Dylan Smith : winedbg: Prevent syntax errors for list command due to the lexer.

[Alexandre Julliard]

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

Author: Dylan Smith 
Date:   Sat Aug 22 01:57:29 2009 -0400

winedbg: Prevent syntax errors for list command due to the lexer.

The list command allows more than just a pathname, but since a pathname
allows such a wide range of characters, it will prevent other parameters
from getting parsed properly (e.g. a start line number). This even
interfered with the usage of pathname for the list command, since the
command typically includes a line number within the file.

---

programs/winedbg/debug.l |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l
index 4332989..0697f60 100644
--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -111,11 +111,10 @@ DIGIT	   [0-9]
 HEXDIGIT   [0-9a-fA-F]
 FORMAT     [ubcdgiswx]
 IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]*
-PATHNAME   [\/-_a-zA-Z0-9.~@]+
+PATHNAME   [\/_a-zA-Z0-9.~@][\/-_a-zA-Z0-9.~@]*
 STRING     "[^\n"]+"

%s FORMAT_EXPECTED
-%s PATH_EXPECTED
 %s INFO_CMD
 %s HELP_CMD
 %s BD_CMD
@@ -124,7 +123,9 @@ STRING     "[^\n"]+"
 %s MODE_CMD
 %s MAINT_CMD
 %s NOCMD
+%s PATH_ACCEPTED

+%x PATH_EXPECTED
 %x ASTRING_EXPECTED
 %x NOPROCESS
 %%
@@ -135,11 +136,6 @@ STRING     "[^\n"]+"
 <*>\n		                        { BEGIN(INITIAL); syntax_error = 0; return tEOL; }
                                         /* Indicates end of command. Reset state. */

-                                        /* This rule must precede the ones below, */
-                                        /* otherwise paths like '/' or '0x9' would */
-                                        /* get parsed as an operator or tNUM */
-<PATH_EXPECTED>{PATHNAME}		{ dbg_lval.string = lexeme_alloc(yytext); return tPATH; }
-
 "||"					{ return OP_LOR; }
 "&&"					{ return OP_LAND; }
 "=="					{ return OP_EQ; }
@@ -150,7 +146,6 @@ STRING     "[^\n"]+"
 ">>"					{ return OP_SHR; }
 "->"					{ return OP_DRF; }
 "::"					{ return OP_SCOPE; }
-[-+<=>|&^()*/%:!~,.]			{ return *yytext; }
 "["					{ return *yytext; }
 "]"					{ return *yytext; }

@@ -172,7 +167,7 @@ STRING     "[^\n"]+"
 <INITIAL>up				{ BEGIN(NOCMD); return tUP; }
 <INITIAL>down|dow|do			{ BEGIN(NOCMD); return tDOWN; }
 <INITIAL>frame|fram|fra|fr		{ BEGIN(NOCMD); return tFRAME; }
-<INITIAL>list|lis|li|l			{ BEGIN(PATH_EXPECTED); return tLIST; }
+<INITIAL>list|lis|li|l			{ BEGIN(PATH_ACCEPTED); return tLIST; }
 <INITIAL>enable|enabl|enab|ena		{ BEGIN(BD_CMD); return tENABLE;}
 <INITIAL>disable|disabl|disab|disa|dis  { BEGIN(BD_CMD); return tDISABLE; }
 <INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { BEGIN(NOCMD); return tDISASSEMBLE; }
@@ -253,6 +248,10 @@ all                                     { return tALL; }
 {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; }
+
+[-+<=>|&^()*/%:!~,.]			{ return *yytext; }
+
 <*>[ \t\r]+                             /* Eat up whitespace and DOS LF */

<NOPROCESS>.                            { BEGIN(ASTRING_EXPECTED); yyless(0); return tNOPROCESS;}