matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ssfilter: Eliminate shift/reduce conflicts 

The problematic bit was the 'expr: expr expr' rule. Fix this by making
'expr' token represent a single filter only and introduce a new token
'exprlist' to represent a combination of filters.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2018-03-24 18:45:14 +01:00 committed by Stephen Hemminger
parent 8ee38d833c
commit b2038cc0b2
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
misc/ssfilter.y
View File

@ -42,7 +42,7 @@ static void yyerror(char *s)
%nonassoc '!' %nonassoc '!'
%% %%
applet: null expr applet: null exprlist
{ {
*yy_ret = $2; *yy_ret = $2;
$$ = $2; $$ = $2;
@ -51,6 +51,32 @@ applet: null expr
; ;
null: /* NOTHING */ { $$ = NULL; } null: /* NOTHING */ { $$ = NULL; }
; ;
exprlist: expr
| '!' expr
{
$$ = alloc_node(SSF_NOT, $2);
}
| '(' exprlist ')'
{
$$ = $2;
}
| exprlist '|' expr
{
$$ = alloc_node(SSF_OR, $1);
$$->post = $3;
}
| exprlist '&' expr
{
$$ = alloc_node(SSF_AND, $1);
$$->post = $3;
}
| exprlist expr
{
$$ = alloc_node(SSF_AND, $1);
$$->post = $2;
}
;
expr: DCOND HOSTCOND expr: DCOND HOSTCOND
{ {
$$ = alloc_node(SSF_DCOND, $2); $$ = alloc_node(SSF_DCOND, $2);
@ -128,30 +154,6 @@ expr: DCOND HOSTCOND
{ {
$$ = alloc_node(SSF_S_AUTO, NULL); $$ = alloc_node(SSF_S_AUTO, NULL);
} }
| expr '|' expr
{
$$ = alloc_node(SSF_OR, $1);
$$->post = $3;
}
| expr expr
{
$$ = alloc_node(SSF_AND, $1);
$$->post = $2;
}
| expr '&' expr
{
$$ = alloc_node(SSF_AND, $1);
$$->post = $3;
}
| '!' expr
{
$$ = alloc_node(SSF_NOT, $2);
}
| '(' expr ')'
{
$$ = $2;
}
; ;
%% %%