X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=894549c102b78e6c0cdd1dac3e0c126451bdaad4;hb=97a49a511ccafbbff3b49ec90af761244d3a9227;hp=c6a086d63f4aeee920cd12e2b239faf4147ae1ab;hpb=d2bcd477230b4ac8d7e69fc253d94250b13eb37a;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index c6a086d..894549c 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -243,10 +243,11 @@ tokenunion #line 44 "parser.y" 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; @@ -263,6 +264,7 @@ tokenunion for_start_t for_start; abc_exception_t *exception; regexp_t regexp; + modifiers_t flags; struct { abc_exception_list_t *l; code_t*finally; @@ -271,7 +273,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 275 "parser.tab.c" +#line 277 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -282,7 +284,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 259 "parser.y" +#line 263 "parser.y" static int a3_error(char*s) @@ -346,9 +348,17 @@ struct _methodstate { char is_global; int variable_count; + dict_t*unresolved_variables; + char inner; + char uses_parent_function; + int uses_slots; + dict_t*slots; + 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; abc_exception_list_t*exceptions; @@ -362,6 +372,7 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; + namespace_list_t*active_namespaces; dict_t*imports; char has_own_imports; char new_vars; // e.g. transition between two functions @@ -396,12 +407,14 @@ DECLARE_LIST(state); multiname_t m;\ namespace_t m##_ns;\ if(f) { \ - m##_ns.access = (f)->access; \ - m##_ns.name = ""; \ + 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; \ @@ -443,6 +456,7 @@ static void new_state() state->has_own_imports = 0; state->vars = dict_new(); state->old = oldstate; + state->new_vars = 0; } static void state_has_imports() { @@ -497,7 +511,7 @@ static void old_state() 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); +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0); static char* internal_filename_package = 0; @@ -522,7 +536,7 @@ void initialize_file(char*filename) dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); - function_initvars(state->method, 0, 0); + 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 } @@ -593,59 +607,73 @@ static void xx_scopetest() c = abc_iftrue(c,xx);*/ } - typedef struct _variable { int index; classinfo_t*type; char init; + 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) +{ + 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(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 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 = state->method->variable_count++; v->type = type; v->init = init; 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) @@ -692,6 +720,14 @@ 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) @@ -703,19 +739,27 @@ static void parsererror(const char*file, int line, const char*f) static code_t* method_header(methodstate_t*m) { code_t*c = 0; - if(m->late_binding && !m->inner) { + if(m->uses_slots || (m->late_binding && !m->inner)) { c = abc_getlocal_0(c); c = abc_pushscope(c); } - /*if(m->innerfunctions) { + if(m->uses_slots) { c = abc_newactivation(c); c = abc_pushscope(c); - }*/ + } methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); - c = abc_newfunction(c, l->methodstate->abc); - c = abc_setlocal(c, l->methodstate->var_index); + 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; } @@ -769,54 +813,77 @@ 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; + ns.name = mod->ns; + } 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 void function_initvars(methodstate_t*m, params_t*params, int flags) +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { - if(m->inner) - new_variable("this", 0, 0); - else if(!m->is_global) - new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0); - else - new_variable("globalscope", 0, 0); + 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) { - new_variable(p->param->name, p->param->type, 0); + new_variable(p->param->name, p->param->type, 0, 1); } } methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; - m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0); + 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; } } 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"); @@ -825,19 +892,19 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo 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."); /* 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; @@ -865,7 +932,7 @@ 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); } if(as3_pass == 2) { @@ -873,9 +940,9 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo state->method = state->cls->init; parserassert(state->cls && state->cls->info); - - function_initvars(state->cls->init, 0, 0); - function_initvars(state->cls->static_init, 0, 0); + + function_initvars(state->cls->init, 0, 0, 1); + function_initvars(state->cls->static_init, 0, 0, 0); if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); @@ -960,7 +1027,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 { @@ -1038,7 +1105,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)) { @@ -1074,21 +1141,24 @@ 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 = methodinfo_register_global(ns.access, state->package, name); minfo->return_type = return_type; } 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 = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->return_type = return_type; // getslot on a member slot only returns "undefined", so no need // to actually store these @@ -1102,7 +1172,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na else if(params->list && params->list->param) type = params->list->param->type; // 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); @@ -1119,7 +1189,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("different type in getter and setter"); } } 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; @@ -1127,9 +1197,10 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na /* 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; } @@ -1140,9 +1211,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) 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(); @@ -1164,24 +1233,28 @@ 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); } 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(state->method, 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)); @@ -1197,18 +1270,21 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n 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, 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) { @@ -1216,79 +1292,149 @@ 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); + 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) { + int flags = mod?mod->flags:0; + 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 */ + if(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(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; + } + dict_destroy(xvars); + old_state(); return 0; } - abc_method_t*f = 0; + if(as3_pass==2) { + /*if(state->method->uses_parent_function){ + syntaxerror("accessing variables of parent function from inner functions not supported yet"); + }*/ - 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 = {state->method->info->access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, name}; + abc_method_t*f = 0; - 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 = {state->method->info->access, state->package}; - multiname_t mname = {QNAME, &mname_ns, 0, name}; - - 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; - - 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; - - 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*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 = {state->method->info->access, ""}; + multiname_t mname = {QNAME, &mname_ns, 0, name}; + + 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 = {state->method->info->access, state->package}; + multiname_t mname = {QNAME, &mname_ns, 0, name}; + + 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(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); - 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) @@ -1390,8 +1536,11 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; if(TYPE_IS_NULL(from) && !IS_NUMBER_OR_INT(to)) return c; - syntaxerror("can't convert type %s to %s", from->name, to->name); - return 0; // make gcc happy + + 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) @@ -1763,7 +1912,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1767 "parser.tab.c" +#line 1916 "parser.tab.c" #ifdef short # undef short @@ -1976,16 +2125,16 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 145 +#define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2994 +#define YYLAST 2992 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 110 +#define YYNNTS 111 /* YYNRULES -- Number of rules. */ -#define YYNRULES 303 +#define YYNRULES 304 /* YYNRULES -- Number of states. */ #define YYNSTATES 514 @@ -2047,8 +2196,8 @@ static const yytype_uint16 yyprhs[] = 19, 21, 23, 25, 30, 32, 33, 35, 37, 40, 42, 44, 46, 48, 50, 55, 57, 59, 60, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, - 85, 87, 91, 94, 96, 98, 100, 102, 104, 106, - 108, 113, 115, 118, 120, 122, 126, 129, 130, 133, + 85, 87, 89, 93, 96, 98, 100, 102, 104, 106, + 108, 110, 115, 118, 120, 122, 126, 129, 130, 133, 136, 138, 142, 146, 147, 150, 151, 159, 160, 162, 164, 168, 170, 173, 177, 186, 193, 194, 201, 202, 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, @@ -2073,7 +2222,7 @@ static const yytype_uint16 yyprhs[] = 771, 775, 776, 778, 782, 788, 792, 796, 800, 804, 808, 812, 816, 820, 824, 828, 832, 836, 842, 845, 848, 851, 854, 858, 861, 866, 872, 876, 882, 886, - 888, 892, 898, 904 + 888, 891, 894, 899, 904 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -2087,10 +2236,10 @@ static const yytype_int16 yyrhs[] = 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, 143, 145, -1, 145, -1, 188, -1, 159, -1, 160, -1, 161, -1, 163, -1, 171, -1, 154, -1, 182, - -1, 179, -1, 236, -1, 243, -1, 126, 143, 132, - -1, 126, 132, -1, 99, -1, 144, -1, 150, -1, - 165, -1, 166, -1, 233, -1, 181, -1, 148, 126, - 143, 132, -1, 242, -1, 145, 99, -1, 145, -1, + -1, 179, -1, 236, -1, 244, -1, 243, -1, 126, + 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, + 150, -1, 165, -1, 166, -1, 233, -1, 181, -1, + 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, 144, -1, 3, 89, 3, -1, 102, 234, -1, -1, 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, 152, -1, 3, 224, 149, -1, -1, 65, 146, -1, @@ -2167,45 +2316,45 @@ static const yytype_int16 yyrhs[] = -1, 90, 237, -1, 53, 127, 3, -1, 128, 3, -1, 237, 127, 128, 3, -1, 237, 127, 3, 89, 3, -1, 237, 92, 3, -1, 237, 127, 122, 237, - 133, -1, 237, 127, 3, -1, 3, -1, 189, 18, - 3, -1, 189, 18, 3, 102, 3, -1, 189, 18, - 3, 102, 5, -1, 23, 18, 3, -1 + 133, -1, 237, 127, 3, -1, 3, -1, 18, 3, + -1, 189, 242, -1, 189, 242, 102, 3, -1, 189, + 242, 102, 5, -1, 23, 220, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1742, 1742, 1744, 1744, 1745, 1746, 1748, 1749, 1750, - 1751, 1752, 1753, 1754, 1755, 1757, 1757, 1758, 1759, 1761, - 1762, 1763, 1764, 1765, 1766, 1767, 1769, 1770, 1772, 1773, - 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, - 1786, 1787, 1788, 1791, 1792, 1793, 1794, 1795, 1796, 1797, - 1798, 1800, 1804, 1805, 1809, 1816, 1820, 1821, 1825, 1826, - 1828, 1829, 1831, 1874, 1875, 1878, 1878, 1897, 1898, 1899, - 1904, 1907, 1911, 1912, 1914, 1934, 1977, 1977, 1996, 1996, - 2011, 2014, 2017, 2020, 2024, 2025, 2026, 2027, 2028, 2029, - 2031, 2042, 2045, 2045, 2074, 2074, 2094, 2094, 2111, 2112, - 2113, 2114, 2122, 2131, 2131, 2176, 2180, 2191, 2200, 2201, - 2203, 2204, 2206, 2206, 2208, 2208, 2211, 2225, 2241, 2242, - 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, - 2254, 2255, 2257, 2258, 2260, 2261, 2263, 2264, 2268, 2266, - 2274, 2272, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, - 2289, 2295, 2296, 2297, 2298, 2299, 2300, 2303, 2316, 2316, - 2318, 2318, 2391, 2392, 2394, 2395, 2396, 2397, 2398, 2400, - 2401, 2402, 2403, 2412, 2416, 2422, 2428, 2436, 2441, 2447, - 2455, 2463, 2464, 2465, 2468, 2467, 2482, 2483, 2485, 2484, - 2506, 2515, 2528, 2529, 2531, 2532, 2534, 2535, 2536, 2545, - 2546, 2550, 2551, 2553, 2554, 2555, 2557, 2561, 2562, 2567, - 2568, 2604, 2650, 2671, 2692, 2695, 2702, 2703, 2704, 2710, - 2716, 2718, 2720, 2722, 2724, 2726, 2728, 2745, 2750, 2753, - 2756, 2759, 2762, 2765, 2768, 2771, 2774, 2778, 2781, 2784, - 2787, 2790, 2793, 2796, 2799, 2803, 2814, 2832, 2837, 2842, - 2847, 2852, 2857, 2861, 2865, 2870, 2874, 2878, 2887, 2896, - 2906, 2911, 2923, 2929, 2934, 2940, 2946, 2950, 2952, 2963, - 2972, 2979, 2980, 2982, 2988, 2997, 3004, 3016, 3022, 3028, - 3034, 3040, 3046, 3052, 3058, 3071, 3082, 3089, 3102, 3129, - 3143, 3157, 3171, 3186, 3193, 3200, 3207, 3214, 3225, 3259, - 3361, 3362, 3363, 3365 + 0, 1893, 1893, 1895, 1895, 1896, 1897, 1899, 1900, 1901, + 1902, 1903, 1904, 1905, 1906, 1908, 1908, 1909, 1910, 1912, + 1913, 1914, 1915, 1916, 1917, 1918, 1920, 1921, 1923, 1924, + 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, + 1937, 1938, 1939, 1940, 1943, 1944, 1945, 1946, 1947, 1948, + 1949, 1950, 1954, 1955, 1959, 1966, 1970, 1971, 1975, 1976, + 1978, 1979, 1981, 2042, 2043, 2046, 2046, 2065, 2066, 2067, + 2072, 2076, 2081, 2082, 2084, 2104, 2148, 2148, 2167, 2167, + 2182, 2185, 2188, 2191, 2195, 2196, 2197, 2198, 2199, 2200, + 2202, 2213, 2216, 2216, 2245, 2245, 2269, 2269, 2285, 2286, + 2287, 2288, 2296, 2305, 2305, 2350, 2354, 2365, 2374, 2375, + 2377, 2378, 2380, 2380, 2382, 2382, 2385, 2400, 2416, 2417, + 2418, 2419, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, + 2435, 2436, 2440, 2441, 2443, 2444, 2446, 2447, 2451, 2449, + 2457, 2455, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, + 2473, 2479, 2480, 2481, 2482, 2483, 2484, 2487, 2500, 2500, + 2502, 2502, 2577, 2578, 2580, 2581, 2582, 2583, 2584, 2586, + 2587, 2588, 2589, 2598, 2602, 2608, 2614, 2622, 2627, 2633, + 2641, 2649, 2650, 2651, 2654, 2653, 2670, 2671, 2673, 2672, + 2696, 2707, 2720, 2721, 2723, 2724, 2726, 2727, 2728, 2737, + 2738, 2742, 2743, 2745, 2746, 2747, 2749, 2753, 2754, 2759, + 2760, 2796, 2842, 2863, 2884, 2887, 2894, 2895, 2896, 2902, + 2908, 2910, 2912, 2914, 2916, 2918, 2920, 2937, 2942, 2945, + 2948, 2951, 2954, 2957, 2960, 2963, 2966, 2970, 2973, 2976, + 2979, 2982, 2985, 2988, 2991, 2995, 3006, 3024, 3029, 3034, + 3039, 3044, 3049, 3053, 3057, 3062, 3066, 3070, 3079, 3088, + 3098, 3103, 3115, 3121, 3126, 3132, 3138, 3142, 3144, 3155, + 3164, 3171, 3172, 3174, 3180, 3189, 3196, 3208, 3214, 3220, + 3226, 3232, 3238, 3244, 3250, 3263, 3274, 3281, 3294, 3321, + 3335, 3349, 3363, 3378, 3385, 3392, 3399, 3406, 3417, 3451, + 3572, 3578, 3581, 3584, 3587 }; #endif @@ -2261,7 +2410,7 @@ static const char *const yytname[] = "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", - "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2294,7 +2443,7 @@ static const yytype_uint8 yyr1[] = 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, + 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, @@ -2320,7 +2469,7 @@ static const yytype_uint8 yyr1[] = 237, 239, 239, 240, 240, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 241, - 242, 242, 242, 243 + 242, 243, 243, 243, 244 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2330,8 +2479,8 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 4, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 4, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 2, 1, 1, 1, 1, 1, 1, 1, - 4, 1, 2, 1, 1, 3, 2, 0, 2, 2, + 1, 1, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 4, 2, 1, 1, 3, 2, 0, 2, 2, 1, 3, 3, 0, 2, 0, 7, 0, 1, 1, 3, 1, 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, @@ -2356,7 +2505,7 @@ static const yytype_uint8 yyr2[] = 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, 5, 3, 5, 3, 1, - 3, 5, 5, 3 + 2, 2, 4, 4, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2372,41 +2521,41 @@ static const yytype_uint16 yydefact[] = 0, 2, 118, 5, 54, 12, 0, 36, 67, 31, 32, 33, 34, 35, 38, 37, 7, 30, 0, 119, 120, 9, 8, 11, 10, 220, 223, 225, 224, 219, - 39, 217, 221, 222, 40, 0, 0, 72, 76, 118, - 92, 108, 109, 114, 111, 0, 0, 299, 209, 186, - 0, 265, 0, 0, 116, 0, 103, 203, 0, 213, - 65, 0, 216, 0, 272, 291, 290, 268, 248, 247, - 0, 0, 204, 205, 206, 82, 0, 106, 214, 0, - 80, 43, 42, 118, 44, 29, 0, 45, 46, 47, - 49, 0, 48, 51, 293, 1, 6, 118, 299, 0, - 68, 0, 0, 69, 183, 0, 159, 0, 158, 0, - 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 39, 217, 221, 222, 41, 40, 0, 0, 72, 76, + 118, 92, 108, 109, 114, 111, 0, 0, 304, 299, + 209, 186, 0, 265, 0, 0, 116, 0, 103, 203, + 0, 213, 65, 0, 216, 0, 272, 291, 290, 268, + 248, 247, 0, 0, 204, 205, 206, 82, 0, 106, + 214, 0, 80, 44, 43, 118, 45, 29, 0, 46, + 47, 48, 50, 0, 49, 293, 1, 6, 118, 299, + 0, 68, 0, 0, 69, 0, 183, 0, 159, 0, + 158, 0, 301, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 289, 288, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 289, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 203, 0, 0, 55, 73, 0, 53, 0, - 0, 118, 112, 0, 303, 201, 173, 0, 0, 0, - 27, 0, 292, 0, 0, 275, 0, 267, 270, 207, - 208, 83, 200, 59, 60, 105, 215, 58, 81, 41, - 28, 118, 0, 0, 200, 0, 0, 182, 181, 0, - 132, 134, 160, 218, 262, 263, 260, 261, 241, 242, - 244, 243, 239, 240, 282, 281, 277, 276, 284, 285, - 283, 279, 278, 280, 245, 246, 296, 254, 253, 252, - 286, 0, 251, 250, 249, 237, 238, 258, 257, 255, - 259, 256, 0, 0, 298, 0, 0, 0, 52, 0, - 0, 25, 0, 118, 17, 23, 0, 20, 19, 22, - 21, 118, 110, 203, 210, 162, 0, 0, 174, 178, - 118, 191, 117, 264, 0, 26, 212, 0, 273, 0, - 0, 57, 0, 118, 300, 13, 57, 0, 0, 0, - 0, 136, 0, 0, 200, 0, 211, 269, 0, 0, - 294, 118, 0, 0, 115, 18, 118, 0, 0, 0, - 0, 180, 175, 200, 0, 107, 0, 118, 0, 190, - 198, 197, 0, 193, 192, 196, 199, 0, 62, 61, - 50, 0, 0, 118, 173, 133, 0, 0, 194, 135, - 140, 57, 287, 295, 297, 77, 0, 84, 0, 113, - 202, 172, 168, 165, 166, 164, 167, 171, 170, 169, - 163, 162, 0, 0, 177, 0, 0, 98, 102, 100, - 104, 63, 274, 0, 56, 301, 302, 0, 75, 0, + 0, 0, 0, 0, 0, 203, 0, 0, 55, 73, + 0, 53, 0, 0, 118, 112, 0, 0, 201, 173, + 0, 0, 0, 27, 0, 292, 0, 0, 275, 0, + 267, 270, 207, 208, 83, 200, 59, 60, 105, 215, + 58, 81, 42, 28, 118, 0, 200, 0, 0, 300, + 182, 181, 0, 132, 134, 160, 0, 218, 262, 263, + 260, 261, 241, 242, 244, 243, 239, 240, 282, 281, + 277, 276, 284, 285, 283, 279, 278, 280, 245, 246, + 296, 254, 253, 252, 286, 0, 251, 250, 249, 237, + 238, 258, 257, 255, 259, 256, 0, 0, 298, 0, + 0, 0, 52, 0, 0, 25, 0, 118, 17, 23, + 0, 20, 19, 22, 21, 118, 110, 191, 203, 210, + 162, 0, 0, 174, 178, 118, 117, 264, 0, 26, + 212, 0, 273, 0, 0, 57, 0, 118, 13, 57, + 0, 0, 0, 0, 136, 0, 0, 200, 302, 303, + 0, 211, 269, 0, 0, 294, 118, 0, 0, 115, + 18, 118, 0, 0, 0, 0, 180, 175, 200, 0, + 107, 0, 118, 0, 190, 198, 197, 193, 192, 196, + 199, 0, 62, 61, 51, 0, 118, 173, 133, 0, + 0, 194, 135, 140, 57, 287, 295, 297, 77, 0, + 84, 0, 113, 202, 172, 168, 165, 166, 164, 167, + 171, 170, 169, 163, 162, 0, 0, 177, 0, 0, + 98, 102, 100, 104, 63, 274, 56, 0, 75, 0, 137, 138, 0, 118, 161, 79, 0, 0, 0, 85, 88, 86, 24, 179, 188, 176, 96, 0, 99, 101, 118, 66, 118, 200, 118, 195, 0, 155, 0, 0, @@ -2421,92 +2570,94 @@ static const yytype_uint16 yydefact[] = /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 302, 303, 304, 324, 325, - 134, 135, 209, 305, 136, 378, 137, 237, 234, 451, - 57, 223, 151, 152, 58, 59, 60, 61, 207, 62, - 89, 138, 139, 438, 439, 440, 441, 63, 210, 417, - 503, 418, 468, 419, 420, 64, 220, 140, 65, 94, - 372, 66, 311, 211, 67, 141, 69, 70, 341, 343, - 387, 307, 454, 308, 433, 477, 478, 479, 459, 460, - 461, 159, 309, 344, 361, 410, 317, 318, 319, 249, - 310, 500, 100, 75, 467, 373, 374, 375, 389, 376, - 331, 314, 121, 122, 123, 215, 76, 77, 78, 142, - 124, 79, 80, 81, 82, 113, 114, 83, 143, 84 + -1, 50, 51, 52, 53, 306, 307, 308, 328, 329, + 136, 137, 212, 309, 138, 382, 139, 240, 237, 451, + 57, 226, 152, 153, 58, 59, 60, 61, 210, 62, + 90, 140, 141, 438, 439, 440, 441, 63, 213, 420, + 503, 421, 468, 422, 423, 64, 223, 142, 65, 95, + 97, 66, 315, 214, 67, 143, 69, 70, 344, 346, + 390, 311, 454, 312, 433, 477, 478, 479, 459, 460, + 461, 161, 313, 347, 366, 413, 322, 323, 324, 252, + 314, 500, 102, 75, 467, 377, 378, 379, 392, 380, + 335, 319, 123, 124, 125, 218, 76, 77, 78, 144, + 126, 79, 80, 81, 82, 115, 116, 83, 162, 84, + 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -374 +#define YYPACT_NINF -426 static const yytype_int16 yypact[] = { - 1667, -68, -374, -374, -374, -374, -374, -374, -374, -374, - -30, -97, -374, -57, 20, -374, -374, -374, 49, -374, - 2087, -374, 71, -374, 2157, -374, -37, 85, -35, -374, - -374, -374, -374, 6, 8, -374, -374, 2087, 14, 2087, - 2087, 2087, -374, 2087, 2087, 2087, 2087, 2087, 627, 88, - 177, -374, 497, -374, -374, -374, 81, -374, 2017, -374, - -374, -374, -374, -374, -374, -374, -374, -374, 308, 298, - -374, -374, -374, -374, -374, -374, -374, -374, -374, 79, - -374, 2562, -374, -374, -374, 197, 86, -374, -374, 1919, - -374, -374, -374, -374, -374, -18, 206, -374, -46, -374, - 93, 133, 2087, 83, -374, 2087, -374, 2087, 215, 133, - -374, 117, 2562, 94, 127, 133, 133, 201, 133, 133, - -53, 103, 129, 2087, -374, 227, 228, 2087, 2087, 228, - 232, -374, -374, 757, -374, -374, 107, -374, -374, -374, - -374, 219, -374, -374, -374, -374, -374, 1017, 170, 236, - -374, 141, 176, -374, 70, 242, -374, 243, -374, 244, - -374, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, + 1667, -42, -426, -426, -426, -426, -426, -426, -426, -426, + -37, -73, -426, -27, 11, -426, -426, -426, 71, -426, + 2087, -426, 78, -426, 2157, -426, 9, 71, 17, -426, + -426, -426, -426, -2, -4, -426, -426, 2087, 25, 2087, + 2087, 2087, -426, 2087, 2087, 2087, 2087, 2087, 627, 138, + 143, -426, 497, -426, -426, -426, 27, -426, 2017, -426, + -426, -426, -426, -426, -426, -426, -426, -426, 417, 216, + -426, -426, -426, -426, -426, -426, -426, -426, -426, 55, + -426, 2499, -426, -426, -426, -426, 197, 82, -426, -426, + 1919, -426, -426, -426, -426, -426, 19, 75, -426, -426, + -51, -426, 85, -20, 2087, 84, -426, 2087, -426, 2087, + 209, -20, -426, 117, 2499, 91, 113, -20, -20, 361, + -20, -20, -56, 99, 126, 2087, -426, 224, 225, 2087, + 2087, 225, 226, -426, -426, 757, -426, -426, 104, -426, + -426, -426, -426, 214, -426, -426, -426, -426, 1017, 163, + 231, -426, 136, 175, -426, 241, 45, 245, -426, 246, + -426, 247, 149, -426, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, -374, -374, 245, 2087, 2087, 2087, + 2087, 2087, 2087, 2087, 2087, 2087, 2087, -426, -426, 249, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 11, -374, -374, 2087, 159, 247, - 2087, 1147, -374, 85, -374, 137, 24, -49, 16, 2182, - 1793, 130, -374, 2087, 2087, -374, 2087, -374, -374, -374, - -374, -374, 157, 164, -374, 79, 79, 164, -374, -374, - -374, 1919, 262, 134, 157, 2087, 2087, -374, -374, 269, - 226, 231, -374, 2562, 1009, 489, 489, 489, 2867, 2867, - 2867, 2867, 1009, 1009, 2562, 2562, 2562, 2562, 2562, 2562, - 2562, 2562, 2562, 2562, 304, 2623, -374, 349, 349, 349, - 2562, 2379, 2684, 2745, 2806, 1009, 1009, 201, 201, 133, - 133, 133, 148, 2440, 193, 2087, 281, -40, -374, 167, - 2253, -374, 154, 1277, -374, -374, 168, -374, -374, -374, - -374, 1147, -374, 2087, -374, 96, 287, 174, 200, -374, - 1919, 181, -374, -374, 169, 1793, -374, -36, -374, 204, - 26, 208, 228, 887, 212, -374, -20, 53, -31, 199, - 125, 309, 125, 205, 157, 2087, -374, -374, 324, 2316, - -374, 1919, 2087, 207, -374, -374, 1147, 202, 209, 67, - 26, -374, -374, 157, 25, -374, 110, 1919, 2087, 181, - -374, -374, 210, -374, -374, -374, -374, 2087, -374, -374, - -374, 39, 2087, 1919, 24, -374, 125, 217, -374, 251, - -374, 208, 2562, -374, -374, -374, -14, 27, 221, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, 253, 233, 287, -374, 234, 241, -374, -374, 110, - -374, 267, -374, 126, -374, -374, -374, 250, -374, 252, - 251, -374, 125, 230, -374, -374, 2087, 259, 235, 27, - -374, -374, -374, -374, -374, -374, -374, 362, -374, -374, - 1919, -374, 1919, 157, 1407, -374, 366, -374, 347, 254, - 249, -374, 2501, 1793, -374, -374, -374, 1793, 1793, 157, - -374, -374, 256, -374, -374, 258, 74, 255, 1537, -374, - -374, -374, -374, 70, -374, -374, 1793, -374, 257, 261, - 264, -374, 1407, -374, -374, 385, -374, -374, -374, -374, - 1793, 270, 268, 265, 271, -374, 24, 1793, -374, 272, - 274, 157, -374, -374 + 2087, 2087, 2087, 2087, 2087, 2087, 2087, 5, -426, -426, + 2087, 159, 248, 2087, 1147, -426, 71, 81, 144, 16, + -54, 15, 307, 1793, 127, -426, 2087, 2087, -426, 2087, + -426, -426, -426, -426, -426, 162, 168, -426, 55, 55, + 168, -426, -426, -426, 1919, 137, 162, 2087, 2087, -426, + -426, -426, 267, 217, 220, -426, 23, 2499, 1009, 489, + 489, 489, 2865, 2865, 2865, 2865, 1009, 1009, 2499, 2499, + 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2560, 2621, + -426, 213, 213, 213, 2499, 2316, 2682, 2743, 2804, 1009, + 1009, 361, 361, -20, -20, -20, 145, 2377, 187, 2087, + 276, -50, -426, 158, 2182, -426, 153, 1277, -426, -426, + 160, -426, -426, -426, -426, 1147, -426, 165, 2087, -426, + -36, 284, 156, 190, -426, 1919, -426, -426, 164, 1793, + -426, -35, -426, 193, 21, 198, 225, 887, -426, -43, + 80, -14, 179, 103, 289, 103, 186, 162, -426, -426, + 2087, -426, -426, 310, 2253, -426, 1919, 2087, 188, -426, + -426, 1147, 191, 185, 459, 21, -426, -426, 162, 20, + -426, -6, 1919, 2087, 165, -426, -426, -426, -426, -426, + -426, 2087, -426, -426, -426, 2087, 1919, 16, -426, 103, + 204, -426, 233, -426, 198, 2499, -426, -426, -426, -13, + 29, 192, -426, -426, -426, -426, -426, -426, -426, -426, + -426, -426, -426, -426, 229, 210, 284, -426, 212, 219, + -426, -426, -6, -426, 274, -426, -426, 211, -426, 215, + 233, -426, 103, 235, -426, -426, 2087, 238, 218, 29, + -426, -426, -426, -426, -426, -426, -426, 343, -426, -426, + 1919, -426, 1919, 162, 1407, -426, 346, -426, 324, 222, + 273, -426, 2438, 1793, -426, -426, -426, 1793, 1793, 162, + -426, -426, 232, -426, -426, 234, 108, 223, 1537, -426, + -426, -426, -426, 45, -426, -426, 1793, -426, 227, 237, + 244, -426, 1407, -426, -426, 349, -426, -426, -426, -426, + 1793, 239, 242, 270, 268, -426, 16, 1793, -426, 271, + 275, 162, -426, -426 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -374, -374, 260, -374, 352, -285, -374, 98, -373, -39, - 1, -84, -310, 31, 2, 17, 351, 289, 89, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, -374, -374, -374, -374, -17, -16, -374, -374, 5, - -374, 13, -374, -374, -374, -374, -374, -374, -374, -202, - 36, -374, -374, -374, -374, 0, -374, 356, -374, -374, - -374, 58, -374, 59, -374, -65, -374, -48, -374, -374, - -26, -374, 3, -374, 32, -374, -369, -374, -298, -47, - 4, -374, -374, -374, -374, -374, 408, -318, 51, 78, - -237, -374, -99, -374, -374, -374, -374, -374, -374, -374, - -27, -3, -52, -7, -374, -374, -374, -374, -374, -374 + -426, -426, 258, -426, 305, -294, -426, 63, -425, -41, + 1, -84, -308, 58, 2, 14, 352, 290, 76, -426, + -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, + -426, -426, -426, -426, -426, -15, -12, -426, -426, 8, + -426, 10, -426, -426, -426, -426, -426, -426, -426, -128, + 94, -426, -426, -426, -426, 0, -426, 356, -426, -426, + -426, 60, -426, 62, -426, -66, -426, -40, -426, -426, + -24, -426, 3, -426, 28, -426, -372, -426, -301, -46, + 4, -426, -426, -426, -426, -426, 98, -251, 50, 100, + -236, -426, -100, -426, -426, -426, -426, -426, -426, -426, + -28, -1, -53, -8, -426, -426, -426, -426, -426, -426, + -426 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2516,108 +2667,108 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -153 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 208, 153, 336, 221, 133, - 365, 312, 111, 98, 294, 429, 312, 101, 362, 321, - 86, 85, 385, 91, 388, 88, 357, 315, 315, 369, - 109, 55, 112, 115, 116, 92, 117, 118, 119, 92, - 112, 395, 425, 120, 426, 92, 186, 161, -70, 240, - 95, 161, 68, 54, 56, 73, 74, 421, 71, 72, - 161, 436, 370, 103, 161, 90, 414, 96, 388, 161, - 401, 398, 402, 428, 99, 403, 404, 405, 203, 406, - 227, 204, 377, 55, 320, 102, 161, 105, 91, 437, - 487, 144, 87, 351, 488, 489, 230, 367, 219, 217, - 112, 154, 383, 292, 92, 247, 156, 391, 212, 213, - 71, 72, 407, 496, 455, 445, 112, 316, 413, 435, - 158, 248, 408, 409, 235, 236, 412, 504, 369, 321, - 107, 322, 106, 295, 510, 108, 110, 509, 415, 296, - 470, 371, 471, 416, 92, 92, 93, 68, 54, 56, - 73, 74, 382, 161, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 145, 55, 161, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 112, 293, 328, 359, 329, - 205, 360, 333, 300, 297, 71, 72, 147, 206, 214, - 218, 68, 54, 306, 358, 216, 472, 112, 222, 112, - 327, 312, 224, 184, 185, 186, 225, 226, 228, 229, - 231, 232, 490, 241, 2, 238, 208, 242, -71, 244, - 245, 240, 337, 338, 246, 250, 251, 252, 276, 240, - 15, 16, 17, 2, 19, 202, 21, 203, 298, 313, - 204, 299, 330, 326, 332, 334, 335, 208, 25, 15, - 16, 17, 339, 19, 513, 21, 456, 30, 31, 32, - 340, 346, 348, 208, 350, 342, 354, 25, 349, 352, - 315, 184, 185, 186, 356, 456, 30, 31, 32, 208, - 364, 366, 2, 68, 54, 306, 112, 363, -108, 368, - 377, 68, 54, 306, 381, 199, 200, 201, 15, 16, - 17, 384, 19, 202, 21, 203, 386, 393, 204, 457, - 427, 390, 450, 397, 399, 154, 25, 423, 392, 155, - 156, 422, 400, 431, 162, 30, 31, 32, 457, 396, - 424, 432, 157, 442, 158, 359, 68, 54, 306, 444, - 446, 112, -151, 447, 463, 469, 208, 464, 208, 482, - 112, 163, 164, 165, 483, 166, 167, 168, 169, 170, - 171, -152, 491, 452, 492, 453, 484, 493, 502, 497, - 506, 507, 183, 498, 184, 185, 186, 499, 187, 188, - 189, 355, 505, 508, 146, 511, 512, 243, 434, 150, - 192, 193, 194, 195, 196, 233, 197, 198, 199, 200, - 201, 379, 465, 466, 448, 160, 202, 501, 203, 462, - 494, 204, 449, 458, 485, 104, 495, 430, 411, 184, - 185, 186, 0, 443, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 476, 474, 475, 480, 481, 0, - 458, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 0, 476, 474, - 475, 480, 481, 0, 0, 0, 0, 0, 0, 0, + 68, 54, 56, 73, 74, 154, 211, 135, 298, 224, + 339, 113, 100, 87, 92, 429, 103, 370, 317, 320, + 367, 362, 418, 320, 374, -70, 348, 419, 349, 111, + 93, 114, 117, 118, 93, 119, 120, 121, 487, 114, + 93, 189, 488, 489, 164, 122, 164, 86, 398, 89, + 164, 243, 68, 54, 56, 73, 74, 375, 55, 381, + 71, 496, 72, 436, 424, 164, 364, 401, 417, 365, + 187, 188, 189, 206, 92, 504, 207, 230, 428, 325, + 250, 101, 510, 356, 317, 88, 164, 164, 316, 316, + 93, 437, 388, 316, 391, 91, 251, 233, 372, 222, + 93, 114, 205, 220, 206, 296, 374, 207, 96, 321, + 55, 394, 71, 416, 72, 445, 98, 114, 109, 386, + 435, 105, 93, 110, 108, 106, 155, 299, 238, 239, + 326, 104, 415, 300, 509, 156, 376, 94, 391, 107, + 158, 145, 470, 146, 471, 215, 216, 112, 68, 54, + 56, 73, 74, 148, 160, 164, 257, 258, 259, 260, + 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 385, + 164, 455, 281, 282, 283, 284, 285, 286, 287, 288, + 289, 290, 291, 292, 293, 294, 295, 114, 297, 332, + 208, 333, 217, 337, 209, 304, 55, 219, 71, 301, + 72, 221, 225, 229, 68, 54, 310, 472, 363, 114, + 2, 114, 227, 228, 231, 331, 232, 234, 235, 241, + 244, -71, 155, 490, 246, 247, 15, 16, 17, 2, + 19, 211, 21, 248, 249, 243, 340, 341, 253, 254, + 255, 256, 280, 243, 25, 15, 16, 17, 302, 19, + 330, 21, 303, 30, 31, 32, 318, 334, 336, 338, + 342, 343, 211, 25, 345, 513, 353, 2, 351, 355, + 357, 456, 30, 31, 32, 359, 361, 320, 211, 368, + 369, 354, -108, 15, 16, 17, 371, 19, 373, 21, + 381, 387, 211, 187, 188, 189, 389, 68, 54, 310, + 114, 25, 393, 396, 400, 68, 54, 310, 403, 456, + 30, 31, 32, 402, 442, 200, 201, 202, 203, 204, + 431, 364, 427, 432, 457, 205, 444, 206, 446, 450, + 207, 447, 395, 463, 452, 425, 469, 165, 453, 482, + 464, 483, 502, 426, 484, 493, 399, 147, 491, 497, + 492, 68, 54, 310, 506, 114, 211, -151, 211, 498, + 360, 505, 457, 114, 166, 167, 168, 499, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 507, 187, 188, 189, + 508, 190, 191, 192, 511, -152, 245, 512, 434, 193, + 151, 194, 383, 195, 196, 197, 198, 199, 236, 200, + 201, 202, 203, 204, 465, 163, 501, 466, 462, 205, + 448, 206, 449, 458, 207, 155, 485, 495, 494, 430, + 327, 0, 443, 0, 156, 0, 0, 0, 157, 158, + 0, 187, 188, 189, 476, 474, 475, 480, 481, 0, + 458, 159, 404, 160, 405, 414, 0, 406, 407, 408, + 0, 409, 0, 0, 0, 202, 203, 204, 476, 474, + 475, 480, 481, 205, 0, 206, 0, 0, 207, 0, 0, 0, 476, 474, 475, 480, 481, -4, 0, 0, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 162, + 1, 2, 3, 4, 410, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 411, 412, 14, 15, 16, 17, + 18, 19, 20, 21, 0, 0, 23, 0, 0, 165, 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, -153, -153, -153, 0, - 37, 38, 0, 0, 170, 171, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, + 37, 38, 0, 0, 173, 174, 0, 39, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, + 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 198, 199, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, + 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -4, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 132, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 134, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 239, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 242, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 380, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 384, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, @@ -2625,11 +2776,11 @@ static const yytype_int16 yytable[] = 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, -153, -153, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, + 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, 0, 0, 0, 0, 0, 0, 42, 0, -153, -153, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, + 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -3, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, @@ -2640,7 +2791,7 @@ static const yytype_int16 yytable[] = 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, @@ -2653,7 +2804,7 @@ static const yytype_int16 yytable[] = 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, @@ -2698,180 +2849,180 @@ static const yytype_int16 yytable[] = 0, 47, 0, 48, 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, -118, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 125, 0, 126, 0, 0, 0, 24, - 127, 25, 26, 0, 27, 128, 28, 0, 29, 129, + 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, + 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 130, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 131, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 0, 23, 125, - 0, 126, 0, 0, 0, 24, 127, 25, 26, 0, - 27, 128, 28, 0, 29, 129, 30, 31, 32, 0, + 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, + 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, + 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 130, 0, 0, 0, 39, + 0, 0, 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 131, 0, - 148, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 41, 0, 0, 0, 0, 0, 0, 0, 133, 0, + 149, 0, 3, 4, 0, 5, 6, 7, 8, 9, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 20, 47, 22, 48, 23, 49, 0, 126, + 0, 46, 20, 47, 22, 48, 23, 49, 0, 128, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 28, 0, 29, 149, 0, 0, 0, 0, 0, 0, + 28, 0, 29, 150, 0, 0, 0, 0, 0, 0, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 43, 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 29, 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 0, 0, 162, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 165, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 46, - 0, 47, 0, 0, 190, 49, 191, 0, 192, 193, - 194, 195, 196, 162, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 0, 0, 0, 0, 0, 323, 0, 0, 0, 0, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 166, + 167, 168, 0, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 0, 187, 188, 189, 0, 190, 191, 192, 46, + 0, 47, 0, 0, 193, 49, 194, 0, 195, 196, + 197, 198, 199, 165, 200, 201, 202, 203, 204, 0, + 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, + 0, 0, 0, 0, 0, 358, 0, 0, 0, 0, + 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 0, 187, 188, 189, 0, 190, 191, 192, + 0, 0, 0, 0, 0, 193, 165, 194, 0, 195, + 196, 197, 198, 199, 0, 200, 201, 202, 203, 204, + 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, + 207, 0, 0, 166, 167, 168, 397, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 0, 190, 162, 191, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 0, 0, 163, 164, 165, 353, 166, 167, 168, + 182, 183, 184, 185, 186, 0, 187, 188, 189, 0, + 190, 191, 192, 0, 0, 0, 0, 165, 193, 0, + 194, 350, 195, 196, 197, 198, 199, 0, 200, 201, + 202, 203, 204, 0, 0, 0, 0, 0, 205, 0, + 206, 0, 0, 207, 166, 167, 168, 0, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 0, 187, 188, 189, + 0, 190, 191, 192, 0, 0, 0, 0, 165, 193, + 0, 194, 0, 195, 196, 197, 198, 199, 0, 200, + 201, 202, 203, 204, 0, 0, 0, 0, 0, 205, + 0, 206, 352, 0, 207, 166, 167, 168, 0, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 0, 187, 188, + 189, 0, 190, 191, 192, 0, 0, 0, 0, 165, + 193, 0, 194, 486, 195, 196, 197, 198, 199, 0, + 200, 201, 202, 203, 204, 0, 0, 0, 0, 0, + 205, 0, 206, 0, 0, 207, 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 0, 190, 162, - 191, 0, 192, 193, 194, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 0, 0, 163, 164, 165, 394, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 0, 0, 0, - 162, 190, 0, 191, 345, 192, 193, 194, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 163, 164, 165, - 0, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 0, - 184, 185, 186, 0, 187, 188, 189, 0, 0, 0, - 0, 162, 190, 0, 191, 0, 192, 193, 194, 195, - 196, 0, 197, 198, 199, 200, 201, 0, 0, 0, - 0, 0, 202, 0, 203, 347, 0, 204, 163, 164, - 165, 0, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 0, 184, 185, 186, 0, 187, 188, 189, 0, 0, - 0, 0, 162, 190, 0, 191, 486, 192, 193, 194, - 195, 196, 0, 197, 198, 199, 200, 201, 0, 0, - 0, 0, 0, 202, 0, 203, 0, 0, 204, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 0, - 0, 0, 0, 162, 190, 0, 191, 0, 192, 193, - 194, 195, 196, 0, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, + 179, 180, 181, 182, 183, 184, 185, 186, 0, 187, + 188, 189, 0, 190, 191, 192, 0, 0, 0, 0, + 165, 193, 0, 194, 0, 195, 196, 197, 198, 199, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 0, + 0, 205, 0, 206, 0, 0, 207, 166, 167, 168, + 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 186, 0, + 187, 188, 189, 0, 190, 191, 192, 0, 0, 0, + 0, 165, 0, 0, 0, 0, 195, 196, 197, 198, + 199, 0, 200, 201, 202, 203, 204, 0, 0, 0, + 0, 0, 205, 0, 206, 0, 0, 207, 166, 167, + 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 187, 188, 189, 0, 190, 191, 192, 0, 0, + 0, 0, 165, 0, 0, 0, 0, 195, 196, 197, + 198, 199, 0, 200, 201, 202, 203, 204, 0, 0, + 0, 0, 0, 205, 0, 206, 0, 0, 207, 166, + 167, 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 162, 0, 0, 0, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 163, 164, 165, 0, 166, 167, 168, 169, 170, - 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 184, 185, 186, 0, 187, 188, - 189, 0, 0, 0, 0, 162, 0, 0, 0, 0, - 0, 193, 194, 195, 196, 0, 197, 198, 199, 200, - 201, 0, 0, 0, 0, 0, 202, 0, 203, 0, - 0, 204, 163, 164, 165, 0, 166, 167, 168, 169, - 170, 171, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 184, 185, 186, 0, 187, - 188, 189, 0, 0, 0, 0, 162, 0, 0, 0, - 0, 0, 0, 194, 195, 196, 0, 197, 198, 199, - 200, 201, 0, 0, 0, 0, 0, 202, 0, 203, - 0, 0, 204, 163, 164, 165, 0, 166, 167, 168, - 169, 170, 171, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 162, 0, 0, - 0, 0, 0, 0, -153, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 163, 164, 165, 0, -153, -153, - -153, -153, 170, 171, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 184, 185, 186, - 0, 187, 188, 189, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 195, 196, 0, 197, - 198, 199, 200, 201, 0, 0, 0, 0, 0, 202, - 0, 203, 0, 0, 204 + 0, 0, 187, 188, 189, 0, 190, 191, 192, 0, + 0, 0, 0, 165, 0, 0, 0, 0, 0, 196, + 197, 198, 199, 0, 200, 201, 202, 203, 204, 0, + 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, + 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 187, 188, 189, 0, 190, 191, 192, + 0, 0, 0, 0, 165, 0, 0, 0, 0, 0, + 0, 197, 198, 199, 0, 200, 201, 202, 203, 204, + 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, + 207, 166, 167, 168, 0, 169, 170, 171, 172, 173, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 187, 188, 189, 0, 190, 191, + 192, 0, 0, 0, 0, 165, 0, 0, 0, 0, + 0, 0, -153, 198, 199, 0, 200, 201, 202, 203, + 204, 0, 0, 0, 0, 0, 205, 0, 206, 0, + 0, 207, 166, 167, 168, 0, -153, -153, -153, -153, + 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 187, 188, 189, 0, 190, + 191, 192, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 198, 199, 0, 200, 201, 202, + 203, 204, 0, 0, 0, 0, 0, 205, 0, 206, + 0, 0, 207 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 89, 58, 244, 107, 48, - 320, 213, 39, 20, 3, 384, 218, 24, 316, 3, - 50, 89, 340, 3, 342, 122, 311, 3, 3, 3, - 37, 0, 39, 40, 41, 19, 43, 44, 45, 19, - 47, 351, 3, 46, 5, 19, 92, 100, 68, 133, - 14, 100, 52, 52, 52, 52, 52, 367, 0, 0, - 100, 34, 36, 27, 100, 122, 364, 18, 386, 100, - 3, 356, 5, 383, 3, 8, 9, 10, 124, 12, - 133, 127, 102, 52, 133, 122, 100, 122, 3, 62, - 463, 3, 122, 133, 467, 468, 123, 133, 105, 102, - 107, 27, 133, 202, 19, 35, 32, 344, 126, 127, - 52, 52, 45, 486, 432, 413, 123, 93, 93, 133, - 46, 51, 55, 56, 127, 128, 363, 500, 3, 3, - 122, 115, 126, 122, 507, 127, 122, 506, 28, 128, - 450, 115, 452, 33, 19, 19, 126, 147, 147, 147, - 147, 147, 99, 100, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 0, 147, 100, - 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 224, 102, 226, - 3, 105, 241, 210, 207, 147, 147, 126, 122, 3, - 127, 211, 211, 211, 313, 122, 453, 224, 3, 226, - 223, 423, 105, 90, 91, 92, 132, 100, 125, 100, - 3, 3, 469, 126, 4, 3, 320, 18, 68, 3, - 99, 325, 245, 246, 68, 3, 3, 3, 3, 333, - 20, 21, 22, 4, 24, 122, 26, 124, 99, 122, - 127, 14, 105, 133, 100, 3, 132, 351, 38, 20, - 21, 22, 3, 24, 511, 26, 46, 47, 48, 49, - 54, 133, 89, 367, 3, 54, 132, 38, 295, 122, - 3, 90, 91, 92, 126, 46, 47, 48, 49, 383, - 100, 132, 4, 303, 303, 303, 313, 133, 127, 105, - 102, 311, 311, 311, 102, 114, 115, 116, 20, 21, - 22, 122, 24, 122, 26, 124, 17, 3, 127, 99, - 382, 126, 65, 126, 132, 27, 38, 127, 345, 31, - 32, 368, 133, 126, 40, 47, 48, 49, 99, 352, - 377, 100, 44, 132, 46, 102, 356, 356, 356, 126, - 126, 368, 132, 122, 105, 3, 450, 132, 452, 3, - 377, 67, 68, 69, 27, 71, 72, 73, 74, 75, - 76, 132, 126, 133, 126, 133, 132, 132, 3, 132, - 122, 126, 88, 132, 90, 91, 92, 133, 94, 95, - 96, 303, 132, 132, 52, 133, 132, 147, 391, 58, - 106, 107, 108, 109, 110, 126, 112, 113, 114, 115, - 116, 332, 439, 439, 419, 69, 122, 492, 124, 436, - 478, 127, 419, 433, 460, 27, 483, 386, 360, 90, - 91, 92, -1, 411, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 454, 454, 454, 454, 454, -1, - 460, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, -1, 478, 478, - 478, 478, 478, -1, -1, -1, -1, -1, -1, -1, + 0, 0, 0, 0, 0, 58, 90, 48, 3, 109, + 246, 39, 20, 50, 3, 387, 24, 325, 3, 3, + 321, 315, 28, 3, 3, 68, 3, 33, 5, 37, + 19, 39, 40, 41, 19, 43, 44, 45, 463, 47, + 19, 92, 467, 468, 100, 46, 100, 89, 356, 122, + 100, 135, 52, 52, 52, 52, 52, 36, 0, 102, + 0, 486, 0, 34, 372, 100, 102, 361, 369, 105, + 90, 91, 92, 124, 3, 500, 127, 133, 386, 133, + 35, 3, 507, 133, 3, 122, 100, 100, 216, 217, + 19, 62, 343, 221, 345, 122, 51, 125, 133, 107, + 19, 109, 122, 104, 124, 205, 3, 127, 14, 93, + 52, 347, 52, 93, 52, 416, 18, 125, 122, 133, + 133, 27, 19, 127, 126, 27, 18, 122, 129, 130, + 115, 122, 368, 128, 506, 27, 115, 126, 389, 122, + 32, 3, 450, 0, 452, 126, 127, 122, 148, 148, + 148, 148, 148, 126, 46, 100, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 99, + 100, 432, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 227, + 3, 229, 127, 244, 122, 213, 148, 122, 148, 210, + 148, 127, 3, 100, 214, 214, 214, 453, 318, 227, + 4, 229, 105, 132, 125, 226, 100, 3, 3, 3, + 126, 68, 18, 469, 3, 99, 20, 21, 22, 4, + 24, 325, 26, 68, 3, 329, 247, 248, 3, 3, + 3, 102, 3, 337, 38, 20, 21, 22, 99, 24, + 133, 26, 14, 47, 48, 49, 122, 105, 100, 132, + 3, 54, 356, 38, 54, 511, 89, 4, 133, 3, + 122, 46, 47, 48, 49, 132, 126, 3, 372, 133, + 100, 299, 127, 20, 21, 22, 132, 24, 105, 26, + 102, 122, 386, 90, 91, 92, 17, 307, 307, 307, + 318, 38, 126, 3, 126, 315, 315, 315, 133, 46, + 47, 48, 49, 132, 132, 112, 113, 114, 115, 116, + 126, 102, 385, 100, 99, 122, 126, 124, 126, 65, + 127, 122, 350, 105, 133, 373, 3, 40, 133, 3, + 132, 27, 3, 381, 132, 132, 357, 52, 126, 132, + 126, 361, 361, 361, 122, 373, 450, 132, 452, 132, + 307, 132, 99, 381, 67, 68, 69, 133, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 126, 90, 91, 92, + 132, 94, 95, 96, 133, 132, 148, 132, 394, 102, + 58, 104, 336, 106, 107, 108, 109, 110, 128, 112, + 113, 114, 115, 116, 439, 69, 492, 439, 436, 122, + 422, 124, 422, 433, 127, 18, 460, 483, 478, 389, + 133, -1, 414, -1, 27, -1, -1, -1, 31, 32, + -1, 90, 91, 92, 454, 454, 454, 454, 454, -1, + 460, 44, 3, 46, 5, 365, -1, 8, 9, 10, + -1, 12, -1, -1, -1, 114, 115, 116, 478, 478, + 478, 478, 478, 122, -1, 124, -1, -1, 127, -1, -1, -1, 492, 492, 492, 492, 492, 0, -1, -1, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, + 3, 4, 5, 6, 45, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 55, 56, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, @@ -3061,65 +3212,65 @@ static const yytype_int16 yycheck[] = 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, -1, 102, 40, - 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, + 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, + 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, -1, -1, 67, 68, 69, 133, + 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, + -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, + 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, + -1, 124, 125, -1, 127, 67, 68, 69, -1, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, + 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, + 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, + 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, 102, -1, 104, 105, 106, 107, 108, 109, 110, + 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, + -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, 102, -1, 104, -1, 106, 107, 108, 109, + -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, 125, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, + 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, - -1, -1, 40, 102, -1, 104, 105, 106, 107, 108, + -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, - 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, 40, 102, -1, 104, -1, 106, 107, + 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, -1, 40, -1, -1, -1, -1, -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, - -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, + -1, -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, - -1, -1, -1, 108, 109, 110, -1, 112, 113, 114, + 95, 96, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, - -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, - 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, - 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, - -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 109, 110, -1, 112, - 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, - -1, 124, -1, -1, 127 + -1, -1, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3134,41 +3285,41 @@ static const yytype_uint8 yystos[] = 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, 160, 161, 163, 171, 179, 182, 185, 188, 189, 190, 191, 195, 197, 206, 214, 217, 230, 231, 232, 235, - 236, 237, 238, 241, 243, 89, 50, 122, 122, 164, - 122, 3, 19, 126, 183, 184, 18, 3, 237, 3, - 216, 237, 122, 184, 220, 122, 126, 122, 127, 237, - 122, 234, 237, 239, 240, 237, 237, 237, 237, 237, - 235, 226, 227, 228, 234, 30, 32, 37, 42, 46, - 66, 99, 132, 143, 144, 145, 148, 150, 165, 166, - 181, 189, 233, 242, 3, 0, 138, 126, 3, 46, - 150, 156, 157, 236, 27, 31, 32, 44, 46, 205, - 191, 100, 40, 67, 68, 69, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 90, 91, 92, 94, 95, 96, - 102, 104, 106, 107, 108, 109, 110, 112, 113, 114, - 115, 116, 122, 124, 127, 3, 122, 162, 145, 146, - 172, 187, 126, 127, 3, 229, 122, 235, 127, 237, - 180, 226, 3, 155, 105, 132, 100, 133, 125, 100, - 234, 3, 3, 151, 152, 235, 235, 151, 3, 132, - 145, 126, 18, 136, 3, 99, 68, 35, 51, 213, - 3, 3, 3, 237, 237, 237, 237, 237, 237, 237, + 236, 237, 238, 241, 243, 244, 89, 50, 122, 122, + 164, 122, 3, 19, 126, 183, 184, 184, 220, 3, + 237, 3, 216, 237, 122, 184, 220, 122, 126, 122, + 127, 237, 122, 234, 237, 239, 240, 237, 237, 237, + 237, 237, 235, 226, 227, 228, 234, 30, 32, 37, + 42, 46, 66, 99, 132, 143, 144, 145, 148, 150, + 165, 166, 181, 189, 233, 3, 0, 138, 126, 3, + 46, 150, 156, 157, 236, 18, 27, 31, 32, 44, + 46, 205, 242, 191, 100, 40, 67, 68, 69, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, + 94, 95, 96, 102, 104, 106, 107, 108, 109, 110, + 112, 113, 114, 115, 116, 122, 124, 127, 3, 122, + 162, 145, 146, 172, 187, 126, 127, 127, 229, 122, + 235, 127, 237, 180, 226, 3, 155, 105, 132, 100, + 133, 125, 100, 234, 3, 3, 151, 152, 235, 235, + 151, 3, 132, 145, 126, 136, 3, 99, 68, 3, + 35, 51, 213, 3, 3, 3, 102, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 3, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 226, 237, 3, 122, 128, 235, 99, 14, - 237, 99, 139, 140, 141, 147, 148, 195, 197, 206, - 214, 186, 183, 122, 225, 3, 93, 210, 211, 212, - 133, 3, 115, 133, 142, 143, 133, 235, 234, 234, - 105, 224, 100, 143, 3, 132, 224, 235, 235, 3, - 54, 192, 54, 193, 207, 105, 133, 125, 89, 237, - 3, 133, 122, 133, 132, 141, 126, 139, 226, 102, - 105, 208, 212, 133, 100, 146, 132, 133, 105, 3, - 36, 115, 184, 219, 220, 221, 223, 102, 149, 152, - 132, 102, 99, 133, 122, 221, 17, 194, 221, 222, - 126, 224, 237, 3, 133, 146, 235, 126, 139, 132, - 133, 3, 5, 8, 9, 10, 12, 45, 55, 56, - 209, 223, 224, 93, 212, 28, 33, 173, 175, 177, - 178, 146, 234, 127, 234, 3, 5, 236, 146, 210, + 3, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 237, 237, 237, 237, 237, 237, 226, 237, 3, 122, + 128, 235, 99, 14, 237, 99, 139, 140, 141, 147, + 148, 195, 197, 206, 214, 186, 183, 3, 122, 225, + 3, 93, 210, 211, 212, 133, 115, 133, 142, 143, + 133, 235, 234, 234, 105, 224, 100, 143, 132, 224, + 235, 235, 3, 54, 192, 54, 193, 207, 3, 5, + 105, 133, 125, 89, 237, 3, 133, 122, 133, 132, + 141, 126, 139, 226, 102, 105, 208, 212, 133, 100, + 146, 132, 133, 105, 3, 36, 115, 219, 220, 221, + 223, 102, 149, 152, 132, 99, 133, 122, 221, 17, + 194, 221, 222, 126, 224, 237, 3, 133, 146, 235, + 126, 139, 132, 133, 3, 5, 8, 9, 10, 12, + 45, 55, 56, 209, 223, 224, 93, 212, 28, 33, + 173, 175, 177, 178, 146, 234, 234, 236, 146, 210, 222, 126, 100, 198, 149, 133, 34, 62, 167, 168, 169, 170, 132, 208, 126, 212, 126, 122, 173, 175, 65, 153, 133, 133, 196, 221, 46, 99, 189, 202, @@ -3993,7 +4144,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1769 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4004,7 +4155,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1770 "parser.y" +#line 1921 "parser.y" {(yyval.code)=code_new();} } break; @@ -4015,7 +4166,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1772 "parser.y" +#line 1923 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4026,30 +4177,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1773 "parser.y" +#line 1924 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 41: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 1787 "parser.y" - {(yyval.code)=(yyvsp[(2) - (3)].code);} - } - break; - - - case 42: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1788 "parser.y" - {(yyval.code)=0;} +#line 1939 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4059,19 +4199,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1791 "parser.y" +#line 1940 "parser.y" {(yyval.code)=0;} } break; - case 50: + case 44: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1798 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 1943 "parser.y" + {(yyval.code)=0;} } break; @@ -4081,8 +4221,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1800 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 1950 "parser.y" + {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4092,7 +4232,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1804 "parser.y" +#line 1954 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4103,7 +4243,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1805 "parser.y" +#line 1955 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4114,7 +4254,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1809 "parser.y" +#line 1959 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4128,7 +4268,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1820 "parser.y" +#line 1970 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4139,7 +4279,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1821 "parser.y" +#line 1971 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4152,7 +4292,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1825 "parser.y" +#line 1975 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4163,7 +4303,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1826 "parser.y" +#line 1976 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4174,7 +4314,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1828 "parser.y" +#line 1978 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4185,7 +4325,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1829 "parser.y" +#line 1979 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4196,45 +4336,63 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" +#line 1982 "parser.y" { +PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id)); +PASS1 + new_variable((yyvsp[(1) - (3)].id), 0, 1, 0); +PASS2 if(!is_subtype_of((yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo))) { syntaxerror("Can't convert %s to %s", (yyvsp[(3) - (3)].value).t->name, (yyvsp[(2) - (3)].classinfo)->name); } - int index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1); + char slot = 0; + int index = 0; + if(state->method->uses_slots) { + variable_t* v = find_slot(state, (yyvsp[(1) - (3)].id)); + if(v && !v->init) { + // this variable is stored in a slot + v->init = 1; + v->type = (yyvsp[(2) - (3)].classinfo); + slot = 1; + index = v->index; + } + } + if(!index) { + index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0); + } + + (yyval.code) = slot?abc_getscopeobject(0, 1):0; if((yyvsp[(2) - (3)].classinfo)) { if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = (yyvsp[(3) - (3)].value).c; + (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); + (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo)); } } else { if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = (yyvsp[(3) - (3)].value).c; + (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); (yyval.code) = abc_coerce_a((yyval.code)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { + // don't do anything code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = code_new(); + code_free((yyval.code)); + (yyval.code) = 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) { + (yyval.code) = abc_setslot((yyval.code), index); + } else { + (yyval.code) = abc_setlocal((yyval.code), index); + } } } break; @@ -4245,7 +4403,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1874 "parser.y" +#line 2042 "parser.y" {(yyval.code) = code_new();} } break; @@ -4256,7 +4414,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1875 "parser.y" +#line 2043 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4267,8 +4425,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" - {new_state();} +#line 2046 "parser.y" + {PASS12 new_state();} } break; @@ -4278,7 +4436,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" +#line 2046 "parser.y" { (yyval.code) = code_new(); @@ -4295,7 +4453,7 @@ yyreduce: myjmp->branch = (yyval.code) = abc_nop((yyval.code)); } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4306,7 +4464,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1897 "parser.y" +#line 2065 "parser.y" {(yyval.code)=code_new();} } break; @@ -4317,9 +4475,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1904 "parser.y" +#line 2072 "parser.y" { - (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1); + PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0); + PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0); } } break; @@ -4330,8 +4489,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1907 "parser.y" +#line 2076 "parser.y" { + PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); } } @@ -4343,8 +4503,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1911 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} +#line 2081 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4354,8 +4514,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1912 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} +#line 2082 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4365,7 +4525,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1914 "parser.y" +#line 2084 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4383,7 +4543,7 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4394,13 +4554,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1934 "parser.y" +#line 2104 "parser.y" { - variable_t*var = find_variable((yyvsp[(2) - (6)].id)); + variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); - int it = new_variable(tmp1name, TYPE_INT, 0); + int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); - int array = new_variable(tmp1name, 0, 0); + int array = new_variable(tmp1name, 0, 0, 0); (yyval.code) = code_new(); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c); @@ -4432,10 +4592,11 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } } break; @@ -4446,8 +4607,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" - {new_state();} +#line 2148 "parser.y" + {PASS12 new_state();} } break; @@ -4457,7 +4618,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" +#line 2148 "parser.y" { (yyval.code) = code_new(); @@ -4474,7 +4635,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4485,8 +4646,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" - {new_state();} +#line 2167 "parser.y" + {PASS12 new_state();} } break; @@ -4496,7 +4657,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2167 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4509,7 +4670,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4520,7 +4681,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2011 "parser.y" +#line 2182 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4533,7 +4694,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2014 "parser.y" +#line 2185 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4546,7 +4707,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2017 "parser.y" +#line 2188 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4559,7 +4720,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2020 "parser.y" +#line 2191 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4572,7 +4733,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2024 "parser.y" +#line 2195 "parser.y" {(yyval.code)=0;} } break; @@ -4583,7 +4744,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2025 "parser.y" +#line 2196 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4594,7 +4755,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" +#line 2197 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4605,7 +4766,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2198 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4616,7 +4777,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2028 "parser.y" +#line 2199 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4627,7 +4788,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2029 "parser.y" +#line 2200 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4638,7 +4799,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2031 "parser.y" +#line 2202 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4659,7 +4820,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2042 "parser.y" +#line 2213 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4672,8 +4833,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2045 "parser.y" - {new_state();} +#line 2216 "parser.y" + {PASS12 new_state();} } break; @@ -4683,7 +4844,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2045 "parser.y" +#line 2216 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4708,7 +4869,7 @@ yyreduce: } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4719,8 +4880,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2074 "parser.y" - {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} +#line 2245 "parser.y" + {PASS12 new_state(); + state->exception_name=(yyvsp[(3) - (5)].id); + PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); + PASS2 new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0); + } } break; @@ -4730,7 +4895,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2075 "parser.y" +#line 2250 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4741,14 +4906,14 @@ yyreduce: (yyval.exception) = e; code_t*c = 0; - int i = find_variable_safe((yyvsp[(3) - (9)].id))->index; + int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index; e->target = c = abc_nop(0); c = abc_setlocal(c, i); c = code_append(c, (yyvsp[(8) - (9)].code)); c = abc_kill(c, i); c = var_block(c); - old_state(); + PASS12 old_state(); } } break; @@ -4759,8 +4924,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2094 "parser.y" - {new_state();state->exception_name=0;} +#line 2269 "parser.y" + {PASS12 new_state();state->exception_name=0;} } break; @@ -4770,12 +4935,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2094 "parser.y" +#line 2269 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { (yyval.exception)=0; - old_state(); } else { NEW(abc_exception_t, e) e->exc_type = 0; //all exceptions @@ -4783,9 +4947,9 @@ yyreduce: e->target = 0; e->to = abc_nop(0); e->to = code_append(e->to, (yyvsp[(4) - (5)].code)); - old_state(); (yyval.exception) = e; } + PASS12 old_state(); } } break; @@ -4796,7 +4960,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" +#line 2285 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4807,7 +4971,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 2286 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4818,7 +4982,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2113 "parser.y" +#line 2287 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4829,7 +4993,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2114 "parser.y" +#line 2288 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4847,7 +5011,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2122 "parser.y" +#line 2296 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4865,8 +5029,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" - {new_state();} +#line 2305 "parser.y" + {PASS12 new_state();} } break; @@ -4876,7 +5040,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2305 "parser.y" { code_t*out = abc_nop(0); @@ -4889,7 +5053,7 @@ yyreduce: int tmp; if((yyvsp[(6) - (6)].catch_list).finally) - tmp = new_variable("__finally__", 0, 0); + tmp = new_variable("__finally__", 0, 0, 0); abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l; int count=0; @@ -4917,7 +5081,7 @@ yyreduce: list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4928,7 +5092,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2176 "parser.y" +#line 2350 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4942,11 +5106,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2180 "parser.y" +#line 2354 "parser.y" { 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); (yyval.code)=code_new(); (yyval.code)=abc_getlocal((yyval.code), v->index); (yyval.code)=abc_throw((yyval.code)); @@ -4960,7 +5124,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2191 "parser.y" +#line 2365 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushscope((yyval.code)); @@ -4976,7 +5140,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2201 "parser.y" +#line 2375 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -4987,7 +5151,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2203 "parser.y" +#line 2377 "parser.y" {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} } break; @@ -4998,7 +5162,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2204 "parser.y" +#line 2378 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5009,7 +5173,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2206 "parser.y" +#line 2380 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5020,7 +5184,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2207 "parser.y" +#line 2381 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5031,7 +5195,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2208 "parser.y" +#line 2382 "parser.y" {PASS12 startpackage("");} } break; @@ -5042,7 +5206,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2383 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5053,10 +5217,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2211 "parser.y" +#line 2385 "parser.y" { - PASS1 - if(!registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name)) { + PASS12 + slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); + if(!s) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } @@ -5077,9 +5242,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2225 "parser.y" +#line 2400 "parser.y" { - PASS1 + PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { as3_schedule_package((yyvsp[(2) - (4)].id)); } @@ -5100,8 +5265,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" - {PASS12 (yyval.flags)=0;} +#line 2416 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5111,7 +5276,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2417 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5122,8 +5287,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2243 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2418 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5133,8 +5298,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2244 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2419 "parser.y" + { + PASS12 + (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; + if((yyvsp[(1) - (2)].flags).ns && (yyvsp[(2) - (2)].flags).ns) syntaxerror("only one namespace allowed in one declaration"); + (yyval.flags).ns=(yyvsp[(1) - (2)].flags).ns?(yyvsp[(1) - (2)].flags).ns:(yyvsp[(2) - (2)].flags).ns; + +} } break; @@ -5144,8 +5315,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2427 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5155,8 +5326,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2247 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2428 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5166,8 +5337,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2248 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2429 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5177,8 +5348,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2249 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2430 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5188,8 +5359,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2250 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2431 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5199,8 +5370,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2251 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2432 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5210,8 +5381,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2433 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5221,8 +5392,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2253 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2434 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5232,8 +5403,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2254 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2435 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5243,8 +5414,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2255 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2436 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; @@ -5254,7 +5427,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2257 "parser.y" +#line 2440 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; @@ -5265,7 +5438,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2258 "parser.y" +#line 2441 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5276,7 +5449,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2260 "parser.y" +#line 2443 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5287,7 +5460,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2261 "parser.y" +#line 2444 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5298,7 +5471,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2263 "parser.y" +#line 2446 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5309,7 +5482,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2447 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5320,8 +5493,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2451 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5331,7 +5504,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" +#line 2453 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5342,8 +5515,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2274 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2457 "parser.y" + {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE; + startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} } break; @@ -5353,7 +5527,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2276 "parser.y" +#line 2460 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5364,7 +5538,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2289 "parser.y" +#line 2473 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5379,7 +5553,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2300 "parser.y" +#line 2484 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5392,15 +5566,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2303 "parser.y" +#line 2487 "parser.y" { PASS12 - (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; - if((yyvsp[(1) - (8)].flags)&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { + (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; + if((yyvsp[(1) - (8)].flags).flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { syntaxerror("invalid method modifiers: interface methods always need to be public"); } - startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); - endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); + startfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); + endfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); list_deep_free((yyvsp[(6) - (8)].params).list); } } @@ -5412,8 +5586,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2318 "parser.y" - {setstaticfunction((yyvsp[(1) - (3)].flags));} +#line 2502 "parser.y" + {setstaticfunction((yyvsp[(1) - (3)].flags).flags);} } break; @@ -5423,38 +5597,40 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2318 "parser.y" +#line 2502 "parser.y" { - int flags = (yyvsp[(1) - (6)].flags); - U8 access = flags2access((yyvsp[(1) - (6)].flags)); + int flags = (yyvsp[(1) - (6)].flags).flags; + namespace_t ns = modifiers2access(&(yyvsp[(1) - (6)].flags)); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (6)].id), 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(3) - (6)].id), 1); if(i) { check_override(i, flags); } - info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (6)].id)); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(3) - (6)].id)); } else { slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); if(i) { syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); } - info = varinfo_register_global(access, state->package, (yyvsp[(3) - (6)].id)); + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(3) - (6)].id)); } info->type = (yyvsp[(5) - (6)].classinfo); info->flags = flags; /* slot name */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (6)].id)}; + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(3) - (6)].id)}; 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) { @@ -5503,7 +5679,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2577 "parser.y" {(yyval.constant)=0;} } break; @@ -5514,7 +5690,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2578 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5525,7 +5701,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2580 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; @@ -5536,7 +5712,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2581 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5547,7 +5723,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2582 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; @@ -5558,7 +5734,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2397 "parser.y" +#line 2583 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -5569,7 +5745,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2584 "parser.y" {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; @@ -5580,7 +5756,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2586 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -5591,7 +5767,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" +#line 2587 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -5602,7 +5778,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" +#line 2588 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -5613,7 +5789,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2403 "parser.y" +#line 2589 "parser.y" { // TODO as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); @@ -5628,7 +5804,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2412 "parser.y" +#line 2598 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5642,7 +5818,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2602 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5656,7 +5832,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2422 "parser.y" +#line 2608 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5672,7 +5848,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2428 "parser.y" +#line 2614 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5688,7 +5864,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2436 "parser.y" +#line 2622 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5703,7 +5879,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2627 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5718,13 +5894,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2633 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (4)].id); (yyval.param)->type = (yyvsp[(3) - (4)].classinfo); + PASS2 (yyval.param)->value = (yyvsp[(4) - (4)].constant); } } @@ -5736,13 +5912,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2455 "parser.y" +#line 2641 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (2)].id); (yyval.param)->type = TYPE_ANY; + PASS2 (yyval.param)->value = (yyvsp[(2) - (2)].constant); } } @@ -5750,34 +5926,12 @@ yyreduce: - case 181: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2463 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 182: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2465 "parser.y" - {(yyval.token)=0;} +#line 2651 "parser.y" + {PASS12 (yyval.token)=0;} } break; @@ -5787,8 +5941,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2468 "parser.y" - {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} +#line 2654 "parser.y" + {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; @@ -5798,16 +5952,18 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2469 "parser.y" +#line 2655 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list); + PASS1 + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); code_t*c = method_header(state->method); c = wrap_function(c, 0, (yyvsp[(11) - (12)].code)); - endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + PASS12 list_deep_free((yyvsp[(6) - (12)].params).list); (yyval.code)=0; } @@ -5820,7 +5976,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2671 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -5831,7 +5987,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2485 "parser.y" +#line 2673 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -5842,9 +5998,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2486 "parser.y" +#line 2674 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(4) - (10)].params).list); + PASS1 + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); PASS2 methodinfo_t*f = state->method->info; if(!f || !f->kind) syntaxerror("internal error"); @@ -5853,11 +6010,12 @@ yyreduce: c = wrap_function(c, 0, (yyvsp[(9) - (10)].code)); int index = state->method->var_index; - endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); - list_deep_free((yyvsp[(4) - (10)].params).list); + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); (yyval.value).c = abc_getlocal(0, index); (yyval.value).t = TYPE_FUNCTION(f); + + PASS12 list_deep_free((yyvsp[(4) - (10)].params).list); } } break; @@ -5868,13 +6026,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2506 "parser.y" +#line 2696 "parser.y" { - PASS1 (yyval.classinfo)=0; + PASS1 static slotinfo_t c; + memset(&c, 0, sizeof(c)); + c.name = (yyvsp[(1) - (1)].id); + (yyval.classinfo) = (classinfo_t*)&c; PASS2 - /* try current package */ slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); - if(!s) syntaxerror("Could not find class/method %s\n", (yyvsp[(1) - (1)].id)); + if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); (yyval.classinfo) = (classinfo_t*)s; } } @@ -5886,13 +6046,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2515 "parser.y" +#line 2707 "parser.y" { - PASS1 static classinfo_t c; + PASS1 static slotinfo_t c; memset(&c, 0, sizeof(c)); c.package = (yyvsp[(1) - (3)].id); c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=&c; + (yyval.classinfo)=(classinfo_t*)&c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -5908,7 +6068,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2531 "parser.y" +#line 2723 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -5919,7 +6079,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2532 "parser.y" +#line 2724 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; @@ -5930,7 +6090,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2534 "parser.y" +#line 2726 "parser.y" {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -5941,7 +6101,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2535 "parser.y" +#line 2727 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; @@ -5952,7 +6112,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2536 "parser.y" +#line 2728 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; @@ -5963,7 +6123,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2545 "parser.y" +#line 2737 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5974,7 +6134,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" +#line 2738 "parser.y" {(yyval.classinfo)=0;} } break; @@ -5985,7 +6145,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2742 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -5996,7 +6156,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2551 "parser.y" +#line 2743 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6007,7 +6167,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2553 "parser.y" +#line 2745 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -6018,7 +6178,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2557 "parser.y" +#line 2749 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6031,7 +6191,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2561 "parser.y" +#line 2753 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6042,7 +6202,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2562 "parser.y" +#line 2754 "parser.y" { (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); @@ -6056,7 +6216,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2568 "parser.y" +#line 2760 "parser.y" { (yyval.value).c = (yyvsp[(2) - (4)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); @@ -6070,7 +6230,7 @@ yyreduce: multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).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);//FIXME multiname_t*name = t->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); @@ -6097,7 +6257,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2604 "parser.y" +#line 2796 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6113,9 +6273,9 @@ yyreduce: (yyval.value).c = code_append((yyval.value).c, paramcode); (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); multiname_destroy(name); - } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { + } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)(yyval.value).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. } @@ -6152,7 +6312,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2842 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6182,7 +6342,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2671 "parser.y" +#line 2863 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6193,7 +6353,7 @@ yyreduce: (yyval.value).c->opcode = OPCODE_DELETEPROPERTY; } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).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; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = abc_deleteproperty2((yyval.value).c, name); } else { @@ -6212,7 +6372,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2884 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6225,7 +6385,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2695 "parser.y" +#line 2887 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6239,7 +6399,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 2894 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; @@ -6250,7 +6410,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2703 "parser.y" +#line 2895 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6261,7 +6421,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2704 "parser.y" +#line 2896 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6277,7 +6437,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2710 "parser.y" +#line 2902 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6290,7 +6450,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2716 "parser.y" +#line 2908 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6301,7 +6461,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2720 "parser.y" +#line 2912 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6312,7 +6472,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2722 "parser.y" +#line 2914 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6323,7 +6483,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2724 "parser.y" +#line 2916 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6334,7 +6494,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2728 "parser.y" +#line 2920 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6360,7 +6520,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" +#line 2937 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6375,7 +6535,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2750 "parser.y" +#line 2942 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6388,7 +6548,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2753 "parser.y" +#line 2945 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6401,7 +6561,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2756 "parser.y" +#line 2948 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6414,7 +6574,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2759 "parser.y" +#line 2951 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6427,7 +6587,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2762 "parser.y" +#line 2954 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6440,7 +6600,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 2957 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6453,7 +6613,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" +#line 2960 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6466,7 +6626,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2771 "parser.y" +#line 2963 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6479,7 +6639,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2774 "parser.y" +#line 2966 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6492,7 +6652,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2778 "parser.y" +#line 2970 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6505,7 +6665,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2781 "parser.y" +#line 2973 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6518,7 +6678,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2784 "parser.y" +#line 2976 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6531,7 +6691,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2787 "parser.y" +#line 2979 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6544,7 +6704,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2790 "parser.y" +#line 2982 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6557,7 +6717,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2793 "parser.y" +#line 2985 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6570,7 +6730,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2796 "parser.y" +#line 2988 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6583,7 +6743,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2799 "parser.y" +#line 2991 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6596,7 +6756,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2803 "parser.y" +#line 2995 "parser.y" {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O'); (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); @@ -6617,7 +6777,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2814 "parser.y" +#line 3006 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6644,7 +6804,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2832 "parser.y" +#line 3024 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6658,7 +6818,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2837 "parser.y" +#line 3029 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6672,7 +6832,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2842 "parser.y" +#line 3034 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitand((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6686,7 +6846,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2847 "parser.y" +#line 3039 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitxor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6700,7 +6860,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2852 "parser.y" +#line 3044 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6714,7 +6874,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2857 "parser.y" +#line 3049 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_rshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6728,7 +6888,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2861 "parser.y" +#line 3053 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_urshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6742,7 +6902,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "parser.y" +#line 3057 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_lshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6756,7 +6916,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2870 "parser.y" +#line 3062 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_divide((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6770,7 +6930,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2874 "parser.y" +#line 3066 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_modulo((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6784,7 +6944,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2878 "parser.y" +#line 3070 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_add_i((yyval.value).c); @@ -6803,7 +6963,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2887 "parser.y" +#line 3079 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_subtract_i((yyval.value).c); @@ -6822,7 +6982,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2896 "parser.y" +#line 3088 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_multiply_i((yyval.value).c); @@ -6841,7 +7001,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2906 "parser.y" +#line 3098 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_in((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6855,7 +7015,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "parser.y" +#line 3103 "parser.y" {char use_astype=0; // flash player's astype works differently than astypelate if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) { MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data)); @@ -6876,7 +7036,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2924 "parser.y" +#line 3116 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_instanceof((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6890,7 +7050,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2929 "parser.y" +#line 3121 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_istypelate((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6904,7 +7064,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2934 "parser.y" +#line 3126 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6919,7 +7079,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2940 "parser.y" +#line 3132 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6934,7 +7094,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2946 "parser.y" +#line 3138 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6947,7 +7107,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2950 "parser.y" +#line 3142 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; @@ -6958,7 +7118,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2952 "parser.y" +#line 3144 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6978,7 +7138,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "parser.y" +#line 3155 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6996,7 +7156,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2972 "parser.y" +#line 3164 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7012,7 +7172,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 3171 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -7023,7 +7183,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 3172 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; @@ -7034,7 +7194,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" +#line 3174 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7050,7 +7210,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2988 "parser.y" +#line 3180 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -7066,7 +7226,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2997 "parser.y" +#line 3189 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7082,7 +7242,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "parser.y" +#line 3196 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7103,7 +7263,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3016 "parser.y" +#line 3208 "parser.y" { code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t); @@ -7119,7 +7279,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3022 "parser.y" +#line 3214 "parser.y" { code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t); @@ -7135,7 +7295,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3028 "parser.y" +#line 3220 "parser.y" { code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t); @@ -7151,7 +7311,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3034 "parser.y" +#line 3226 "parser.y" { code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t); @@ -7167,7 +7327,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3040 "parser.y" +#line 3232 "parser.y" { code_t*c = abc_divide((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t); @@ -7183,7 +7343,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3046 "parser.y" +#line 3238 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7199,7 +7359,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3052 "parser.y" +#line 3244 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7215,7 +7375,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3058 "parser.y" +#line 3250 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7238,7 +7398,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3071 "parser.y" +#line 3263 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7259,7 +7419,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3082 "parser.y" +#line 3274 "parser.y" { code_t*c = 0; c = code_append(c, (yyvsp[(3) - (3)].value).c); c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t); @@ -7275,7 +7435,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 3281 "parser.y" { (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?'); (yyval.value).c = (yyvsp[(1) - (5)].value).c; @@ -7285,7 +7445,7 @@ yyreduce: code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0); (yyval.value).c = j1->branch = abc_label((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t); + (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); (yyval.value).c = j2->branch = abc_label((yyval.value).c); } } @@ -7297,7 +7457,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3102 "parser.y" +#line 3294 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if((is_getlocal((yyvsp[(1) - (2)].value).c) && TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { @@ -7332,7 +7492,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3129 "parser.y" +#line 3321 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7355,7 +7515,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "parser.y" +#line 3335 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7378,7 +7538,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3157 "parser.y" +#line 3349 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7401,14 +7561,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3172 "parser.y" +#line 3364 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); - namespace_t ns = {f->access, ""}; + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; (yyval.value).c = abc_getlocal_0((yyval.value).c); @@ -7424,7 +7584,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3186 "parser.y" +#line 3378 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7440,7 +7600,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" +#line 3385 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7456,7 +7616,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3200 "parser.y" +#line 3392 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7472,7 +7632,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3207 "parser.y" +#line 3399 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7488,7 +7648,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3214 "parser.y" +#line 3406 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7504,7 +7664,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3226 "parser.y" +#line 3418 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -7513,7 +7673,7 @@ yyreduce: is_static = 1; } if(t) { - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); char noslot = 0; if(f && !is_static != !(f->flags&FLAG_STATIC)) noslot=1; @@ -7546,8 +7706,21 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3259 "parser.y" +#line 3451 "parser.y" { + 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 *correct* because local variables of the parent function + would shadow those. + */ + if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { + unknown_variable((yyvsp[(1) - (1)].id)); + } + PASS2 + (yyval.value).t = 0; (yyval.value).c = 0; slotinfo_t*a = 0; @@ -7555,17 +7728,23 @@ yyreduce: variable_t*v; /* look at variables */ - if((v = find_variable((yyvsp[(1) - (1)].id)))) { + if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) { // $1 is a local variable (yyval.value).c = abc_getlocal((yyval.value).c, v->index); (yyval.value).t = v->type; break; } + if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) { + (yyval.value).c = abc_getscopeobject((yyval.value).c, 1); + (yyval.value).c = abc_getslot((yyval.value).c, v->index); + (yyval.value).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, (yyvsp[(1) - (1)].id), 1)) && + if(state->cls && (f = registry_findmember_nsset(state->cls->info, state->active_namespaces, (yyvsp[(1) - (1)].id), 1)) && (f->flags&FLAG_STATIC) >= i_am_static) { // $1 is a function in this class int var_is_static = (f->flags&FLAG_STATIC); @@ -7655,8 +7834,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3361 "parser.y" - {(yyval.code)=0;} +#line 3572 "parser.y" + { + PASS12 + tokenizer_register_namespace((yyvsp[(2) - (2)].id)); + (yyval.id)=(yyvsp[(2) - (2)].id); +} } break; @@ -7666,8 +7849,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3362 "parser.y" - {(yyval.code)=0;} +#line 3578 "parser.y" + { + (yyval.code)=0; +} } break; @@ -7677,8 +7862,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3363 "parser.y" - {(yyval.code)=0;} +#line 3581 "parser.y" + { + (yyval.code)=0; +} } break; @@ -7688,10 +7875,23 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3365 "parser.y" +#line 3584 "parser.y" + { + (yyval.code)=0; +} + } + break; + + + + case 304: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3587 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].id)); + tokenizer_register_namespace((yyvsp[(2) - (2)].classinfo)->name); (yyval.code)=0; } } @@ -7701,7 +7901,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7705 "parser.tab.c" +#line 7905 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);