diff --git a/qa/drc_proto/drc_rule_parser.cpp b/qa/drc_proto/drc_rule_parser.cpp index 1b86d0580f..e12c5cc26c 100644 --- a/qa/drc_proto/drc_rule_parser.cpp +++ b/qa/drc_proto/drc_rule_parser.cpp @@ -33,11 +33,10 @@ #include -using namespace DRCRULE_T; - +using namespace DRCRULEPROTO_T; test::DRC_RULES_PARSER::DRC_RULES_PARSER( BOARD* aBoard, FILE* aFile, const wxString& aFilename ) - : DRC_RULES_LEXER( aFile, aFilename ), + : DRC_RULES_PROTO_LEXER( aFile, aFilename ), m_board( aBoard ), m_requiredVersion( 0 ), m_tooRecent( false ) @@ -62,6 +61,8 @@ void test::DRC_RULES_PARSER::Parse( token = NextTok(); + printf("TOK %d %d\n", token, T_version ); + if( !haveVersion && token != T_version ) Expecting( "version" ); diff --git a/qa/drc_proto/drc_rule_parser.h b/qa/drc_proto/drc_rule_parser.h index 9c54f04c17..c45f6afd87 100644 --- a/qa/drc_proto/drc_rule_parser.h +++ b/qa/drc_proto/drc_rule_parser.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include class BOARD_ITEM; @@ -40,7 +40,7 @@ class DRC_RULE; #define DRC_RULE_FILE_VERSION 20200610 -class DRC_RULES_PARSER : public DRC_RULES_LEXER +class DRC_RULES_PARSER : public DRC_RULES_PROTO_LEXER { public: DRC_RULES_PARSER( BOARD* aBoard, FILE* aFile, const wxString& aFilename );