haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting and performance. 

(wxString construction is surprisingly expensive.)
This commit is contained in:
Jeff Young 2024-05-03 12:14:14 +01:00
parent f00a1ab517
commit ce1404df79
1 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp
View File

@ -317,15 +317,15 @@ LIB_SYMBOL* SCH_IO_KICAD_SEXPR_PARSER::parseLibSymbol( LIB_SYMBOL_MAP& aSymbolLi
name.Replace( wxS( "{slash}" ), wxT( "/" ) ); name.Replace( wxS( "{slash}" ), wxT( "/" ) );
LIB_ID id; LIB_ID id;
int bad_pos = id.Parse( name ); int bad_pos = id.Parse( name );
if( bad_pos >= 0 ) if( bad_pos >= 0 )
{ {
if( static_cast<int>( name.size() ) > bad_pos ) if( static_cast<int>( name.size() ) > bad_pos )
{ {
wxString msg = wxString::Format( wxString msg = wxString::Format( _( "Symbol %s contains invalid character '%c'" ),
_( "Symbol %s contains invalid character '%c'" ), name, name,
name[bad_pos] ); name[bad_pos] );
THROW_PARSE_ERROR( msg, CurSource(), CurLine(), CurLineNumber(), CurOffset() ); THROW_PARSE_ERROR( msg, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
} }
@ -488,6 +488,7 @@ LIB_SYMBOL* SCH_IO_KICAD_SEXPR_PARSER::parseLibSymbol( LIB_SYMBOL_MAP& aSymbolLi
unitDisplayName = FromUTF8(); unitDisplayName = FromUTF8();
symbol->SetUnitDisplayName( m_unit, unitDisplayName ); symbol->SetUnitDisplayName( m_unit, unitDisplayName );
} }
NeedRIGHT(); NeedRIGHT();
break; break;
@ -550,40 +551,15 @@ SCH_ITEM* SCH_IO_KICAD_SEXPR_PARSER::ParseSymbolDrawItem()
{ {
switch( CurTok() ) switch( CurTok() )
{ {
case T_arc: case T_arc: return parseSymbolArc(); break;
return parseSymbolArc(); case T_bezier: return parseSymbolBezier(); break;
break; case T_circle: return parseSymbolCircle(); break;
case T_pin: return parseSymbolPin(); break;
case T_bezier: case T_polyline: return parseSymbolPolyLine(); break;
return parseSymbolBezier(); case T_rectangle: return parseSymbolRectangle(); break;
break; case T_text: return parseSymbolText(); break;
case T_text_box: return parseSymbolTextBox(); break;
case T_circle: default: Expecting( "arc, bezier, circle, pin, polyline, rectangle, or text" );
return parseSymbolCircle();
break;
case T_pin:
return parseSymbolPin();
break;
case T_polyline:
return parseSymbolPolyLine();
break;
case T_rectangle:
return parseSymbolRectangle();
break;
case T_text:
return parseSymbolText();
break;
case T_text_box:
return parseSymbolTextBox();
break;
default:
Expecting( "arc, bezier, circle, pin, polyline, rectangle, or text" );
} }
return nullptr; return nullptr;
@ -690,6 +666,8 @@ void SCH_IO_KICAD_SEXPR_PARSER::parseEDA_TEXT( EDA_TEXT* aText, bool aConvertOve
aText->SetText( ConvertToNewOverbarNotation( aText->GetText() ) ); aText->SetText( ConvertToNewOverbarNotation( aText->GetText() ) );
T token; T token;
bool bold = false;
bool italic = false;
wxString faceName; wxString faceName;
COLOR4D color = COLOR4D::UNSPECIFIED; COLOR4D color = COLOR4D::UNSPECIFIED;
@ -735,18 +713,14 @@ void SCH_IO_KICAD_SEXPR_PARSER::parseEDA_TEXT( EDA_TEXT* aText, bool aConvertOve
break; break;
case T_bold: case T_bold:
{ bold = parseMaybeAbsentBool( true );
bool bold = parseMaybeAbsentBool( true );
aText->SetBoldFlag( bold ); aText->SetBoldFlag( bold );
break; break;
}
case T_italic: case T_italic:
{ italic = parseMaybeAbsentBool( true );
bool italic = parseMaybeAbsentBool( true );
aText->SetItalic( italic ); aText->SetItalic( italic );
break; break;
}
case T_color: case T_color:
color.r = parseInt( "red" ) / 255.0; color.r = parseInt( "red" ) / 255.0;
@ -768,10 +742,7 @@ void SCH_IO_KICAD_SEXPR_PARSER::parseEDA_TEXT( EDA_TEXT* aText, bool aConvertOve
} }
if( !faceName.IsEmpty() ) if( !faceName.IsEmpty() )
{ aText->SetFont( KIFONT::FONT::GetFont( faceName, bold, italic ) );
aText->SetFont( KIFONT::FONT::GetFont( faceName, aText->IsBold(),
aText->IsItalic() ) );
}
break; break;
@ -886,8 +857,7 @@ SCH_FIELD* SCH_IO_KICAD_SEXPR_PARSER::parseProperty( std::unique_ptr<LIB_SYMBOL>
wxString name; wxString name;
wxString value; wxString value;
std::unique_ptr<SCH_FIELD> field = std::make_unique<SCH_FIELD>( aSymbol.get(), auto field = std::make_unique<SCH_FIELD>( aSymbol.get(), MANDATORY_FIELDS );
MANDATORY_FIELDS );
// By default, fieds are visible. // By default, fieds are visible.
// Invisible fields have the hide style or keyword specified in file // Invisible fields have the hide style or keyword specified in file
@ -948,9 +918,11 @@ SCH_FIELD* SCH_IO_KICAD_SEXPR_PARSER::parseProperty( std::unique_ptr<LIB_SYMBOL>
case T_id: case T_id:
{ {
int id = parseInt( "field ID" ); int id = parseInt( "field ID" );
// Only set an ID that isn't a MANDATORY_FIELDS ID // Only set an ID that isn't a MANDATORY_FIELDS ID
if( id >= MANDATORY_FIELDS ) if( id >= MANDATORY_FIELDS )
field->SetId( id ); field->SetId( id );
NeedRIGHT(); NeedRIGHT();
} }
break; break;
@ -984,9 +956,8 @@ SCH_FIELD* SCH_IO_KICAD_SEXPR_PARSER::parseProperty( std::unique_ptr<LIB_SYMBOL>
} }
} }
// Due to an bug when in #LIB_SYMBOL::Flatten, duplicate ids slipped through // Due to an bug when in #LIB_SYMBOL::Flatten, duplicate ids slipped through when writing
// when writing files. This section replaces duplicate #SCH_FIELD indices on // files. This section replaces duplicate #SCH_FIELD indices on load.
// load.
if( ( field->GetId() >= MANDATORY_FIELDS ) && m_fieldIDsRead.count( field->GetId() ) ) if( ( field->GetId() >= MANDATORY_FIELDS ) && m_fieldIDsRead.count( field->GetId() ) )
{ {
int nextAvailableId = field->GetId() + 1; int nextAvailableId = field->GetId() + 1;
@ -3434,8 +3405,11 @@ SCH_SHEET* SCH_IO_KICAD_SEXPR_PARSER::parseSheet()
else else
{ {
// Whitespaces are not permitted // Whitespaces are not permitted
std::vector<wxString> whitespaces = { wxT( "\r" ), wxT( "\n" ), static std::vector<wxString> whitespaces =
wxT( "\t" ), wxT( " " ) }; { wxT( "\r" ),
wxT( "\n" ),
wxT( "\t" ),
wxT( " " ) };
for( wxString ch : whitespaces ) for( wxString ch : whitespaces )
instance.m_PageNumber.Replace( ch, wxEmptyString ); instance.m_PageNumber.Replace( ch, wxEmptyString );