winedbg: Move module scoping to the lexer.

This allows expressing module scoping with wildcard characters (eg kernel*!CreateFileA). Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winedbg: Move module scoping to the lexer.
c03d651b · Eric Pouech · Alexandre Julliard · 61a2e527 · c03d651b · c03d651b
Commit c03d651b authored Dec 08, 2021 by Eric Pouech Committed by Alexandre Julliard Dec 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

dbg.y programs/winedbg/dbg.y +0 -2

debug.l programs/winedbg/debug.l +2 -1

No files found.
--- a/programs/winedbg/dbg.y
+++ b/programs/winedbg/dbg.y
@@ -164,8 +164,6 @@ pathname:

 identifier:
      tIDENTIFIER              { $$ = $1; }
-    | tIDENTIFIER '!' tIDENTIFIER { $$ = lexeme_alloc_size(strlen($1) + 1 + strlen($3) + 1);
-                                       sprintf($$, "%s!%s", $1, $3); }
    ;

 list_arg:

--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -100,6 +100,7 @@ HEXDIGIT   [0-9a-fA-F]
 FORMAT     [ubcdgiswxa]
 IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]*
 SCOPED_IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]*"::"
+MODULE_IDENTIFIER [_a-zA-Z~?\*][_a-zA-Z0-9~?\*@]*"!"
 PATHNAME   [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]*
 STRING     \"(\\[^\n]|[^\\"\n])*\"

@@ -243,7 +244,7 @@ union					{ return tUNION; }
 enum					{ return tENUM; }
 all                                     { return tALL; }

-{SCOPED_IDENTIFIER}*{IDENTIFIER}	{ dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; }
+{MODULE_IDENTIFIER}?{SCOPED_IDENTIFIER}*{IDENTIFIER}	{ dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; }
 "$"{IDENTIFIER}				{ dbg_lval.string = lexeme_alloc(yytext+1); return tINTVAR; }

 <PATH_EXPECTED,PATH_ACCEPTED>{PATHNAME}	{ dbg_lval.string = lexeme_alloc(yytext); return tPATH; }