X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=319bd8021b5df2fc88b254cfc9380aea1068cf2b;hb=587e0f9b99afe95e4e758960074c594a81e323b0;hp=89d80ecb15e22e33dc9b11b80defa4157c087a20;hpb=6ead8227212dc074744a3a4282a6a572d120fecc;p=swftools.git diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 89d80ec..319bd80 100644 --- a/lib/as3/parser.y +++ b/lib/as3/parser.y @@ -103,6 +103,7 @@ %token KW_WHILE "while" %token KW_NUMBER "Number" %token KW_STRING "String" +%token KW_DELETE "delete" %token KW_IF "if" %token KW_ELSE "else" %token KW_BREAK "break" @@ -132,9 +133,6 @@ %token T_SHL "<<" %token T_USHR ">>>" %token T_SHR ">>" -%token T_SEMICOLON ';' -%token T_STAR '*' -%token T_DOT '.' %type X_IDENTIFIER PACKAGE %type VARCONST @@ -150,7 +148,7 @@ %type VOIDEXPRESSION %type EXPRESSION NONCOMMAEXPRESSION %type MAYBEEXPRESSION -%type E +%type E DELETE %type CONSTANT %type FOR IF WHILE MAYBEELSE BREAK RETURN %type USE_NAMESPACE @@ -180,45 +178,38 @@ %type MAYBE_EXPRESSION_LIST EXPRESSION_LIST MAYBE_PARAM_VALUES // precedence: from low to high -// http://livedocs.adobe.com/flash/9.0/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00000012.html %left prec_none + +%left below_semicolon +%left ';' +%left ',' +%right '=' "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|=" %right '?' ':' -%right '=' "/=" "%=" "*=" "+=" "-=" ">>=" "<<=" ">>>=" %left "||" %left "&&" %nonassoc '|' %nonassoc '^' %nonassoc '&' -%nonassoc "!=" "==" "===" "<=" '<' ">=" '>' // TODO: support "a < b < c" syntax? -%nonassoc "is" -%left prec_belowminus -%left '-' -%left '+' -%left "<<" -%left ">>>" -%left ">>" -%left '%' -%left '/' -%left '*' -%left '!' -%left '~' -%left "--" "++" -%left '[' -%nonassoc "as" -%left '.' ".." "::" +%nonassoc "==" "!=" "===" "!==" +%nonassoc "<=" '<' ">=" '>' "instanceof" // TODO: support "a < b < c" syntax? +%left "<<" ">>" ">>>" +%left below_minus +%left '-' '+' +%left '/' '*' '%' +%left plusplus_prefix minusminus_prefix '~' '!' "delete" "typeof" //FIXME: *unary* + - should be here, too +%left "--" "++" +%nonassoc "is" "as" +%left '[' ']' '{' "new" '.' ".." "::" %nonassoc T_IDENTIFIER -%left below_semicolon -%left ';' +%left below_else %nonassoc "else" %left '(' // needed for "return" precedence: %nonassoc T_STRING T_REGEXP %nonassoc T_INT T_UINT T_BYTE T_SHORT T_FLOAT -%nonassoc "new" "false" "true" "null" - -%left prec_highest +%nonassoc "false" "true" "null" %{ @@ -764,16 +755,18 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n multiname_t mname = {QNAME, &mname_ns, 0, name}; multiname_t*type2 = sig2mname(return_type); + int slot = 0; if(!strcmp(state->clsinfo->name,name)) { state->m = abc_class_constructor(state->cls, type2); + name = "__as3_constructor__"; } else { if(flags&FLAG_STATIC) state->m = abc_class_staticmethod(state->cls, type2, &mname); else state->m = abc_class_method(state->cls, type2, &mname); - int slot = state->m->trait->slot_id; - state->minfo = registerfunction(getset, flags, name, params, return_type, slot); + slot = state->m->trait->slot_id; } + state->minfo = registerfunction(getset, flags, name, params, return_type, slot); if(getset == KW_GET) state->m->trait->kind = TRAIT_GETTER; if(getset == KW_SET) state->m->trait->kind = TRAIT_SETTER; @@ -796,7 +789,7 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } /* state->vars is initialized by state_new */ - if(new_variable("this", state->clsinfo)!=0) syntaxerror("Internal error"); + if(new_variable((flags&FLAG_STATIC)?"class":"this", state->clsinfo)!=0) syntaxerror("Internal error"); for(p=params->list;p;p=p->next) { new_variable(p->param->name, p->param->type); @@ -901,6 +894,8 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) } if(TYPE_IS_FUNCTION(from) && TYPE_IS_FUNCTION(to)) return c; + if(TYPE_IS_CLASS(from) && TYPE_IS_CLASS(to)) + return c; syntaxerror("can't convert type %s to %s", from->name, to->name); } @@ -926,6 +921,40 @@ void parserassert(int b) if(!b) syntaxerror("internal error: assertion failed"); } +static classinfo_t* find_class(char*name) +{ + classinfo_t*c=0; + + c = registry_findclass(state->package, name); + + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(c) + break; + if(!strcmp(e->key, name)) { + c = (classinfo_t*)e->data; + } + e = e->next; + } + + /* try package.* imports */ + import_list_t*l = state->wildcard_imports; + while(l) { + if(c) + break; + //printf("does package %s contain a class %s?\n", l->import->package, name); + c = registry_findclass(l->import->package, name); + l = l->next; + } + + /* try global package */ + if(!c) { + c = registry_findclass("", name); + } + return c; +} + static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore) { /* converts this: @@ -961,12 +990,26 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETPROPERTY; multiname_t*m = (multiname_t*)r->data[0]; write->data[0] = multiname_clone(m); - if(m->type != QNAME && m->type != MULTINAME) - syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname)"); - if(!justassign) { - prefix = abc_dup(prefix); // we need the object, too + if(m->type == QNAME || m->type == MULTINAME) { + if(!justassign) { + prefix = abc_dup(prefix); // we need the object, too + } + use_temp_var = 1; + } else if(m->type == MULTINAMEL) { + if(!justassign) { + /* dupping two values on the stack requires 5 operations and one register- + couldn't adobe just have given us a dup2? */ + int temp = gettempvar(); + prefix = abc_setlocal(prefix, temp); + prefix = abc_dup(prefix); + prefix = abc_getlocal(prefix, temp); + prefix = abc_swap(prefix); + prefix = abc_getlocal(prefix, temp); + } + use_temp_var = 1; + } else { + syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname/multiname)"); } - use_temp_var = 1; } else if(r->opcode == OPCODE_GETSLOT) { write->opcode = OPCODE_SETSLOT; write->data[0] = r->data[0]; @@ -1056,6 +1099,8 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r return c; } +#define IS_INT(a) (TYPE_IS_INT((a).t) || TYPE_IS_UINT((a).t)) +#define BOTH_INT(a,b) (IS_INT(a) && IS_INT(b)) %} @@ -1066,7 +1111,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r PROGRAM: MAYBECODE -MAYBECODE: CODE {$$=$1;} +MAYBECODE: CODE {$$=$1;/*TODO: do something with this code if we're not in a function*/} MAYBECODE: {$$=code_new();} CODE: CODE CODEPIECE {$$=code_append($1,$2);} @@ -1153,7 +1198,7 @@ ONE_VARIABLE: {} T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION /* ------------ control flow ------------------------- */ -MAYBEELSE: %prec prec_none {$$ = code_new();} +MAYBEELSE: %prec below_else {$$ = code_new();} MAYBEELSE: "else" CODEBLOCK {$$=$2;} //MAYBEELSE: ';' "else" CODEBLOCK {$$=$3;} @@ -1326,18 +1371,18 @@ SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER MAYBETYPE MAYBEEXPRESSIO if($4) { MULTINAME(m, $4); t=abc_class_slot(state->cls, &mname, &m); - info->slot = t->slot_id; } else { t=abc_class_slot(state->cls, &mname, 0); } + info->slot = t->slot_id; } else { if($4) { MULTINAME(m, $4); t=abc_class_staticslot(state->cls, &mname, &m); - //info->slot = t->slot_id; } else { t=abc_class_staticslot(state->cls, &mname, 0); } + info->slot = t->slot_id; } if($5.c && !is_pushundefined($5.c)) { code_t*c = 0; @@ -1430,34 +1475,7 @@ FUNCTION_DECLARATION: MAYBE_MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_P CLASS: T_IDENTIFIER { /* try current package */ - $$ = registry_findclass(state->package, $1); - - /* try explicit imports */ - dictentry_t* e = dict_get_slot(state->imports, $1); - while(e) { - if($$) - break; - if(!strcmp(e->key, $1)) { - $$ = (classinfo_t*)e->data; - } - e = e->next; - } - - /* try package.* imports */ - import_list_t*l = state->wildcard_imports; - while(l) { - if($$) - break; - //printf("does package %s contain a class %s?\n", l->import->package, $1); - $$ = registry_findclass(l->import->package, $1); - l = l->next; - } - - /* try global package */ - if(!$$) { - $$ = registry_findclass("", $1); - } - + $$ = find_class($1); if(!$$) syntaxerror("Could not find class %s\n", $1); } @@ -1483,7 +1501,7 @@ TYPE : QNAME {$$=$1;} MAYBETYPE: ':' TYPE {$$=$2;} MAYBETYPE: {$$=0;} -/* ----------function calls, constructor calls ------ */ +/* ----------function calls, delete, constructor calls ------ */ MAYBE_PARAM_VALUES : %prec prec_none {$$=0;} MAYBE_PARAM_VALUES : '(' MAYBE_EXPRESSION_LIST ')' {$$=$2} @@ -1503,8 +1521,12 @@ NEW : "new" CLASS MAYBE_PARAM_VALUES { MULTINAME(m, $2); $$.c = code_new(); - /* TODO: why do we have to *find* our own classes? */ - $$.c = abc_findpropstrict2($$.c, &m); + if($2->slot) { + $$.c = abc_getglobalscope($$.c); + $$.c = abc_getslot($$.c, $2->slot); + } else { + $$.c = abc_findpropstrict2($$.c, &m); + } typedcode_list_t*l = $3; int len = 0; @@ -1513,7 +1535,10 @@ NEW : "new" CLASS MAYBE_PARAM_VALUES { l = l->next; len ++; } - $$.c = abc_constructprop2($$.c, &m, len); + if($2->slot) + $$.c = abc_construct($$.c, len); + else + $$.c = abc_constructprop2($$.c, &m, len); $$.t = $2; } @@ -1572,6 +1597,27 @@ FUNCTIONCALL : E '(' MAYBE_EXPRESSION_LIST ')' { } } +DELETE: "delete" E { + $$.c = $2.c; + if($$.c->opcode == OPCODE_COERCE_A) { + $$.c = code_cutlast($$.c); + } + multiname_t*name = 0; + if($$.c->opcode == OPCODE_GETPROPERTY) { + $$.c->opcode = OPCODE_DELETEPROPERTY; + } else if($$.c->opcode == OPCODE_GETSLOT) { + int slot = (int)(ptroff_t)$$.c->data[0]; + multiname_t*name = abc_class_find_slotid(state->cls,slot)->name; + $$.c = code_cutlast($$.c); + $$.c = abc_deleteproperty2($$.c, name); + } else { + $$.c = abc_getlocal_0($$.c); + MULTINAME_LATE(m, $2.t?$2.t->access:ACCESS_PACKAGE, ""); + $$.c = abc_deleteproperty2($$.c, &m); + } + $$.t = TYPE_BOOLEAN; +} + RETURN: "return" %prec prec_none { $$ = abc_returnvoid(0); } @@ -1579,23 +1625,25 @@ RETURN: "return" EXPRESSION { $$ = $2.c; $$ = abc_returnvalue($$); } + // ----------------------- expression types ------------------------------------- -NONCOMMAEXPRESSION : E %prec prec_belowminus {$$=$1;} -EXPRESSION : E %prec prec_belowminus {$$ = $1;} -EXPRESSION : EXPRESSION ',' E %prec prec_belowminus { +NONCOMMAEXPRESSION : E %prec below_minus {$$=$1;} +EXPRESSION : E %prec below_minus {$$ = $1;} +EXPRESSION : EXPRESSION ',' E %prec below_minus { $$.c = $1.c; $$.c = cut_last_push($$.c); $$.c = code_append($$.c,$3.c); $$.t = $3.t; } -VOIDEXPRESSION : EXPRESSION %prec prec_belowminus {$$=cut_last_push($1.c);} +VOIDEXPRESSION : EXPRESSION %prec below_minus {$$=cut_last_push($1.c);} // ----------------------- expression evaluation ------------------------------------- E : CONSTANT E : VAR_READ %prec T_IDENTIFIER {$$ = $1;} E : NEW {$$ = $1;} +E : DELETE {$$ = $1;} E : T_REGEXP {$$.c = abc_pushundefined(0); /* FIXME */ $$.t = TYPE_ANY; } @@ -1687,22 +1735,65 @@ E : '!' E {$$.c=$2.c; $$.t = TYPE_BOOLEAN; } -E : E '-' E -E : E '/' E -E : E '+' E {$$.c = code_append($1.c,$3.c);$$.c = abc_add($$.c);$$.c=abc_coerce_a($$.c); - $$.t = join_types($1.t, $3.t, '+'); +E : '~' E {$$.c=$2.c; + $$.c = abc_bitnot($$.c); + $$.t = TYPE_INT; + } + +E : E '&' E {$$.c = code_append($1.c,$3.c); + $$.c = abc_bitand($$.c); + $$.t = TYPE_INT; + } + +E : E '|' E {$$.c = code_append($1.c,$3.c); + $$.c = abc_bitor($$.c); + $$.t = TYPE_INT; + } + +E : E '-' E {$$.c = code_append($1.c,$3.c); + if(BOTH_INT($1,$3)) { + $$.c = abc_subtract_i($$.c); + $$.t = TYPE_INT; + } else { + $$.c = abc_subtract($$.c); + $$.t = TYPE_NUMBER; + } + } +E : E '/' E {$$.c = code_append($1.c,$3.c); + $$.c = abc_divide($$.c); + $$.t = TYPE_NUMBER; + } +E : E '+' E {$$.c = code_append($1.c,$3.c); + $$.c = abc_add($$.c); + $$.t = TYPE_NUMBER; } -E : E '%' E {$$.c = code_append($1.c,$3.c);$$.c = abc_modulo($$.c);$$.c=abc_coerce_a($$.c); - $$.t = join_types($1.t, $3.t, '%'); +E : E '%' E {$$.c = code_append($1.c,$3.c); + $$.c = abc_modulo($$.c); + $$.t = TYPE_NUMBER; } -E : E '*' E {$$.c = code_append($1.c,$3.c);$$.c = abc_multiply($$.c);$$.c=abc_coerce_a($$.c); - $$.t = join_types($1.t, $3.t, '*'); +E : E '*' E {$$.c = code_append($1.c,$3.c); + if(BOTH_INT($1,$3)) { + $$.c = abc_multiply_i($$.c); + $$.t = TYPE_INT; + } else { + $$.c = abc_multiply($$.c); + $$.t = TYPE_NUMBER; + } } E : E "as" E E : E "is" E E : '(' E ')' {$$=$2;} -E : '-' E {$$=$2;} +E : '-' E { + $$=$2; + if(IS_INT($2)) { + $$.c=abc_negate_i($$.c); + $$.t = TYPE_INT; + } else { + $$.c=abc_negate($$.c); + $$.t = TYPE_NUMBER; + } +} E : E '[' E ']' { $$.c = $1.c; @@ -1710,11 +1801,12 @@ E : E '[' E ']' { MULTINAME_LATE(m, $1.t?$1.t->access:ACCESS_PACKAGE, ""); $$.c = abc_getproperty2($$.c, &m); + $$.t = 0; // array elements have unknown type } E : E "*=" E { code_t*c = $3.c; - if(TYPE_IS_INT($3.t) || TYPE_IS_UINT($3.t)) { + if(BOTH_INT($1,$3)) { c=abc_multiply_i(c); } else { c=abc_multiply(c); @@ -1811,7 +1903,7 @@ E : E "--" { code_t*c = 0; $$.t = $1.t; } -E : "++" E { code_t*c = 0; +E : "++" %prec plusplus_prefix E { code_t*c = 0; classinfo_t*type = $2.t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { c=abc_increment_i(c); @@ -1825,7 +1917,7 @@ E : "++" E { code_t*c = 0; $$.t = $2.t; } -E : "--" E { code_t*c = 0; +E : "--" %prec minusminus_prefix E { code_t*c = 0; classinfo_t*type = $2.t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { c=abc_decrement_i(c); @@ -1841,10 +1933,21 @@ E : "--" E { code_t*c = 0; E : E '.' T_IDENTIFIER {$$.c = $1.c; - if($$.t) { - memberinfo_t*f = registry_findmember($$.t, $3); + classinfo_t*t = $1.t; + char is_static = 0; + if(TYPE_IS_CLASS(t)) { + memberinfo_t*m = registry_findmember($1.t, "prototype"); + if(!m) syntaxerror("identifier '%s' not found in anonymous class", $3); + t = m->type; + is_static = 1; + } + if(t) { + memberinfo_t*f = registry_findmember(t, $3); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; - if(f && f->slot) { + if(f && f->slot && !noslot) { $$.c = abc_getslot($$.c, f->slot); } else { if(f) { @@ -1882,13 +1985,20 @@ VAR_READ : T_IDENTIFIER { $$.t = 0; $$.c = 0; int i; + classinfo_t*a = 0; memberinfo_t*f = 0; + + /* look at variables */ if((i = find_variable($1, &$$.t)) >= 0) { // $1 is a local variable $$.c = abc_getlocal($$.c, i); - } else if(f = registry_findmember(state->clsinfo, $1)) { + + /* look at current class' members */ + } else if((f = registry_findmember(state->clsinfo, $1))) { // $1 is a function in this class - if(f->flags&FLAG_STATIC) { + int var_is_static = (f->flags&FLAG_STATIC); + int i_am_static = (state->minfo?(state->minfo->flags&FLAG_STATIC):FLAG_STATIC); + if(var_is_static != i_am_static) { /* there doesn't seem to be any "static" way to access static properties of a class */ state->late_binding = 1; @@ -1913,10 +2023,22 @@ VAR_READ : T_IDENTIFIER { } else { $$.t = f->type; } + + /* look at classes in the current package and imported classes */ + } else if((a = find_class($1))) { + if(a->slot) { + $$.c = abc_getglobalscope($$.c); + $$.c = abc_getslot($$.c, a->slot); + } else { + MULTINAME(m, a); + $$.c = abc_getlex2($$.c, &m); + } + $$.t = TYPE_CLASS(a); + + /* unknown object, let the avm2 resolve it */ } else { - // let the avm2 resolve $1 if(strcmp($1,"trace")) - warning("Couldn't resolve %s, doing late binding", $1); + warning("Couldn't resolve %s, doing late binding", $1); state->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, $1};