Robert Shearman : msi: Fix bison warnings by providing precedence rules for expressions

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: a911ea0fd76419c70131daca53eaf434d1ed3b26
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=a911ea0fd76419c70131daca...

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Tue Feb  7 16:24:51 2006 +0100

msi: Fix bison warnings by providing precedence rules for expressions
and by removing a redundant expression case.

---

 dlls/msi/sql.y |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 6669441..b0b4b2b 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -132,6 +132,14 @@ static struct expr * EXPR_wildcard( void
 %type <column_type> column_type data_type data_type_l data_count
 %type <integer> number
 
+/* Reference: http://mates.ms.mff.cuni.cz/oracle/doc/ora815nt/server.815/a67779/operator.h... */
+%left TK_OR
+%left TK_AND
+%left TK_NOT
+%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_ISNULL TK_LIKE TK_BETWEEN TK_IN
+%left TK_PLUS TK_MINUS TK_CONCAT
+%right TK_NEGATION
+
 %%
 
 query:
@@ -430,12 +438,6 @@ expr:
             if( !$$ )
                 YYABORT;
         }
-  | column_val TK_EQ column_val
-        {
-            $$ = EXPR_complex( info, $1, OP_EQ, $3 );
-            if( !$$ )
-                YYABORT;
-        }
   | expr TK_AND expr
         {
             $$ = EXPR_complex( info, $1, OP_AND, $3 );
@@ -545,7 +547,7 @@ const_val:
             if( !$$ )
                 YYABORT;
         }
-  | TK_MINUS number
+  | TK_MINUS number %prec TK_NEGATION
         {
             $$ = EXPR_ival( info, -$2 );
             if( !$$ )