commit 5c1231d2dfc90258fd3c7eb42717dd7fa7d22393
author Huw Davies <huw@codeweavers.com> Tue Jan 04 20:34:05 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 04 20:34:05 2005 +0000
tree d6e8f95dfd50a7c82cde1417d60973974ea2a46a
parent 7fa80077b4b2da8c0af22c63a1611243970e1082

Add the precedence of the conditional operator.

tools/widl/parser.y

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index 6448d8f..55c7862 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -205,6 +205,7 @@
 %type <str> libraryhdr
 
 %left ','
+%right COND
 %left '|'
 %left '&'
 %left '-' '+'
@@ -460,7 +461,7 @@
 expr:	  aNUM					{ $$ = make_exprl(EXPR_NUM, $1); }
 	| aHEXNUM				{ $$ = make_exprl(EXPR_HEXNUM, $1); }
 	| aIDENTIFIER				{ $$ = make_exprs(EXPR_IDENTIFIER, $1); }
-	| expr '?' expr ':' expr		{ $$ = make_expr3(EXPR_COND, $1, $3, $5); }
+	| expr '?' expr ':' expr %prec COND	{ $$ = 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); }