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

qa/drc_proto: fix regressions in DRC_RULE_PARSER

This commit is contained in:
Tomasz Wlostowski 2020-08-04 00:10:47 +02:00
parent 59303adaca
commit 782fcc6139
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/drc_proto/drc_rule_parser.cpp
View File

@ -138,7 +138,7 @@ void test::DRC_RULES_PARSER::Parse( std::vector<test::DRC_RULE_CONDITION*>& aCon
case T_rule: case T_rule:
{ {
auto rule = parseRULE(); auto rule = parseRULE();
drc_dbg(0, "Parsed rule: '%s' type '%s\n", (const char*) rule->GetName().c_str(), (const char*) rule->GetTestProviderName().c_str() ); drc_dbg(0, "Parsed rule: '%s' type '%s'\n", (const char*) rule->GetName().c_str(), (const char*) rule->GetTestProviderName().c_str() );
aRules.push_back( rule ); aRules.push_back( rule );
break; break;
} }
@ -204,8 +204,13 @@ test::DRC_RULE* test::DRC_RULES_PARSER::parseRULE()
if( !IsSymbol( token ) ) if( !IsSymbol( token ) )
reportError( _( "Missing rule name." ) ); reportError( _( "Missing rule name." ) );
rule->m_Priority = 0;
rule->m_Enabled = true;
rule->m_Name = FromUTF8(); rule->m_Name = FromUTF8();
printf("parseRule '%s'\n", (const char *) rule->m_Name.c_str() );
for( token = NextTok(); token != T_RIGHT; token = NextTok() ) for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{ {
if( token != T_LEFT ) if( token != T_LEFT )
@ -222,6 +227,7 @@ test::DRC_RULE* test::DRC_RULES_PARSER::parseRULE()
// to new error reporting framework? // to new error reporting framework?
NeedSYMBOL(); NeedSYMBOL();
rule->m_TestProviderName = FromUTF8(); rule->m_TestProviderName = FromUTF8();
NeedRIGHT();
break; break;
case T_min: case T_min:
@ -286,10 +292,12 @@ test::DRC_RULE* test::DRC_RULES_PARSER::parseRULE()
case T_allow: case T_allow:
rule->m_Constraint.m_Allow = parseInt("allowed"); rule->m_Constraint.m_Allow = parseInt("allowed");
NeedRIGHT();
break; break;
case T_enable: case T_enable:
rule->m_Enabled = parseInt("enabled"); rule->m_Enabled = parseInt("enabled");
NeedRIGHT();
break; break;
case T_severity: case T_severity:
@ -303,12 +311,14 @@ test::DRC_RULE* test::DRC_RULES_PARSER::parseRULE()
Expecting( "error, warning or ignore" ); Expecting( "error, warning or ignore" );
break; break;
} }
NeedRIGHT();
break; break;
case T_priority: case T_priority:
rule->m_Priority = parseInt("priotity"); rule->m_Priority = parseInt("priotity");
NeedRIGHT();
break; break;
@ -323,7 +333,7 @@ test::DRC_RULE* test::DRC_RULES_PARSER::parseRULE()
break; break;
} }
NeedRIGHT();
} }
return rule; return rule;