X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=894549c102b78e6c0cdd1dac3e0c126451bdaad4;hb=65dec90461cf9ceb574ba89189a65980960a3f56;hp=b9826cffafdb4b780f09c96e796815ce8c7f2c7d;hpb=a5b36820121471188e8418567cb8e0f4cba32c75;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index b9826cf..894549c 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -189,42 +189,44 @@ extern int a3_lex(); KW_IS = 322, KW_IN = 323, KW_AS = 324, - T_EQEQ = 325, - T_EQEQEQ = 326, - T_NE = 327, - T_NEE = 328, - T_LE = 329, - T_GE = 330, - T_ORBY = 331, - T_DIVBY = 332, - T_MODBY = 333, - T_MULBY = 334, - T_PLUSBY = 335, - T_MINUSBY = 336, - T_SHRBY = 337, - T_SHLBY = 338, - T_USHRBY = 339, - T_OROR = 340, - T_ANDAND = 341, - T_COLONCOLON = 342, - T_MINUSMINUS = 343, - T_PLUSPLUS = 344, - T_DOTDOT = 345, - T_DOTDOTDOT = 346, - T_SHL = 347, - T_USHR = 348, - T_SHR = 349, - prec_none = 350, - below_semicolon = 351, - below_assignment = 352, - below_minus = 355, - minusminus_prefix = 356, - plusplus_prefix = 357, - below_curly = 358, - new2 = 359, - above_identifier = 360, - below_else = 361, - above_function = 362 + T_DICTSTART = 325, + T_EQEQ = 326, + T_EQEQEQ = 327, + T_NE = 328, + T_NEE = 329, + T_LE = 330, + T_GE = 331, + T_ORBY = 332, + T_DIVBY = 333, + T_MODBY = 334, + T_MULBY = 335, + T_PLUSBY = 336, + T_MINUSBY = 337, + T_XORBY = 338, + T_SHRBY = 339, + T_SHLBY = 340, + T_USHRBY = 341, + T_OROR = 342, + T_ANDAND = 343, + T_COLONCOLON = 344, + T_MINUSMINUS = 345, + T_PLUSPLUS = 346, + T_DOTDOT = 347, + T_DOTDOTDOT = 348, + T_SHL = 349, + T_USHR = 350, + T_SHR = 351, + prec_none = 352, + below_semicolon = 353, + below_assignment = 354, + below_minus = 356, + minusminus_prefix = 357, + plusplus_prefix = 358, + below_curly = 359, + new2 = 360, + above_identifier = 361, + below_else = 362, + above_function = 363 }; #endif @@ -241,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; @@ -261,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; @@ -269,7 +273,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 273 "parser.tab.c" +#line 277 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -280,7 +284,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 257 "parser.y" +#line 263 "parser.y" static int a3_error(char*s) @@ -319,18 +323,23 @@ typedef struct _import { DECLARE_LIST(import); +DECLARE(methodstate); +DECLARE_LIST(methodstate); + typedef struct _classstate { /* class data */ classinfo_t*info; abc_class_t*abc; - code_t*init; - code_t*static_init; + + methodstate_t*init; + methodstate_t*static_init; + //code_t*init; + //code_t*static_init; + char has_constructor; } classstate_t; -DECLARE_LIST(methodstate); - -typedef struct _methodstate { +struct _methodstate { /* method data */ methodinfo_t*info; char late_binding; @@ -339,14 +348,23 @@ typedef 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; methodstate_list_t*innerfunctions; -} methodstate_t; +}; typedef struct _state { struct _state*old; @@ -354,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 @@ -388,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; \ @@ -435,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() { @@ -479,7 +501,7 @@ static void old_state() free(leaving->method); leaving->method=0; } - if(leaving->cls && leaving->cls != state->cls) { + if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) { free(leaving->cls); leaving->cls=0; } @@ -487,6 +509,11 @@ static void old_state() state_destroy(leaving); } +static code_t* method_header(methodstate_t*m); +static code_t* wrap_function(code_t*c,code_t*header, code_t*body); +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0); + + static char* internal_filename_package = 0; void initialize_file(char*filename) { @@ -496,9 +523,6 @@ void initialize_file(char*filename) new_state(); state->package = internal_filename_package = strdup(filename); - state->method = rfx_calloc(sizeof(methodstate_t)); - state->method->variable_count = 1; - global->token2info = dict_lookup(global->file2token2info, current_filename // use long version ); @@ -506,6 +530,16 @@ void initialize_file(char*filename) global->token2info = dict_new2(&ptr_type); dict_put(global->file2token2info, current_filename, global->token2info); } + + if(as3_pass==1) { + state->method = rfx_calloc(sizeof(methodstate_t)); + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + } else { + state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + function_initvars(state->method, 0, 0, 1); + global->init = abc_initscript(global->file); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope + } } void finish_file() @@ -513,10 +547,15 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } - free(state->method);state->method=0; - //free(state->package);state->package=0; // used in registry + if(as3_pass==2) { + code_t*header = method_header(state->method); + code_t*c = wrap_function(header, 0, global->init->method->body->code); + global->init->method->body->code = c; + free(state->method);state->method=0; + } + //free(state->package);state->package=0; // used in registry state_destroy(state);state=0; } @@ -527,23 +566,10 @@ void initialize_parser() global->file->flags &= ~ABCFILE_LAZY; global->file2token2info = dict_new(); global->token2info = 0; - - global->init = abc_initscript(global->file); - code_t*c = global->init->method->body->code; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - global->init->method->body->code = c; } void* finish_parser() { - code_t*c = global->init->method->body->code; - /*c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "[leaving global init function]"); - c = abc_callpropvoid(c, "[package]::trace", 1);*/ - c = abc_returnvoid(c); - global->init->method->body->code = c; - dict_free_all(global->file2token2info, 1, (void*)dict_destroy); global->token2info=0; @@ -581,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) @@ -680,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) @@ -688,32 +736,44 @@ static void parsererror(const char*file, int line, const char*f) } -code_t* method_header() +static code_t* method_header(methodstate_t*m) { code_t*c = 0; - if(state->method->late_binding && !state->method->inner) { + if(m->uses_slots || (m->late_binding && !m->inner)) { c = abc_getlocal_0(c); c = abc_pushscope(c); } - /*if(state->method->innerfunctions) { + if(m->uses_slots) { c = abc_newactivation(c); c = abc_pushscope(c); - }*/ - if(state->method->is_constructor && !state->method->has_super) { - // call default constructor - c = abc_getlocal_0(c); - c = abc_constructsuper(c, 0); } - methodstate_list_t*l = state->method->innerfunctions; + 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; } - list_free(state->method->innerfunctions); - state->method->innerfunctions = 0; + if(m->header) { + c = code_append(c, m->header); + m->header = 0; + } + if(m->is_constructor && !m->has_super) { + // call default constructor + c = abc_getlocal_0(c); + c = abc_constructsuper(c, 0); + } + list_free(m->innerfunctions); + m->innerfunctions = 0; return c; } @@ -753,52 +813,98 @@ 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 ns; +} + +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) +{ + if(var0) { + int index = -1; + if(m->inner) + index = new_variable("this", 0, 0, 0); + else if(!m->is_global) + index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0); + else + index = new_variable("globalscope", 0, 0, 0); + if(index) + *(int*)0=0; + parserassert(!index); + } + if(m->uses_slots) { + /* as variables and slots share the same number, make sure + that those variable indices are reserved. It's up to the + optimizer to later shuffle the variables down to lower + indices */ + m->variable_count = m->uses_slots; + } + + if(params) { + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + new_variable(p->param->name, p->param->type, 0, 1); + } + } + + methodstate_list_t*l = m->innerfunctions; + while(l) { + methodstate_t*m = l->methodstate; + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); + m->var_index = v->index; + m->slot_index = v->index; + v->is_inner_method = m; + l = l->next; } - return access; } + char*as3_globalclass=0; -static void startclass(int flags, char*classname, classinfo_t*extends, classinfo_list_t*implements) +static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, classinfo_list_t*implements) { if(state->cls) { syntaxerror("inner classes now allowed"); } new_state(); - state->cls = rfx_calloc(sizeof(classstate_t)); - 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; @@ -807,9 +913,18 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } if(as3_pass==1) { - state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor - state->method->variable_count = 1; - dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->cls = rfx_calloc(sizeof(classstate_t)); + state->cls->init = rfx_calloc(sizeof(methodstate_t)); + state->cls->static_init = rfx_calloc(sizeof(methodstate_t)); + /* notice: we make no effort to initialize the top variable (local0) here, + even though it has special meaning. We just rely on the facat + that pass 1 won't do anything with variables */ + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls); + + /* set current method to constructor- all code within the class-level (except + static variable initializations) will be executed during construction time */ + state->method = state->cls->init; if(registry_find(package, classname)) { syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname); @@ -817,14 +932,17 @@ 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) { - state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); - - state->cls->info = (classinfo_t*)registry_find(package, classname); - parserassert((int)state->cls->info); + state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + state->method = state->cls->init; + parserassert(state->cls && state->cls->info); + + function_initvars(state->cls->init, 0, 0, 1); + function_initvars(state->cls->static_init, 0, 0, 0); if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); @@ -909,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 { @@ -919,6 +1037,19 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } +static void setstaticfunction(int x) +{ + if(state->cls) { + if(x&FLAG_STATIC) { + state->method = state->cls->static_init; + } else { + state->method = state->cls->init; + } + } else { + parserassert(state->method); + } +} + static void endclass() { if(as3_pass == 2) { @@ -926,23 +1057,23 @@ static void endclass() code_t*c = 0; c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); - state->cls->init = code_append(state->cls->init, c); - } - if(!state->method->late_binding) { - // class initialization code uses late binding - code_t*c = 0; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - state->cls->static_init = code_append(c, state->cls->static_init); + state->cls->init->header = code_append(state->cls->init->header, c); + state->cls->has_constructor=1; } - if(state->cls->init) { - abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->init, m->body->code); + if(state->cls->info->flags&FLAG_INTERFACE) { + if(state->cls->init->header) + syntaxerror("interface can not have class-level code"); + } else { + abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); + code_t*c = method_header(state->cls->init); + m->body->code = wrap_function(c, 0, m->body->code); + } } if(state->cls->static_init) { abc_method_t*m = abc_class_getstaticconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->static_init, m->body->code); + code_t*c = method_header(state->cls->static_init); + m->body->code = wrap_function(c, 0, m->body->code); } } @@ -974,7 +1105,7 @@ static void check_constant_against_type(classinfo_t*t, constant_t*c) || c->type == CONSTANT_UINT); } else if(TYPE_IS_UINT(t)) { xassert(c->type == CONSTANT_UINT || - (c->type == CONSTANT_INT && c->i>0)); + (c->type == CONSTANT_INT && c->i>=0)); } else if(TYPE_IS_INT(t)) { xassert(c->type == CONSTANT_INT); } else if(TYPE_IS_BOOLEAN(t)) { @@ -1010,21 +1141,24 @@ static void check_override(memberinfo_t*m, int flags) } } -static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot) +static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot) { methodinfo_t*minfo = 0; - U8 access = flags2access(flags); + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = methodinfo_register_global(access, state->package, name); + minfo = methodinfo_register_global(ns.access, state->package, name); minfo->return_type = return_type; } else if(getset != KW_GET && getset != KW_SET) { //class method - memberinfo_t* m = registry_findmember(state->cls->info, name, 0); + memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { + printf("%s.%s | %s.%s\n", + m->package, m->name, + ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->return_type = return_type; // getslot on a member slot only returns "undefined", so no need // to actually store these @@ -1038,7 +1172,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na else if(params->list && params->list->param) type = params->list->param->type; // not sure wether to look into superclasses here, too - minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1); + minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { if(minfo->kind!=INFOTYPE_SLOT) syntaxerror("class already contains a method called '%s'", name); @@ -1055,7 +1189,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("different type in getter and setter"); } } else { - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; minfo->return_type = type; @@ -1063,44 +1197,21 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; - return minfo; -} - -static void function_initvars(params_t*params, int flags) -{ - if(state->method->inner) - new_variable("this", 0, 0); - else if(!state->method->is_global) - new_variable((flags&FLAG_STATIC)?"class":"this", state->cls->info, 0); - else - new_variable("globalscope", 0, 0); + if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; + if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; + if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; - param_list_t*p=0; - for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0); - } - - methodstate_list_t*l = state->method->innerfunctions; - while(l) { - methodstate_t*m = l->methodstate; - m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0); - l = l->next; - } + return minfo; } static void innerfunction(char*name, params_t*params, classinfo_t*return_type) { - parserassert(state->method && state->method->info); + //parserassert(state->method && state->method->info); methodstate_t*parent_method = state->method; if(as3_pass==1) { - // not valid yet - params = 0; - return_type = 0; + return_type = 0; // not valid in pass 1 } new_state(); @@ -1113,35 +1224,41 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) state->method->abc = rfx_calloc(sizeof(abc_method_t)); NEW(methodinfo_t,minfo); + minfo->kind = INFOTYPE_METHOD; + minfo->access = ACCESS_PACKAGEINTERNAL; minfo->name = name; state->method->info = minfo; - list_append(parent_method->innerfunctions, state->method); + if(parent_method) + list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + + function_initvars(state->method, params, 0, 1); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); state->method->info->return_type = return_type; - function_initvars(params, 0); + function_initvars(state->method, params, 0, 1); } } -static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type) { if(state->method && state->method->info) { syntaxerror("not able to start another method scope"); } new_state(); + state->new_vars = 1; if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); state->method->has_super = 0; - state->method->variable_count = 0; if(state->cls) { state->method->is_constructor = !strcmp(state->cls->info->name,name); @@ -1153,18 +1270,21 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n name = "__as3_constructor__"; return_type = 0; - state->method->info = registerfunction(getset, flags, name, params, return_type, 0); + state->method->info = registerfunction(getset, mod, name, params, return_type, 0); + + function_initvars(state->method, params, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); - + if(state->cls) { - memberinfo_t*m = registry_findmember(state->cls->info, name, 2); - check_override(m, flags); + memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2); + check_override(m, mod->flags); } if(state->cls) { @@ -1172,79 +1292,149 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } state->method->info->return_type = return_type; - function_initvars(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(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) @@ -1346,8 +1536,11 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; if(TYPE_IS_NULL(from) && !IS_NUMBER_OR_INT(to)) return c; - syntaxerror("can't convert type %s to %s", from->name, to->name); - return 0; // make gcc happy + + as3_error("can't convert type %s%s%s to %s%s%s", + from->package, from->package?".":"", from->name, + to->package, to->package?".":"", to->name); + return c; } code_t*defaultvalue(code_t*c, classinfo_t*type) @@ -1719,7 +1912,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1723 "parser.tab.c" +#line 1916 "parser.tab.c" #ifdef short # undef short @@ -1932,22 +2125,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 125 +#define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3223 +#define YYLAST 2992 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 133 +#define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 109 +#define YYNNTS 111 /* YYNRULES -- Number of rules. */ -#define YYNRULES 301 +#define YYNRULES 304 /* YYNRULES -- Number of states. */ -#define YYNSTATES 512 +#define YYNSTATES 514 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 362 +#define YYMAXUTOK 363 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1958,16 +2151,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 117, 2, 2, 2, 115, 107, 2, - 121, 132, 114, 112, 98, 111, 126, 113, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 104, 97, - 108, 100, 109, 103, 127, 2, 2, 2, 2, 2, + 2, 2, 2, 118, 2, 2, 2, 116, 108, 2, + 122, 133, 115, 113, 100, 112, 127, 114, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 105, 99, + 109, 102, 110, 104, 128, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 123, 2, 124, 106, 2, 2, 2, 2, 2, + 2, 124, 2, 125, 107, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 125, 105, 131, 116, 2, 2, 2, + 2, 2, 2, 126, 106, 132, 117, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1990,8 +2183,8 @@ static const yytype_uint8 yytranslate[] = 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 99, 101, 102, 110, 118, 119, 120, 122, - 128, 129, 130 + 95, 96, 97, 98, 101, 103, 111, 119, 120, 121, + 123, 129, 130, 131 }; #if YYDEBUG @@ -2003,8 +2196,8 @@ static const yytype_uint16 yyprhs[] = 19, 21, 23, 25, 30, 32, 33, 35, 37, 40, 42, 44, 46, 48, 50, 55, 57, 59, 60, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, - 85, 87, 89, 91, 93, 95, 97, 99, 101, 106, - 108, 112, 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, @@ -2015,153 +2208,153 @@ 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, 448, 449, 452, 454, 456, 458, 460, 462, 464, - 466, 468, 470, 471, 473, 476, 481, 485, 487, 492, - 495, 497, 499, 500, 501, 514, 516, 517, 518, 529, - 531, 535, 537, 539, 541, 545, 547, 549, 551, 554, - 555, 556, 560, 561, 563, 565, 567, 570, 573, 574, - 579, 584, 589, 592, 594, 597, 599, 601, 605, 607, + 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, 645, 649, 653, - 657, 661, 665, 669, 673, 677, 681, 684, 687, 691, - 695, 699, 703, 707, 711, 715, 719, 723, 727, 731, - 735, 739, 743, 747, 752, 755, 757, 761, 764, 769, - 773, 774, 776, 780, 786, 790, 794, 798, 802, 806, - 810, 814, 818, 822, 826, 830, 836, 839, 842, 845, - 848, 852, 855, 860, 866, 870, 876, 880, 882, 886, - 892, 898 + 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, 891, 894, 899, 904 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, - 136, 137, -1, 184, -1, 196, -1, 194, -1, 212, - -1, 205, -1, 146, -1, 147, 125, 135, 131, -1, - 97, -1, -1, 139, -1, 140, -1, 139, 140, -1, - 196, -1, 194, -1, 212, -1, 205, -1, 146, -1, - 147, 125, 138, 131, -1, 97, -1, 142, -1, -1, - 142, 144, -1, 144, -1, 187, -1, 158, -1, 159, - -1, 160, -1, 162, -1, 170, -1, 153, -1, 181, - -1, 178, -1, 234, -1, 241, -1, 97, -1, 143, - -1, 149, -1, 164, -1, 165, -1, 231, -1, 180, - -1, 147, 125, 142, 131, -1, 240, -1, 125, 142, - 131, -1, 125, 131, -1, 144, 97, -1, 144, -1, - 143, -1, 3, 87, 3, -1, 100, 232, -1, -1, - 46, 150, -1, 32, 150, -1, 151, -1, 150, 98, - 151, -1, 3, 222, 148, -1, -1, 65, 145, -1, - -1, 64, 121, 154, 233, 132, 145, 152, -1, -1, - 149, -1, 234, -1, 46, 3, 222, -1, 3, -1, - 13, 121, -1, 13, 50, 121, -1, 157, 155, 97, - 233, 97, 234, 132, 145, -1, 157, 156, 68, 233, - 132, 145, -1, -1, 14, 121, 161, 233, 132, 145, - -1, -1, 15, 163, 145, 14, 121, 233, 132, -1, + 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, + 137, 138, -1, 185, -1, 197, -1, 195, -1, 214, + -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, + 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, 244, -1, 243, -1, 126, + 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, + 150, -1, 165, -1, 166, -1, 233, -1, 181, -1, + 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, + 144, -1, 3, 89, 3, -1, 102, 234, -1, -1, + 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, + 152, -1, 3, 224, 149, -1, -1, 65, 146, -1, + -1, 64, 122, 155, 235, 133, 146, 153, -1, -1, + 150, -1, 236, -1, 46, 3, 224, -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, 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 167, -1, 169, -1, 167, 169, -1, 168, -1, - 167, 168, -1, 34, 235, 104, 141, -1, 62, 104, - 141, -1, -1, 16, 121, 171, 235, 132, 125, 166, - 131, -1, -1, 33, 121, 3, 222, 132, 173, 125, - 141, 131, -1, -1, 28, 125, 175, 141, 131, -1, - 172, -1, 176, 172, -1, 176, -1, 176, 174, -1, - 174, -1, -1, 52, 125, 179, 141, 131, 177, -1, - 37, 233, -1, 37, -1, 39, 121, 233, 132, 145, - -1, 3, -1, 19, -1, 183, 126, 182, -1, 182, - -1, -1, 19, 183, 125, 185, 138, 131, -1, -1, - 19, 125, 186, 138, 131, -1, 41, 218, -1, 41, - 183, 126, 114, -1, -1, 189, -1, 190, -1, 189, - 190, -1, 21, -1, 22, -1, 20, -1, 38, -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, + 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, + -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, + 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, 219, -1, -1, 54, 220, -1, - -1, 17, 220, -1, -1, 188, 31, 3, 191, 193, - 125, 195, 198, 131, -1, -1, 188, 44, 3, 192, - 125, 197, 201, 131, -1, -1, 199, -1, 200, -1, - 199, 200, -1, 97, -1, 147, 125, 198, 131, -1, - 205, -1, 212, -1, 143, -1, -1, 202, -1, 203, - -1, 202, 203, -1, 97, -1, 46, 3, -1, 188, - 27, 211, 3, 121, 208, 132, 222, -1, 46, -1, - 32, -1, 188, 204, 3, 222, 148, -1, -1, 100, - 207, -1, 10, -1, 8, -1, 9, -1, 12, -1, - 5, -1, 56, -1, 55, -1, 45, -1, 3, -1, - -1, 209, -1, 91, 210, -1, 209, 98, 91, 210, - -1, 209, 98, 210, -1, 210, -1, 3, 104, 221, - 206, -1, 3, 206, -1, 51, -1, 35, -1, -1, - -1, 188, 27, 211, 3, 121, 208, 132, 222, 125, - 213, 141, 131, -1, 3, -1, -1, -1, 27, 214, - 121, 208, 132, 222, 125, 216, 141, 131, -1, 3, - -1, 183, 126, 3, -1, 218, -1, 217, -1, 219, - -1, 220, 98, 219, -1, 219, -1, 114, -1, 36, - -1, 104, 221, -1, -1, -1, 121, 224, 132, -1, - -1, 225, -1, 226, -1, 232, -1, 225, 98, -1, - 226, 232, -1, -1, 25, 235, 227, 223, -1, 235, - 121, 224, 132, -1, 53, 121, 224, 132, -1, 63, - 235, -1, 42, -1, 42, 233, -1, 235, -1, 235, - -1, 233, 98, 235, -1, 233, -1, 215, -1, 236, - -1, 239, -1, 228, -1, 230, -1, 229, -1, 6, - -1, 10, -1, 11, -1, 8, -1, 9, -1, 12, - -1, 5, -1, 29, -1, 56, -1, 55, -1, 45, - -1, 235, 108, 235, -1, 235, 109, 235, -1, 235, - 74, 235, -1, 235, 75, 235, -1, 235, 70, 235, - -1, 235, 71, 235, -1, 235, 73, 235, -1, 235, - 72, 235, -1, 235, 85, 235, -1, 235, 86, 235, - -1, 117, 235, -1, 116, 235, -1, 235, 107, 235, - -1, 235, 106, 235, -1, 235, 105, 235, -1, 235, - 94, 235, -1, 235, 93, 235, -1, 235, 92, 235, - -1, 235, 113, 235, -1, 235, 115, 235, -1, 235, - 112, 235, -1, 235, 111, 235, -1, 235, 114, 235, - -1, 235, 68, 235, -1, 235, 69, 235, -1, 235, - 40, 235, -1, 235, 67, 235, -1, 43, 121, 235, - 132, -1, 36, 235, -1, 36, -1, 121, 233, 132, - -1, 111, 235, -1, 235, 123, 235, 124, -1, 123, - 224, 124, -1, -1, 238, -1, 232, 104, 232, -1, - 238, 98, 232, 104, 232, -1, 125, 237, 131, -1, - 235, 79, 235, -1, 235, 78, 235, -1, 235, 83, - 235, -1, 235, 82, 235, -1, 235, 84, 235, -1, - 235, 77, 235, -1, 235, 76, 235, -1, 235, 80, - 235, -1, 235, 81, 235, -1, 235, 100, 235, -1, - 235, 103, 235, 104, 235, -1, 235, 89, -1, 235, - 88, -1, 89, 235, -1, 88, 235, -1, 53, 126, - 3, -1, 127, 3, -1, 235, 126, 127, 3, -1, - 235, 126, 3, 87, 3, -1, 235, 90, 3, -1, - 235, 126, 121, 235, 132, -1, 235, 126, 3, -1, - 3, -1, 188, 18, 3, -1, 188, 18, 3, 100, - 3, -1, 188, 18, 3, 100, 5, -1, 23, 18, - 3, -1 + 4, -1, -1, 54, 221, -1, -1, 54, 222, -1, + -1, 17, 222, -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, + -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, 18, 3, + -1, 189, 242, -1, 189, 242, 102, 3, -1, 189, + 242, 102, 5, -1, 23, 220, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1698, 1698, 1700, 1700, 1701, 1702, 1704, 1705, 1706, - 1707, 1708, 1709, 1710, 1711, 1713, 1713, 1714, 1715, 1717, - 1718, 1719, 1720, 1721, 1722, 1723, 1725, 1726, 1728, 1729, - 1732, 1733, 1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, - 1742, 1745, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1754, - 1756, 1757, 1758, 1759, 1763, 1770, 1774, 1775, 1779, 1780, - 1782, 1783, 1785, 1828, 1829, 1832, 1832, 1851, 1852, 1853, - 1856, 1859, 1863, 1864, 1866, 1886, 1929, 1929, 1948, 1948, - 1963, 1966, 1969, 1972, 1976, 1977, 1978, 1979, 1980, 1981, - 1983, 1994, 1997, 1997, 2026, 2026, 2046, 2046, 2063, 2064, - 2065, 2066, 2074, 2083, 2083, 2128, 2132, 2143, 2152, 2153, - 2155, 2156, 2158, 2158, 2160, 2160, 2163, 2177, 2193, 2194, - 2195, 2196, 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, - 2206, 2207, 2209, 2210, 2212, 2213, 2215, 2216, 2220, 2218, - 2226, 2224, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, - 2241, 2247, 2248, 2249, 2250, 2251, 2252, 2255, 2268, 2268, - 2270, 2343, 2344, 2346, 2347, 2348, 2349, 2350, 2352, 2353, - 2354, 2355, 2364, 2368, 2374, 2380, 2388, 2393, 2399, 2407, - 2415, 2416, 2417, 2420, 2419, 2434, 2435, 2437, 2436, 2458, - 2467, 2480, 2481, 2483, 2484, 2486, 2487, 2488, 2497, 2498, - 2502, 2503, 2505, 2506, 2507, 2509, 2513, 2514, 2519, 2520, - 2556, 2602, 2623, 2644, 2647, 2654, 2655, 2656, 2662, 2668, - 2670, 2672, 2674, 2676, 2678, 2680, 2697, 2702, 2705, 2708, - 2711, 2714, 2717, 2720, 2723, 2726, 2730, 2733, 2736, 2739, - 2742, 2745, 2748, 2751, 2755, 2766, 2784, 2789, 2794, 2799, - 2804, 2809, 2813, 2817, 2822, 2826, 2830, 2839, 2848, 2858, - 2863, 2875, 2881, 2886, 2892, 2898, 2902, 2904, 2915, 2924, - 2931, 2932, 2934, 2940, 2949, 2956, 2968, 2974, 2980, 2986, - 2992, 2998, 3004, 3017, 3028, 3035, 3048, 3075, 3089, 3103, - 3117, 3132, 3139, 3146, 3153, 3160, 3171, 3205, 3307, 3308, - 3309, 3311 + 0, 1893, 1893, 1895, 1895, 1896, 1897, 1899, 1900, 1901, + 1902, 1903, 1904, 1905, 1906, 1908, 1908, 1909, 1910, 1912, + 1913, 1914, 1915, 1916, 1917, 1918, 1920, 1921, 1923, 1924, + 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, + 1937, 1938, 1939, 1940, 1943, 1944, 1945, 1946, 1947, 1948, + 1949, 1950, 1954, 1955, 1959, 1966, 1970, 1971, 1975, 1976, + 1978, 1979, 1981, 2042, 2043, 2046, 2046, 2065, 2066, 2067, + 2072, 2076, 2081, 2082, 2084, 2104, 2148, 2148, 2167, 2167, + 2182, 2185, 2188, 2191, 2195, 2196, 2197, 2198, 2199, 2200, + 2202, 2213, 2216, 2216, 2245, 2245, 2269, 2269, 2285, 2286, + 2287, 2288, 2296, 2305, 2305, 2350, 2354, 2365, 2374, 2375, + 2377, 2378, 2380, 2380, 2382, 2382, 2385, 2400, 2416, 2417, + 2418, 2419, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, + 2435, 2436, 2440, 2441, 2443, 2444, 2446, 2447, 2451, 2449, + 2457, 2455, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, + 2473, 2479, 2480, 2481, 2482, 2483, 2484, 2487, 2500, 2500, + 2502, 2502, 2577, 2578, 2580, 2581, 2582, 2583, 2584, 2586, + 2587, 2588, 2589, 2598, 2602, 2608, 2614, 2622, 2627, 2633, + 2641, 2649, 2650, 2651, 2654, 2653, 2670, 2671, 2673, 2672, + 2696, 2707, 2720, 2721, 2723, 2724, 2726, 2727, 2728, 2737, + 2738, 2742, 2743, 2745, 2746, 2747, 2749, 2753, 2754, 2759, + 2760, 2796, 2842, 2863, 2884, 2887, 2894, 2895, 2896, 2902, + 2908, 2910, 2912, 2914, 2916, 2918, 2920, 2937, 2942, 2945, + 2948, 2951, 2954, 2957, 2960, 2963, 2966, 2970, 2973, 2976, + 2979, 2982, 2985, 2988, 2991, 2995, 3006, 3024, 3029, 3034, + 3039, 3044, 3049, 3053, 3057, 3062, 3066, 3070, 3079, 3088, + 3098, 3103, 3115, 3121, 3126, 3132, 3138, 3142, 3144, 3155, + 3164, 3171, 3172, 3174, 3180, 3189, 3196, 3208, 3214, 3220, + 3226, 3232, 3238, 3244, 3250, 3263, 3274, 3281, 3294, 3321, + 3335, 3349, 3363, 3378, 3385, 3392, 3399, 3406, 3417, 3451, + 3572, 3578, 3581, 3584, 3587 }; #endif @@ -2184,13 +2377,13 @@ static const char *const yytname[] = "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"", "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"", - "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", "\">=\"", "\"|=\"", - "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", "\">>=\"", "\"<<=\"", - "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"", - "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", "prec_none", "below_semicolon", - "';'", "','", "below_assignment", "'='", "\"&=\"", "\"^=\"", "'?'", - "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", "'-'", "'+'", - "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix", + "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", + "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", + "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", + "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", + "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='", + "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", + "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix", "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'", "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'", "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST", @@ -2208,15 +2401,16 @@ 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", "MAYBESTATICCONSTANT", - "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", - "FUNCTION_DECLARATION", "$@12", "MAYBE_IDENTIFIER", "INNERFUNCTION", - "$@13", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", - "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", - "EXPRESSION_LIST", "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 + "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", + "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", + "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", + "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", + "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", + "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", + "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2234,48 +2428,48 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 59, 44, 352, - 61, 353, 354, 63, 58, 124, 94, 38, 60, 62, - 355, 45, 43, 47, 42, 37, 126, 33, 356, 357, - 358, 40, 359, 91, 93, 123, 46, 64, 360, 361, - 362, 125, 41 + 345, 346, 347, 348, 349, 350, 351, 352, 353, 59, + 44, 354, 61, 355, 63, 58, 124, 94, 38, 60, + 62, 356, 45, 43, 47, 42, 37, 126, 33, 357, + 358, 359, 40, 360, 91, 93, 123, 46, 64, 361, + 362, 363, 125, 41 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 133, 134, 135, 135, 136, 136, 137, 137, 137, - 137, 137, 137, 137, 137, 138, 138, 139, 139, 140, - 140, 140, 140, 140, 140, 140, 141, 141, 142, 142, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 145, 145, 145, 145, 146, 147, 148, 148, 149, 149, - 150, 150, 151, 152, 152, 154, 153, 155, 155, 155, - 156, 156, 157, 157, 158, 159, 161, 160, 163, 162, - 164, 164, 165, 165, 166, 166, 166, 166, 167, 167, - 168, 169, 171, 170, 173, 172, 175, 174, 176, 176, - 177, 177, 177, 179, 178, 180, 180, 181, 182, 182, - 183, 183, 185, 184, 186, 184, 187, 187, 188, 188, - 189, 189, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 191, 191, 192, 192, 193, 193, 195, 194, - 197, 196, 198, 198, 199, 199, 200, 200, 200, 200, - 200, 201, 201, 202, 202, 203, 203, 203, 204, 204, - 205, 206, 206, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 208, 208, 208, 208, 209, 209, 210, 210, - 211, 211, 211, 213, 212, 214, 214, 216, 215, 217, - 218, 219, 219, 220, 220, 221, 221, 221, 222, 222, - 223, 223, 224, 224, 224, 225, 226, 225, 227, 228, - 229, 229, 230, 231, 231, 232, 233, 233, 234, 235, - 235, 235, 235, 235, 235, 235, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 237, 237, 238, 238, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 239, 240, 240, - 240, 241 + 0, 134, 135, 136, 136, 137, 137, 138, 138, 138, + 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, 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, + 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, + 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, + 178, 178, 178, 180, 179, 181, 181, 182, 183, 183, + 184, 184, 186, 185, 187, 185, 188, 188, 189, 189, + 190, 190, 191, 191, 191, 191, 191, 191, 191, 191, + 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, 243, 243, 243, 244 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2285,8 +2479,8 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 4, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 4, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, - 3, 2, 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, @@ -2297,21 +2491,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, - 5, 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, + 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, 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, + 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, 4, 2, 1, 3, 2, 4, 3, - 0, 1, 3, 5, 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 + 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, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2319,808 +2513,764 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 297, 131, 231, 225, 228, 229, 226, 227, 230, + 118, 299, 131, 232, 226, 229, 230, 227, 228, 231, 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 186, 232, 265, 125, 0, 0, 0, 235, - 126, 128, 127, 0, 0, 234, 233, 0, 0, 0, - 0, 14, 0, 0, 0, 0, 202, 270, 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, 219, 222, 224, 223, 218, 39, - 216, 220, 221, 40, 0, 0, 72, 76, 118, 92, - 108, 109, 114, 111, 0, 0, 297, 208, 185, 0, - 264, 0, 0, 116, 0, 103, 202, 0, 212, 65, - 289, 288, 267, 247, 246, 0, 0, 203, 204, 205, - 215, 0, 0, 271, 291, 1, 6, 118, 297, 0, - 0, 68, 0, 0, 69, 182, 0, 159, 0, 158, - 0, 121, 0, 0, 0, 0, 0, 0, 0, 0, + 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, 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, 41, 40, 0, 0, 72, 76, + 118, 92, 108, 109, 114, 111, 0, 0, 304, 299, + 209, 186, 0, 265, 0, 0, 116, 0, 103, 203, + 0, 213, 65, 0, 216, 0, 272, 291, 290, 268, + 248, 247, 0, 0, 204, 205, 206, 82, 0, 106, + 214, 0, 80, 44, 43, 118, 45, 29, 0, 46, + 47, 48, 50, 0, 49, 293, 1, 6, 118, 299, + 0, 68, 0, 0, 69, 0, 183, 0, 159, 0, + 158, 0, 301, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 287, 286, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 289, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 202, 0, 0, 55, 73, 0, 82, 106, - 213, 0, 80, 41, 118, 42, 53, 0, 0, 43, - 44, 45, 47, 0, 46, 49, 0, 118, 112, 0, - 301, 200, 172, 0, 0, 0, 27, 0, 290, 0, - 266, 269, 206, 207, 0, 274, 0, 0, 199, 59, - 60, 199, 58, 0, 0, 181, 180, 0, 132, 134, - 199, 217, 261, 262, 259, 260, 240, 241, 243, 242, - 238, 239, 281, 280, 276, 275, 282, 283, 278, 277, - 279, 244, 245, 294, 253, 252, 251, 284, 0, 250, - 249, 248, 236, 237, 257, 256, 254, 258, 255, 0, - 0, 296, 0, 0, 0, 83, 105, 214, 81, 51, - 118, 29, 216, 52, 0, 118, 0, 0, 25, 0, - 118, 17, 23, 0, 20, 19, 22, 21, 118, 110, - 202, 209, 161, 0, 0, 173, 177, 118, 190, 117, - 263, 0, 26, 211, 0, 272, 0, 13, 0, 57, - 0, 57, 0, 0, 0, 0, 136, 0, 0, 57, - 0, 210, 268, 0, 0, 292, 118, 50, 28, 0, - 118, 298, 0, 115, 18, 118, 0, 0, 0, 0, - 179, 174, 199, 0, 107, 0, 118, 0, 189, 197, - 196, 0, 192, 191, 195, 198, 0, 62, 61, 0, - 118, 172, 133, 0, 0, 193, 135, 140, 160, 285, - 293, 295, 77, 0, 48, 0, 84, 0, 113, 201, - 171, 167, 164, 165, 163, 166, 170, 169, 168, 162, - 161, 0, 0, 176, 0, 0, 98, 102, 100, 104, - 63, 273, 0, 56, 0, 75, 0, 137, 138, 0, - 118, 79, 299, 300, 0, 0, 0, 85, 88, 86, - 24, 178, 187, 175, 96, 0, 99, 101, 118, 66, - 118, 199, 118, 194, 0, 155, 0, 0, 118, 153, - 0, 27, 93, 89, 87, 27, 27, 199, 64, 74, - 0, 146, 150, 0, 0, 0, 118, 144, 148, 149, - 156, 182, 141, 154, 27, 91, 0, 0, 0, 183, - 118, 139, 145, 0, 90, 188, 97, 94, 27, 0, - 0, 0, 0, 147, 172, 27, 184, 0, 0, 199, - 95, 157 + 0, 0, 0, 0, 0, 203, 0, 0, 55, 73, + 0, 53, 0, 0, 118, 112, 0, 0, 201, 173, + 0, 0, 0, 27, 0, 292, 0, 0, 275, 0, + 267, 270, 207, 208, 83, 200, 59, 60, 105, 215, + 58, 81, 42, 28, 118, 0, 200, 0, 0, 300, + 182, 181, 0, 132, 134, 160, 0, 218, 262, 263, + 260, 261, 241, 242, 244, 243, 239, 240, 282, 281, + 277, 276, 284, 285, 283, 279, 278, 280, 245, 246, + 296, 254, 253, 252, 286, 0, 251, 250, 249, 237, + 238, 258, 257, 255, 259, 256, 0, 0, 298, 0, + 0, 0, 52, 0, 0, 25, 0, 118, 17, 23, + 0, 20, 19, 22, 21, 118, 110, 191, 203, 210, + 162, 0, 0, 174, 178, 118, 117, 264, 0, 26, + 212, 0, 273, 0, 0, 57, 0, 118, 13, 57, + 0, 0, 0, 0, 136, 0, 0, 200, 302, 303, + 0, 211, 269, 0, 0, 294, 118, 0, 0, 115, + 18, 118, 0, 0, 0, 0, 180, 175, 200, 0, + 107, 0, 118, 0, 190, 198, 197, 193, 192, 196, + 199, 0, 62, 61, 51, 0, 118, 173, 133, 0, + 0, 194, 135, 140, 57, 287, 295, 297, 77, 0, + 84, 0, 113, 202, 172, 168, 165, 166, 164, 167, + 171, 170, 169, 163, 162, 0, 0, 177, 0, 0, + 98, 102, 100, 104, 63, 274, 56, 0, 75, 0, + 137, 138, 0, 118, 161, 79, 0, 0, 0, 85, + 88, 86, 24, 179, 188, 176, 96, 0, 99, 101, + 118, 66, 118, 200, 118, 195, 0, 155, 0, 0, + 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 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 49, 50, 51, 52, 299, 300, 301, 321, 322, - 195, 291, 197, 302, 198, 377, 199, 232, 230, 449, - 56, 219, 132, 133, 57, 58, 59, 60, 187, 61, - 88, 200, 201, 436, 437, 438, 439, 62, 206, 416, - 501, 417, 466, 418, 419, 63, 216, 202, 64, 93, - 371, 65, 308, 207, 66, 203, 68, 69, 336, 338, - 384, 304, 452, 305, 430, 475, 476, 477, 457, 458, - 459, 140, 306, 360, 409, 314, 315, 316, 237, 307, - 498, 99, 74, 465, 372, 373, 374, 386, 375, 329, - 311, 116, 117, 118, 211, 75, 76, 77, 204, 119, - 78, 79, 80, 81, 122, 123, 82, 205, 83 + -1, 50, 51, 52, 53, 306, 307, 308, 328, 329, + 136, 137, 212, 309, 138, 382, 139, 240, 237, 451, + 57, 226, 152, 153, 58, 59, 60, 61, 210, 62, + 90, 140, 141, 438, 439, 440, 441, 63, 213, 420, + 503, 421, 468, 422, 423, 64, 223, 142, 65, 95, + 97, 66, 315, 214, 67, 143, 69, 70, 344, 346, + 390, 311, 454, 312, 433, 477, 478, 479, 459, 460, + 461, 161, 313, 347, 366, 413, 322, 323, 324, 252, + 314, 500, 102, 75, 467, 377, 378, 379, 392, 380, + 335, 319, 123, 124, 125, 218, 76, 77, 78, 144, + 126, 79, 80, 81, 82, 115, 116, 83, 162, 84, + 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -348 +#define YYPACT_NINF -426 static const yytype_int16 yypact[] = { - 1656, -44, -348, -348, -348, -348, -348, -348, -348, -348, - -31, -41, -348, -30, 7, -348, -348, -348, 82, -348, - 2221, -348, 100, -348, 336, -348, -1, 19, 13, -348, - -348, -348, -348, -2, -77, -348, -348, 2221, 38, 2221, - 2221, -348, 2221, 2221, 2221, 2221, 2221, 2221, 179, 196, - -348, 495, -348, -348, -348, 78, -348, 2128, -348, -348, - -348, -348, -348, -348, -348, -348, -348, 166, 240, -348, - -348, -348, -348, -348, -348, -348, -348, -348, 115, -348, - 2736, -348, -348, -348, 213, 102, -348, -348, 1906, -348, - -348, -348, -348, -348, -102, 222, -348, -4, -348, 109, - -25, 2221, 110, -348, 2221, -348, 2221, 237, -25, -348, - -25, -25, 305, -25, -25, -56, 118, 145, 2221, -348, - 2736, 141, 116, 150, -348, -348, -348, 1011, 181, 247, - 248, -348, 155, 190, -348, -10, 253, -348, 260, -348, - 262, -348, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, -348, -348, 266, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 64, -348, -348, 2221, 273, 2221, - 2221, 247, 281, -348, 624, -348, 189, 271, 167, -348, - -348, -348, -348, 275, -348, -348, 2221, 1140, -348, 19, - -348, 173, 24, -38, 66, 2282, 1781, 163, -348, 2221, - -348, -348, -348, -348, 2221, -348, 2221, 165, 193, 200, - -348, 193, 200, 2221, 2221, -348, -348, 296, 252, 259, - 193, 2736, 998, 487, 487, 487, 3097, 3097, 3097, 3097, - 998, 998, 2736, 2736, 2736, 2736, 2736, 2736, 2736, 2736, - 2736, 2797, 2857, -348, 287, 287, 287, 2736, 2492, 2917, - 2977, 3037, 998, 998, 305, 305, -25, -25, -25, 175, - 2553, 227, 2221, 312, -28, -348, 115, 115, -348, -348, - 753, -348, 2614, -348, 195, 2031, 314, 2352, -348, 187, - 1269, -348, -348, 194, -348, -348, -348, -348, 1140, -348, - 2221, -348, 131, 317, 191, 223, -348, 1906, 198, -348, - -348, 197, 1781, -348, -27, -348, 218, -348, 12, 226, - 247, -39, 135, -14, 208, 89, 315, 89, 209, 226, - 2221, -348, -348, 332, 2422, -348, 1906, -348, -348, 2221, - 882, 236, 212, -348, -348, 1140, 207, 211, 69, 12, - -348, -348, 193, 25, -348, 60, 1906, 2221, 198, -348, - -348, 224, -348, -348, -348, -348, 2221, -348, -348, 2221, - 1906, 24, -348, 89, 228, -348, 251, -348, -348, 2736, - -348, -348, -348, -11, -348, 178, 11, 220, -348, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - 258, 234, 317, -348, 241, 231, -348, -348, 60, -348, - 297, -348, 202, -348, 235, -348, 238, 251, -348, 89, - 180, -348, -348, -348, 2221, 264, 242, 11, -348, -348, - -348, -348, -348, -348, -348, 368, -348, -348, 1906, -348, - 1906, 193, 1398, -348, 375, -348, 352, 249, 233, -348, - 2675, 1781, -348, -348, -348, 1781, 1781, 193, -348, -348, - 257, -348, -348, 261, 188, 254, 1527, -348, -348, -348, - -348, -10, -348, -348, 1781, -348, 256, 265, 272, -348, - 1398, -348, -348, 380, -348, -348, -348, -348, 1781, 274, - 263, 278, 276, -348, 24, 1781, -348, 277, 280, 193, - -348, -348 + 1667, -42, -426, -426, -426, -426, -426, -426, -426, -426, + -37, -73, -426, -27, 11, -426, -426, -426, 71, -426, + 2087, -426, 78, -426, 2157, -426, 9, 71, 17, -426, + -426, -426, -426, -2, -4, -426, -426, 2087, 25, 2087, + 2087, 2087, -426, 2087, 2087, 2087, 2087, 2087, 627, 138, + 143, -426, 497, -426, -426, -426, 27, -426, 2017, -426, + -426, -426, -426, -426, -426, -426, -426, -426, 417, 216, + -426, -426, -426, -426, -426, -426, -426, -426, -426, 55, + -426, 2499, -426, -426, -426, -426, 197, 82, -426, -426, + 1919, -426, -426, -426, -426, -426, 19, 75, -426, -426, + -51, -426, 85, -20, 2087, 84, -426, 2087, -426, 2087, + 209, -20, -426, 117, 2499, 91, 113, -20, -20, 361, + -20, -20, -56, 99, 126, 2087, -426, 224, 225, 2087, + 2087, 225, 226, -426, -426, 757, -426, -426, 104, -426, + -426, -426, -426, 214, -426, -426, -426, -426, 1017, 163, + 231, -426, 136, 175, -426, 241, 45, 245, -426, 246, + -426, 247, 149, -426, 2087, 2087, 2087, 2087, 2087, 2087, + 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, + 2087, 2087, 2087, 2087, 2087, 2087, 2087, -426, -426, 249, + 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, + 2087, 2087, 2087, 2087, 2087, 2087, 2087, 5, -426, -426, + 2087, 159, 248, 2087, 1147, -426, 71, 81, 144, 16, + -54, 15, 307, 1793, 127, -426, 2087, 2087, -426, 2087, + -426, -426, -426, -426, -426, 162, 168, -426, 55, 55, + 168, -426, -426, -426, 1919, 137, 162, 2087, 2087, -426, + -426, -426, 267, 217, 220, -426, 23, 2499, 1009, 489, + 489, 489, 2865, 2865, 2865, 2865, 1009, 1009, 2499, 2499, + 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2560, 2621, + -426, 213, 213, 213, 2499, 2316, 2682, 2743, 2804, 1009, + 1009, 361, 361, -20, -20, -20, 145, 2377, 187, 2087, + 276, -50, -426, 158, 2182, -426, 153, 1277, -426, -426, + 160, -426, -426, -426, -426, 1147, -426, 165, 2087, -426, + -36, 284, 156, 190, -426, 1919, -426, -426, 164, 1793, + -426, -35, -426, 193, 21, 198, 225, 887, -426, -43, + 80, -14, 179, 103, 289, 103, 186, 162, -426, -426, + 2087, -426, -426, 310, 2253, -426, 1919, 2087, 188, -426, + -426, 1147, 191, 185, 459, 21, -426, -426, 162, 20, + -426, -6, 1919, 2087, 165, -426, -426, -426, -426, -426, + -426, 2087, -426, -426, -426, 2087, 1919, 16, -426, 103, + 204, -426, 233, -426, 198, 2499, -426, -426, -426, -13, + 29, 192, -426, -426, -426, -426, -426, -426, -426, -426, + -426, -426, -426, -426, 229, 210, 284, -426, 212, 219, + -426, -426, -6, -426, 274, -426, -426, 211, -426, 215, + 233, -426, 103, 235, -426, -426, 2087, 238, 218, 29, + -426, -426, -426, -426, -426, -426, -426, 343, -426, -426, + 1919, -426, 1919, 162, 1407, -426, 346, -426, 324, 222, + 273, -426, 2438, 1793, -426, -426, -426, 1793, 1793, 162, + -426, -426, 232, -426, -426, 234, 108, 223, 1537, -426, + -426, -426, -426, 45, -426, -426, 1793, -426, 227, 237, + 244, -426, 1407, -426, -426, 349, -426, -426, -426, -426, + 1793, 239, 242, 270, 268, -426, 16, 1793, -426, 271, + 275, 162, -426, -426 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -348, -348, 270, -348, 337, -287, -348, 90, -193, -178, - 1, -76, -271, 6, 2, 67, 355, 285, 85, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - -348, -348, -348, -348, -348, -21, -20, -348, -348, 14, - -348, 15, -348, -348, -348, -348, -348, -348, -348, -200, - 75, -348, -348, -348, -348, 0, -348, 353, -348, -348, - -348, 59, -348, 62, -348, -68, -348, -53, -348, -348, - -29, -348, 3, 26, -348, -347, -348, -305, -47, 4, - -348, -348, -348, -348, -348, 408, -317, 54, 79, -184, - -348, -99, -348, -348, -348, -348, -348, -348, -348, -36, - 5, -52, -7, -348, -348, -348, -348, -348, -348 + -426, -426, 258, -426, 305, -294, -426, 63, -425, -41, + 1, -84, -308, 58, 2, 14, 352, 290, 76, -426, + -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, + -426, -426, -426, -426, -426, -15, -12, -426, -426, 8, + -426, 10, -426, -426, -426, -426, -426, -426, -426, -128, + 94, -426, -426, -426, -426, 0, -426, 356, -426, -426, + -426, 60, -426, 62, -426, -66, -426, -40, -426, -426, + -24, -426, 3, -426, 28, -426, -372, -426, -301, -46, + 4, -426, -426, -426, -426, -426, 98, -251, 50, 100, + -236, -426, -100, -426, -426, -426, -426, -426, -426, -426, + -28, -1, -53, -8, -426, -426, -426, -426, -426, -426, + -426 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -216 +#define YYTABLE_NINF -153 static const yytype_int16 yytable[] = { - 67, 53, 55, 72, 73, 134, 54, 217, 361, 309, - 90, 121, 196, 97, 309, 368, 290, 100, 382, 85, - 385, 356, 90, 208, 209, 235, 91, 312, 312, -70, - 108, 91, 110, 111, 426, 112, 113, 114, 91, 120, - 120, 236, 142, 84, 106, 434, 364, 331, 369, 107, - 115, 67, 53, 55, 72, 73, 339, 54, 413, 70, - 142, 376, 71, 164, 165, 166, 385, 281, 397, 318, - 142, 142, 400, 435, 401, 392, 220, 402, 403, 404, - 87, 405, 223, 279, 142, 91, 166, 142, 414, 94, - 86, 89, 368, 415, 317, 420, 182, 215, 183, 120, - 95, 184, 102, 98, 346, 366, 213, 443, 91, 425, - 70, 120, 453, 71, 406, 313, 412, 350, 380, 183, - 101, 431, 184, 105, 407, 408, 370, 67, 53, 55, - 72, 73, 92, 54, 104, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 507, 121, 109, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 120, 280, 468, 411, 469, - 319, 432, 124, 433, 2, 282, 70, 292, 325, 71, - 326, 283, 284, 135, 286, 287, 125, 136, 137, 297, - 15, 16, 17, 127, 19, 318, 21, 67, 53, 303, - 138, 357, 139, 142, 348, 135, 185, 120, 25, 120, - 137, 91, 309, 186, 324, 210, 454, 30, 31, 32, - 212, 358, 379, 142, 139, 359, 214, 2, 332, 333, - 218, 196, 221, 222, 2, 224, 348, 225, 226, -71, - 228, 231, 233, 15, 16, 17, 238, 19, 234, 21, - 15, 16, 17, 239, 19, 240, 21, 470, 485, 263, - 196, 25, 486, 487, 348, 344, 285, 455, 25, 454, - 30, 31, 32, 488, 288, 294, 293, 30, 31, 32, - 196, 494, 295, 296, 310, 323, 327, 328, 330, 334, - 67, 53, 303, 120, 196, 502, 335, 341, 67, 53, - 303, -151, 508, 337, 343, 345, 349, 351, 353, 355, - 312, 363, 367, 362, -108, 511, 376, 424, 365, 381, - 455, 421, 383, 389, 387, 390, 395, 396, 398, 96, - 423, 3, 4, 399, 5, 6, 7, 8, 9, 429, - 422, 440, 445, 428, 393, 67, 53, 303, 358, 442, - 120, 20, 448, 22, -152, 23, 444, 450, 461, 120, - 451, 467, 196, 462, 196, 164, 165, 166, 480, 481, - 482, 29, 489, 500, 504, 491, 490, 495, 126, 34, - 354, 35, 36, 164, 165, 166, 496, 227, 177, 178, - 179, 180, 181, 505, 497, 503, 388, 506, 182, 509, - 183, 510, 131, 184, 229, 378, 463, 464, 179, 180, - 181, 141, 499, 492, 39, 40, 182, 460, 183, 483, - 456, 184, 446, 447, 493, 103, 441, 427, 410, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 474, 472, 473, 478, 479, 45, 456, 46, - 0, 47, 0, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 474, 472, 473, 478, - 479, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 474, 472, 473, 478, 479, -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, 143, 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, -216, -216, -216, 0, 37, 38, - 0, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 39, 40, 0, 0, 0, 0, 0, - 0, 0, 41, 0, 0, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 42, 0, 182, 0, - 183, 43, 44, 184, 0, 0, 45, 0, 46, 0, - 47, 0, 48, 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, 188, 0, 129, 0, 0, 0, - 24, 189, 25, 26, 0, 27, 190, 28, 0, 29, - 191, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, - 0, 193, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, - 43, 44, 0, 0, 0, 45, 0, 46, 0, 47, - 0, 48, 0, 0, 0, 289, 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, 188, 0, 129, 0, 0, 0, 24, - 189, 25, 26, 0, 27, 190, 28, 0, 29, 191, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 192, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, - 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, - 44, 0, 0, 0, 45, 0, 46, 0, 47, 0, - 48, 0, 0, 0, 347, 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, 188, 0, 129, 0, 0, 0, 24, 189, - 25, 26, 0, 27, 190, 28, 0, 29, 191, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 192, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 39, 40, 0, 0, 0, 0, 0, 0, 0, 193, + 68, 54, 56, 73, 74, 154, 211, 135, 298, 224, + 339, 113, 100, 87, 92, 429, 103, 370, 317, 320, + 367, 362, 418, 320, 374, -70, 348, 419, 349, 111, + 93, 114, 117, 118, 93, 119, 120, 121, 487, 114, + 93, 189, 488, 489, 164, 122, 164, 86, 398, 89, + 164, 243, 68, 54, 56, 73, 74, 375, 55, 381, + 71, 496, 72, 436, 424, 164, 364, 401, 417, 365, + 187, 188, 189, 206, 92, 504, 207, 230, 428, 325, + 250, 101, 510, 356, 317, 88, 164, 164, 316, 316, + 93, 437, 388, 316, 391, 91, 251, 233, 372, 222, + 93, 114, 205, 220, 206, 296, 374, 207, 96, 321, + 55, 394, 71, 416, 72, 445, 98, 114, 109, 386, + 435, 105, 93, 110, 108, 106, 155, 299, 238, 239, + 326, 104, 415, 300, 509, 156, 376, 94, 391, 107, + 158, 145, 470, 146, 471, 215, 216, 112, 68, 54, + 56, 73, 74, 148, 160, 164, 257, 258, 259, 260, + 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 385, + 164, 455, 281, 282, 283, 284, 285, 286, 287, 288, + 289, 290, 291, 292, 293, 294, 295, 114, 297, 332, + 208, 333, 217, 337, 209, 304, 55, 219, 71, 301, + 72, 221, 225, 229, 68, 54, 310, 472, 363, 114, + 2, 114, 227, 228, 231, 331, 232, 234, 235, 241, + 244, -71, 155, 490, 246, 247, 15, 16, 17, 2, + 19, 211, 21, 248, 249, 243, 340, 341, 253, 254, + 255, 256, 280, 243, 25, 15, 16, 17, 302, 19, + 330, 21, 303, 30, 31, 32, 318, 334, 336, 338, + 342, 343, 211, 25, 345, 513, 353, 2, 351, 355, + 357, 456, 30, 31, 32, 359, 361, 320, 211, 368, + 369, 354, -108, 15, 16, 17, 371, 19, 373, 21, + 381, 387, 211, 187, 188, 189, 389, 68, 54, 310, + 114, 25, 393, 396, 400, 68, 54, 310, 403, 456, + 30, 31, 32, 402, 442, 200, 201, 202, 203, 204, + 431, 364, 427, 432, 457, 205, 444, 206, 446, 450, + 207, 447, 395, 463, 452, 425, 469, 165, 453, 482, + 464, 483, 502, 426, 484, 493, 399, 147, 491, 497, + 492, 68, 54, 310, 506, 114, 211, -151, 211, 498, + 360, 505, 457, 114, 166, 167, 168, 499, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 507, 187, 188, 189, + 508, 190, 191, 192, 511, -152, 245, 512, 434, 193, + 151, 194, 383, 195, 196, 197, 198, 199, 236, 200, + 201, 202, 203, 204, 465, 163, 501, 466, 462, 205, + 448, 206, 449, 458, 207, 155, 485, 495, 494, 430, + 327, 0, 443, 0, 156, 0, 0, 0, 157, 158, + 0, 187, 188, 189, 476, 474, 475, 480, 481, 0, + 458, 159, 404, 160, 405, 414, 0, 406, 407, 408, + 0, 409, 0, 0, 0, 202, 203, 204, 476, 474, + 475, 480, 481, 205, 0, 206, 0, 0, 207, 0, + 0, 0, 476, 474, 475, 480, 481, -4, 0, 0, + 1, 2, 3, 4, 410, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 411, 412, 14, 15, 16, 17, + 18, 19, 20, 21, 0, 0, 23, 0, 0, 165, + 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, + 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, + 34, 0, 35, 36, 0, 0, -153, -153, -153, 0, + 37, 38, 0, 0, 173, 174, 0, 39, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, + 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 198, 199, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, + 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, -4, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, + 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 0, 0, 0, 43, 44, - 0, 0, 0, 45, 0, 46, 0, 47, 0, 48, - 0, 0, 0, 394, 1, 2, 3, 4, 0, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, - 14, 15, 16, 17, 18, 19, 20, 21, -216, 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, -216, -216, 37, 38, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 164, 165, 166, 0, - 167, 168, 169, 0, 0, 0, 0, 0, 0, 39, - 40, 0, 0, 0, 0, 0, -216, -216, 41, 177, - 178, 179, 180, 181, 0, 0, 0, 0, 0, 182, - 0, 183, 42, 0, 184, 0, 0, 43, 44, 0, - 0, 0, 45, 0, 46, 0, 47, 0, 48, 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, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 134, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, + 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, - 0, 0, 0, 0, 0, 0, 0, 298, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 242, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, + 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, + 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, + 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, + 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, + 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, - 0, 45, 0, 46, 0, 47, 0, 48, 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, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, 384, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, + 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, + 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, 187, + 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 42, 0, -153, -153, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, + 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, -3, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, + 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, 39, 40, 0, - 0, 0, 0, 0, 0, 0, 298, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, + 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, - 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, - 45, 0, 46, 0, 47, 0, 48, 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, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, + 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, 39, 40, 0, 0, - 0, 0, 0, 0, 0, 471, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, - 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, - 0, 46, 0, 47, 0, 48, 0, 0, 0, -142, + 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, 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, 39, 40, 0, 0, 0, - 0, 0, 0, 0, 471, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, - 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, - 46, 0, 47, 0, 48, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, - 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, - 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, - 0, 47, 0, 48, 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, 188, 0, 129, 0, 0, 0, 24, 189, 25, - 26, 0, 27, 190, 28, 0, 29, 191, 30, 31, - 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 192, 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, 127, 0, 128, 0, 0, 0, 24, + 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, + 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, 0, 39, - 40, 0, 0, 0, 0, 0, 0, 0, 193, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, + 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, + 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, + 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, + 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, + 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, + 0, 0, 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, - 0, 0, 45, 0, 46, 0, 47, 0, 48, 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, 188, 0, 129, 0, - 0, 0, 24, 189, 25, 26, 0, 27, 190, 28, - 0, 29, 191, 30, 31, 32, 0, 0, 33, 34, - 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 192, 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, 133, 0, + 149, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, + 0, 46, 20, 47, 22, 48, 23, 49, 0, 128, + 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, + 28, 0, 29, 150, 0, 0, 0, 0, 0, 0, + 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, + 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, + 0, 0, 0, 24, 0, 0, 0, 0, 0, 43, + 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, + 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, + 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, + 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, + 0, 0, 29, 0, 44, 45, 0, 0, 0, 46, + 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, + 0, 0, 165, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, - 0, 0, 0, 193, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, - 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, - 0, 194, 0, 48, 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, 188, 0, 129, 0, 0, 0, 24, 189, 25, - 26, 0, 27, 190, 28, 0, 29, 191, 30, 31, - 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 192, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 40, 41, 166, + 167, 168, 0, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 0, 187, 188, 189, 0, 190, 191, 192, 46, + 0, 47, 0, 0, 193, 49, 194, 0, 195, 196, + 197, 198, 199, 165, 200, 201, 202, 203, 204, 0, + 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, + 0, 0, 0, 0, 0, 358, 0, 0, 0, 0, + 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 0, 187, 188, 189, 0, 190, 191, 192, + 0, 0, 0, 0, 0, 193, 165, 194, 0, 195, + 196, 197, 198, 199, 0, 200, 201, 202, 203, 204, + 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, + 207, 0, 0, 166, 167, 168, 397, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 0, 187, 188, 189, 0, + 190, 191, 192, 0, 0, 0, 0, 165, 193, 0, + 194, 350, 195, 196, 197, 198, 199, 0, 200, 201, + 202, 203, 204, 0, 0, 0, 0, 0, 205, 0, + 206, 0, 0, 207, 166, 167, 168, 0, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 0, 187, 188, 189, + 0, 190, 191, 192, 0, 0, 0, 0, 165, 193, + 0, 194, 0, 195, 196, 197, 198, 199, 0, 200, + 201, 202, 203, 204, 0, 0, 0, 0, 0, 205, + 0, 206, 352, 0, 207, 166, 167, 168, 0, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 0, 187, 188, + 189, 0, 190, 191, 192, 0, 0, 0, 0, 165, + 193, 0, 194, 486, 195, 196, 197, 198, 199, 0, + 200, 201, 202, 203, 204, 0, 0, 0, 0, 0, + 205, 0, 206, 0, 0, 207, 166, 167, 168, 0, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 0, 187, + 188, 189, 0, 190, 191, 192, 0, 0, 0, 0, + 165, 193, 0, 194, 0, 195, 196, 197, 198, 199, + 0, 200, 201, 202, 203, 204, 0, 0, 0, 0, + 0, 205, 0, 206, 0, 0, 207, 166, 167, 168, + 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 186, 0, + 187, 188, 189, 0, 190, 191, 192, 0, 0, 0, + 0, 165, 0, 0, 0, 0, 195, 196, 197, 198, + 199, 0, 200, 201, 202, 203, 204, 0, 0, 0, + 0, 0, 205, 0, 206, 0, 0, 207, 166, 167, + 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, - 40, 0, 0, 0, 0, 0, 0, 0, 193, 0, - 0, 128, 0, 3, 4, 0, 5, 6, 7, 8, - 9, 0, 42, 0, 0, 0, 0, 43, 44, 0, - 0, 0, 45, 20, 46, 22, 47, 23, 48, 0, - 129, 0, 0, 0, 24, 0, 0, 0, 0, 0, - 0, 28, 0, 29, 130, 0, 0, 0, 0, 0, - 0, 34, 0, 35, 36, 0, 0, 0, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 187, 188, 189, 0, 190, 191, 192, 0, 0, + 0, 0, 165, 0, 0, 0, 0, 195, 196, 197, + 198, 199, 0, 200, 201, 202, 203, 204, 0, 0, + 0, 0, 0, 205, 0, 206, 0, 0, 207, 166, + 167, 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, - 0, 0, 0, 0, 96, 0, 3, 4, 0, 5, - 6, 7, 8, 9, 0, 0, 0, 0, 0, 42, - 0, 0, 0, 0, 43, 44, 20, 0, 22, 45, - 23, 46, 0, 47, 0, 48, 0, 24, 0, 0, - 0, 0, 0, 0, 28, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, + 0, 0, 187, 188, 189, 0, 190, 191, 192, 0, + 0, 0, 0, 165, 0, 0, 0, 0, 0, 196, + 197, 198, 199, 0, 200, 201, 202, 203, 204, 0, + 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, + 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, - 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 143, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, - 0, 0, 45, 0, 46, 0, 47, 0, 48, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 320, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 352, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 391, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 143, 0, 171, 340, 172, 173, 174, - 175, 176, 0, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 0, 164, 165, 166, 0, 167, 168, 169, 0, 0, - 0, 0, 0, 170, 143, 0, 171, 0, 172, 173, - 174, 175, 176, 0, 177, 178, 179, 180, 181, 0, - 0, 0, 0, 0, 182, 0, 183, 342, 0, 184, - 0, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 0, 164, 165, 166, 0, 167, 168, 169, 0, - 0, 0, 0, 0, 170, 143, 0, 171, -215, 172, - 173, 174, 175, 176, 0, 177, 178, 179, 180, 181, - 0, 0, 0, 0, 0, 182, 0, 183, 0, 0, - 184, 0, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 0, 164, 165, 166, 0, 167, 168, 169, - 0, 0, 0, 0, 0, 170, 143, 0, 171, 484, - 172, 173, 174, 175, 176, 0, 177, 178, 179, 180, - 181, 0, 0, 0, 0, 0, 182, 0, 183, 0, - 0, 184, 0, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, - 161, 162, 163, 0, 164, 165, 166, 0, 167, 168, - 169, 0, 0, 0, 0, 0, 170, 143, 0, 171, - 0, 172, 173, 174, 175, 176, 0, 177, 178, 179, - 180, 181, 0, 0, 0, 0, 0, 182, 0, 183, - 0, 0, 184, 0, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 163, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 172, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 172, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 0, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 0, -216, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, -216, -216, -216, - -216, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184 + 0, 0, 0, 187, 188, 189, 0, 190, 191, 192, + 0, 0, 0, 0, 165, 0, 0, 0, 0, 0, + 0, 197, 198, 199, 0, 200, 201, 202, 203, 204, + 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, + 207, 166, 167, 168, 0, 169, 170, 171, 172, 173, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 187, 188, 189, 0, 190, 191, + 192, 0, 0, 0, 0, 165, 0, 0, 0, 0, + 0, 0, -153, 198, 199, 0, 200, 201, 202, 203, + 204, 0, 0, 0, 0, 0, 205, 0, 206, 0, + 0, 207, 166, 167, 168, 0, -153, -153, -153, -153, + 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 187, 188, 189, 0, 190, + 191, 192, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 198, 199, 0, 200, 201, 202, + 203, 204, 0, 0, 0, 0, 0, 205, 0, 206, + 0, 0, 207 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 57, 0, 106, 313, 209, - 3, 47, 88, 20, 214, 3, 194, 24, 335, 50, - 337, 308, 3, 125, 126, 35, 19, 3, 3, 68, - 37, 19, 39, 40, 381, 42, 43, 44, 19, 46, - 47, 51, 98, 87, 121, 34, 317, 231, 36, 126, - 45, 51, 51, 51, 51, 51, 240, 51, 363, 0, - 98, 100, 0, 88, 89, 90, 383, 3, 355, 3, - 98, 98, 3, 62, 5, 346, 132, 8, 9, 10, - 121, 12, 118, 182, 98, 19, 90, 98, 28, 14, - 121, 121, 3, 33, 132, 366, 121, 104, 123, 106, - 18, 126, 27, 3, 132, 132, 101, 412, 19, 380, - 51, 118, 429, 51, 45, 91, 91, 295, 132, 123, - 121, 132, 126, 125, 55, 56, 114, 127, 127, 127, - 127, 127, 125, 127, 121, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 504, 194, 121, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 448, 362, 450, - 114, 3, 3, 5, 4, 121, 127, 194, 224, 127, - 226, 127, 187, 27, 189, 190, 0, 31, 32, 206, - 20, 21, 22, 125, 24, 3, 26, 207, 207, 207, - 44, 310, 46, 98, 290, 27, 3, 224, 38, 226, - 32, 19, 422, 121, 219, 3, 46, 47, 48, 49, - 121, 100, 97, 98, 46, 104, 126, 4, 233, 234, - 3, 317, 124, 98, 4, 104, 322, 131, 98, 68, - 3, 3, 97, 20, 21, 22, 3, 24, 68, 26, - 20, 21, 22, 3, 24, 3, 26, 451, 461, 3, - 346, 38, 465, 466, 350, 282, 3, 97, 38, 46, - 47, 48, 49, 467, 3, 14, 97, 47, 48, 49, - 366, 484, 125, 18, 121, 132, 131, 104, 98, 3, - 300, 300, 300, 310, 380, 498, 54, 132, 308, 308, - 308, 131, 505, 54, 87, 3, 121, 3, 131, 125, - 3, 98, 104, 132, 126, 509, 100, 379, 131, 121, - 97, 367, 17, 340, 125, 3, 100, 125, 131, 3, - 376, 5, 6, 132, 8, 9, 10, 11, 12, 98, - 126, 131, 121, 125, 349, 355, 355, 355, 100, 125, - 367, 25, 65, 27, 131, 29, 125, 132, 104, 376, - 132, 3, 448, 131, 450, 88, 89, 90, 3, 27, - 131, 45, 125, 3, 121, 131, 125, 131, 51, 53, - 300, 55, 56, 88, 89, 90, 131, 127, 111, 112, - 113, 114, 115, 125, 132, 131, 339, 131, 121, 132, - 123, 131, 57, 126, 129, 330, 437, 437, 113, 114, - 115, 68, 490, 476, 88, 89, 121, 434, 123, 458, - 430, 126, 418, 418, 481, 27, 410, 383, 359, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 452, 452, 452, 452, 452, 121, 458, 123, - -1, 125, -1, 127, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 476, 476, 476, 476, - 476, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 490, 490, 490, 490, 490, 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, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, 88, 89, -1, -1, -1, -1, -1, - -1, -1, 97, -1, -1, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, 111, -1, 121, -1, - 123, 116, 117, 126, -1, -1, 121, -1, 123, -1, - 125, -1, 127, -1, -1, -1, 131, 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, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 88, 89, -1, -1, -1, -1, -1, -1, - -1, 97, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, - 116, 117, -1, -1, -1, 121, -1, 123, -1, 125, - -1, 127, -1, -1, -1, 131, 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, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 88, 89, -1, -1, -1, -1, -1, -1, -1, - 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, - 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, - 127, -1, -1, -1, 131, 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, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, -1, -1, -1, -1, -1, -1, 97, + 0, 0, 0, 0, 0, 58, 90, 48, 3, 109, + 246, 39, 20, 50, 3, 387, 24, 325, 3, 3, + 321, 315, 28, 3, 3, 68, 3, 33, 5, 37, + 19, 39, 40, 41, 19, 43, 44, 45, 463, 47, + 19, 92, 467, 468, 100, 46, 100, 89, 356, 122, + 100, 135, 52, 52, 52, 52, 52, 36, 0, 102, + 0, 486, 0, 34, 372, 100, 102, 361, 369, 105, + 90, 91, 92, 124, 3, 500, 127, 133, 386, 133, + 35, 3, 507, 133, 3, 122, 100, 100, 216, 217, + 19, 62, 343, 221, 345, 122, 51, 125, 133, 107, + 19, 109, 122, 104, 124, 205, 3, 127, 14, 93, + 52, 347, 52, 93, 52, 416, 18, 125, 122, 133, + 133, 27, 19, 127, 126, 27, 18, 122, 129, 130, + 115, 122, 368, 128, 506, 27, 115, 126, 389, 122, + 32, 3, 450, 0, 452, 126, 127, 122, 148, 148, + 148, 148, 148, 126, 46, 100, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 99, + 100, 432, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 227, + 3, 229, 127, 244, 122, 213, 148, 122, 148, 210, + 148, 127, 3, 100, 214, 214, 214, 453, 318, 227, + 4, 229, 105, 132, 125, 226, 100, 3, 3, 3, + 126, 68, 18, 469, 3, 99, 20, 21, 22, 4, + 24, 325, 26, 68, 3, 329, 247, 248, 3, 3, + 3, 102, 3, 337, 38, 20, 21, 22, 99, 24, + 133, 26, 14, 47, 48, 49, 122, 105, 100, 132, + 3, 54, 356, 38, 54, 511, 89, 4, 133, 3, + 122, 46, 47, 48, 49, 132, 126, 3, 372, 133, + 100, 299, 127, 20, 21, 22, 132, 24, 105, 26, + 102, 122, 386, 90, 91, 92, 17, 307, 307, 307, + 318, 38, 126, 3, 126, 315, 315, 315, 133, 46, + 47, 48, 49, 132, 132, 112, 113, 114, 115, 116, + 126, 102, 385, 100, 99, 122, 126, 124, 126, 65, + 127, 122, 350, 105, 133, 373, 3, 40, 133, 3, + 132, 27, 3, 381, 132, 132, 357, 52, 126, 132, + 126, 361, 361, 361, 122, 373, 450, 132, 452, 132, + 307, 132, 99, 381, 67, 68, 69, 133, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 126, 90, 91, 92, + 132, 94, 95, 96, 133, 132, 148, 132, 394, 102, + 58, 104, 336, 106, 107, 108, 109, 110, 128, 112, + 113, 114, 115, 116, 439, 69, 492, 439, 436, 122, + 422, 124, 422, 433, 127, 18, 460, 483, 478, 389, + 133, -1, 414, -1, 27, -1, -1, -1, 31, 32, + -1, 90, 91, 92, 454, 454, 454, 454, 454, -1, + 460, 44, 3, 46, 5, 365, -1, 8, 9, 10, + -1, 12, -1, -1, -1, 114, 115, 116, 478, 478, + 478, 478, 478, 122, -1, 124, -1, -1, 127, -1, + -1, -1, 492, 492, 492, 492, 492, 0, -1, -1, + 3, 4, 5, 6, 45, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 55, 56, 19, 20, 21, 22, + 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, + -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, + 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, + 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, 111, -1, -1, -1, -1, 116, 117, - -1, -1, -1, 121, -1, 123, -1, 125, -1, 127, - -1, -1, -1, 131, 3, 4, 5, 6, -1, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, 21, 22, 23, 24, 25, 26, 40, -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, 74, 75, 63, 64, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 88, 89, 90, -1, - 92, 93, 94, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, 108, 109, 97, 111, - 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, - -1, 123, 111, -1, 126, -1, -1, 116, 117, -1, - -1, -1, 121, -1, 123, -1, 125, -1, 127, -1, - -1, -1, 131, 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, + -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, 88, 89, - -1, -1, -1, -1, -1, -1, -1, 97, -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, 111, -1, -1, -1, -1, 116, 117, -1, -1, - -1, 121, -1, 123, -1, 125, -1, 127, -1, -1, - -1, 131, 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, -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, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, - -1, -1, -1, -1, -1, -1, 97, -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, -1, -1, -1, -1, -1, -1, -1, -1, - 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, - 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, - 131, 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, -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, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 88, 89, -1, -1, - -1, -1, -1, -1, -1, 97, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, - -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, - -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, + -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, -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, 88, 89, -1, -1, -1, - -1, -1, -1, -1, 97, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, - -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, - 123, -1, 125, -1, 127, -1, 0, -1, 131, 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, -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, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 88, 89, -1, -1, -1, -1, - -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, - -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, - -1, 125, -1, 127, 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, -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, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, 97, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, - -1, -1, 121, -1, 123, -1, 125, -1, 127, 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, -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, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 88, 89, -1, -1, -1, -1, - -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, - -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, - -1, 125, -1, 127, 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, -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, + 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, 40, 102, -1, + 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, + 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, + -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, + 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, + -1, 124, 125, -1, 127, 67, 68, 69, -1, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, + 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, + 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, + 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, + 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, + 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, + -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, + -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, + -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, + 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, + -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, + 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, + -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, + 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, 97, -1, - -1, 3, -1, 5, 6, -1, 8, 9, 10, 11, - 12, -1, 111, -1, -1, -1, -1, 116, 117, -1, - -1, -1, 121, 25, 123, 27, 125, 29, 127, -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, -1, -1, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, + 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, + -1, -1, -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, -1, -1, -1, -1, 88, 89, -1, -1, - -1, -1, -1, -1, 3, -1, 5, 6, -1, 8, - 9, 10, 11, 12, -1, -1, -1, -1, -1, 111, - -1, -1, -1, -1, 116, 117, 25, -1, 27, 121, - 29, 123, -1, 125, -1, 127, -1, 36, -1, -1, - -1, -1, -1, -1, 43, -1, 45, -1, -1, -1, - -1, -1, -1, -1, 53, -1, 55, 56, -1, -1, - -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, -1, 40, -1, -1, -1, -1, -1, 107, + 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, + 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, - -1, -1, 121, -1, 123, -1, 125, -1, 127, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, - -1, -1, -1, -1, 132, -1, -1, -1, -1, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, - -1, -1, -1, -1, 132, -1, -1, -1, -1, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, - -1, -1, -1, -1, 132, -1, -1, -1, -1, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, 40, -1, 103, 104, 105, 106, 107, - 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - -1, 88, 89, 90, -1, 92, 93, 94, -1, -1, - -1, -1, -1, 100, 40, -1, 103, -1, 105, 106, - 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, - -1, -1, -1, -1, 121, -1, 123, 124, -1, 126, - -1, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, -1, 88, 89, 90, -1, 92, 93, 94, -1, - -1, -1, -1, -1, 100, 40, -1, 103, 104, 105, - 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, - -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, - 126, -1, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, -1, 88, 89, 90, -1, 92, 93, 94, - -1, -1, -1, -1, -1, 100, 40, -1, 103, 104, - 105, 106, 107, 108, 109, -1, 111, 112, 113, 114, - 115, -1, -1, -1, -1, -1, 121, -1, 123, -1, - -1, 126, -1, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, -1, 88, 89, 90, -1, 92, 93, - 94, -1, -1, -1, -1, -1, 100, 40, -1, 103, - -1, 105, 106, 107, 108, 109, -1, 111, 112, 113, - 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, - -1, -1, 126, -1, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 86, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -1, -1, - -1, -1, 105, 106, 107, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -1, -1, - -1, -1, 105, 106, 107, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, 106, 107, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 107, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 107, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126 + -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, + -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, + 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, + 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, + -1, -1, 108, 109, 110, -1, 112, 113, 114, 115, + 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, + -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, + 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, + 95, 96, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 109, 110, -1, 112, 113, 114, + 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, + -1, -1, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3130,55 +3280,55 @@ static const yytype_uint8 yystos[] = 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 88, - 89, 97, 111, 116, 117, 121, 123, 125, 127, 134, - 135, 136, 137, 143, 146, 147, 153, 157, 158, 159, - 160, 162, 170, 178, 181, 184, 187, 188, 189, 190, - 194, 196, 205, 212, 215, 228, 229, 230, 233, 234, - 235, 236, 239, 241, 87, 50, 121, 121, 163, 121, - 3, 19, 125, 182, 183, 18, 3, 235, 3, 214, - 235, 121, 183, 218, 121, 125, 121, 126, 235, 121, - 235, 235, 235, 235, 235, 233, 224, 225, 226, 232, - 235, 232, 237, 238, 3, 0, 137, 125, 3, 32, - 46, 149, 155, 156, 234, 27, 31, 32, 44, 46, - 204, 190, 98, 40, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 88, 89, 90, 92, 93, 94, - 100, 103, 105, 106, 107, 108, 109, 111, 112, 113, - 114, 115, 121, 123, 126, 3, 121, 161, 30, 37, - 42, 46, 66, 97, 125, 143, 144, 145, 147, 149, - 164, 165, 180, 188, 231, 240, 171, 186, 125, 126, - 3, 227, 121, 233, 126, 235, 179, 224, 3, 154, - 132, 124, 98, 232, 104, 131, 98, 135, 3, 150, - 151, 3, 150, 97, 68, 35, 51, 211, 3, 3, - 3, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 3, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 224, - 235, 3, 121, 127, 233, 3, 233, 233, 3, 131, - 142, 144, 235, 97, 14, 125, 18, 235, 97, 138, - 139, 140, 146, 147, 194, 196, 205, 212, 185, 182, - 121, 223, 3, 91, 208, 209, 210, 132, 3, 114, - 132, 141, 142, 132, 233, 232, 232, 131, 104, 222, - 98, 222, 233, 233, 3, 54, 191, 54, 192, 222, - 104, 132, 124, 87, 235, 3, 132, 131, 144, 121, - 142, 3, 132, 131, 140, 125, 138, 224, 100, 104, - 206, 210, 132, 98, 145, 131, 132, 104, 3, 36, - 114, 183, 217, 218, 219, 221, 100, 148, 151, 97, - 132, 121, 219, 17, 193, 219, 220, 125, 148, 235, - 3, 132, 145, 233, 131, 100, 125, 138, 131, 132, - 3, 5, 8, 9, 10, 12, 45, 55, 56, 207, - 221, 222, 91, 210, 28, 33, 172, 174, 176, 177, - 145, 232, 126, 232, 234, 145, 208, 220, 125, 98, - 197, 132, 3, 5, 34, 62, 166, 167, 168, 169, - 131, 206, 125, 210, 125, 121, 172, 174, 65, 152, - 132, 132, 195, 219, 46, 97, 188, 201, 202, 203, - 235, 104, 131, 168, 169, 216, 175, 3, 145, 145, - 222, 97, 143, 147, 188, 198, 199, 200, 205, 212, - 3, 27, 131, 203, 104, 141, 141, 141, 222, 125, - 125, 131, 200, 211, 141, 131, 131, 132, 213, 198, - 3, 173, 141, 131, 121, 125, 131, 208, 141, 132, - 131, 222 + 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, + 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, 244, 89, 50, 122, 122, + 164, 122, 3, 19, 126, 183, 184, 184, 220, 3, + 237, 3, 216, 237, 122, 184, 220, 122, 126, 122, + 127, 237, 122, 234, 237, 239, 240, 237, 237, 237, + 237, 237, 235, 226, 227, 228, 234, 30, 32, 37, + 42, 46, 66, 99, 132, 143, 144, 145, 148, 150, + 165, 166, 181, 189, 233, 3, 0, 138, 126, 3, + 46, 150, 156, 157, 236, 18, 27, 31, 32, 44, + 46, 205, 242, 191, 100, 40, 67, 68, 69, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, + 94, 95, 96, 102, 104, 106, 107, 108, 109, 110, + 112, 113, 114, 115, 116, 122, 124, 127, 3, 122, + 162, 145, 146, 172, 187, 126, 127, 127, 229, 122, + 235, 127, 237, 180, 226, 3, 155, 105, 132, 100, + 133, 125, 100, 234, 3, 3, 151, 152, 235, 235, + 151, 3, 132, 145, 126, 136, 3, 99, 68, 3, + 35, 51, 213, 3, 3, 3, 102, 237, 237, 237, + 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 237, 237, 237, 237, 237, 237, 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, 3, 122, 225, + 3, 93, 210, 211, 212, 133, 115, 133, 142, 143, + 133, 235, 234, 234, 105, 224, 100, 143, 132, 224, + 235, 235, 3, 54, 192, 54, 193, 207, 3, 5, + 105, 133, 125, 89, 237, 3, 133, 122, 133, 132, + 141, 126, 139, 226, 102, 105, 208, 212, 133, 100, + 146, 132, 133, 105, 3, 36, 115, 219, 220, 221, + 223, 102, 149, 152, 132, 99, 133, 122, 221, 17, + 194, 221, 222, 126, 224, 237, 3, 133, 146, 235, + 126, 139, 132, 133, 3, 5, 8, 9, 10, 12, + 45, 55, 56, 209, 223, 224, 93, 212, 28, 33, + 173, 175, 177, 178, 146, 234, 234, 236, 146, 210, + 222, 126, 100, 198, 149, 133, 34, 62, 167, 168, + 169, 170, 132, 208, 126, 212, 126, 122, 173, 175, + 65, 153, 133, 133, 196, 221, 46, 99, 189, 202, + 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 }; #define yyerrok (yyerrstatus = 0) @@ -3994,7 +4144,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1725 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4005,7 +4155,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1726 "parser.y" +#line 1921 "parser.y" {(yyval.code)=code_new();} } break; @@ -4016,7 +4166,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1728 "parser.y" +#line 1923 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4027,52 +4177,41 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1729 "parser.y" +#line 1924 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 41: + case 42: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1745 "parser.y" - {(yyval.code)=0;} - } - break; - - - - case 48: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 1752 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 1939 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; - case 49: + case 43: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1754 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 1940 "parser.y" + {(yyval.code)=0;} } break; - case 50: + case 44: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1756 "parser.y" - {(yyval.code)=(yyvsp[(2) - (3)].code);} +#line 1943 "parser.y" + {(yyval.code)=0;} } break; @@ -4082,8 +4221,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1757 "parser.y" - {(yyval.code)=0;} +#line 1950 "parser.y" + {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4093,7 +4232,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1758 "parser.y" +#line 1954 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4104,7 +4243,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1759 "parser.y" +#line 1955 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4115,7 +4254,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1763 "parser.y" +#line 1959 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4129,7 +4268,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1774 "parser.y" +#line 1970 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4140,7 +4279,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1775 "parser.y" +#line 1971 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4153,7 +4292,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1779 "parser.y" +#line 1975 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4164,7 +4303,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1780 "parser.y" +#line 1976 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4175,7 +4314,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1782 "parser.y" +#line 1978 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4186,7 +4325,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1783 "parser.y" +#line 1979 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4197,45 +4336,63 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1786 "parser.y" +#line 1982 "parser.y" { +PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id)); +PASS1 + new_variable((yyvsp[(1) - (3)].id), 0, 1, 0); +PASS2 if(!is_subtype_of((yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo))) { syntaxerror("Can't convert %s to %s", (yyvsp[(3) - (3)].value).t->name, (yyvsp[(2) - (3)].classinfo)->name); } - int index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1); + char slot = 0; + int index = 0; + if(state->method->uses_slots) { + variable_t* v = find_slot(state, (yyvsp[(1) - (3)].id)); + if(v && !v->init) { + // this variable is stored in a slot + v->init = 1; + v->type = (yyvsp[(2) - (3)].classinfo); + slot = 1; + index = v->index; + } + } + if(!index) { + index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0); + } + + (yyval.code) = slot?abc_getscopeobject(0, 1):0; if((yyvsp[(2) - (3)].classinfo)) { if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = (yyvsp[(3) - (3)].value).c; + (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); + (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo)); } } else { if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = (yyvsp[(3) - (3)].value).c; + (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); (yyval.code) = abc_coerce_a((yyval.code)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { + // don't do anything code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = code_new(); + code_free((yyval.code)); + (yyval.code) = 0; + break; } } - - /* that's the default for a local register, anyway - else { - state->method->initcode = abc_pushundefined(state->method->initcode); - state->method->initcode = abc_setlocal(state->method->initcode, index); - }*/ - //printf("variable %s -> %d (%s)\n", $2->text, index, $4.t?$4.t->name:""); + if(slot) { + (yyval.code) = abc_setslot((yyval.code), index); + } else { + (yyval.code) = abc_setlocal((yyval.code), index); + } } } break; @@ -4246,7 +4403,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1828 "parser.y" +#line 2042 "parser.y" {(yyval.code) = code_new();} } break; @@ -4257,7 +4414,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1829 "parser.y" +#line 2043 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4268,8 +4425,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" - {new_state();} +#line 2046 "parser.y" + {PASS12 new_state();} } break; @@ -4279,7 +4436,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" +#line 2046 "parser.y" { (yyval.code) = code_new(); @@ -4296,7 +4453,7 @@ yyreduce: myjmp->branch = (yyval.code) = abc_nop((yyval.code)); } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4307,7 +4464,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1851 "parser.y" +#line 2065 "parser.y" {(yyval.code)=code_new();} } break; @@ -4318,9 +4475,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1856 "parser.y" +#line 2072 "parser.y" { - (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1); + PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0); + PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0); } } break; @@ -4331,8 +4489,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1859 "parser.y" +#line 2076 "parser.y" { + PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); } } @@ -4344,8 +4503,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1863 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} +#line 2081 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4355,8 +4514,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1864 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} +#line 2082 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4366,7 +4525,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1866 "parser.y" +#line 2084 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4384,7 +4543,7 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4395,13 +4554,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1886 "parser.y" +#line 2104 "parser.y" { - variable_t*var = find_variable((yyvsp[(2) - (6)].id)); + variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); - int it = new_variable(tmp1name, TYPE_INT, 0); + int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); - int array = new_variable(tmp1name, 0, 0); + int array = new_variable(tmp1name, 0, 0, 0); (yyval.code) = code_new(); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c); @@ -4433,10 +4592,11 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } } break; @@ -4447,8 +4607,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1929 "parser.y" - {new_state();} +#line 2148 "parser.y" + {PASS12 new_state();} } break; @@ -4458,7 +4618,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1929 "parser.y" +#line 2148 "parser.y" { (yyval.code) = code_new(); @@ -4475,7 +4635,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4486,8 +4646,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" - {new_state();} +#line 2167 "parser.y" + {PASS12 new_state();} } break; @@ -4497,7 +4657,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" +#line 2167 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4510,7 +4670,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4521,7 +4681,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1963 "parser.y" +#line 2182 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4534,7 +4694,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1966 "parser.y" +#line 2185 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4547,7 +4707,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1969 "parser.y" +#line 2188 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4560,7 +4720,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1972 "parser.y" +#line 2191 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4573,7 +4733,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1976 "parser.y" +#line 2195 "parser.y" {(yyval.code)=0;} } break; @@ -4584,7 +4744,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" +#line 2196 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4595,7 +4755,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1978 "parser.y" +#line 2197 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4606,7 +4766,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1979 "parser.y" +#line 2198 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4617,7 +4777,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1980 "parser.y" +#line 2199 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4628,7 +4788,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1981 "parser.y" +#line 2200 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4639,7 +4799,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1983 "parser.y" +#line 2202 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4660,7 +4820,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1994 "parser.y" +#line 2213 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4673,8 +4833,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1997 "parser.y" - {new_state();} +#line 2216 "parser.y" + {PASS12 new_state();} } break; @@ -4684,7 +4844,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1997 "parser.y" +#line 2216 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4709,7 +4869,7 @@ yyreduce: } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4720,8 +4880,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" - {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} +#line 2245 "parser.y" + {PASS12 new_state(); + state->exception_name=(yyvsp[(3) - (5)].id); + PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); + PASS2 new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0); + } } break; @@ -4731,7 +4895,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2250 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4742,14 +4906,14 @@ yyreduce: (yyval.exception) = e; code_t*c = 0; - int i = find_variable_safe((yyvsp[(3) - (9)].id))->index; + int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index; e->target = c = abc_nop(0); c = abc_setlocal(c, i); c = code_append(c, (yyvsp[(8) - (9)].code)); c = abc_kill(c, i); c = var_block(c); - old_state(); + PASS12 old_state(); } } break; @@ -4760,8 +4924,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" - {new_state();state->exception_name=0;} +#line 2269 "parser.y" + {PASS12 new_state();state->exception_name=0;} } break; @@ -4771,12 +4935,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" +#line 2269 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { (yyval.exception)=0; - old_state(); } else { NEW(abc_exception_t, e) e->exc_type = 0; //all exceptions @@ -4784,9 +4947,9 @@ yyreduce: e->target = 0; e->to = abc_nop(0); e->to = code_append(e->to, (yyvsp[(4) - (5)].code)); - old_state(); (yyval.exception) = e; } + PASS12 old_state(); } } break; @@ -4797,7 +4960,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2063 "parser.y" +#line 2285 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4808,7 +4971,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2064 "parser.y" +#line 2286 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4819,7 +4982,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2287 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4830,7 +4993,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2066 "parser.y" +#line 2288 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4848,7 +5011,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2074 "parser.y" +#line 2296 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4866,8 +5029,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2083 "parser.y" - {new_state();} +#line 2305 "parser.y" + {PASS12 new_state();} } break; @@ -4877,7 +5040,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2083 "parser.y" +#line 2305 "parser.y" { code_t*out = abc_nop(0); @@ -4890,7 +5053,7 @@ yyreduce: int tmp; if((yyvsp[(6) - (6)].catch_list).finally) - tmp = new_variable("__finally__", 0, 0); + tmp = new_variable("__finally__", 0, 0, 0); abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l; int count=0; @@ -4918,7 +5081,7 @@ yyreduce: list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4929,7 +5092,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2128 "parser.y" +#line 2350 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4943,11 +5106,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2132 "parser.y" +#line 2354 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); - variable_t*v = find_variable(state->exception_name); + variable_t*v = find_variable(state, state->exception_name); (yyval.code)=code_new(); (yyval.code)=abc_getlocal((yyval.code), v->index); (yyval.code)=abc_throw((yyval.code)); @@ -4961,7 +5124,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2143 "parser.y" +#line 2365 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushscope((yyval.code)); @@ -4977,7 +5140,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2153 "parser.y" +#line 2375 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -4988,7 +5151,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2155 "parser.y" +#line 2377 "parser.y" {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} } break; @@ -4999,7 +5162,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2156 "parser.y" +#line 2378 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5010,7 +5173,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2158 "parser.y" +#line 2380 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5021,7 +5184,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2159 "parser.y" +#line 2381 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5032,7 +5195,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2160 "parser.y" +#line 2382 "parser.y" {PASS12 startpackage("");} } break; @@ -5043,7 +5206,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2161 "parser.y" +#line 2383 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5054,10 +5217,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2163 "parser.y" +#line 2385 "parser.y" { - PASS1 - if(!registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name)) { + PASS12 + slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); + if(!s) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } @@ -5078,9 +5242,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2177 "parser.y" +#line 2400 "parser.y" { - PASS1 + PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { as3_schedule_package((yyvsp[(2) - (4)].id)); } @@ -5101,8 +5265,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2193 "parser.y" - {PASS12 (yyval.flags)=0;} +#line 2416 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5112,7 +5276,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2194 "parser.y" +#line 2417 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5123,8 +5287,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2195 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2418 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5134,8 +5298,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2419 "parser.y" + { + PASS12 + (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; + if((yyvsp[(1) - (2)].flags).ns && (yyvsp[(2) - (2)].flags).ns) syntaxerror("only one namespace allowed in one declaration"); + (yyval.flags).ns=(yyvsp[(1) - (2)].flags).ns?(yyvsp[(1) - (2)].flags).ns:(yyvsp[(2) - (2)].flags).ns; + +} } break; @@ -5145,8 +5315,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2198 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2427 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5156,8 +5326,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2428 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5167,8 +5337,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2200 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2429 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5178,8 +5348,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2201 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2430 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5189,8 +5359,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2431 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5200,8 +5370,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2203 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2432 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5211,8 +5381,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2204 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2433 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5222,8 +5392,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2205 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2434 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5233,8 +5403,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2206 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2435 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5244,8 +5414,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2207 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2436 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; @@ -5255,7 +5427,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2440 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; @@ -5266,7 +5438,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2210 "parser.y" +#line 2441 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5277,7 +5449,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2212 "parser.y" +#line 2443 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5288,7 +5460,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2213 "parser.y" +#line 2444 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5299,7 +5471,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2215 "parser.y" +#line 2446 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5310,7 +5482,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2447 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5321,8 +5493,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2220 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2451 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5332,7 +5504,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2222 "parser.y" +#line 2453 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5343,8 +5515,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2226 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2457 "parser.y" + {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE; + startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} } break; @@ -5354,7 +5527,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2228 "parser.y" +#line 2460 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5365,11 +5538,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" +#line 2473 "parser.y" { - code_t*c = state->cls->static_init; + code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); - state->cls->static_init = c; + state->cls->static_init->header = c; } } break; @@ -5380,7 +5553,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2484 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5393,15 +5566,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2255 "parser.y" +#line 2487 "parser.y" { PASS12 - (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; - if((yyvsp[(1) - (8)].flags)&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { + (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; + if((yyvsp[(1) - (8)].flags).flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { syntaxerror("invalid method modifiers: interface methods always need to be public"); } - startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); - endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); + startfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); + endfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); list_deep_free((yyvsp[(6) - (8)].params).list); } } @@ -5413,54 +5586,66 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" +#line 2502 "parser.y" + {setstaticfunction((yyvsp[(1) - (3)].flags).flags);} + } + break; + + + + case 161: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2502 "parser.y" { - int flags = (yyvsp[(1) - (5)].flags); - U8 access = flags2access((yyvsp[(1) - (5)].flags)); + int flags = (yyvsp[(1) - (6)].flags).flags; + namespace_t ns = modifiers2access(&(yyvsp[(1) - (6)].flags)); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (5)].id), 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(3) - (6)].id), 1); if(i) { check_override(i, flags); } - - info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (5)].id)); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(3) - (6)].id)); } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (5)].id)); + slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (5)].id)); + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); } - info = varinfo_register_global(access, state->package, (yyvsp[(3) - (5)].id)); + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(3) - (6)].id)); } - info->type = (yyvsp[(4) - (5)].classinfo); + info->type = (yyvsp[(5) - (6)].classinfo); info->flags = flags; /* slot name */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (5)].id)}; + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(3) - (6)].id)}; trait_list_t**traits; code_t**code; if(!state->cls) { // global variable - mname_ns.name = state->package; + ns.name = state->package; traits = &global->init->traits; code = &global->init->method->body->code; } else if(flags&FLAG_STATIC) { // static variable traits = &state->cls->abc->static_traits; - code = &state->cls->static_init; + code = &state->cls->static_init->header; } else { // instance variable traits = &state->cls->abc->traits; - code = &state->cls->init; + code = &state->cls->init->header; } trait_t*t=0; - if((yyvsp[(4) - (5)].classinfo)) { - MULTINAME(m, (yyvsp[(4) - (5)].classinfo)); + if((yyvsp[(5) - (6)].classinfo)) { + MULTINAME(m, (yyvsp[(5) - (6)].classinfo)); t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); } else { t = trait_new_member(traits, 0, multiname_clone(&mname), 0); @@ -5469,141 +5654,142 @@ yyreduce: /* initalization code (if needed) */ code_t*c = 0; - if((yyvsp[(5) - (5)].value).c && !is_pushundefined((yyvsp[(5) - (5)].value).c)) { + if((yyvsp[(6) - (6)].value).c && !is_pushundefined((yyvsp[(6) - (6)].value).c)) { c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(5) - (5)].value).c); - c = converttype(c, (yyvsp[(5) - (5)].value).t, (yyvsp[(4) - (5)].classinfo)); + c = code_append(c, (yyvsp[(6) - (6)].value).c); + c = converttype(c, (yyvsp[(6) - (6)].value).t, (yyvsp[(5) - (6)].classinfo)); c = abc_setslot(c, t->slot_id); } *code = code_append(*code, c); - if((yyvsp[(2) - (5)].token)==KW_CONST) { + if((yyvsp[(2) - (6)].token)==KW_CONST) { t->kind= TRAIT_CONST; } (yyval.code)=0; + setstaticfunction(0); } } break; - case 161: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2343 "parser.y" +#line 2577 "parser.y" {(yyval.constant)=0;} } break; - case 162: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2344 "parser.y" +#line 2578 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 163: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2346 "parser.y" +#line 2580 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 164: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2347 "parser.y" +#line 2581 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 165: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2348 "parser.y" +#line 2582 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 166: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2349 "parser.y" +#line 2583 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 167: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2350 "parser.y" +#line 2584 "parser.y" {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; - case 168: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2586 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 169: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2353 "parser.y" +#line 2587 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 170: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2354 "parser.y" +#line 2588 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 171: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2355 "parser.y" +#line 2589 "parser.y" { // TODO as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); @@ -5614,11 +5800,11 @@ yyreduce: - case 172: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2598 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5628,11 +5814,11 @@ yyreduce: - case 173: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2602 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5642,11 +5828,11 @@ yyreduce: - case 174: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2374 "parser.y" +#line 2608 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5658,11 +5844,11 @@ yyreduce: - case 175: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2380 "parser.y" +#line 2614 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5674,11 +5860,11 @@ yyreduce: - case 176: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2388 "parser.y" +#line 2622 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5689,11 +5875,11 @@ yyreduce: - case 177: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2393 "parser.y" +#line 2627 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5704,17 +5890,17 @@ yyreduce: - case 178: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2633 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (4)].id); (yyval.param)->type = (yyvsp[(3) - (4)].classinfo); + PASS2 (yyval.param)->value = (yyvsp[(4) - (4)].constant); } } @@ -5722,17 +5908,17 @@ yyreduce: - case 179: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2407 "parser.y" +#line 2641 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (2)].id); (yyval.param)->type = TYPE_ANY; + PASS2 (yyval.param)->value = (yyvsp[(2) - (2)].constant); } } @@ -5740,64 +5926,44 @@ yyreduce: - case 180: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2415 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 181: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 182: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2417 "parser.y" - {(yyval.token)=0;} +#line 2651 "parser.y" + {PASS12 (yyval.token)=0;} } break; - case 183: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "parser.y" - {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} +#line 2654 "parser.y" + {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; - case 184: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2421 "parser.y" +#line 2655 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list); + PASS1 + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); - code_t*c = method_header(); + code_t*c = method_header(state->method); c = wrap_function(c, 0, (yyvsp[(11) - (12)].code)); - endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + PASS12 list_deep_free((yyvsp[(6) - (12)].params).list); (yyval.code)=0; } @@ -5806,65 +5972,69 @@ yyreduce: - case 186: + case 187: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2435 "parser.y" +#line 2671 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 187: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2437 "parser.y" +#line 2673 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 188: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2438 "parser.y" +#line 2674 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(4) - (10)].params).list); + PASS1 + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); PASS2 methodinfo_t*f = state->method->info; - if(!f) syntaxerror("internal error"); + if(!f || !f->kind) syntaxerror("internal error"); - code_t*c = method_header(); + code_t*c = method_header(state->method); 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 189: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2458 "parser.y" +#line 2696 "parser.y" { - PASS1 (yyval.classinfo)=0; + PASS1 static slotinfo_t c; + memset(&c, 0, sizeof(c)); + c.name = (yyvsp[(1) - (1)].id); + (yyval.classinfo) = (classinfo_t*)&c; PASS2 - /* try current package */ slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); - if(!s) syntaxerror("Could not find class/method %s\n", (yyvsp[(1) - (1)].id)); + if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); (yyval.classinfo) = (classinfo_t*)s; } } @@ -5872,17 +6042,17 @@ yyreduce: - case 190: + case 191: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" +#line 2707 "parser.y" { - PASS1 static classinfo_t c; + PASS1 static slotinfo_t c; memset(&c, 0, sizeof(c)); c.package = (yyvsp[(1) - (3)].id); c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=&c; + (yyval.classinfo)=(classinfo_t*)&c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -5894,121 +6064,121 @@ yyreduce: - case 193: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2723 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 194: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2484 "parser.y" +#line 2724 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 195: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2486 "parser.y" +#line 2726 "parser.y" {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 196: + case 197: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2487 "parser.y" +#line 2727 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 197: + case 198: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2488 "parser.y" +#line 2728 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; - case 198: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2497 "parser.y" +#line 2737 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 199: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2498 "parser.y" +#line 2738 "parser.y" {(yyval.classinfo)=0;} } break; - case 200: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2502 "parser.y" +#line 2742 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 201: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2503 "parser.y" +#line 2743 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 202: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2505 "parser.y" +#line 2745 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 205: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2509 "parser.y" +#line 2749 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6017,22 +6187,22 @@ yyreduce: - case 206: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2513 "parser.y" +#line 2753 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 207: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2514 "parser.y" +#line 2754 "parser.y" { (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); @@ -6042,11 +6212,11 @@ yyreduce: - case 209: + case 210: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2520 "parser.y" +#line 2760 "parser.y" { (yyval.value).c = (yyvsp[(2) - (4)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); @@ -6060,7 +6230,7 @@ yyreduce: multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME multiname_t*name = t->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); @@ -6083,11 +6253,11 @@ yyreduce: - case 210: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2556 "parser.y" +#line 2796 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6103,9 +6273,9 @@ yyreduce: (yyval.value).c = code_append((yyval.value).c, paramcode); (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); multiname_destroy(name); - } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { + } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot); if(t->kind!=TRAIT_METHOD) { //ok: flash allows to assign closures to members. } @@ -6138,11 +6308,11 @@ yyreduce: - case 211: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2842 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6168,11 +6338,11 @@ yyreduce: - case 212: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2623 "parser.y" +#line 2863 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6183,7 +6353,7 @@ yyreduce: (yyval.value).c->opcode = OPCODE_DELETEPROPERTY; } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - multiname_t*name = abc_class_find_slotid(state->cls->abc,slot)->name; + multiname_t*name = traits_find_slotid(state->cls->abc->traits,slot)->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = abc_deleteproperty2((yyval.value).c, name); } else { @@ -6198,11 +6368,11 @@ yyreduce: - case 213: + case 214: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2644 "parser.y" +#line 2884 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6211,11 +6381,11 @@ yyreduce: - case 214: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2647 "parser.y" +#line 2887 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6225,33 +6395,33 @@ yyreduce: - case 215: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2654 "parser.y" +#line 2894 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 216: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2655 "parser.y" +#line 2895 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 217: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2656 "parser.y" +#line 2896 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6263,11 +6433,11 @@ yyreduce: - case 218: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2902 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6276,55 +6446,55 @@ yyreduce: - case 219: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2668 "parser.y" +#line 2908 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 221: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2672 "parser.y" +#line 2912 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "parser.y" +#line 2914 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 223: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2916 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 225: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2680 "parser.y" +#line 2920 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6346,11 +6516,11 @@ yyreduce: - case 226: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2697 "parser.y" +#line 2937 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6361,11 +6531,11 @@ yyreduce: - case 227: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 2942 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6374,11 +6544,11 @@ yyreduce: - case 228: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" +#line 2945 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6387,11 +6557,11 @@ yyreduce: - case 229: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" +#line 2948 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6400,11 +6570,11 @@ yyreduce: - case 230: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" +#line 2951 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6413,11 +6583,11 @@ yyreduce: - case 231: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2714 "parser.y" +#line 2954 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6426,11 +6596,11 @@ yyreduce: - case 232: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 2957 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6439,11 +6609,11 @@ yyreduce: - case 233: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2720 "parser.y" +#line 2960 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6452,11 +6622,11 @@ yyreduce: - case 234: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 2963 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6465,11 +6635,11 @@ yyreduce: - case 235: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 2966 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6478,11 +6648,11 @@ yyreduce: - case 236: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2730 "parser.y" +#line 2970 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6491,11 +6661,11 @@ yyreduce: - case 237: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2733 "parser.y" +#line 2973 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6504,11 +6674,11 @@ yyreduce: - case 238: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2736 "parser.y" +#line 2976 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6517,11 +6687,11 @@ yyreduce: - case 239: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2739 "parser.y" +#line 2979 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6530,11 +6700,11 @@ yyreduce: - case 240: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2742 "parser.y" +#line 2982 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6543,11 +6713,11 @@ yyreduce: - case 241: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" +#line 2985 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6556,11 +6726,11 @@ yyreduce: - case 242: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2748 "parser.y" +#line 2988 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6569,11 +6739,11 @@ yyreduce: - case 243: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2751 "parser.y" +#line 2991 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6582,11 +6752,11 @@ yyreduce: - case 244: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2755 "parser.y" +#line 2995 "parser.y" {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O'); (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); @@ -6603,11 +6773,11 @@ yyreduce: - case 245: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2766 "parser.y" +#line 3006 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6630,11 +6800,11 @@ yyreduce: - case 246: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2784 "parser.y" +#line 3024 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6644,11 +6814,11 @@ yyreduce: - case 247: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2789 "parser.y" +#line 3029 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6658,11 +6828,11 @@ yyreduce: - case 248: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2794 "parser.y" +#line 3034 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitand((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6672,11 +6842,11 @@ yyreduce: - case 249: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2799 "parser.y" +#line 3039 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitxor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6686,11 +6856,11 @@ yyreduce: - case 250: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2804 "parser.y" +#line 3044 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6700,11 +6870,11 @@ yyreduce: - case 251: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2809 "parser.y" +#line 3049 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_rshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6714,11 +6884,11 @@ yyreduce: - case 252: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2813 "parser.y" +#line 3053 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_urshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6728,11 +6898,11 @@ yyreduce: - case 253: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2817 "parser.y" +#line 3057 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_lshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6742,11 +6912,11 @@ yyreduce: - case 254: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2822 "parser.y" +#line 3062 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_divide((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6756,11 +6926,11 @@ yyreduce: - case 255: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2826 "parser.y" +#line 3066 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_modulo((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6770,11 +6940,11 @@ yyreduce: - case 256: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2830 "parser.y" +#line 3070 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_add_i((yyval.value).c); @@ -6789,11 +6959,11 @@ yyreduce: - case 257: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2839 "parser.y" +#line 3079 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_subtract_i((yyval.value).c); @@ -6808,11 +6978,11 @@ yyreduce: - case 258: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2848 "parser.y" +#line 3088 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { (yyval.value).c = abc_multiply_i((yyval.value).c); @@ -6827,11 +6997,11 @@ yyreduce: - case 259: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2858 "parser.y" +#line 3098 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_in((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6841,11 +7011,11 @@ yyreduce: - case 260: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 3103 "parser.y" {char use_astype=0; // flash player's astype works differently than astypelate if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) { MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data)); @@ -6862,11 +7032,11 @@ yyreduce: - case 261: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2876 "parser.y" +#line 3116 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_instanceof((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6876,11 +7046,11 @@ yyreduce: - case 262: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2881 "parser.y" +#line 3121 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_istypelate((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6890,11 +7060,11 @@ yyreduce: - case 263: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2886 "parser.y" +#line 3126 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6905,11 +7075,11 @@ yyreduce: - case 264: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2892 "parser.y" +#line 3132 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6920,11 +7090,11 @@ yyreduce: - case 265: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2898 "parser.y" +#line 3138 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6933,22 +7103,22 @@ yyreduce: - case 266: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2902 "parser.y" +#line 3142 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 267: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2904 "parser.y" +#line 3144 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6964,11 +7134,11 @@ yyreduce: - case 268: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2915 "parser.y" +#line 3155 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6982,11 +7152,11 @@ yyreduce: - case 269: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2924 "parser.y" +#line 3164 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -6998,33 +7168,33 @@ yyreduce: - case 270: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2931 "parser.y" +#line 3171 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; - case 271: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2932 "parser.y" +#line 3172 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 272: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2934 "parser.y" +#line 3174 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7036,11 +7206,11 @@ yyreduce: - case 273: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2940 "parser.y" +#line 3180 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -7052,11 +7222,11 @@ yyreduce: - case 274: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2949 "parser.y" +#line 3189 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7068,11 +7238,11 @@ yyreduce: - case 275: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2956 "parser.y" +#line 3196 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7089,11 +7259,11 @@ yyreduce: - case 276: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2968 "parser.y" +#line 3208 "parser.y" { code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t); @@ -7105,11 +7275,11 @@ yyreduce: - case 277: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2974 "parser.y" +#line 3214 "parser.y" { code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t); @@ -7121,11 +7291,11 @@ yyreduce: - case 278: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 3220 "parser.y" { code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t); @@ -7137,11 +7307,11 @@ yyreduce: - case 279: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2986 "parser.y" +#line 3226 "parser.y" { code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t); @@ -7153,11 +7323,11 @@ yyreduce: - case 280: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "parser.y" +#line 3232 "parser.y" { code_t*c = abc_divide((yyvsp[(3) - (3)].value).c); c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t); @@ -7169,11 +7339,11 @@ yyreduce: - case 281: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "parser.y" +#line 3238 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7185,11 +7355,27 @@ yyreduce: - case 282: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "parser.y" +#line 3244 "parser.y" + { + code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); + c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).t = (yyvsp[(1) - (3)].value).t; + } + } + break; + + + + case 284: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3250 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7208,11 +7394,11 @@ yyreduce: - case 283: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3017 "parser.y" +#line 3263 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7229,11 +7415,11 @@ yyreduce: - case 284: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3028 "parser.y" +#line 3274 "parser.y" { code_t*c = 0; c = code_append(c, (yyvsp[(3) - (3)].value).c); c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t); @@ -7245,11 +7431,11 @@ yyreduce: - case 285: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3035 "parser.y" +#line 3281 "parser.y" { (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?'); (yyval.value).c = (yyvsp[(1) - (5)].value).c; @@ -7259,7 +7445,7 @@ yyreduce: code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0); (yyval.value).c = j1->branch = abc_label((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t); + (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); (yyval.value).c = j2->branch = abc_label((yyval.value).c); } } @@ -7267,11 +7453,11 @@ yyreduce: - case 286: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "parser.y" +#line 3294 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if((is_getlocal((yyvsp[(1) - (2)].value).c) && TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { @@ -7302,11 +7488,11 @@ yyreduce: - case 287: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3075 "parser.y" +#line 3321 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7325,11 +7511,11 @@ yyreduce: - case 288: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 3335 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7348,11 +7534,11 @@ yyreduce: - case 289: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3103 "parser.y" +#line 3349 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7371,18 +7557,18 @@ yyreduce: - case 290: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3118 "parser.y" +#line 3364 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); - namespace_t ns = {f->access, ""}; + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; (yyval.value).c = abc_getlocal_0((yyval.value).c); @@ -7394,11 +7580,11 @@ yyreduce: - case 291: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3132 "parser.y" +#line 3378 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7410,11 +7596,11 @@ yyreduce: - case 292: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3139 "parser.y" +#line 3385 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7426,11 +7612,11 @@ yyreduce: - case 293: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3146 "parser.y" +#line 3392 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7442,11 +7628,11 @@ yyreduce: - case 294: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3153 "parser.y" +#line 3399 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7458,11 +7644,11 @@ yyreduce: - case 295: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3160 "parser.y" +#line 3406 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7474,11 +7660,11 @@ yyreduce: - case 296: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3172 "parser.y" +#line 3418 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -7487,7 +7673,7 @@ yyreduce: is_static = 1; } if(t) { - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); char noslot = 0; if(f && !is_static != !(f->flags&FLAG_STATIC)) noslot=1; @@ -7516,12 +7702,25 @@ yyreduce: - case 297: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "parser.y" +#line 3451 "parser.y" { + PASS1 + /* Queue unresolved identifiers for checking against the parent + function's variables. + We consider everything which is not a local variable "unresolved". + This encompasses class names, members of the surrounding class + etc. which *correct* because local variables of the parent function + would shadow those. + */ + if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { + unknown_variable((yyvsp[(1) - (1)].id)); + } + PASS2 + (yyval.value).t = 0; (yyval.value).c = 0; slotinfo_t*a = 0; @@ -7529,17 +7728,23 @@ yyreduce: variable_t*v; /* look at variables */ - if((v = find_variable((yyvsp[(1) - (1)].id)))) { + if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) { // $1 is a local variable (yyval.value).c = abc_getlocal((yyval.value).c, v->index); (yyval.value).t = v->type; break; } + if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) { + (yyval.value).c = abc_getscopeobject((yyval.value).c, 1); + (yyval.value).c = abc_getslot((yyval.value).c, v->index); + (yyval.value).t = v->type; + break; + } int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC; /* look at current class' members */ - if(state->cls && (f = registry_findmember(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && + if(state->cls && (f = registry_findmember_nsset(state->cls->info, state->active_namespaces, (yyvsp[(1) - (1)].id), 1)) && (f->flags&FLAG_STATIC) >= i_am_static) { // $1 is a function in this class int var_is_static = (f->flags&FLAG_STATIC); @@ -7625,47 +7830,68 @@ yyreduce: - case 298: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3307 "parser.y" - {(yyval.code)=0;} +#line 3572 "parser.y" + { + PASS12 + tokenizer_register_namespace((yyvsp[(2) - (2)].id)); + (yyval.id)=(yyvsp[(2) - (2)].id); +} } break; - case 299: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3308 "parser.y" - {(yyval.code)=0;} +#line 3578 "parser.y" + { + (yyval.code)=0; +} } break; - case 300: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3309 "parser.y" - {(yyval.code)=0;} +#line 3581 "parser.y" + { + (yyval.code)=0; +} } break; - case 301: + case 303: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3584 "parser.y" + { + (yyval.code)=0; +} + } + break; + + + + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3311 "parser.y" +#line 3587 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].id)); + tokenizer_register_namespace((yyvsp[(2) - (2)].classinfo)->name); (yyval.code)=0; } } @@ -7675,7 +7901,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7679 "parser.tab.c" +#line 7905 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);