Commit 6789e622 authored by Wayne Stambaugh's avatar Wayne Stambaugh

Fix Pcbnew s-expr file parser bug.

parent f4af52f9
...@@ -1670,7 +1670,7 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont ...@@ -1670,7 +1670,7 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont
|| !m_company.IsEmpty() || !m_comment1.IsEmpty() || !m_comment2.IsEmpty() || !m_company.IsEmpty() || !m_comment1.IsEmpty() || !m_comment2.IsEmpty()
|| !m_comment3.IsEmpty() || !m_comment4.IsEmpty() ) || !m_comment3.IsEmpty() || !m_comment4.IsEmpty() )
{ {
aFormatter->Print( aNestLevel, "(title_block " ); aFormatter->Print( aNestLevel, "(title_block \n" );
if( !m_title.IsEmpty() ) if( !m_title.IsEmpty() )
aFormatter->Print( aNestLevel+1, "(title %s)\n", aFormatter->Print( aNestLevel+1, "(title %s)\n",
......
...@@ -264,7 +264,7 @@ S3D_MASTER* PCB_PARSER::parse3DModel() throw( PARSE_ERROR ) ...@@ -264,7 +264,7 @@ S3D_MASTER* PCB_PARSER::parse3DModel() throw( PARSE_ERROR )
auto_ptr< S3D_MASTER > n3D( new S3D_MASTER( NULL ) ); auto_ptr< S3D_MASTER > n3D( new S3D_MASTER( NULL ) );
NeedSYMBOL(); NeedSYMBOLorNUMBER();
n3D->m_Shape3DName = FromUTF8(); n3D->m_Shape3DName = FromUTF8();
for( token = NextTok(); token != T_RIGHT; token = NextTok() ) for( token = NextTok(); token != T_RIGHT; token = NextTok() )
...@@ -592,12 +592,12 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR ) ...@@ -592,12 +592,12 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
switch( token ) switch( token )
{ {
case T_title: case T_title:
NeedSYMBOL(); NextTok();
titleBlock.SetTitle( FromUTF8() ); titleBlock.SetTitle( FromUTF8() );
break; break;
case T_date: case T_date:
NeedSYMBOL(); NextTok();
titleBlock.SetDate( FromUTF8() ); titleBlock.SetDate( FromUTF8() );
break; break;
...@@ -1587,7 +1587,7 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR ) ...@@ -1587,7 +1587,7 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR )
break; break;
case T_path: case T_path:
NeedSYMBOL(); NeedSYMBOLorNUMBER(); // Paths can be numerical so a number is also a symbol here
module->SetPath( FromUTF8() ); module->SetPath( FromUTF8() );
NeedRIGHT(); NeedRIGHT();
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment