WRC: Alow resource nameID to have quotes

Jacek Caban jack at itma.pwr.wroc.pl
Fri Sep 30 13:12:58 CDT 2005


This patch partially fixes bug 786. Now the error is:

test.rc:2:64: Error: Duplicate resource name 'dialog_id'

Changelog:
    Allow resource nameID to have quotes
-------------- next part --------------
Index: tools/wrc/parser.y
===================================================================
RCS file: /home/wine/wine/tools/wrc/parser.y,v
retrieving revision 1.53
diff -u -p -r1.53 parser.y
--- tools/wrc/parser.y	3 Aug 2005 21:25:10 -0000	1.53
+++ tools/wrc/parser.y	30 Sep 2005 18:01:42 -0000
@@ -356,7 +356,7 @@ static int rsrcid_to_token(int lookahead
 %type <styles>  optional_style_pair
 %type <num>	any_num
 %type <style>   style
-%type <str>	filename
+%type <str>	filename resid
 
 %%
 
@@ -484,7 +484,7 @@ resource
 			chat("Got %s (%d)", get_typename($3), $$->name->name.i_name);
 			}
 			}
-	| tIDENT usrcvt resource_definition {
+	| resid usrcvt resource_definition {
 		$$ = $3;
 		if($$)
 		{
@@ -549,6 +549,10 @@ resource
 usrcvt	: /* Empty */	{ yychar = rsrcid_to_token(yychar); }
 	;
 
+resid   :
+        tIDENT  { $$ = $1 }
+        | tSTRING { $$ = $1 }
+
 /*
  * Get a valid name/id
  */


More information about the wine-patches mailing list