Changeset 332 for cpp/frams/vm/framscript.l

Timestamp:

02/28/15 03:42:40 (10 years ago)

Author:

Maciej Komosinski

Message:

• use source/code mapping for line number and file information in vm error messages
• mandatory parentheses in typeof()
• int() float() string() added
• typeof() returns plain names of core types instead of numeric constants

short-circuit evaluation of && and

• fixed switch/case fall through (previously each case not ending with break jumped to default: (when present))
• case labels do not have to be constant

File:

• cpp/frams/vm/framscript.l (modified) (4 diffs)

cpp/frams/vm/framscript.l

@@ -33 +33 @@
 \"\"\"             {trctx.tmp=""; trctx.multilimit='\"'; BEGIN multiline;}
 "'''"              {trctx.tmp=""; trctx.multilimit='\''; BEGIN multiline;}
-"@line "[0-9]+\n   {trctx.line=atol(yytext+6);}
-"@file "[^\n\t\r]+\n {trctx.srcname=SString(yytext+6,yyleng-7);}
+"@line "[0-9]+\n   {trctx.line=atol(yytext+6);trctx.linechanged=true;}
+"@file "[^\n\t\r]+\n {trctx.srcname=SString(yytext+6,yyleng-7);trctx.namechanged=true;}
 
 [a-zA-Z_][a-zA-Z0-9_]* { int t=lookupToken(yytext);
@@ -65 +65 @@
 ">>"                return RSHIFT;
 
-<INITIAL,asmcode,asmcode2>\/\/.*\n         {trctx.line++;} // komentarz jednoliniowy
+<INITIAL,asmcode,asmcode2>\/\/.*\n         {trctx.line++;trctx.linechanged=true;} // komentarz jednoliniowy
 <INITIAL,asmcode,asmcode2>\/\/[^\n]*       ;               // komentarz ale nie ma potem \n
 
 <INITIAL>\/\*       BEGIN comment;
-<comment>\n         {trctx.line++;}
+<comment>\n         {trctx.line++;trctx.linechanged=true;}
 <comment>\*\/       BEGIN 0;
 <comment>.          ;
@@ -85 +85 @@
                        trctx.tmp+=SString(yytext,yyleng);
                     }
-<multiline>\n       {trctx.line++; trctx.tmp+="\n";}
+<multiline>\n       {trctx.line++; trctx.linechanged=true; trctx.tmp+="\n";}
 [ \t\r\f]           ;
-\n                  {trctx.line++;}
+\n                  {trctx.line++; trctx.linechanged=true;}
 .                   return yytext[0];
 
@@ -94 +94 @@
                     char *t=yytext;
                     while(t=strchr(t+1,'\n')) trctx.line++;
+                    trctx.linechanged=true;
                     return ASM;
                     }
 <asmcode>.*\n {
               char *t=yytext;
-              trctx.line++;
+              trctx.line++; trctx.linechanged=true;
               while ((*t==' ')||(*t=='\t')) t++;
               if (*t=='}') {yyless((t-yytext)+1); BEGIN 0; return '}';}