widl: Use the same precendence rule for the conditional operator as in wpp.

Fixes several shift/reduce warnings.
This commit is contained in:
Robert Shearman 2005-12-26 13:07:08 +01:00 committed by Alexandre Julliard
parent 30a9f99bb9
commit e59dcf53fc
1 changed files with 2 additions and 2 deletions

View File

@ -216,7 +216,7 @@ static type_t std_uhyper = { "MIDL_uhyper" };
%type <str> libraryhdr
%left ','
%right COND
%right '?' ':'
%left '|'
%left '&'
%left '-' '+'
@ -480,7 +480,7 @@ m_expr: { $$ = make_expr(EXPR_VOID); }
expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); }
| aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); }
| aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); }
| expr '?' expr ':' expr %prec COND { $$ = make_expr3(EXPR_COND, $1, $3, $5); }
| expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); }
| expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); }
| expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); }
| expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); }