aboutsummaryrefslogtreecommitdiffstats
path: root/dfilter-grammar.y
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-10-12 05:21:07 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-10-12 05:21:07 +0000
commit10c4bab8e129dc0012e8e341fb74fc725e66fee8 (patch)
tree7a53eaf1dde1a9d660528ef2c2cdfb5a7b5c1ca5 /dfilter-grammar.y
parent99e8c65674b9bed3fc6d967a9ed1dd0ca5cac374 (diff)
The 4 shift/reduce conflicts have to do with the associativity of the
logical operators, e.g.: NOT expression AND expression expression AND expression AND expression etc. The shift/reduce conflicts _are_resolved (according to the output from bison -v), so the conflicts seem to be benign. Right now I marked the 4 shift/reduce conflicts as expected, but perhaps someone more knowledgable about yacc grammars could take a look at it? svn path=/trunk/; revision=814
Diffstat (limited to 'dfilter-grammar.y')
-rw-r--r--dfilter-grammar.y7
1 files changed, 3 insertions, 4 deletions
diff --git a/dfilter-grammar.y b/dfilter-grammar.y
index 6d658d6520..ae47287a43 100644
--- a/dfilter-grammar.y
+++ b/dfilter-grammar.y
@@ -3,7 +3,7 @@
/* dfilter-grammar.y
* Parser for display filters
*
- * $Id: dfilter-grammar.y,v 1.27 1999/10/12 05:13:32 guy Exp $
+ * $Id: dfilter-grammar.y,v 1.28 1999/10/12 05:21:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -156,11 +156,10 @@ dfilter *global_df = NULL;
%token <operand> TOK_AND TOK_OR TOK_NOT TOK_XOR
%token <operand> TOK_EQ TOK_NE TOK_GT TOK_GE TOK_LT TOK_LE
-%token <operand> TOK_TRUE TOK_FALSE
+%expect 4
%left TOK_AND
-%left TOK_OR
-%left TOK_XOR
+%left TOK_OR TOK_XOR
%nonassoc TOK_NOT
%%