X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Ftokenizer.lex;h=d2e277c91029c34c3d9287c439aafb04af5bcb11;hb=6a35c7253ba161c50a18ecc86e46d0b3ead9a2a0;hp=304df5356385941bb2d9b16f3e8bc5f3a8b5754f;hpb=30a768f43ce83c2bd181c899b8c747c8c2a9ce08;p=swftools.git diff --git a/lib/as3/tokenizer.lex b/lib/as3/tokenizer.lex index 304df53..d2e277c 100644 --- a/lib/as3/tokenizer.lex +++ b/lib/as3/tokenizer.lex @@ -129,16 +129,13 @@ void handleInclude(char*text, int len, char quotes) //BEGIN(INITIAL); keep context } -string_t string_unescape(const char*in, int l) +static int do_unescape(const char*s, const char*end, char*n) { - int len=0; - const char*s = in; - const char*end = &in[l]; - char*n = (char*)malloc(l); char*o = n; + int len=0; while(s256) syntaxerror("octal number out of range (0-255): %d", num); - o[len++] = num; + if(o) o[len] = num;len++; continue; } case 'x': case 'u': { @@ -214,12 +211,12 @@ string_t string_unescape(const char*in, int l) if(unicode) { char*utf8 = getUTF8(num); while(*utf8) { - o[len++] = *utf8++; + if(o) o[len] = *utf8;utf8++;len++; } } else { if(num>256) syntaxerror("byte out of range (0-255): %d", num); - o[len++] = num; + if(o) o[len] = num;len++; } break; } @@ -227,8 +224,19 @@ string_t string_unescape(const char*in, int l) syntaxerror("unknown escape sequence: \"\\%c\"", *s); } } + if(o) o[len]=0; + return len; +} + +static string_t string_unescape(const char*in, int l) +{ + const char*s = in; + const char*end = &in[l]; + + int len = do_unescape(s, end, 0); + char*n = (char*)malloc(len+1); + do_unescape(s, end, n); string_t out = string_new(n, len); - o[len]=0; return out; } @@ -298,6 +306,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() { @@ -312,8 +325,10 @@ static inline int handleint() char l = (yytext[0]=='-'); char*max = l?"1073741824":"2147483647"; - if(yyleng-l>10) - syntaxerror("integer overflow"); + if(yyleng-l>10) { + warning("integer overflow: %s", s); + return handlefloat(); + } if(yyleng-l==10) { int t; for(t=0;t8) - syntaxerror("integer overflow"); + if(yyleng-l>8) { + char*s = nrbuf(); + syntaxerror("integer overflow %s", s); + } + int t; unsigned int v = 0; for(t=l;t='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(); + warning("signed integer overflow: %s", s); + return setfloat(v); + } + if(!l && v>2147483647) { + char*s = nrbuf(); + warning("unsigned integer overflow: %s", s); + return setfloat(v); + } if(l==3) { return setint(-(int)v); @@ -366,6 +390,20 @@ static inline int handlehex() } } +void handleLabel(char*text, int len) +{ + int t; + for(t=len-1;t>=0;--t) { + if(text[t]!=' ' && + text[t]!='.') + break; + } + char*s = malloc(t+1); + memcpy(s, yytext, t); + s[t]=0; + avm2_lval.id = s; +} + void initialize_scanner(); #define YY_USER_INIT initialize_scanner(); @@ -375,12 +413,15 @@ void initialize_scanner(); //int {c();return m(KW_INT);} //uint {c();return m(KW_UINT);} //Number {c();return m(KW_NUMBER);} + + %} %s REGEXPOK %s BEGINNING NAME [a-zA-Z_][a-zA-Z0-9_\\]* +_ [^a-zA-Z0-9_\\] HEXINT 0x[a-zA-Z0-9]+ INT [0-9]+ @@ -423,6 +464,15 @@ REGEXP [/]([^/\n]|\\[/])*[/][a-zA-Z]* 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;} +for {c();avm2_lval.id="";return T_FOR;} +do {c();avm2_lval.id="";return T_DO;} +while {c();avm2_lval.id="";return T_WHILE;} +switch {c();avm2_lval.id="";return T_SWITCH;} + [&][&] {c();BEGIN(REGEXPOK);return m(T_ANDAND);} [|][|] {c();BEGIN(REGEXPOK);return m(T_OROR);} [!][=] {c();BEGIN(REGEXPOK);return m(T_NE);} @@ -438,6 +488,7 @@ REGEXP [/]([^/\n]|\\[/])*[/][a-zA-Z]* [/][=] {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);} @@ -449,14 +500,17 @@ REGEXP [/]([^/\n]|\\[/])*[/][a-zA-Z]* \. {c();return m('.');} :: {c();return m(T_COLONCOLON);} : {c();return m(':');} +instanceof {c();return m(KW_INSTANCEOF);} implements {c();return m(KW_IMPLEMENTS);} interface {c();return m(KW_INTERFACE);} namespace {c();return m(KW_NAMESPACE);} protected {c();return m(KW_PROTECTED);} undefined {c();return m(KW_UNDEFINED);} +continue {c();return m(KW_CONTINUE);} override {c();return m(KW_OVERRIDE);} internal {c();return m(KW_INTERNAL);} function {c();return m(KW_FUNCTION);} +default {c();return m(KW_DEFAULT);} package {c();return m(KW_PACKAGE);} private {c();return m(KW_PRIVATE);} dynamic {c();return m(KW_DYNAMIC);} @@ -468,24 +522,29 @@ native {c();return m(KW_NATIVE);} static {c();return m(KW_STATIC);} import {c();return m(KW_IMPORT);} typeof {c();return m(KW_TYPEOF);} -while {c();return m(KW_WHILE);} +throw {c();return m(KW_THROW);} class {c();return m(KW_CLASS);} const {c();return m(KW_CONST);} +catch {c();return m(KW_CATCH);} final {c();return m(KW_FINAL);} false {c();return m(KW_FALSE);} break {c();return m(KW_BREAK);} super {c();return m(KW_SUPER);} +each {c();return m(KW_EACH);} void {c();return m(KW_VOID);} 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);} -for {c();return m(KW_FOR);} set {c();return m(KW_SET);} var {c();return m(KW_VAR);} +try {c();return m(KW_TRY);} is {c();return m(KW_IS) ;} +in {c();return m(KW_IN) ;} if {c();return m(KW_IF) ;} as {c();return m(KW_AS);} {NAME} {c();BEGIN(INITIAL);return mkid(T_IDENTIFIER);} @@ -574,7 +633,6 @@ char*token2string(enum yytokentype nr, YYSTYPE v) else if(nr==KW_INT) return "int"; else if(nr==KW_NEW) return "new"; else if(nr==KW_GET) return "get"; - else if(nr==KW_FOR) return "for"; else if(nr==KW_SET) return "set"; else if(nr==KW_VAR) return "var"; else if(nr==KW_IS) return "is";