Eliminate conflicts by setting associativity (and precedence too).

svn path=/trunk/yasm/; revision=115

diff --git a/modules/parsers/nasm/bison.y.in b/modules/parsers/nasm/bison.y.in
index f282e8b51cde7b40140064073889246b15f82d99..0c155b2245acbc03b02e2fbe9785b15787feef22 100644 (file)
--- a/modules/parsers/nasm/bison.y.in
+++ b/modules/parsers/nasm/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.17 2001/07/05 09:32:58 mu Exp $
+/* $Id: bison.y.in,v 1.18 2001/07/05 09:50:51 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson, Michael Urman
@@ -90,8 +90,13 @@ extern void yyerror(char *);
 %type <syminfo> immlabel
 %type <sym> label_id
 
+%left '|'
+%left '^'
+%left '&'
+%left LEFT_OP RIGHT_OP
 %left '-' '+'
-%left '*' '/'
+%left '*' '/' '%'
+%nonassoc '~'
 
 %%
 input: /* empty */

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 5dbfced1ceadc0fa342ee66ef1bdff511171452a..f3132d3a165820bfa5d5bae50ba91b41d50c0119 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -1,4 +1,4 @@
-/* $Id: nasm-bison.y,v 1.17 2001/07/05 09:32:58 mu Exp $
+/* $Id: nasm-bison.y,v 1.18 2001/07/05 09:50:51 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson, Michael Urman
@@ -90,8 +90,13 @@ extern void yyerror(char *);
 %type <syminfo> immlabel
 %type <sym> label_id
 
+%left '|'
+%left '^'
+%left '&'
+%left LEFT_OP RIGHT_OP
 %left '-' '+'
-%left '*' '/'
+%left '*' '/' '%'
+%nonassoc '~'
 
 %%
 input: /* empty */

diff --git a/src/bison.y.in b/src/bison.y.in
index f282e8b51cde7b40140064073889246b15f82d99..0c155b2245acbc03b02e2fbe9785b15787feef22 100644 (file)
--- a/src/bison.y.in
+++ b/src/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.17 2001/07/05 09:32:58 mu Exp $
+/* $Id: bison.y.in,v 1.18 2001/07/05 09:50:51 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson, Michael Urman
@@ -90,8 +90,13 @@ extern void yyerror(char *);
 %type <syminfo> immlabel
 %type <sym> label_id
 
+%left '|'
+%left '^'
+%left '&'
+%left LEFT_OP RIGHT_OP
 %left '-' '+'
-%left '*' '/'
+%left '*' '/' '%'
+%nonassoc '~'
 
 %%
 input: /* empty */

diff --git a/src/parsers/nasm/bison.y.in b/src/parsers/nasm/bison.y.in
index f282e8b51cde7b40140064073889246b15f82d99..0c155b2245acbc03b02e2fbe9785b15787feef22 100644 (file)
--- a/src/parsers/nasm/bison.y.in
+++ b/src/parsers/nasm/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.17 2001/07/05 09:32:58 mu Exp $
+/* $Id: bison.y.in,v 1.18 2001/07/05 09:50:51 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson, Michael Urman
@@ -90,8 +90,13 @@ extern void yyerror(char *);
 %type <syminfo> immlabel
 %type <sym> label_id
 
+%left '|'
+%left '^'
+%left '&'
+%left LEFT_OP RIGHT_OP
 %left '-' '+'
-%left '*' '/'
+%left '*' '/' '%'
+%nonassoc '~'
 
 %%
 input: /* empty */

diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index 5dbfced1ceadc0fa342ee66ef1bdff511171452a..f3132d3a165820bfa5d5bae50ba91b41d50c0119 100644 (file)
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -1,4 +1,4 @@
-/* $Id: nasm-bison.y,v 1.17 2001/07/05 09:32:58 mu Exp $
+/* $Id: nasm-bison.y,v 1.18 2001/07/05 09:50:51 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson, Michael Urman
@@ -90,8 +90,13 @@ extern void yyerror(char *);
 %type <syminfo> immlabel
 %type <sym> label_id
 
+%left '|'
+%left '^'
+%left '&'
+%left LEFT_OP RIGHT_OP
 %left '-' '+'
-%left '*' '/'
+%left '*' '/' '%'
+%nonassoc '~'
 
 %%
 input: /* empty */