X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=59cda49dac493e81d184c251be1e08c4002a3a4a;hb=15d3df10f09bd780efa101d0c253db96716eb145;hp=894549c102b78e6c0cdd1dac3e0c126451bdaad4;hpb=434d5040b814eae784d080c695fe8c3d370a166b;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 894549c..59cda49 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -265,6 +265,7 @@ tokenunion abc_exception_t *exception; regexp_t regexp; modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -273,7 +274,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 277 "parser.tab.c" +#line 278 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -284,7 +285,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 263 "parser.y" +#line 265 "parser.y" static int a3_error(char*s) @@ -342,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; @@ -361,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; @@ -372,8 +376,10 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; - namespace_list_t*active_namespaces; + 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 @@ -451,9 +457,13 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; + state->new_namespaces = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; @@ -464,6 +474,18 @@ static void state_has_imports() state->imports = dict_clone(state->imports); state->has_own_imports = 1; } +static void import_toplevel(const char*package) +{ + char* s = strdup(package); + while(1) { + dict_put(state->import_toplevel_packages, s, 0); + char*x = strrchr(s, '.'); + if(!x) + break; + *x = 0; + } + free(s); +} static void state_destroy(state_t*state) { @@ -496,6 +518,12 @@ static void old_state() 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); @@ -534,11 +562,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 } } @@ -657,8 +685,9 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c v->index = state->method->variable_count++; v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); return v; } @@ -736,17 +765,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); @@ -840,6 +879,7 @@ static namespace_t modifiers2access(modifiers_t*mod) } return ns; } +static slotinfo_t* find_class(const char*name); static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { @@ -855,12 +895,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; + m->variable_count = m->uses_slots; } if(params) { @@ -869,16 +910,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); + } + } + } + } } @@ -888,6 +948,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; @@ -897,6 +958,12 @@ 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(); + } /* create the class name, together with the proper attributes */ int access=0; @@ -933,6 +1000,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) { @@ -946,17 +1019,18 @@ 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); - - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + 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; + while(state->cls->info->interfaces[pos]) { + if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE)) + syntaxerror("'%s' is not an interface", + state->cls->info->interfaces[pos]->name); + pos++; } + /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ + state->cls->info->superclass = extends; + /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); multiname_t*extends2 = sig2mname(extends); @@ -1037,10 +1111,14 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl } } -static void setstaticfunction(int x) +static int slotstate_varconst = 0; +static modifiers_t*slotstate_flags = 0; +static void setslotstate(modifiers_t* flags, int varconst) { + slotstate_varconst = varconst; + slotstate_flags = flags; if(state->cls) { - if(x&FLAG_STATIC) { + if(flags && flags->flags&FLAG_STATIC) { state->method = state->cls->static_init; } else { state->method = state->cls->init; @@ -1091,6 +1169,10 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___PUSHPACKAGE__) { + char*name = string_cstr(c->data[0]); + syntaxerror("Can't reference a package (%s) as such", name); + } c=c->prev; } } @@ -1098,6 +1180,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 @@ -1126,12 +1209,15 @@ static void check_override(memberinfo_t*m, int flags) return; if(m->flags & FLAG_FINAL) syntaxerror("can't override final member %s", m->name); + + /* allow this. it's no issue. if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC)) - syntaxerror("can't override static member %s", m->name); + syntaxerror("can't override static member %s", m->name);*/ + if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC)) syntaxerror("can't override non-static member %s with static declaration", m->name); - if(!(flags&FLAG_OVERRIDE)) { + if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) { if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) { if(m->kind == INFOTYPE_METHOD) syntaxerror("can't override without explicit 'override' declaration"); @@ -1148,7 +1234,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c if(!state->cls) { //package method minfo = methodinfo_register_global(ns.access, state->package, name); - minfo->return_type = return_type; + minfo->return_type = 0; // save this for pass 2 } else if(getset != KW_GET && getset != KW_SET) { //class method memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); @@ -1159,7 +1245,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); - minfo->return_type = return_type; + minfo->return_type = 0; // save this for pass 2 // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1167,10 +1253,12 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c //class getter/setter int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET; classinfo_t*type=0; - if(getset == KW_GET) + if(getset == KW_GET) { type = return_type; - else if(params->list && params->list->param) + } else if(params->list && params->list->param && !params->list->next) { type = params->list->param->type; + } else + syntaxerror("setter function needs to take exactly one argument"); // not sure wether to look into superclasses here, too minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { @@ -1182,17 +1270,22 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ minfo->subtype |= gs; - if(!minfo->return_type) { - minfo->return_type = type; - } else { - if(minfo && minfo->return_type != type) - syntaxerror("different type in getter and setter"); - } + + /* + FIXME: this check needs to be done in pass 2 + + if((!minfo->return_type != !type) || + (minfo->return_type && type && + !strcmp(minfo->return_type->name, type->name))) { + syntaxerror("different type in getter and setter: %s and %s", + minfo->return_type?minfo->return_type->name:"*", + type?type->name:"*"); + }*/ } else { minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; - minfo->return_type = type; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; @@ -1233,7 +1326,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); - + function_initvars(state->method, params, 0, 1); } @@ -1269,7 +1362,6 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, if(state->method->is_constructor) name = "__as3_constructor__"; - return_type = 0; state->method->info = registerfunction(getset, mod, name, params, return_type, 0); function_initvars(state->method, params, mod->flags, 1); @@ -1306,7 +1398,9 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* function_initvars(state->method, 0, 0, 0); methodstate_list_t*ml = state->method->innerfunctions; + dict_t*xvars = dict_new(); + while(ml) { methodstate_t*m = ml->methodstate; parserassert(m->inner); @@ -1317,7 +1411,8 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* dictentry_t*l = d->slots[t]; while(l) { /* check parent method's variables */ - if(find_variable(state, l->key)) { + variable_t*v; + if((v=find_variable(state, l->key))) { m->uses_parent_function = 1; state->method->uses_slots = 1; dict_put(xvars, l->key, 0); @@ -1332,10 +1427,12 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } ml = ml->next; } + if(state->method->uses_slots) { state->method->slots = dict_new(); int i = 1; DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) { + if(!name) syntaxerror("internal error"); if(v->index && dict_contains(xvars, name)) { v->init = 0; v->index = i++; @@ -1349,8 +1446,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; } - dict_destroy(xvars); - old_state(); return 0; } @@ -1422,6 +1517,11 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* check_code_for_break(body); + /* Seems this works now. + if(state->method->exceptions && state->method->uses_slots) { + as3_warning("try/catch and activation not supported yet within the same method"); + }*/ + if(f->body) { f->body->code = body; f->body->exceptions = state->method->exceptions; @@ -1568,7 +1668,37 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static const char* get_package_from_name(const char*name) +{ + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + +static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1605,6 +1735,43 @@ static slotinfo_t* find_class(char*name) return 0; } +typedcode_t push_class(slotinfo_t*a) +{ + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); + } else { + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; + } + } else { + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); + } else { + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); + } + x.t = TYPE_CLASS(c); + } + return x; +} static char is_getlocal(code_t*c) { @@ -1652,7 +1819,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } else { prefix = 0; } - + char use_temp_var = readbefore; /* generate the write instruction, and maybe append a dup to the prefix code */ @@ -1701,6 +1868,10 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETLOCAL_2; } else if(r->opcode == OPCODE_GETLOCAL_3) { write->opcode = OPCODE_SETLOCAL_3; + } else if(r->opcode == OPCODE_GETSUPER) { + write->opcode = OPCODE_SETSUPER; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); } else { code_dump(r); syntaxerror("illegal lvalue: can't assign a value to this expression"); @@ -1895,10 +2066,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); } } @@ -1912,7 +2083,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1916 "parser.tab.c" +#line 2087 "parser.tab.c" #ifdef short # undef short @@ -2127,16 +2298,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2992 +#define YYLAST 3061 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 111 +#define YYNNTS 114 /* YYNRULES -- Number of rules. */ -#define YYNRULES 304 +#define YYNRULES 308 /* YYNRULES -- Number of states. */ -#define YYNSTATES 514 +#define YYNSTATES 520 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -2202,159 +2373,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, 450, 451, 454, 456, 458, 460, 462, 464, - 466, 468, 470, 472, 473, 475, 478, 483, 487, 489, - 494, 497, 499, 501, 502, 503, 516, 518, 519, 520, - 531, 533, 537, 539, 541, 543, 547, 549, 551, 553, - 556, 557, 558, 562, 563, 565, 567, 569, 572, 575, - 576, 581, 586, 591, 594, 596, 599, 601, 603, 607, - 609, 611, 613, 615, 617, 619, 621, 623, 625, 627, - 629, 631, 633, 635, 637, 639, 641, 643, 647, 651, - 655, 659, 663, 667, 671, 675, 679, 683, 686, 689, - 693, 697, 701, 705, 709, 713, 717, 721, 725, 729, - 733, 737, 741, 745, 749, 754, 757, 759, 763, 766, - 771, 775, 776, 778, 782, 788, 792, 796, 800, 804, - 808, 812, 816, 820, 824, 828, 832, 836, 842, 845, - 848, 851, 854, 858, 861, 866, 872, 876, 882, 886, - 888, 891, 894, 899, 904 + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 311, 313, 314, 321, 322, 328, 331, 336, + 337, 339, 341, 344, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 365, 368, 369, 372, 373, 376, + 377, 387, 388, 397, 398, 400, 402, 405, 407, 412, + 414, 416, 418, 419, 421, 423, 426, 428, 431, 440, + 442, 444, 445, 450, 452, 456, 460, 461, 464, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 483, 485, + 488, 493, 497, 499, 504, 507, 509, 511, 512, 513, + 526, 528, 529, 530, 541, 543, 547, 549, 551, 553, + 557, 559, 561, 563, 566, 567, 568, 572, 573, 575, + 577, 579, 582, 585, 586, 591, 596, 601, 604, 606, + 609, 611, 613, 617, 619, 621, 623, 625, 627, 629, + 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, + 651, 653, 657, 661, 665, 669, 673, 677, 681, 685, + 689, 693, 696, 699, 703, 707, 711, 715, 719, 723, + 727, 731, 735, 739, 743, 747, 751, 755, 759, 764, + 767, 769, 773, 776, 781, 785, 786, 788, 792, 798, + 802, 806, 810, 814, 818, 822, 826, 830, 834, 838, + 842, 846, 852, 855, 858, 861, 864, 868, 871, 876, + 882, 886, 892, 896, 898, 901, 906, 911, 914 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 185, -1, 197, -1, 195, -1, 214, - -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, 214, -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, 236, -1, 244, -1, 243, -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, 233, -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, 234, -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, 224, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 235, 133, 146, 153, -1, -1, - 150, -1, 236, -1, 46, 3, 224, -1, 3, -1, + 152, -1, 3, 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, - 235, 99, 236, 133, 146, -1, 158, 157, 68, 235, - 133, 146, -1, -1, 14, 122, 162, 235, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 235, 133, -1, + 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, 237, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 237, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 224, 133, 174, 126, + 168, 169, -1, 34, 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, 235, -1, 37, -1, 39, 122, 235, 133, 146, - -1, 3, -1, 19, -1, 184, 127, 183, -1, 183, - -1, -1, 19, 184, 126, 186, 139, 132, -1, -1, - 19, 126, 187, 139, 132, -1, 41, 220, -1, 41, - 184, 127, 115, -1, -1, 190, -1, 191, -1, 190, - 191, -1, 21, -1, 22, -1, 20, -1, 38, -1, - 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 221, -1, -1, 54, 222, -1, - -1, 17, 222, -1, -1, 189, 31, 3, 192, 194, - 126, 196, 199, 132, -1, -1, 189, 44, 3, 193, - 126, 198, 202, 132, -1, -1, 200, -1, 201, -1, - 200, 201, -1, 99, -1, 148, 126, 199, 132, -1, - 206, -1, 214, -1, 144, -1, -1, 203, -1, 204, - -1, 203, 204, -1, 99, -1, 46, 3, -1, 189, - 27, 213, 3, 122, 210, 133, 224, -1, 46, -1, - 32, -1, -1, 189, 205, 3, 207, 224, 149, -1, - -1, 102, 209, -1, 10, -1, 8, -1, 9, -1, + 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, + 182, 146, -1, 3, -1, 19, -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, 211, -1, 93, 212, -1, 211, 100, - 93, 212, -1, 211, 100, 212, -1, 212, -1, 3, - 105, 223, 208, -1, 3, 208, -1, 51, -1, 35, - -1, -1, -1, 189, 27, 213, 3, 122, 210, 133, - 224, 126, 215, 142, 132, -1, 3, -1, -1, -1, - 27, 216, 122, 210, 133, 224, 126, 218, 142, 132, - -1, 3, -1, 184, 127, 3, -1, 220, -1, 219, - -1, 221, -1, 222, 100, 221, -1, 221, -1, 115, - -1, 36, -1, 105, 223, -1, -1, -1, 122, 226, - 133, -1, -1, 227, -1, 228, -1, 234, -1, 227, - 100, -1, 228, 234, -1, -1, 25, 237, 229, 225, - -1, 237, 122, 226, 133, -1, 53, 122, 226, 133, - -1, 63, 237, -1, 42, -1, 42, 235, -1, 237, - -1, 237, -1, 235, 100, 237, -1, 235, -1, 217, - -1, 238, -1, 241, -1, 230, -1, 232, -1, 231, + 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, 3, -1, 185, 127, 3, -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, 237, 109, 237, -1, 237, 110, 237, - -1, 237, 75, 237, -1, 237, 76, 237, -1, 237, - 71, 237, -1, 237, 72, 237, -1, 237, 74, 237, - -1, 237, 73, 237, -1, 237, 87, 237, -1, 237, - 88, 237, -1, 118, 237, -1, 117, 237, -1, 237, - 108, 237, -1, 237, 107, 237, -1, 237, 106, 237, - -1, 237, 96, 237, -1, 237, 95, 237, -1, 237, - 94, 237, -1, 237, 114, 237, -1, 237, 116, 237, - -1, 237, 113, 237, -1, 237, 112, 237, -1, 237, - 115, 237, -1, 237, 68, 237, -1, 237, 69, 237, - -1, 237, 40, 237, -1, 237, 67, 237, -1, 43, - 122, 237, 133, -1, 36, 237, -1, 36, -1, 122, - 235, 133, -1, 112, 237, -1, 237, 124, 237, 125, - -1, 124, 226, 125, -1, -1, 240, -1, 234, 105, - 234, -1, 240, 100, 234, 105, 234, -1, 70, 239, - 132, -1, 237, 80, 237, -1, 237, 79, 237, -1, - 237, 85, 237, -1, 237, 84, 237, -1, 237, 86, - 237, -1, 237, 78, 237, -1, 237, 77, 237, -1, - 237, 83, 237, -1, 237, 81, 237, -1, 237, 82, - 237, -1, 237, 102, 237, -1, 237, 104, 237, 105, - 237, -1, 237, 91, -1, 237, 90, -1, 91, 237, - -1, 90, 237, -1, 53, 127, 3, -1, 128, 3, - -1, 237, 127, 128, 3, -1, 237, 127, 3, 89, - 3, -1, 237, 92, 3, -1, 237, 127, 122, 237, - 133, -1, 237, 127, 3, -1, 3, -1, 18, 3, - -1, 189, 242, -1, 189, 242, 102, 3, -1, 189, - 242, 102, 5, -1, 23, 220, -1 + -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, 1893, 1893, 1895, 1895, 1896, 1897, 1899, 1900, 1901, - 1902, 1903, 1904, 1905, 1906, 1908, 1908, 1909, 1910, 1912, - 1913, 1914, 1915, 1916, 1917, 1918, 1920, 1921, 1923, 1924, - 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, - 1937, 1938, 1939, 1940, 1943, 1944, 1945, 1946, 1947, 1948, - 1949, 1950, 1954, 1955, 1959, 1966, 1970, 1971, 1975, 1976, - 1978, 1979, 1981, 2042, 2043, 2046, 2046, 2065, 2066, 2067, - 2072, 2076, 2081, 2082, 2084, 2104, 2148, 2148, 2167, 2167, - 2182, 2185, 2188, 2191, 2195, 2196, 2197, 2198, 2199, 2200, - 2202, 2213, 2216, 2216, 2245, 2245, 2269, 2269, 2285, 2286, - 2287, 2288, 2296, 2305, 2305, 2350, 2354, 2365, 2374, 2375, - 2377, 2378, 2380, 2380, 2382, 2382, 2385, 2400, 2416, 2417, - 2418, 2419, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, - 2435, 2436, 2440, 2441, 2443, 2444, 2446, 2447, 2451, 2449, - 2457, 2455, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, - 2473, 2479, 2480, 2481, 2482, 2483, 2484, 2487, 2500, 2500, - 2502, 2502, 2577, 2578, 2580, 2581, 2582, 2583, 2584, 2586, - 2587, 2588, 2589, 2598, 2602, 2608, 2614, 2622, 2627, 2633, - 2641, 2649, 2650, 2651, 2654, 2653, 2670, 2671, 2673, 2672, - 2696, 2707, 2720, 2721, 2723, 2724, 2726, 2727, 2728, 2737, - 2738, 2742, 2743, 2745, 2746, 2747, 2749, 2753, 2754, 2759, - 2760, 2796, 2842, 2863, 2884, 2887, 2894, 2895, 2896, 2902, - 2908, 2910, 2912, 2914, 2916, 2918, 2920, 2937, 2942, 2945, - 2948, 2951, 2954, 2957, 2960, 2963, 2966, 2970, 2973, 2976, - 2979, 2982, 2985, 2988, 2991, 2995, 3006, 3024, 3029, 3034, - 3039, 3044, 3049, 3053, 3057, 3062, 3066, 3070, 3079, 3088, - 3098, 3103, 3115, 3121, 3126, 3132, 3138, 3142, 3144, 3155, - 3164, 3171, 3172, 3174, 3180, 3189, 3196, 3208, 3214, 3220, - 3226, 3232, 3238, 3244, 3250, 3263, 3274, 3281, 3294, 3321, - 3335, 3349, 3363, 3378, 3385, 3392, 3399, 3406, 3417, 3451, - 3572, 3578, 3581, 3584, 3587 + 0, 2065, 2065, 2067, 2067, 2068, 2069, 2071, 2072, 2073, + 2074, 2075, 2076, 2077, 2078, 2080, 2080, 2081, 2082, 2084, + 2085, 2086, 2087, 2088, 2089, 2090, 2092, 2093, 2095, 2096, + 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, + 2109, 2110, 2111, 2112, 2115, 2116, 2117, 2118, 2119, 2120, + 2121, 2122, 2126, 2127, 2131, 2138, 2142, 2143, 2147, 2148, + 2150, 2151, 2153, 2214, 2215, 2218, 2218, 2237, 2238, 2239, + 2244, 2248, 2253, 2254, 2256, 2276, 2324, 2324, 2343, 2343, + 2358, 2361, 2364, 2367, 2371, 2372, 2373, 2374, 2375, 2376, + 2378, 2389, 2392, 2392, 2421, 2421, 2446, 2446, 2462, 2463, + 2464, 2465, 2473, 2482, 2482, 2531, 2535, 2546, 2558, 2575, + 2576, 2578, 2579, 2581, 2581, 2583, 2583, 2586, 2602, 2619, + 2620, 2621, 2622, 2630, 2631, 2632, 2633, 2634, 2635, 2636, + 2637, 2638, 2639, 2643, 2644, 2646, 2647, 2649, 2650, 2654, + 2652, 2660, 2658, 2667, 2668, 2669, 2670, 2671, 2672, 2673, + 2674, 2676, 2682, 2683, 2684, 2685, 2686, 2687, 2690, 2703, + 2703, 2705, 2705, 2707, 2708, 2710, 2785, 2786, 2788, 2789, + 2790, 2791, 2792, 2794, 2795, 2796, 2797, 2809, 2813, 2819, + 2825, 2833, 2838, 2844, 2852, 2860, 2861, 2862, 2865, 2864, + 2881, 2882, 2884, 2883, 2907, 2926, 2940, 2941, 2943, 2944, + 2946, 2947, 2948, 2957, 2958, 2962, 2963, 2965, 2966, 2967, + 2969, 2973, 2974, 2979, 2980, 3016, 3062, 3083, 3104, 3107, + 3114, 3115, 3116, 3122, 3128, 3130, 3132, 3134, 3136, 3138, + 3140, 3157, 3162, 3165, 3168, 3171, 3174, 3177, 3180, 3183, + 3186, 3190, 3193, 3196, 3199, 3202, 3205, 3208, 3211, 3215, + 3226, 3244, 3249, 3254, 3259, 3264, 3269, 3273, 3277, 3282, + 3286, 3290, 3299, 3308, 3318, 3323, 3335, 3341, 3346, 3352, + 3358, 3362, 3364, 3375, 3384, 3391, 3392, 3394, 3400, 3409, + 3416, 3428, 3434, 3440, 3446, 3452, 3458, 3464, 3470, 3483, + 3494, 3501, 3514, 3541, 3555, 3569, 3583, 3598, 3605, 3612, + 3619, 3626, 3637, 3687, 3792, 3799, 3806, 3813, 3820 }; #endif @@ -2395,14 +2567,14 @@ 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", - "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", - "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", + "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST", + "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", @@ -2449,27 +2621,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, 209, 209, 209, 209, 209, - 209, 209, 209, 210, 210, 210, 210, 211, 211, 212, - 212, 213, 213, 213, 215, 214, 216, 216, 218, 217, - 219, 220, 221, 221, 222, 222, 223, 223, 223, 224, - 224, 225, 225, 226, 226, 226, 227, 228, 227, 229, - 230, 231, 231, 232, 233, 233, 234, 235, 235, 236, - 237, 237, 237, 237, 237, 237, 237, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 239, 239, 240, 240, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 241, - 242, 243, 243, 243, 244 + 178, 178, 178, 180, 179, 181, 181, 182, 183, 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, 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. */ @@ -2485,27 +2657,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, 6, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 1, 2, 4, 3, 1, 4, - 2, 1, 1, 0, 0, 12, 1, 0, 0, 10, - 1, 3, 1, 1, 1, 3, 1, 1, 1, 2, - 0, 0, 3, 0, 1, 1, 1, 2, 2, 0, - 4, 4, 4, 2, 1, 2, 1, 1, 3, 1, + 1, 2, 1, 0, 6, 2, 1, 4, 2, 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, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, + 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 4, 2, + 1, 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 2, 1, 3, 2, 4, - 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 5, 2, 2, - 2, 2, 3, 2, 4, 5, 3, 5, 3, 1, - 2, 2, 4, 4, 2 + 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 @@ -2513,342 +2685,252 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 299, 131, 232, 226, 229, 230, 227, 228, 231, - 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 187, 233, 266, 125, 0, 0, 0, 236, - 126, 128, 127, 0, 0, 235, 234, 0, 0, 271, - 0, 0, 14, 0, 0, 0, 0, 203, 118, 0, - 0, 2, 118, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 37, 7, 30, 0, 119, - 120, 9, 8, 11, 10, 220, 223, 225, 224, 219, - 39, 217, 221, 222, 41, 40, 0, 0, 72, 76, - 118, 92, 108, 109, 114, 111, 0, 0, 304, 299, - 209, 186, 0, 265, 0, 0, 116, 0, 103, 203, - 0, 213, 65, 0, 216, 0, 272, 291, 290, 268, - 248, 247, 0, 0, 204, 205, 206, 82, 0, 106, - 214, 0, 80, 44, 43, 118, 45, 29, 0, 46, - 47, 48, 50, 0, 49, 293, 1, 6, 118, 299, - 0, 68, 0, 0, 69, 0, 183, 0, 159, 0, - 158, 0, 301, 121, 0, 0, 0, 0, 0, 0, + 119, 303, 132, 236, 230, 233, 234, 231, 232, 235, + 0, 0, 78, 0, 0, 125, 123, 124, 0, 131, + 0, 130, 191, 237, 270, 126, 0, 0, 0, 240, + 127, 129, 128, 0, 0, 239, 238, 0, 0, 275, + 0, 0, 14, 0, 0, 0, 0, 207, 119, 0, + 0, 2, 119, 5, 54, 12, 0, 36, 67, 31, + 32, 33, 34, 35, 38, 119, 37, 7, 30, 0, + 120, 121, 9, 8, 11, 10, 224, 227, 229, 228, + 223, 39, 221, 225, 226, 41, 40, 0, 0, 72, + 76, 119, 92, 109, 110, 115, 112, 0, 0, 303, + 213, 190, 0, 269, 0, 0, 117, 0, 103, 207, + 0, 217, 65, 0, 220, 0, 276, 295, 294, 272, + 252, 251, 0, 0, 208, 209, 210, 82, 0, 106, + 218, 0, 80, 44, 43, 119, 45, 29, 0, 46, + 47, 48, 50, 0, 49, 297, 1, 6, 119, 303, + 0, 68, 0, 0, 69, 53, 108, 0, 187, 0, + 160, 0, 159, 161, 307, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 289, 288, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 203, 0, 0, 55, 73, - 0, 53, 0, 0, 118, 112, 0, 0, 201, 173, - 0, 0, 0, 27, 0, 292, 0, 0, 275, 0, - 267, 270, 207, 208, 83, 200, 59, 60, 105, 215, - 58, 81, 42, 28, 118, 0, 200, 0, 0, 300, - 182, 181, 0, 132, 134, 160, 0, 218, 262, 263, - 260, 261, 241, 242, 244, 243, 239, 240, 282, 281, - 277, 276, 284, 285, 283, 279, 278, 280, 245, 246, - 296, 254, 253, 252, 286, 0, 251, 250, 249, 237, - 238, 258, 257, 255, 259, 256, 0, 0, 298, 0, - 0, 0, 52, 0, 0, 25, 0, 118, 17, 23, - 0, 20, 19, 22, 21, 118, 110, 191, 203, 210, - 162, 0, 0, 174, 178, 118, 117, 264, 0, 26, - 212, 0, 273, 0, 0, 57, 0, 118, 13, 57, - 0, 0, 0, 0, 136, 0, 0, 200, 302, 303, - 0, 211, 269, 0, 0, 294, 118, 0, 0, 115, - 18, 118, 0, 0, 0, 0, 180, 175, 200, 0, - 107, 0, 118, 0, 190, 198, 197, 193, 192, 196, - 199, 0, 62, 61, 51, 0, 118, 173, 133, 0, - 0, 194, 135, 140, 57, 287, 295, 297, 77, 0, - 84, 0, 113, 202, 172, 168, 165, 166, 164, 167, - 171, 170, 169, 163, 162, 0, 0, 177, 0, 0, - 98, 102, 100, 104, 63, 274, 56, 0, 75, 0, - 137, 138, 0, 118, 161, 79, 0, 0, 0, 85, - 88, 86, 24, 179, 188, 176, 96, 0, 99, 101, - 118, 66, 118, 200, 118, 195, 0, 155, 0, 0, - 118, 153, 0, 27, 93, 89, 87, 27, 27, 200, - 64, 74, 0, 146, 150, 0, 0, 0, 118, 144, - 148, 149, 156, 183, 141, 154, 27, 91, 0, 0, - 0, 184, 118, 139, 145, 0, 90, 189, 97, 94, - 27, 0, 0, 0, 0, 147, 173, 27, 185, 0, - 0, 200, 95, 157 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 293, + 292, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 207, 0, 0, + 55, 73, 0, 0, 0, 119, 113, 0, 194, 0, + 197, 196, 308, 205, 177, 0, 0, 0, 27, 0, + 296, 0, 0, 279, 0, 271, 274, 211, 212, 83, + 204, 59, 60, 105, 219, 58, 81, 42, 28, 119, + 0, 204, 0, 0, 52, 304, 186, 185, 0, 133, + 135, 0, 222, 266, 267, 264, 265, 245, 246, 248, + 247, 243, 244, 286, 285, 281, 280, 288, 289, 287, + 283, 282, 284, 249, 250, 300, 258, 257, 256, 290, + 0, 255, 254, 253, 241, 242, 262, 261, 259, 263, + 260, 0, 0, 302, 0, 0, 0, 0, 0, 25, + 0, 119, 17, 23, 0, 20, 19, 22, 21, 119, + 111, 0, 207, 214, 166, 0, 0, 178, 182, 107, + 195, 118, 268, 0, 26, 216, 0, 277, 0, 0, + 57, 0, 119, 13, 57, 0, 0, 0, 0, 0, + 137, 0, 0, 204, 162, 163, 0, 215, 273, 0, + 0, 298, 119, 0, 0, 116, 18, 119, 0, 0, + 0, 0, 184, 179, 204, 0, 0, 119, 0, 202, + 201, 200, 203, 0, 62, 61, 51, 0, 119, 305, + 306, 177, 134, 0, 0, 198, 136, 141, 57, 0, + 291, 299, 301, 77, 0, 84, 0, 114, 206, 176, + 172, 169, 170, 168, 171, 175, 174, 173, 167, 166, + 0, 0, 181, 0, 0, 98, 102, 100, 104, 63, + 278, 56, 0, 75, 0, 138, 139, 0, 119, 165, + 164, 79, 0, 0, 0, 85, 88, 86, 24, 183, + 192, 180, 96, 0, 99, 101, 119, 66, 119, 204, + 119, 199, 0, 156, 0, 0, 119, 154, 0, 27, + 93, 89, 87, 27, 27, 204, 64, 74, 0, 147, + 151, 0, 0, 0, 119, 145, 149, 150, 157, 187, + 142, 155, 27, 91, 0, 0, 0, 188, 119, 140, + 146, 0, 90, 193, 97, 94, 27, 0, 0, 0, + 0, 148, 177, 27, 189, 0, 0, 204, 95, 158 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 306, 307, 308, 328, 329, - 136, 137, 212, 309, 138, 382, 139, 240, 237, 451, - 57, 226, 152, 153, 58, 59, 60, 61, 210, 62, - 90, 140, 141, 438, 439, 440, 441, 63, 213, 420, - 503, 421, 468, 422, 423, 64, 223, 142, 65, 95, - 97, 66, 315, 214, 67, 143, 69, 70, 344, 346, - 390, 311, 454, 312, 433, 477, 478, 479, 459, 460, - 461, 161, 313, 347, 366, 413, 322, 323, 324, 252, - 314, 500, 102, 75, 467, 377, 378, 379, 392, 380, - 335, 319, 123, 124, 125, 218, 76, 77, 78, 144, - 126, 79, 80, 81, 82, 115, 116, 83, 162, 84, - 85 + -1, 50, 51, 52, 53, 310, 311, 312, 333, 334, + 136, 137, 156, 313, 138, 384, 139, 245, 242, 457, + 57, 231, 152, 153, 58, 59, 60, 61, 212, 62, + 91, 140, 141, 444, 445, 446, 447, 63, 214, 425, + 509, 426, 474, 427, 428, 64, 228, 142, 65, 66, + 96, 219, 67, 319, 215, 68, 143, 70, 71, 350, + 352, 394, 315, 460, 316, 438, 483, 484, 485, 465, + 466, 467, 163, 317, 261, 354, 355, 372, 418, 326, + 327, 328, 258, 318, 506, 102, 76, 473, 220, 221, + 381, 396, 382, 340, 323, 123, 124, 125, 223, 77, + 78, 79, 144, 126, 80, 81, 82, 83, 115, 116, + 84, 164, 85, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -426 +#define YYPACT_NINF -388 static const yytype_int16 yypact[] = { - 1667, -42, -426, -426, -426, -426, -426, -426, -426, -426, - -37, -73, -426, -27, 11, -426, -426, -426, 71, -426, - 2087, -426, 78, -426, 2157, -426, 9, 71, 17, -426, - -426, -426, -426, -2, -4, -426, -426, 2087, 25, 2087, - 2087, 2087, -426, 2087, 2087, 2087, 2087, 2087, 627, 138, - 143, -426, 497, -426, -426, -426, 27, -426, 2017, -426, - -426, -426, -426, -426, -426, -426, -426, -426, 417, 216, - -426, -426, -426, -426, -426, -426, -426, -426, -426, 55, - -426, 2499, -426, -426, -426, -426, 197, 82, -426, -426, - 1919, -426, -426, -426, -426, -426, 19, 75, -426, -426, - -51, -426, 85, -20, 2087, 84, -426, 2087, -426, 2087, - 209, -20, -426, 117, 2499, 91, 113, -20, -20, 361, - -20, -20, -56, 99, 126, 2087, -426, 224, 225, 2087, - 2087, 225, 226, -426, -426, 757, -426, -426, 104, -426, - -426, -426, -426, 214, -426, -426, -426, -426, 1017, 163, - 231, -426, 136, 175, -426, 241, 45, 245, -426, 246, - -426, 247, 149, -426, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, -426, -426, 249, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 5, -426, -426, - 2087, 159, 248, 2087, 1147, -426, 71, 81, 144, 16, - -54, 15, 307, 1793, 127, -426, 2087, 2087, -426, 2087, - -426, -426, -426, -426, -426, 162, 168, -426, 55, 55, - 168, -426, -426, -426, 1919, 137, 162, 2087, 2087, -426, - -426, -426, 267, 217, 220, -426, 23, 2499, 1009, 489, - 489, 489, 2865, 2865, 2865, 2865, 1009, 1009, 2499, 2499, - 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2499, 2560, 2621, - -426, 213, 213, 213, 2499, 2316, 2682, 2743, 2804, 1009, - 1009, 361, 361, -20, -20, -20, 145, 2377, 187, 2087, - 276, -50, -426, 158, 2182, -426, 153, 1277, -426, -426, - 160, -426, -426, -426, -426, 1147, -426, 165, 2087, -426, - -36, 284, 156, 190, -426, 1919, -426, -426, 164, 1793, - -426, -35, -426, 193, 21, 198, 225, 887, -426, -43, - 80, -14, 179, 103, 289, 103, 186, 162, -426, -426, - 2087, -426, -426, 310, 2253, -426, 1919, 2087, 188, -426, - -426, 1147, 191, 185, 459, 21, -426, -426, 162, 20, - -426, -6, 1919, 2087, 165, -426, -426, -426, -426, -426, - -426, 2087, -426, -426, -426, 2087, 1919, 16, -426, 103, - 204, -426, 233, -426, 198, 2499, -426, -426, -426, -13, - 29, 192, -426, -426, -426, -426, -426, -426, -426, -426, - -426, -426, -426, -426, 229, 210, 284, -426, 212, 219, - -426, -426, -6, -426, 274, -426, -426, 211, -426, 215, - 233, -426, 103, 235, -426, -426, 2087, 238, 218, 29, - -426, -426, -426, -426, -426, -426, -426, 343, -426, -426, - 1919, -426, 1919, 162, 1407, -426, 346, -426, 324, 222, - 273, -426, 2438, 1793, -426, -426, -426, 1793, 1793, 162, - -426, -426, 232, -426, -426, 234, 108, 223, 1537, -426, - -426, -426, -426, 45, -426, -426, 1793, -426, 227, 237, - 244, -426, 1407, -426, -426, 349, -426, -426, -426, -426, - 1793, 239, 242, 270, 268, -426, 16, 1793, -426, 271, - 275, 162, -426, -426 + 1673, -42, -388, -388, -388, -388, -388, -388, -388, -388, + -29, -72, -388, -47, 16, -388, -388, -388, 74, -388, + 2093, -388, 64, -388, 2163, -388, -24, 42, 25, -388, + -388, -388, -388, -1, 5, -388, -388, 2093, 56, 2093, + 2093, 2093, -388, 2093, 2093, 2093, 2093, 2093, 633, 110, + 144, -388, 503, -388, -388, -388, 50, -388, 2023, -388, + -388, -388, -388, -388, -388, 1925, -388, -388, -388, 97, + 233, -388, -388, -388, -388, -388, -388, -388, -388, -388, + 104, -388, 2568, -388, -388, -388, -388, 196, 84, -388, + -388, 1925, -388, -388, -388, -388, -388, 85, 70, -388, + -59, -388, 91, 237, 2093, 87, -388, 2093, -388, 2093, + 225, 237, -388, 130, 2568, 106, 139, 237, 237, 174, + 237, 237, -61, 121, 147, 2093, -388, 245, 253, 2093, + 2093, 253, 255, -388, -388, 763, -388, -388, 135, -388, + -388, -388, -388, 249, -388, -388, -388, -388, 1023, 195, + 265, -388, 170, 202, -388, 173, -388, 270, 72, 271, + -388, 272, -388, -388, -388, -388, 2093, 2093, 2093, 2093, + 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, + 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, -388, + -388, 273, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, + 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 11, + -388, -388, 2093, 269, 2093, 1153, -388, 42, 157, 158, + -388, -388, -388, 164, 13, -57, 19, 2188, 1799, 160, + -388, 2093, 2093, -388, 2093, -388, -388, -388, -388, -388, + 189, 197, -388, 104, 104, 197, -388, -388, -388, 1925, + 163, 189, 2093, 2093, -388, 198, -388, -388, 296, 251, + 252, 305, 2568, 301, 495, 495, 495, 2934, 2934, 2934, + 2934, 301, 301, 2568, 2568, 2568, 2568, 2568, 2568, 2568, + 2568, 2568, 2568, 2629, 2690, -388, 118, 118, 118, 2568, + 2385, 2751, 2812, 2873, 301, 301, 174, 174, 237, 237, + 237, 177, 2446, 226, 2093, 311, -56, 194, 2259, -388, + 185, 1283, -388, -388, 192, -388, -388, -388, -388, 1153, + -388, 119, 2093, -388, 100, 320, 191, 230, -388, -388, + 157, -388, -388, 193, 1799, -388, -54, -388, 221, 22, + 229, 253, 893, -388, -28, 31, -16, 99, 210, 70, + 317, 70, 212, 189, 236, -388, 2093, -388, -388, 339, + 2322, -388, 1925, 2093, 213, -388, -388, 1153, 214, 217, + 54, 22, -388, -388, 189, 15, 112, 1925, 2093, -388, + -388, -388, -388, 2093, -388, -388, -388, 2093, 1925, -388, + -388, 13, -388, 70, 219, -388, 247, -388, 229, 305, + 2568, -388, -388, -388, -15, 26, 220, -388, -388, -388, + -388, -388, -388, -388, -388, -388, -388, -388, -388, 261, + 227, 320, -388, 240, 250, -388, -388, 112, -388, 286, + -388, -388, 222, -388, 242, 247, -388, 70, 203, -388, + -388, -388, 2093, 274, 246, 26, -388, -388, -388, -388, + -388, -388, -388, 377, -388, -388, 1925, -388, 1925, 189, + 1413, -388, 378, -388, 359, 256, 336, -388, 2507, 1799, + -388, -388, -388, 1799, 1799, 189, -388, -388, 263, -388, + -388, 264, 51, 262, 1543, -388, -388, -388, -388, 72, + -388, -388, 1799, -388, 266, 267, 254, -388, 1413, -388, + -388, 397, -388, -388, -388, -388, 1799, 275, 280, 278, + 276, -388, 13, 1799, -388, 279, 277, 189, -388, -388 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -426, -426, 258, -426, 305, -294, -426, 63, -425, -41, - 1, -84, -308, 58, 2, 14, 352, 290, 76, -426, - -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, - -426, -426, -426, -426, -426, -15, -12, -426, -426, 8, - -426, 10, -426, -426, -426, -426, -426, -426, -426, -128, - 94, -426, -426, -426, -426, 0, -426, 356, -426, -426, - -426, 60, -426, 62, -426, -66, -426, -40, -426, -426, - -24, -426, 3, -426, 28, -426, -372, -426, -301, -46, - 4, -426, -426, -426, -426, -426, 98, -251, 50, 100, - -236, -426, -100, -426, -426, -426, -426, -426, -426, -426, - -28, -1, -53, -8, -426, -426, -426, -426, -426, -426, - -426 + -388, -388, 257, -388, 354, -296, -388, 107, -387, -31, + 1, -55, -85, 29, 2, 21, 362, 293, 81, -388, + -388, -388, -388, -388, -388, -388, -388, -388, -388, -388, + -388, -388, -388, -388, -388, -21, -19, -388, -388, 6, + -388, 7, -388, -388, -388, -388, -388, -388, -388, -388, + -175, 76, -388, -388, -388, -388, 0, -388, 357, -388, + -388, -388, 48, -388, 49, -388, -68, -388, -53, -388, + -388, -30, -388, 3, -388, -388, 33, 18, -388, -376, + -388, -305, -49, 4, -388, -388, -388, -388, -388, 412, + -89, 52, 71, -239, -388, -96, -388, -388, -388, -388, + -388, -388, -388, -34, -9, -50, -13, -388, -388, -388, + -388, -388, -388, -388 }; /* 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 -154 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 154, 211, 135, 298, 224, - 339, 113, 100, 87, 92, 429, 103, 370, 317, 320, - 367, 362, 418, 320, 374, -70, 348, 419, 349, 111, - 93, 114, 117, 118, 93, 119, 120, 121, 487, 114, - 93, 189, 488, 489, 164, 122, 164, 86, 398, 89, - 164, 243, 68, 54, 56, 73, 74, 375, 55, 381, - 71, 496, 72, 436, 424, 164, 364, 401, 417, 365, - 187, 188, 189, 206, 92, 504, 207, 230, 428, 325, - 250, 101, 510, 356, 317, 88, 164, 164, 316, 316, - 93, 437, 388, 316, 391, 91, 251, 233, 372, 222, - 93, 114, 205, 220, 206, 296, 374, 207, 96, 321, - 55, 394, 71, 416, 72, 445, 98, 114, 109, 386, - 435, 105, 93, 110, 108, 106, 155, 299, 238, 239, - 326, 104, 415, 300, 509, 156, 376, 94, 391, 107, - 158, 145, 470, 146, 471, 215, 216, 112, 68, 54, - 56, 73, 74, 148, 160, 164, 257, 258, 259, 260, - 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, - 271, 272, 273, 274, 275, 276, 277, 278, 279, 385, - 164, 455, 281, 282, 283, 284, 285, 286, 287, 288, - 289, 290, 291, 292, 293, 294, 295, 114, 297, 332, - 208, 333, 217, 337, 209, 304, 55, 219, 71, 301, - 72, 221, 225, 229, 68, 54, 310, 472, 363, 114, - 2, 114, 227, 228, 231, 331, 232, 234, 235, 241, - 244, -71, 155, 490, 246, 247, 15, 16, 17, 2, - 19, 211, 21, 248, 249, 243, 340, 341, 253, 254, - 255, 256, 280, 243, 25, 15, 16, 17, 302, 19, - 330, 21, 303, 30, 31, 32, 318, 334, 336, 338, - 342, 343, 211, 25, 345, 513, 353, 2, 351, 355, - 357, 456, 30, 31, 32, 359, 361, 320, 211, 368, - 369, 354, -108, 15, 16, 17, 371, 19, 373, 21, - 381, 387, 211, 187, 188, 189, 389, 68, 54, 310, - 114, 25, 393, 396, 400, 68, 54, 310, 403, 456, - 30, 31, 32, 402, 442, 200, 201, 202, 203, 204, - 431, 364, 427, 432, 457, 205, 444, 206, 446, 450, - 207, 447, 395, 463, 452, 425, 469, 165, 453, 482, - 464, 483, 502, 426, 484, 493, 399, 147, 491, 497, - 492, 68, 54, 310, 506, 114, 211, -151, 211, 498, - 360, 505, 457, 114, 166, 167, 168, 499, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 507, 187, 188, 189, - 508, 190, 191, 192, 511, -152, 245, 512, 434, 193, - 151, 194, 383, 195, 196, 197, 198, 199, 236, 200, - 201, 202, 203, 204, 465, 163, 501, 466, 462, 205, - 448, 206, 449, 458, 207, 155, 485, 495, 494, 430, - 327, 0, 443, 0, 156, 0, 0, 0, 157, 158, - 0, 187, 188, 189, 476, 474, 475, 480, 481, 0, - 458, 159, 404, 160, 405, 414, 0, 406, 407, 408, - 0, 409, 0, 0, 0, 202, 203, 204, 476, 474, - 475, 480, 481, 205, 0, 206, 0, 0, 207, 0, - 0, 0, 476, 474, 475, 480, 481, -4, 0, 0, - 1, 2, 3, 4, 410, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 411, 412, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 165, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, -153, -153, -153, 0, - 37, 38, 0, 0, 173, 174, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, - 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 198, 199, - 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, - 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -4, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, - 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, - 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 134, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, - 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, - 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 242, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, - 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, - 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 132, 0, 0, 0, 39, 0, 0, + 69, 54, 56, 74, 75, 113, 213, 100, 154, 222, + 155, 103, 344, 229, 303, 434, 324, 135, 324, 93, + 373, 88, 330, 368, 111, 218, 114, 117, 118, 55, + 119, 120, 121, 191, 114, 94, 155, 122, 94, 166, + -70, 94, 320, 166, 166, 93, 166, 87, 72, 73, + 90, 320, 69, 54, 56, 74, 75, 409, 379, 410, + 442, 94, 411, 412, 413, 208, 414, 101, 209, 157, + 422, 406, 235, 218, 383, 92, 329, 362, 158, 377, + 248, 55, 493, 160, 166, 166, 494, 495, 443, 94, + 97, 238, 98, 89, 227, 225, 114, 162, 104, 415, + 72, 73, 389, 105, 390, 502, 325, 256, 421, 416, + 417, 301, 114, 145, 398, 157, 451, 388, 441, 510, + 243, 244, 330, 257, 158, 108, 516, 109, 159, 160, + 387, 166, 110, 304, 331, 420, 515, 380, 94, 305, + 423, 161, 95, 162, 146, 424, 320, 107, 69, 54, + 56, 74, 75, 262, 263, 264, 265, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 148, 55, 112, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 114, 302, 72, 73, 337, 210, + 338, 308, 370, 306, 166, 371, 211, 2, 189, 190, + 191, 216, 217, 224, 226, 69, 54, 314, 342, 114, + 478, 114, 336, 15, 16, 17, 369, 19, 230, 21, + 202, 203, 204, 205, 206, 232, 496, 2, 233, 234, + 207, 25, 208, 345, 346, 209, 236, 237, 239, 462, + 30, 31, 32, 15, 16, 17, 240, 19, 246, 21, + 392, 249, 395, -71, 189, 190, 191, 157, 251, 252, + 253, 25, 254, 255, 259, 260, 285, 403, 519, 248, + 30, 31, 32, 307, -109, 321, 322, 248, 204, 205, + 206, 360, 429, 335, 339, 343, 207, 341, 208, 348, + 347, 209, 463, 433, 395, 349, 351, 155, 353, 114, + 357, 69, 54, 314, 361, 359, 363, 365, 367, 69, + 54, 314, 155, 324, 374, 376, 378, 189, 190, 191, + 375, 383, 391, 155, 393, -152, 399, 432, 397, 405, + 2, -154, 401, 400, 430, 436, 407, 437, 461, 431, + 408, 456, 448, 450, 404, 458, 15, 16, 17, 207, + 19, 208, 21, 370, 209, 114, 452, 69, 54, 314, + 114, 476, 453, 477, 25, 459, -154, -154, 470, 469, + 475, 488, 462, 30, 31, 32, 489, 505, 490, 497, + 498, 189, 190, 191, 499, 192, 193, 194, 503, 504, + 508, 155, 512, 155, 513, 250, 147, 511, 514, 518, + -154, -154, 517, 202, 203, 204, 205, 206, 366, 439, + 151, 241, 385, 207, 471, 208, 472, 165, 209, 468, + 507, 500, 440, 454, 455, 463, 491, 449, 464, 106, + 501, 0, 419, 0, 0, 435, 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, 133, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 384, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, -153, -153, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, - 188, 189, 0, 190, 191, 192, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, -153, -153, - 0, 200, 201, 202, 203, 204, 0, 0, 0, 43, - 0, 205, 0, 206, 44, 45, 207, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -3, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 482, 480, 481, 486, 487, 0, 464, 0, -153, 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, 305, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -142, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 482, 480, 481, 486, 487, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 482, 480, + 481, 486, 487, -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, 167, 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, -154, -154, -154, 0, 37, 38, 0, 0, + 175, 176, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, + 193, 194, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 42, 0, 200, 201, 0, 202, 203, 204, + 205, 206, 0, 0, 0, 43, 0, 207, 0, 208, + 44, 45, 209, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 0, 0, 0, -4, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, + 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, + 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, -3, 0, -143, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, + 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 0, 0, 0, 134, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, + 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, + 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 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, 0, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, + 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 0, 0, 0, 247, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, -118, 0, 15, 16, 17, 18, 19, 20, 21, + 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, @@ -2859,8 +2941,86 @@ static const yytype_int16 yytable[] = 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 0, 0, 0, 386, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, + 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, + 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 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, 0, 0, 0, -3, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, + 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, + 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 309, 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, 309, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, + 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, + 0, 49, 0, 0, 0, -16, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, + 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, + 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, + 0, 0, 479, 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, -143, 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, 479, 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, -144, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, + 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, + 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, + 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, + 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 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, 0, 0, 15, + 8, 9, 10, 11, 12, 13, 0, -119, 0, 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, @@ -2869,294 +3029,301 @@ static const yytype_int16 yytable[] = 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, 133, 0, - 149, 0, 3, 4, 0, 5, 6, 7, 8, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 20, 47, 22, 48, 23, 49, 0, 128, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 28, 0, 29, 150, 0, 0, 0, 0, 0, 0, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 43, - 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 99, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 0, 0, 165, 0, 0, 0, 0, 39, 0, 0, + 0, 46, 0, 47, 0, 48, 0, 49, 1, 2, + 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 0, 0, 0, 15, 16, 17, 18, 19, + 20, 21, 22, 0, 23, 127, 0, 128, 0, 0, + 0, 24, 129, 25, 26, 0, 27, 130, 28, 0, + 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, + 35, 36, 0, 0, 0, 0, 0, 0, 37, 38, + 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 166, - 167, 168, 0, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 186, 0, 187, 188, 189, 0, 190, 191, 192, 46, - 0, 47, 0, 0, 193, 49, 194, 0, 195, 196, - 197, 198, 199, 165, 200, 201, 202, 203, 204, 0, - 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, - 0, 0, 0, 0, 0, 358, 0, 0, 0, 0, - 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 0, 187, 188, 189, 0, 190, 191, 192, - 0, 0, 0, 0, 0, 193, 165, 194, 0, 195, - 196, 197, 198, 199, 0, 200, 201, 202, 203, 204, - 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, - 207, 0, 0, 166, 167, 168, 397, 169, 170, 171, + 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, + 0, 0, 0, 0, 133, 0, 149, 0, 3, 4, + 0, 5, 6, 7, 8, 9, 0, 43, 0, 0, + 0, 0, 44, 45, 0, 0, 0, 46, 20, 47, + 22, 48, 23, 49, 0, 128, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 0, 28, 0, 29, 150, + 0, 0, 0, 0, 0, 0, 34, 0, 35, 36, + 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, + 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, + 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, + 22, 0, 23, 0, 0, 0, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 43, 28, 0, 29, 0, + 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, + 0, 49, 0, 0, 0, 0, 37, 0, 0, 0, + 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, + 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, + 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, + 22, 0, 23, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 43, 0, 0, 29, 0, + 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, + 0, 49, 0, 0, 0, 0, 0, 0, 167, 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, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 0, 187, 188, 189, 0, - 190, 191, 192, 0, 0, 0, 0, 165, 193, 0, - 194, 350, 195, 196, 197, 198, 199, 0, 200, 201, - 202, 203, 204, 0, 0, 0, 0, 0, 205, 0, - 206, 0, 0, 207, 166, 167, 168, 0, 169, 170, + 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, + 191, 0, 192, 193, 194, 46, 0, 47, 0, 0, + 195, 49, 196, 0, 197, 198, 199, 200, 201, 167, + 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, + 207, 0, 208, 0, 0, 209, 0, 0, 0, 0, + 0, 332, 0, 0, 0, 0, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 0, 187, 188, 189, - 0, 190, 191, 192, 0, 0, 0, 0, 165, 193, - 0, 194, 0, 195, 196, 197, 198, 199, 0, 200, - 201, 202, 203, 204, 0, 0, 0, 0, 0, 205, - 0, 206, 352, 0, 207, 166, 167, 168, 0, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 0, 187, 188, - 189, 0, 190, 191, 192, 0, 0, 0, 0, 165, - 193, 0, 194, 486, 195, 196, 197, 198, 199, 0, - 200, 201, 202, 203, 204, 0, 0, 0, 0, 0, - 205, 0, 206, 0, 0, 207, 166, 167, 168, 0, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 0, 187, - 188, 189, 0, 190, 191, 192, 0, 0, 0, 0, - 165, 193, 0, 194, 0, 195, 196, 197, 198, 199, - 0, 200, 201, 202, 203, 204, 0, 0, 0, 0, - 0, 205, 0, 206, 0, 0, 207, 166, 167, 168, - 0, 169, 170, 171, 172, 173, 174, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 186, 0, - 187, 188, 189, 0, 190, 191, 192, 0, 0, 0, - 0, 165, 0, 0, 0, 0, 195, 196, 197, 198, - 199, 0, 200, 201, 202, 203, 204, 0, 0, 0, - 0, 0, 205, 0, 206, 0, 0, 207, 166, 167, - 168, 0, 169, 170, 171, 172, 173, 174, 0, 0, + 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, + 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, + 0, 195, 167, 196, 0, 197, 198, 199, 200, 201, + 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, + 0, 207, 0, 208, 0, 0, 209, 0, 0, 168, + 169, 170, 364, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, + 0, 0, 0, 0, 195, 167, 196, 0, 197, 198, + 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, + 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, + 0, 0, 168, 169, 170, 402, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, + 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, + 356, 197, 198, 199, 200, 201, 0, 202, 203, 204, + 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, + 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, + 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, + 196, 0, 197, 198, 199, 200, 201, 0, 202, 203, + 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, + 208, 358, 0, 209, 168, 169, 170, 0, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, + 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, + 0, 196, 492, 197, 198, 199, 200, 201, 0, 202, + 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, + 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, + 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, + 195, 0, 196, 0, 197, 198, 199, 200, 201, 0, + 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, + 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, + 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 188, 0, 189, + 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, + 167, 0, 0, 0, 0, 197, 198, 199, 200, 201, + 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, + 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, + 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 187, 188, 189, 0, 190, 191, 192, 0, 0, - 0, 0, 165, 0, 0, 0, 0, 195, 196, 197, - 198, 199, 0, 200, 201, 202, 203, 204, 0, 0, - 0, 0, 0, 205, 0, 206, 0, 0, 207, 166, - 167, 168, 0, 169, 170, 171, 172, 173, 174, 0, + 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, + 0, 167, 0, 0, 0, 0, 197, 198, 199, 200, + 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, + 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, + 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 187, 188, 189, 0, 190, 191, 192, 0, - 0, 0, 0, 165, 0, 0, 0, 0, 0, 196, - 197, 198, 199, 0, 200, 201, 202, 203, 204, 0, - 0, 0, 0, 0, 205, 0, 206, 0, 0, 207, - 166, 167, 168, 0, 169, 170, 171, 172, 173, 174, + 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, + 0, 0, 167, 0, 0, 0, 0, 0, 198, 199, + 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, + 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, + 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 187, 188, 189, 0, 190, 191, 192, - 0, 0, 0, 0, 165, 0, 0, 0, 0, 0, - 0, 197, 198, 199, 0, 200, 201, 202, 203, 204, - 0, 0, 0, 0, 0, 205, 0, 206, 0, 0, - 207, 166, 167, 168, 0, 169, 170, 171, 172, 173, - 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 187, 188, 189, 0, 190, 191, - 192, 0, 0, 0, 0, 165, 0, 0, 0, 0, - 0, 0, -153, 198, 199, 0, 200, 201, 202, 203, - 204, 0, 0, 0, 0, 0, 205, 0, 206, 0, - 0, 207, 166, 167, 168, 0, -153, -153, -153, -153, - 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 187, 188, 189, 0, 190, - 191, 192, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 198, 199, 0, 200, 201, 202, - 203, 204, 0, 0, 0, 0, 0, 205, 0, 206, - 0, 0, 207 + 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, + 0, 0, 0, 167, 0, 0, 0, 0, 0, 0, + 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, + 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, + 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, + 0, 0, 0, 0, 167, 0, 0, 0, 0, 0, + 0, -154, 200, 201, 0, 202, 203, 204, 205, 206, + 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, + 209, 168, 169, 170, 0, -154, -154, -154, -154, 175, + 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, + 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 200, 201, 0, 202, 203, 204, 205, + 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, + 0, 209 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 58, 90, 48, 3, 109, - 246, 39, 20, 50, 3, 387, 24, 325, 3, 3, - 321, 315, 28, 3, 3, 68, 3, 33, 5, 37, - 19, 39, 40, 41, 19, 43, 44, 45, 463, 47, - 19, 92, 467, 468, 100, 46, 100, 89, 356, 122, - 100, 135, 52, 52, 52, 52, 52, 36, 0, 102, - 0, 486, 0, 34, 372, 100, 102, 361, 369, 105, - 90, 91, 92, 124, 3, 500, 127, 133, 386, 133, - 35, 3, 507, 133, 3, 122, 100, 100, 216, 217, - 19, 62, 343, 221, 345, 122, 51, 125, 133, 107, - 19, 109, 122, 104, 124, 205, 3, 127, 14, 93, - 52, 347, 52, 93, 52, 416, 18, 125, 122, 133, - 133, 27, 19, 127, 126, 27, 18, 122, 129, 130, - 115, 122, 368, 128, 506, 27, 115, 126, 389, 122, - 32, 3, 450, 0, 452, 126, 127, 122, 148, 148, - 148, 148, 148, 126, 46, 100, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 99, - 100, 432, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 227, - 3, 229, 127, 244, 122, 213, 148, 122, 148, 210, - 148, 127, 3, 100, 214, 214, 214, 453, 318, 227, - 4, 229, 105, 132, 125, 226, 100, 3, 3, 3, - 126, 68, 18, 469, 3, 99, 20, 21, 22, 4, - 24, 325, 26, 68, 3, 329, 247, 248, 3, 3, - 3, 102, 3, 337, 38, 20, 21, 22, 99, 24, - 133, 26, 14, 47, 48, 49, 122, 105, 100, 132, - 3, 54, 356, 38, 54, 511, 89, 4, 133, 3, - 122, 46, 47, 48, 49, 132, 126, 3, 372, 133, - 100, 299, 127, 20, 21, 22, 132, 24, 105, 26, - 102, 122, 386, 90, 91, 92, 17, 307, 307, 307, - 318, 38, 126, 3, 126, 315, 315, 315, 133, 46, - 47, 48, 49, 132, 132, 112, 113, 114, 115, 116, - 126, 102, 385, 100, 99, 122, 126, 124, 126, 65, - 127, 122, 350, 105, 133, 373, 3, 40, 133, 3, - 132, 27, 3, 381, 132, 132, 357, 52, 126, 132, - 126, 361, 361, 361, 122, 373, 450, 132, 452, 132, - 307, 132, 99, 381, 67, 68, 69, 133, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 126, 90, 91, 92, - 132, 94, 95, 96, 133, 132, 148, 132, 394, 102, - 58, 104, 336, 106, 107, 108, 109, 110, 128, 112, - 113, 114, 115, 116, 439, 69, 492, 439, 436, 122, - 422, 124, 422, 433, 127, 18, 460, 483, 478, 389, - 133, -1, 414, -1, 27, -1, -1, -1, 31, 32, - -1, 90, 91, 92, 454, 454, 454, 454, 454, -1, - 460, 44, 3, 46, 5, 365, -1, 8, 9, 10, - -1, 12, -1, -1, -1, 114, 115, 116, 478, 478, - 478, 478, 478, 122, -1, 124, -1, -1, 127, -1, - -1, -1, 492, 492, 492, 492, 492, 0, -1, -1, - 3, 4, 5, 6, 45, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 55, 56, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, 67, 68, 69, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + 0, 0, 0, 0, 0, 39, 91, 20, 58, 98, + 65, 24, 251, 109, 3, 391, 3, 48, 3, 3, + 325, 50, 3, 319, 37, 3, 39, 40, 41, 0, + 43, 44, 45, 92, 47, 19, 91, 46, 19, 100, + 68, 19, 217, 100, 100, 3, 100, 89, 0, 0, + 122, 226, 52, 52, 52, 52, 52, 3, 36, 5, + 34, 19, 8, 9, 10, 124, 12, 3, 127, 18, + 375, 367, 133, 3, 102, 122, 133, 133, 27, 133, + 135, 52, 469, 32, 100, 100, 473, 474, 62, 19, + 14, 125, 18, 122, 107, 104, 109, 46, 122, 45, + 52, 52, 3, 27, 5, 492, 93, 35, 93, 55, + 56, 207, 125, 3, 353, 18, 421, 133, 133, 506, + 129, 130, 3, 51, 27, 126, 513, 122, 31, 32, + 99, 100, 127, 122, 115, 374, 512, 115, 19, 128, + 28, 44, 126, 46, 0, 33, 321, 122, 148, 148, + 148, 148, 148, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 126, 148, 122, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 148, 148, 232, 3, + 234, 214, 102, 212, 100, 105, 122, 4, 90, 91, + 92, 126, 127, 122, 127, 215, 215, 215, 249, 232, + 459, 234, 231, 20, 21, 22, 322, 24, 3, 26, + 112, 113, 114, 115, 116, 105, 475, 4, 132, 100, + 122, 38, 124, 252, 253, 127, 125, 100, 3, 46, + 47, 48, 49, 20, 21, 22, 3, 24, 3, 26, + 349, 126, 351, 68, 90, 91, 92, 18, 3, 99, + 68, 38, 99, 3, 3, 3, 3, 362, 517, 334, + 47, 48, 49, 14, 127, 127, 122, 342, 114, 115, + 116, 304, 377, 133, 105, 132, 122, 100, 124, 3, + 102, 127, 99, 388, 393, 54, 54, 362, 3, 322, + 133, 311, 311, 311, 3, 89, 122, 132, 126, 319, + 319, 319, 377, 3, 133, 132, 105, 90, 91, 92, + 100, 102, 122, 388, 17, 132, 100, 387, 126, 126, + 4, 40, 3, 356, 378, 126, 132, 100, 437, 383, + 133, 65, 132, 126, 363, 133, 20, 21, 22, 122, + 24, 124, 26, 102, 127, 378, 126, 367, 367, 367, + 383, 456, 122, 458, 38, 133, 75, 76, 132, 105, + 3, 3, 46, 47, 48, 49, 27, 133, 132, 126, + 126, 90, 91, 92, 132, 94, 95, 96, 132, 132, + 3, 456, 122, 458, 126, 148, 52, 132, 132, 132, + 109, 110, 133, 112, 113, 114, 115, 116, 311, 398, + 58, 128, 341, 122, 445, 124, 445, 70, 127, 442, + 498, 484, 399, 427, 427, 99, 466, 419, 438, 27, + 489, -1, 371, -1, -1, 393, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + 460, 460, 460, 460, 460, -1, 466, -1, 132, -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, 484, 484, 484, 484, 484, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 498, 498, + 498, 498, 498, 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, -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, 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, -1, -1, -1, -1, 36, + -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, + 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, + 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, + -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, + -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, + -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, + 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, + 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, + -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, + -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, + -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, + 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, + 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, + -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, + -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, + -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, + 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, + 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, + -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, + -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, + -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, + 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, -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, 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, + -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, 66, + -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, @@ -3164,7 +3331,7 @@ static const yytype_int16 yycheck[] = -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, + 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, @@ -3173,69 +3340,94 @@ static const yytype_int16 yycheck[] = -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, 122, -1, 124, -1, 126, -1, 128, 3, 4, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, -1, -1, -1, 20, 21, 22, 23, 24, + 25, 26, 27, -1, 29, 30, -1, 32, -1, -1, + -1, 36, 37, 38, 39, -1, 41, 42, 43, -1, + 45, 46, 47, 48, 49, -1, -1, 52, 53, -1, + 55, 56, -1, -1, -1, -1, -1, -1, 63, 64, + -1, 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, + -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, 104, + 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, + 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, + -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, - 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, + 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, + 124, 125, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, - -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, + -1, 104, 105, 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, + -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, - 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, + 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, + 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, + 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, 88, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, @@ -3243,13 +3435,13 @@ static const yytype_int16 yycheck[] = 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, - -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, + -1, -1, 40, -1, -1, -1, -1, -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, 40, -1, -1, -1, -1, -1, 107, + -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, @@ -3261,16 +3453,10 @@ static const yytype_int16 yycheck[] = 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, - -1, -1, 108, 109, 110, -1, 112, 113, 114, 115, + 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, - -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, - 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, -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, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3283,52 +3469,52 @@ 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, 214, 217, 230, 231, 232, 235, - 236, 237, 238, 241, 243, 244, 89, 50, 122, 122, - 164, 122, 3, 19, 126, 183, 184, 184, 220, 3, - 237, 3, 216, 237, 122, 184, 220, 122, 126, 122, - 127, 237, 122, 234, 237, 239, 240, 237, 237, 237, - 237, 237, 235, 226, 227, 228, 234, 30, 32, 37, + 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, 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, 189, 233, 3, 0, 138, 126, 3, - 46, 150, 156, 157, 236, 18, 27, 31, 32, 44, - 46, 205, 242, 191, 100, 40, 67, 68, 69, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, - 94, 95, 96, 102, 104, 106, 107, 108, 109, 110, - 112, 113, 114, 115, 116, 122, 124, 127, 3, 122, - 162, 145, 146, 172, 187, 126, 127, 127, 229, 122, - 235, 127, 237, 180, 226, 3, 155, 105, 132, 100, - 133, 125, 100, 234, 3, 3, 151, 152, 235, 235, - 151, 3, 132, 145, 126, 136, 3, 99, 68, 3, - 35, 51, 213, 3, 3, 3, 102, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 3, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 226, 237, 3, 122, - 128, 235, 99, 14, 237, 99, 139, 140, 141, 147, - 148, 195, 197, 206, 214, 186, 183, 3, 122, 225, - 3, 93, 210, 211, 212, 133, 115, 133, 142, 143, - 133, 235, 234, 234, 105, 224, 100, 143, 132, 224, - 235, 235, 3, 54, 192, 54, 193, 207, 3, 5, - 105, 133, 125, 89, 237, 3, 133, 122, 133, 132, - 141, 126, 139, 226, 102, 105, 208, 212, 133, 100, - 146, 132, 133, 105, 3, 36, 115, 219, 220, 221, - 223, 102, 149, 152, 132, 99, 133, 122, 221, 17, - 194, 221, 222, 126, 224, 237, 3, 133, 146, 235, - 126, 139, 132, 133, 3, 5, 8, 9, 10, 12, - 45, 55, 56, 209, 223, 224, 93, 212, 28, 33, - 173, 175, 177, 178, 146, 234, 234, 236, 146, 210, - 222, 126, 100, 198, 149, 133, 34, 62, 167, 168, - 169, 170, 132, 208, 126, 212, 126, 122, 173, 175, - 65, 153, 133, 133, 196, 221, 46, 99, 189, 202, - 203, 204, 237, 105, 132, 169, 170, 218, 176, 3, - 146, 146, 224, 99, 144, 148, 189, 199, 200, 201, - 206, 214, 3, 27, 132, 204, 105, 142, 142, 142, - 224, 126, 126, 132, 201, 213, 142, 132, 132, 133, - 215, 199, 3, 174, 142, 132, 122, 126, 132, 210, - 142, 133, 132, 224 + 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, 3, 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, + 3, 115, 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) @@ -4144,7 +4330,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1920 "parser.y" +#line 2092 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4155,7 +4341,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1921 "parser.y" +#line 2093 "parser.y" {(yyval.code)=code_new();} } break; @@ -4166,7 +4352,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1923 "parser.y" +#line 2095 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4177,7 +4363,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1924 "parser.y" +#line 2096 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4188,7 +4374,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1939 "parser.y" +#line 2111 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4199,7 +4385,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1940 "parser.y" +#line 2112 "parser.y" {(yyval.code)=0;} } break; @@ -4210,7 +4396,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1943 "parser.y" +#line 2115 "parser.y" {(yyval.code)=0;} } break; @@ -4221,7 +4407,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1950 "parser.y" +#line 2122 "parser.y" {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4232,7 +4418,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1954 "parser.y" +#line 2126 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4243,7 +4429,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1955 "parser.y" +#line 2127 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4254,7 +4440,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1959 "parser.y" +#line 2131 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4268,7 +4454,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1970 "parser.y" +#line 2142 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4279,7 +4465,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1971 "parser.y" +#line 2143 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4292,7 +4478,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1975 "parser.y" +#line 2147 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4303,7 +4489,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1976 "parser.y" +#line 2148 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4314,7 +4500,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1978 "parser.y" +#line 2150 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4325,7 +4511,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1979 "parser.y" +#line 2151 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4336,7 +4522,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1982 "parser.y" +#line 2154 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4403,7 +4589,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2042 "parser.y" +#line 2214 "parser.y" {(yyval.code) = code_new();} } break; @@ -4414,7 +4600,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2043 "parser.y" +#line 2215 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4425,7 +4611,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" +#line 2218 "parser.y" {PASS12 new_state();} } break; @@ -4436,7 +4622,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" +#line 2218 "parser.y" { (yyval.code) = code_new(); @@ -4464,7 +4650,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2237 "parser.y" {(yyval.code)=code_new();} } break; @@ -4475,7 +4661,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2072 "parser.y" +#line 2244 "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); @@ -4489,7 +4675,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2076 "parser.y" +#line 2248 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4503,7 +4689,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2081 "parser.y" +#line 2253 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4514,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2082 "parser.y" +#line 2254 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4525,7 +4711,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2084 "parser.y" +#line 2256 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4554,9 +4740,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2104 "parser.y" +#line 2276 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); + if(!var) { + syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id)); + } + char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); @@ -4607,7 +4797,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2148 "parser.y" +#line 2324 "parser.y" {PASS12 new_state();} } break; @@ -4618,7 +4808,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2148 "parser.y" +#line 2324 "parser.y" { (yyval.code) = code_new(); @@ -4646,7 +4836,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2167 "parser.y" +#line 2343 "parser.y" {PASS12 new_state();} } break; @@ -4657,7 +4847,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2167 "parser.y" +#line 2343 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4681,7 +4871,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2182 "parser.y" +#line 2358 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4694,7 +4884,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2185 "parser.y" +#line 2361 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4707,7 +4897,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2188 "parser.y" +#line 2364 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4720,7 +4910,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2191 "parser.y" +#line 2367 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4733,7 +4923,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2195 "parser.y" +#line 2371 "parser.y" {(yyval.code)=0;} } break; @@ -4744,7 +4934,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" +#line 2372 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4755,7 +4945,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2197 "parser.y" +#line 2373 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4766,7 +4956,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2198 "parser.y" +#line 2374 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4777,7 +4967,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" +#line 2375 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4788,7 +4978,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2200 "parser.y" +#line 2376 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4799,7 +4989,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" +#line 2378 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4820,7 +5010,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2213 "parser.y" +#line 2389 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4833,7 +5023,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2392 "parser.y" {PASS12 new_state();} } break; @@ -4844,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2392 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4880,7 +5070,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2245 "parser.y" +#line 2421 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -4895,7 +5085,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2250 "parser.y" +#line 2426 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4909,6 +5099,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); @@ -4924,7 +5115,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2269 "parser.y" +#line 2446 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -4935,7 +5126,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2269 "parser.y" +#line 2446 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4960,7 +5151,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2285 "parser.y" +#line 2462 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4971,7 +5162,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2286 "parser.y" +#line 2463 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4982,7 +5173,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2287 "parser.y" +#line 2464 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4993,7 +5184,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2288 "parser.y" +#line 2465 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5011,7 +5202,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2296 "parser.y" +#line 2473 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5029,8 +5220,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2305 "parser.y" - {PASS12 new_state();} +#line 2482 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -5040,7 +5234,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2305 "parser.y" +#line 2485 "parser.y" { code_t*out = abc_nop(0); @@ -5066,6 +5260,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)); } @@ -5092,7 +5287,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2350 "parser.y" +#line 2531 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5106,7 +5301,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2354 "parser.y" +#line 2535 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5124,104 +5319,134 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2365 "parser.y" +#line 2546 "parser.y" + { + new_state(); + if(state->method->has_exceptions) { + char var[32]; + sprintf(var, "#with#_%d", as3_tokencount); + int v = new_variable(var,(yyvsp[(3) - (4)].value).t,0,0); + 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 108: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2558 "parser.y" { - (yyval.code) = (yyvsp[(3) - (5)].value).c; - (yyval.code) = abc_pushscope((yyval.code)); - (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code)); + /* 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; - case 109: + case 110: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2375 "parser.y" +#line 2576 "parser.y" {PASS12 (yyval.id)="package";} } break; - case 110: + case 111: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2377 "parser.y" +#line 2578 "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; - case 111: + case 112: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2378 "parser.y" +#line 2579 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; - case 112: + case 113: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2380 "parser.y" +#line 2581 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; - case 113: + case 114: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2381 "parser.y" +#line 2582 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 114: + case 115: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2382 "parser.y" +#line 2583 "parser.y" {PASS12 startpackage("");} } break; - case 115: + case 116: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2584 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 116: + case 117: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2385 "parser.y" +#line 2586 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); - if(!s) {// || !(s->flags&FLAG_BUILTIN)) { + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } @@ -5231,6 +5456,7 @@ PASS2 syntaxerror("Couldn't import class\n"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); (yyval.code)=0; } } @@ -5238,14 +5464,14 @@ PASS2 - case 117: + case 118: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2602 "parser.y" { PASS12 - if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { + if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { as3_schedule_package((yyvsp[(2) - (4)].id)); } @@ -5254,6 +5480,7 @@ PASS2 i->package = (yyvsp[(2) - (4)].id); state_has_imports(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); (yyval.code)=0; } } @@ -5261,44 +5488,44 @@ PASS2 - case 118: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2619 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 119: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2417 "parser.y" +#line 2620 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 120: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2418 "parser.y" +#line 2621 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2419 "parser.y" +#line 2622 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5311,110 +5538,110 @@ PASS2 - case 122: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2427 "parser.y" +#line 2630 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 123: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2428 "parser.y" +#line 2631 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 124: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2429 "parser.y" +#line 2632 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 125: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2430 "parser.y" +#line 2633 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 126: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2431 "parser.y" +#line 2634 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 127: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2432 "parser.y" +#line 2635 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 128: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2433 "parser.y" +#line 2636 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 129: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2434 "parser.y" +#line 2637 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 130: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2435 "parser.y" +#line 2638 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 131: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2436 "parser.y" +#line 2639 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5423,99 +5650,99 @@ PASS2 - case 132: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2440 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2643 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 133: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2644 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 134: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2443 "parser.y" +#line 2646 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 135: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2444 "parser.y" +#line 2647 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 136: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2446 "parser.y" +#line 2649 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 137: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2650 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 138: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2451 "parser.y" +#line 2654 "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 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2453 "parser.y" +#line 2656 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 140: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2457 "parser.y" +#line 2660 "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));} } @@ -5523,22 +5750,22 @@ PASS2 - case 141: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2460 "parser.y" +#line 2663 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 151: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2473 "parser.y" +#line 2676 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5549,11 +5776,11 @@ PASS2 - case 156: + case 157: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2484 "parser.y" +#line 2687 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5562,11 +5789,11 @@ PASS2 - case 157: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2487 "parser.y" +#line 2690 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5582,49 +5809,82 @@ PASS2 - case 160: + case 161: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2502 "parser.y" - {setstaticfunction((yyvsp[(1) - (3)].flags).flags);} +#line 2705 "parser.y" + {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 161: + case 162: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2705 "parser.y" + {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} + } + break; + + + + case 163: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2707 "parser.y" + {(yyval.code) = (yyvsp[(1) - (1)].code);} + } + break; + + + + case 164: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2708 "parser.y" + {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} + } + break; + + + + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2502 "parser.y" +#line 2711 "parser.y" { - int flags = (yyvsp[(1) - (6)].flags).flags; - namespace_t ns = modifiers2access(&(yyvsp[(1) - (6)].flags)); + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(3) - (6)].id), 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); if(i) { check_override(i, flags); } - info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(3) - (6)].id)); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); } if(ns.name && ns.name[0]) { syntaxerror("namespaces not allowed on package-level variables"); } - info = varinfo_register_global(ns.access, state->package, (yyvsp[(3) - (6)].id)); + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); } - info->type = (yyvsp[(5) - (6)].classinfo); + info->type = (yyvsp[(2) - (3)].classinfo); info->flags = flags; /* slot name */ - multiname_t mname = {QNAME, &ns, 0, (yyvsp[(3) - (6)].id)}; + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; trait_list_t**traits; code_t**code; @@ -5644,8 +5904,8 @@ PASS2 } trait_t*t=0; - if((yyvsp[(5) - (6)].classinfo)) { - MULTINAME(m, (yyvsp[(5) - (6)].classinfo)); + if((yyvsp[(2) - (3)].classinfo)) { + MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); } else { t = trait_new_member(traits, 0, multiname_clone(&mname), 0); @@ -5654,157 +5914,159 @@ PASS2 /* initalization code (if needed) */ code_t*c = 0; - if((yyvsp[(6) - (6)].value).c && !is_pushundefined((yyvsp[(6) - (6)].value).c)) { + if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(6) - (6)].value).c); - c = converttype(c, (yyvsp[(6) - (6)].value).t, (yyvsp[(5) - (6)].classinfo)); + c = code_append(c, (yyvsp[(3) - (3)].value).c); + c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); c = abc_setslot(c, t->slot_id); } *code = code_append(*code, c); - if((yyvsp[(2) - (6)].token)==KW_CONST) { + if(slotstate_varconst==KW_CONST) { t->kind= TRAIT_CONST; } (yyval.code)=0; - setstaticfunction(0); } } break; - case 162: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2577 "parser.y" +#line 2785 "parser.y" {(yyval.constant)=0;} } break; - case 163: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2578 "parser.y" +#line 2786 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 164: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2580 "parser.y" +#line 2788 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 165: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2581 "parser.y" +#line 2789 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 166: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2582 "parser.y" +#line 2790 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 167: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2583 "parser.y" +#line 2791 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 168: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2584 "parser.y" +#line 2792 "parser.y" {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; - case 169: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2586 "parser.y" +#line 2794 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 170: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2587 "parser.y" +#line 2795 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 171: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2588 "parser.y" +#line 2796 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 172: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2589 "parser.y" +#line 2797 "parser.y" { - // TODO - as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { + (yyval.constant) = constant_new_float(__builtin_nan("")); + } else { + as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); + (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + } } } break; - case 173: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2598 "parser.y" +#line 2809 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5814,11 +6076,11 @@ PASS2 - case 174: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2813 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5828,11 +6090,11 @@ PASS2 - case 175: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" +#line 2819 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5844,11 +6106,11 @@ PASS2 - case 176: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2614 "parser.y" +#line 2825 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5860,11 +6122,11 @@ PASS2 - case 177: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2622 "parser.y" +#line 2833 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5875,11 +6137,11 @@ PASS2 - case 178: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2838 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5890,11 +6152,11 @@ PASS2 - case 179: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2633 "parser.y" +#line 2844 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5908,11 +6170,11 @@ PASS2 - case 180: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2641 "parser.y" +#line 2852 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5926,33 +6188,33 @@ PASS2 - case 183: + case 187: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2651 "parser.y" +#line 2862 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 184: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2654 "parser.y" +#line 2865 "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 185: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2655 "parser.y" +#line 2866 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -5972,33 +6234,33 @@ PASS2 - case 187: + case 191: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2671 "parser.y" +#line 2882 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 188: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2673 "parser.y" +#line 2884 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 189: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "parser.y" +#line 2885 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6022,16 +6284,24 @@ PASS2 - case 190: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2696 "parser.y" +#line 2907 "parser.y" { - PASS1 static slotinfo_t c; - memset(&c, 0, sizeof(c)); - c.name = (yyvsp[(1) - (1)].id); - (yyval.classinfo) = (classinfo_t*)&c; + 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); @@ -6042,17 +6312,18 @@ PASS2 - case 191: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2707 "parser.y" +#line 2926 "parser.y" { - PASS1 static slotinfo_t c; - memset(&c, 0, sizeof(c)); - c.package = (yyvsp[(1) - (3)].id); - c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=(classinfo_t*)&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)); @@ -6064,122 +6335,122 @@ PASS2 - case 194: + case 198: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 2943 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 195: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2724 "parser.y" +#line 2944 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 196: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" - {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} +#line 2946 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 197: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2727 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2947 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 198: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2728 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2948 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 199: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2737 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2957 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 200: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2738 "parser.y" - {(yyval.classinfo)=0;} +#line 2958 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 201: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2742 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2962 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 202: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2743 "parser.y" +#line 2963 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 203: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2965 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 206: + case 210: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2749 "parser.y" - {(yyval.value_list).len=1; +#line 2969 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6187,24 +6458,24 @@ PASS2 - case 207: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2753 "parser.y" +#line 2973 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 208: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2754 "parser.y" +#line 2974 "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); } } @@ -6212,11 +6483,11 @@ PASS2 - case 210: + case 214: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2760 "parser.y" +#line 2980 "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); @@ -6226,7 +6497,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]; @@ -6234,10 +6505,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; @@ -6253,11 +6524,11 @@ PASS2 - case 211: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2796 "parser.y" +#line 3016 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6271,7 +6542,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]; @@ -6283,17 +6554,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) { @@ -6308,11 +6579,11 @@ PASS2 - case 212: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2842 "parser.y" +#line 3062 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6329,7 +6600,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; } @@ -6338,11 +6609,11 @@ PASS2 - case 213: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 3083 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6368,11 +6639,11 @@ PASS2 - case 214: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2884 "parser.y" +#line 3104 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6381,11 +6652,11 @@ PASS2 - case 215: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2887 "parser.y" +#line 3107 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6395,33 +6666,33 @@ PASS2 - case 216: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2894 "parser.y" +#line 3114 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 217: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2895 "parser.y" +#line 3115 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 218: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2896 "parser.y" +#line 3116 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6433,11 +6704,11 @@ PASS2 - case 219: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2902 "parser.y" +#line 3122 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6446,55 +6717,55 @@ PASS2 - case 220: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2908 "parser.y" +#line 3128 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2912 "parser.y" +#line 3132 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 223: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 3134 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 224: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2916 "parser.y" +#line 3136 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 226: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2920 "parser.y" +#line 3140 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6516,11 +6787,11 @@ PASS2 - case 227: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2937 "parser.y" +#line 3157 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6531,11 +6802,11 @@ PASS2 - case 228: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2942 "parser.y" +#line 3162 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6544,11 +6815,11 @@ PASS2 - case 229: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2945 "parser.y" +#line 3165 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6557,11 +6828,11 @@ PASS2 - case 230: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2948 "parser.y" +#line 3168 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6570,11 +6841,11 @@ PASS2 - case 231: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2951 "parser.y" +#line 3171 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6583,11 +6854,11 @@ PASS2 - case 232: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2954 "parser.y" +#line 3174 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6596,11 +6867,11 @@ PASS2 - case 233: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2957 "parser.y" +#line 3177 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6609,11 +6880,11 @@ PASS2 - case 234: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2960 "parser.y" +#line 3180 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6622,11 +6893,11 @@ PASS2 - case 235: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "parser.y" +#line 3183 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6635,11 +6906,11 @@ PASS2 - case 236: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2966 "parser.y" +#line 3186 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6648,11 +6919,11 @@ PASS2 - case 237: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2970 "parser.y" +#line 3190 "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; } @@ -6661,11 +6932,11 @@ PASS2 - case 238: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "parser.y" +#line 3193 "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; } @@ -6674,11 +6945,11 @@ PASS2 - case 239: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2976 "parser.y" +#line 3196 "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; } @@ -6687,11 +6958,11 @@ PASS2 - case 240: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 3199 "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; } @@ -6700,11 +6971,11 @@ PASS2 - case 241: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" +#line 3202 "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; } @@ -6713,11 +6984,11 @@ PASS2 - case 242: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2985 "parser.y" +#line 3205 "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; } @@ -6726,11 +6997,11 @@ PASS2 - case 243: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2988 "parser.y" +#line 3208 "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; } @@ -6739,11 +7010,11 @@ PASS2 - case 244: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2991 "parser.y" +#line 3211 "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; } @@ -6752,11 +7023,11 @@ PASS2 - case 245: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2995 "parser.y" +#line 3215 "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); @@ -6773,11 +7044,11 @@ PASS2 - case 246: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3006 "parser.y" +#line 3226 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6800,11 +7071,11 @@ PASS2 - case 247: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3024 "parser.y" +#line 3244 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6814,11 +7085,11 @@ PASS2 - case 248: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3029 "parser.y" +#line 3249 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6828,11 +7099,11 @@ PASS2 - case 249: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3034 "parser.y" +#line 3254 "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; @@ -6842,11 +7113,11 @@ PASS2 - case 250: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3039 "parser.y" +#line 3259 "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; @@ -6856,11 +7127,11 @@ PASS2 - case 251: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3044 "parser.y" +#line 3264 "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; @@ -6870,11 +7141,11 @@ PASS2 - case 252: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3049 "parser.y" +#line 3269 "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; @@ -6884,11 +7155,11 @@ PASS2 - case 253: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3053 "parser.y" +#line 3273 "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; @@ -6898,11 +7169,11 @@ PASS2 - case 254: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3057 "parser.y" +#line 3277 "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; @@ -6912,11 +7183,11 @@ PASS2 - case 255: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3062 "parser.y" +#line 3282 "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; @@ -6926,11 +7197,11 @@ PASS2 - case 256: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3066 "parser.y" +#line 3286 "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; @@ -6940,11 +7211,11 @@ PASS2 - case 257: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3070 "parser.y" +#line 3290 "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); @@ -6959,11 +7230,11 @@ PASS2 - case 258: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3079 "parser.y" +#line 3299 "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); @@ -6978,11 +7249,11 @@ PASS2 - case 259: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3088 "parser.y" +#line 3308 "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); @@ -6997,11 +7268,11 @@ PASS2 - case 260: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3098 "parser.y" +#line 3318 "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; @@ -7011,11 +7282,11 @@ PASS2 - case 261: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3103 "parser.y" +#line 3323 "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)); @@ -7032,11 +7303,11 @@ PASS2 - case 262: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3116 "parser.y" +#line 3336 "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; @@ -7046,11 +7317,11 @@ PASS2 - case 263: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3121 "parser.y" +#line 3341 "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; @@ -7060,11 +7331,11 @@ PASS2 - case 264: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3126 "parser.y" +#line 3346 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7075,11 +7346,11 @@ PASS2 - case 265: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3132 "parser.y" +#line 3352 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7090,11 +7361,11 @@ PASS2 - case 266: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3138 "parser.y" +#line 3358 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7103,22 +7374,22 @@ PASS2 - case 267: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3142 "parser.y" +#line 3362 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 268: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3144 "parser.y" +#line 3364 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -7134,11 +7405,11 @@ PASS2 - case 269: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3155 "parser.y" +#line 3375 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7152,15 +7423,15 @@ PASS2 - case 270: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3164 "parser.y" +#line 3384 "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(); } } @@ -7168,52 +7439,52 @@ PASS2 - case 271: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3171 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3391 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 272: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3172 "parser.y" +#line 3392 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 273: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3174 "parser.y" +#line 3394 "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 274: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3180 "parser.y" +#line 3400 "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); } @@ -7222,15 +7493,15 @@ PASS2 - case 275: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3189 "parser.y" +#line 3409 "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(); } } @@ -7238,11 +7509,11 @@ PASS2 - case 276: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3196 "parser.y" +#line 3416 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7259,11 +7530,11 @@ PASS2 - case 277: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3208 "parser.y" +#line 3428 "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); @@ -7275,11 +7546,11 @@ PASS2 - case 278: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3214 "parser.y" +#line 3434 "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); @@ -7291,11 +7562,11 @@ PASS2 - case 279: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3220 "parser.y" +#line 3440 "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); @@ -7307,11 +7578,11 @@ PASS2 - case 280: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3226 "parser.y" +#line 3446 "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); @@ -7323,11 +7594,11 @@ PASS2 - case 281: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3232 "parser.y" +#line 3452 "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); @@ -7339,11 +7610,11 @@ PASS2 - case 282: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3238 "parser.y" +#line 3458 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7355,11 +7626,11 @@ PASS2 - case 283: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3244 "parser.y" +#line 3464 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7371,11 +7642,11 @@ PASS2 - case 284: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3250 "parser.y" +#line 3470 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7394,11 +7665,11 @@ PASS2 - case 285: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3263 "parser.y" +#line 3483 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7415,11 +7686,11 @@ PASS2 - case 286: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3274 "parser.y" +#line 3494 "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); @@ -7431,11 +7702,11 @@ PASS2 - case 287: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3281 "parser.y" +#line 3501 "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; @@ -7453,14 +7724,14 @@ PASS2 - case 288: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3294 "parser.y" +#line 3514 "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)) { + if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { int nr = getlocalnr((yyvsp[(1) - (2)].value).c); code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0; if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) { @@ -7488,11 +7759,11 @@ PASS2 - case 289: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3321 "parser.y" +#line 3541 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7511,11 +7782,11 @@ PASS2 - case 290: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3335 "parser.y" +#line 3555 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7534,11 +7805,11 @@ PASS2 - case 291: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3349 "parser.y" +#line 3569 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7557,11 +7828,11 @@ PASS2 - case 292: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3364 "parser.y" +#line 3584 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; @@ -7580,11 +7851,11 @@ PASS2 - case 293: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3378 "parser.y" +#line 3598 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7596,11 +7867,11 @@ PASS2 - case 294: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3385 "parser.y" +#line 3605 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7612,11 +7883,11 @@ PASS2 - case 295: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3392 "parser.y" +#line 3612 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7628,11 +7899,11 @@ PASS2 - case 296: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3399 "parser.y" +#line 3619 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7644,11 +7915,11 @@ PASS2 - case 297: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3406 "parser.y" +#line 3626 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7660,65 +7931,86 @@ PASS2 - case 298: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3418 "parser.y" - {(yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->data) { - t = t->data; - is_static = 1; - } - if(t) { - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); - char noslot = 0; - if(f && !is_static != !(f->flags&FLAG_STATIC)) - noslot=1; - if(f && f->slot && !noslot) { - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - } else { - MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - } - /* determine type */ - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); - if(!(yyval.value).t) - (yyval.value).c = abc_coerce_a((yyval.value).c); - } else { - /* when resolving a property on an unknown type, we do know the - name of the property (and don't seem to need the package), but - we need to make avm2 try out all access modes */ - multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); - } - } +#line 3637 "parser.y" + { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + classinfo_t*t = (yyvsp[(1) - (3)].value).t; + char is_static = 0; + if(TYPE_IS_CLASS(t) && t->data) { + t = t->data; + is_static = 1; + } + if(t) { + if(t->subtype==INFOTYPE_UNRESOLVED) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); + } + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + (yyval.value).c = abc_getslot((yyval.value).c, f->slot); + } else { + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + } + /* determine type */ + (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + if(!(yyval.value).t) + (yyval.value).c = abc_coerce_a((yyval.value).c); + } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; + char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); + if(dict_contains(state->import_toplevel_packages, package2)) { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(!a) + syntaxerror("couldn't resolve %s", package2); + (yyval.value) = push_class(a); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + (yyval.value).c = abc_coerce_a((yyval.value).c); + (yyval.value).t = registry_getanytype(); + } +} } break; - case 299: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3451 "parser.y" +#line 3687 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent function's variables. We consider everything which is not a local variable "unresolved". This encompasses class names, members of the surrounding class - etc. which *correct* because local variables of the parent function + etc. which is *correct* because local variables of the parent function would shadow those. */ if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { unknown_variable((yyvsp[(1) - (1)].id)); } + + /* let the compiler know that it might check the current directory/package + for this identifier- maybe there's a file $1.as defining $1. */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 (yyval.value).t = 0; @@ -7781,41 +8073,21 @@ PASS2 /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - if(a->access == ACCESS_PACKAGEINTERNAL && - strcmp(a->package, state->package) && - strcmp(a->package, internal_filename_package) - ) - syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", - infotypename(a),(yyvsp[(1) - (1)].id), a->package, state->package); - - if(a->kind != INFOTYPE_CLASS) { - MULTINAME(m, a); - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - if(a->kind == INFOTYPE_METHOD) { - methodinfo_t*f = (methodinfo_t*)a; - (yyval.value).t = TYPE_FUNCTION(f); - } else { - varinfo_t*v = (varinfo_t*)a; - (yyval.value).t = v->type; - } - } else { - classinfo_t*c = (classinfo_t*)a; - if(c->slot) { - (yyval.value).c = abc_getglobalscope((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, c->slot); - } else { - MULTINAME(m, c); - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - } - (yyval.value).t = TYPE_CLASS(c); - } + (yyval.value) = push_class(a); + break; + } + + /* look through package prefixes */ + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) { + (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); + (yyval.value).t = 0; break; } /* unknown object, let the avm2 resolve it */ if(1) { - as3_softwarning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); + //as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); state->method->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; @@ -7830,53 +8102,66 @@ PASS2 - case 300: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3572 "parser.y" +#line 3792 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(2) - (2)].id)); - (yyval.id)=(yyvsp[(2) - (2)].id); + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (2)].id); + n->url = 0; + (yyval.namespace_decl)=n; } } break; - case 301: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3578 "parser.y" +#line 3799 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].id); + (yyval.namespace_decl)=n; } } break; - case 302: + case 306: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3581 "parser.y" +#line 3806 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].str).str; + (yyval.namespace_decl)=n; } } break; - case 303: + case 307: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3584 "parser.y" +#line 3813 "parser.y" { + PASS12 + list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl)); + tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name); (yyval.code)=0; } } @@ -7884,14 +8169,20 @@ PASS2 - case 304: + case 308: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3587 "parser.y" +#line 3820 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(2) - (2)].classinfo)->name); + 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); (yyval.code)=0; } } @@ -7901,7 +8192,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 7905 "parser.tab.c" +#line 8196 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);