@@ -42,7 +42,7 @@ static void yyerror(char *s)
%nonassoc '!'
%%
-applet: null expr
+applet: null exprlist
{
*yy_ret = $2;
$$ = $2;
@@ -51,6 +51,32 @@ applet: null expr
;
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
{
$$ = alloc_node(SSF_DCOND, $2);
@@ -128,30 +154,6 @@ expr: DCOND HOSTCOND
{
$$ = 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;
- }
;
%%
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> --- misc/ssfilter.y | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-)