Add proper error checking in asciihex2int functions

[emu8051.git] / src / cli / scanner.l

diff --git a/src/cli/scanner.l b/src/cli/scanner.l
index 6abaa30..919d71e 100644 (file)
--- a/src/cli/scanner.l
+++ b/src/cli/scanner.l
@@ -2,8 +2,13 @@
 %option noinput
 %option nounput
 %{
+  #include "menu.h"
   #include "parser.h"
   #include "hexfile.h"
+
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max_size) result = menu_get_input(buf, max_size);
+
 %}
 
 digit          [0-9]
@@ -12,9 +17,26 @@ hextail              ({digit}|{alpha}){1,8}
 hex1           0[xX]{hextail}
 hex2           ${hextail}
 
+
 %%
-{hex1}      { yylval.number = asciihex2int(yytext); return NUMBER; }
-{hex2}      { yylval.number = asciihex2int(&yytext[1]); return NUMBER; }
+{hex1}      {
+                /*
+                 * No need to check return value of asciihex2int, because lex
+                 * always passes a valid ASCII hex string.
+                 */
+                yylval.number = asciihex2int(&yytext[2]); /* Skip "0x" prefix */
+                return NUMBER;
+            }
+{hex2}      {
+                /*
+                 * No need to check return value of asciihex2int, because lex
+                 * always passes a valid ASCII hex string.
+                 */
+                yylval.number = asciihex2int(&yytext[1]); /* Skip "$" prefix */
+                return NUMBER;
+            }
+
+
 [0-9]+      { yylval.number = atoi(yytext); return NUMBER; }
 [h?]        return TOK_HELP;
 sb          return TOK_SB;
@@ -25,16 +47,20 @@ di          return TOK_DI;
 dp          return TOK_DP;
 dr          return TOK_DR;
 r           return TOK_RUN;
-me          return TOK_MOD_EXT;
-mi          return TOK_MOD_INT;
-mp          return TOK_MOD_PROG;
-mr          return TOK_MOD_REG;
 q           return TOK_QUIT;
 s           return TOK_STEP;
 u           return TOK_UNASM;
+we          return TOK_MOD_EXT;
+wi          return TOK_MOD_INT;
+wp          return TOK_MOD_PROG;
+wr          return TOK_MOD_REG;
 z           return TOK_RST;
 zt          return TOK_RST_TIMER;
 all         return TOK_ALL;
+a           return TOK_A;
+b           return TOK_B;
+c           return TOK_C;
+d           return TOK_D;
 [a-z0-9]+   { yylval.string = strdup(yytext); return WORD; }
 [\n]        return TOK_ENTER;
 [ \t]+      { /* ignore whitespace */ }