wine/programs/winedbg debug.l dbg.y

Alexandre Julliard julliard at wine.codeweavers.com
Sat Nov 12 13:10:24 CST 2005


ChangeSet ID:	21231
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/12 13:10:24

Modified files:
	programs/winedbg: debug.l dbg.y 

Log message:
	Eric Pouech <eric.pouech at wanadoo.fr>
	Removed a couple of shift/reduce warnings in grammar.

Patch: http://cvs.winehq.org/patch.py?id=21231

Old revision  New revision  Changes     Path
 1.15          1.16          +1 -0       wine/programs/winedbg/debug.l
 1.26          1.27          +5 -4       wine/programs/winedbg/dbg.y

Index: wine/programs/winedbg/debug.l
diff -u -p wine/programs/winedbg/debug.l:1.15 wine/programs/winedbg/debug.l:1.16
--- wine/programs/winedbg/debug.l:1.15	12 Nov 2005 19:10:24 -0000
+++ wine/programs/winedbg/debug.l	12 Nov 2005 19:10:24 -0000
@@ -112,6 +112,7 @@ STRING     \"[^\n"]+\"
 "<<"					{ return OP_SHL; }
 ">>"					{ return OP_SHR; }
 "->"					{ return OP_DRF; }
+"::"					{ return OP_SCOPE; }
 [-+<=>|&^()*/%:!~,\.]			{ return *yytext; }
 "["					{ return *yytext; }
 "]"					{ return *yytext; }
Index: wine/programs/winedbg/dbg.y
diff -u -p wine/programs/winedbg/dbg.y:1.26 wine/programs/winedbg/dbg.y:1.27
--- wine/programs/winedbg/dbg.y:1.26	12 Nov 2005 19:10:24 -0000
+++ wine/programs/winedbg/dbg.y	12 Nov 2005 19:10:24 -0000
@@ -79,7 +79,7 @@ int yyerror(const char*);
 %left '+' '-'
 %left '*' '/' '%'
 %left OP_SIGN '!' '~' OP_DEREF /* OP_INC OP_DEC OP_ADDR */
-%left '.' '[' OP_DRF
+%left '.' '[' OP_DRF OP_SCOPE
 %nonassoc ':'
 
 %type <expression> expr lvalue
@@ -164,8 +164,8 @@ identifier:
       tIDENTIFIER               { $$ = $1; }
     | tPATH '!' tIDENTIFIER     { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1);
                                   sprintf($$, "%s!%s", $1, $3); }
-    | identifier ':' ':' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($4) + 1);
-                                       sprintf($$, "%s::%s", $1, $4); }
+    | identifier OP_SCOPE tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 2 + strlen($3) + 1);
+                                       sprintf($$, "%s::%s", $1, $3); }
     ;
 
 list_arg:
@@ -374,7 +374,8 @@ lvalue_addr: 
       lvalue                     { $$ = expr_eval($1); }
     ;
 
-lvalue: tNUM                     { $$ = expr_alloc_sconstant($1); }
+lvalue: 
+      tNUM                       { $$ = expr_alloc_sconstant($1); }
     | tINTVAR                    { $$ = expr_alloc_internal_var($1); }
     | identifier		 { $$ = expr_alloc_symbol($1); }
     | lvalue OP_DRF tIDENTIFIER	 { $$ = expr_alloc_pstruct($1, $3); }



More information about the wine-cvs mailing list