From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 7 Feb 2014 04:00:10 +0000 (-0500)
Subject: Allow hex numbers to begin with 0x or $ prefix in scanner
X-Git-Tag: v2.0.1~26
X-Git-Url: http://gitweb.hugovil.com/?p=emu8051.git;a=commitdiff_plain;h=f2f9b967b44e9df39b7254d32e74f89d9fda3dfb

Allow hex numbers to begin with 0x or $ prefix in scanner
---

diff --git a/src/cli/scanner.l b/src/cli/scanner.l
index 2839f83..6abaa30 100644
--- a/src/cli/scanner.l
+++ b/src/cli/scanner.l
@@ -5,8 +5,17 @@
   #include "parser.h"
   #include "hexfile.h"
 %}
+
+digit		[0-9]
+alpha		[a-fA-F]
+hextail		({digit}|{alpha}){1,8}
+hex1		0[xX]{hextail}
+hex2		${hextail}
+
 %%
-[0-9]+      { yylval.number = asciihex2int(yytext); return NUMBER; }
+{hex1}      { yylval.number = asciihex2int(yytext); return NUMBER; }
+{hex2}      { yylval.number = asciihex2int(&yytext[1]); return NUMBER; }
+[0-9]+      { yylval.number = atoi(yytext); return NUMBER; }
 [h?]        return TOK_HELP;
 sb          return TOK_SB;
 rb          return TOK_RB;