Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolved shift/reduce conflict

Browse source
This commit is contained in:
Pavel Machek 2000-05-16 14:24:33 +00:00
parent e2f4f27564
commit 60de3356ab
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/confbase.Y
View file

@ -56,6 +56,7 @@ CF_DECLS
%type <a> ipa %type <a> ipa
%type <px> prefix prefix_or_ipa %type <px> prefix prefix_or_ipa
%nonassoc PREFIX_DUMMY
%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ %nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ
%left '+' '-' %left '+' '-'
%left '*' '/' '%' %left '*' '/' '%'

4
filter/config.Y
View file

@ -211,7 +211,7 @@ pair:
* Complex types, their bison value is struct f_val * Complex types, their bison value is struct f_val
*/ */
fprefix_s: fprefix_s:
IPA '/' NUM { IPA '/' NUM %prec '/' {
if (!ip_is_prefix($1, $3)) cf_error("Invalid network prefix: %I/%d", $1, $3); if (!ip_is_prefix($1, $3)) cf_error("Invalid network prefix: %I/%d", $1, $3);
$$.type = T_PREFIX; $$.val.px.ip = $1; $$.val.px.len = $3; $$.type = T_PREFIX; $$.val.px.ip = $1; $$.val.px.len = $3;
} }
@ -225,7 +225,7 @@ fprefix:
; ;
fipa: fipa:
IPA { $$.type = T_IP; $$.val.px.ip = $1; } IPA %prec PREFIX_DUMMY { $$.type = T_IP; $$.val.px.ip = $1; }
; ;
set_atom: set_atom:

2
filter/test.conf
View file

@ -6,7 +6,7 @@
router id 62.168.0.1; router id 62.168.0.1;
#define xyzzy = 120+10; define xyzzy = (120+10);
function callme(int arg1; int arg2) function callme(int arg1; int arg2)
int local1; int local1;