X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=d0927b2af1257c0be467f05fa147f4f89ffba2a5;hp=33ab3de6484c86343de954c063dd0db00b76c901;hb=4da50aa69285c6f5abd97e41dd195648b8df49fe;hpb=6e924a7805803518bb3f665b8fb35b1904991d52 diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 33ab3de..d0927b2 100644 --- a/lib/as3/parser.y +++ b/lib/as3/parser.y @@ -43,10 +43,11 @@ extern int a3_lex(); %union tokenunion { enum yytokentype token; - int flags; classinfo_t*classinfo; classinfo_list_t*classinfo_list; + slotinfo_t*slotinfo; + slotinfo_list_t*slotinfo_list; int number_int; unsigned int number_uint; @@ -63,6 +64,8 @@ extern int a3_lex(); for_start_t for_start; abc_exception_t *exception; regexp_t regexp; + modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -169,11 +172,12 @@ extern int a3_lex(); %type FOR_START %type X_IDENTIFIER PACKAGE FOR_IN_INIT MAYBE_IDENTIFIER +%type NAMESPACE_ID %type VARCONST %type CODE %type CODEPIECE CODE_STATEMENT %type CODEBLOCK MAYBECODE MAYBE_CASE_LIST CASE_LIST DEFAULT CASE SWITCH WITH -%type PACKAGE_DECLARATION SLOT_DECLARATION +%type PACKAGE_DECLARATION SLOT_DECLARATION SLOT_LIST ONE_SLOT %type FUNCTION_DECLARATION PACKAGE_INITCODE %type VARIABLE_DECLARATION ONE_VARIABLE VARIABLE_LIST THROW %type CATCH FINALLY @@ -198,20 +202,22 @@ extern int a3_lex(); %type MAYBE_PARAM_LIST %type MAYBE_MODIFIERS %type MODIFIER_LIST +%type MODIFIER %type STATICCONSTANT MAYBESTATICCONSTANT %type IMPLEMENTS_LIST -%type EXTENDS +%type EXTENDS CLASS_SPEC %type EXTENDS_LIST -%type CLASS PACKAGEANDCLASS CLASS_SPEC + +%type CLASS PACKAGEANDCLASS %type CLASS_SPEC_LIST + %type TYPE //%type VARIABLE %type VAR_READ %type NEW //%type T_IDENTIFIER -%type MODIFIER %type FUNCTIONCALL -%type MAYBE_EXPRESSION_LIST EXPRESSION_LIST EXPRESSION_LIST_AND_COMMA MAYBE_PARAM_VALUES MAYBE_EXPRPAIR_LIST EXPRPAIR_LIST +%type MAYBE_EXPRESSION_LIST EXPRESSION_LIST EXPRESSION_LIST_AND_COMMA MAYBE_PARAM_VALUES MAYBE_EXPRPAIR_LIST EXPRPAIR_LIST WITH_HEAD // precedence: from low to high @@ -313,6 +319,7 @@ typedef struct _classstate { struct _methodstate { /* method data */ methodinfo_t*info; + char has_exceptions; char late_binding; char is_constructor; char has_super; @@ -325,6 +332,7 @@ struct _methodstate { char uses_parent_function; int uses_slots; dict_t*slots; + int activation_var; abc_method_t*abc; int var_index; // for inner methods @@ -332,6 +340,8 @@ struct _methodstate { char is_a_slot; // for inner methods code_t*header; + + code_t*scope_code; abc_exception_list_t*exceptions; methodstate_list_t*innerfunctions; @@ -343,7 +353,11 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; + dict_t*import_toplevel_packages; dict_t*imports; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -351,6 +365,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -421,12 +437,20 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_has_imports() { @@ -434,6 +458,18 @@ static void state_has_imports() state->imports = dict_clone(state->imports); state->has_own_imports = 1; } +static void import_toplevel(const char*package) +{ + char* s = strdup(package); + while(1) { + dict_put(state->import_toplevel_packages, s, 0); + char*x = strrchr(s, '.'); + if(!x) + break; + *x = 0; + } + free(s); +} static void state_destroy(state_t*state) { @@ -456,17 +492,22 @@ static void state_destroy(state_t*state) dict_destroy(state->vars);state->vars=0; } + list_free(state->active_namespace_urls) + state->active_namespace_urls = 0; + free(state); } static void old_state() { + trie_rollback(active_namespaces); + if(!state || !state->old) syntaxerror("invalid nesting"); state_t*leaving = state; state = state->old; - + if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -475,7 +516,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -490,6 +531,9 @@ void initialize_file(char*filename) if(state) { syntaxerror("invalid call to initialize_file during parsing of another file"); } + + active_namespaces = trie_new(); + new_state(); state->package = internal_filename_package = strdup(filename); @@ -504,11 +548,11 @@ void initialize_file(char*filename) if(as3_pass==1) { state->method = rfx_calloc(sizeof(methodstate_t)); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); function_initvars(state->method, 0, 0, 1); global->init = abc_initscript(global->file); - state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } } @@ -581,6 +625,7 @@ typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; methodstate_t*is_inner_method; } variable_t; @@ -615,6 +660,11 @@ static char variable_exists(char*name) } code_t*defaultvalue(code_t*c, classinfo_t*type); +static int alloc_local() +{ + return state->method->variable_count++; +} + static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { if(maybeslot) { @@ -624,11 +674,12 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c } NEW(variable_t, v); - v->index = state->method->variable_count++; + v->index = alloc_local(); v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); return v; } @@ -706,17 +757,36 @@ static void parsererror(const char*file, int line, const char*f) } -static code_t* method_header(methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - code_t*c = 0; - if(m->uses_slots || (m->late_binding && !m->inner)) { + if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { - c = abc_newactivation(c); - c = abc_pushscope(c); + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } } + return c; +} + +static code_t* method_header(methodstate_t*m) +{ + code_t*c = 0; + + c = add_scope_code(c, m, 1); + methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); @@ -742,6 +812,19 @@ static code_t* method_header(methodstate_t*m) c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); } + + if(m->slots) { + /* all parameters that are used by inner functions + need to be copied from local to slot */ + parserassert(m->activation_var); + DICT_ITERATE_ITEMS(m->slots,char*,name,variable_t*,v) { + if(v->is_parameter) { + c = abc_getlocal(c, m->activation_var); + c = abc_getlocal(c, v->index); + c = abc_setslot(c, v->index); + } + } + } list_free(m->innerfunctions); m->innerfunctions = 0; return c; @@ -783,25 +866,53 @@ static void endpackage() #define FLAG_PACKAGEINTERNAL 2048 #define FLAG_NAMESPACE 4096 -static int flags2access(int flags) +static namespace_t modifiers2access(modifiers_t*mod) { - int access = 0; - if(flags&FLAG_PUBLIC) { - if(access&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + namespace_t ns; + ns.access = 0; + ns.name = ""; + if(mod->flags&FLAG_NAMESPACE) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + syntaxerror("invalid combination of access levels and namespaces"); + ns.access = ACCESS_NAMESPACE; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + trie_dump(active_namespaces); + syntaxerror("unknown namespace: %s", mod->ns); + } + ns.name = url; + } else if(mod->flags&FLAG_PUBLIC) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PACKAGE; - } else if(flags&FLAG_PRIVATE) { - if(access&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PACKAGE; + } else if(mod->flags&FLAG_PRIVATE) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PRIVATE; - } else if(flags&FLAG_PROTECTED) { - if(access&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PRIVATE; + } else if(mod->flags&FLAG_PROTECTED) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PROTECTED; + ns.access = ACCESS_PROTECTED; } else { - access = ACCESS_PACKAGEINTERNAL; + ns.access = ACCESS_PACKAGEINTERNAL; } - return access; + return ns; +} +static slotinfo_t* find_class(const char*name); + +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); +} + +void add_active_url(const char*url) +{ + NEW(namespace_t,n); + n->name = url; + list_append(state->active_namespace_urls, n); } static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) @@ -818,56 +929,87 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char *(int*)0=0; parserassert(!index); } + if(m->uses_slots) { /* as variables and slots share the same number, make sure that those variable indices are reserved. It's up to the optimizer to later shuffle the variables down to lower indices */ - m->variable_count = m->uses_slots; + m->variable_count = m->uses_slots; } if(params) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0, 1); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - + if(m->uses_slots) { + dict_dump(m->slots, stdout, ""); + } + methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); m->var_index = v->index; m->slot_index = v->index; v->is_inner_method = m; + l = l->next; } + + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + + if(as3_pass==2 && m->slots) { + /* exchange unresolved identifiers with the actual objects */ + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); + } + v->type = type; + } + } + } } char*as3_globalclass=0; -static void startclass(int flags, char*classname, classinfo_t*extends, classinfo_list_t*implements) +static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, classinfo_list_t*implements) { if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; - if(flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) + if(mod->flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) syntaxerror("invalid modifier(s)"); - if((flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) + if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + + //if(!(mod->flags&FLAG_INTERFACE) && !extends) { + if(!(mod->flags&FLAG_INTERFACE) && !extends) { + // all classes extend object + extends = registry_getobjectclass(); + } /* create the class name, together with the proper attributes */ int access=0; char*package=0; - if(!(flags&FLAG_PUBLIC) && state->package==internal_filename_package) { + if(!(mod->flags&FLAG_PUBLIC) && state->package==internal_filename_package) { access = ACCESS_PRIVATE; package = internal_filename_package; - } else if(!(flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { + } else if(!(mod->flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { access = ACCESS_PACKAGEINTERNAL; package = state->package; } else if(state->package!=internal_filename_package) { access = ACCESS_PACKAGE; package = state->package; @@ -895,7 +1037,13 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* build info struct */ int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); - state->cls->info->flags |= flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + + int pos = 0; + classinfo_list_t*l = implements; + for(l=implements;l;l=l->next) { + state->cls->info->interfaces[pos++] = l->classinfo; + } } if(as3_pass == 2) { @@ -909,17 +1057,18 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); - - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + int pos = 0; - classinfo_list_t*l = implements; - for(l=implements;l;l=l->next) { - if(!(l->classinfo->flags & FLAG_INTERFACE)) - syntaxerror("'%s' is not an interface", l->classinfo->name); - state->cls->info->interfaces[pos++] = l->classinfo; + while(state->cls->info->interfaces[pos]) { + if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE)) + syntaxerror("'%s' is not an interface", + state->cls->info->interfaces[pos]->name); + pos++; } + /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ + state->cls->info->superclass = extends; + /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); multiname_t*extends2 = sig2mname(extends); @@ -990,7 +1139,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* flash.display.MovieClip handling */ - if(!as3_globalclass && (flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { + if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { if(state->package && state->package[0]) { as3_globalclass = concat3(state->package, ".", classname); } else { @@ -1000,10 +1149,14 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } -static void setstaticfunction(int x) +static int slotstate_varconst = 0; +static modifiers_t*slotstate_flags = 0; +static void setslotstate(modifiers_t* flags, int varconst) { + slotstate_varconst = varconst; + slotstate_flags = flags; if(state->cls) { - if(x&FLAG_STATIC) { + if(flags && flags->flags&FLAG_STATIC) { state->method = state->cls->static_init; } else { state->method = state->cls->init; @@ -1054,6 +1207,10 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___PUSHPACKAGE__) { + char*name = string_cstr(c->data[0]); + syntaxerror("Can't reference a package (%s) as such", name); + } c=c->prev; } } @@ -1061,6 +1218,7 @@ void check_code_for_break(code_t*c) static void check_constant_against_type(classinfo_t*t, constant_t*c) { + return; #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) if(TYPE_IS_NUMBER(t)) { xassert(c->type == CONSTANT_FLOAT @@ -1089,12 +1247,15 @@ static void check_override(memberinfo_t*m, int flags) return; if(m->flags & FLAG_FINAL) syntaxerror("can't override final member %s", m->name); + + /* allow this. it's no issue. if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC)) - syntaxerror("can't override static member %s", m->name); + syntaxerror("can't override static member %s", m->name);*/ + if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC)) syntaxerror("can't override non-static member %s with static declaration", m->name); - if(!(flags&FLAG_OVERRIDE)) { + if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) { if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) { if(m->kind == INFOTYPE_METHOD) syntaxerror("can't override without explicit 'override' declaration"); @@ -1104,22 +1265,25 @@ static void check_override(memberinfo_t*m, int flags) } } -static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot) +static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot) { methodinfo_t*minfo = 0; - U8 access = flags2access(flags); + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = methodinfo_register_global(access, state->package, name); - minfo->return_type = return_type; + minfo = methodinfo_register_global(ns.access, state->package, name); + minfo->return_type = 0; // save this for pass 2 } else if(getset != KW_GET && getset != KW_SET) { //class method - memberinfo_t* m = registry_findmember(state->cls->info, name, 0); + memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { + printf("%s.%s | %s.%s\n", + m->package, m->name, + ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, access, name); - minfo->return_type = return_type; + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); + minfo->return_type = 0; // save this for pass 2 // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1127,12 +1291,14 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na //class getter/setter int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET; classinfo_t*type=0; - if(getset == KW_GET) + if(getset == KW_GET) { type = return_type; - else if(params->list && params->list->param) + } else if(params->list && params->list->param && !params->list->next) { type = params->list->param->type; + } else + syntaxerror("setter function needs to take exactly one argument"); // not sure wether to look into superclasses here, too - minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1); + minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { if(minfo->kind!=INFOTYPE_SLOT) syntaxerror("class already contains a method called '%s'", name); @@ -1142,24 +1308,30 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ minfo->subtype |= gs; - if(!minfo->return_type) { - minfo->return_type = type; - } else { - if(minfo && minfo->return_type != type) - syntaxerror("different type in getter and setter"); - } + + /* + FIXME: this check needs to be done in pass 2 + + if((!minfo->return_type != !type) || + (minfo->return_type && type && + !strcmp(minfo->return_type->name, type->name))) { + syntaxerror("different type in getter and setter: %s and %s", + minfo->return_type?minfo->return_type->name:"*", + type?type->name:"*"); + }*/ } else { - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; - minfo->return_type = type; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; + if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; + if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + return minfo; } @@ -1192,7 +1364,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); - + function_initvars(state->method, params, 0, 1); } @@ -1206,7 +1378,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) } } -static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type) { if(state->method && state->method->info) { @@ -1228,10 +1400,9 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n if(state->method->is_constructor) name = "__as3_constructor__"; - return_type = 0; - state->method->info = registerfunction(getset, flags, name, params, return_type, 0); + state->method->info = registerfunction(getset, mod, name, params, return_type, 0); - function_initvars(state->method, params, flags, 1); + function_initvars(state->method, params, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } @@ -1242,8 +1413,8 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n parserassert(state->method); if(state->cls) { - memberinfo_t*m = registry_findmember(state->cls->info, name, 2); - check_override(m, flags); + memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2); + check_override(m, mod->flags); } if(state->cls) { @@ -1251,11 +1422,11 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } state->method->info->return_type = return_type; - function_initvars(state->method, params, flags, 1); + function_initvars(state->method, params, mod->flags, 1); } } -static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { if(as3_pass==1) { @@ -1263,7 +1434,9 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, function_initvars(state->method, 0, 0, 0); methodstate_list_t*ml = state->method->innerfunctions; + dict_t*xvars = dict_new(); + while(ml) { methodstate_t*m = ml->methodstate; parserassert(m->inner); @@ -1274,7 +1447,8 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, dictentry_t*l = d->slots[t]; while(l) { /* check parent method's variables */ - if(find_variable(state, l->key)) { + variable_t*v; + if((v=find_variable(state, l->key))) { m->uses_parent_function = 1; state->method->uses_slots = 1; dict_put(xvars, l->key, 0); @@ -1289,10 +1463,12 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, } ml = ml->next; } + if(state->method->uses_slots) { state->method->slots = dict_new(); int i = 1; DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) { + if(!name) syntaxerror("internal error"); if(v->index && dict_contains(xvars, name)) { v->init = 0; v->index = i++; @@ -1306,8 +1482,6 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; } - dict_destroy(xvars); - old_state(); return 0; } @@ -1327,10 +1501,10 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; + namespace_t mname_ns = modifiers2access(mod); multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) + if(mod->flags&FLAG_STATIC) f = abc_class_staticmethod(state->cls->abc, type2, &mname); else f = abc_class_method(state->cls->abc, type2, &mname); @@ -1346,7 +1520,7 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, //flash doesn't seem to allow us to access function slots //state->method->info->slot = slot; - if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; + if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; if(getset == KW_GET) f->trait->kind = TRAIT_GETTER; if(getset == KW_SET) f->trait->kind = TRAIT_SETTER; if(params->varargs) f->flags |= METHOD_NEED_REST; @@ -1379,6 +1553,11 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, check_code_for_break(body); + /* Seems this works now. + if(state->method->exceptions && state->method->uses_slots) { + as3_warning("try/catch and activation not supported yet within the same method"); + }*/ + if(f->body) { f->body->code = body; f->body->exceptions = state->method->exceptions; @@ -1525,7 +1704,37 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static const char* get_package_from_name(const char*name) +{ + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + +static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1562,6 +1771,43 @@ static slotinfo_t* find_class(char*name) return 0; } +typedcode_t push_class(slotinfo_t*a) +{ + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); + } else { + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; + } + } else { + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); + } else { + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); + } + x.t = TYPE_CLASS(c); + } + return x; +} static char is_getlocal(code_t*c) { @@ -1609,7 +1855,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } else { prefix = 0; } - + char use_temp_var = readbefore; /* generate the write instruction, and maybe append a dup to the prefix code */ @@ -1658,6 +1904,10 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETLOCAL_2; } else if(r->opcode == OPCODE_GETLOCAL_3) { write->opcode = OPCODE_SETLOCAL_3; + } else if(r->opcode == OPCODE_GETSUPER) { + write->opcode = OPCODE_SETSUPER; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); } else { code_dump(r); syntaxerror("illegal lvalue: can't assign a value to this expression"); @@ -1744,7 +1994,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1852,10 +2101,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) int lookup_version_cost = 4*num_insertion_points + 5; if(cantdup || simple_version_cost > lookup_version_cost) { - printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost); + //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_lookup(c, finally, tempvar); } else { - printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost); + //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_simple(c, finally, tempvar); } } @@ -1917,6 +2166,7 @@ CODE_STATEMENT: WITH CODE_STATEMENT: TRY CODE_STATEMENT: VOIDEXPRESSION CODE_STATEMENT: USE_NAMESPACE +CODE_STATEMENT: NAMESPACE_DECLARATION CODE_STATEMENT: '{' CODE '}' {$$=$2;} CODE_STATEMENT: '{' '}' {$$=0;} @@ -1930,8 +2180,6 @@ CODEPIECE: RETURN CODEPIECE: THROW CODEPIECE: CONDITIONAL_COMPILATION '{' CODE '}' {$$=$3;} -CODEPIECE: NAMESPACE_DECLARATION {/*TODO*/$$=0;} - //CODEBLOCK : '{' CODE '}' {$$=$2;} //CODEBLOCK : '{' '}' {$$=0;} CODEBLOCK : CODEPIECE ';' {$$=$1;} @@ -2086,6 +2334,10 @@ FOR : FOR_START FOR_INIT ';' EXPRESSION ';' VOIDEXPRESSION ')' CODEBLOCK { FOR_IN : FOR_START FOR_IN_INIT "in" EXPRESSION ')' CODEBLOCK { variable_t*var = find_variable(state, $2); + if(!var) { + syntaxerror("variable %s not known in this scope", $2); + } + char*tmp1name = concat2($2, "__tmp1__"); int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2($2, "__array__"); @@ -2183,7 +2435,7 @@ CASE_LIST: CASE {$$=$1;} CASE_LIST: CASE_LIST CASE {$$=code_append($$,$2);} CASE: "case" E ':' MAYBECODE { - $$ = abc_dup(0); + $$ = abc_getlocal(0, state->switch_var); $$ = code_append($$, $2.c); code_t*j = $$ = abc_ifne($$, 0); $$ = code_append($$, $4); @@ -2196,10 +2448,12 @@ CASE: "case" E ':' MAYBECODE { DEFAULT: "default" ':' MAYBECODE { $$ = $3; } -SWITCH : T_SWITCH '(' {PASS12 new_state();} E ')' '{' MAYBE_CASE_LIST '}' { +SWITCH : T_SWITCH '(' {PASS12 new_state();state->switch_var=alloc_local();} E ')' '{' MAYBE_CASE_LIST '}' { $$=$4.c; + $$ = abc_setlocal($$, state->switch_var); $$ = code_append($$, $7); - code_t*out = $$ = abc_pop($$); + + code_t*out = $$ = abc_kill($$, state->switch_var); breakjumpsto($$, $1, out); code_t*c = $$,*lastblock=0; @@ -2243,6 +2497,7 @@ CATCH: "catch" '(' T_IDENTIFIER MAYBETYPE ')' {PASS12 new_state(); int i = find_variable_safe(state, $3)->index; e->target = c = abc_nop(0); c = abc_setlocal(c, i); + c = code_append(c, code_dup(state->method->scope_code)); c = code_append(c, $8); c = abc_kill(c, i); @@ -2285,7 +2540,10 @@ CATCH_FINALLY_LIST: FINALLY { } } -TRY : "try" '{' {PASS12 new_state();} MAYBECODE '}' CATCH_FINALLY_LIST { +TRY : "try" '{' {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } MAYBECODE '}' CATCH_FINALLY_LIST { code_t*out = abc_nop(0); code_t*start = abc_nop(0); @@ -2310,6 +2568,7 @@ TRY : "try" '{' {PASS12 new_state();} MAYBECODE '}' CATCH_FINALLY_LIST { parserassert((ptroff_t)$6.finally); // finally block e->target = $$ = abc_nop($$); + $$ = code_append($$, code_dup(state->method->scope_code)); $$ = abc___rethrow__($$); } @@ -2345,17 +2604,36 @@ THROW : "throw" %prec prec_none { /* ------------ with -------------------------------- */ -WITH : "with" '(' EXPRESSION ')' CODEBLOCK { - $$ = $3.c; - $$ = abc_pushscope($$); - $$ = code_append($$, $5); +WITH_HEAD : "with" '(' EXPRESSION ')' { + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + $$.number = v; + } + $$.cc = $3.c; +} +WITH : WITH_HEAD CODEBLOCK { + /* remove getlocal;pushwith from scope code again */ + state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); + + $$ = $1.cc; + if(state->method->has_exceptions) { + $$ = abc_dup($$); + $$ = abc_setlocal($$, $1.number); + } + $$ = abc_pushwith($$); + $$ = code_append($$, $2); $$ = abc_popscope($$); + old_state(); } /* ------------ packages and imports ---------------- */ X_IDENTIFIER: T_IDENTIFIER | "package" {PASS12 $$="package";} + | T_NAMESPACE {PASS12 $$=$1;} PACKAGE: PACKAGE '.' X_IDENTIFIER {PASS12 $$ = concat3($1,".",$3);free($1);$1=0;} PACKAGE: X_IDENTIFIER {PASS12 $$=strdup($1);} @@ -2368,52 +2646,58 @@ PACKAGE_DECLARATION : "package" '{' {PASS12 startpackage("");} IMPORT : "import" PACKAGEANDCLASS { PASS12 slotinfo_t*s = registry_find($2->package, $2->name); - if(!s) {// || !(s->flags&FLAG_BUILTIN)) { + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class($2->package, $2->name); } - - PASS2 classinfo_t*c = $2; if(!c) syntaxerror("Couldn't import class\n"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); $$=0; } IMPORT : "import" PACKAGE '.' '*' { PASS12 - if(strncmp("flash.", $2, 6)) { + if(strncmp("flash.", $2, 6) && as3_pass==1) { as3_schedule_package($2); } - PASS2 NEW(import_t,i); i->package = $2; state_has_imports(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); $$=0; } /* ------------ classes and interfaces (header) -------------- */ -MAYBE_MODIFIERS : %prec above_function {PASS12 $$=0;} +MAYBE_MODIFIERS : %prec above_function {PASS12 $$.flags=0;$$.ns=0;} MAYBE_MODIFIERS : MODIFIER_LIST {PASS12 $$=$1;} MODIFIER_LIST : MODIFIER {PASS12 $$=$1;} -MODIFIER_LIST : MODIFIER_LIST MODIFIER {PASS12 $$=$1|$2;} - -MODIFIER : KW_PUBLIC {PASS12 $$=FLAG_PUBLIC;} - | KW_PRIVATE {PASS12 $$=FLAG_PRIVATE;} - | KW_PROTECTED {PASS12 $$=FLAG_PROTECTED;} - | KW_STATIC {PASS12 $$=FLAG_STATIC;} - | KW_DYNAMIC {PASS12 $$=FLAG_DYNAMIC;} - | KW_FINAL {PASS12 $$=FLAG_FINAL;} - | KW_OVERRIDE {PASS12 $$=FLAG_OVERRIDE;} - | KW_NATIVE {PASS12 $$=FLAG_NATIVE;} - | KW_INTERNAL {PASS12 $$=FLAG_PACKAGEINTERNAL;} - | T_NAMESPACE {PASS12 $$=FLAG_NAMESPACE;} - -EXTENDS : {$$=registry_getobjectclass();} -EXTENDS : KW_EXTENDS CLASS_SPEC {$$=$2;} +MODIFIER_LIST : MODIFIER_LIST MODIFIER { + PASS12 + $$.flags=$1.flags|$2.flags; + if($1.ns && $2.ns) syntaxerror("only one namespace allowed in one declaration"); + $$.ns=$1.ns?$1.ns:$2.ns; + +} +MODIFIER : KW_PUBLIC {PASS12 $$.flags=FLAG_PUBLIC;$$.ns=0;} + | KW_PRIVATE {PASS12 $$.flags=FLAG_PRIVATE;$$.ns=0;} + | KW_PROTECTED {PASS12 $$.flags=FLAG_PROTECTED;$$.ns=0;} + | KW_STATIC {PASS12 $$.flags=FLAG_STATIC;$$.ns=0;} + | KW_DYNAMIC {PASS12 $$.flags=FLAG_DYNAMIC;$$.ns=0;} + | KW_FINAL {PASS12 $$.flags=FLAG_FINAL;$$.ns=0;} + | KW_OVERRIDE {PASS12 $$.flags=FLAG_OVERRIDE;$$.ns=0;} + | KW_NATIVE {PASS12 $$.flags=FLAG_NATIVE;$$.ns=0;} + | KW_INTERNAL {PASS12 $$.flags=FLAG_PACKAGEINTERNAL;$$.ns=0;} + | T_NAMESPACE {PASS12 $$.flags=FLAG_NAMESPACE; + $$.ns=$1; + } + +EXTENDS : {PASS12 $$=0;} +EXTENDS : KW_EXTENDS CLASS_SPEC {PASS12 $$=$2;} EXTENDS_LIST : {PASS12 $$=list_new();} EXTENDS_LIST : KW_EXTENDS CLASS_SPEC_LIST {PASS12 $$=$2;} @@ -2423,13 +2707,14 @@ IMPLEMENTS_LIST : KW_IMPLEMENTS CLASS_SPEC_LIST {PASS12 $$=$2;} CLASS_DECLARATION : MAYBE_MODIFIERS "class" T_IDENTIFIER EXTENDS IMPLEMENTS_LIST - '{' {PASS12 startclass($1,$3,$4,$5);} + '{' {PASS12 startclass(&$1,$3,$4,$5);} MAYBE_CLASS_BODY '}' {PASS12 endclass();$$=0;} INTERFACE_DECLARATION : MAYBE_MODIFIERS "interface" T_IDENTIFIER EXTENDS_LIST - '{' {PASS12 startclass($1|FLAG_INTERFACE,$3,0,$4);} + '{' {PASS12 $1.flags|=FLAG_INTERFACE; + startclass(&$1,$3,0,$4);} MAYBE_INTERFACE_BODY '}' {PASS12 endclass();$$=0;} @@ -2460,12 +2745,12 @@ IDECLARATION : "var" T_IDENTIFIER { } IDECLARATION : MAYBE_MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' MAYBETYPE { PASS12 - $1 |= FLAG_PUBLIC; - if($1&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { + $1.flags |= FLAG_PUBLIC; + if($1.flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { syntaxerror("invalid method modifiers: interface methods always need to be public"); } - startfunction(0,$1,$3,$4,&$6,$8); - endfunction(0,$1,$3,$4,&$6,$8, 0); + startfunction(&$1,$3,$4,&$6,$8); + endfunction(&$1,$3,$4,&$6,$8, 0); list_deep_free($6.list); } @@ -2473,37 +2758,45 @@ IDECLARATION : MAYBE_MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LI VARCONST: "var" | "const" -SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER {setstaticfunction($1);} MAYBETYPE MAYBEEXPRESSION { - int flags = $1; - U8 access = flags2access($1); +SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST {setslotstate(&$1,$2);} SLOT_LIST {$$=$4;setslotstate(0, 0);} + +SLOT_LIST: ONE_SLOT {$$ = $1;} +SLOT_LIST: SLOT_LIST ',' ONE_SLOT {$$ = code_append($1, $3);} + +ONE_SLOT: T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION +{ + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, $3, 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, $1, 1); if(i) { check_override(i, flags); } - info = varinfo_register_onclass(state->cls->info, access, $3); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, $1); } else { - slotinfo_t*i = registry_find(state->package, $3); + slotinfo_t*i = registry_find(state->package, $1); if(i) { - syntaxerror("package %s already contains '%s'", state->package, $3); + syntaxerror("package %s already contains '%s'", state->package, $1); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); } - info = varinfo_register_global(access, state->package, $3); + info = varinfo_register_global(ns.access, state->package, $1); } - info->type = $5; + info->type = $2; info->flags = flags; /* slot name */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, $3}; + multiname_t mname = {QNAME, &ns, 0, $1}; trait_list_t**traits; code_t**code; if(!state->cls) { // global variable - mname_ns.name = state->package; + ns.name = state->package; traits = &global->init->traits; code = &global->init->method->body->code; } else if(flags&FLAG_STATIC) { @@ -2517,8 +2810,8 @@ SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER {setstaticfunction($1);} } trait_t*t=0; - if($5) { - MULTINAME(m, $5); + if($2) { + MULTINAME(m, $2); t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); } else { t = trait_new_member(traits, 0, multiname_clone(&mname), 0); @@ -2527,21 +2820,20 @@ SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER {setstaticfunction($1);} /* initalization code (if needed) */ code_t*c = 0; - if($6.c && !is_pushundefined($6.c)) { + if($3.c && !is_pushundefined($3.c)) { c = abc_getlocal_0(c); - c = code_append(c, $6.c); - c = converttype(c, $6.t, $5); + c = code_append(c, $3.c); + c = converttype(c, $3.t, $2); c = abc_setslot(c, t->slot_id); } *code = code_append(*code, c); - if($2==KW_CONST) { + if(slotstate_varconst==KW_CONST) { t->kind= TRAIT_CONST; } $$=0; - setstaticfunction(0); } /* ------------ constants -------------------------------------- */ @@ -2559,9 +2851,12 @@ STATICCONSTANT : "true" {$$ = constant_new_true($1);} STATICCONSTANT : "false" {$$ = constant_new_false($1);} STATICCONSTANT : "null" {$$ = constant_new_null($1);} STATICCONSTANT : T_IDENTIFIER { - // TODO - as3_warning("Couldn't resolve %s", $1); - $$ = constant_new_null($1); + if(!strcmp($1, "NaN")) { + $$ = constant_new_float(__builtin_nan("")); + } else { + as3_warning("Couldn't evaluate constant value of %s", $1); + $$ = constant_new_null($1); + } } /* ------------ classes and interfaces (body, functions) ------- */ @@ -2623,17 +2918,17 @@ GETSET : "get" | {PASS12 $$=0;} FUNCTION_DECLARATION: MAYBE_MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' - MAYBETYPE '{' {PASS12 startfunction(0,$1,$3,$4,&$6,$8);} MAYBECODE '}' + MAYBETYPE '{' {PASS12 startfunction(&$1,$3,$4,&$6,$8);} MAYBECODE '}' { PASS1 - endfunction(0,$1,$3,$4,&$6,0,0); + endfunction(&$1,$3,$4,&$6,0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); code_t*c = method_header(state->method); c = wrap_function(c, 0, $11); - endfunction(0,$1,$3,$4,&$6,$8,c); + endfunction(&$1,$3,$4,&$6,$8,c); PASS12 list_deep_free($6.list); $$=0; @@ -2645,7 +2940,7 @@ INNERFUNCTION: "function" MAYBE_IDENTIFIER '(' MAYBE_PARAM_LIST ')' MAYBETYPE '{' {PASS12 innerfunction($2,&$4,$6);} MAYBECODE '}' { PASS1 - endfunction(0,0,0,$2,&$4,0,0); + endfunction(0,0,$2,&$4,0,0); PASS2 methodinfo_t*f = state->method->info; if(!f || !f->kind) syntaxerror("internal error"); @@ -2654,7 +2949,7 @@ INNERFUNCTION: "function" MAYBE_IDENTIFIER '(' MAYBE_PARAM_LIST ')' MAYBETYPE c = wrap_function(c, 0, $9); int index = state->method->var_index; - endfunction(0,0,0,$2,&$4,$6,c); + endfunction(0,0,$2,&$4,$6,c); $$.c = abc_getlocal(0, index); $$.t = TYPE_FUNCTION(f); @@ -2665,20 +2960,32 @@ INNERFUNCTION: "function" MAYBE_IDENTIFIER '(' MAYBE_PARAM_LIST ')' MAYBETYPE /* ------------- package + class ids --------------- */ -CLASS: T_IDENTIFIER { - PASS1 $$=0; +CLASS: X_IDENTIFIER { + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->name = $1; + c->package = get_package_from_name($1); + if(!c->package) { + c->nsset = get_current_imports(); + /* make the compiler look for this class in the current directory, + just in case: */ + as3_schedule_class_noerror(state->package, $1); + } + $$ = (classinfo_t*)c; PASS2 slotinfo_t*s = find_class($1); if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", $1, state->package); $$ = (classinfo_t*)s; } -PACKAGEANDCLASS : PACKAGE '.' T_IDENTIFIER { - PASS1 static classinfo_t c; - memset(&c, 0, sizeof(c)); - c.package = $1; - c.name = $3; - $$=&c; +PACKAGEANDCLASS : PACKAGE '.' X_IDENTIFIER { + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->package = $1; + c->name = $3; + $$ = (classinfo_t*)c; PASS2 slotinfo_t*s = registry_find($1, $3); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", $1, $3); @@ -2692,9 +2999,9 @@ CLASS_SPEC: PACKAGEANDCLASS CLASS_SPEC_LIST : CLASS_SPEC {PASS12 $$=list_new();list_append($$, $1);} CLASS_SPEC_LIST : CLASS_SPEC_LIST ',' CLASS_SPEC {PASS12 $$=$1;list_append($$,$3);} -TYPE : CLASS_SPEC {$$=$1;} - | '*' {$$=registry_getanytype();} - | "void" {$$=registry_getanytype();} +TYPE : CLASS_SPEC {PASS12 $$=$1;} + | '*' {PASS12 $$=registry_getanytype();} + | "void" {PASS12 $$=registry_getanytype();} /* | "String" {$$=registry_getstringclass();} | "int" {$$=registry_getintclass();} @@ -2703,25 +3010,25 @@ TYPE : CLASS_SPEC {$$=$1;} | "Number" {$$=registry_getnumberclass();} */ -MAYBETYPE: ':' TYPE {$$=$2;} -MAYBETYPE: {$$=0;} +MAYBETYPE: ':' TYPE {PASS12 $$=$2;} +MAYBETYPE: {PASS12 $$=0;} /* ----------function calls, delete, constructor calls ------ */ -MAYBE_PARAM_VALUES : %prec prec_none {$$.cc=0;$$.len=0;} +MAYBE_PARAM_VALUES : %prec prec_none {$$.cc=0;$$.number=0;} MAYBE_PARAM_VALUES : '(' MAYBE_EXPRESSION_LIST ')' {$$=$2;} -MAYBE_EXPRESSION_LIST : {$$.cc=0;$$.len=0;} +MAYBE_EXPRESSION_LIST : {$$.cc=0;$$.number=0;} MAYBE_EXPRESSION_LIST : EXPRESSION_LIST MAYBE_EXPRESSION_LIST : EXPRESSION_LIST_AND_COMMA -EXPRESSION_LIST : NONCOMMAEXPRESSION {$$.len=1; +EXPRESSION_LIST : NONCOMMAEXPRESSION {$$.number=1; $$.cc = $1.c; } EXPRESSION_LIST_AND_COMMA: EXPRESSION_LIST ',' {$$ = $1;} EXPRESSION_LIST : EXPRESSION_LIST_AND_COMMA NONCOMMAEXPRESSION { - $$.len= $1.len+1; + $$.number= $1.number+1; $$.cc = code_append($1.cc, $2.c); } @@ -2735,7 +3042,7 @@ NEW : "new" E XX MAYBE_PARAM_VALUES { multiname_t*name = $$.c->data[0];$$.c->data[0]=0; $$.c = code_cutlast($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_constructprop2($$.c, name, $4.len); + $$.c = abc_constructprop2($$.c, name, $4.number); multiname_destroy(name); } else if($$.c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)$$.c->data[0]; @@ -2743,10 +3050,10 @@ NEW : "new" E XX MAYBE_PARAM_VALUES { multiname_t*name = t->name; $$.c = code_cutlast($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_constructprop2($$.c, name, $4.len); + $$.c = abc_constructprop2($$.c, name, $4.number); } else { $$.c = code_append($$.c, paramcode); - $$.c = abc_construct($$.c, $4.len); + $$.c = abc_construct($$.c, $4.number); } $$.t = TYPE_ANY; @@ -2775,7 +3082,7 @@ FUNCTIONCALL : E '(' MAYBE_EXPRESSION_LIST ')' { multiname_t*name = $$.c->data[0];$$.c->data[0]=0; $$.c = code_cutlast($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_callproperty2($$.c, name, $3.len); + $$.c = abc_callproperty2($$.c, name, $3.number); multiname_destroy(name); } else if($$.c->opcode == OPCODE_GETSLOT && $$.c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)$$.c->data[0]; @@ -2787,17 +3094,17 @@ FUNCTIONCALL : E '(' MAYBE_EXPRESSION_LIST ')' { $$.c = code_cutlast($$.c); $$.c = code_append($$.c, paramcode); //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding - $$.c = abc_callproperty2($$.c, name, $3.len); + $$.c = abc_callproperty2($$.c, name, $3.number); } else if($$.c->opcode == OPCODE_GETSUPER) { multiname_t*name = $$.c->data[0];$$.c->data[0]=0; $$.c = code_cutlast($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_callsuper2($$.c, name, $3.len); + $$.c = abc_callsuper2($$.c, name, $3.number); multiname_destroy(name); } else { $$.c = abc_getglobalscope($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_call($$.c, $3.len); + $$.c = abc_call($$.c, $3.number); } if(TYPE_IS_FUNCTION($1.t) && $1.t->data) { @@ -2824,7 +3131,7 @@ FUNCTIONCALL : "super" '(' MAYBE_EXPRESSION_LIST ')' { */ state->method->has_super = 1; - $$.c = abc_constructsuper($$.c, $3.len); + $$.c = abc_constructsuper($$.c, $3.number); $$.c = abc_pushundefined($$.c); $$.t = TYPE_ANY; } @@ -2875,13 +3182,9 @@ VOIDEXPRESSION : EXPRESSION %prec below_minus { // ----------------------- expression evaluation ------------------------------------- E : INNERFUNCTION %prec prec_none {$$ = $1;} -//V : CONSTANT {$$ = 0;} E : CONSTANT -//V : VAR_READ %prec T_IDENTIFIER {$$ = 0;} E : VAR_READ %prec T_IDENTIFIER {$$ = $1;} -//V : NEW {$$ = $1.c;} E : NEW {$$ = $1;} -//V : DELETE {$$ = $1.c;} E : DELETE {$$ = $1;} E : FUNCTIONCALL @@ -3133,22 +3436,22 @@ E : E '[' E ']' { E : '[' MAYBE_EXPRESSION_LIST ']' { $$.c = code_new(); $$.c = code_append($$.c, $2.cc); - $$.c = abc_newarray($$.c, $2.len); + $$.c = abc_newarray($$.c, $2.number); $$.t = registry_getarrayclass(); } -MAYBE_EXPRPAIR_LIST : {$$.cc=0;$$.len=0;} +MAYBE_EXPRPAIR_LIST : {$$.cc=0;$$.number=0;} MAYBE_EXPRPAIR_LIST : EXPRPAIR_LIST {$$=$1;} EXPRPAIR_LIST : NONCOMMAEXPRESSION ':' NONCOMMAEXPRESSION { $$.cc = 0; $$.cc = code_append($$.cc, $1.c); $$.cc = code_append($$.cc, $3.c); - $$.len = 2; + $$.number = 2; } EXPRPAIR_LIST : EXPRPAIR_LIST ',' NONCOMMAEXPRESSION ':' NONCOMMAEXPRESSION { $$.cc = $1.cc; - $$.len = $1.len+2; + $$.number = $1.number+2; $$.cc = code_append($$.cc, $3.c); $$.cc = code_append($$.cc, $5.c); } @@ -3158,7 +3461,7 @@ EXPRPAIR_LIST : EXPRPAIR_LIST ',' NONCOMMAEXPRESSION ':' NONCOMMAEXPRESSION { E : "{ (dictionary)" MAYBE_EXPRPAIR_LIST '}' { $$.c = code_new(); $$.c = code_append($$.c, $2.cc); - $$.c = abc_newobject($$.c, $2.len/2); + $$.c = abc_newobject($$.c, $2.number/2); $$.t = registry_getobjectclass(); } @@ -3262,7 +3565,7 @@ E : E '?' E ':' E %prec below_assignment { E : E "++" { code_t*c = 0; classinfo_t*type = $1.t; - if((is_getlocal($1.c) && TYPE_IS_INT($1.t)) || TYPE_IS_NUMBER($1.t)) { + if(is_getlocal($1.c) && (TYPE_IS_INT($1.t) || TYPE_IS_NUMBER($1.t))) { int nr = getlocalnr($1.c); code_free($1.c);$1.c=0; if(TYPE_IS_INT($1.t)) { @@ -3335,7 +3638,8 @@ E : "super" '.' T_IDENTIFIER classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember(t, $3, 1); + memberinfo_t*f = findmember_nsset(t, $3, 1); + MEMBER_MULTINAME(m, f, $3); $$.c = 0; $$.c = abc_getlocal_0($$.c); @@ -3378,43 +3682,69 @@ E : E '.' '(' E ')' { as3_warning("ignored .() operator"); } -//VARIABLE : VARIABLE "::" '[' EXPRESSION ']' // qualified expression +//E : E "::" '[' E ']' { +// // qualified expression TODO +// $$.c = abc_pushundefined(0); +// $$.t = 0; +// as3_warning("ignored ::[] operator"); +// } - -E : E '.' T_IDENTIFIER - {$$.c = $1.c; - classinfo_t*t = $1.t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->data) { - t = t->data; - is_static = 1; - } - if(t) { - memberinfo_t*f = registry_findmember(t, $3, 1); - char noslot = 0; - if(f && !is_static != !(f->flags&FLAG_STATIC)) - noslot=1; - if(f && f->slot && !noslot) { - $$.c = abc_getslot($$.c, f->slot); - } else { - MEMBER_MULTINAME(m, f, $3); - $$.c = abc_getproperty2($$.c, &m); - } - /* determine type */ - $$.t = slotinfo_gettype((slotinfo_t*)f); - if(!$$.t) - $$.c = abc_coerce_a($$.c); - } else { - /* when resolving a property on an unknown type, we do know the - name of the property (and don't seem to need the package), but - we need to make avm2 try out all access modes */ - multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, $3}; - $$.c = abc_getproperty2($$.c, &m); - $$.c = abc_coerce_a($$.c); - $$.t = registry_getanytype(); - } - } +E : E '.' T_IDENTIFIER { + $$.c = $1.c; + classinfo_t*t = $1.t; + char is_static = 0; + if(TYPE_IS_CLASS(t) && t->data) { + t = t->data; + is_static = 1; + } + if(t) { + if(t->subtype==INFOTYPE_UNRESOLVED) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", $3, t->name); + } + memberinfo_t*f = findmember_nsset(t, $3, 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + $$.c = abc_getslot($$.c, f->slot); + } else { + if(!f) + as3_warning("Access of undefined property '%s' in %s", $3, t->name); + + MEMBER_MULTINAME(m, f, $3); + $$.c = abc_getproperty2($$.c, &m); + } + /* determine type */ + $$.t = slotinfo_gettype((slotinfo_t*)f); + if(!$$.t) + $$.c = abc_coerce_a($$.c); + } else if($1.c && $1.c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = $1.c->data[0]; + char*package2 = concat3(package->str, ".", $3); + + slotinfo_t*a = registry_find(package->str, $3); + if(a) { + $$ = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + $$.c = $1.c; + $$.c->data[0] = string_new4(package2); + $$.t = 0; + } else { + syntaxerror("couldn't resolve %s", package2); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", $3); + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, $3}; + $$.c = abc_getproperty2($$.c, &m); + $$.c = abc_coerce_a($$.c); + $$.t = registry_getanytype(); + } +} VAR_READ : T_IDENTIFIER { PASS1 @@ -3422,12 +3752,16 @@ VAR_READ : T_IDENTIFIER { function's variables. We consider everything which is not a local variable "unresolved". This encompasses class names, members of the surrounding class - etc. which *correct* because local variables of the parent function + etc. which is *correct* because local variables of the parent function would shadow those. */ if(state->method->inner && !find_variable(state, $1)) { unknown_variable($1); } + + /* let the compiler know that it might want to check the current directory/package + for this identifier- maybe there's a file $1.as defining $1. */ + as3_schedule_class_noerror(state->package, $1); PASS2 $$.t = 0; @@ -3453,8 +3787,11 @@ VAR_READ : T_IDENTIFIER { int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC; /* look at current class' members */ - if(state->cls && (f = registry_findmember(state->cls->info, $1, 1)) && - (f->flags&FLAG_STATIC) >= i_am_static) { + if(!state->method->inner && + state->cls && + (f = findmember_nsset(state->cls->info, $1, 1)) && + (f->flags&FLAG_STATIC) >= i_am_static) + { // $1 is a function in this class int var_is_static = (f->flags&FLAG_STATIC); @@ -3470,7 +3807,7 @@ VAR_READ : T_IDENTIFIER { static properties of a class */ state->method->late_binding = 1; $$.t = f->type; - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, $1}; $$.c = abc_findpropstrict2($$.c, &m); $$.c = abc_getproperty2($$.c, &m); @@ -3480,7 +3817,7 @@ VAR_READ : T_IDENTIFIER { $$.c = abc_getslot($$.c, f->slot); break; } else { - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, $1}; $$.c = abc_getlocal_0($$.c); $$.c = abc_getproperty2($$.c, &m); @@ -3490,41 +3827,22 @@ VAR_READ : T_IDENTIFIER { /* look at actual classes, in the current package and imported */ if((a = find_class($1))) { - if(a->access == ACCESS_PACKAGEINTERNAL && - strcmp(a->package, state->package) && - strcmp(a->package, internal_filename_package) - ) - syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", - infotypename(a),$1, a->package, state->package); - - if(a->kind != INFOTYPE_CLASS) { - MULTINAME(m, a); - $$.c = abc_findpropstrict2($$.c, &m); - $$.c = abc_getproperty2($$.c, &m); - if(a->kind == INFOTYPE_METHOD) { - methodinfo_t*f = (methodinfo_t*)a; - $$.t = TYPE_FUNCTION(f); - } else { - varinfo_t*v = (varinfo_t*)a; - $$.t = v->type; - } - } else { - classinfo_t*c = (classinfo_t*)a; - if(c->slot) { - $$.c = abc_getglobalscope($$.c); - $$.c = abc_getslot($$.c, c->slot); - } else { - MULTINAME(m, c); - $$.c = abc_getlex2($$.c, &m); - } - $$.t = TYPE_CLASS(c); - } + $$ = push_class(a); + break; + } + + /* look through package prefixes */ + if(dict_contains(state->import_toplevel_packages, $1) || + registry_ispackage($1)) { + $$.c = abc___pushpackage__($$.c, $1); + $$.t = 0; break; } /* unknown object, let the avm2 resolve it */ if(1) { - as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + //as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + as3_warning("Couldn't resolve '%s', doing late binding", $1); state->method->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, $1}; @@ -3537,13 +3855,61 @@ VAR_READ : T_IDENTIFIER { // ----------------- namespaces ------------------------------------------------- -NAMESPACE_DECLARATION : MAYBE_MODIFIERS "namespace" T_IDENTIFIER {$$=0;} -NAMESPACE_DECLARATION : MAYBE_MODIFIERS "namespace" T_IDENTIFIER '=' T_IDENTIFIER {$$=0;} -NAMESPACE_DECLARATION : MAYBE_MODIFIERS "namespace" T_IDENTIFIER '=' T_STRING {$$=0;} +NAMESPACE_ID : "namespace" T_IDENTIFIER { + PASS12 + NEW(namespace_decl_t,n); + n->name = $2; + n->url = $2; + $$=n; +} +NAMESPACE_ID : "namespace" T_IDENTIFIER '=' T_IDENTIFIER { + PASS12 + NEW(namespace_decl_t,n); + n->name = $2; + n->url = $4; + $$=n; +} +NAMESPACE_ID : "namespace" T_IDENTIFIER '=' T_STRING { + PASS12 + NEW(namespace_decl_t,n); + n->name = $2; + n->url = $4.str; + $$=n; +} +NAMESPACE_DECLARATION : MAYBE_MODIFIERS NAMESPACE_ID { + PASS12 + trie_put(active_namespaces, $2->name, (void*)$2->url); + + namespace_t access = modifiers2access(&$1); + varinfo_t* var = varinfo_register_global(access.access, state->package, $2->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = $2->url; + var->value = constant_new_namespace(&ns); + + $$=0; +} -USE_NAMESPACE : "use" "namespace" T_IDENTIFIER { +USE_NAMESPACE : "use" "namespace" CLASS_SPEC { PASS12 - tokenizer_register_namespace($3); + const char*url = $3->name; + + varinfo_t*s = (varinfo_t*)$3; + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", $3->name); + } + + if(!s || s->kind != INFOTYPE_SLOT) + syntaxerror("%s.%s is not a public namespace (%d)", $3->package, $3->name, s?s->kind:-1); + if(!s->value || !NS_TYPE(s->value->type)) + syntaxerror("%s.%s is not a namespace", $3->package, $3->name); + url = s->value->ns->name; + + trie_put(active_namespaces, $3->name, (void*)url); + add_active_url(url); $$=0; }