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

drc_proto: use separate lexer for rule file from current pcbnew DRC

This commit is contained in:
Tomasz Wlostowski 2020-06-30 10:43:16 +02:00
parent 0e0cf5dff8
commit bc86ea7682
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/drc_proto/drc_rule_parser.cpp
View File

@ -33,11 +33,10 @@
#include <pcb_expr_evaluator.h> #include <pcb_expr_evaluator.h>
using namespace DRCRULE_T; using namespace DRCRULEPROTO_T;
test::DRC_RULES_PARSER::DRC_RULES_PARSER( BOARD* aBoard, FILE* aFile, const wxString& aFilename ) 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_board( aBoard ),
m_requiredVersion( 0 ), m_requiredVersion( 0 ),
m_tooRecent( false ) m_tooRecent( false )
@ -62,6 +61,8 @@ void test::DRC_RULES_PARSER::Parse(
token = NextTok(); token = NextTok();
printf("TOK %d %d\n", token, T_version );
if( !haveVersion && token != T_version ) if( !haveVersion && token != T_version )
Expecting( "version" ); Expecting( "version" );

4
qa/drc_proto/drc_rule_parser.h
View File

@ -28,7 +28,7 @@
#include <netclass.h> #include <netclass.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <drc_proto/drc_rule.h> #include <drc_proto/drc_rule.h>
#include <drc_rules_lexer.h> #include <drc_rules_proto_lexer.h>
class BOARD_ITEM; class BOARD_ITEM;
@ -40,7 +40,7 @@ class DRC_RULE;
#define DRC_RULE_FILE_VERSION 20200610 #define DRC_RULE_FILE_VERSION 20200610
class DRC_RULES_PARSER : public DRC_RULES_LEXER class DRC_RULES_PARSER : public DRC_RULES_PROTO_LEXER
{ {
public: public:
DRC_RULES_PARSER( BOARD* aBoard, FILE* aFile, const wxString& aFilename ); DRC_RULES_PARSER( BOARD* aBoard, FILE* aFile, const wxString& aFilename );