Alexandre Julliard : Revert "winedbg: Remove useless NOCMD state."

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jun 7 07:48:47 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: dbd566d54506d9fd677ca32423034df6bdf14c3f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=dbd566d54506d9fd677ca32423034df6bdf14c3f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  6 17:15:31 2006 +0200

Revert "winedbg: Remove useless NOCMD state."

This reverts 92deacbe425bfd986a2cc3bf1e776aca02cf08c8 commit.

---

 programs/winedbg/debug.l |   51 +++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l
index 458c006..cb2a564 100644
--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -89,6 +89,7 @@ STRING     \"[^\n"]+\"
 %s SHOW_CMD
 %s MODE_CMD
 %s MAINT_CMD
+%s NOCMD
 
 %x ASTRING_EXPECTED
 %x NOPROCESS
@@ -134,52 +135,52 @@ STRING     \"[^\n"]+\"
                                           yylval.string = lexeme_alloc(p); return tSTRING; }
 
 <INITIAL,NOPROCESS>info|inf|in		{ BEGIN(INFO_CMD); return tINFO; }
-<INITIAL>up				{ return tUP; }
-<INITIAL>down|dow|do			{ return tDOWN; }
-<INITIAL>frame|fram|fra|fr		{ return tFRAME; }
+<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>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 { return tDISASSEMBLE; }
+<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { BEGIN(NOCMD); return tDISASSEMBLE; }
 <INITIAL>locally|local			{ BEGIN(LOCAL_CMD); return tLOCAL; }
 <INITIAL,LOCAL_CMD>display|displa|displ|disp	{ BEGIN(FORMAT_EXPECTED); return tDISPLAY; }
-<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d	{ return tDISPLAY; }
-<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und	{ return tUNDISPLAY; }
+<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d	{ BEGIN(NOCMD); return tDISPLAY; }
+<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und	{ BEGIN(NOCMD); return tUNDISPLAY; }
 <INITIAL>delete|delet|dele|del		{ BEGIN(BD_CMD); return tDELETE; }
-<INITIAL,NOPROCESS>quit|qui|qu|q	{ return tQUIT; }
-<INITIAL>set|se				{ return tSET; }
+<INITIAL,NOPROCESS>quit|qui|qu|q	{ BEGIN(NOCMD); return tQUIT; }
+<INITIAL>set|se				{ BEGIN(NOCMD); return tSET; }
 <INITIAL>x				{ BEGIN(FORMAT_EXPECTED); return tEXAM; }
 <INITIAL,NOPROCESS>help|hel|he|"?"	{ BEGIN(HELP_CMD); return tHELP; }
 
-<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { return tBACKTRACE; }
-<INITIAL,NOPROCESS>where|wher|whe       { return tBACKTRACE; }
+<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; }
+<INITIAL,NOPROCESS>where|wher|whe       { BEGIN(NOCMD); return tBACKTRACE; }
 
-<INITIAL>cont|con|co|c   		{ return tCONT; }
-<INITIAL>pass|pas|pa   			{ return tPASS; }
-<INITIAL>condition|conditio|conditi|condit|condi|cond	{ return tCOND; }
-<INITIAL>step|ste|st|s   		{ return tSTEP; }
-<INITIAL>next|nex|ne|n   		{ return tNEXT; }
-<INITIAL>stepi|si	   		{ return tSTEPI; }
-<INITIAL>nexti|ni	   		{ return tNEXTI; }
-<INITIAL>finish|finis|fini|fin|fi	{ return tFINISH; }
+<INITIAL>cont|con|co|c   		{ BEGIN(NOCMD); return tCONT; }
+<INITIAL>pass|pas|pa   			{ BEGIN(NOCMD); return tPASS; }
+<INITIAL>condition|conditio|conditi|condit|condi|cond	{ BEGIN(NOCMD); return tCOND; }
+<INITIAL>step|ste|st|s   		{ BEGIN(NOCMD); return tSTEP; }
+<INITIAL>next|nex|ne|n   		{ BEGIN(NOCMD); return tNEXT; }
+<INITIAL>stepi|si	   		{ BEGIN(NOCMD); return tSTEPI; }
+<INITIAL>nexti|ni	   		{ BEGIN(NOCMD); return tNEXTI; }
+<INITIAL>finish|finis|fini|fin|fi	{ BEGIN(NOCMD); return tFINISH; }
 
-<INITIAL>abort|abor|abo         	{ return tABORT; }
+<INITIAL>abort|abor|abo         	{ BEGIN(NOCMD); return tABORT; }
 <INITIAL>print|prin|pri|pr|p		{ BEGIN(FORMAT_EXPECTED); return tPRINT; }
 
 <INITIAL>show|sho|sh			{ BEGIN(SHOW_CMD); return tSHOW; }
 <INITIAL,NOPROCESS>source|sourc|sour|src { BEGIN(PATH_EXPECTED); return tSOURCE; }
 <INITIAL>symbolfile|symbols|symbol|sf   { BEGIN(PATH_EXPECTED); return tSYMBOLFILE; }
 
-<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b	{ return tBREAK; }
-<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { return tHBREAK; }
-<INITIAL>watch|watc|wat			{ return tWATCH; }
-<INITIAL>whatis|whati|what		{ return tWHATIS; }
+<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b	{ BEGIN(NOCMD); return tBREAK; }
+<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; }
+<INITIAL>watch|watc|wat			{ BEGIN(NOCMD); return tWATCH; }
+<INITIAL>whatis|whati|what		{ BEGIN(NOCMD); return tWHATIS; }
 <INITIAL,NOPROCESS>run|ru|r     	{ BEGIN(ASTRING_EXPECTED); return tRUN;}
-<INITIAL>detach|detac|deta|det   	{ return tDETACH; }
+<INITIAL>detach|detac|deta|det   	{ BEGIN(NOCMD); return tDETACH; }
 <INITIAL>maintenance|maint              { BEGIN(MAINT_CMD); return tMAINTENANCE; }
 <INITIAL>minidump|mdmp                  { BEGIN(PATH_EXPECTED); return tMINIDUMP; }
 <INITIAL>echo				{ BEGIN(ASTRING_EXPECTED); return tECHO; }
-<NOPROCESS>attach|attac|atta|att 	{ return tATTACH; }
+<NOPROCESS>attach|attac|atta|att 	{ BEGIN(NOCMD); return tATTACH; }
 <INFO_CMD>share|shar|sha		{ return tSHARE; }
 <INFO_CMD>locals|local|loca|loc		{ return tLOCAL; }
 <INFO_CMD>class|clas|cla                { return tCLASS; }




More information about the wine-cvs mailing list