X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Ftokenizer.lex;h=c06b2be18d0f9aec98a75d906bde456e319669b0;hb=15e8636a35f6ce15f3753e3363ba0956499b3b25;hp=45c09a8ef5abd8639572755f40bd0fd9e88bd335;hpb=80135f60d8e1f3ffd8270060ab9edb7a224425ea;p=swftools.git

diff --git a/lib/as3/tokenizer.lex b/lib/as3/tokenizer.lex
index 45c09a8..c06b2be 100644
--- a/lib/as3/tokenizer.lex
+++ b/lib/as3/tokenizer.lex
@@ -31,59 +31,42 @@
 #include "tokenizer.h"
 #include "files.h"
 
-static void countlines(char*text, int len) {
-    int t;
-    for(t=0;t<len;t++) {
-	if(text[t]=='\n') {
-	    current_line++;
-	    current_column=0;
-	} else {
-	    current_column++;
-	}
-    }
-}
+int as3_pass = 0;
 
-static int verbose = 1;
-static void dbg(const char*format, ...)
+int as3_verbosity = 1;
+void as3_error(const char*format, ...)
 {
     char buf[1024];
     int l;
     va_list arglist;
-    if(!verbose)
-	return;
+    if(as3_verbosity<0)
+        exit(1);
     va_start(arglist, format);
     vsprintf(buf, format, arglist);
     va_end(arglist);
-    l = strlen(buf);
-    while(l && buf[l-1]=='\n') {
-	buf[l-1] = 0;
-	l--;
-    }
-    printf("(tokenizer) ");
-    printf("%s\n", buf);
-    fflush(stdout);
+    fprintf(stderr, "%s:%d:%d: error: %s\n", current_filename_short, current_line, current_column, buf);
+    fflush(stderr);
+    exit(1);
 }
-
-void syntaxerror(const char*format, ...)
+void as3_warning(const char*format, ...)
 {
     char buf[1024];
     int l;
     va_list arglist;
-    if(!verbose)
-	return;
+    if(as3_verbosity<1)
+        return;
     va_start(arglist, format);
     vsprintf(buf, format, arglist);
     va_end(arglist);
-    fprintf(stderr, "%s:%d:%d: error: %s\n", current_filename_short, current_line, current_column, buf);
+    fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename_short, current_line, current_column, buf);
     fflush(stderr);
-    exit(1);
 }
-void warning(const char*format, ...)
+void as3_softwarning(const char*format, ...)
 {
     char buf[1024];
     int l;
     va_list arglist;
-    if(!verbose)
+    if(as3_verbosity<2)
 	return;
     va_start(arglist, format);
     vsprintf(buf, format, arglist);
@@ -91,6 +74,26 @@ void warning(const char*format, ...)
     fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename_short, current_line, current_column, buf);
     fflush(stderr);
 }
+static void dbg(const char*format, ...)
+{
+    char buf[1024];
+    int l;
+    va_list arglist;
+    if(as3_verbosity<3)
+	return;
+    va_start(arglist, format);
+    vsprintf(buf, format, arglist);
+    va_end(arglist);
+    l = strlen(buf);
+    while(l && buf[l-1]=='\n') {
+	buf[l-1] = 0;
+	l--;
+    }
+    printf("(tokenizer) ");
+    printf("%s\n", buf);
+    fflush(stdout);
+}
+
 
 
 #ifndef YY_CURRENT_BUFFER
@@ -157,6 +160,7 @@ static int do_unescape(const char*s, const char*end, char*n)
         switch(*s) {
 	    case '\\': if(o) o[len] = '\\';s++;len++; break;
 	    case '"': if(o) o[len] = '"';s++;len++; break;
+	    case '\'': if(o) o[len] = '\'';s++;len++; break;
 	    case 'b': if(o) o[len] = '\b';s++;len++; break;
 	    case 'f': if(o) o[len] = '\f';s++;len++; break;
 	    case 'n': if(o) o[len] = '\n';s++;len++; break;
@@ -306,6 +310,11 @@ static inline int setuint(unsigned int v)
     else
         return T_UINT;
 }
+static inline int setfloat(double v)
+{
+    avm2_lval.number_float = v;
+    return T_FLOAT;
+}
 
 static inline int handlefloat()
 {
@@ -320,13 +329,17 @@ static inline int handleint()
     char l = (yytext[0]=='-');
 
     char*max = l?"1073741824":"2147483647";
-    if(yyleng-l>10)
-        syntaxerror("integer overflow");
+    if(yyleng-l>10) {
+        as3_warning("integer overflow: %s (converted to Number)", s);
+        return handlefloat();
+    }
     if(yyleng-l==10) {
         int t;
         for(t=0;t<yyleng-l;t++) {
-            if(yytext[l+t]>max[t])
-                syntaxerror("integer overflow %s > %s", s+l,max);
+            if(yytext[l+t]>max[t]) {
+                as3_warning("integer overflow: %s (converted to Number)", s);
+                return handlefloat();
+            }
             else if(yytext[l+t]<max[t])
                 break;
         }
@@ -345,27 +358,61 @@ static inline int handleint()
     }
 }
 
+static inline int handlehexfloat()
+{
+    char l = (yytext[0]=='-')+2;
+    double d=0;
+    char dot=0;
+    double base=1;
+    int t;
+    for(t=l;t<yyleng;t++) {
+        char c = yytext[t];
+        if(c=='.') {
+            dot=1;
+            continue;
+        }
+        if(!dot) {
+            d*=16;
+        } else {
+            base*=1/16.0;
+        }
+        if(c>='0' && c<='9')
+            d+=(c&15)*base;
+        else if((c>='a' && c<='f') || (c>='A' && c<='F'))
+            d+=((c&0x0f)+9)*base;
+    }
+    return setfloat(d);
+}
 static inline int handlehex()
 {
     char l = (yytext[0]=='-')+2;
+    int len = yyleng;
+
+    if(len-l>8) {
+        char*s = nrbuf();
+        syntaxerror("integer overflow %s", s);
+    }
 
-    if(yyleng-l>8)
-        syntaxerror("integer overflow");
     int t;
     unsigned int v = 0;
-    for(t=l;t<yyleng;t++) {
+    for(t=l;t<len;t++) {
         v<<=4;
         char c = yytext[t];
         if(c>='0' && c<='9')
             v|=(c&15);
-        else if(c>='a' && c<='f' ||
-                c>='A' && c<='F')
+        else if((c>='a' && c<='f') || (c>='A' && c<='F'))
             v|=(c&0x0f)+9;
     }
-    if(l && v>1073741824)
-        syntaxerror("signed integer overflow");
-    if(!l && v>2147483647)
-        syntaxerror("unsigned integer overflow");
+    if(l && v>1073741824) {
+        char*s = nrbuf();
+        as3_warning("signed integer overflow: %s (converted to Number)", s);
+        return setfloat(v);
+    }
+    if(!l && v>2147483647) {
+        char*s = nrbuf();
+        as3_warning("unsigned integer overflow: %s (converted to Number)", s);
+        return setfloat(v);
+    }
 
     if(l==3) {
         return setint(-(int)v);
@@ -379,7 +426,7 @@ void handleLabel(char*text, int len)
     int t;
     for(t=len-1;t>=0;--t) {
         if(text[t]!=' ' &&
-           text[t]!='.')
+           text[t]!=':')
             break;
     }
     char*s = malloc(t+1);
@@ -388,10 +435,47 @@ void handleLabel(char*text, int len)
     avm2_lval.id = s;
 }
 
+static int handleregexp()
+{
+    char*s = malloc(yyleng);
+    int len=yyleng-1;
+    memcpy(s, yytext+1, len);
+    s[len] = 0;
+    int t;
+    for(t=len;t>=0;--t) {
+        if(s[t]=='/') {
+            s[t] = 0;
+            break;
+        }
+    }
+    avm2_lval.regexp.pattern = s;
+    if(t==len) {
+        avm2_lval.regexp.options = 0;
+    } else {
+        avm2_lval.regexp.options = s+t+1;
+    }
+    return T_REGEXP;
+}
+
 void initialize_scanner();
 #define YY_USER_INIT initialize_scanner();
 
-#define c() {countlines(yytext, yyleng);}
+/* count the number of lines+columns consumed by this token */
+static inline void l() {
+    int t;
+    for(t=0;t<yyleng;t++) {
+	if(yytext[t]=='\n') {
+	    current_line++;
+	    current_column=0;
+	} else {
+	    current_column++;
+	}
+    }
+}
+/* count the number of columns consumed by this token */
+static inline void c() {
+    current_column+=yyleng;
+}
 
 //Boolean                      {c();return m(KW_BOOLEAN);}
 //int                          {c();return m(KW_INT);}
@@ -408,10 +492,12 @@ NAME	 [a-zA-Z_][a-zA-Z0-9_\\]*
 _        [^a-zA-Z0-9_\\]
 
 HEXINT    0x[a-zA-Z0-9]+
+HEXFLOAT  0x[a-zA-Z0-9]*\.[a-zA-Z0-9]*
 INT       [0-9]+
 FLOAT     [0-9]+(\.[0-9]*)?|\.[0-9]+
 
 HEXWITHSIGN [+-]?({HEXINT})
+HEXFLOATWITHSIGN [+-]?({HEXFLOAT})
 INTWITHSIGN [+-]?({INT})
 FLOATWITHSIGN [+-]?({FLOAT})
 
@@ -423,35 +509,37 @@ REGEXP   [/]([^/\n]|\\[/])*[/][a-zA-Z]*
 %%
 
 
-{SINGLELINE_COMMENT}         {c(); /* single line comment */}
-{MULTILINE_COMMENT}          {c(); /* multi line comment */}
+{SINGLELINE_COMMENT}         {l(); /* single line comment */}
+{MULTILINE_COMMENT}          {l(); /* multi line comment */}
 [/][*]                       {syntaxerror("syntax error: unterminated comment", yytext);}
 
-^include{S}+{STRING}{S}*/\n    {c();handleInclude(yytext, yyleng, 1);}
-^include{S}+[^" \t\r\n][\x20-\xff]*{S}*/\n    {c();handleInclude(yytext, yyleng, 0);}
-{STRING}                     {c(); BEGIN(INITIAL);handleString(yytext, yyleng);return T_STRING;}
+^include{S}+{STRING}{S}*/\n    {l();handleInclude(yytext, yyleng, 1);}
+^include{S}+[^" \t\r\n][\x20-\xff]*{S}*/\n    {l();handleInclude(yytext, yyleng, 0);}
+{STRING}                     {l(); BEGIN(INITIAL);handleString(yytext, yyleng);return T_STRING;}
 
 <BEGINNING,REGEXPOK>{
-{REGEXP}                     {c(); BEGIN(INITIAL);return m(T_REGEXP);} 
+{REGEXP}                     {c(); BEGIN(INITIAL);return handleregexp();} 
 {HEXWITHSIGN}                {c(); BEGIN(INITIAL);return handlehex();}
+{HEXFLOATWITHSIGN}                {c(); BEGIN(INITIAL);return handlehexfloat();}
 {INTWITHSIGN}                {c(); BEGIN(INITIAL);return handleint();}
 {FLOATWITHSIGN}              {c(); BEGIN(INITIAL);return handlefloat();}
 }
 
 \xef\xbb\xbf                 {/* utf 8 bom */}
-{S}                          {c();}
+{S}                          {l();}
 
 {HEXINT}                     {c(); BEGIN(INITIAL);return handlehex();}
+{HEXFLOAT}                   {c(); BEGIN(INITIAL);return handlehexfloat();}
 {INT}                        {c(); BEGIN(INITIAL);return handleint();}
 {FLOAT}                      {c(); BEGIN(INITIAL);return handlefloat();}
 
 3rr0r                        {/* for debugging: generates a tokenizer-level error */
                               syntaxerror("3rr0r");}
 
-{NAME}{S}*:{S}*for/{_}        {c();handleLabel(yytext, yyleng-3);return T_FOR;}
-{NAME}{S}*:{S}*do/{_}         {c();handleLabel(yytext, yyleng-2);return T_DO;}
-{NAME}{S}*:{S}*while/{_}      {c();handleLabel(yytext, yyleng-5);return T_WHILE;}
-{NAME}{S}*:{S}*switch/{_}     {c();handleLabel(yytext, yyleng-6);return T_SWITCH;}
+{NAME}{S}*:{S}*for/{_}        {l();handleLabel(yytext, yyleng-3);return T_FOR;}
+{NAME}{S}*:{S}*do/{_}         {l();handleLabel(yytext, yyleng-2);return T_DO;}
+{NAME}{S}*:{S}*while/{_}      {l();handleLabel(yytext, yyleng-5);return T_WHILE;}
+{NAME}{S}*:{S}*switch/{_}     {l();handleLabel(yytext, yyleng-6);return T_SWITCH;}
 for                          {c();avm2_lval.id="";return T_FOR;}
 do                           {c();avm2_lval.id="";return T_DO;}
 while                        {c();avm2_lval.id="";return T_WHILE;}
@@ -472,6 +560,7 @@ switch                       {c();avm2_lval.id="";return T_SWITCH;}
 [/][=]                       {c();return m(T_DIVBY);}
 [%][=]                       {c();return m(T_MODBY);}
 [*][=]                       {c();return m(T_MULBY);}
+[|][=]                       {c();return m(T_ORBY);}
 [>][>][=]                    {c();return m(T_SHRBY);}
 [<][<][=]                    {c();return m(T_SHLBY);}
 [>][>][>][=]                 {c();return m(T_USHRBY);}
@@ -493,6 +582,7 @@ continue                     {c();return m(KW_CONTINUE);}
 override                     {c();return m(KW_OVERRIDE);}
 internal                     {c();return m(KW_INTERNAL);}
 function                     {c();return m(KW_FUNCTION);}
+finally                      {c();return m(KW_FINALLY);}
 default                      {c();return m(KW_DEFAULT);}
 package                      {c();return m(KW_PACKAGE);}
 private                      {c();return m(KW_PRIVATE);}
@@ -519,6 +609,7 @@ true                         {c();return m(KW_TRUE);}
 null                         {c();return m(KW_NULL);}
 else                         {c();return m(KW_ELSE);}
 case                         {c();return m(KW_CASE);}
+with                         {c();return m(KW_WITH);}
 use                          {c();return m(KW_USE);}
 new                          {c();return m(KW_NEW);}
 get                          {c();return m(KW_GET);}
@@ -532,7 +623,7 @@ as                           {c();return m(KW_AS);}
 {NAME}                       {c();BEGIN(INITIAL);return mkid(T_IDENTIFIER);}
 
 [+-\/*^~@$!%&\(=\[\]\{\}|?:;,<>] {c();BEGIN(REGEXPOK);return m(yytext[0]);}
-[\)\]]                            {c();BEGIN(INITIAL);return m(yytext[0]);}
+[\)\]]                           {c();BEGIN(INITIAL);return m(yytext[0]);}
 
 .		             {char c1=yytext[0];
                               char buf[128];
@@ -553,7 +644,7 @@ as                           {c();return m(KW_AS);}
 			      exit(1);
 		              yyterminate();
 		             }
-<<EOF>>		             {c();
+<<EOF>>		             {l();
                               void*b = leave_file();
 			      if (!b) {
 			         yyterminate();