X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=f4565e570d8fb525e243dbd07e64ffb653be78a5;hp=2631457f567f5700b954f64cc6fea8831ee7e108;hb=71c8242a8242eeb6e8b6dcf57239550a6f35c88a;hpb=bb864e1a88e670c99d559c7dee4f74e9bf7d978b diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 2631457..f4565e5 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -343,6 +343,7 @@ typedef struct _classstate { struct _methodstate { /* method data */ methodinfo_t*info; + char has_exceptions; char late_binding; char is_constructor; char has_super; @@ -362,6 +363,8 @@ struct _methodstate { char is_a_slot; // for inner methods code_t*header; + + code_t*scope_code; abc_exception_list_t*exceptions; methodstate_list_t*innerfunctions; @@ -375,8 +378,7 @@ typedef struct _state { import_list_t*wildcard_imports; dict_t*import_toplevel_packages; dict_t*imports; - namespace_list_t*active_namespaces; - namespace_decl_list_t*new_namespaces; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -384,6 +386,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -460,10 +464,11 @@ static void new_state() state = s; state->level++; state->has_own_imports = 0; - state->new_namespaces = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; + + trie_remember(active_namespaces); } static void state_has_imports() { @@ -510,18 +515,14 @@ static void state_destroy(state_t*state) static void old_state() { + trie_rollback(active_namespaces); + if(!state || !state->old) syntaxerror("invalid nesting"); state_t*leaving = state; state = state->old; - namespace_decl_list_t*nl=leaving->new_namespaces; - while(nl) { - tokenizer_unregister_namespace(nl->namespace_decl->name); - nl = nl->next; - } - if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -545,6 +546,9 @@ void initialize_file(char*filename) if(state) { syntaxerror("invalid call to initialize_file during parsing of another file"); } + + active_namespaces = trie_new(); + new_state(); state->package = internal_filename_package = strdup(filename); @@ -559,11 +563,11 @@ void initialize_file(char*filename) if(as3_pass==1) { state->method = rfx_calloc(sizeof(methodstate_t)); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); function_initvars(state->method, 0, 0, 1); global->init = abc_initscript(global->file); - state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } } @@ -670,6 +674,11 @@ static char variable_exists(char*name) } code_t*defaultvalue(code_t*c, classinfo_t*type); +static int alloc_local() +{ + return state->method->variable_count++; +} + static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { if(maybeslot) { @@ -679,11 +688,12 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c } NEW(variable_t, v); - v->index = state->method->variable_count++; + v->index = alloc_local(); v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); return v; } @@ -761,17 +771,27 @@ static void parsererror(const char*file, int line, const char*f) } -static code_t* method_header(methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m) { - code_t*c = 0; if(m->uses_slots || (m->late_binding && !m->inner)) { c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { + /* FIXME: does this need to be the same activation object as + in the function header? */ c = abc_newactivation(c); c = abc_pushscope(c); } + return c; +} + +static code_t* method_header(methodstate_t*m) +{ + code_t*c = 0; + + c = add_scope_code(c, m); + methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); @@ -847,7 +867,14 @@ static namespace_t modifiers2access(modifiers_t*mod) 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; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + syntaxerror("unknown namespace: %s", mod->ns); + } + ns.name = url; } else if(mod->flags&FLAG_PUBLIC) { if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); @@ -867,6 +894,12 @@ static namespace_t modifiers2access(modifiers_t*mod) } static slotinfo_t* find_class(const char*name); +memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + /* FIXME- we need to loop through namespaces here */ + return registry_findmember(cls, "", name, recurse); +} + static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { if(var0) { @@ -881,23 +914,13 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char *(int*)0=0; parserassert(!index); } + if(m->uses_slots) { /* as variables and slots share the same number, make sure that those variable indices are reserved. It's up to the optimizer to later shuffle the variables down to lower indices */ m->variable_count = m->uses_slots; - DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { - if(v->type) { - if(v->type->package) - v->type = (classinfo_t*)registry_find(v->type->package, v->type->name); - else - v->type = (classinfo_t*)find_class(v->type->name); - if(!v->type || v->type->kind != INFOTYPE_CLASS) { - syntaxerror("Couldn't find class %s", v->type->name); - } - } - } } if(params) { @@ -906,16 +929,35 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char new_variable(p->param->name, p->param->type, 0, 1); } } + + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m); + } + methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); m->var_index = v->index; m->slot_index = v->index; v->is_inner_method = m; + l = l->next; } + + if(as3_pass==2 && m->slots) { + /* exchange unresolved identifiers with the actual objects */ + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { + v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!v->type || v->type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s", v->type->name); + } + } + } + } } @@ -936,6 +978,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + //if(!(mod->flags&FLAG_INTERFACE) && !extends) { if(!(mod->flags&FLAG_INTERFACE) && !extends) { // all classes extend object extends = registry_getobjectclass(); @@ -976,6 +1019,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + + int pos = 0; + classinfo_list_t*l = implements; + for(l=implements;l;l=l->next) { + state->cls->info->interfaces[pos++] = l->classinfo; + } } if(as3_pass == 2) { @@ -989,16 +1038,17 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); + + int pos = 0; + while(state->cls->info->interfaces[pos]) { + if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE)) + syntaxerror("'%s' is not an interface", + state->cls->info->interfaces[pos]->name); + pos++; + } /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ state->cls->info->superclass = extends; - int pos = 0; - classinfo_list_t*l = implements; - for(l=implements;l;l=l->next) { - if(!(l->classinfo->flags & FLAG_INTERFACE)) - syntaxerror("'%s' is not an interface", l->classinfo->name); - state->cls->info->interfaces[pos++] = l->classinfo; - } /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); @@ -1149,6 +1199,7 @@ void check_code_for_break(code_t*c) static void check_constant_against_type(classinfo_t*t, constant_t*c) { + return; #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) if(TYPE_IS_NUMBER(t)) { xassert(c->type == CONSTANT_FLOAT @@ -1359,8 +1410,6 @@ static void startfunction(modifiers_t*mod, 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); @@ -1400,6 +1449,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* state->method->slots = dict_new(); int i = 1; DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) { + if(!name) syntaxerror("internal error"); if(v->index && dict_contains(xvars, name)) { v->init = 0; v->index = i++; @@ -1432,10 +1482,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; + namespace_t mname_ns = modifiers2access(mod); multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) + if(mod->flags&FLAG_STATIC) f = abc_class_staticmethod(state->cls->abc, type2, &mname); else f = abc_class_method(state->cls->abc, type2, &mname); @@ -1451,7 +1501,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* //flash doesn't seem to allow us to access function slots //state->method->info->slot = slot; - if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; + if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; if(getset == KW_GET) f->trait->kind = TRAIT_GETTER; if(getset == KW_SET) f->trait->kind = TRAIT_SETTER; if(params->varargs) f->flags |= METHOD_NEED_REST; @@ -1484,11 +1534,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* check_code_for_break(body); - if(state->method->exceptions && - (state->method->late_binding || state->method->uses_slots)) { - //syntaxerror("try/catch and activation or late binding not supported yet within the same method"); - as3_warning("try/catch and activation or late binding not supported yet within the same method"); - } + /* Seems this works now. + if(state->method->exceptions && state->method->uses_slots) { + as3_warning("try/catch and activation not supported yet within the same method"); + }*/ if(f->body) { f->body->code = body; @@ -1636,6 +1685,36 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } +static const char* get_package_from_name(const char*name) +{ + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1896,7 +1975,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -2004,10 +2082,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) int lookup_version_cost = 4*num_insertion_points + 5; if(cantdup || simple_version_cost > lookup_version_cost) { - printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost); + //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_lookup(c, finally, tempvar); } else { - printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost); + //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_simple(c, finally, tempvar); } } @@ -2021,7 +2099,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 2025 "parser.tab.c" +#line 2103 "parser.tab.c" #ifdef short # undef short @@ -2234,18 +2312,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 145 +#define YYFINAL 147 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2999 +#define YYLAST 3001 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 113 +#define YYNNTS 114 /* YYNRULES -- Number of rules. */ -#define YYNRULES 307 +#define YYNRULES 309 /* YYNRULES -- Number of states. */ -#define YYNSTATES 519 +#define YYNSTATES 521 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -2311,160 +2389,160 @@ static const yytype_uint16 yyprhs[] = 164, 168, 170, 173, 177, 186, 193, 194, 201, 202, 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, 233, 238, 242, 243, 252, 253, 263, 264, 270, 272, - 275, 277, 280, 282, 283, 290, 293, 295, 301, 303, - 305, 309, 311, 312, 319, 320, 326, 329, 334, 335, - 337, 339, 342, 344, 346, 348, 350, 352, 354, 356, - 358, 360, 362, 363, 366, 367, 370, 371, 374, 375, - 385, 386, 395, 396, 398, 400, 403, 405, 410, 412, - 414, 416, 417, 419, 421, 424, 426, 429, 438, 440, - 442, 443, 448, 450, 454, 458, 459, 462, 464, 466, - 468, 470, 472, 474, 476, 478, 480, 481, 483, 486, - 491, 495, 497, 502, 505, 507, 509, 510, 511, 524, - 526, 527, 528, 539, 541, 545, 547, 549, 551, 555, - 557, 559, 561, 564, 565, 566, 570, 571, 573, 575, - 577, 580, 583, 584, 589, 594, 599, 602, 604, 607, - 609, 611, 615, 617, 619, 621, 623, 625, 627, 629, + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 619, 621, 623, 625, 627, 629, 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, - 651, 655, 659, 663, 667, 671, 675, 679, 683, 687, - 691, 694, 697, 701, 705, 709, 713, 717, 721, 725, - 729, 733, 737, 741, 745, 749, 753, 757, 762, 765, - 767, 771, 774, 779, 783, 784, 786, 790, 796, 800, - 804, 808, 812, 816, 820, 824, 828, 832, 836, 840, - 844, 850, 853, 856, 859, 862, 866, 869, 874, 880, - 884, 890, 894, 896, 899, 904, 909, 912 + 651, 653, 655, 659, 663, 667, 671, 675, 679, 683, + 687, 691, 695, 698, 701, 705, 709, 713, 717, 721, + 725, 729, 733, 737, 741, 745, 749, 753, 757, 761, + 766, 769, 771, 775, 778, 783, 787, 788, 790, 794, + 800, 804, 808, 812, 816, 820, 824, 828, 832, 836, + 840, 844, 848, 854, 857, 860, 863, 866, 870, 873, + 878, 884, 888, 894, 898, 900, 903, 908, 913, 916 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 185, -1, 197, -1, 195, -1, 216, - -1, 206, -1, 147, -1, 148, 126, 136, 132, -1, + 137, 138, -1, 186, -1, 198, -1, 196, -1, 217, + -1, 207, -1, 147, -1, 148, 126, 136, 132, -1, 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 197, -1, 195, -1, 216, -1, 206, -1, 147, -1, + 198, -1, 196, -1, 217, -1, 207, -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, 238, -1, 246, -1, 245, -1, 126, + 143, 145, -1, 145, -1, 189, -1, 159, -1, 160, + -1, 161, -1, 163, -1, 171, -1, 154, -1, 183, + -1, 179, -1, 239, -1, 247, -1, 246, -1, 126, 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, - 150, -1, 165, -1, 166, -1, 235, -1, 181, -1, + 150, -1, 165, -1, 166, -1, 236, -1, 181, -1, 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 236, -1, -1, + 144, -1, 3, 89, 3, -1, 102, 237, -1, -1, 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 226, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 237, 133, 146, 153, -1, -1, - 150, -1, 238, -1, 46, 3, 226, -1, 3, -1, + 152, -1, 3, 227, 149, -1, -1, 65, 146, -1, + -1, 64, 122, 155, 238, 133, 146, 153, -1, -1, + 150, -1, 239, -1, 46, 3, 227, -1, 3, -1, 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 237, 99, 238, 133, 146, -1, 158, 157, 68, 237, - 133, 146, -1, -1, 14, 122, 162, 237, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 237, 133, -1, + 238, 99, 239, 133, 146, -1, 158, 157, 68, 238, + 133, 146, -1, -1, 14, 122, 162, 238, 133, 146, + -1, -1, 15, 164, 146, 14, 122, 238, 133, -1, 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 239, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 239, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 226, 133, 174, 126, + 168, 169, -1, 34, 240, 105, 142, -1, 62, 105, + 142, -1, -1, 16, 122, 172, 240, 133, 126, 167, + 132, -1, -1, 33, 122, 3, 227, 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, 237, -1, 37, -1, 39, 122, 237, 133, 146, - -1, 3, -1, 19, -1, 184, 127, 183, -1, 183, - -1, -1, 19, 184, 126, 186, 139, 132, -1, -1, - 19, 126, 187, 139, 132, -1, 41, 222, -1, 41, - 184, 127, 115, -1, -1, 190, -1, 191, -1, 190, - 191, -1, 21, -1, 22, -1, 20, -1, 38, -1, - 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 223, -1, -1, 54, 224, -1, - -1, 17, 224, -1, -1, 189, 31, 3, 192, 194, - 126, 196, 199, 132, -1, -1, 189, 44, 3, 193, - 126, 198, 202, 132, -1, -1, 200, -1, 201, -1, - 200, 201, -1, 99, -1, 148, 126, 199, 132, -1, - 206, -1, 216, -1, 144, -1, -1, 203, -1, 204, - -1, 203, 204, -1, 99, -1, 46, 3, -1, 189, - 27, 215, 3, 122, 212, 133, 226, -1, 46, -1, - 32, -1, -1, 189, 205, 207, 208, -1, 209, -1, - 208, 100, 209, -1, 3, 226, 149, -1, -1, 102, - 211, -1, 10, -1, 8, -1, 9, -1, 12, -1, - 5, -1, 56, -1, 55, -1, 45, -1, 3, -1, - -1, 213, -1, 93, 214, -1, 213, 100, 93, 214, - -1, 213, 100, 214, -1, 214, -1, 3, 105, 225, - 210, -1, 3, 210, -1, 51, -1, 35, -1, -1, - -1, 189, 27, 215, 3, 122, 212, 133, 226, 126, - 217, 142, 132, -1, 3, -1, -1, -1, 27, 218, - 122, 212, 133, 226, 126, 220, 142, 132, -1, 3, - -1, 184, 127, 3, -1, 222, -1, 221, -1, 223, - -1, 224, 100, 223, -1, 223, -1, 115, -1, 36, - -1, 105, 225, -1, -1, -1, 122, 228, 133, -1, - -1, 229, -1, 230, -1, 236, -1, 229, 100, -1, - 230, 236, -1, -1, 25, 239, 231, 227, -1, 239, - 122, 228, 133, -1, 53, 122, 228, 133, -1, 63, - 239, -1, 42, -1, 42, 237, -1, 239, -1, 239, - -1, 237, 100, 239, -1, 237, -1, 219, -1, 240, - -1, 243, -1, 232, -1, 234, -1, 233, -1, 6, - -1, 10, -1, 11, -1, 8, -1, 9, -1, 12, - -1, 5, -1, 29, -1, 56, -1, 55, -1, 45, - -1, 239, 109, 239, -1, 239, 110, 239, -1, 239, - 75, 239, -1, 239, 76, 239, -1, 239, 71, 239, - -1, 239, 72, 239, -1, 239, 74, 239, -1, 239, - 73, 239, -1, 239, 87, 239, -1, 239, 88, 239, - -1, 118, 239, -1, 117, 239, -1, 239, 108, 239, - -1, 239, 107, 239, -1, 239, 106, 239, -1, 239, - 96, 239, -1, 239, 95, 239, -1, 239, 94, 239, - -1, 239, 114, 239, -1, 239, 116, 239, -1, 239, - 113, 239, -1, 239, 112, 239, -1, 239, 115, 239, - -1, 239, 68, 239, -1, 239, 69, 239, -1, 239, - 40, 239, -1, 239, 67, 239, -1, 43, 122, 239, - 133, -1, 36, 239, -1, 36, -1, 122, 237, 133, - -1, 112, 239, -1, 239, 124, 239, 125, -1, 124, - 228, 125, -1, -1, 242, -1, 236, 105, 236, -1, - 242, 100, 236, 105, 236, -1, 70, 241, 132, -1, - 239, 80, 239, -1, 239, 79, 239, -1, 239, 85, - 239, -1, 239, 84, 239, -1, 239, 86, 239, -1, - 239, 78, 239, -1, 239, 77, 239, -1, 239, 83, - 239, -1, 239, 81, 239, -1, 239, 82, 239, -1, - 239, 102, 239, -1, 239, 104, 239, 105, 239, -1, - 239, 91, -1, 239, 90, -1, 91, 239, -1, 90, - 239, -1, 53, 127, 3, -1, 128, 3, -1, 239, - 127, 128, 3, -1, 239, 127, 3, 89, 3, -1, - 239, 92, 3, -1, 239, 127, 122, 239, 133, -1, - 239, 127, 3, -1, 3, -1, 18, 3, -1, 18, - 3, 102, 3, -1, 18, 3, 102, 5, -1, 189, - 244, -1, 23, 18, 223, -1 + 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, + 182, 146, -1, 3, -1, 19, -1, 4, -1, 185, + 127, 184, -1, 184, -1, -1, 19, 185, 126, 187, + 139, 132, -1, -1, 19, 126, 188, 139, 132, -1, + 41, 223, -1, 41, 185, 127, 115, -1, -1, 191, + -1, 192, -1, 191, 192, -1, 21, -1, 22, -1, + 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, + 26, -1, 24, -1, 4, -1, -1, 54, 224, -1, + -1, 54, 225, -1, -1, 17, 225, -1, -1, 190, + 31, 3, 193, 195, 126, 197, 200, 132, -1, -1, + 190, 44, 3, 194, 126, 199, 203, 132, -1, -1, + 201, -1, 202, -1, 201, 202, -1, 99, -1, 148, + 126, 200, 132, -1, 207, -1, 217, -1, 144, -1, + -1, 204, -1, 205, -1, 204, 205, -1, 99, -1, + 46, 3, -1, 190, 27, 216, 3, 122, 213, 133, + 227, -1, 46, -1, 32, -1, -1, 190, 206, 208, + 209, -1, 210, -1, 209, 100, 210, -1, 3, 227, + 149, -1, -1, 102, 212, -1, 10, -1, 8, -1, + 9, -1, 12, -1, 5, -1, 56, -1, 55, -1, + 45, -1, 3, -1, -1, 214, -1, 93, 215, -1, + 214, 100, 93, 215, -1, 214, 100, 215, -1, 215, + -1, 3, 105, 226, 211, -1, 3, 211, -1, 51, + -1, 35, -1, -1, -1, 190, 27, 216, 3, 122, + 213, 133, 227, 126, 218, 142, 132, -1, 3, -1, + -1, -1, 27, 219, 122, 213, 133, 227, 126, 221, + 142, 132, -1, 184, -1, 185, 127, 184, -1, 223, + -1, 222, -1, 224, -1, 225, 100, 224, -1, 224, + -1, 115, -1, 36, -1, 105, 226, -1, -1, -1, + 122, 229, 133, -1, -1, 230, -1, 231, -1, 237, + -1, 230, 100, -1, 231, 237, -1, -1, 25, 240, + 232, 228, -1, 240, 122, 229, 133, -1, 53, 122, + 229, 133, -1, 63, 240, -1, 42, -1, 42, 238, + -1, 240, -1, 240, -1, 238, 100, 240, -1, 238, + -1, 220, -1, 241, -1, 244, -1, 233, -1, 235, + -1, 234, -1, 6, -1, 10, -1, 11, -1, 8, + -1, 9, -1, 12, -1, 5, -1, 29, -1, 56, + -1, 55, -1, 45, -1, 240, 109, 240, -1, 240, + 110, 240, -1, 240, 75, 240, -1, 240, 76, 240, + -1, 240, 71, 240, -1, 240, 72, 240, -1, 240, + 74, 240, -1, 240, 73, 240, -1, 240, 87, 240, + -1, 240, 88, 240, -1, 118, 240, -1, 117, 240, + -1, 240, 108, 240, -1, 240, 107, 240, -1, 240, + 106, 240, -1, 240, 96, 240, -1, 240, 95, 240, + -1, 240, 94, 240, -1, 240, 114, 240, -1, 240, + 116, 240, -1, 240, 113, 240, -1, 240, 112, 240, + -1, 240, 115, 240, -1, 240, 68, 240, -1, 240, + 69, 240, -1, 240, 40, 240, -1, 240, 67, 240, + -1, 43, 122, 240, 133, -1, 36, 240, -1, 36, + -1, 122, 238, 133, -1, 112, 240, -1, 240, 124, + 240, 125, -1, 124, 229, 125, -1, -1, 243, -1, + 237, 105, 237, -1, 243, 100, 237, 105, 237, -1, + 70, 242, 132, -1, 240, 80, 240, -1, 240, 79, + 240, -1, 240, 85, 240, -1, 240, 84, 240, -1, + 240, 86, 240, -1, 240, 78, 240, -1, 240, 77, + 240, -1, 240, 83, 240, -1, 240, 81, 240, -1, + 240, 82, 240, -1, 240, 102, 240, -1, 240, 104, + 240, 105, 240, -1, 240, 91, -1, 240, 90, -1, + 91, 240, -1, 90, 240, -1, 53, 127, 3, -1, + 128, 3, -1, 240, 127, 128, 3, -1, 240, 127, + 3, 89, 3, -1, 240, 92, 3, -1, 240, 127, + 122, 240, 133, -1, 240, 127, 3, -1, 3, -1, + 18, 3, -1, 18, 3, 102, 3, -1, 18, 3, + 102, 5, -1, 190, 245, -1, 23, 18, 224, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 2003, 2003, 2005, 2005, 2006, 2007, 2009, 2010, 2011, - 2012, 2013, 2014, 2015, 2016, 2018, 2018, 2019, 2020, 2022, - 2023, 2024, 2025, 2026, 2027, 2028, 2030, 2031, 2033, 2034, - 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, - 2047, 2048, 2049, 2050, 2053, 2054, 2055, 2056, 2057, 2058, - 2059, 2060, 2064, 2065, 2069, 2076, 2080, 2081, 2085, 2086, - 2088, 2089, 2091, 2152, 2153, 2156, 2156, 2175, 2176, 2177, - 2182, 2186, 2191, 2192, 2194, 2214, 2262, 2262, 2281, 2281, - 2296, 2299, 2302, 2305, 2309, 2310, 2311, 2312, 2313, 2314, - 2316, 2327, 2330, 2330, 2359, 2359, 2383, 2383, 2399, 2400, - 2401, 2402, 2410, 2419, 2419, 2464, 2468, 2479, 2488, 2489, - 2491, 2492, 2494, 2494, 2496, 2496, 2499, 2515, 2532, 2533, - 2534, 2535, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, - 2551, 2552, 2556, 2557, 2559, 2560, 2562, 2563, 2567, 2565, - 2573, 2571, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, - 2589, 2595, 2596, 2597, 2598, 2599, 2600, 2603, 2616, 2616, - 2618, 2618, 2620, 2621, 2623, 2698, 2699, 2701, 2702, 2703, - 2704, 2705, 2707, 2708, 2709, 2710, 2722, 2726, 2732, 2738, - 2746, 2751, 2757, 2765, 2773, 2774, 2775, 2778, 2777, 2794, - 2795, 2797, 2796, 2820, 2836, 2851, 2852, 2854, 2855, 2857, - 2858, 2859, 2868, 2869, 2873, 2874, 2876, 2877, 2878, 2880, - 2884, 2885, 2890, 2891, 2927, 2973, 2994, 3015, 3018, 3025, - 3026, 3027, 3033, 3039, 3041, 3043, 3045, 3047, 3049, 3051, - 3068, 3073, 3076, 3079, 3082, 3085, 3088, 3091, 3094, 3097, - 3101, 3104, 3107, 3110, 3113, 3116, 3119, 3122, 3126, 3137, - 3155, 3160, 3165, 3170, 3175, 3180, 3184, 3188, 3193, 3197, - 3201, 3210, 3219, 3229, 3234, 3246, 3252, 3257, 3263, 3269, - 3273, 3275, 3286, 3295, 3302, 3303, 3305, 3311, 3320, 3327, - 3339, 3345, 3351, 3357, 3363, 3369, 3375, 3381, 3394, 3405, - 3412, 3425, 3452, 3466, 3480, 3494, 3509, 3516, 3523, 3530, - 3537, 3548, 3598, 3703, 3710, 3717, 3724, 3731 + 0, 2081, 2081, 2083, 2083, 2084, 2085, 2087, 2088, 2089, + 2090, 2091, 2092, 2093, 2094, 2096, 2096, 2097, 2098, 2100, + 2101, 2102, 2103, 2104, 2105, 2106, 2108, 2109, 2111, 2112, + 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, + 2125, 2126, 2127, 2128, 2131, 2132, 2133, 2134, 2135, 2136, + 2137, 2138, 2142, 2143, 2147, 2154, 2158, 2159, 2163, 2164, + 2166, 2167, 2169, 2230, 2231, 2234, 2234, 2253, 2254, 2255, + 2260, 2264, 2269, 2270, 2272, 2292, 2340, 2340, 2359, 2359, + 2374, 2377, 2380, 2383, 2387, 2388, 2389, 2390, 2391, 2392, + 2394, 2405, 2408, 2408, 2439, 2439, 2464, 2464, 2480, 2481, + 2482, 2483, 2491, 2500, 2500, 2549, 2553, 2564, 2574, 2591, + 2592, 2593, 2595, 2596, 2598, 2598, 2600, 2600, 2603, 2619, + 2636, 2637, 2638, 2639, 2646, 2647, 2648, 2649, 2650, 2651, + 2652, 2653, 2654, 2655, 2659, 2660, 2662, 2663, 2665, 2666, + 2670, 2668, 2676, 2674, 2683, 2684, 2685, 2686, 2687, 2688, + 2689, 2690, 2692, 2698, 2699, 2700, 2701, 2702, 2703, 2706, + 2719, 2719, 2721, 2721, 2723, 2724, 2726, 2801, 2802, 2804, + 2805, 2806, 2807, 2808, 2810, 2811, 2812, 2813, 2825, 2829, + 2835, 2841, 2849, 2854, 2860, 2868, 2876, 2877, 2878, 2881, + 2880, 2897, 2898, 2900, 2899, 2923, 2942, 2956, 2957, 2959, + 2960, 2962, 2963, 2964, 2973, 2974, 2978, 2979, 2981, 2982, + 2983, 2985, 2989, 2990, 2995, 2996, 3032, 3078, 3099, 3120, + 3123, 3130, 3131, 3132, 3138, 3144, 3146, 3148, 3150, 3152, + 3154, 3156, 3173, 3178, 3181, 3184, 3187, 3190, 3193, 3196, + 3199, 3202, 3206, 3209, 3212, 3215, 3218, 3221, 3224, 3227, + 3231, 3242, 3260, 3265, 3270, 3275, 3280, 3285, 3289, 3293, + 3298, 3302, 3306, 3315, 3324, 3334, 3339, 3351, 3357, 3362, + 3368, 3374, 3378, 3380, 3391, 3400, 3407, 3408, 3410, 3416, + 3425, 3432, 3444, 3450, 3456, 3462, 3468, 3474, 3480, 3486, + 3499, 3510, 3517, 3530, 3557, 3571, 3585, 3599, 3614, 3621, + 3628, 3635, 3642, 3653, 3703, 3808, 3815, 3822, 3829, 3844 }; #endif @@ -2505,9 +2583,9 @@ static const char *const yytname[] = "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6", - "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH", - "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", - "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", + "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH_HEAD", + "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", + "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", @@ -2559,27 +2637,27 @@ static const yytype_uint8 yyr1[] = 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, 210, 210, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 212, 212, 212, 212, - 213, 213, 214, 214, 215, 215, 215, 217, 216, 218, - 218, 220, 219, 221, 222, 223, 223, 224, 224, 225, - 225, 225, 226, 226, 227, 227, 228, 228, 228, 229, - 230, 229, 231, 232, 233, 233, 234, 235, 235, 236, - 237, 237, 238, 239, 239, 239, 239, 239, 239, 239, + 178, 178, 178, 180, 179, 181, 181, 182, 183, 184, + 184, 184, 185, 185, 187, 186, 188, 186, 189, 189, + 190, 190, 191, 191, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 193, 193, 194, 194, 195, 195, + 197, 196, 199, 198, 200, 200, 201, 201, 202, 202, + 202, 202, 202, 203, 203, 204, 204, 205, 205, 205, + 206, 206, 208, 207, 209, 209, 210, 211, 211, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, + 213, 213, 214, 214, 215, 215, 216, 216, 216, 218, + 217, 219, 219, 221, 220, 222, 223, 224, 224, 225, + 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 231, 230, 232, 233, 234, 234, 235, 236, + 236, 237, 238, 238, 239, 240, 240, 240, 240, 240, + 240, 240, 241, 241, 241, 241, 241, 241, 241, 241, + 241, 241, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 241, 241, 242, 242, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 243, 244, 244, 244, 245, 246 + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 242, 242, 243, 243, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 244, 245, 245, 245, 246, 247 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2595,27 +2673,27 @@ static const yytype_uint8 yyr2[] = 3, 1, 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, 4, 3, 0, 8, 0, 9, 0, 5, 1, 2, - 1, 2, 1, 0, 6, 2, 1, 5, 1, 1, - 3, 1, 0, 6, 0, 5, 2, 4, 0, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2, 0, 2, 0, 2, 0, 9, - 0, 8, 0, 1, 1, 2, 1, 4, 1, 1, - 1, 0, 1, 1, 2, 1, 2, 8, 1, 1, - 0, 4, 1, 3, 3, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, 2, 4, - 3, 1, 4, 2, 1, 1, 0, 0, 12, 1, - 0, 0, 10, 1, 3, 1, 1, 1, 3, 1, - 1, 1, 2, 0, 0, 3, 0, 1, 1, 1, - 2, 2, 0, 4, 4, 4, 2, 1, 2, 1, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 0, 6, 2, 1, 4, 2, 1, + 1, 1, 3, 1, 0, 6, 0, 5, 2, 4, + 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 0, 9, 0, 8, 0, 1, 1, 2, 1, 4, + 1, 1, 1, 0, 1, 1, 2, 1, 2, 8, + 1, 1, 0, 4, 1, 3, 3, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 2, 4, 3, 1, 4, 2, 1, 1, 0, 0, + 12, 1, 0, 0, 10, 1, 3, 1, 1, 1, + 3, 1, 1, 1, 2, 0, 0, 3, 0, 1, + 1, 1, 2, 2, 0, 4, 4, 4, 2, 1, + 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 2, 1, 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 4, 2, 1, - 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 5, 2, 2, 2, 2, 3, 2, 4, 5, 3, - 5, 3, 1, 2, 4, 4, 2, 3 + 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, + 5, 3, 5, 3, 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2623,657 +2701,544 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 302, 131, 235, 229, 232, 233, 230, 231, 234, - 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 190, 236, 269, 125, 0, 0, 0, 239, - 126, 128, 127, 0, 0, 238, 237, 0, 0, 274, - 0, 0, 14, 0, 0, 0, 0, 206, 118, 0, - 0, 2, 118, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 37, 7, 30, 0, 119, - 120, 9, 8, 11, 10, 223, 226, 228, 227, 222, - 39, 220, 224, 225, 41, 40, 0, 0, 72, 76, - 118, 92, 108, 109, 114, 111, 0, 0, 302, 212, - 189, 0, 268, 0, 0, 116, 0, 103, 206, 0, - 216, 65, 0, 219, 0, 275, 294, 293, 271, 251, - 250, 0, 0, 207, 208, 209, 82, 0, 106, 217, - 0, 80, 44, 43, 118, 45, 29, 0, 46, 47, - 48, 50, 0, 49, 296, 1, 6, 118, 302, 0, - 68, 0, 0, 69, 0, 186, 0, 159, 0, 158, - 160, 306, 121, 0, 0, 0, 0, 0, 0, 0, + 120, 304, 133, 237, 231, 234, 235, 232, 233, 236, + 0, 0, 78, 0, 0, 126, 124, 125, 0, 132, + 0, 131, 192, 238, 271, 127, 0, 0, 0, 241, + 128, 130, 129, 0, 0, 240, 239, 0, 0, 276, + 0, 0, 14, 0, 0, 0, 0, 208, 120, 0, + 0, 2, 120, 5, 54, 12, 0, 36, 67, 31, + 32, 33, 34, 35, 38, 120, 37, 7, 30, 0, + 121, 122, 9, 8, 11, 10, 225, 228, 230, 229, + 224, 39, 222, 226, 227, 41, 40, 0, 0, 72, + 76, 120, 92, 109, 111, 110, 116, 113, 0, 0, + 304, 214, 191, 0, 270, 0, 0, 118, 0, 103, + 208, 0, 218, 65, 0, 221, 0, 277, 296, 295, + 273, 253, 252, 0, 0, 209, 210, 211, 82, 0, + 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, + 46, 47, 48, 50, 0, 49, 298, 1, 6, 120, + 304, 0, 68, 0, 0, 69, 53, 108, 0, 188, + 0, 161, 0, 160, 162, 308, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 292, 291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 206, 0, 0, 55, 73, 0, - 53, 0, 0, 118, 112, 0, 193, 0, 196, 195, - 307, 204, 176, 0, 0, 0, 27, 0, 295, 0, - 0, 278, 0, 270, 273, 210, 211, 83, 203, 59, - 60, 105, 218, 58, 81, 42, 28, 118, 0, 203, - 0, 0, 303, 185, 184, 0, 132, 134, 0, 221, - 265, 266, 263, 264, 244, 245, 247, 246, 242, 243, - 285, 284, 280, 279, 287, 288, 286, 282, 281, 283, - 248, 249, 299, 257, 256, 255, 289, 0, 254, 253, - 252, 240, 241, 261, 260, 258, 262, 259, 0, 0, - 301, 0, 0, 0, 52, 0, 0, 25, 0, 118, - 17, 23, 0, 20, 19, 22, 21, 118, 110, 0, - 206, 213, 165, 0, 0, 177, 181, 118, 194, 117, - 267, 0, 26, 215, 0, 276, 0, 0, 57, 0, - 118, 13, 57, 0, 0, 0, 0, 0, 136, 0, - 0, 203, 161, 162, 0, 214, 272, 0, 0, 297, - 118, 0, 0, 115, 18, 118, 0, 0, 0, 0, - 183, 178, 203, 0, 107, 0, 118, 0, 201, 200, - 199, 202, 0, 62, 61, 51, 0, 118, 304, 305, - 176, 133, 0, 0, 197, 135, 140, 57, 0, 290, - 298, 300, 77, 0, 84, 0, 113, 205, 175, 171, - 168, 169, 167, 170, 174, 173, 172, 166, 165, 0, - 0, 180, 0, 0, 98, 102, 100, 104, 63, 277, - 56, 0, 75, 0, 137, 138, 0, 118, 164, 163, - 79, 0, 0, 0, 85, 88, 86, 24, 182, 191, - 179, 96, 0, 99, 101, 118, 66, 118, 203, 118, - 198, 0, 155, 0, 0, 118, 153, 0, 27, 93, - 89, 87, 27, 27, 203, 64, 74, 0, 146, 150, - 0, 0, 0, 118, 144, 148, 149, 156, 186, 141, - 154, 27, 91, 0, 0, 0, 187, 118, 139, 145, - 0, 90, 192, 97, 94, 27, 0, 0, 0, 0, - 147, 176, 27, 188, 0, 0, 203, 95, 157 + 294, 293, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 208, 0, + 0, 55, 73, 0, 0, 0, 120, 114, 0, 195, + 0, 198, 197, 309, 206, 178, 0, 0, 0, 27, + 0, 297, 0, 0, 280, 0, 272, 275, 212, 213, + 83, 205, 59, 60, 105, 220, 58, 81, 42, 28, + 120, 0, 205, 0, 0, 52, 305, 187, 186, 0, + 134, 136, 0, 223, 267, 268, 265, 266, 246, 247, + 249, 248, 244, 245, 287, 286, 282, 281, 289, 290, + 288, 284, 283, 285, 250, 251, 301, 259, 258, 257, + 291, 0, 256, 255, 254, 242, 243, 263, 262, 260, + 264, 261, 0, 0, 303, 0, 0, 0, 0, 0, + 25, 0, 120, 17, 23, 0, 20, 19, 22, 21, + 120, 112, 0, 208, 215, 167, 0, 0, 179, 183, + 107, 119, 196, 269, 0, 26, 217, 0, 278, 0, + 0, 57, 0, 120, 13, 57, 0, 0, 0, 0, + 0, 138, 0, 0, 205, 163, 164, 0, 216, 274, + 0, 0, 299, 120, 0, 0, 117, 18, 120, 0, + 0, 0, 0, 185, 180, 205, 0, 0, 120, 0, + 203, 202, 201, 204, 0, 62, 61, 51, 0, 120, + 306, 307, 178, 135, 0, 0, 199, 137, 142, 57, + 0, 292, 300, 302, 77, 0, 84, 0, 115, 207, + 177, 173, 170, 171, 169, 172, 176, 175, 174, 168, + 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, + 63, 279, 56, 0, 75, 0, 139, 140, 0, 120, + 166, 165, 79, 0, 0, 0, 85, 88, 86, 24, + 184, 193, 181, 96, 0, 99, 101, 120, 66, 120, + 205, 120, 200, 0, 157, 0, 0, 120, 155, 0, + 27, 93, 89, 87, 27, 27, 205, 64, 74, 0, + 148, 152, 0, 0, 0, 120, 146, 150, 151, 158, + 188, 143, 156, 27, 91, 0, 0, 0, 189, 120, + 141, 147, 0, 90, 194, 97, 94, 27, 0, 0, + 0, 0, 149, 178, 27, 190, 0, 0, 205, 95, + 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 308, 309, 310, 331, 332, - 135, 136, 211, 311, 137, 383, 138, 243, 240, 456, - 57, 229, 151, 152, 58, 59, 60, 61, 209, 62, - 90, 139, 140, 443, 444, 445, 446, 63, 212, 424, - 508, 425, 473, 426, 427, 64, 226, 141, 65, 95, - 217, 66, 317, 213, 67, 142, 69, 70, 348, 350, - 393, 313, 459, 314, 437, 482, 483, 484, 464, 465, - 466, 160, 315, 258, 352, 353, 370, 417, 324, 325, - 326, 255, 316, 505, 101, 75, 472, 218, 219, 380, - 395, 381, 338, 321, 122, 123, 124, 221, 76, 77, - 78, 143, 125, 79, 80, 81, 82, 114, 115, 83, - 161, 84, 85 + -1, 50, 51, 52, 53, 311, 312, 313, 334, 335, + 137, 138, 157, 314, 139, 385, 140, 246, 243, 458, + 57, 232, 153, 154, 58, 59, 60, 61, 213, 62, + 91, 141, 142, 445, 446, 447, 448, 63, 215, 426, + 510, 427, 475, 428, 429, 64, 229, 143, 65, 66, + 219, 220, 67, 320, 216, 68, 144, 70, 71, 351, + 353, 395, 316, 461, 317, 439, 484, 485, 486, 466, + 467, 468, 164, 318, 262, 355, 356, 373, 419, 327, + 328, 329, 259, 319, 507, 103, 76, 474, 221, 222, + 382, 397, 383, 341, 324, 124, 125, 126, 224, 77, + 78, 79, 145, 127, 80, 81, 82, 83, 116, 117, + 84, 165, 85, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -386 +#define YYPACT_NINF -403 static const yytype_int16 yypact[] = { - 1672, -68, -386, -386, -386, -386, -386, -386, -386, -386, - -31, -80, -386, -72, 15, -386, -386, -386, 59, -386, - 2092, -386, 86, -386, 2162, -386, 6, 45, 11, -386, - -386, -386, -386, -12, -43, -386, -386, 2092, 13, 2092, - 2092, 2092, -386, 2092, 2092, 2092, 2092, 2092, 632, 136, - 143, -386, 502, -386, -386, -386, 26, -386, 2022, -386, - -386, -386, -386, -386, -386, -386, -386, -386, 312, 405, - -386, -386, -386, -386, -386, -386, -386, -386, -386, 80, - -386, 2567, -386, -386, -386, -386, 198, 84, -386, -386, - 1924, -386, -386, -386, -386, -386, -2, 83, -386, -62, - -386, 95, -46, 2092, 89, -386, 2092, -386, 2092, 216, - -46, -386, 115, 2567, 101, 130, -46, -46, 237, -46, - -46, -74, 106, 138, 2092, -386, 233, 234, 2092, 2092, - 234, 236, -386, -386, 762, -386, -386, 117, -386, -386, - -386, -386, 223, -386, -386, -386, -386, 1022, 178, 245, - -386, 155, 188, -386, 254, 94, 260, -386, 262, -386, - -386, -386, -386, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, -386, -386, 263, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 8, -386, -386, 2092, - 168, 255, 2092, 1152, -386, 45, 141, 144, -386, -386, - -386, 148, 22, -28, 19, 2187, 1798, 139, -386, 2092, - 2092, -386, 2092, -386, -386, -386, -386, -386, 169, 173, - -386, 80, 80, 173, -386, -386, -386, 1924, 145, 169, - 2092, 2092, 179, -386, -386, 283, 240, 241, 284, 2567, - 1014, 494, 494, 494, 2872, 2872, 2872, 2872, 1014, 1014, - 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, - 308, 2628, -386, 137, 137, 137, 2567, 2384, 2689, 2750, - 2811, 1014, 1014, 237, 237, -46, -46, -46, 164, 2445, - 209, 2092, 296, 7, -386, 186, 2258, -386, 181, 1282, - -386, -386, 174, -386, -386, -386, -386, 1152, -386, 134, - 2092, -386, -1, 298, 182, 214, -386, 1924, 141, -386, - -386, 184, 1798, -386, 21, -386, 215, 63, 219, 234, - 892, -386, -45, 111, 99, 38, 200, 83, 306, 83, - 205, 169, 224, -386, 2092, -386, -386, 323, 2321, -386, - 1924, 2092, 206, -386, -386, 1152, 201, 204, 280, 63, - -386, -386, 169, 25, -386, 98, 1924, 2092, -386, -386, - -386, -386, 2092, -386, -386, -386, 2092, 1924, -386, -386, - 22, -386, 83, 212, -386, 242, -386, 219, 284, 2567, - -386, -386, -386, 102, 46, 208, -386, -386, -386, -386, - -386, -386, -386, -386, -386, -386, -386, -386, 239, 228, - 298, -386, 247, 227, -386, -386, 98, -386, 295, -386, - -386, 229, -386, 230, 242, -386, 83, 47, -386, -386, - -386, 2092, 266, 246, 46, -386, -386, -386, -386, -386, - -386, -386, 365, -386, -386, 1924, -386, 1924, 169, 1412, - -386, 382, -386, 359, 256, 258, -386, 2506, 1798, -386, - -386, -386, 1798, 1798, 169, -386, -386, 261, -386, -386, - 265, 194, 257, 1542, -386, -386, -386, -386, 94, -386, - -386, 1798, -386, 269, 273, 259, -386, 1412, -386, -386, - 390, -386, -386, -386, -386, 1798, 274, 272, 271, 275, - -386, 22, 1798, -386, 277, 276, 169, -386, -386 + 1674, -70, -403, -403, -403, -403, -403, -403, -403, -403, + -15, -72, -403, -52, 19, -403, -403, -403, 80, -403, + 2094, -403, 99, -403, 2164, -403, -16, 42, -5, -403, + -403, -403, -403, -1, 5, -403, -403, 2094, 13, 2094, + 2094, 2094, -403, 2094, 2094, 2094, 2094, 2094, 634, 123, + 128, -403, 504, -403, -403, -403, 8, -403, 2024, -403, + -403, -403, -403, -403, -403, 1926, -403, -403, -403, 240, + 361, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 38, -403, 2569, -403, -403, -403, -403, 137, 20, -403, + -403, 1926, -403, -403, -403, -403, -403, -403, -87, 42, + -403, -67, -403, 21, -48, 2094, 79, -403, 2094, -403, + 2094, 138, -48, -403, 43, 2569, 76, 107, -48, -48, + 604, -48, -48, -29, 84, 110, 2094, -403, 210, 211, + 2094, 2094, 211, 212, -403, -403, 764, -403, -403, 85, + -403, -403, -403, -403, 209, -403, -403, -403, -403, 1024, + 158, 232, -403, 139, 171, -403, 141, -403, 238, 12, + 239, -403, 247, -403, -403, -403, -403, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + -403, -403, 249, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 11, -403, -403, 2094, 229, 2094, 1154, -403, 42, 133, + 135, -403, -403, -403, 142, 15, -10, 90, 2189, 1800, + 130, -403, 2094, 2094, -403, 2094, -403, -403, -403, -403, + -403, 161, 169, -403, 38, 38, 169, -403, -403, -403, + 1926, 149, 161, 2094, 2094, -403, 168, -403, -403, 280, + 231, 233, 286, 2569, 1016, 496, 496, 496, 322, 322, + 322, 322, 1016, 1016, 2569, 2569, 2569, 2569, 2569, 2569, + 2569, 2569, 2569, 2569, 2630, 2691, -403, 368, 368, 368, + 2569, 2386, 2752, 2813, 2874, 1016, 1016, 604, 604, -48, + -48, -48, 157, 2447, 202, 2094, 291, 14, 173, 2260, + -403, 165, 1284, -403, -403, 172, -403, -403, -403, -403, + 1154, -403, 42, 2094, -403, -43, 296, 167, 201, -403, + -403, -403, 175, -403, 174, 1800, -403, 44, -403, 200, + 63, 207, 211, 894, -403, -27, -11, 46, 113, 189, + 42, 298, 42, 190, 161, 217, -403, 2094, -403, -403, + 315, 2323, -403, 1926, 2094, 193, -403, -403, 1154, 192, + 194, 75, 63, -403, -403, 161, 26, 96, 1926, 2094, + -403, -403, -403, -403, 2094, -403, -403, -403, 2094, 1926, + -403, -403, 15, -403, 42, 199, -403, 230, -403, 207, + 286, 2569, -403, -403, -403, 103, 24, 197, -403, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 234, 205, 296, -403, 206, 213, -403, -403, 96, -403, + 268, -403, -403, 204, -403, 215, 230, -403, 42, 208, + -403, -403, -403, 2094, 236, 214, 24, -403, -403, -403, + -403, -403, -403, -403, 335, -403, -403, 1926, -403, 1926, + 161, 1414, -403, 339, -403, 316, 219, 227, -403, 2508, + 1800, -403, -403, -403, 1800, 1800, 161, -403, -403, 223, + -403, -403, 226, 250, 221, 1544, -403, -403, -403, -403, + 12, -403, -403, 1800, -403, 222, 224, 225, -403, 1414, + -403, -403, 354, -403, -403, -403, -403, 1800, 228, 241, + 235, 243, -403, 15, 1800, -403, 244, 246, 161, -403, + -403 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -386, -386, 248, -386, 360, -290, -386, 104, -385, -38, - 1, -85, -313, 58, 2, 14, 361, 301, 97, -386, - -386, -386, -386, -386, -386, -386, -386, -386, -386, -386, - -386, -386, -386, -386, -386, -10, -5, -386, -386, 12, - -386, 16, -386, -386, -386, -386, -386, -386, -386, -200, - 76, -386, -386, -386, -386, 0, -386, 371, -386, -386, - -386, 60, -386, 61, -386, -56, -386, -39, -386, -386, - -20, -386, 3, -386, -386, 48, 29, -386, -373, -386, - -303, -40, 4, -386, -386, -386, -386, -386, 422, -89, - 64, 81, -240, -386, -95, -386, -386, -386, -386, -386, - -386, -386, -32, -6, -52, -8, -386, -386, -386, -386, - -386, -386, -386 + -403, -403, 218, -403, 312, -299, -403, 61, -402, -31, + 1, -55, -85, 48, 2, -23, 321, 251, 58, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + -403, -403, -403, -403, -403, -62, -60, -403, -403, -40, + -403, -36, -403, -403, -403, -403, -403, -403, -403, -403, + 6, 50, -403, -403, -403, -403, 0, -403, 331, -403, + -403, -403, 49, -403, 51, -403, -96, -403, -80, -403, + -403, -61, -403, 3, -403, -403, 7, 9, -403, -376, + -403, -311, -79, 4, -403, -403, -403, -403, -403, 388, + -91, 25, 52, -239, -403, -98, -403, -403, -403, -403, + -403, -403, -403, -34, -9, -49, -13, -403, -403, -403, + -403, -403, -403, -403 }; /* 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 -153 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 210, 153, 112, 220, 342, - 134, 300, 99, 227, 374, 318, 102, 433, 92, 87, - 371, 86, 328, -70, 318, 322, 163, 366, 322, 110, - 188, 113, 116, 117, 93, 118, 119, 120, 93, 113, - 121, 388, 89, 389, 186, 187, 188, 402, 92, 246, - 91, 2, 68, 54, 56, 73, 74, 382, 55, 233, - 71, 72, 205, 428, 93, 206, 216, 15, 16, 17, - 421, 19, 163, 21, 432, 405, 204, 97, 205, 108, - 441, 206, 93, 492, 109, 25, 216, 493, 494, 100, - 96, 88, 236, 461, 30, 31, 32, 223, 225, 378, - 113, 368, 93, 104, 369, 327, 501, 163, 442, 298, - 55, 397, 71, 72, 107, 323, 113, 450, 420, 318, - 509, 163, 241, 242, 214, 215, 422, 515, 103, 253, - 301, 423, 419, 106, 329, 111, 302, 328, 514, 144, - 360, 94, 475, 145, 476, 254, 462, 68, 54, 56, - 73, 74, 147, 93, 376, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 281, 379, -151, - 163, 283, 284, 285, 286, 287, 288, 289, 290, 291, - 292, 293, 294, 295, 296, 297, 113, 299, 335, 163, - 336, 207, 163, 303, 306, 55, 208, 71, 72, 340, - 386, 163, 154, 68, 54, 312, 224, 222, 477, 228, - 230, 155, 113, 334, 113, 367, 157, 186, 187, 188, - 232, 234, 387, 231, 495, 440, 237, 238, 235, 244, - 159, 154, 210, 247, 343, 344, -71, 246, 249, 199, - 200, 201, 202, 203, 250, 246, 251, 252, 391, 204, - 394, 205, 2, 256, 206, 257, 282, 304, -108, 305, - 320, 319, 333, 339, 337, 210, 518, 341, 15, 16, - 17, 345, 19, 408, 21, 409, 346, 351, 410, 411, - 412, 210, 413, 358, 347, 349, 25, 355, 357, 359, - 365, 322, 210, 394, 461, 30, 31, 32, 361, 68, - 54, 312, 113, 363, 373, 372, 375, 68, 54, 312, - 377, 382, 390, 392, 398, 414, 400, 186, 187, 188, - 154, 396, 404, 406, 431, 415, 416, 407, 435, 155, - 447, 368, 436, 156, 157, 429, 399, 460, 164, 452, - 430, 201, 202, 203, 449, 403, 158, 462, 159, 204, - 455, 205, 457, 458, 206, 68, 54, 312, 474, 113, - 210, 468, 210, 451, 113, 165, 166, 167, 469, 168, - 169, 170, 171, 172, 173, 487, 488, 496, 489, 498, - -152, 497, 504, 507, 511, 248, 185, 512, 186, 187, - 188, 502, 189, 190, 191, 503, 510, 513, 517, 2, - 516, 438, 146, 364, 194, 195, 196, 197, 198, 150, - 199, 200, 201, 202, 203, 15, 16, 17, 239, 19, - 204, 21, 205, 467, 470, 206, 384, 463, 453, 471, - 162, 506, 454, 25, 499, 490, 439, 448, 500, 105, - 418, 0, 30, 31, 32, 0, 434, 0, 0, 481, - 479, 480, 485, 486, 0, 463, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 481, 479, 480, 485, 486, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 481, 479, 480, - 485, 486, -4, 0, 0, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 164, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, -153, -153, -153, 0, 37, 38, 0, 0, 172, - 173, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 197, 198, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, - 45, 206, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -4, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 133, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 245, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 385, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, -153, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, -153, - -153, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, -153, -153, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, - 45, 206, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -3, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 69, 54, 56, 74, 75, 114, 214, 101, 223, 155, + 156, 104, 230, 345, 304, 374, 435, 136, 325, 87, + 97, 369, 93, 94, 112, 192, 115, 118, 119, 325, + 120, 121, 122, 97, 115, 88, 156, 123, 95, 217, + 218, -70, 190, 191, 192, 93, 94, 257, 55, 72, + 90, 73, 69, 54, 56, 74, 75, 209, 443, 371, + 210, 95, 372, 258, 98, 423, 93, 94, 494, 407, + 92, 167, 495, 496, 208, 384, 209, 106, 410, 210, + 411, 249, 95, 412, 413, 414, 444, 415, 388, 167, + 167, 503, 239, 93, 94, 228, 226, 115, 99, 380, + 55, 72, 102, 73, 236, 511, 105, 89, 326, 95, + 302, 452, 517, 115, 167, 399, 390, 108, 391, 422, + 416, 244, 245, 330, 424, 109, 146, 110, 147, 425, + 417, 418, 111, 305, 149, 113, 421, 516, 167, 306, + 211, 231, 212, 225, 167, 96, 167, 363, 233, 69, + 54, 56, 74, 75, 263, 264, 265, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 378, 381, 389, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 115, 303, 55, 72, 338, + 73, 339, 309, 167, 307, 331, 227, 235, 234, 237, + 238, 250, 2, 240, 241, 247, 69, 54, 315, 343, + 115, 479, 115, 337, 321, 370, -71, 158, 15, 16, + 17, 2, 19, 332, 21, 252, 442, 497, 253, 254, + 255, 256, 260, 308, 346, 347, 25, 15, 16, 17, + 261, 19, 286, 21, 463, 30, 31, 32, 158, 393, + -113, 396, 322, 336, 323, 25, 340, 159, 158, 342, + 348, 160, 161, 463, 30, 31, 32, 159, 404, 520, + 249, 344, 161, 349, 162, 350, 163, 352, 249, 354, + 358, 360, 361, 430, 362, 364, 163, 366, 368, 325, + 375, 376, -112, 396, 434, 379, 377, 464, 156, 384, + 115, 392, 69, 54, 315, 394, 398, 400, 402, 406, + 69, 54, 315, 156, 408, 437, 464, 409, 332, 449, + 438, 451, 453, 457, 156, 454, 371, 459, 476, 433, + -153, 470, 489, 490, 401, 431, 471, 462, 460, 498, + 432, 491, 499, 500, 504, 405, 505, 509, 506, -154, + 512, 514, 168, 513, 148, 2, 115, 251, 69, 54, + 315, 115, 477, 367, 478, 515, 440, 518, 519, 152, + 242, 15, 16, 17, 472, 19, 473, 21, 455, 169, + 170, 171, 456, -155, -155, -155, -155, 176, 177, 25, + 386, 166, 156, 508, 156, 501, 492, 441, 30, 31, + 32, 502, 190, 191, 192, 107, 193, 194, 195, 436, + 0, 0, 0, 0, 420, 0, 0, 0, 0, 450, + 469, 201, 202, 0, 203, 204, 205, 206, 207, 465, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 0, 0, 0, 0, 0, 0, 0, 0, 190, 191, + 192, 483, 481, 482, 487, 488, 0, 465, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -15, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 307, 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, + 203, 204, 205, 206, 207, 483, 481, 482, 487, 488, + 208, 0, 209, 0, 0, 210, 0, 0, 0, 483, + 481, 482, 487, 488, -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, 168, 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, -155, -155, -155, 0, 37, 38, 0, + 0, 176, 177, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 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, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 190, 191, 192, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 205, 206, + 207, 0, 0, 0, 40, 41, 208, 0, 209, 0, + 0, 210, 0, 134, 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, 135, 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, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 478, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -142, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 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, 248, 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, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 478, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, -3, 0, -143, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 387, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, -155, 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, -155, -155, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, -155, -155, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 1, 2, 3, 4, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 0, -118, 0, 15, 16, - 17, 18, 19, 20, 21, 22, 0, 23, 126, 0, - 127, 0, 0, 0, 24, 128, 25, 26, 0, 27, - 129, 28, 0, 29, 130, 30, 31, 32, 0, 0, - 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, - 0, 37, 38, 0, 131, 0, 0, 0, 39, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -15, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, - 0, 0, 0, 0, 0, 0, 0, 132, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 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, - 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, - 46, 0, 47, 0, 48, 0, 49, 1, 2, 3, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 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, -144, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 126, 0, 127, 0, 0, 0, - 24, 128, 25, 26, 0, 27, 129, 28, 0, 29, - 130, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 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, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 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, -145, 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, - 131, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 132, 0, 148, 0, 3, 4, 0, - 5, 6, 7, 8, 9, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 20, 47, 22, - 48, 23, 49, 0, 127, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 0, 28, 0, 29, 149, 0, - 0, 0, 0, 0, 0, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 98, 0, 3, 4, 0, - 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 43, 28, 0, 29, 0, 44, - 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, - 49, 0, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 98, 0, 3, 4, 0, - 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, - 0, 23, 0, 0, 0, 0, 0, 0, 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, 164, 0, 0, - 0, 0, 39, 0, 0, 0, 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, -120, 0, + 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, + 128, 0, 129, 0, 0, 0, 24, 130, 25, 26, + 0, 27, 131, 28, 0, 29, 132, 30, 31, 32, + 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, + 0, 0, 0, 37, 38, 0, 133, 0, 0, 0, + 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 40, 41, 0, 0, 0, 0, 0, 0, 0, 134, + 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, 128, 0, 129, 0, + 0, 0, 24, 130, 25, 26, 0, 27, 131, 28, + 0, 29, 132, 30, 31, 32, 0, 0, 33, 34, + 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, + 38, 0, 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 165, 166, 167, 0, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 0, 186, 187, 188, - 0, 189, 190, 191, 46, 0, 47, 0, 0, 192, - 49, 193, 0, 194, 195, 196, 197, 198, 164, 199, - 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, - 0, 205, 0, 0, 206, 0, 0, 0, 0, 0, - 330, 0, 0, 0, 0, 165, 166, 167, 0, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 0, 186, 187, - 188, 0, 189, 190, 191, 0, 0, 0, 0, 0, - 192, 164, 193, 0, 194, 195, 196, 197, 198, 0, - 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, - 204, 0, 205, 0, 0, 206, 0, 0, 165, 166, - 167, 362, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, - 0, 0, 0, 192, 164, 193, 0, 194, 195, 196, - 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, - 0, 0, 0, 204, 0, 205, 0, 0, 206, 0, - 0, 165, 166, 167, 401, 168, 169, 170, 171, 172, + 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, + 0, 0, 0, 0, 0, 134, 0, 150, 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, 129, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 0, 28, 0, 29, + 151, 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, 100, 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, 100, 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, 168, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 169, 170, 171, 0, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 46, 0, 47, 0, + 0, 196, 49, 197, 0, 198, 199, 200, 201, 202, + 168, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 0, 0, 0, + 0, 0, 333, 0, 0, 0, 0, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 0, 196, 168, 197, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 0, 0, + 169, 170, 171, 365, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 0, 196, 168, 197, 0, 198, + 199, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 0, 0, 169, 170, 171, 403, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 0, 0, 0, 168, 196, 0, + 197, 357, 198, 199, 200, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 0, 0, 208, 0, + 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 0, 190, 191, 192, + 0, 193, 194, 195, 0, 0, 0, 0, 168, 196, + 0, 197, 0, 198, 199, 200, 201, 202, 0, 203, + 204, 205, 206, 207, 0, 0, 0, 0, 0, 208, + 0, 209, 359, 0, 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 0, 0, 0, 164, 192, 0, 193, 354, - 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 0, 0, 204, 0, 205, 0, - 0, 206, 165, 166, 167, 0, 168, 169, 170, 171, + 183, 184, 185, 186, 187, 188, 189, 0, 190, 191, + 192, 0, 193, 194, 195, 0, 0, 0, 0, 168, + 196, 0, 197, 493, 198, 199, 200, 201, 202, 0, + 203, 204, 205, 206, 207, 0, 0, 0, 0, 0, + 208, 0, 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 0, 186, 187, 188, 0, 189, - 190, 191, 0, 0, 0, 0, 164, 192, 0, 193, - 0, 194, 195, 196, 197, 198, 0, 199, 200, 201, - 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, - 356, 0, 206, 165, 166, 167, 0, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, - 189, 190, 191, 0, 0, 0, 0, 164, 192, 0, - 193, 491, 194, 195, 196, 197, 198, 0, 199, 200, - 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, - 205, 0, 0, 206, 165, 166, 167, 0, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 0, 186, 187, 188, - 0, 189, 190, 191, 0, 0, 0, 0, 164, 192, - 0, 193, 0, 194, 195, 196, 197, 198, 0, 199, - 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, - 0, 205, 0, 0, 206, 165, 166, 167, 0, 168, - 169, 170, 171, 172, 173, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 186, 187, - 188, 0, 189, 190, 191, 0, 0, 0, 0, 164, - 0, 0, 0, 0, 194, 195, 196, 197, 198, 0, - 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, - 204, 0, 205, 0, 0, 206, 165, 166, 167, 0, - 168, 169, 170, 171, 172, 173, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 186, - 187, 188, 0, 189, 190, 191, 0, 0, 0, 0, - 164, 0, 0, 0, 0, 0, 195, 196, 197, 198, - 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, - 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, - 0, 168, 169, 170, 171, 172, 173, 0, 0, 0, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 0, 0, 0, 0, + 168, 196, 0, 197, 0, 198, 199, 200, 201, 202, + 0, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 168, 0, 0, 0, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 169, 170, + 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, - 0, 164, 0, 0, 0, 0, 0, 0, 196, 197, - 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, - 0, 0, 204, 0, 205, 0, 0, 206, 165, 166, - 167, 0, 168, 169, 170, 171, 172, 173, 0, 0, + 0, 190, 191, 192, 0, 193, 194, 195, 0, 0, + 0, 0, 168, 0, 0, 0, 0, 198, 199, 200, + 201, 202, 0, 203, 204, 205, 206, 207, 0, 0, + 0, 0, 0, 208, 0, 209, 0, 0, 210, 169, + 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, - 0, 0, 164, 0, 0, 0, 0, 0, 0, -153, - 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, - 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, - 166, 167, 0, -153, -153, -153, -153, 172, 173, 0, + 0, 0, 190, 191, 192, 0, 193, 194, 195, 0, + 0, 0, 0, 168, 0, 0, 0, 0, 0, 199, + 200, 201, 202, 0, 203, 204, 205, 206, 207, 0, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 186, 187, 188, 0, 189, 190, 191, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 197, 198, 0, 199, 200, 201, 202, 203, 0, - 0, 0, 0, 0, 204, 0, 205, 0, 0, 206 + 0, 0, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, + 0, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, + 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 190, 191, 192, 0, 193, 194, + 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -155, 201, 202, 0, 203, 204, 205, 206, + 207, 0, 0, 0, 0, 0, 208, 0, 209, 0, + 0, 210 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 90, 58, 39, 97, 249, - 48, 3, 20, 108, 327, 215, 24, 390, 3, 50, - 323, 89, 3, 68, 224, 3, 100, 317, 3, 37, - 92, 39, 40, 41, 19, 43, 44, 45, 19, 47, - 46, 3, 122, 5, 90, 91, 92, 360, 3, 134, - 122, 4, 52, 52, 52, 52, 52, 102, 0, 133, - 0, 0, 124, 376, 19, 127, 3, 20, 21, 22, - 373, 24, 100, 26, 387, 365, 122, 18, 124, 122, - 34, 127, 19, 468, 127, 38, 3, 472, 473, 3, - 14, 122, 124, 46, 47, 48, 49, 103, 106, 36, - 108, 102, 19, 27, 105, 133, 491, 100, 62, 204, - 52, 351, 52, 52, 126, 93, 124, 420, 93, 319, - 505, 100, 128, 129, 126, 127, 28, 512, 122, 35, - 122, 33, 372, 122, 115, 122, 128, 3, 511, 3, - 133, 126, 455, 0, 457, 51, 99, 147, 147, 147, - 147, 147, 126, 19, 133, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 115, 132, - 100, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 230, 100, - 232, 3, 100, 209, 212, 147, 122, 147, 147, 247, - 99, 100, 18, 213, 213, 213, 127, 122, 458, 3, - 105, 27, 230, 229, 232, 320, 32, 90, 91, 92, - 100, 125, 133, 132, 474, 133, 3, 3, 100, 3, - 46, 18, 327, 126, 250, 251, 68, 332, 3, 112, - 113, 114, 115, 116, 99, 340, 68, 3, 347, 122, - 349, 124, 4, 3, 127, 3, 3, 99, 127, 14, - 122, 127, 133, 100, 105, 360, 516, 132, 20, 21, - 22, 102, 24, 3, 26, 5, 3, 3, 8, 9, - 10, 376, 12, 301, 54, 54, 38, 133, 89, 3, - 126, 3, 387, 392, 46, 47, 48, 49, 122, 309, - 309, 309, 320, 132, 100, 133, 132, 317, 317, 317, - 105, 102, 122, 17, 100, 45, 3, 90, 91, 92, - 18, 126, 126, 132, 386, 55, 56, 133, 126, 27, - 132, 102, 100, 31, 32, 377, 354, 436, 40, 122, - 382, 114, 115, 116, 126, 361, 44, 99, 46, 122, - 65, 124, 133, 133, 127, 365, 365, 365, 3, 377, - 455, 105, 457, 126, 382, 67, 68, 69, 132, 71, - 72, 73, 74, 75, 76, 3, 27, 126, 132, 132, - 132, 126, 133, 3, 122, 147, 88, 126, 90, 91, - 92, 132, 94, 95, 96, 132, 132, 132, 132, 4, - 133, 397, 52, 309, 106, 107, 108, 109, 110, 58, - 112, 113, 114, 115, 116, 20, 21, 22, 127, 24, - 122, 26, 124, 441, 444, 127, 339, 437, 426, 444, - 69, 497, 426, 38, 483, 465, 398, 418, 488, 27, - 369, -1, 47, 48, 49, -1, 392, -1, -1, 459, - 459, 459, 459, 459, -1, 465, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 483, 483, 483, 483, 483, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 497, 497, 497, - 497, 497, 0, -1, -1, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, 40, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, 67, 68, 69, -1, 63, 64, -1, -1, 75, - 76, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, 109, 110, -1, 112, 113, 114, 115, - 116, -1, -1, -1, 112, -1, 122, -1, 124, 117, - 118, 127, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 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, 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, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, 0, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 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, + 0, 0, 0, 0, 0, 39, 91, 20, 99, 58, + 65, 24, 110, 252, 3, 326, 392, 48, 3, 89, + 14, 320, 3, 4, 37, 92, 39, 40, 41, 3, + 43, 44, 45, 27, 47, 50, 91, 46, 19, 126, + 127, 68, 90, 91, 92, 3, 4, 35, 0, 0, + 122, 0, 52, 52, 52, 52, 52, 124, 34, 102, + 127, 19, 105, 51, 14, 376, 3, 4, 470, 368, + 122, 100, 474, 475, 122, 102, 124, 27, 3, 127, + 5, 136, 19, 8, 9, 10, 62, 12, 99, 100, + 100, 493, 126, 3, 4, 108, 105, 110, 18, 36, + 52, 52, 3, 52, 133, 507, 122, 122, 93, 19, + 208, 422, 514, 126, 100, 354, 3, 122, 5, 93, + 45, 130, 131, 133, 28, 126, 3, 122, 0, 33, + 55, 56, 127, 122, 126, 122, 375, 513, 100, 128, + 3, 3, 122, 122, 100, 126, 100, 133, 105, 149, + 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 133, 115, 133, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 149, 149, 233, + 149, 235, 215, 100, 213, 115, 127, 100, 132, 125, + 100, 126, 4, 3, 3, 3, 216, 216, 216, 250, + 233, 460, 235, 232, 218, 323, 68, 18, 20, 21, + 22, 4, 24, 227, 26, 3, 133, 476, 99, 68, + 99, 3, 3, 14, 253, 254, 38, 20, 21, 22, + 3, 24, 3, 26, 46, 47, 48, 49, 18, 350, + 127, 352, 127, 133, 122, 38, 105, 27, 18, 100, + 102, 31, 32, 46, 47, 48, 49, 27, 363, 518, + 335, 132, 32, 3, 44, 54, 46, 54, 343, 3, + 133, 89, 305, 378, 3, 122, 46, 132, 126, 3, + 133, 100, 127, 394, 389, 105, 132, 99, 363, 102, + 323, 122, 312, 312, 312, 17, 126, 100, 3, 126, + 320, 320, 320, 378, 132, 126, 99, 133, 322, 132, + 100, 126, 126, 65, 389, 122, 102, 133, 3, 388, + 132, 105, 3, 27, 357, 379, 132, 438, 133, 126, + 384, 132, 126, 132, 132, 364, 132, 3, 133, 132, + 132, 126, 40, 122, 52, 4, 379, 149, 368, 368, + 368, 384, 457, 312, 459, 132, 399, 133, 132, 58, + 129, 20, 21, 22, 446, 24, 446, 26, 428, 67, + 68, 69, 428, 71, 72, 73, 74, 75, 76, 38, + 342, 70, 457, 499, 459, 485, 467, 400, 47, 48, + 49, 490, 90, 91, 92, 27, 94, 95, 96, 394, + -1, -1, -1, -1, 372, -1, -1, -1, -1, 420, + 443, 109, 110, -1, 112, 113, 114, 115, 116, 439, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, - -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, + 92, 461, 461, 461, 461, 461, -1, 467, -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, + 112, 113, 114, 115, 116, 485, 485, 485, 485, 485, + 122, -1, 124, -1, -1, 127, -1, -1, -1, 499, + 499, 499, 499, 499, 0, -1, -1, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, 67, 68, 69, -1, 63, 64, -1, + -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, + 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, + 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, 90, 91, 92, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 114, 115, + 116, -1, -1, -1, 90, 91, 122, -1, 124, -1, + -1, 127, -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, @@ -3283,62 +3248,166 @@ static const yytype_int16 yycheck[] = 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, 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, 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, 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, -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, + -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, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, 0, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 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, + 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, -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, -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, -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, @@ -3350,37 +3419,50 @@ static const yytype_int16 yycheck[] = -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, -1, -1, 90, 91, + -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, - -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, + 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, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 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, -1, -1, -1, -1, -1, 107, 108, 109, 110, + 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, 108, 109, + -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -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, + -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, 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, 109, 110, -1, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127 + -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, 108, 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 @@ -3393,52 +3475,53 @@ static const yytype_uint8 yystos[] = 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, 216, 219, 232, 233, 234, 237, - 238, 239, 240, 243, 245, 246, 89, 50, 122, 122, - 164, 122, 3, 19, 126, 183, 184, 18, 3, 239, - 3, 218, 239, 122, 184, 222, 122, 126, 122, 127, - 239, 122, 236, 239, 241, 242, 239, 239, 239, 239, - 239, 237, 228, 229, 230, 236, 30, 32, 37, 42, - 46, 66, 99, 132, 143, 144, 145, 148, 150, 165, - 166, 181, 189, 235, 3, 0, 138, 126, 3, 46, - 150, 156, 157, 238, 18, 27, 31, 32, 44, 46, - 205, 244, 191, 100, 40, 67, 68, 69, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 90, 91, 92, 94, - 95, 96, 102, 104, 106, 107, 108, 109, 110, 112, - 113, 114, 115, 116, 122, 124, 127, 3, 122, 162, - 145, 146, 172, 187, 126, 127, 3, 184, 221, 222, - 223, 231, 122, 237, 127, 239, 180, 228, 3, 155, - 105, 132, 100, 133, 125, 100, 236, 3, 3, 151, - 152, 237, 237, 151, 3, 132, 145, 126, 136, 3, - 99, 68, 3, 35, 51, 215, 3, 3, 207, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 3, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 228, 239, - 3, 122, 128, 237, 99, 14, 239, 99, 139, 140, - 141, 147, 148, 195, 197, 206, 216, 186, 183, 127, - 122, 227, 3, 93, 212, 213, 214, 133, 3, 115, - 133, 142, 143, 133, 237, 236, 236, 105, 226, 100, - 143, 132, 226, 237, 237, 102, 3, 54, 192, 54, - 193, 3, 208, 209, 105, 133, 125, 89, 239, 3, - 133, 122, 133, 132, 141, 126, 139, 228, 102, 105, - 210, 214, 133, 100, 146, 132, 133, 105, 36, 115, - 223, 225, 102, 149, 152, 132, 99, 133, 3, 5, - 122, 223, 17, 194, 223, 224, 126, 226, 100, 239, - 3, 133, 146, 237, 126, 139, 132, 133, 3, 5, - 8, 9, 10, 12, 45, 55, 56, 211, 225, 226, - 93, 214, 28, 33, 173, 175, 177, 178, 146, 236, - 236, 238, 146, 212, 224, 126, 100, 198, 149, 209, - 133, 34, 62, 167, 168, 169, 170, 132, 210, 126, - 214, 126, 122, 173, 175, 65, 153, 133, 133, 196, - 223, 46, 99, 189, 202, 203, 204, 239, 105, 132, - 169, 170, 220, 176, 3, 146, 146, 226, 99, 144, - 148, 189, 199, 200, 201, 206, 216, 3, 27, 132, - 204, 105, 142, 142, 142, 226, 126, 126, 132, 201, - 215, 142, 132, 132, 133, 217, 199, 3, 174, 142, - 132, 122, 126, 132, 212, 142, 133, 132, 226 + 160, 161, 163, 171, 179, 182, 183, 186, 189, 190, + 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, + 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, + 122, 164, 122, 3, 4, 19, 126, 184, 185, 18, + 3, 240, 3, 219, 240, 122, 185, 223, 122, 126, + 122, 127, 240, 122, 237, 240, 242, 243, 240, 240, + 240, 240, 240, 238, 229, 230, 231, 237, 30, 32, + 37, 42, 46, 66, 99, 132, 143, 144, 145, 148, + 150, 165, 166, 181, 190, 236, 3, 0, 138, 126, + 3, 46, 150, 156, 157, 239, 145, 146, 18, 27, + 31, 32, 44, 46, 206, 245, 192, 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, 146, 172, 188, 126, 127, 184, + 185, 222, 223, 224, 232, 122, 238, 127, 240, 180, + 229, 3, 155, 105, 132, 100, 133, 125, 100, 237, + 3, 3, 151, 152, 238, 238, 151, 3, 132, 145, + 126, 136, 3, 99, 68, 99, 3, 35, 51, 216, + 3, 3, 208, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 3, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 229, 240, 3, 122, 128, 238, 14, 240, + 99, 139, 140, 141, 147, 148, 196, 198, 207, 217, + 187, 184, 127, 122, 228, 3, 93, 213, 214, 215, + 133, 115, 184, 133, 142, 143, 133, 238, 237, 237, + 105, 227, 100, 143, 132, 227, 238, 238, 102, 3, + 54, 193, 54, 194, 3, 209, 210, 105, 133, 125, + 89, 240, 3, 133, 122, 133, 132, 141, 126, 139, + 229, 102, 105, 211, 215, 133, 100, 132, 133, 105, + 36, 115, 224, 226, 102, 149, 152, 132, 99, 133, + 3, 5, 122, 224, 17, 195, 224, 225, 126, 227, + 100, 240, 3, 133, 146, 238, 126, 139, 132, 133, + 3, 5, 8, 9, 10, 12, 45, 55, 56, 212, + 226, 227, 93, 215, 28, 33, 173, 175, 177, 178, + 146, 237, 237, 239, 146, 213, 225, 126, 100, 199, + 149, 210, 133, 34, 62, 167, 168, 169, 170, 132, + 211, 126, 215, 126, 122, 173, 175, 65, 153, 133, + 133, 197, 224, 46, 99, 190, 203, 204, 205, 240, + 105, 132, 169, 170, 221, 176, 3, 146, 146, 227, + 99, 144, 148, 190, 200, 201, 202, 207, 217, 3, + 27, 132, 205, 105, 142, 142, 142, 227, 126, 126, + 132, 202, 216, 142, 132, 132, 133, 218, 200, 3, + 174, 142, 132, 122, 126, 132, 213, 142, 133, 132, + 227 }; #define yyerrok (yyerrstatus = 0) @@ -4254,7 +4337,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2030 "parser.y" +#line 2108 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4265,7 +4348,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2031 "parser.y" +#line 2109 "parser.y" {(yyval.code)=code_new();} } break; @@ -4276,7 +4359,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2033 "parser.y" +#line 2111 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4287,7 +4370,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2034 "parser.y" +#line 2112 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4298,7 +4381,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2049 "parser.y" +#line 2127 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4309,7 +4392,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2050 "parser.y" +#line 2128 "parser.y" {(yyval.code)=0;} } break; @@ -4320,7 +4403,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2053 "parser.y" +#line 2131 "parser.y" {(yyval.code)=0;} } break; @@ -4331,7 +4414,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2060 "parser.y" +#line 2138 "parser.y" {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4342,7 +4425,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2064 "parser.y" +#line 2142 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4353,7 +4436,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2143 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4364,7 +4447,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2069 "parser.y" +#line 2147 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4378,7 +4461,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2080 "parser.y" +#line 2158 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4389,7 +4472,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2081 "parser.y" +#line 2159 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4402,7 +4485,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2085 "parser.y" +#line 2163 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4413,7 +4496,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2086 "parser.y" +#line 2164 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4424,7 +4507,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2088 "parser.y" +#line 2166 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4435,7 +4518,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2089 "parser.y" +#line 2167 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4446,7 +4529,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2092 "parser.y" +#line 2170 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4513,7 +4596,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2152 "parser.y" +#line 2230 "parser.y" {(yyval.code) = code_new();} } break; @@ -4524,7 +4607,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2153 "parser.y" +#line 2231 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4535,7 +4618,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2156 "parser.y" +#line 2234 "parser.y" {PASS12 new_state();} } break; @@ -4546,7 +4629,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2156 "parser.y" +#line 2234 "parser.y" { (yyval.code) = code_new(); @@ -4574,7 +4657,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2175 "parser.y" +#line 2253 "parser.y" {(yyval.code)=code_new();} } break; @@ -4585,7 +4668,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2182 "parser.y" +#line 2260 "parser.y" { 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); @@ -4599,7 +4682,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2186 "parser.y" +#line 2264 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4613,7 +4696,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2191 "parser.y" +#line 2269 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4624,7 +4707,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2192 "parser.y" +#line 2270 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4635,7 +4718,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2194 "parser.y" +#line 2272 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4664,7 +4747,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2214 "parser.y" +#line 2292 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4721,7 +4804,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2340 "parser.y" {PASS12 new_state();} } break; @@ -4732,7 +4815,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2340 "parser.y" { (yyval.code) = code_new(); @@ -4760,7 +4843,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2281 "parser.y" +#line 2359 "parser.y" {PASS12 new_state();} } break; @@ -4771,7 +4854,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2281 "parser.y" +#line 2359 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4795,7 +4878,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2296 "parser.y" +#line 2374 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4808,7 +4891,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2299 "parser.y" +#line 2377 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4821,7 +4904,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2302 "parser.y" +#line 2380 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4834,7 +4917,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2305 "parser.y" +#line 2383 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4847,7 +4930,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2309 "parser.y" +#line 2387 "parser.y" {(yyval.code)=0;} } break; @@ -4858,7 +4941,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2310 "parser.y" +#line 2388 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4869,7 +4952,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2311 "parser.y" +#line 2389 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4880,7 +4963,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2312 "parser.y" +#line 2390 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4891,7 +4974,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2313 "parser.y" +#line 2391 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4902,7 +4985,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2314 "parser.y" +#line 2392 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4913,9 +4996,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2316 "parser.y" +#line 2394 "parser.y" { - (yyval.code) = abc_dup(0); + (yyval.code) = abc_getlocal(0, state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); @@ -4934,7 +5017,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2327 "parser.y" +#line 2405 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4947,8 +5030,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2330 "parser.y" - {PASS12 new_state();} +#line 2408 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -4958,11 +5041,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2330 "parser.y" +#line 2408 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); - code_t*out = (yyval.code) = abc_pop((yyval.code)); + + code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var); breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out); code_t*c = (yyval.code),*lastblock=0; @@ -4994,7 +5079,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2359 "parser.y" +#line 2439 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -5009,7 +5094,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2444 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5023,6 +5108,7 @@ PASS2 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, code_dup(state->method->scope_code)); c = code_append(c, (yyvsp[(8) - (9)].code)); c = abc_kill(c, i); @@ -5038,7 +5124,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2464 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5049,7 +5135,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2464 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5074,7 +5160,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2480 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -5085,7 +5171,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2481 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -5096,7 +5182,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" +#line 2482 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5107,7 +5193,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" +#line 2483 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5125,7 +5211,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2410 "parser.y" +#line 2491 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5143,8 +5229,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2419 "parser.y" - {PASS12 new_state();} +#line 2500 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -5154,7 +5243,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2419 "parser.y" +#line 2503 "parser.y" { code_t*out = abc_nop(0); @@ -5180,6 +5269,7 @@ PASS2 parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally); // finally block e->target = (yyval.code) = abc_nop((yyval.code)); + (yyval.code) = code_append((yyval.code), code_dup(state->method->scope_code)); (yyval.code) = abc___rethrow__((yyval.code)); } @@ -5206,7 +5296,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" +#line 2549 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5220,7 +5310,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2468 "parser.y" +#line 2553 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5238,24 +5328,41 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2479 "parser.y" +#line 2564 "parser.y" { - (yyval.code) = (yyvsp[(3) - (5)].value).c; - (yyval.code) = abc_pushwith((yyval.code)); - (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code)); - (yyval.code) = abc_popscope((yyval.code)); + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + (yyval.value_list).number = v; + } + (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c; } } break; - case 109: + case 108: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2489 "parser.y" - {PASS12 (yyval.id)="package";} +#line 2574 "parser.y" + { + /* remove getlocal;pushwith from scope code again */ + state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); + + (yyval.code) = (yyvsp[(1) - (2)].value_list).cc; + if(state->method->has_exceptions) { + (yyval.code) = abc_dup((yyval.code)); + (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number); + } + (yyval.code) = abc_pushwith((yyval.code)); + (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code)); + (yyval.code) = abc_popscope((yyval.code)); + old_state(); +} } break; @@ -5265,8 +5372,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2491 "parser.y" - {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} +#line 2592 "parser.y" + {PASS12 (yyval.id)="package";} } break; @@ -5276,8 +5383,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2492 "parser.y" - {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} +#line 2593 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5287,8 +5394,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2494 "parser.y" - {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} +#line 2595 "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; @@ -5298,8 +5405,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2495 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2596 "parser.y" + {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5309,8 +5416,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2496 "parser.y" - {PASS12 startpackage("");} +#line 2598 "parser.y" + {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5320,7 +5427,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2497 "parser.y" +#line 2599 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5331,15 +5438,37 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2499 "parser.y" - { - PASS12 - slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); - if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { - as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); - } +#line 2600 "parser.y" + {PASS12 startpackage("");} + } + break; - PASS2 + + + case 117: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2601 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} + } + break; + + + + case 118: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2603 "parser.y" + { + PASS12 + slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { + as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); + } + + PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); @@ -5353,11 +5482,11 @@ PASS2 - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2515 "parser.y" +#line 2619 "parser.y" { PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { @@ -5377,44 +5506,44 @@ PASS2 - case 118: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2532 "parser.y" +#line 2636 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 119: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2533 "parser.y" +#line 2637 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 120: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2534 "parser.y" +#line 2638 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2535 "parser.y" +#line 2639 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5427,110 +5556,110 @@ PASS2 - case 122: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2543 "parser.y" +#line 2646 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 123: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2544 "parser.y" +#line 2647 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 124: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2545 "parser.y" +#line 2648 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 125: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" +#line 2649 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 126: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2547 "parser.y" +#line 2650 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 127: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2548 "parser.y" +#line 2651 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 128: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2549 "parser.y" +#line 2652 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 129: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2653 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 130: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2551 "parser.y" +#line 2654 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 131: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2552 "parser.y" +#line 2655 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5539,99 +5668,99 @@ PASS2 - case 132: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2556 "parser.y" - {(yyval.classinfo)=0;} +#line 2659 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 133: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2557 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2660 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 134: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2559 "parser.y" +#line 2662 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 135: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2560 "parser.y" +#line 2663 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 136: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2562 "parser.y" +#line 2665 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 137: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2563 "parser.y" +#line 2666 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 138: + case 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2567 "parser.y" +#line 2670 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; - case 139: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2569 "parser.y" +#line 2672 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 140: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2573 "parser.y" +#line 2676 "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));} } @@ -5639,22 +5768,22 @@ PASS2 - case 141: + case 143: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2576 "parser.y" +#line 2679 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2589 "parser.y" +#line 2692 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5665,11 +5794,11 @@ PASS2 - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "parser.y" +#line 2703 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5678,11 +5807,11 @@ PASS2 - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2603 "parser.y" +#line 2706 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5698,55 +5827,55 @@ PASS2 - case 160: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2618 "parser.y" +#line 2721 "parser.y" {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 161: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2618 "parser.y" +#line 2721 "parser.y" {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; - case 162: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2620 "parser.y" +#line 2723 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; - case 163: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2724 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; - case 164: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2624 "parser.y" +#line 2727 "parser.y" { int flags = slotstate_flags->flags; namespace_t ns = modifiers2access(slotstate_flags); @@ -5823,121 +5952,121 @@ PASS2 - case 165: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2698 "parser.y" +#line 2801 "parser.y" {(yyval.constant)=0;} } break; - case 166: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2699 "parser.y" +#line 2802 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 167: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2701 "parser.y" +#line 2804 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 168: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 2805 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 169: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2703 "parser.y" +#line 2806 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 170: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2704 "parser.y" +#line 2807 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 171: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" +#line 2808 "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 172: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2707 "parser.y" +#line 2810 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 173: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" +#line 2811 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 174: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2709 "parser.y" +#line 2812 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 175: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2710 "parser.y" +#line 2813 "parser.y" { if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { (yyval.constant) = constant_new_float(__builtin_nan("")); @@ -5951,11 +6080,11 @@ PASS2 - case 176: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2722 "parser.y" +#line 2825 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5965,11 +6094,11 @@ PASS2 - case 177: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 2829 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5979,11 +6108,11 @@ PASS2 - case 178: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2732 "parser.y" +#line 2835 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5995,11 +6124,11 @@ PASS2 - case 179: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2738 "parser.y" +#line 2841 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6011,11 +6140,11 @@ PASS2 - case 180: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2746 "parser.y" +#line 2849 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6026,11 +6155,11 @@ PASS2 - case 181: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2751 "parser.y" +#line 2854 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6041,11 +6170,11 @@ PASS2 - case 182: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2757 "parser.y" +#line 2860 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6059,11 +6188,11 @@ PASS2 - case 183: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 2868 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6077,33 +6206,33 @@ PASS2 - case 186: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2775 "parser.y" +#line 2878 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 187: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2778 "parser.y" +#line 2881 "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 188: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2779 "parser.y" +#line 2882 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -6123,33 +6252,33 @@ PASS2 - case 190: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2795 "parser.y" +#line 2898 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 191: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2797 "parser.y" +#line 2900 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 192: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2798 "parser.y" +#line 2901 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6173,21 +6302,24 @@ PASS2 - case 193: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2820 "parser.y" +#line 2923 "parser.y" { - PASS1 static classinfo_t c; - memset(&c, 0, sizeof(c)); - c.kind = INFOTYPE_CLASS; - c.subtype = 255; - c.name = (yyvsp[(1) - (1)].id); - (yyval.classinfo) = &c; - - /* let the compiler know that we might be looking for this soon */ - as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->name = (yyvsp[(1) - (1)].id); + c->package = get_package_from_name((yyvsp[(1) - (1)].id)); + if(!c->package) { + c->nsset = get_current_imports(); + /* make the compiler look for this class in the current directory, + just in case: */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); + } + (yyval.classinfo) = (classinfo_t*)c; PASS2 slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); @@ -6198,19 +6330,18 @@ PASS2 - case 194: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2836 "parser.y" +#line 2942 "parser.y" { - PASS1 static classinfo_t c; - memset(&c, 0, sizeof(c)); - c.kind = INFOTYPE_CLASS; - c.subtype = 255; - c.package = (yyvsp[(1) - (3)].id); - c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo) = &c; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->package = (yyvsp[(1) - (3)].id); + c->name = (yyvsp[(3) - (3)].id); + (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)); @@ -6222,122 +6353,122 @@ PASS2 - case 197: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2854 "parser.y" +#line 2959 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 198: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2855 "parser.y" +#line 2960 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 199: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2857 "parser.y" +#line 2962 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 200: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2858 "parser.y" +#line 2963 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 201: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2859 "parser.y" +#line 2964 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 202: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 2973 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 203: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2869 "parser.y" +#line 2974 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 204: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2873 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2978 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 205: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2874 "parser.y" +#line 2979 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 206: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2876 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2981 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 209: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2880 "parser.y" - {(yyval.value_list).len=1; +#line 2985 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6345,24 +6476,24 @@ PASS2 - case 210: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2884 "parser.y" +#line 2989 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 211: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2885 "parser.y" +#line 2990 "parser.y" { - (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; + (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); } } @@ -6370,11 +6501,11 @@ PASS2 - case 213: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2891 "parser.y" +#line 2996 "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); @@ -6384,7 +6515,7 @@ PASS2 multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; @@ -6392,10 +6523,10 @@ PASS2 multiname_t*name = t->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); } else { (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number); } (yyval.value).t = TYPE_ANY; @@ -6411,11 +6542,11 @@ PASS2 - case 214: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2927 "parser.y" +#line 3032 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6429,7 +6560,7 @@ PASS2 multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); } 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]; @@ -6441,17 +6572,17 @@ PASS2 (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); } else if((yyval.value).c->opcode == OPCODE_GETSUPER) { multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); } else { (yyval.value).c = abc_getglobalscope((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); } if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) { @@ -6466,11 +6597,11 @@ PASS2 - case 215: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "parser.y" +#line 3078 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6487,7 +6618,7 @@ PASS2 */ state->method->has_super = 1; - (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); (yyval.value).c = abc_pushundefined((yyval.value).c); (yyval.value).t = TYPE_ANY; } @@ -6496,11 +6627,11 @@ PASS2 - case 216: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2994 "parser.y" +#line 3099 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6526,11 +6657,11 @@ PASS2 - case 217: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3015 "parser.y" +#line 3120 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6539,11 +6670,11 @@ PASS2 - case 218: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3018 "parser.y" +#line 3123 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6553,33 +6684,33 @@ PASS2 - case 219: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3025 "parser.y" +#line 3130 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 220: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3026 "parser.y" +#line 3131 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 221: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3027 "parser.y" +#line 3132 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6591,11 +6722,11 @@ PASS2 - case 222: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3033 "parser.y" +#line 3138 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6604,55 +6735,55 @@ PASS2 - case 223: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3039 "parser.y" +#line 3144 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 225: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3043 "parser.y" +#line 3148 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 226: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3045 "parser.y" +#line 3150 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 227: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3047 "parser.y" +#line 3152 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 229: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3051 "parser.y" +#line 3156 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6674,11 +6805,11 @@ PASS2 - case 230: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3068 "parser.y" +#line 3173 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6689,11 +6820,11 @@ PASS2 - case 231: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3073 "parser.y" +#line 3178 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6702,11 +6833,11 @@ PASS2 - case 232: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3076 "parser.y" +#line 3181 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6715,11 +6846,11 @@ PASS2 - case 233: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3079 "parser.y" +#line 3184 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6728,11 +6859,11 @@ PASS2 - case 234: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3082 "parser.y" +#line 3187 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6741,11 +6872,11 @@ PASS2 - case 235: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3085 "parser.y" +#line 3190 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6754,11 +6885,11 @@ PASS2 - case 236: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3088 "parser.y" +#line 3193 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6767,11 +6898,11 @@ PASS2 - case 237: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3091 "parser.y" +#line 3196 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6780,11 +6911,11 @@ PASS2 - case 238: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3094 "parser.y" +#line 3199 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6793,11 +6924,11 @@ PASS2 - case 239: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3097 "parser.y" +#line 3202 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6806,11 +6937,11 @@ PASS2 - case 240: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3101 "parser.y" +#line 3206 "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; } @@ -6819,11 +6950,11 @@ PASS2 - case 241: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3104 "parser.y" +#line 3209 "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; } @@ -6832,11 +6963,11 @@ PASS2 - case 242: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "parser.y" +#line 3212 "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; } @@ -6845,11 +6976,11 @@ PASS2 - case 243: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3110 "parser.y" +#line 3215 "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; } @@ -6858,11 +6989,11 @@ PASS2 - case 244: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3113 "parser.y" +#line 3218 "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; } @@ -6871,11 +7002,11 @@ PASS2 - case 245: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3116 "parser.y" +#line 3221 "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; } @@ -6884,11 +7015,11 @@ PASS2 - case 246: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3119 "parser.y" +#line 3224 "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; } @@ -6897,11 +7028,11 @@ PASS2 - case 247: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3122 "parser.y" +#line 3227 "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; } @@ -6910,11 +7041,11 @@ PASS2 - case 248: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3126 "parser.y" +#line 3231 "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); @@ -6931,11 +7062,11 @@ PASS2 - case 249: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3137 "parser.y" +#line 3242 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6958,11 +7089,11 @@ PASS2 - case 250: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3155 "parser.y" +#line 3260 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6972,11 +7103,11 @@ PASS2 - case 251: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3160 "parser.y" +#line 3265 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6986,11 +7117,11 @@ PASS2 - case 252: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3165 "parser.y" +#line 3270 "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; @@ -7000,11 +7131,11 @@ PASS2 - case 253: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3170 "parser.y" +#line 3275 "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; @@ -7014,11 +7145,11 @@ PASS2 - case 254: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3175 "parser.y" +#line 3280 "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; @@ -7028,11 +7159,11 @@ PASS2 - case 255: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3180 "parser.y" +#line 3285 "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; @@ -7042,11 +7173,11 @@ PASS2 - case 256: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3184 "parser.y" +#line 3289 "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; @@ -7056,11 +7187,11 @@ PASS2 - case 257: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3188 "parser.y" +#line 3293 "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; @@ -7070,11 +7201,11 @@ PASS2 - case 258: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" +#line 3298 "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; @@ -7084,11 +7215,11 @@ PASS2 - case 259: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3197 "parser.y" +#line 3302 "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; @@ -7098,11 +7229,11 @@ PASS2 - case 260: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3201 "parser.y" +#line 3306 "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); @@ -7117,11 +7248,11 @@ PASS2 - case 261: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3210 "parser.y" +#line 3315 "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); @@ -7136,11 +7267,11 @@ PASS2 - case 262: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3219 "parser.y" +#line 3324 "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); @@ -7155,11 +7286,11 @@ PASS2 - case 263: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3229 "parser.y" +#line 3334 "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; @@ -7169,11 +7300,11 @@ PASS2 - case 264: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3234 "parser.y" +#line 3339 "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)); @@ -7190,11 +7321,11 @@ PASS2 - case 265: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3247 "parser.y" +#line 3352 "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; @@ -7204,11 +7335,11 @@ PASS2 - case 266: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3252 "parser.y" +#line 3357 "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; @@ -7218,11 +7349,11 @@ PASS2 - case 267: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "parser.y" +#line 3362 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7233,11 +7364,11 @@ PASS2 - case 268: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3263 "parser.y" +#line 3368 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7248,11 +7379,11 @@ PASS2 - case 269: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3269 "parser.y" +#line 3374 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7261,22 +7392,22 @@ PASS2 - case 270: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3273 "parser.y" +#line 3378 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 271: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3275 "parser.y" +#line 3380 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -7292,11 +7423,11 @@ PASS2 - case 272: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3286 "parser.y" +#line 3391 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7310,15 +7441,15 @@ PASS2 - case 273: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3295 "parser.y" +#line 3400 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len); + (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number); (yyval.value).t = registry_getarrayclass(); } } @@ -7326,52 +7457,52 @@ PASS2 - case 274: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3302 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3407 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 275: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3303 "parser.y" +#line 3408 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 276: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3305 "parser.y" +#line 3410 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).len = 2; + (yyval.value_list).number = 2; } } break; - case 277: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3311 "parser.y" +#line 3416 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; + (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); } @@ -7380,15 +7511,15 @@ PASS2 - case 278: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3320 "parser.y" +#line 3425 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2); + (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2); (yyval.value).t = registry_getobjectclass(); } } @@ -7396,11 +7527,11 @@ PASS2 - case 279: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3327 "parser.y" +#line 3432 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7417,11 +7548,11 @@ PASS2 - case 280: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3339 "parser.y" +#line 3444 "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); @@ -7433,11 +7564,11 @@ PASS2 - case 281: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3345 "parser.y" +#line 3450 "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); @@ -7449,11 +7580,11 @@ PASS2 - case 282: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3351 "parser.y" +#line 3456 "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); @@ -7465,11 +7596,11 @@ PASS2 - case 283: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3357 "parser.y" +#line 3462 "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); @@ -7481,11 +7612,11 @@ PASS2 - case 284: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3363 "parser.y" +#line 3468 "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); @@ -7497,11 +7628,11 @@ PASS2 - case 285: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3369 "parser.y" +#line 3474 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7513,11 +7644,11 @@ PASS2 - case 286: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3375 "parser.y" +#line 3480 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7529,11 +7660,11 @@ PASS2 - case 287: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3381 "parser.y" +#line 3486 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7552,11 +7683,11 @@ PASS2 - case 288: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3394 "parser.y" +#line 3499 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7573,11 +7704,11 @@ PASS2 - case 289: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3405 "parser.y" +#line 3510 "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); @@ -7589,11 +7720,11 @@ PASS2 - case 290: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3412 "parser.y" +#line 3517 "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; @@ -7611,11 +7742,11 @@ PASS2 - case 291: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3425 "parser.y" +#line 3530 "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))) { @@ -7646,11 +7777,11 @@ PASS2 - case 292: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3452 "parser.y" +#line 3557 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7669,11 +7800,11 @@ PASS2 - case 293: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3466 "parser.y" +#line 3571 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7692,11 +7823,11 @@ PASS2 - case 294: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3480 "parser.y" +#line 3585 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7715,17 +7846,17 @@ PASS2 - case 295: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3495 "parser.y" +#line 3600 "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_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; @@ -7738,11 +7869,11 @@ PASS2 - case 296: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3509 "parser.y" +#line 3614 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7754,11 +7885,11 @@ PASS2 - case 297: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3516 "parser.y" +#line 3621 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7770,11 +7901,11 @@ PASS2 - case 298: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3523 "parser.y" +#line 3628 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7786,11 +7917,11 @@ PASS2 - case 299: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3530 "parser.y" +#line 3635 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7802,11 +7933,11 @@ PASS2 - case 300: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3537 "parser.y" +#line 3642 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7818,11 +7949,11 @@ PASS2 - case 301: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3548 "parser.y" +#line 3653 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; @@ -7832,10 +7963,10 @@ PASS2 is_static = 1; } if(t) { - if(t->subtype==0xff) { + if(t->subtype==INFOTYPE_UNRESOLVED) { syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); } - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); char noslot = 0; if(f && !is_static != !(f->flags&FLAG_STATIC)) noslot=1; @@ -7877,11 +8008,11 @@ PASS2 - case 302: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3598 "parser.y" +#line 3703 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -7923,7 +8054,7 @@ PASS2 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_nsset(state->cls->info, state->active_namespaces, (yyvsp[(1) - (1)].id), 1)) && + if(state->cls && (f = findmember_nsset(state->cls->info, (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); @@ -7989,16 +8120,16 @@ PASS2 - case 303: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3703 "parser.y" +#line 3808 "parser.y" { PASS12 NEW(namespace_decl_t,n); n->name = (yyvsp[(2) - (2)].id); - n->url = 0; + n->url = (yyvsp[(2) - (2)].id); (yyval.namespace_decl)=n; } } @@ -8006,11 +8137,11 @@ PASS2 - case 304: + case 306: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3710 "parser.y" +#line 3815 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8023,11 +8154,11 @@ PASS2 - case 305: + case 307: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3717 "parser.y" +#line 3822 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8040,15 +8171,23 @@ PASS2 - case 306: + case 308: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3724 "parser.y" +#line 3829 "parser.y" { PASS12 - list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl)); - tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name); + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + (yyval.code)=0; } } @@ -8056,20 +8195,15 @@ PASS2 - case 307: + case 309: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3731 "parser.y" +#line 3844 "parser.y" { PASS12 - NEW(namespace_decl_t,n); - n->name = (yyvsp[(3) - (3)].classinfo)->name; - n->url = 0; - /* FIXME: for pass2, we should now try to figure out what the URL of - this thing is */ - list_append(state->new_namespaces, n); - tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); + char*url = 0; + trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, url); (yyval.code)=0; } } @@ -8079,7 +8213,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 8083 "parser.tab.c" +#line 8217 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);