X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=d0927b2af1257c0be467f05fa147f4f89ffba2a5;hb=4da50aa69285c6f5abd97e41dd195648b8df49fe;hp=3c65f9525ac4b11b43ec854aaf45178414b62bbf;hpb=e0be76c5568d0482705912669c0a91be21755fcd;p=swftools.git diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 3c65f95..d0927b2 100644 --- a/lib/as3/parser.y +++ b/lib/as3/parser.y @@ -31,6 +31,7 @@ #include "registry.h" #include "code.h" #include "opcodes.h" +#include "compiler.h" extern int a3_lex(); @@ -42,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; @@ -62,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; @@ -69,7 +73,7 @@ extern int a3_lex(); } -%token T_IDENTIFIER +%token T_IDENTIFIER T_NAMESPACE %token T_STRING %token T_REGEXP %token T_EMPTY @@ -138,6 +142,7 @@ extern int a3_lex(); %token KW_IN "in" %token KW_AS "as" +%token T_DICTSTART "{ (dictionary)" %token T_EQEQ "==" %token T_EQEQEQ "===" %token T_NE "!=" @@ -150,6 +155,7 @@ extern int a3_lex(); %token T_MULBY "*=" %token T_PLUSBY "+=" %token T_MINUSBY "-=" +%token T_XORBY "^=" %token T_SHRBY ">>=" %token T_SHLBY "<<=" %token T_USHRBY ">>>=" @@ -166,13 +172,14 @@ 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 VARIABLE_DECLARATION ONE_VARIABLE VARIABLE_LIST THROW %type CATCH FINALLY %type CATCH_LIST CATCH_FINALLY_LIST %type CLASS_DECLARATION @@ -185,7 +192,7 @@ extern int a3_lex(); %type CONSTANT %type FOR FOR_IN IF WHILE DO_WHILE MAYBEELSE BREAK RETURN CONTINUE TRY %type INNERFUNCTION -%type USE_NAMESPACE +%type USE_NAMESPACE %type FOR_INIT %type IMPORT %type MAYBETYPE @@ -195,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 QNAME -%type QNAME_LIST + +%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 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 @@ -235,18 +244,21 @@ extern int a3_lex(); %left plusplus_prefix minusminus_prefix '~' '!' "void" "delete" "typeof" //FIXME: *unary* + - should be here, too %left "--" "++" %nonassoc below_curly -%left '[' ']' '{' "new" '.' ".." "::" -%nonassoc T_IDENTIFIER + +%left '(' +%left new2 +%left '[' ']' "new" '{' "{ (dictionary)" '.' ".." "::" '@' + +%left T_IDENTIFIER %left above_identifier %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 "false" "true" "null" "undefined" "super" "function" -%nonassoc above_function +%left above_function @@ -288,34 +300,52 @@ typedef struct _import { DECLARE_LIST(import); +DECLARE(methodstate); +DECLARE_LIST(methodstate); + typedef struct _classstate { /* class data */ classinfo_t*info; abc_class_t*abc; - code_t*init; - code_t*static_init; + + methodstate_t*init; + methodstate_t*static_init; + //code_t*init; + //code_t*static_init; + char has_constructor; } classstate_t; -DECLARE_LIST(methodstate); - -typedef struct _methodstate { +struct _methodstate { /* method data */ - memberinfo_t*info; + methodinfo_t*info; + char has_exceptions; char late_binding; char is_constructor; char has_super; char is_global; int variable_count; + dict_t*unresolved_variables; + char inner; + char uses_parent_function; + int uses_slots; + dict_t*slots; + int activation_var; + abc_method_t*abc; int var_index; // for inner methods + int slot_index; // for inner methods + char is_a_slot; // for inner methods + code_t*header; + + code_t*scope_code; abc_exception_list_t*exceptions; methodstate_list_t*innerfunctions; -} methodstate_t; +}; typedef struct _state { struct _state*old; @@ -323,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 @@ -331,6 +365,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -339,6 +375,7 @@ typedef struct _global { abc_file_t*file; abc_script_t*init; dict_t*token2info; + dict_t*file2token2info; } global_t; static global_t*global = 0; @@ -349,17 +386,21 @@ DECLARE_LIST(state); #define MULTINAME(m,x) \ multiname_t m;\ namespace_t m##_ns;\ - registry_fill_multiname(&m, &m##_ns, x); + (x)->package; \ + registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x)); #define MEMBER_MULTINAME(m,f,n) \ multiname_t m;\ namespace_t m##_ns;\ if(f) { \ - m##_ns = flags2namespace(f->flags, ""); \ + if((m##_ns.access = ((slotinfo_t*)(f))->access)==ACCESS_NAMESPACE) \ + m##_ns.name = ((slotinfo_t*)(f))->package; \ + else \ + m##_ns.name = ""; \ m.type = QNAME; \ m.ns = &m##_ns; \ m.namespace_set = 0; \ - m.name = f->name; \ + m.name = ((slotinfo_t*)(f))->name; \ } else { \ m.type = MULTINAME; \ m.ns =0; \ @@ -396,11 +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() { @@ -408,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) { @@ -430,36 +492,68 @@ 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; } - if(leaving->cls && leaving->cls != state->cls) { + if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) { free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } +static code_t* method_header(methodstate_t*m); +static code_t* wrap_function(code_t*c,code_t*header, code_t*body); +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0); + + +static char* internal_filename_package = 0; 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 = filename; + state->package = internal_filename_package = strdup(filename); - state->method = rfx_calloc(sizeof(methodstate_t)); - state->method->variable_count = 1; + global->token2info = dict_lookup(global->file2token2info, + current_filename // use long version + ); + if(!global->token2info) { + global->token2info = dict_new2(&ptr_type); + dict_put(global->file2token2info, current_filename, global->token2info); + } + + 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); + } } void finish_file() @@ -467,6 +561,15 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } + + if(as3_pass==2) { + code_t*header = method_header(state->method); + code_t*c = wrap_function(header, 0, global->init->method->body->code); + global->init->method->body->code = c; + free(state->method);state->method=0; + } + + //free(state->package);state->package=0; // used in registry state_destroy(state);state=0; } @@ -475,24 +578,16 @@ void initialize_parser() global = rfx_calloc(sizeof(global_t)); global->file = abc_file_new(); global->file->flags &= ~ABCFILE_LAZY; - global->token2info = dict_new2(&ptr_type); - - global->init = abc_initscript(global->file); - code_t*c = global->init->method->body->code; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - global->init->method->body->code = c; + global->file2token2info = dict_new(); + global->token2info = 0; } void* finish_parser() { - code_t*c = global->init->method->body->code; - /*c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "[leaving global init function]"); - c = abc_callpropvoid(c, "[package]::trace", 1);*/ - c = abc_returnvoid(c); - global->init->method->body->code = c; - dict_destroy(global->token2info);global->token2info=0; + dict_free_all(global->file2token2info, 1, (void*)dict_destroy); + + global->token2info=0; + return global->file; } @@ -526,59 +621,80 @@ static void xx_scopetest() c = abc_iftrue(c,xx);*/ } - typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; + methodstate_t*is_inner_method; } variable_t; -static variable_t* find_variable(char*name) +static variable_t* find_variable(state_t*s, char*name) { - state_t* s = state; while(s) { variable_t*v = 0; - if(s->method) - v = dict_lookup(s->vars, name); - if(v) { - return v; - } - if(s->new_vars) - break; + v = dict_lookup(s->vars, name); + if(v) return v; + if(s->new_vars) break; s = s->old; } return 0; -} -static variable_t* find_variable_safe(char*name) +} +static variable_t* find_slot(state_t*s, const char*name) { - variable_t* v = find_variable(name); + if(s->method && s->method->slots) + return dict_lookup(s->method->slots, name); + return 0; +} + +static variable_t* find_variable_safe(state_t*s, char*name) +{ + variable_t* v = find_variable(s, name); if(!v) syntaxerror("undefined variable: %s", name); return v; } static char variable_exists(char*name) { - return dict_lookup(state->vars, name)!=0; + return dict_contains(state->vars, name); } code_t*defaultvalue(code_t*c, classinfo_t*type); -static int new_variable(const char*name, classinfo_t*type, char init) + +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) { + variable_t*v = find_slot(state, name); + if(v) + return v; + } + 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 state->method->variable_count++; + return v; +} +static int new_variable(const char*name, classinfo_t*type, char init, char maybeslot) +{ + return new_variable2(name, type, init, maybeslot)->index; } + #define TEMPVARNAME "__as3_temp__" static int gettempvar() { - variable_t*v = find_variable(TEMPVARNAME); + variable_t*v = find_variable(state, TEMPVARNAME); if(v) return v->index; - return new_variable(TEMPVARNAME, 0, 0); + return new_variable(TEMPVARNAME, 0, 0, 0); } code_t* var_block(code_t*body) @@ -625,6 +741,96 @@ code_t* var_block(code_t*body) return c; } +void unknown_variable(char*name) +{ + if(!state->method->unresolved_variables) + state->method->unresolved_variables = dict_new(); + if(!dict_contains(state->method->unresolved_variables, name)) + dict_put(state->method->unresolved_variables, name, 0); +} + +#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} + +static void parsererror(const char*file, int line, const char*f) +{ + syntaxerror("internal error in %s, %s:%d", f, file, line); +} + + +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) +{ + 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) { + /* 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); + if(m->uses_slots && l->methodstate->is_a_slot) { + c = abc_getscopeobject(c, 1); + c = abc_newfunction(c, l->methodstate->abc); + c = abc_dup(c); + c = abc_setlocal(c, l->methodstate->var_index); + c = abc_setslot(c, l->methodstate->slot_index); + } else { + c = abc_newfunction(c, l->methodstate->abc); + c = abc_setlocal(c, l->methodstate->var_index); + } + free(l->methodstate);l->methodstate=0; + l = l->next; + } + if(m->header) { + c = code_append(c, m->header); + m->header = 0; + } + if(m->is_constructor && !m->has_super) { + // call default constructor + 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; +} + + static code_t* wrap_function(code_t*c,code_t*header, code_t*body) { c = code_append(c, header); @@ -654,79 +860,223 @@ static void endpackage() old_state(); } -#define _TRACE_ {printf("vfw: %s: %d (%s)\n",__FILE__,__LINE__,__func__);fflush(stdout);} -#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} +#define FLAG_PUBLIC 256 +#define FLAG_PROTECTED 512 +#define FLAG_PRIVATE 1024 +#define FLAG_PACKAGEINTERNAL 2048 +#define FLAG_NAMESPACE 4096 -static void parsererror(const char*file, int line, const char*f) +static namespace_t modifiers2access(modifiers_t*mod) { - syntaxerror("internal error in %s, %s:%d", f, file, line); + 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"); + 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"); + 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"); + ns.access = ACCESS_PROTECTED; + } else { + ns.access = ACCESS_PACKAGEINTERNAL; + } + 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) +{ + if(var0) { + int index = -1; + if(m->inner) + index = new_variable("this", 0, 0, 0); + else if(!m->is_global) + index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0); + else + index = new_variable("globalscope", 0, 0, 0); + if(index) + *(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; + } + + if(params) { + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + 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, char interface) +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(); - state->cls = rfx_calloc(sizeof(classstate_t)); - state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor - state->method->variable_count = 1; + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; - if(flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC)) + 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) { - access = ACCESS_PRIVATE; package = current_filename; - } else if(!(flags&FLAG_PUBLIC) && state->package) { + if(!(mod->flags&FLAG_PUBLIC) && state->package==internal_filename_package) { + access = ACCESS_PRIVATE; 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) { + } else if(state->package!=internal_filename_package) { access = ACCESS_PACKAGE; package = state->package; } else { syntaxerror("public classes only allowed inside a package"); } if(as3_pass==1) { - if(registry_findclass(package, classname)) { + state->cls = rfx_calloc(sizeof(classstate_t)); + state->cls->init = rfx_calloc(sizeof(methodstate_t)); + state->cls->static_init = rfx_calloc(sizeof(methodstate_t)); + /* notice: we make no effort to initialize the top variable (local0) here, + even though it has special meaning. We just rely on the facat + that pass 1 won't do anything with variables */ + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls); + + /* set current method to constructor- all code within the class-level (except + static variable initializations) will be executed during construction time */ + state->method = state->cls->init; + + if(registry_find(package, classname)) { syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname); } /* build info struct */ int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); + 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) { - state->cls->info = registry_findclass(package, classname); - parserassert((int)state->cls->info); + state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + state->method = state->cls->init; + parserassert(state->cls && state->cls->info); + + function_initvars(state->cls->init, 0, 0, 1); + function_initvars(state->cls->static_init, 0, 0, 0); - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + if(extends && (extends->flags & FLAG_FINAL)) + syntaxerror("Can't extend final class '%s'", extends->name); + int pos = 0; - classinfo_list_t*l = implements; - for(l=implements;l;l=l->next) { - 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); state->cls->abc = abc_class_new(global->file, &classname2, extends2); - if(flags&FLAG_FINAL) abc_class_final(state->cls->abc); - if(!(flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc); - if(interface) { - state->cls->info->flags |= CLASS_INTERFACE; + if(state->cls->info->flags&FLAG_FINAL) abc_class_final(state->cls->abc); + if(!(state->cls->info->flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc); + if(state->cls->info->flags&FLAG_INTERFACE) { abc_class_interface(state->cls->abc); } @@ -789,7 +1139,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* flash.display.MovieClip handling */ - if(!as3_globalclass && (flags&FLAG_PUBLIC) && classinfo_equals(registry_getMovieClip(),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 { @@ -799,30 +1149,47 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } +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(flags && flags->flags&FLAG_STATIC) { + state->method = state->cls->static_init; + } else { + state->method = state->cls->init; + } + } else { + parserassert(state->method); + } +} + static void endclass() { if(as3_pass == 2) { - if(!state->cls->has_constructor && !(state->cls->info->flags&CLASS_INTERFACE)) { + if(!state->cls->has_constructor && !(state->cls->info->flags&FLAG_INTERFACE)) { code_t*c = 0; c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); - state->cls->init = code_append(state->cls->init, c); - } - if(!state->method->late_binding) { - // class initialization code uses late binding - code_t*c = 0; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - state->cls->static_init = code_append(c, state->cls->static_init); + state->cls->init->header = code_append(state->cls->init->header, c); + state->cls->has_constructor=1; } - if(state->cls->init) { - abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->init, m->body->code); + if(state->cls->info->flags&FLAG_INTERFACE) { + if(state->cls->init->header) + syntaxerror("interface can not have class-level code"); + } else { + abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); + code_t*c = method_header(state->cls->init); + m->body->code = wrap_function(c, 0, m->body->code); + } } if(state->cls->static_init) { abc_method_t*m = abc_class_getstaticconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->static_init, m->body->code); + code_t*c = method_header(state->cls->static_init); + m->body->code = wrap_function(c, 0, m->body->code); } } @@ -840,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; } } @@ -847,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 @@ -854,7 +1226,7 @@ static void check_constant_against_type(classinfo_t*t, constant_t*c) || c->type == CONSTANT_UINT); } else if(TYPE_IS_UINT(t)) { xassert(c->type == CONSTANT_UINT || - (c->type == CONSTANT_INT && c->i>0)); + (c->type == CONSTANT_INT && c->i>=0)); } else if(TYPE_IS_INT(t)) { xassert(c->type == CONSTANT_INT); } else if(TYPE_IS_BOOLEAN(t)) { @@ -863,122 +1235,114 @@ static void check_constant_against_type(classinfo_t*t, constant_t*c) } } - -static int flags2access(int flags) +static void check_override(memberinfo_t*m, int flags) { - int access = 0; - if(flags&FLAG_PUBLIC) { - if(access&(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)) - syntaxerror("invalid combination of access levels"); - access = ACCESS_PRIVATE; - } else if(flags&FLAG_PROTECTED) { - if(access&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) - syntaxerror("invalid combination of access levels"); - access = ACCESS_PROTECTED; - } else { - access = ACCESS_PACKAGEINTERNAL; + if(!m) + return; + if(m->parent == state->cls->info) + syntaxerror("class '%s' already contains a method/slot '%s'", m->parent->name, m->name); + if(!m->parent) + syntaxerror("internal error: overriding method %s, which doesn't have parent", m->name); + if(m->access==ACCESS_PRIVATE) + 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);*/ + + 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) && !(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"); + else + syntaxerror("can't override '%s'", m->name); + } } - return access; } - -static memberinfo_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) { - memberinfo_t*minfo = 0; + methodinfo_t*minfo = 0; + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = memberinfo_register_global(flags2access(flags), state->package, name, MEMBER_METHOD); - 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 - if((minfo = registry_findmember(state->cls->info, name, 0))) { - if(minfo->parent == state->cls->info) { - syntaxerror("class already contains a member/method called '%s'", name); - } else if(!minfo->parent) { - syntaxerror("internal error: overriding method %s, which doesn't have parent", name); - } else { - if(!(minfo->flags&(FLAG_STATIC|FLAG_PRIVATE))) - syntaxerror("function %s already exists in superclass. Did you forget the 'override' keyword?"); - } + 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 = memberinfo_register(state->cls->info, name, MEMBER_METHOD); - 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; } else { //class getter/setter - int gs = getset==KW_GET?MEMBER_GET:MEMBER_SET; + 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 - if((minfo=registry_findmember(state->cls->info, name, 0))) { - if(minfo->kind & ~(MEMBER_GET|MEMBER_SET)) - syntaxerror("class already contains a member or method called '%s'", name); - if(minfo->kind & gs) + 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); + if(!(minfo->subtype & (SUBTYPE_GETSET))) + syntaxerror("class already contains a field called '%s'", name); + if(minfo->subtype & gs) syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ - minfo->kind |= gs; - if(!minfo->type) - minfo->type = type; - else - if(type && minfo->type != type) - syntaxerror("different type in getter and setter"); + minfo->subtype |= gs; + + /* + 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 = memberinfo_register(state->cls->info, name, gs); - minfo->type = type; + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); + minfo->kind = INFOTYPE_SLOT; //hack + minfo->subtype = gs; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_PUBLIC) minfo->flags |= FLAG_PUBLIC; - if(flags&FLAG_PRIVATE) minfo->flags |= FLAG_PRIVATE; - if(flags&FLAG_PROTECTED) minfo->flags |= FLAG_PROTECTED; - if(flags&FLAG_PACKAGEINTERNAL) minfo->flags |= FLAG_PACKAGEINTERNAL; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; - return minfo; -} - -static void function_initvars(params_t*params, int flags) -{ - if(state->method->inner) - new_variable("this", 0, 0); - else if(!state->method->is_global) - new_variable((flags&FLAG_STATIC)?"class":"this", state->cls->info, 0); - else - new_variable("globalscope", 0, 0); + 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; - param_list_t*p=0; - for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0); - } - - methodstate_list_t*l = state->method->innerfunctions; - while(l) { - methodstate_t*m = l->methodstate; - m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0); - l = l->next; - } + return minfo; } static void innerfunction(char*name, params_t*params, classinfo_t*return_type) { - parserassert(state->method && state->method->info); + //parserassert(state->method && state->method->info); methodstate_t*parent_method = state->method; if(as3_pass==1) { - // not valid yet - params = 0; - return_type = 0; + return_type = 0; // not valid in pass 1 } new_state(); @@ -990,36 +1354,42 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) state->method->variable_count = 0; state->method->abc = rfx_calloc(sizeof(abc_method_t)); - NEW(memberinfo_t,minfo); + NEW(methodinfo_t,minfo); + minfo->kind = INFOTYPE_METHOD; + minfo->access = ACCESS_PACKAGEINTERNAL; minfo->name = name; state->method->info = minfo; - list_append(parent_method->innerfunctions, state->method); + if(parent_method) + 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); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); state->method->info->return_type = return_type; - function_initvars(params, 0); + function_initvars(state->method, params, 0, 1); } } -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) { syntaxerror("not able to start another method scope"); } new_state(); + state->new_vars = 1; if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); state->method->has_super = 0; - state->method->variable_count = 0; if(state->cls) { state->method->is_constructor = !strcmp(state->cls->info->name,name); @@ -1030,94 +1400,177 @@ 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, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); + + if(state->cls) { + memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2); + check_override(m, mod->flags); + } if(state->cls) { state->cls->has_constructor |= state->method->is_constructor; } state->method->info->return_type = return_type; - function_initvars(params, flags); + 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) { + // store inner methods in variables + 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); + if(m->unresolved_variables) { + dict_t*d = m->unresolved_variables; + int t; + for(t=0;thashsize;t++) { + dictentry_t*l = d->slots[t]; + while(l) { + /* check parent method's variables */ + 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); + } + l = l->next; + } + if(l) break; + } + + dict_destroy(m->unresolved_variables); + m->unresolved_variables = 0; + } + 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++; + if(v->is_inner_method) { + v->is_inner_method->is_a_slot = 1; + } + //v->type = 0; + dict_put(state->method->slots, name, v); + } + } + state->method->uses_slots = i; + dict_destroy(state->vars);state->vars = 0; + } old_state(); return 0; } - abc_method_t*f = 0; - - multiname_t*type2 = sig2mname(return_type); - int slot = 0; - if(state->method->inner) { - f = state->method->abc; - abc_method_init(f, global->file, type2, 1); - } else if(state->method->is_constructor) { - f = abc_class_getconstructor(state->cls->abc, type2); - } else if(!state->method->is_global) { - namespace_t mname_ns = flags2namespace(flags, ""); - multiname_t mname = {QNAME, &mname_ns, 0, name}; + if(as3_pass==2) { + /*if(state->method->uses_parent_function){ + syntaxerror("accessing variables of parent function from inner functions not supported yet"); + }*/ - if(flags&FLAG_STATIC) - f = abc_class_staticmethod(state->cls->abc, type2, &mname); - else - f = abc_class_method(state->cls->abc, type2, &mname); - slot = f->trait->slot_id; - } else { - namespace_t mname_ns = flags2namespace(flags, state->package); - multiname_t mname = {QNAME, &mname_ns, 0, name}; + abc_method_t*f = 0; - f = abc_method_new(global->file, type2, 1); - trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f); - //abc_code_t*c = global->init->method->body->code; - } - //flash doesn't seem to allow us to access function slots - //state->method->info->slot = slot; + multiname_t*type2 = sig2mname(return_type); + int slot = 0; + if(state->method->inner) { + f = state->method->abc; + abc_method_init(f, global->file, type2, 1); + } else if(state->method->is_constructor) { + f = abc_class_getconstructor(state->cls->abc, type2); + } else if(!state->method->is_global) { + namespace_t mname_ns = modifiers2access(mod); + multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(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; + if(mod->flags&FLAG_STATIC) + f = abc_class_staticmethod(state->cls->abc, type2, &mname); + else + f = abc_class_method(state->cls->abc, type2, &mname); + slot = f->trait->slot_id; + } else { + namespace_t mname_ns = {state->method->info->access, state->package}; + multiname_t mname = {QNAME, &mname_ns, 0, name}; - char opt=0; - param_list_t*p=0; - for(p=params->list;p;p=p->next) { - if(params->varargs && !p->next) { - break; //varargs: omit last parameter in function signature + f = abc_method_new(global->file, type2, 1); + trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f); + //abc_code_t*c = global->init->method->body->code; } - multiname_t*m = sig2mname(p->param->type); - list_append(f->parameters, m); - if(p->param->value) { - check_constant_against_type(p->param->type, p->param->value); - opt=1;list_append(f->optional_parameters, p->param->value); - } else if(opt) { - syntaxerror("non-optional parameter not allowed after optional parameters"); + //flash doesn't seem to allow us to access function slots + //state->method->info->slot = slot; + + 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; + + char opt=0; + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + if(params->varargs && !p->next) { + break; //varargs: omit last parameter in function signature + } + multiname_t*m = sig2mname(p->param->type); + list_append(f->parameters, m); + if(p->param->value) { + check_constant_against_type(p->param->type, p->param->value); + opt=1;list_append(f->optional_parameters, p->param->value); + } else if(opt) { + syntaxerror("non-optional parameter not allowed after optional parameters"); + } + } + if(state->method->slots) { + DICT_ITERATE_ITEMS(state->method->slots, char*, name, variable_t*, v) { + if(v->index) { + multiname_t*mname = multiname_new(namespace_new(ACCESS_PACKAGE, ""), name); + multiname_t*type = sig2mname(v->type); + trait_t*t = trait_new_member(&f->body->traits, type, mname, 0); + t->slot_id = v->index; + } + } + } + + 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; + } else { //interface + if(body) + syntaxerror("interface methods can't have a method body"); } - } - check_code_for_break(body); - if(f->body) { - f->body->code = body; - f->body->exceptions = state->method->exceptions; - } else { //interface - if(body) - syntaxerror("interface methods can't have a method body"); + old_state(); + return f; } - - old_state(); - return f; + + return 0; } char is_subtype_of(classinfo_t*type, classinfo_t*supertype) @@ -1217,8 +1670,13 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*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); - return 0; // make gcc happy + if(TYPE_IS_NULL(from) && !IS_NUMBER_OR_INT(to)) + return c; + + as3_error("can't convert type %s%s%s to %s%s%s", + from->package, from->package?".":"", from->name, + to->package, to->package?".":"", to->name); + return c; } code_t*defaultvalue(code_t*c, classinfo_t*type) @@ -1246,11 +1704,41 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static classinfo_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) { - classinfo_t*c=0; + slotinfo_t*c=0; - c = registry_findclass(state->package, name); + c = registry_find(state->package, name); if(c) return c; /* try explicit imports */ @@ -1258,7 +1746,7 @@ static classinfo_t* find_class(char*name) if(c) return c; while(e) { if(!strcmp(e->key, name)) { - c = (classinfo_t*)e->data; + c = (slotinfo_t*)e->data; if(c) return c; } e = e->next; @@ -1268,21 +1756,58 @@ static classinfo_t* find_class(char*name) import_list_t*l = state->wildcard_imports; while(l) { //printf("does package %s contain a class %s?\n", l->import->package, name); - c = registry_findclass(l->import->package, name); + c = registry_find(l->import->package, name); if(c) return c; l = l->next; } /* try global package */ - c = registry_findclass("", name); + c = registry_find("", name); if(c) return c; - + /* try local "filename" package */ - c = registry_findclass(current_filename_short, name); + c = registry_find(internal_filename_package, name); if(c) return c; 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) { @@ -1315,7 +1840,6 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar] */ - if(in && in->opcode == OPCODE_COERCE_A) { in = code_cutlast(in); } @@ -1331,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 */ @@ -1380,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"); @@ -1435,6 +1963,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r c = code_append(c, write); c = code_append(c, r); } else { + code_free(r);r=0; temp = gettempvar(); if(prefix) { c = code_append(c, prefix); @@ -1465,7 +1994,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1573,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); } } @@ -1605,6 +2133,7 @@ PROGRAM_CODE: PACKAGE_DECLARATION | FUNCTION_DECLARATION | SLOT_DECLARATION | PACKAGE_INITCODE + | CONDITIONAL_COMPILATION '{' MAYBE_PROGRAM_CODE_LIST '}' // conditional compilation | ';' MAYBE_INPACKAGE_CODE_LIST: | INPACKAGE_CODE_LIST @@ -1616,6 +2145,7 @@ INPACKAGE_CODE: INTERFACE_DECLARATION | FUNCTION_DECLARATION | SLOT_DECLARATION | PACKAGE_INITCODE + | CONDITIONAL_COMPILATION '{' MAYBE_INPACKAGE_CODE_LIST '}' // conditional compilation | ';' MAYBECODE: CODE {$$=$1;} @@ -1624,7 +2154,7 @@ MAYBECODE: {$$=code_new();} CODE: CODE CODEPIECE {$$=code_append($1,$2);} CODE: CODEPIECE {$$=$1;} -// code which also may appear outside a method +// code which may appear outside of methods CODE_STATEMENT: IMPORT CODE_STATEMENT: FOR CODE_STATEMENT: FOR_IN @@ -1635,8 +2165,12 @@ CODE_STATEMENT: IF CODE_STATEMENT: WITH CODE_STATEMENT: TRY CODE_STATEMENT: VOIDEXPRESSION +CODE_STATEMENT: USE_NAMESPACE +CODE_STATEMENT: NAMESPACE_DECLARATION +CODE_STATEMENT: '{' CODE '}' {$$=$2;} +CODE_STATEMENT: '{' '}' {$$=0;} -// code which may appear anywhere +// code which may appear in methods CODEPIECE: ';' {$$=0;} CODEPIECE: CODE_STATEMENT CODEPIECE: VARIABLE_DECLARATION @@ -1644,12 +2178,10 @@ CODEPIECE: BREAK CODEPIECE: CONTINUE CODEPIECE: RETURN CODEPIECE: THROW +CODEPIECE: CONDITIONAL_COMPILATION '{' CODE '}' {$$=$3;} -CODEPIECE: NAMESPACE_DECLARATION {/*TODO*/$$=0;} -CODEPIECE: USE_NAMESPACE {/*TODO*/$$=0;} - -CODEBLOCK : '{' CODE '}' {$$=$2;} -CODEBLOCK : '{' '}' {$$=0;} +//CODEBLOCK : '{' CODE '}' {$$=$2;} +//CODEBLOCK : '{' '}' {$$=0;} CODEBLOCK : CODEPIECE ';' {$$=$1;} CODEBLOCK : CODEPIECE %prec below_semicolon {$$=$1;} @@ -1660,6 +2192,10 @@ PACKAGE_INITCODE: CODE_STATEMENT { *cc = code_append(*cc, $1); } +/* ------------ conditional compilation ------------- */ + +CONDITIONAL_COMPILATION: T_IDENTIFIER "::" T_IDENTIFIER + /* ------------ variables --------------------------- */ MAYBEEXPRESSION : '=' NONCOMMAEXPRESSION {$$=$2;} @@ -1675,41 +2211,61 @@ VARIABLE_LIST: VARIABLE_LIST ',' ONE_VARIABLE {$$ = code_append($1, $3);} ONE_VARIABLE: T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { +PASS12 if(variable_exists($1)) syntaxerror("Variable %s already defined", $1); +PASS1 + new_variable($1, 0, 1, 0); +PASS2 if(!is_subtype_of($3.t, $2)) { syntaxerror("Can't convert %s to %s", $3.t->name, $2->name); } - int index = new_variable($1, $2, 1); + char slot = 0; + int index = 0; + if(state->method->uses_slots) { + variable_t* v = find_slot(state, $1); + if(v && !v->init) { + // this variable is stored in a slot + v->init = 1; + v->type = $2; + slot = 1; + index = v->index; + } + } + if(!index) { + index = new_variable($1, $2, 1, 0); + } + + $$ = slot?abc_getscopeobject(0, 1):0; if($2) { if($3.c->prev || $3.c->opcode != OPCODE_PUSHUNDEFINED) { - $$ = $3.c; + $$ = code_append($$, $3.c); $$ = converttype($$, $3.t, $2); - $$ = abc_setlocal($$, index); } else { - $$ = defaultvalue(0, $2); - $$ = abc_setlocal($$, index); + code_free($3.c); + $$ = defaultvalue($$, $2); } } else { if($3.c->prev || $3.c->opcode != OPCODE_PUSHUNDEFINED) { - $$ = $3.c; + $$ = code_append($$, $3.c); $$ = abc_coerce_a($$); - $$ = abc_setlocal($$, index); } else { - $$ = code_new(); + // don't do anything + code_free($3.c); + code_free($$); + $$ = 0; + break; } } - - /* that's the default for a local register, anyway - else { - state->method->initcode = abc_pushundefined(state->method->initcode); - state->method->initcode = abc_setlocal(state->method->initcode, index); - }*/ - //printf("variable %s -> %d (%s)\n", $2->text, index, $4.t?$4.t->name:""); + if(slot) { + $$ = abc_setslot($$, index); + } else { + $$ = abc_setlocal($$, index); + } } /* ------------ control flow ------------------------- */ @@ -1718,7 +2274,7 @@ MAYBEELSE: %prec below_else {$$ = code_new();} MAYBEELSE: "else" CODEBLOCK {$$=$2;} //MAYBEELSE: ';' "else" CODEBLOCK {$$=$3;} -IF : "if" '(' {new_state();} EXPRESSION ')' CODEBLOCK MAYBEELSE { +IF : "if" '(' {PASS12 new_state();} EXPRESSION ')' CODEBLOCK MAYBEELSE { $$ = code_new(); $$ = code_append($$, $4.c); @@ -1734,7 +2290,7 @@ IF : "if" '(' {new_state();} EXPRESSION ')' CODEBLOCK MAYBEELSE { myjmp->branch = $$ = abc_nop($$); } $$ = var_block($$); - old_state(); + PASS12 old_state(); } FOR_INIT : {$$=code_new();} @@ -1742,15 +2298,19 @@ FOR_INIT : VARIABLE_DECLARATION FOR_INIT : VOIDEXPRESSION // TODO: why doesn't an %prec above_identifier resolve the r-r conflict here? +// (I don't see any easy way to revolve this conflict otherwise, as we +// can't touch VAR_READ without upsetting the precedence about "return") FOR_IN_INIT : "var" T_IDENTIFIER MAYBETYPE { - $$=$2;new_variable($2,$3,1); + PASS1 $$=$2;new_variable($2,0,1,0); + PASS2 $$=$2;new_variable($2,$3,1,0); } FOR_IN_INIT : T_IDENTIFIER { + PASS12 $$=$1; } -FOR_START : T_FOR '(' {new_state();$$.name=$1;$$.each=0;} -FOR_START : T_FOR "each" '(' {new_state();$$.name=$1;$$.each=1;} +FOR_START : T_FOR '(' {PASS12 new_state();$$.name=$1;$$.each=0;} +FOR_START : T_FOR "each" '(' {PASS12 new_state();$$.name=$1;$$.each=1;} FOR : FOR_START FOR_INIT ';' EXPRESSION ';' VOIDEXPRESSION ')' CODEBLOCK { if($1.each) syntaxerror("invalid syntax: ; not allowed in for each statement"); @@ -1769,15 +2329,19 @@ FOR : FOR_START FOR_INIT ';' EXPRESSION ';' VOIDEXPRESSION ')' CODEBLOCK { myif->branch = out; $$ = var_block($$); - old_state(); + PASS12 old_state(); } FOR_IN : FOR_START FOR_IN_INIT "in" EXPRESSION ')' CODEBLOCK { - variable_t*var = find_variable($2); + 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); + int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2($2, "__array__"); - int array = new_variable(tmp1name, 0, 0); + int array = new_variable(tmp1name, 0, 0, 0); $$ = code_new(); $$ = code_append($$, $4.c); @@ -1809,13 +2373,14 @@ FOR_IN : FOR_START FOR_IN_INIT "in" EXPRESSION ')' CODEBLOCK { myif->branch = out; $$ = var_block($$); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } -WHILE : T_WHILE '(' {new_state();} EXPRESSION ')' CODEBLOCK { +WHILE : T_WHILE '(' {PASS12 new_state();} EXPRESSION ')' CODEBLOCK { $$ = code_new(); @@ -1831,10 +2396,10 @@ WHILE : T_WHILE '(' {new_state();} EXPRESSION ')' CODEBLOCK { continuejumpsto($$, $1, cont); $$ = var_block($$); - old_state(); + PASS12 old_state(); } -DO_WHILE : T_DO {new_state();} CODEBLOCK "while" '(' EXPRESSION ')' { +DO_WHILE : T_DO {PASS12 new_state();} CODEBLOCK "while" '(' EXPRESSION ')' { $$ = code_new(); code_t*loopstart = $$ = abc_label($$); $$ = code_append($$, $3); @@ -1846,7 +2411,7 @@ DO_WHILE : T_DO {new_state();} CODEBLOCK "while" '(' EXPRESSION ')' { continuejumpsto($$, $1, cont); $$ = var_block($$); - old_state(); + PASS12 old_state(); } BREAK : "break" %prec prec_none { @@ -1870,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); @@ -1883,10 +2448,12 @@ CASE: "case" E ':' MAYBECODE { DEFAULT: "default" ':' MAYBECODE { $$ = $3; } -SWITCH : T_SWITCH '(' {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; @@ -1907,12 +2474,16 @@ SWITCH : T_SWITCH '(' {new_state();} E ')' '{' MAYBE_CASE_LIST '}' { } $$ = var_block($$); - old_state(); + PASS12 old_state(); } /* ------------ try / catch /finally ---------------- */ -CATCH: "catch" '(' T_IDENTIFIER MAYBETYPE ')' {new_state();state->exception_name=$3;new_variable($3, $4, 0);} +CATCH: "catch" '(' T_IDENTIFIER MAYBETYPE ')' {PASS12 new_state(); + state->exception_name=$3; + PASS1 new_variable($3, 0, 0, 0); + PASS2 new_variable($3, $4, 0, 0); + } '{' MAYBECODE '}' { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, $3}; @@ -1923,20 +2494,20 @@ CATCH: "catch" '(' T_IDENTIFIER MAYBETYPE ')' {new_state();state->exception_name $$ = e; code_t*c = 0; - int i = find_variable_safe($3)->index; + 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); c = var_block(c); - old_state(); + PASS12 old_state(); } -FINALLY: "finally" '{' {new_state();state->exception_name=0;} MAYBECODE '}' { +FINALLY: "finally" '{' {PASS12 new_state();state->exception_name=0;} MAYBECODE '}' { $4 = var_block($4); if(!$4) { $$=0; - old_state(); } else { NEW(abc_exception_t, e) e->exc_type = 0; //all exceptions @@ -1944,9 +2515,9 @@ FINALLY: "finally" '{' {new_state();state->exception_name=0;} MAYBECODE '}' { e->target = 0; e->to = abc_nop(0); e->to = code_append(e->to, $4); - old_state(); $$ = e; } + PASS12 old_state(); } CATCH_LIST: CATCH {$$.l=list_new();$$.finally=0;list_append($$.l,$1);} @@ -1969,7 +2540,10 @@ CATCH_FINALLY_LIST: FINALLY { } } -TRY : "try" '{' {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); @@ -1981,7 +2555,7 @@ TRY : "try" '{' {new_state();} MAYBECODE '}' CATCH_FINALLY_LIST { int tmp; if($6.finally) - tmp = new_variable("__finally__", 0, 0); + tmp = new_variable("__finally__", 0, 0, 0); abc_exception_list_t*l = $6.l; int count=0; @@ -1994,6 +2568,7 @@ TRY : "try" '{' {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__($$); } @@ -2009,7 +2584,7 @@ TRY : "try" '{' {new_state();} MAYBECODE '}' CATCH_FINALLY_LIST { list_concat(state->method->exceptions, $6.l); $$ = var_block($$); - old_state(); + PASS12 old_state(); } /* ------------ throw ------------------------------- */ @@ -2021,7 +2596,7 @@ THROW : "throw" EXPRESSION { THROW : "throw" %prec prec_none { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); - variable_t*v = find_variable(state->exception_name); + variable_t*v = find_variable(state, state->exception_name); $$=code_new(); $$=abc_getlocal($$, v->index); $$=abc_throw($$); @@ -2029,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);} @@ -2049,57 +2643,78 @@ PACKAGE_DECLARATION : "package" PACKAGE '{' {PASS12 startpackage($2);free($2);$2 PACKAGE_DECLARATION : "package" '{' {PASS12 startpackage("");} MAYBE_INPACKAGE_CODE_LIST '}' {PASS12 endpackage();$$=0;} -IMPORT : "import" QNAME { +IMPORT : "import" PACKAGEANDCLASS { + PASS12 + slotinfo_t*s = registry_find($2->package, $2->name); + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { + as3_schedule_class($2->package, $2->name); + } 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) && as3_pass==1) { + as3_schedule_package($2); + } + 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;} - -EXTENDS : {$$=registry_getobjectclass();} -EXTENDS : KW_EXTENDS QNAME {$$=$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 QNAME_LIST {PASS12 $$=$2;} +EXTENDS_LIST : KW_EXTENDS CLASS_SPEC_LIST {PASS12 $$=$2;} IMPLEMENTS_LIST : {PASS12 $$=list_new();} -IMPLEMENTS_LIST : KW_IMPLEMENTS QNAME_LIST {PASS12 $$=$2;} +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, 0);} + '{' {PASS12 startclass(&$1,$3,$4,$5);} MAYBE_CLASS_BODY '}' {PASS12 endclass();$$=0;} INTERFACE_DECLARATION : MAYBE_MODIFIERS "interface" T_IDENTIFIER EXTENDS_LIST - '{' {PASS12 startclass($1,$3,0,$4,1);} + '{' {PASS12 $1.flags|=FLAG_INTERFACE; + startclass(&$1,$3,0,$4);} MAYBE_INTERFACE_BODY '}' {PASS12 endclass();$$=0;} @@ -2110,13 +2725,14 @@ MAYBE_CLASS_BODY : CLASS_BODY CLASS_BODY : CLASS_BODY_ITEM CLASS_BODY : CLASS_BODY CLASS_BODY_ITEM CLASS_BODY_ITEM : ';' +CLASS_BODY_ITEM : CONDITIONAL_COMPILATION '{' MAYBE_CLASS_BODY '}' CLASS_BODY_ITEM : SLOT_DECLARATION CLASS_BODY_ITEM : FUNCTION_DECLARATION CLASS_BODY_ITEM : CODE_STATEMENT { - code_t*c = state->cls->static_init; + code_t*c = state->cls->static_init->header; c = code_append(c, $1); - state->cls->static_init = c; + state->cls->static_init->header = c; } MAYBE_INTERFACE_BODY : @@ -2129,51 +2745,73 @@ 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); } /* ------------ classes and interfaces (body, slots ) ------- */ VARCONST: "var" | "const" -SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { - int flags = $1; - memberinfo_t* info = state->cls? - memberinfo_register(state->cls->info, $3, MEMBER_SLOT): - memberinfo_register_global(flags2access($1), state->package, $3, MEMBER_SLOT); +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, ns.name, $1, 1); + if(i) { + check_override(i, flags); + } + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, $1); + } else { + slotinfo_t*i = registry_find(state->package, $1); + if(i) { + 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(ns.access, state->package, $1); + } - info->type = $4; + info->type = $2; info->flags = flags; /* slot name */ - namespace_t mname_ns = {flags2access(flags), ""}; - 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) { // static variable traits = &state->cls->abc->static_traits; - code = &state->cls->static_init; + code = &state->cls->static_init->header; } else { // instance variable traits = &state->cls->abc->traits; - code = &state->cls->init; + code = &state->cls->init->header; } trait_t*t=0; - if($4) { - MULTINAME(m, $4); + 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); @@ -2182,16 +2820,16 @@ SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER MAYBETYPE MAYBEEXPRESSIO /* initalization code (if needed) */ code_t*c = 0; - if($5.c && !is_pushundefined($5.c)) { + if($3.c && !is_pushundefined($3.c)) { c = abc_getlocal_0(c); - c = code_append(c, $5.c); - c = converttype(c, $5.t, $4); + 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; } @@ -2207,11 +2845,19 @@ STATICCONSTANT : T_BYTE {$$ = constant_new_int($1);} STATICCONSTANT : T_INT {$$ = constant_new_int($1);} STATICCONSTANT : T_UINT {$$ = constant_new_uint($1);} STATICCONSTANT : T_FLOAT {$$ = constant_new_float($1);} -STATICCONSTANT : T_STRING {$$ = constant_new_string2($1.str,$1.len);} +STATICCONSTANT : T_STRING {$$ = constant_new_string2($1.str,$1.len);free((char*)$1.str);} //STATICCONSTANT : T_NAMESPACE {$$ = constant_new_namespace($1);} STATICCONSTANT : "true" {$$ = constant_new_true($1);} STATICCONSTANT : "false" {$$ = constant_new_false($1);} STATICCONSTANT : "null" {$$ = constant_new_null($1);} +STATICCONSTANT : T_IDENTIFIER { + 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) ------- */ @@ -2252,55 +2898,39 @@ PARAM_LIST: PARAM { } PARAM: T_IDENTIFIER ':' TYPE MAYBESTATICCONSTANT { - PASS1 $$=0; - PASS2 - $$ = malloc(sizeof(param_t)); + PASS12 + $$ = rfx_calloc(sizeof(param_t)); $$->name=$1; $$->type = $3; + PASS2 $$->value = $4; } PARAM: T_IDENTIFIER MAYBESTATICCONSTANT { - PASS1 $$=0; - PASS2 - $$ = malloc(sizeof(param_t)); + PASS12 + $$ = rfx_calloc(sizeof(param_t)); $$->name=$1; $$->type = TYPE_ANY; + PASS2 $$->value = $2; } -GETSET : "get" {$$=$1;} - | "set" {$$=$1;} - | {$$=0;} +GETSET : "get" + | "set" + | {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 old_state(); + PASS1 + endfunction(&$1,$3,$4,&$6,0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); - code_t*c = 0; - if(state->method->late_binding) { - c = abc_getlocal_0(c); - c = abc_pushscope(c); - } - if(state->method->is_constructor && !state->method->has_super) { - // call default constructor - c = abc_getlocal_0(c); - c = abc_constructsuper(c, 0); - } - methodstate_list_t*l = state->method->innerfunctions; - while(l) { - parserassert(l->methodstate->abc); - c = abc_newfunction(c, l->methodstate->abc); - c = abc_setlocal(c, l->methodstate->var_index); - free(l->methodstate);l->methodstate=0; - l = l->next; - } - list_free(state->method->innerfunctions); - state->method->innerfunctions = 0; - + + 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; } @@ -2309,49 +2939,69 @@ MAYBE_IDENTIFIER: {PASS12 $$=0;} INNERFUNCTION: "function" MAYBE_IDENTIFIER '(' MAYBE_PARAM_LIST ')' MAYBETYPE '{' {PASS12 innerfunction($2,&$4,$6);} MAYBECODE '}' { - PASS1 old_state(); + PASS1 + endfunction(0,0,$2,&$4,0,0); PASS2 - memberinfo_t*f = state->method->info; - if(!f) syntaxerror("internal error"); - - code_t*c = 0; + methodinfo_t*f = state->method->info; + if(!f || !f->kind) syntaxerror("internal error"); + + code_t*c = method_header(state->method); 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); + + PASS12 list_deep_free($4.list); } /* ------------- 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 - /* try current package */ - $$ = find_class($1); - if(!$$) syntaxerror("Could not find class %s\n", $1); -} - -PACKAGEANDCLASS : PACKAGE '.' T_IDENTIFIER { - PASS1 $$=0; + 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 '.' 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 - $$ = registry_findclass($1, $3); - if(!$$) syntaxerror("Couldn't find class %s.%s\n", $1, $3); + slotinfo_t*s = registry_find($1, $3); + if(!s) syntaxerror("Couldn't find class/method %s.%s\n", $1, $3); free($1);$1=0; + $$ = (classinfo_t*)s; } -QNAME: PACKAGEANDCLASS - | CLASS +CLASS_SPEC: PACKAGEANDCLASS + | CLASS -QNAME_LIST : QNAME {PASS12 $$=list_new();list_append($$, $1);} -QNAME_LIST : QNAME_LIST ',' QNAME {PASS12 $$=$1;list_append($$,$3);} +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 : QNAME {$$=$1;} - | '*' {$$=registry_getanytype();} - | "void" {$$=registry_getanytype();} +TYPE : CLASS_SPEC {PASS12 $$=$1;} + | '*' {PASS12 $$=registry_getanytype();} + | "void" {PASS12 $$=registry_getanytype();} /* | "String" {$$=registry_getstringclass();} | "int" {$$=registry_getintclass();} @@ -2360,42 +3010,59 @@ TYPE : QNAME {$$=$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 -EXPRESSION_LIST : NONCOMMAEXPRESSION {$$.len=1; +MAYBE_EXPRESSION_LIST : EXPRESSION_LIST_AND_COMMA + +EXPRESSION_LIST : NONCOMMAEXPRESSION {$$.number=1; $$.cc = $1.c; } -EXPRESSION_LIST : EXPRESSION_LIST ',' NONCOMMAEXPRESSION { - $$.len= $1.len+1; - $$.cc = code_append($1.cc, $3.c); - } -NEW : "new" CLASS MAYBE_PARAM_VALUES { - MULTINAME(m, $2); - $$.c = code_new(); - - if($2->slot) { - $$.c = abc_getglobalscope($$.c); - $$.c = abc_getslot($$.c, $2->slot); +EXPRESSION_LIST_AND_COMMA: EXPRESSION_LIST ',' {$$ = $1;} +EXPRESSION_LIST : EXPRESSION_LIST_AND_COMMA NONCOMMAEXPRESSION { + $$.number= $1.number+1; + $$.cc = code_append($1.cc, $2.c); + } + +XX : %prec new2 +NEW : "new" E XX MAYBE_PARAM_VALUES { + $$.c = $2.c; + if($$.c->opcode == OPCODE_COERCE_A) $$.c = code_cutlast($$.c); + + code_t*paramcode = $4.cc; + if($$.c->opcode == OPCODE_GETPROPERTY) { + 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.number); + multiname_destroy(name); + } else if($$.c->opcode == OPCODE_GETSLOT) { + int slot = (int)(ptroff_t)$$.c->data[0]; + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME + multiname_t*name = t->name; + $$.c = code_cutlast($$.c); + $$.c = code_append($$.c, paramcode); + $$.c = abc_constructprop2($$.c, name, $4.number); } else { - $$.c = abc_findpropstrict2($$.c, &m); + $$.c = code_append($$.c, paramcode); + $$.c = abc_construct($$.c, $4.number); + } + + $$.t = TYPE_ANY; + if(TYPE_IS_CLASS($2.t) && $2.t->data) { + $$.t = $2.t->data; + } else { + $$.c = abc_coerce_a($$.c); + $$.t = TYPE_ANY; } - - $$.c = code_append($$.c, $3.cc); - - if($2->slot) - $$.c = abc_construct($$.c, $3.len); - else - $$.c = abc_constructprop2($$.c, &m, $3.len); - $$.t = $2; } /* TODO: use abc_call (for calling local variables), @@ -2415,11 +3082,11 @@ 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) { + } else if($$.c->opcode == OPCODE_GETSLOT && $$.c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)$$.c->data[0]; - trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot); if(t->kind!=TRAIT_METHOD) { //ok: flash allows to assign closures to members. } @@ -2427,29 +3094,27 @@ 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_getlocal_0($$.c); + $$.c = abc_getglobalscope($$.c); $$.c = code_append($$.c, paramcode); - $$.c = abc_call($$.c, $3.len); + $$.c = abc_call($$.c, $3.number); } - memberinfo_t*f = 0; - - if(TYPE_IS_FUNCTION($1.t) && $1.t->function) { - $$.t = $1.t->function->return_type; + if(TYPE_IS_FUNCTION($1.t) && $1.t->data) { + $$.t = ((methodinfo_t*)($1.t->data))->return_type; } else { $$.c = abc_coerce_a($$.c); $$.t = TYPE_ANY; } - } + FUNCTIONCALL : "super" '(' MAYBE_EXPRESSION_LIST ')' { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -2466,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; } @@ -2481,7 +3146,7 @@ DELETE: "delete" E { $$.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->abc,slot)->name; + multiname_t*name = traits_find_slotid(state->cls->abc->traits,slot)->name; $$.c = code_cutlast($$.c); $$.c = abc_deleteproperty2($$.c, name); } else { @@ -2517,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 @@ -2562,7 +3223,7 @@ CONSTANT : T_UINT {$$.c = abc_pushuint(0, $1); CONSTANT : T_FLOAT {$$.c = abc_pushdouble(0, $1); $$.t = TYPE_FLOAT; } -CONSTANT : T_STRING {$$.c = abc_pushstring2(0, &$1); +CONSTANT : T_STRING {$$.c = abc_pushstring2(0, &$1);free((char*)$1.str); $$.t = TYPE_STRING; } CONSTANT : "undefined" {$$.c = abc_pushundefined(0); @@ -2712,10 +3373,10 @@ E : E "in" E {$$.c = code_append($1.c,$3.c); } E : E "as" E {char use_astype=0; // flash player's astype works differently than astypelate - if(use_astype && TYPE_IS_CLASS($3.t)) { - MULTINAME(m,$3.t->cls); + if(use_astype && TYPE_IS_CLASS($3.t) && $3.t->data) { + MULTINAME(m, (classinfo_t*)($3.t->data)); $$.c = abc_astype2($1.c, &m); - $$.t = $3.t->cls; + $$.t = $3.t->data; } else { $$.c = code_append($1.c, $3.c); $$.c = abc_astypelate($$.c); @@ -2775,32 +3436,32 @@ 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); } //MAYBECOMMA: ',' //MAYBECOMMA: -E : '{' MAYBE_EXPRPAIR_LIST '}' { +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(); } @@ -2852,6 +3513,12 @@ E : E "|=" E { $$.c = toreadwrite($1.c, c, 0, 0); $$.t = $1.t; } +E : E "^=" E { + code_t*c = abc_bitxor($3.c); + c=converttype(c, TYPE_INT, $1.t); + $$.c = toreadwrite($1.c, c, 0, 0); + $$.t = $1.t; + } E : E "+=" E { code_t*c = $3.c; @@ -2892,13 +3559,13 @@ E : E '?' E ':' E %prec below_assignment { code_t*j2 = $$.c = abc_jump($$.c, 0); $$.c = j1->branch = abc_label($$.c); $$.c = code_append($$.c, $5.c); - $$.c = converttype($$.c, $3.t, $$.t); + $$.c = converttype($$.c, $5.t, $$.t); $$.c = j2->branch = abc_label($$.c); } 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)) { @@ -2971,73 +3638,164 @@ E : "super" '.' T_IDENTIFIER classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember(t, $3, 1); - namespace_t ns = flags2namespace(f->flags, ""); + memberinfo_t*f = findmember_nsset(t, $3, 1); + MEMBER_MULTINAME(m, f, $3); $$.c = 0; $$.c = abc_getlocal_0($$.c); $$.c = abc_getsuper2($$.c, &m); - $$.t = memberinfo_gettype(f); + $$.t = slotinfo_gettype((slotinfo_t*)f); } -E : E '.' T_IDENTIFIER - {$$.c = $1.c; - classinfo_t*t = $1.t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->cls) { - t = t->cls; - 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 = memberinfo_gettype(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 : '@' T_IDENTIFIER { + // attribute TODO + $$.c = abc_pushundefined(0); + $$.t = 0; + as3_warning("ignored @ operator"); + } + +E : E '.' '@' T_IDENTIFIER { + // child attribute TODO + $$.c = abc_pushundefined(0); + $$.t = 0; + as3_warning("ignored .@ operator"); + } + +E : E '.' T_IDENTIFIER "::" T_IDENTIFIER { + // namespace declaration TODO + $$.c = abc_pushundefined(0); + $$.t = 0; + as3_warning("ignored :: operator"); + } + +E : E ".." T_IDENTIFIER { + // descendants TODO + $$.c = abc_pushundefined(0); + $$.t = 0; + as3_warning("ignored .. operator"); + } + +E : E '.' '(' E ')' { + // filter TODO + $$.c = abc_pushundefined(0); + $$.t = 0; + as3_warning("ignored .() operator"); + } + +//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) { + 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 + /* Queue unresolved identifiers for checking against the parent + function's variables. + We consider everything which is not a local variable "unresolved". + This encompasses class names, members of the surrounding class + 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; $$.c = 0; - classinfo_t*a = 0; + slotinfo_t*a = 0; memberinfo_t*f = 0; variable_t*v; /* look at variables */ - if((v = find_variable($1))) { + if((v = find_variable(state, $1))) { // $1 is a local variable $$.c = abc_getlocal($$.c, v->index); $$.t = v->type; break; } + if((v = find_slot(state, $1))) { + $$.c = abc_getscopeobject($$.c, 1); + $$.c = abc_getslot($$.c, v->index); + $$.t = v->type; + break; + } 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); - if(f->kind == MEMBER_METHOD) { + if(f->kind == INFOTYPE_METHOD) { $$.t = TYPE_FUNCTION(f); } else { $$.t = f->type; @@ -3049,7 +3807,7 @@ VAR_READ : T_IDENTIFIER { static properties of a class */ state->method->late_binding = 1; $$.t = f->type; - namespace_t ns = {flags2access(f->flags), ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, $1}; $$.c = abc_findpropstrict2($$.c, &m); $$.c = abc_getproperty2($$.c, &m); @@ -3059,7 +3817,7 @@ VAR_READ : T_IDENTIFIER { $$.c = abc_getslot($$.c, f->slot); break; } else { - namespace_t ns = {flags2access(f->flags), ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, $1}; $$.c = abc_getlocal_0($$.c); $$.c = abc_getproperty2($$.c, &m); @@ -3069,31 +3827,22 @@ VAR_READ : T_IDENTIFIER { /* look at actual classes, in the current package and imported */ if((a = find_class($1))) { - if(a->flags & FLAG_METHOD) { - MULTINAME(m, a); - $$.c = abc_findpropstrict2($$.c, &m); - $$.c = abc_getproperty2($$.c, &m); - if(a->function->kind == MEMBER_METHOD) { - $$.t = TYPE_FUNCTION(a->function); - } else { - $$.t = a->function->type; - } - } else { - 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); - } + $$ = 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}; @@ -3104,16 +3853,63 @@ VAR_READ : T_IDENTIFIER { } } -//TODO: -//VARIABLE : VARIABLE ".." T_IDENTIFIER // descendants -//VARIABLE : VARIABLE "::" VARIABLE // namespace declaration -//VARIABLE : VARIABLE "::" '[' EXPRESSION ']' // qualified expression - // ----------------- 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 {$$=0;} +USE_NAMESPACE : "use" "namespace" CLASS_SPEC { + PASS12 + 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; +}