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

Minor reformatting and performance improvement.

This commit is contained in:
Jeff Young 2020-09-16 10:49:54 +01:00
parent b993a29695
commit c0f83b30d3
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/drc/drc_rule_condition.cpp
View File

@ -60,7 +60,8 @@ bool DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOARD_ITEM
PCB_EXPR_CONTEXT ctx( aLayer ); PCB_EXPR_CONTEXT ctx( aLayer );
ctx.SetItems( a, b ); ctx.SetItems( a, b );
ctx.SetErrorCallback( [&]( const wxString& aMessage, int aOffset ) ctx.SetErrorCallback(
[&]( const wxString& aMessage, int aOffset )
{ {
if( aReporter ) if( aReporter )
aReporter->Report( _( "ERROR: " ) + aMessage ); aReporter->Report( _( "ERROR: " ) + aMessage );
@ -72,7 +73,12 @@ bool DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOARD_ITEM
bool DRC_RULE_CONDITION::Compile( REPORTER* aReporter, int aSourceLine, int aSourceOffset ) bool DRC_RULE_CONDITION::Compile( REPORTER* aReporter, int aSourceLine, int aSourceOffset )
{ {
auto errorHandler = [&]( const wxString& aMessage, int aOffset ) PCB_EXPR_COMPILER compiler;
compiler.SetErrorCallback(
[&]( const wxString& aMessage, int aOffset )
{
if( aReporter )
{ {
wxString rest; wxString rest;
wxString first = aMessage.BeforeFirst( '|', &rest ); wxString first = aMessage.BeforeFirst( '|', &rest );
@ -82,12 +88,9 @@ bool DRC_RULE_CONDITION::Compile( REPORTER* aReporter, int aSourceLine, int aSou
first, first,
rest ); rest );
if( aReporter )
aReporter->Report( msg, RPT_SEVERITY_ERROR ); aReporter->Report( msg, RPT_SEVERITY_ERROR );
}; }
} );
PCB_EXPR_COMPILER compiler;
compiler.SetErrorCallback( errorHandler );
m_ucode = std::make_unique<PCB_EXPR_UCODE>(); m_ucode = std::make_unique<PCB_EXPR_UCODE>();