widl: Make constdef and externdef take a declarator instead of an ident so that…

widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements.

widl: Make constdef and externdef take a declarator instead of an ident so that…
017213e1 · Rob Shearman · Alexandre Julliard · 4f8f89e6 · 017213e1
Commit 017213e1 authored Apr 29, 2008 by Rob Shearman Committed by Alexandre Julliard Apr 30, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

parser.y tools/widl/parser.y +5 -4

No files found.
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -602,8 +602,9 @@ case:	  tCASE expr_int_const ':' union_field	{ attr_t *a = make_attrp(ATTR_CASE,
 						}
 	;

-constdef: tCONST decl_spec ident '=' expr_const	{ $$ = reg_const($3);
-						  set_type($$, $2, NULL, FALSE);
+constdef: tCONST decl_spec declarator '=' expr_const
+						{ $$ = reg_const($3->var);
+						  set_type($$, $2, $3, FALSE);
 						  $$->eval = $5;
 						}
 	;
@@ -720,8 +721,8 @@ expr_const: expr				{ $$ = $1;
 						}
 	;

-externdef: tEXTERN tCONST decl_spec ident	{ $$ = $4;
-						  set_type($$, $3, NULL, FALSE);
+externdef: tEXTERN tCONST decl_spec declarator	{ $$ = $4->var;
+						  set_type($$, $3, $4, FALSE);
 						}
 	;