André Hentschel : wrc: Allow comma after popup name.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a49eac930a3e6582b3df67f739206fc821f4e89f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a49eac930a3e6582b3df67f739...

Author: André Hentschel <nerv(a)dawncrow.de>
Date:   Mon Dec 13 17:28:34 2010 +0100

wrc: Allow comma after popup name.

---

 tools/wrc/parser.y |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 8c49114..e1a3c68 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -369,7 +369,7 @@ resource_file
 		else
 			$1 = rsc;
 
-		/* Final statements before were done */
+		/* Final statements before we're done */
                 if ((head = get_resource_head($1)) != NULL)
                 {
                     if (resource_top)  /* append to existing resources */
@@ -1278,13 +1278,14 @@ item_definitions
  * (who would want to specify a MF_x flag twice?).
  */
 item_options
-	: /* Empty */				{ $$ = 0; }
-	| opt_comma tCHECKED		item_options	{ $$ = $3 | MF_CHECKED; }
-	| opt_comma tGRAYED		item_options	{ $$ = $3 | MF_GRAYED; }
-	| opt_comma tHELP		item_options	{ $$ = $3 | MF_HELP; }
-	| opt_comma tINACTIVE		item_options	{ $$ = $3 | MF_DISABLED; }
-	| opt_comma tMENUBARBREAK	item_options	{ $$ = $3 | MF_MENUBARBREAK; }
-	| opt_comma tMENUBREAK	item_options	{ $$ = $3 | MF_MENUBREAK; }
+	:  /* Empty */			{ $$ = 0; }
+	| ','		item_options	{ $$ = $2; }
+	| tCHECKED	item_options	{ $$ = $2 | MF_CHECKED; }
+	| tGRAYED	item_options	{ $$ = $2 | MF_GRAYED; }
+	| tHELP		item_options	{ $$ = $2 | MF_HELP; }
+	| tINACTIVE	item_options	{ $$ = $2 | MF_DISABLED; }
+	| tMENUBARBREAK	item_options	{ $$ = $2 | MF_MENUBARBREAK; }
+	| tMENUBREAK	item_options	{ $$ = $2 | MF_MENUBREAK; }
 	;
 
 /* ------------------------------ MenuEx ------------------------------ */