X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=9b0f2b56b629d2cbebb59c95b2bff767696489d9;hb=7b50420de50a9123799cf7a4d26daf8f2f3eeaa9;hp=de1964d84109480bb125aa2f97e53d9457b0e144;hpb=c1b77b2459e0b8687428e6f4932797b869caace1;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index de1964d..9b0f2b5 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 { @@ -970,10 +1037,14 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } -static void setstaticfunction(int x) +static int slotstate_varconst = 0; +static modifiers_t*slotstate_flags = 0; +static void setslotstate(modifiers_t* flags, int varconst) { + slotstate_varconst = varconst; + slotstate_flags = flags; if(state->cls) { - if(x&FLAG_STATIC) { + if(flags && flags->flags&FLAG_STATIC) { state->method = state->cls->static_init; } else { state->method = state->cls->init; @@ -1038,7 +1109,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,22 +1145,25 @@ static void check_override(memberinfo_t*m, int flags) } } -static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot) +static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot) { methodinfo_t*minfo = 0; - U8 access = flags2access(flags); + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = methodinfo_register_global(access, state->package, name); - minfo->return_type = return_type; + minfo = methodinfo_register_global(ns.access, state->package, name); + minfo->return_type = 0; // save this for pass 2 } else if(getset != KW_GET && getset != KW_SET) { //class method - memberinfo_t* m = registry_findmember(state->cls->info, name, 0); + memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { + printf("%s.%s | %s.%s\n", + m->package, m->name, + ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, access, name); - minfo->return_type = return_type; + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); + minfo->return_type = 0; // save this for pass 2 // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1097,12 +1171,14 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na //class getter/setter int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET; classinfo_t*type=0; - if(getset == KW_GET) + if(getset == KW_GET) { type = return_type; - else if(params->list && params->list->param) + } else if(params->list && params->list->param && !params->list->next) { type = params->list->param->type; + } else + syntaxerror("setter function needs to take exactly one argument"); // not sure wether to look into superclasses here, too - minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1); + minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { if(minfo->kind!=INFOTYPE_SLOT) syntaxerror("class already contains a method called '%s'", name); @@ -1112,24 +1188,30 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ minfo->subtype |= gs; - if(!minfo->return_type) { - minfo->return_type = type; - } else { - if(minfo && minfo->return_type != type) - syntaxerror("different type in getter and setter"); - } + + /* + FIXME: this check needs to be done in pass 2 + + if((!minfo->return_type != !type) || + (minfo->return_type && type && + !strcmp(minfo->return_type->name, type->name))) { + syntaxerror("different type in getter and setter: %s and %s", + minfo->return_type?minfo->return_type->name:"*", + type?type->name:"*"); + }*/ } else { - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; - minfo->return_type = type; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; + if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; + if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + return minfo; } @@ -1140,9 +1222,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 +1244,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)); @@ -1196,19 +1280,21 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n if(state->method->is_constructor) name = "__as3_constructor__"; - return_type = 0; - state->method->info = registerfunction(getset, flags, name, params, return_type, 0); + state->method->info = registerfunction(getset, mod, name, params, return_type, 0); + + function_initvars(state->method, params, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); - + if(state->cls) { - memberinfo_t*m = registry_findmember(state->cls->info, 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 +1302,153 @@ 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"); + }*/ + + abc_method_t*f = 0; - multiname_t*type2 = sig2mname(return_type); - int slot = 0; - if(state->method->inner) { - f = state->method->abc; - abc_method_init(f, global->file, type2, 1); - } else if(state->method->is_constructor) { - f = abc_class_getconstructor(state->cls->abc, type2); - } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, name}; + 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; - } - //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 + 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*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"); + } } - 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(state->method->exceptions && + (state->method->late_binding || state->method->uses_slots)) + syntaxerror("try/catch and activation or late binding not supported yet within the same method"); + + if(f->body) { + f->body->code = body; + f->body->exceptions = state->method->exceptions; + } else { //interface + if(body) + syntaxerror("interface methods can't have a method body"); + } + + old_state(); + return f; } - - old_state(); - return f; + + return 0; } char is_subtype_of(classinfo_t*type, classinfo_t*supertype) @@ -1390,8 +1550,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 +1926,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1767 "parser.tab.c" +#line 1930 "parser.tab.c" #ifdef short # undef short @@ -1978,16 +2141,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 145 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2994 +#define YYLAST 3015 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 110 +#define YYNNTS 113 /* YYNRULES -- Number of rules. */ -#define YYNRULES 303 +#define YYNRULES 307 /* YYNRULES -- Number of states. */ -#define YYNSTATES 514 +#define YYNSTATES 519 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -2047,8 +2210,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, @@ -2059,153 +2222,154 @@ static const yytype_uint16 yyprhs[] = 358, 360, 362, 363, 366, 367, 370, 371, 374, 375, 385, 386, 395, 396, 398, 400, 403, 405, 410, 412, 414, 416, 417, 419, 421, 424, 426, 429, 438, 440, - 442, 443, 450, 451, 454, 456, 458, 460, 462, 464, - 466, 468, 470, 472, 473, 475, 478, 483, 487, 489, - 494, 497, 499, 501, 502, 503, 516, 518, 519, 520, - 531, 533, 537, 539, 541, 543, 547, 549, 551, 553, - 556, 557, 558, 562, 563, 565, 567, 569, 572, 575, - 576, 581, 586, 591, 594, 596, 599, 601, 603, 607, - 609, 611, 613, 615, 617, 619, 621, 623, 625, 627, - 629, 631, 633, 635, 637, 639, 641, 643, 647, 651, - 655, 659, 663, 667, 671, 675, 679, 683, 686, 689, - 693, 697, 701, 705, 709, 713, 717, 721, 725, 729, - 733, 737, 741, 745, 749, 754, 757, 759, 763, 766, - 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 + 442, 443, 448, 450, 454, 458, 459, 462, 464, 466, + 468, 470, 472, 474, 476, 478, 480, 481, 483, 486, + 491, 495, 497, 502, 505, 507, 509, 510, 511, 524, + 526, 527, 528, 539, 541, 545, 547, 549, 551, 555, + 557, 559, 561, 564, 565, 566, 570, 571, 573, 575, + 577, 580, 583, 584, 589, 594, 599, 602, 604, 607, + 609, 611, 615, 617, 619, 621, 623, 625, 627, 629, + 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, + 651, 655, 659, 663, 667, 671, 675, 679, 683, 687, + 691, 694, 697, 701, 705, 709, 713, 717, 721, 725, + 729, 733, 737, 741, 745, 749, 753, 757, 762, 765, + 767, 771, 774, 779, 783, 784, 786, 790, 796, 800, + 804, 808, 812, 816, 820, 824, 828, 832, 836, 840, + 844, 850, 853, 856, 859, 862, 866, 869, 874, 880, + 884, 890, 894, 896, 899, 902, 907, 912 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 185, -1, 197, -1, 195, -1, 214, + 137, 138, -1, 185, -1, 197, -1, 195, -1, 216, -1, 206, -1, 147, -1, 148, 126, 136, 132, -1, 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 197, -1, 195, -1, 214, -1, 206, -1, 147, -1, + 197, -1, 195, -1, 216, -1, 206, -1, 147, -1, 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, - 144, -1, 3, 89, 3, -1, 102, 234, -1, -1, + -1, 179, -1, 238, -1, 246, -1, 245, -1, 126, + 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, + 150, -1, 165, -1, 166, -1, 235, -1, 181, -1, + 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, + 144, -1, 3, 89, 3, -1, 102, 236, -1, -1, 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 224, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 235, 133, 146, 153, -1, -1, - 150, -1, 236, -1, 46, 3, 224, -1, 3, -1, + 152, -1, 3, 226, 149, -1, -1, 65, 146, -1, + -1, 64, 122, 155, 237, 133, 146, 153, -1, -1, + 150, -1, 238, -1, 46, 3, 226, -1, 3, -1, 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 235, 99, 236, 133, 146, -1, 158, 157, 68, 235, - 133, 146, -1, -1, 14, 122, 162, 235, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 235, 133, -1, + 237, 99, 238, 133, 146, -1, 158, 157, 68, 237, + 133, 146, -1, -1, 14, 122, 162, 237, 133, 146, + -1, -1, 15, 164, 146, 14, 122, 237, 133, -1, 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 237, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 237, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 224, 133, 174, 126, + 168, 169, -1, 34, 239, 105, 142, -1, 62, 105, + 142, -1, -1, 16, 122, 172, 239, 133, 126, 167, + 132, -1, -1, 33, 122, 3, 226, 133, 174, 126, 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, - 37, 235, -1, 37, -1, 39, 122, 235, 133, 146, + 37, 237, -1, 37, -1, 39, 122, 237, 133, 146, -1, 3, -1, 19, -1, 184, 127, 183, -1, 183, -1, -1, 19, 184, 126, 186, 139, 132, -1, -1, - 19, 126, 187, 139, 132, -1, 41, 220, -1, 41, + 19, 126, 187, 139, 132, -1, 41, 222, -1, 41, 184, 127, 115, -1, -1, 190, -1, 191, -1, 190, 191, -1, 21, -1, 22, -1, 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 221, -1, -1, 54, 222, -1, - -1, 17, 222, -1, -1, 189, 31, 3, 192, 194, + 4, -1, -1, 54, 223, -1, -1, 54, 224, -1, + -1, 17, 224, -1, -1, 189, 31, 3, 192, 194, 126, 196, 199, 132, -1, -1, 189, 44, 3, 193, 126, 198, 202, 132, -1, -1, 200, -1, 201, -1, 200, 201, -1, 99, -1, 148, 126, 199, 132, -1, - 206, -1, 214, -1, 144, -1, -1, 203, -1, 204, + 206, -1, 216, -1, 144, -1, -1, 203, -1, 204, -1, 203, 204, -1, 99, -1, 46, 3, -1, 189, - 27, 213, 3, 122, 210, 133, 224, -1, 46, -1, - 32, -1, -1, 189, 205, 3, 207, 224, 149, -1, - -1, 102, 209, -1, 10, -1, 8, -1, 9, -1, - 12, -1, 5, -1, 56, -1, 55, -1, 45, -1, - 3, -1, -1, 211, -1, 93, 212, -1, 211, 100, - 93, 212, -1, 211, 100, 212, -1, 212, -1, 3, - 105, 223, 208, -1, 3, 208, -1, 51, -1, 35, - -1, -1, -1, 189, 27, 213, 3, 122, 210, 133, - 224, 126, 215, 142, 132, -1, 3, -1, -1, -1, - 27, 216, 122, 210, 133, 224, 126, 218, 142, 132, - -1, 3, -1, 184, 127, 3, -1, 220, -1, 219, - -1, 221, -1, 222, 100, 221, -1, 221, -1, 115, - -1, 36, -1, 105, 223, -1, -1, -1, 122, 226, - 133, -1, -1, 227, -1, 228, -1, 234, -1, 227, - 100, -1, 228, 234, -1, -1, 25, 237, 229, 225, - -1, 237, 122, 226, 133, -1, 53, 122, 226, 133, - -1, 63, 237, -1, 42, -1, 42, 235, -1, 237, - -1, 237, -1, 235, 100, 237, -1, 235, -1, 217, - -1, 238, -1, 241, -1, 230, -1, 232, -1, 231, - -1, 6, -1, 10, -1, 11, -1, 8, -1, 9, - -1, 12, -1, 5, -1, 29, -1, 56, -1, 55, - -1, 45, -1, 237, 109, 237, -1, 237, 110, 237, - -1, 237, 75, 237, -1, 237, 76, 237, -1, 237, - 71, 237, -1, 237, 72, 237, -1, 237, 74, 237, - -1, 237, 73, 237, -1, 237, 87, 237, -1, 237, - 88, 237, -1, 118, 237, -1, 117, 237, -1, 237, - 108, 237, -1, 237, 107, 237, -1, 237, 106, 237, - -1, 237, 96, 237, -1, 237, 95, 237, -1, 237, - 94, 237, -1, 237, 114, 237, -1, 237, 116, 237, - -1, 237, 113, 237, -1, 237, 112, 237, -1, 237, - 115, 237, -1, 237, 68, 237, -1, 237, 69, 237, - -1, 237, 40, 237, -1, 237, 67, 237, -1, 43, - 122, 237, 133, -1, 36, 237, -1, 36, -1, 122, - 235, 133, -1, 112, 237, -1, 237, 124, 237, 125, - -1, 124, 226, 125, -1, -1, 240, -1, 234, 105, - 234, -1, 240, 100, 234, 105, 234, -1, 70, 239, - 132, -1, 237, 80, 237, -1, 237, 79, 237, -1, - 237, 85, 237, -1, 237, 84, 237, -1, 237, 86, - 237, -1, 237, 78, 237, -1, 237, 77, 237, -1, - 237, 83, 237, -1, 237, 81, 237, -1, 237, 82, - 237, -1, 237, 102, 237, -1, 237, 104, 237, 105, - 237, -1, 237, 91, -1, 237, 90, -1, 91, 237, - -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 + 27, 215, 3, 122, 212, 133, 226, -1, 46, -1, + 32, -1, -1, 189, 205, 207, 208, -1, 209, -1, + 208, 100, 209, -1, 3, 226, 149, -1, -1, 102, + 211, -1, 10, -1, 8, -1, 9, -1, 12, -1, + 5, -1, 56, -1, 55, -1, 45, -1, 3, -1, + -1, 213, -1, 93, 214, -1, 213, 100, 93, 214, + -1, 213, 100, 214, -1, 214, -1, 3, 105, 225, + 210, -1, 3, 210, -1, 51, -1, 35, -1, -1, + -1, 189, 27, 215, 3, 122, 212, 133, 226, 126, + 217, 142, 132, -1, 3, -1, -1, -1, 27, 218, + 122, 212, 133, 226, 126, 220, 142, 132, -1, 3, + -1, 184, 127, 3, -1, 222, -1, 221, -1, 223, + -1, 224, 100, 223, -1, 223, -1, 115, -1, 36, + -1, 105, 225, -1, -1, -1, 122, 228, 133, -1, + -1, 229, -1, 230, -1, 236, -1, 229, 100, -1, + 230, 236, -1, -1, 25, 239, 231, 227, -1, 239, + 122, 228, 133, -1, 53, 122, 228, 133, -1, 63, + 239, -1, 42, -1, 42, 237, -1, 239, -1, 239, + -1, 237, 100, 239, -1, 237, -1, 219, -1, 240, + -1, 243, -1, 232, -1, 234, -1, 233, -1, 6, + -1, 10, -1, 11, -1, 8, -1, 9, -1, 12, + -1, 5, -1, 29, -1, 56, -1, 55, -1, 45, + -1, 239, 109, 239, -1, 239, 110, 239, -1, 239, + 75, 239, -1, 239, 76, 239, -1, 239, 71, 239, + -1, 239, 72, 239, -1, 239, 74, 239, -1, 239, + 73, 239, -1, 239, 87, 239, -1, 239, 88, 239, + -1, 118, 239, -1, 117, 239, -1, 239, 108, 239, + -1, 239, 107, 239, -1, 239, 106, 239, -1, 239, + 96, 239, -1, 239, 95, 239, -1, 239, 94, 239, + -1, 239, 114, 239, -1, 239, 116, 239, -1, 239, + 113, 239, -1, 239, 112, 239, -1, 239, 115, 239, + -1, 239, 68, 239, -1, 239, 69, 239, -1, 239, + 40, 239, -1, 239, 67, 239, -1, 43, 122, 239, + 133, -1, 36, 239, -1, 36, -1, 122, 237, 133, + -1, 112, 239, -1, 239, 124, 239, 125, -1, 124, + 228, 125, -1, -1, 242, -1, 236, 105, 236, -1, + 242, 100, 236, 105, 236, -1, 70, 241, 132, -1, + 239, 80, 239, -1, 239, 79, 239, -1, 239, 85, + 239, -1, 239, 84, 239, -1, 239, 86, 239, -1, + 239, 78, 239, -1, 239, 77, 239, -1, 239, 83, + 239, -1, 239, 81, 239, -1, 239, 82, 239, -1, + 239, 102, 239, -1, 239, 104, 239, 105, 239, -1, + 239, 91, -1, 239, 90, -1, 91, 239, -1, 90, + 239, -1, 53, 127, 3, -1, 128, 3, -1, 239, + 127, 128, 3, -1, 239, 127, 3, 89, 3, -1, + 239, 92, 3, -1, 239, 127, 122, 239, 133, -1, + 239, 127, 3, -1, 3, -1, 18, 3, -1, 189, + 244, -1, 189, 244, 102, 3, -1, 189, 244, 102, + 5, -1, 23, 18, 223, -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, - 1902, 1905, 1909, 1910, 1912, 1932, 1975, 1975, 1994, 1994, - 2009, 2012, 2015, 2018, 2022, 2023, 2024, 2025, 2026, 2027, - 2029, 2040, 2043, 2043, 2072, 2072, 2092, 2092, 2109, 2110, - 2111, 2112, 2120, 2129, 2129, 2174, 2178, 2189, 2198, 2199, - 2201, 2202, 2204, 2204, 2206, 2206, 2209, 2223, 2239, 2240, - 2241, 2242, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251, - 2252, 2253, 2255, 2256, 2258, 2259, 2261, 2262, 2266, 2264, - 2272, 2270, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, - 2287, 2293, 2294, 2295, 2296, 2297, 2298, 2301, 2314, 2314, - 2316, 2316, 2389, 2390, 2392, 2393, 2394, 2395, 2396, 2398, - 2399, 2400, 2401, 2410, 2414, 2420, 2426, 2434, 2439, 2445, - 2453, 2461, 2462, 2463, 2466, 2465, 2480, 2481, 2483, 2482, - 2504, 2513, 2526, 2527, 2529, 2530, 2532, 2533, 2534, 2543, - 2544, 2548, 2549, 2551, 2552, 2553, 2555, 2559, 2560, 2565, - 2566, 2602, 2648, 2669, 2690, 2693, 2700, 2701, 2702, 2708, - 2714, 2716, 2718, 2720, 2722, 2724, 2726, 2743, 2748, 2751, - 2754, 2757, 2760, 2763, 2766, 2769, 2772, 2776, 2779, 2782, - 2785, 2788, 2791, 2794, 2797, 2801, 2812, 2830, 2835, 2840, - 2845, 2850, 2855, 2859, 2863, 2868, 2872, 2876, 2885, 2894, - 2904, 2909, 2921, 2927, 2932, 2938, 2944, 2948, 2950, 2961, - 2970, 2977, 2978, 2980, 2986, 2995, 3002, 3014, 3020, 3026, - 3032, 3038, 3044, 3050, 3056, 3069, 3080, 3087, 3100, 3127, - 3141, 3155, 3169, 3184, 3191, 3198, 3205, 3212, 3223, 3257, - 3359, 3360, 3361, 3363 + 0, 1907, 1907, 1909, 1909, 1910, 1911, 1913, 1914, 1915, + 1916, 1917, 1918, 1919, 1920, 1922, 1922, 1923, 1924, 1926, + 1927, 1928, 1929, 1930, 1931, 1932, 1934, 1935, 1937, 1938, + 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, + 1951, 1952, 1953, 1954, 1957, 1958, 1959, 1960, 1961, 1962, + 1963, 1964, 1968, 1969, 1973, 1980, 1984, 1985, 1989, 1990, + 1992, 1993, 1995, 2056, 2057, 2060, 2060, 2079, 2080, 2081, + 2086, 2090, 2095, 2096, 2098, 2118, 2162, 2162, 2181, 2181, + 2196, 2199, 2202, 2205, 2209, 2210, 2211, 2212, 2213, 2214, + 2216, 2227, 2230, 2230, 2259, 2259, 2283, 2283, 2299, 2300, + 2301, 2302, 2310, 2319, 2319, 2364, 2368, 2379, 2388, 2389, + 2391, 2392, 2394, 2394, 2396, 2396, 2399, 2414, 2430, 2431, + 2432, 2433, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, + 2449, 2450, 2454, 2455, 2457, 2458, 2460, 2461, 2465, 2463, + 2471, 2469, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, + 2487, 2493, 2494, 2495, 2496, 2497, 2498, 2501, 2514, 2514, + 2516, 2516, 2518, 2519, 2521, 2596, 2597, 2599, 2600, 2601, + 2602, 2603, 2605, 2606, 2607, 2608, 2617, 2621, 2627, 2633, + 2641, 2646, 2652, 2660, 2668, 2669, 2670, 2673, 2672, 2689, + 2690, 2692, 2691, 2715, 2726, 2739, 2740, 2742, 2743, 2745, + 2746, 2747, 2756, 2757, 2761, 2762, 2764, 2765, 2766, 2768, + 2772, 2773, 2778, 2779, 2815, 2861, 2882, 2903, 2906, 2913, + 2914, 2915, 2921, 2927, 2929, 2931, 2933, 2935, 2937, 2939, + 2956, 2961, 2964, 2967, 2970, 2973, 2976, 2979, 2982, 2985, + 2989, 2992, 2995, 2998, 3001, 3004, 3007, 3010, 3014, 3025, + 3043, 3048, 3053, 3058, 3063, 3068, 3072, 3076, 3081, 3085, + 3089, 3098, 3107, 3117, 3122, 3134, 3140, 3145, 3151, 3157, + 3161, 3163, 3174, 3183, 3190, 3191, 3193, 3199, 3208, 3215, + 3227, 3233, 3239, 3245, 3251, 3257, 3263, 3269, 3282, 3293, + 3300, 3313, 3340, 3354, 3368, 3382, 3397, 3404, 3411, 3418, + 3425, 3436, 3470, 3591, 3597, 3600, 3603, 3606 }; #endif @@ -2252,8 +2416,8 @@ static const char *const yytname[] = "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", - "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", - "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", + "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST", + "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", @@ -2261,7 +2425,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 +2458,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, @@ -2306,21 +2470,21 @@ static const yytype_uint8 yyr1[] = 191, 191, 192, 192, 193, 193, 194, 194, 196, 195, 198, 197, 199, 199, 200, 200, 201, 201, 201, 201, 201, 202, 202, 203, 203, 204, 204, 204, 205, 205, - 207, 206, 208, 208, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 210, 210, 210, 210, 211, 211, 212, - 212, 213, 213, 213, 215, 214, 216, 216, 218, 217, - 219, 220, 221, 221, 222, 222, 223, 223, 223, 224, - 224, 225, 225, 226, 226, 226, 227, 228, 227, 229, - 230, 231, 231, 232, 233, 233, 234, 235, 235, 236, - 237, 237, 237, 237, 237, 237, 237, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 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 + 207, 206, 208, 208, 209, 210, 210, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 212, 212, 212, 212, + 213, 213, 214, 214, 215, 215, 215, 217, 216, 218, + 218, 220, 219, 221, 222, 223, 223, 224, 224, 225, + 225, 225, 226, 226, 227, 227, 228, 228, 228, 229, + 230, 229, 231, 232, 233, 233, 234, 235, 235, 236, + 237, 237, 238, 239, 239, 239, 239, 239, 239, 239, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 241, 241, 242, 242, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 243, 244, 245, 245, 245, 246 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2330,8 +2494,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, @@ -2342,21 +2506,21 @@ static const yytype_uint8 yyr2[] = 1, 1, 0, 2, 0, 2, 0, 2, 0, 9, 0, 8, 0, 1, 1, 2, 1, 4, 1, 1, 1, 0, 1, 1, 2, 1, 2, 8, 1, 1, - 0, 6, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 1, 2, 4, 3, 1, 4, - 2, 1, 1, 0, 0, 12, 1, 0, 0, 10, - 1, 3, 1, 1, 1, 3, 1, 1, 1, 2, - 0, 0, 3, 0, 1, 1, 1, 2, 2, 0, - 4, 4, 4, 2, 1, 2, 1, 1, 3, 1, + 0, 4, 1, 3, 3, 0, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 1, 2, 4, + 3, 1, 4, 2, 1, 1, 0, 0, 12, 1, + 0, 0, 10, 1, 3, 1, 1, 1, 3, 1, + 1, 1, 2, 0, 0, 3, 0, 1, 1, 1, + 2, 2, 0, 4, 4, 4, 2, 1, 2, 1, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 2, 1, 3, 2, 4, - 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, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 4, 2, 1, + 3, 2, 4, 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, 2, 2, 4, 4, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2364,149 +2528,151 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 299, 131, 232, 226, 229, 230, 227, 228, 231, + 118, 302, 131, 235, 229, 232, 233, 230, 231, 234, 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 187, 233, 266, 125, 0, 0, 0, 236, - 126, 128, 127, 0, 0, 235, 234, 0, 0, 271, - 0, 0, 14, 0, 0, 0, 0, 203, 118, 0, + 0, 129, 190, 236, 269, 125, 0, 0, 0, 239, + 126, 128, 127, 0, 0, 238, 237, 0, 0, 274, + 0, 0, 14, 0, 0, 0, 0, 206, 118, 0, 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, + 120, 9, 8, 11, 10, 223, 226, 228, 227, 222, + 39, 220, 224, 225, 41, 40, 0, 0, 72, 76, + 118, 92, 108, 109, 114, 111, 0, 0, 302, 212, + 189, 0, 268, 0, 0, 116, 0, 103, 206, 0, + 216, 65, 0, 219, 0, 275, 294, 293, 271, 251, + 250, 0, 0, 207, 208, 209, 82, 0, 106, 217, + 0, 80, 44, 43, 118, 45, 29, 0, 46, 47, + 48, 50, 0, 49, 296, 1, 6, 118, 302, 0, + 68, 0, 0, 69, 0, 186, 0, 159, 0, 158, + 160, 304, 121, 0, 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, 292, 291, 0, 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, - 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, - 118, 153, 0, 27, 93, 89, 87, 27, 27, 200, - 64, 74, 0, 146, 150, 0, 0, 0, 118, 144, - 148, 149, 156, 183, 141, 154, 27, 91, 0, 0, - 0, 184, 118, 139, 145, 0, 90, 189, 97, 94, - 27, 0, 0, 0, 0, 147, 173, 27, 185, 0, - 0, 200, 95, 157 + 0, 0, 0, 0, 206, 0, 0, 55, 73, 0, + 53, 0, 0, 118, 112, 0, 193, 0, 196, 195, + 307, 204, 176, 0, 0, 0, 27, 0, 295, 0, + 0, 278, 0, 270, 273, 210, 211, 83, 203, 59, + 60, 105, 218, 58, 81, 42, 28, 118, 0, 203, + 0, 0, 303, 185, 184, 0, 132, 134, 0, 0, + 221, 265, 266, 263, 264, 244, 245, 247, 246, 242, + 243, 285, 284, 280, 279, 287, 288, 286, 282, 281, + 283, 248, 249, 299, 257, 256, 255, 289, 0, 254, + 253, 252, 240, 241, 261, 260, 258, 262, 259, 0, + 0, 301, 0, 0, 0, 52, 0, 0, 25, 0, + 118, 17, 23, 0, 20, 19, 22, 21, 118, 110, + 0, 206, 213, 165, 0, 0, 177, 181, 118, 194, + 117, 267, 0, 26, 215, 0, 276, 0, 0, 57, + 0, 118, 13, 57, 0, 0, 0, 0, 136, 0, + 0, 203, 161, 162, 305, 306, 0, 214, 272, 0, + 0, 297, 118, 0, 0, 115, 18, 118, 0, 0, + 0, 0, 183, 178, 203, 0, 107, 0, 118, 0, + 201, 200, 199, 202, 0, 62, 61, 51, 0, 118, + 176, 133, 0, 0, 197, 135, 140, 57, 0, 290, + 298, 300, 77, 0, 84, 0, 113, 205, 175, 171, + 168, 169, 167, 170, 174, 173, 172, 166, 165, 0, + 0, 180, 0, 0, 98, 102, 100, 104, 63, 277, + 56, 0, 75, 0, 137, 138, 0, 118, 164, 163, + 79, 0, 0, 0, 85, 88, 86, 24, 182, 191, + 179, 96, 0, 99, 101, 118, 66, 118, 203, 118, + 198, 0, 155, 0, 0, 118, 153, 0, 27, 93, + 89, 87, 27, 27, 203, 64, 74, 0, 146, 150, + 0, 0, 0, 118, 144, 148, 149, 156, 186, 141, + 154, 27, 91, 0, 0, 0, 187, 118, 139, 145, + 0, 90, 192, 97, 94, 27, 0, 0, 0, 0, + 147, 176, 27, 188, 0, 0, 203, 95, 157 }; /* 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, 309, 310, 311, 332, 333, + 135, 136, 211, 312, 137, 385, 138, 243, 240, 456, + 57, 229, 151, 152, 58, 59, 60, 61, 209, 62, + 90, 139, 140, 443, 444, 445, 446, 63, 212, 424, + 508, 425, 473, 426, 427, 64, 226, 141, 65, 95, + 217, 66, 318, 213, 67, 142, 69, 70, 348, 350, + 393, 314, 459, 315, 437, 482, 483, 484, 464, 465, + 466, 160, 316, 258, 352, 353, 372, 417, 325, 326, + 327, 255, 317, 505, 101, 75, 472, 218, 219, 382, + 395, 383, 339, 322, 122, 123, 124, 221, 76, 77, + 78, 143, 125, 79, 80, 81, 82, 114, 115, 83, + 161, 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, - 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, 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 + 1672, 12, -426, -426, -426, -426, -426, -426, -426, -426, + -16, -19, -426, -18, 11, -426, -426, -426, 107, -426, + 2092, -426, 132, -426, 350, -426, 58, 25, 79, -426, + -426, -426, -426, 84, -20, -426, -426, 2092, 83, 2092, + 2092, 2092, -426, 2092, 2092, 2092, 2092, 2092, 632, 209, + 216, -426, 502, -426, -426, -426, 93, -426, 2022, -426, + -426, -426, -426, -426, -426, -426, -426, -426, 356, 248, + -426, -426, -426, -426, -426, -426, -426, -426, -426, 118, + -426, 2522, -426, -426, -426, -426, 218, 105, -426, -426, + 1924, -426, -426, -426, -426, -426, -106, 86, -426, -46, + -426, 106, 139, 2092, 108, -426, 2092, -426, 2092, 229, + 139, -426, 129, 2522, 104, 138, 139, 139, 294, 139, + 139, -75, 115, 141, 2092, -426, 239, 243, 2092, 2092, + 243, 244, -426, -426, 762, -426, -426, 123, -426, -426, + -426, -426, 232, -426, -426, -426, -426, 1022, 183, 255, + -426, 165, 197, -426, 264, 92, 270, -426, 273, -426, + -426, 176, -426, 2092, 2092, 2092, 2092, 2092, 2092, 2092, + 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, + 2092, 2092, 2092, 2092, 2092, 2092, -426, -426, 280, 2092, + 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, + 2092, 2092, 2092, 2092, 2092, 2092, 14, -426, -426, 2092, + 185, 271, 2092, 1152, -426, 25, 160, 161, -426, -426, + -426, 167, 20, -12, 19, 2150, 1798, 157, -426, 2092, + 2092, -426, 2092, -426, -426, -426, -426, -426, 186, 192, + -426, 118, 118, 192, -426, -426, -426, 1924, 166, 186, + 2092, 2092, -426, -426, -426, 296, 246, 252, 304, 149, + 2522, 1014, 494, 494, 494, 2888, 2888, 2888, 2888, 1014, + 1014, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, + 2522, 2583, 2644, -426, 211, 211, 211, 2522, 2339, 2705, + 2766, 2827, 1014, 1014, 294, 294, 139, 139, 139, 175, + 2400, 220, 2092, 311, -9, -426, 194, 2213, -426, 189, + 1282, -426, -426, 191, -426, -426, -426, -426, 1152, -426, + 125, 2092, -426, 97, 312, 195, 222, -426, 1924, 160, + -426, -426, 198, 1798, -426, -1, -426, 224, 38, 235, + 243, 892, -426, -26, -35, 8, 212, 86, 314, 86, + 213, 186, 240, -426, -426, -426, 2092, -426, -426, 338, + 2276, -426, 1924, 2092, 217, -426, -426, 1152, 210, 221, + 74, 38, -426, -426, 186, 24, -426, 98, 1924, 2092, + -426, -426, -426, -426, 2092, -426, -426, -426, 2092, 1924, + 20, -426, 86, 219, -426, 250, -426, 235, 304, 2522, + -426, -426, -426, 45, 56, 214, -426, -426, -426, -426, + -426, -426, -426, -426, -426, -426, -426, -426, 242, 225, + 312, -426, 237, 251, -426, -426, 98, -426, 299, -426, + -426, 245, -426, 247, 250, -426, 86, 47, -426, -426, + -426, 2092, 261, 249, 56, -426, -426, -426, -426, -426, + -426, -426, 379, -426, -426, 1924, -426, 1924, 186, 1412, + -426, 386, -426, 363, 259, 233, -426, 2461, 1798, -426, + -426, -426, 1798, 1798, 186, -426, -426, 266, -426, -426, + 267, 193, 262, 1542, -426, -426, -426, -426, 92, -426, + -426, 1798, -426, 265, 269, 263, -426, 1412, -426, -426, + 395, -426, -426, -426, -426, 1798, 272, 277, 281, 279, + -426, 20, 1798, -426, 282, 285, 186, -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, 275, -426, 360, -292, -426, 103, -425, -39, + 1, -85, -317, 59, 2, 17, 361, 297, 85, -426, + -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, + -426, -426, -426, -426, -426, -21, -17, -426, -426, 5, + -426, 6, -426, -426, -426, -426, -426, -426, -426, -200, + 36, -426, -426, -426, -426, 0, -426, 357, -426, -426, + -426, 60, -426, 62, -426, -69, -426, -54, -426, -426, + -31, -426, 3, -426, -426, 32, 18, -426, -372, -426, + -305, -53, 4, -426, -426, -426, -426, -426, 411, -87, + 50, 68, -241, -426, -95, -426, -426, -426, -426, -426, + -426, -426, -32, -6, -52, -8, -426, -426, -426, -426, + -426, -426, -426 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2516,543 +2682,541 @@ 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, - 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, - 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, - 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, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 68, 54, 56, 73, 74, 210, 153, 112, 343, 134, + 220, 376, 99, 227, 92, 319, 102, 301, 433, 373, + 214, 215, 329, 323, 319, 163, 368, 323, 92, 110, + 93, 113, 116, 117, 87, 118, 119, 120, 93, 113, + 121, 216, -70, 492, 93, 402, 188, 493, 494, 246, + 96, 2, 68, 54, 56, 73, 74, 93, 233, 55, + 71, 428, 72, 104, 388, 163, 501, 15, 16, 17, + 421, 19, 432, 21, 380, 405, 384, 408, 205, 409, + 509, 206, 410, 411, 412, 25, 413, 515, 163, 216, + 441, 163, 236, 461, 30, 31, 32, 223, 225, 163, + 113, 86, 108, 89, 91, 93, 88, 109, 163, 299, + 397, 55, 71, 324, 72, 450, 113, 420, 442, 414, + 319, 328, 241, 242, 362, 97, 422, 253, 329, 415, + 416, 423, 378, 419, 330, 100, 302, 94, 475, 514, + 476, 389, 303, 254, 93, 163, 462, 68, 54, 56, + 73, 74, 354, 381, 355, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 440, -151, + 103, 284, 285, 286, 287, 288, 289, 290, 291, 292, + 293, 294, 295, 296, 297, 298, 113, 300, 336, 370, + 337, 106, 371, 304, 307, 111, 55, 71, 341, 72, + 107, 154, 144, 68, 54, 313, 145, 477, 163, 147, + 155, 207, 113, 335, 113, 157, 369, 208, 222, 186, + 187, 188, 228, 495, 230, 224, 231, 2, 232, 159, + 234, 235, 237, 210, 344, 345, 238, 244, 246, 247, + 154, -71, 2, 15, 16, 17, 246, 19, 249, 21, + 391, 204, 394, 205, 250, 251, 206, 252, 15, 16, + 17, 25, 19, 256, 21, 518, 257, 210, 259, 461, + 30, 31, 32, 283, 305, 306, 25, -108, 320, 321, + 334, 338, 340, 210, 360, 30, 31, 32, 342, 346, + 347, 186, 187, 188, 210, 394, 349, 351, 357, 359, + 68, 54, 313, 113, 361, 323, 363, 367, 68, 54, + 313, 365, 375, 199, 200, 201, 202, 203, 374, 379, + 377, 392, 462, 204, 390, 205, 431, 384, 206, 396, + 398, 400, 406, 404, 370, 435, 447, 429, 399, 460, + 436, 449, 430, 98, 407, 3, 4, 403, 5, 6, + 7, 8, 9, 451, 455, -152, 468, 68, 54, 313, + 210, 113, 210, 452, 154, 20, 113, 22, 457, 23, + 458, 469, 474, 155, 186, 187, 188, 156, 157, 487, + 488, 489, 496, 497, 498, 29, 504, 502, 507, 511, + 158, 503, 159, 34, 510, 35, 36, 512, 201, 202, + 203, 513, 146, 366, 438, 516, 204, 517, 205, 150, + 39, 206, 248, 470, 239, 386, 162, 471, 506, 499, + 439, 453, 454, 467, 490, 500, 448, 463, 105, 418, + 40, 41, 434, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 481, + 479, 480, 485, 486, 0, 463, 0, 0, 0, 0, + 0, 0, 46, 0, 47, 0, 0, 0, 49, 0, + 0, 0, 0, 481, 479, 480, 485, 486, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 481, 479, 480, + 485, 486, -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, 164, 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, 172, + 173, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, + 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 42, 0, 197, 198, 0, 199, 200, 201, 202, + 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, + 45, 206, 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, 126, 0, 127, 0, 0, 0, 24, 128, + 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, + 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, + 0, 0, 0, 0, 0, 37, 38, 0, 131, 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, 132, 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, 133, 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, 126, 0, 127, 0, 0, 0, 24, 128, + 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, + 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, + 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, + 0, 0, 39, 0, 0, 0, 0, 0, 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, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 132, - 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, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 132, 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, 245, 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, 126, 0, 127, 0, 0, 0, 24, 128, + 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, + 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, + 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, + 0, 0, 39, 0, 0, 0, 0, 0, 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, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 239, - 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, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 132, 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, 387, 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, 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, 0, 0, 0, 0, 37, 38, 0, 0, -153, + -153, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, + 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 42, 0, -153, -153, 0, 199, 200, 201, 202, + 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, + 45, 206, 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, 18, 19, 20, 21, 0, + 0, 23, 0, 0, 0, 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, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 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, - 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, - 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, 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, 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, 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, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 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, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 308, 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, 1, 2, 3, 4, 0, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, + 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, + 0, 23, 0, 0, 0, 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, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 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, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 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, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 308, 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, 1, 2, 3, 4, 0, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, + 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, + 0, 23, 0, 0, 0, 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, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 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, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 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, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 478, 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, -142, 1, 2, 3, 4, 0, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, + 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, + 0, 23, 0, 0, 0, 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, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 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, -142, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 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, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 478, 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, -3, 0, -143, 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, 0, 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, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 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, -3, 0, -143, - 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, 0, - 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, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 0, 42, 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, -118, 0, 15, 16, + 17, 18, 19, 20, 21, 22, 0, 23, 126, 0, + 127, 0, 0, 0, 24, 128, 25, 26, 0, 27, + 129, 28, 0, 29, 130, 30, 31, 32, 0, 0, + 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, + 0, 37, 38, 0, 131, 0, 0, 0, 39, 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, 42, 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, -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, - 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, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, + 0, 0, 0, 0, 0, 0, 0, 132, 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, 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, - 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 130, 0, 0, 0, 39, + 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, 126, 0, 127, 0, 0, 0, + 24, 128, 25, 26, 0, 27, 129, 28, 0, 29, + 130, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 131, 0, 0, 0, 39, 0, 0, 0, 0, 0, 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, - 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 20, 47, 22, 48, 23, 49, 0, 126, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 28, 0, 29, 149, 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, - 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, - 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, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 132, 0, 148, 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, 127, 0, 0, 0, 24, 0, + 0, 0, 0, 0, 0, 28, 0, 29, 149, 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, 98, 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, 0, 0, 0, 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, - 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, - 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, + 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, + 164, 0, 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, 165, 166, 167, + 49, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, + 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, + 0, 0, 192, 164, 193, 0, 194, 195, 196, 197, + 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, + 0, 0, 204, 0, 205, 0, 0, 206, 0, 0, + 165, 166, 167, 331, 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, + 184, 185, 0, 186, 187, 188, 0, 189, 190, 191, + 0, 0, 0, 0, 0, 192, 164, 193, 0, 194, + 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, + 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, + 206, 0, 0, 165, 166, 167, 364, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, + 189, 190, 191, 0, 0, 0, 0, 0, 192, 164, + 193, 0, 194, 195, 196, 197, 198, 0, 199, 200, + 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, + 205, 0, 0, 206, 0, 0, 165, 166, 167, 401, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 0, 186, + 187, 188, 0, 189, 190, 191, 0, 0, 0, 0, + 164, 192, 0, 193, 356, 194, 195, 196, 197, 198, + 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, + 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, + 0, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, + 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, + 0, 164, 192, 0, 193, 0, 194, 195, 196, 197, + 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, + 0, 0, 204, 0, 205, 358, 0, 206, 165, 166, + 167, 0, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, + 0, 0, 164, 192, 0, 193, 491, 194, 195, 196, + 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, + 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, + 166, 167, 0, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 0, 186, 187, 188, 0, 189, 190, 191, 0, + 0, 0, 0, 164, 192, 0, 193, 0, 194, 195, + 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, + 0, 0, 0, 0, 204, 0, 205, 0, 0, 206, + 165, 166, 167, 0, 168, 169, 170, 171, 172, 173, 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, 185, 0, 186, 187, 188, 0, 189, 190, 191, + 0, 0, 0, 0, 164, 0, 0, 0, 0, 194, + 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, + 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, + 206, 165, 166, 167, 0, 168, 169, 170, 171, 172, + 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, + 191, 0, 0, 0, 0, 164, 0, 0, 0, 0, + 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, + 203, 0, 0, 0, 0, 0, 204, 0, 205, 0, + 0, 206, 165, 166, 167, 0, 168, 169, 170, 171, + 172, 173, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 186, 187, 188, 0, 189, + 190, 191, 0, 0, 0, 0, 164, 0, 0, 0, + 0, 0, 195, 196, 197, 198, 0, 199, 200, 201, + 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, + 0, 0, 206, 165, 166, 167, 0, 168, 169, 170, + 171, 172, 173, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 186, 187, 188, 0, + 189, 190, 191, 0, 0, 0, 0, 164, 0, 0, + 0, 0, 0, 0, 196, 197, 198, 0, 199, 200, + 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, + 205, 0, 0, 206, 165, 166, 167, 0, 168, 169, + 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 186, 187, 188, + 0, 189, 190, 191, 0, 0, 0, 0, 164, 0, + 0, 0, 0, 0, 0, -153, 197, 198, 0, 199, + 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, + 0, 205, 0, 0, 206, 165, 166, 167, 0, -153, + -153, -153, -153, 172, 173, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 186, 187, + 188, 0, 189, 190, 191, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 197, 198, 0, + 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, + 204, 0, 205, 0, 0, 206 }; 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, - -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, - 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, - 53, -1, 55, 56, -1, -1, 67, 68, 69, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + 0, 0, 0, 0, 0, 90, 58, 39, 249, 48, + 97, 328, 20, 108, 3, 215, 24, 3, 390, 324, + 126, 127, 3, 3, 224, 100, 318, 3, 3, 37, + 19, 39, 40, 41, 50, 43, 44, 45, 19, 47, + 46, 3, 68, 468, 19, 362, 92, 472, 473, 134, + 14, 4, 52, 52, 52, 52, 52, 19, 133, 0, + 0, 378, 0, 27, 99, 100, 491, 20, 21, 22, + 375, 24, 389, 26, 36, 367, 102, 3, 124, 5, + 505, 127, 8, 9, 10, 38, 12, 512, 100, 3, + 34, 100, 124, 46, 47, 48, 49, 103, 106, 100, + 108, 89, 122, 122, 122, 19, 122, 127, 100, 204, + 351, 52, 52, 93, 52, 420, 124, 93, 62, 45, + 320, 133, 128, 129, 133, 18, 28, 35, 3, 55, + 56, 33, 133, 374, 115, 3, 122, 126, 455, 511, + 457, 133, 128, 51, 19, 100, 99, 147, 147, 147, + 147, 147, 3, 115, 5, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 133, 132, + 122, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 230, 102, + 232, 122, 105, 209, 212, 122, 147, 147, 247, 147, + 126, 18, 3, 213, 213, 213, 0, 458, 100, 126, + 27, 3, 230, 229, 232, 32, 321, 122, 122, 90, + 91, 92, 3, 474, 105, 127, 132, 4, 100, 46, + 125, 100, 3, 328, 250, 251, 3, 3, 333, 126, + 18, 68, 4, 20, 21, 22, 341, 24, 3, 26, + 347, 122, 349, 124, 99, 68, 127, 3, 20, 21, + 22, 38, 24, 3, 26, 516, 3, 362, 102, 46, + 47, 48, 49, 3, 99, 14, 38, 127, 127, 122, + 133, 105, 100, 378, 302, 47, 48, 49, 132, 3, + 54, 90, 91, 92, 389, 392, 54, 3, 133, 89, + 310, 310, 310, 321, 3, 3, 122, 126, 318, 318, + 318, 132, 100, 112, 113, 114, 115, 116, 133, 105, + 132, 17, 99, 122, 122, 124, 388, 102, 127, 126, + 100, 3, 132, 126, 102, 126, 132, 379, 356, 436, + 100, 126, 384, 3, 133, 5, 6, 363, 8, 9, + 10, 11, 12, 126, 65, 132, 105, 367, 367, 367, + 455, 379, 457, 122, 18, 25, 384, 27, 133, 29, + 133, 132, 3, 27, 90, 91, 92, 31, 32, 3, + 27, 132, 126, 126, 132, 45, 133, 132, 3, 122, + 44, 132, 46, 53, 132, 55, 56, 126, 114, 115, + 116, 132, 52, 310, 397, 133, 122, 132, 124, 58, + 70, 127, 147, 444, 127, 340, 69, 444, 497, 483, + 398, 426, 426, 441, 465, 488, 418, 437, 27, 371, + 90, 91, 392, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 459, + 459, 459, 459, 459, -1, 465, -1, -1, -1, -1, + -1, -1, 122, -1, 124, -1, -1, -1, 128, -1, + -1, -1, -1, 483, 483, 483, 483, 483, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 497, 497, 497, + 497, 497, 0, -1, -1, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 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, 53, -1, 55, 56, -1, + -1, 67, 68, 69, -1, 63, 64, -1, -1, 75, + 76, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, + 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, 109, 110, -1, 112, 113, 114, 115, + 116, -1, -1, -1, 112, -1, 122, -1, 124, 117, + 118, 127, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, + -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, + 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, + -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, + 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, + -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, + 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 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, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, 75, + 76, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, + 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, 109, 110, -1, 112, 113, 114, 115, + 116, -1, -1, -1, 112, -1, 122, -1, 124, 117, + 118, 127, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 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, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, -1, 0, -1, 132, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, + 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, 0, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, + 128, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, 15, 16, -1, 18, -1, 20, 21, + 22, 23, 24, 25, 26, 27, -1, 29, 30, -1, + 32, -1, -1, -1, 36, 37, 38, 39, -1, 41, + 42, 43, -1, 45, 46, 47, 48, 49, -1, -1, + 52, 53, -1, 55, 56, -1, -1, -1, -1, -1, + -1, 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, 18, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, 3, 4, 5, 6, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, -1, 20, - 21, 22, 23, 24, 25, 26, 27, -1, 29, 30, - -1, 32, -1, -1, -1, 36, 37, 38, 39, -1, - 41, 42, 43, -1, 45, 46, 47, 48, 49, -1, - -1, 52, 53, -1, 55, 56, -1, -1, -1, -1, - -1, -1, 63, 64, -1, 66, -1, -1, -1, 70, + 112, -1, -1, -1, -1, 117, 118, -1, -1, -1, + 122, -1, 124, -1, 126, -1, 128, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, - 3, -1, 5, 6, -1, 8, 9, 10, 11, 12, - -1, 112, -1, -1, -1, -1, 117, 118, -1, -1, - -1, 122, 25, 124, 27, 126, 29, 128, -1, 32, - -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, - 43, -1, 45, 46, -1, -1, -1, -1, -1, -1, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, -1, -1, -1, -1, -1, -1, 70, -1, -1, - 3, -1, 5, 6, -1, 8, 9, 10, 11, 12, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, 25, -1, 27, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, -1, -1, -1, -1, 112, - 43, -1, 45, -1, 117, 118, -1, -1, -1, 122, - 53, 124, 55, 56, -1, 128, -1, -1, -1, -1, - 63, -1, -1, -1, -1, -1, -1, 70, -1, -1, - 3, -1, 5, 6, -1, 8, 9, 10, 11, 12, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, 25, -1, 27, -1, 29, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, 45, -1, 117, 118, -1, -1, -1, 122, - 53, 124, 55, 56, -1, 128, -1, -1, -1, -1, - -1, -1, 40, -1, -1, -1, -1, 70, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 3, -1, 5, 6, -1, + 8, 9, 10, 11, 12, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, 25, 124, 27, + 126, 29, 128, -1, 32, -1, -1, -1, 36, -1, + -1, -1, -1, -1, -1, 43, -1, 45, 46, -1, + -1, -1, -1, -1, -1, 53, -1, 55, 56, -1, + -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, + -1, -1, 70, -1, -1, 3, -1, 5, 6, -1, + 8, 9, 10, 11, 12, -1, -1, -1, -1, -1, + -1, -1, 90, 91, -1, -1, -1, 25, -1, 27, + -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, + -1, -1, -1, -1, 112, 43, -1, 45, -1, 117, + 118, -1, -1, -1, 122, 53, 124, 55, 56, -1, + 128, -1, -1, -1, -1, 63, -1, -1, -1, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 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, 122, - -1, 124, -1, -1, 102, 128, 104, -1, 106, 107, - 108, 109, 110, 40, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - -1, -1, -1, -1, -1, 133, -1, -1, -1, -1, - 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, + -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, + 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, + 118, -1, -1, -1, 122, -1, 124, 67, 68, 69, + 128, 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, 114, 115, 116, -1, -1, -1, + -1, -1, 122, -1, 124, -1, -1, 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, @@ -3091,7 +3255,7 @@ static const yytype_int16 yycheck[] = -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, 88, -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, -1, 122, -1, 124, -1, -1, @@ -3099,13 +3263,13 @@ static const yytype_int16 yycheck[] = 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, + 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, -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, + -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, @@ -3116,10 +3280,16 @@ static const yytype_int16 yycheck[] = 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, + -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 + -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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3133,51 +3303,51 @@ static const yytype_uint8 yystos[] = 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, 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, - 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, - 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, - 203, 204, 237, 105, 132, 169, 170, 218, 176, 3, - 146, 146, 224, 99, 144, 148, 189, 199, 200, 201, - 206, 214, 3, 27, 132, 204, 105, 142, 142, 142, - 224, 126, 126, 132, 201, 213, 142, 132, 132, 133, - 215, 199, 3, 174, 142, 132, 122, 126, 132, 210, - 142, 133, 132, 224 + 191, 195, 197, 206, 216, 219, 232, 233, 234, 237, + 238, 239, 240, 243, 245, 246, 89, 50, 122, 122, + 164, 122, 3, 19, 126, 183, 184, 18, 3, 239, + 3, 218, 239, 122, 184, 222, 122, 126, 122, 127, + 239, 122, 236, 239, 241, 242, 239, 239, 239, 239, + 239, 237, 228, 229, 230, 236, 30, 32, 37, 42, + 46, 66, 99, 132, 143, 144, 145, 148, 150, 165, + 166, 181, 189, 235, 3, 0, 138, 126, 3, 46, + 150, 156, 157, 238, 18, 27, 31, 32, 44, 46, + 205, 244, 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, 184, 221, 222, + 223, 231, 122, 237, 127, 239, 180, 228, 3, 155, + 105, 132, 100, 133, 125, 100, 236, 3, 3, 151, + 152, 237, 237, 151, 3, 132, 145, 126, 136, 3, + 99, 68, 3, 35, 51, 215, 3, 3, 207, 102, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 3, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 228, + 239, 3, 122, 128, 237, 99, 14, 239, 99, 139, + 140, 141, 147, 148, 195, 197, 206, 216, 186, 183, + 127, 122, 227, 3, 93, 212, 213, 214, 133, 3, + 115, 133, 142, 143, 133, 237, 236, 236, 105, 226, + 100, 143, 132, 226, 237, 237, 3, 54, 192, 54, + 193, 3, 208, 209, 3, 5, 105, 133, 125, 89, + 239, 3, 133, 122, 133, 132, 141, 126, 139, 228, + 102, 105, 210, 214, 133, 100, 146, 132, 133, 105, + 36, 115, 223, 225, 102, 149, 152, 132, 99, 133, + 122, 223, 17, 194, 223, 224, 126, 226, 100, 239, + 3, 133, 146, 237, 126, 139, 132, 133, 3, 5, + 8, 9, 10, 12, 45, 55, 56, 211, 225, 226, + 93, 214, 28, 33, 173, 175, 177, 178, 146, 236, + 236, 238, 146, 212, 224, 126, 100, 198, 149, 209, + 133, 34, 62, 167, 168, 169, 170, 132, 210, 126, + 214, 126, 122, 173, 175, 65, 153, 133, 133, 196, + 223, 46, 99, 189, 202, 203, 204, 239, 105, 132, + 169, 170, 220, 176, 3, 146, 146, 226, 99, 144, + 148, 189, 199, 200, 201, 206, 216, 3, 27, 132, + 204, 105, 142, 142, 142, 226, 126, 126, 132, 201, + 215, 142, 132, 132, 133, 217, 199, 3, 174, 142, + 132, 122, 126, 132, 212, 142, 133, 132, 226 }; #define yyerrok (yyerrstatus = 0) @@ -3993,7 +4163,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1769 "parser.y" +#line 1934 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4004,7 +4174,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1770 "parser.y" +#line 1935 "parser.y" {(yyval.code)=code_new();} } break; @@ -4015,7 +4185,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1772 "parser.y" +#line 1937 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4026,30 +4196,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1773 "parser.y" +#line 1938 "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 1953 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4059,19 +4218,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1791 "parser.y" +#line 1954 "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 1957 "parser.y" + {(yyval.code)=0;} } break; @@ -4081,8 +4240,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1800 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 1964 "parser.y" + {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4092,7 +4251,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1804 "parser.y" +#line 1968 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4103,7 +4262,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1805 "parser.y" +#line 1969 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4114,7 +4273,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1809 "parser.y" +#line 1973 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4128,7 +4287,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1820 "parser.y" +#line 1984 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4139,7 +4298,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1821 "parser.y" +#line 1985 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4152,7 +4311,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1825 "parser.y" +#line 1989 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4163,7 +4322,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1826 "parser.y" +#line 1990 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4174,7 +4333,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1828 "parser.y" +#line 1992 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4185,7 +4344,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1829 "parser.y" +#line 1993 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4196,45 +4355,63 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" +#line 1996 "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 +4422,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1874 "parser.y" +#line 2056 "parser.y" {(yyval.code) = code_new();} } break; @@ -4256,7 +4433,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1875 "parser.y" +#line 2057 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4267,8 +4444,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" - {new_state();} +#line 2060 "parser.y" + {PASS12 new_state();} } break; @@ -4278,7 +4455,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" +#line 2060 "parser.y" { (yyval.code) = code_new(); @@ -4295,7 +4472,7 @@ yyreduce: myjmp->branch = (yyval.code) = abc_nop((yyval.code)); } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4306,7 +4483,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1897 "parser.y" +#line 2079 "parser.y" {(yyval.code)=code_new();} } break; @@ -4317,9 +4494,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1902 "parser.y" +#line 2086 "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 +4508,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1905 "parser.y" +#line 2090 "parser.y" { + PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); } } @@ -4343,8 +4522,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1909 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} +#line 2095 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4354,8 +4533,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1910 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} +#line 2096 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4365,7 +4544,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1912 "parser.y" +#line 2098 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4383,7 +4562,7 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4394,13 +4573,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1932 "parser.y" +#line 2118 "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 +4611,11 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } } break; @@ -4446,8 +4626,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1975 "parser.y" - {new_state();} +#line 2162 "parser.y" + {PASS12 new_state();} } break; @@ -4457,7 +4637,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1975 "parser.y" +#line 2162 "parser.y" { (yyval.code) = code_new(); @@ -4474,7 +4654,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4485,8 +4665,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1994 "parser.y" - {new_state();} +#line 2181 "parser.y" + {PASS12 new_state();} } break; @@ -4496,7 +4676,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1994 "parser.y" +#line 2181 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4509,7 +4689,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4520,7 +4700,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2009 "parser.y" +#line 2196 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4533,7 +4713,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2012 "parser.y" +#line 2199 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4546,7 +4726,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2015 "parser.y" +#line 2202 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4559,7 +4739,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2018 "parser.y" +#line 2205 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4572,7 +4752,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2022 "parser.y" +#line 2209 "parser.y" {(yyval.code)=0;} } break; @@ -4583,7 +4763,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2023 "parser.y" +#line 2210 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4594,7 +4774,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2024 "parser.y" +#line 2211 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4605,7 +4785,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2025 "parser.y" +#line 2212 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4616,7 +4796,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" +#line 2213 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4627,7 +4807,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2214 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4638,7 +4818,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2029 "parser.y" +#line 2216 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4659,7 +4839,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2040 "parser.y" +#line 2227 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4672,8 +4852,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2043 "parser.y" - {new_state();} +#line 2230 "parser.y" + {PASS12 new_state();} } break; @@ -4683,7 +4863,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2043 "parser.y" +#line 2230 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4708,7 +4888,7 @@ yyreduce: } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4719,8 +4899,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2072 "parser.y" - {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} +#line 2259 "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 +4914,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2073 "parser.y" +#line 2264 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4741,14 +4925,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 +4943,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2092 "parser.y" - {new_state();state->exception_name=0;} +#line 2283 "parser.y" + {PASS12 new_state();state->exception_name=0;} } break; @@ -4770,12 +4954,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2092 "parser.y" +#line 2283 "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 +4966,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 +4979,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2109 "parser.y" +#line 2299 "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 +4990,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2110 "parser.y" +#line 2300 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4818,7 +5001,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" +#line 2301 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4829,7 +5012,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 2302 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4847,7 +5030,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2120 "parser.y" +#line 2310 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4865,8 +5048,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2129 "parser.y" - {new_state();} +#line 2319 "parser.y" + {PASS12 new_state();} } break; @@ -4876,7 +5059,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2129 "parser.y" +#line 2319 "parser.y" { code_t*out = abc_nop(0); @@ -4889,7 +5072,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 +5100,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 +5111,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2174 "parser.y" +#line 2364 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4942,11 +5125,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2178 "parser.y" +#line 2368 "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,10 +5143,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2189 "parser.y" +#line 2379 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; - (yyval.code) = abc_pushscope((yyval.code)); + (yyval.code) = abc_pushwith((yyval.code)); (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code)); (yyval.code) = abc_popscope((yyval.code)); } @@ -4976,7 +5159,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" +#line 2389 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -4987,7 +5170,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2201 "parser.y" +#line 2391 "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 +5181,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" +#line 2392 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5009,7 +5192,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2204 "parser.y" +#line 2394 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5020,7 +5203,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2205 "parser.y" +#line 2395 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5031,7 +5214,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2206 "parser.y" +#line 2396 "parser.y" {PASS12 startpackage("");} } break; @@ -5042,7 +5225,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2207 "parser.y" +#line 2397 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5053,10 +5236,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2399 "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 +5261,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2223 "parser.y" +#line 2414 "parser.y" { - PASS1 + PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { as3_schedule_package((yyvsp[(2) - (4)].id)); } @@ -5100,8 +5284,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2239 "parser.y" - {PASS12 (yyval.flags)=0;} +#line 2430 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5111,7 +5295,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2240 "parser.y" +#line 2431 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5122,8 +5306,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2432 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5133,8 +5317,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2433 "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 +5334,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2244 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2441 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5155,8 +5345,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2245 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2442 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5166,8 +5356,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2443 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5177,8 +5367,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2247 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2444 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5188,8 +5378,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2248 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2445 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5199,8 +5389,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2249 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2446 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5210,8 +5400,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2250 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2447 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5221,8 +5411,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2251 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2448 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5232,8 +5422,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2449 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5243,8 +5433,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2253 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2450 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; @@ -5254,7 +5446,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2255 "parser.y" +#line 2454 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; @@ -5265,7 +5457,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2256 "parser.y" +#line 2455 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5276,7 +5468,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2258 "parser.y" +#line 2457 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5287,7 +5479,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2259 "parser.y" +#line 2458 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5298,7 +5490,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2261 "parser.y" +#line 2460 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5309,7 +5501,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2461 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5320,8 +5512,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2266 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2465 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5331,7 +5523,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "parser.y" +#line 2467 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5342,8 +5534,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2272 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2471 "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 +5546,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2274 "parser.y" +#line 2474 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5364,7 +5557,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2287 "parser.y" +#line 2487 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5379,7 +5572,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2298 "parser.y" +#line 2498 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5392,15 +5585,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2301 "parser.y" +#line 2501 "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 +5605,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2316 "parser.y" - {setstaticfunction((yyvsp[(1) - (3)].flags));} +#line 2516 "parser.y" + {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; @@ -5423,38 +5616,73 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2316 "parser.y" +#line 2516 "parser.y" + {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} + } + break; + + + + case 162: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2518 "parser.y" + {(yyval.code) = (yyvsp[(1) - (1)].code);} + } + break; + + + + case 163: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2519 "parser.y" + {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} + } + break; + + + + case 164: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2522 "parser.y" { - int flags = (yyvsp[(1) - (6)].flags); - U8 access = flags2access((yyvsp[(1) - (6)].flags)); + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (6)].id), 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].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[(1) - (3)].id)); } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].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[(1) - (3)].id)); } - info->type = (yyvsp[(5) - (6)].classinfo); + info->type = (yyvsp[(2) - (3)].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[(1) - (3)].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) { @@ -5468,8 +5696,8 @@ yyreduce: } trait_t*t=0; - if((yyvsp[(5) - (6)].classinfo)) { - MULTINAME(m, (yyvsp[(5) - (6)].classinfo)); + if((yyvsp[(2) - (3)].classinfo)) { + MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); } else { t = trait_new_member(traits, 0, multiname_clone(&mname), 0); @@ -5478,145 +5706,144 @@ yyreduce: /* initalization code (if needed) */ code_t*c = 0; - if((yyvsp[(6) - (6)].value).c && !is_pushundefined((yyvsp[(6) - (6)].value).c)) { + if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(6) - (6)].value).c); - c = converttype(c, (yyvsp[(6) - (6)].value).t, (yyvsp[(5) - (6)].classinfo)); + c = code_append(c, (yyvsp[(3) - (3)].value).c); + c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); c = abc_setslot(c, t->slot_id); } *code = code_append(*code, c); - if((yyvsp[(2) - (6)].token)==KW_CONST) { + if(slotstate_varconst==KW_CONST) { t->kind= TRAIT_CONST; } (yyval.code)=0; - setstaticfunction(0); } } break; - case 162: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2596 "parser.y" {(yyval.constant)=0;} } break; - case 163: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2390 "parser.y" +#line 2597 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 164: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2599 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 165: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2393 "parser.y" +#line 2600 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 166: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2601 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 167: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2602 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 168: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2603 "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; - case 169: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2605 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 170: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2606 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 171: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2607 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 172: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" +#line 2608 "parser.y" { // TODO - as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); + as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); } } @@ -5624,11 +5851,11 @@ yyreduce: - case 173: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2410 "parser.y" +#line 2617 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5638,11 +5865,11 @@ yyreduce: - case 174: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2414 "parser.y" +#line 2621 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5652,11 +5879,11 @@ yyreduce: - case 175: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "parser.y" +#line 2627 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5668,11 +5895,11 @@ yyreduce: - case 176: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2426 "parser.y" +#line 2633 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5684,11 +5911,11 @@ yyreduce: - case 177: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2434 "parser.y" +#line 2641 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5699,11 +5926,11 @@ yyreduce: - case 178: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2439 "parser.y" +#line 2646 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5714,17 +5941,17 @@ yyreduce: - case 179: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2445 "parser.y" +#line 2652 "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); } } @@ -5732,17 +5959,17 @@ yyreduce: - case 180: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2453 "parser.y" +#line 2660 "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,101 +5977,82 @@ yyreduce: - case 181: + case 186: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2461 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} +#line 2670 "parser.y" + {PASS12 (yyval.token)=0;} } break; - case 182: + case 187: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2462 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} +#line 2673 "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; - case 183: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2463 "parser.y" - {(yyval.token)=0;} +#line 2674 "parser.y" + { + 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(&(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; +} } break; - case 184: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2466 "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));} - } - break; - - - - case 185: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" - { - PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list); - 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); - list_deep_free((yyvsp[(6) - (12)].params).list); - (yyval.code)=0; -} - } - break; - - - - case 187: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2481 "parser.y" +#line 2690 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 188: + case 191: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2692 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 189: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2484 "parser.y" +#line 2693 "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,28 +6061,31 @@ 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; - case 190: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2504 "parser.y" +#line 2715 "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; } } @@ -5882,17 +6093,17 @@ yyreduce: - case 191: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2513 "parser.y" +#line 2726 "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)); @@ -5904,121 +6115,121 @@ yyreduce: - case 194: + case 197: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2529 "parser.y" +#line 2742 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 195: + case 198: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2530 "parser.y" +#line 2743 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 196: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2532 "parser.y" - {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} +#line 2745 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 197: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2533 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2746 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 198: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2534 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2747 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 199: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2543 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2756 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 200: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2544 "parser.y" - {(yyval.classinfo)=0;} +#line 2757 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 201: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2548 "parser.y" +#line 2761 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 202: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2549 "parser.y" +#line 2762 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 203: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2551 "parser.y" +#line 2764 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 206: + case 209: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2555 "parser.y" +#line 2768 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6027,22 +6238,22 @@ yyreduce: - case 207: + case 210: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2559 "parser.y" +#line 2772 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 208: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2560 "parser.y" +#line 2773 "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); @@ -6052,11 +6263,11 @@ yyreduce: - case 210: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2566 "parser.y" +#line 2779 "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 +6281,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); @@ -6093,11 +6304,11 @@ yyreduce: - case 211: + case 214: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2815 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6113,9 +6324,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. } @@ -6148,11 +6359,11 @@ yyreduce: - case 212: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2648 "parser.y" +#line 2861 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6178,11 +6389,11 @@ yyreduce: - case 213: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2669 "parser.y" +#line 2882 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6193,7 +6404,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 { @@ -6208,11 +6419,11 @@ yyreduce: - case 214: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2903 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6221,11 +6432,11 @@ yyreduce: - case 215: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2906 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6235,33 +6446,33 @@ yyreduce: - case 216: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2700 "parser.y" +#line 2913 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 217: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2701 "parser.y" +#line 2914 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 218: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 2915 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6273,11 +6484,11 @@ yyreduce: - case 219: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" +#line 2921 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6286,55 +6497,55 @@ yyreduce: - case 220: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2714 "parser.y" +#line 2927 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2718 "parser.y" +#line 2931 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 223: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2720 "parser.y" +#line 2933 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 224: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2722 "parser.y" +#line 2935 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 226: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 2939 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6356,11 +6567,11 @@ yyreduce: - case 227: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2743 "parser.y" +#line 2956 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6371,11 +6582,11 @@ yyreduce: - case 228: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2748 "parser.y" +#line 2961 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6384,11 +6595,11 @@ yyreduce: - case 229: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2751 "parser.y" +#line 2964 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6397,11 +6608,11 @@ yyreduce: - case 230: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2754 "parser.y" +#line 2967 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6410,11 +6621,11 @@ yyreduce: - case 231: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2757 "parser.y" +#line 2970 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6423,11 +6634,11 @@ yyreduce: - case 232: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2760 "parser.y" +#line 2973 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6436,11 +6647,11 @@ yyreduce: - case 233: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2763 "parser.y" +#line 2976 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6449,11 +6660,11 @@ yyreduce: - case 234: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2766 "parser.y" +#line 2979 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6462,11 +6673,11 @@ yyreduce: - case 235: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2769 "parser.y" +#line 2982 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6475,11 +6686,11 @@ yyreduce: - case 236: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2772 "parser.y" +#line 2985 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6488,11 +6699,11 @@ yyreduce: - case 237: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2776 "parser.y" +#line 2989 "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; } @@ -6501,11 +6712,11 @@ yyreduce: - case 238: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2779 "parser.y" +#line 2992 "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; } @@ -6514,11 +6725,11 @@ yyreduce: - case 239: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2782 "parser.y" +#line 2995 "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; } @@ -6527,11 +6738,11 @@ yyreduce: - case 240: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2785 "parser.y" +#line 2998 "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; } @@ -6540,11 +6751,11 @@ yyreduce: - case 241: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2788 "parser.y" +#line 3001 "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; } @@ -6553,11 +6764,11 @@ yyreduce: - case 242: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2791 "parser.y" +#line 3004 "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; } @@ -6566,11 +6777,11 @@ yyreduce: - case 243: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2794 "parser.y" +#line 3007 "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; } @@ -6579,11 +6790,11 @@ yyreduce: - case 244: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2797 "parser.y" +#line 3010 "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; } @@ -6592,11 +6803,11 @@ yyreduce: - case 245: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2801 "parser.y" +#line 3014 "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); @@ -6613,11 +6824,11 @@ yyreduce: - case 246: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2812 "parser.y" +#line 3025 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6640,11 +6851,11 @@ yyreduce: - case 247: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2830 "parser.y" +#line 3043 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6654,11 +6865,11 @@ yyreduce: - case 248: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2835 "parser.y" +#line 3048 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6668,11 +6879,11 @@ yyreduce: - case 249: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2840 "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_bitand((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6682,11 +6893,11 @@ yyreduce: - case 250: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2845 "parser.y" +#line 3058 "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; @@ -6696,11 +6907,11 @@ yyreduce: - case 251: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2850 "parser.y" +#line 3063 "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; @@ -6710,11 +6921,11 @@ yyreduce: - case 252: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2855 "parser.y" +#line 3068 "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; @@ -6724,11 +6935,11 @@ yyreduce: - case 253: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2859 "parser.y" +#line 3072 "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; @@ -6738,11 +6949,11 @@ yyreduce: - case 254: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 3076 "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; @@ -6752,11 +6963,11 @@ yyreduce: - case 255: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 3081 "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; @@ -6766,11 +6977,11 @@ yyreduce: - case 256: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2872 "parser.y" +#line 3085 "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; @@ -6780,11 +6991,11 @@ yyreduce: - case 257: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2876 "parser.y" +#line 3089 "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); @@ -6799,11 +7010,11 @@ yyreduce: - case 258: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2885 "parser.y" +#line 3098 "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); @@ -6818,11 +7029,11 @@ yyreduce: - case 259: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2894 "parser.y" +#line 3107 "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); @@ -6837,11 +7048,11 @@ yyreduce: - case 260: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2904 "parser.y" +#line 3117 "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; @@ -6851,11 +7062,11 @@ yyreduce: - case 261: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2909 "parser.y" +#line 3122 "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)); @@ -6872,11 +7083,11 @@ yyreduce: - case 262: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2922 "parser.y" +#line 3135 "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; @@ -6886,11 +7097,11 @@ yyreduce: - case 263: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2927 "parser.y" +#line 3140 "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; @@ -6900,11 +7111,11 @@ yyreduce: - case 264: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2932 "parser.y" +#line 3145 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6915,11 +7126,11 @@ yyreduce: - case 265: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2938 "parser.y" +#line 3151 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6930,11 +7141,11 @@ yyreduce: - case 266: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2944 "parser.y" +#line 3157 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6943,22 +7154,22 @@ yyreduce: - case 267: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2948 "parser.y" +#line 3161 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 268: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2950 "parser.y" +#line 3163 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6974,11 +7185,11 @@ yyreduce: - case 269: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2961 "parser.y" +#line 3174 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6992,11 +7203,11 @@ yyreduce: - case 270: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2970 "parser.y" +#line 3183 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7008,33 +7219,33 @@ yyreduce: - case 271: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2977 "parser.y" +#line 3190 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 272: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2978 "parser.y" +#line 3191 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 273: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 3193 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7046,11 +7257,11 @@ yyreduce: - case 274: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2986 "parser.y" +#line 3199 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -7062,11 +7273,11 @@ yyreduce: - case 275: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2995 "parser.y" +#line 3208 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7078,11 +7289,11 @@ yyreduce: - case 276: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3002 "parser.y" +#line 3215 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7099,11 +7310,11 @@ yyreduce: - case 277: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3014 "parser.y" +#line 3227 "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); @@ -7115,11 +7326,11 @@ yyreduce: - case 278: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3020 "parser.y" +#line 3233 "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); @@ -7131,11 +7342,11 @@ yyreduce: - case 279: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3026 "parser.y" +#line 3239 "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); @@ -7147,11 +7358,11 @@ yyreduce: - case 280: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3032 "parser.y" +#line 3245 "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); @@ -7163,11 +7374,11 @@ yyreduce: - case 281: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3038 "parser.y" +#line 3251 "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); @@ -7179,11 +7390,11 @@ yyreduce: - case 282: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3044 "parser.y" +#line 3257 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7195,11 +7406,11 @@ yyreduce: - case 283: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3050 "parser.y" +#line 3263 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7211,11 +7422,11 @@ yyreduce: - case 284: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3056 "parser.y" +#line 3269 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7234,11 +7445,11 @@ yyreduce: - case 285: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3069 "parser.y" +#line 3282 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7255,11 +7466,11 @@ yyreduce: - case 286: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3080 "parser.y" +#line 3293 "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); @@ -7271,11 +7482,11 @@ yyreduce: - case 287: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3087 "parser.y" +#line 3300 "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 +7496,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); } } @@ -7293,11 +7504,11 @@ yyreduce: - case 288: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3100 "parser.y" +#line 3313 "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)) { @@ -7328,11 +7539,11 @@ yyreduce: - case 289: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3127 "parser.y" +#line 3340 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7351,11 +7562,11 @@ yyreduce: - case 290: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3141 "parser.y" +#line 3354 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7374,11 +7585,11 @@ yyreduce: - case 291: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3155 "parser.y" +#line 3368 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7397,18 +7608,18 @@ yyreduce: - case 292: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3170 "parser.y" +#line 3383 "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); @@ -7420,11 +7631,11 @@ yyreduce: - case 293: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3184 "parser.y" +#line 3397 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7436,11 +7647,11 @@ yyreduce: - case 294: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3191 "parser.y" +#line 3404 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7452,11 +7663,11 @@ yyreduce: - case 295: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3198 "parser.y" +#line 3411 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7468,11 +7679,11 @@ yyreduce: - case 296: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "parser.y" +#line 3418 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7484,11 +7695,11 @@ yyreduce: - case 297: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3212 "parser.y" +#line 3425 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7500,11 +7711,11 @@ yyreduce: - case 298: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3224 "parser.y" +#line 3437 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -7513,7 +7724,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; @@ -7542,12 +7753,25 @@ yyreduce: - case 299: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "parser.y" +#line 3470 "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 +7779,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); @@ -7651,47 +7881,68 @@ yyreduce: - case 300: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3359 "parser.y" - {(yyval.code)=0;} +#line 3591 "parser.y" + { + PASS12 + tokenizer_register_namespace((yyvsp[(2) - (2)].id)); + (yyval.id)=(yyvsp[(2) - (2)].id); +} } break; - case 301: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3360 "parser.y" - {(yyval.code)=0;} +#line 3597 "parser.y" + { + (yyval.code)=0; +} } break; - case 302: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3361 "parser.y" - {(yyval.code)=0;} +#line 3600 "parser.y" + { + (yyval.code)=0; +} } break; - case 303: + case 306: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3603 "parser.y" + { + (yyval.code)=0; +} + } + break; + + + + case 307: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3363 "parser.y" +#line 3606 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].id)); + tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); (yyval.code)=0; } } @@ -7701,7 +7952,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7705 "parser.tab.c" +#line 7956 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);