mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-20 02:07:23 +01:00
fixing build on windows mingw: avoid token name "CONST"
This commit is contained in:
parent
c808c4ab93
commit
b985fcacac
@ -414,7 +414,7 @@ void PFCfgParser::table_rule() {
|
||||
}
|
||||
case NEWLINE:
|
||||
case OPENING_BRACE:
|
||||
case CONST:
|
||||
case CONST_WORD:
|
||||
case COUNTERS:
|
||||
case FILE:
|
||||
{
|
||||
@ -428,9 +428,9 @@ void PFCfgParser::table_rule() {
|
||||
}
|
||||
{
|
||||
switch ( LA(1)) {
|
||||
case CONST:
|
||||
case CONST_WORD:
|
||||
{
|
||||
match(CONST);
|
||||
match(CONST_WORD);
|
||||
break;
|
||||
}
|
||||
case NEWLINE:
|
||||
|
||||
@ -78,7 +78,7 @@ struct CUSTOM_API PFCfgParserTokenTypes {
|
||||
LESS_THAN = 67,
|
||||
GREATER_THAN = 68,
|
||||
PERSIST = 69,
|
||||
CONST = 70,
|
||||
CONST_WORD = 70,
|
||||
COUNTERS = 71,
|
||||
FILE = 72,
|
||||
STRING = 73,
|
||||
|
||||
@ -66,7 +66,7 @@ TABLE="table"=66
|
||||
LESS_THAN=67
|
||||
GREATER_THAN=68
|
||||
PERSIST="persist"=69
|
||||
CONST="const"=70
|
||||
CONST_WORD="const"=70
|
||||
COUNTERS="counters"=71
|
||||
FILE="file"=72
|
||||
STRING=73
|
||||
|
||||
@ -534,7 +534,7 @@ table_rule :
|
||||
name:WORD
|
||||
GREATER_THAN
|
||||
( PERSIST ) ?
|
||||
( CONST ) ?
|
||||
( CONST_WORD ) ?
|
||||
( COUNTERS )?
|
||||
(
|
||||
FILE file:STRING
|
||||
@ -1864,7 +1864,7 @@ tokens
|
||||
RDR = "rdr";
|
||||
BINAT = "binat";
|
||||
TABLE = "table";
|
||||
CONST = "const";
|
||||
CONST_WORD = "const";
|
||||
PERSIST = "persist";
|
||||
COUNTERS = "counters";
|
||||
FILE = "file";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user