Changeset 468

Timestamp:

02/08/16 21:15:53 (9 years ago)

Author:

Maciej Komosinski

Message:

More sophisticated and accurate parsing of numbers

Location:

cpp/frams/vm

Files:

• framscript.l (modified) (1 diff)
• framscript.y (modified) (1 diff)

cpp/frams/vm/framscript.l

@@ -23 +23 @@
 %%
 
-\$[0-9a-fA-F]+ {int i; sscanf(yytext+1,"%x",&i); framscriptlval.setInt(i); return CONSTANT;}
-0x[0-9a-fA-F]+ {int i; sscanf(yytext+2,"%x",&i); framscriptlval.setInt(i); return CONSTANT;}
-[0-9]+\.[0-9]*    {framscriptlval.setDouble(atof(yytext)); return CONSTANT;}
-[0-9]+            {framscriptlval.setInt(atoi(yytext)); return CONSTANT;}
-[0-9]+\.[0-9]*[eE][+-]?[0-9]+    {framscriptlval.setDouble(atof(yytext)); return CONSTANT;}
-[0-9]+*[eE][+-]?[0-9]+           {framscriptlval.setDouble(atof(yytext)); return CONSTANT;}
+[0-9]+\.[0-9]*                   |
+[0-9]+\.[0-9]*[eE][+-]?[0-9]+    |
+[0-9]+*[eE][+-]?[0-9]+           {if (framscriptlval.parseNumber(yytext,TDouble)==(yytext+yyleng)) return CONSTANT; else { trctx.err->printf("Invalid floating point number: '%s', ",SString(yytext,yyleng).c_str()); return INVALID_NUMBER;} }
+
+[0-9]+                |
+0x[0-9a-fA-F]+        {if (framscriptlval.parseNumber(yytext,TInt)==(yytext+yyleng)) return CONSTANT; else { trctx.err->printf("Invalid integer: '%s', ",SString(yytext,yyleng).c_str()); return INVALID_NUMBER;} }
+
 "null"            {framscriptlval.setEmpty(); return CONSTANT;}
 \"([^\\\"]|\\.)*\" {framscriptlval.setString(SString(yytext+1,yyleng-2));return CONSTANT;}

cpp/frams/vm/framscript.y

@@ -37 +37 @@
 
 %token CONSTANT
+%token INVALID_NUMBER
 
 %nonassoc ASSIGN_ADD ASSIGN_SUB ASSIGN_MUL ASSIGN_DIV ASSIGN_MOD