X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=d2ed21d74201dba6078d5ab80bb90fec7a2630f3;hb=4da50aa69285c6f5abd97e41dd195648b8df49fe;hp=07d76a217a1a6d55d83f6ece9ae312eced7f1029;hpb=c873335ba84fe69cb4a1183326c9cfef160509e2;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 07d76a2..d2ed21d 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -243,10 +243,11 @@ tokenunion #line 44 "parser.y" enum yytokentype token; - int flags; classinfo_t*classinfo; classinfo_list_t*classinfo_list; + slotinfo_t*slotinfo; + slotinfo_list_t*slotinfo_list; int number_int; unsigned int number_uint; @@ -263,6 +264,8 @@ tokenunion for_start_t for_start; abc_exception_t *exception; regexp_t regexp; + modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -271,7 +274,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 275 "parser.tab.c" +#line 278 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -282,7 +285,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 259 "parser.y" +#line 265 "parser.y" static int a3_error(char*s) @@ -340,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; @@ -352,6 +356,7 @@ struct _methodstate { char uses_parent_function; int uses_slots; dict_t*slots; + int activation_var; abc_method_t*abc; int var_index; // for inner methods @@ -359,6 +364,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; @@ -370,7 +377,11 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; + dict_t*import_toplevel_packages; dict_t*imports; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -378,6 +389,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -448,12 +461,20 @@ 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->vars = dict_new(); state->old = oldstate; state->new_vars = 0; + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_has_imports() { @@ -461,6 +482,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) { @@ -483,17 +516,22 @@ static void state_destroy(state_t*state) dict_destroy(state->vars);state->vars=0; } + list_free(state->active_namespace_urls) + state->active_namespace_urls = 0; + free(state); } static void old_state() { + trie_rollback(active_namespaces); + if(!state || !state->old) syntaxerror("invalid nesting"); state_t*leaving = state; state = state->old; - + if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -502,7 +540,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -517,6 +555,9 @@ void initialize_file(char*filename) if(state) { syntaxerror("invalid call to initialize_file during parsing of another file"); } + + active_namespaces = trie_new(); + new_state(); state->package = internal_filename_package = strdup(filename); @@ -531,11 +572,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 } } @@ -608,6 +649,7 @@ typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; methodstate_t*is_inner_method; } variable_t; @@ -642,6 +684,11 @@ static char variable_exists(char*name) } code_t*defaultvalue(code_t*c, classinfo_t*type); +static int alloc_local() +{ + return state->method->variable_count++; +} + static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { if(maybeslot) { @@ -651,11 +698,12 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c } NEW(variable_t, v); - v->index = state->method->variable_count++; + v->index = alloc_local(); v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); return v; } @@ -733,17 +781,36 @@ 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, char init) { - code_t*c = 0; - if(m->uses_slots || (m->late_binding && !m->inner)) { + if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { - c = abc_newactivation(c); - c = abc_pushscope(c); + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } } + return c; +} + +static code_t* method_header(methodstate_t*m) +{ + code_t*c = 0; + + c = add_scope_code(c, m, 1); + methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); @@ -769,6 +836,19 @@ static code_t* method_header(methodstate_t*m) c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); } + + if(m->slots) { + /* all parameters that are used by inner functions + need to be copied from local to slot */ + parserassert(m->activation_var); + DICT_ITERATE_ITEMS(m->slots,char*,name,variable_t*,v) { + if(v->is_parameter) { + c = abc_getlocal(c, m->activation_var); + c = abc_getlocal(c, v->index); + c = abc_setslot(c, v->index); + } + } + } list_free(m->innerfunctions); m->innerfunctions = 0; return c; @@ -810,25 +890,53 @@ static void endpackage() #define FLAG_PACKAGEINTERNAL 2048 #define FLAG_NAMESPACE 4096 -static int flags2access(int flags) +static namespace_t modifiers2access(modifiers_t*mod) { - int access = 0; - if(flags&FLAG_PUBLIC) { - if(access&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + namespace_t ns; + ns.access = 0; + ns.name = ""; + if(mod->flags&FLAG_NAMESPACE) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + syntaxerror("invalid combination of access levels and namespaces"); + ns.access = ACCESS_NAMESPACE; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + trie_dump(active_namespaces); + syntaxerror("unknown namespace: %s", mod->ns); + } + ns.name = url; + } else if(mod->flags&FLAG_PUBLIC) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PACKAGE; - } else if(flags&FLAG_PRIVATE) { - if(access&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PACKAGE; + } else if(mod->flags&FLAG_PRIVATE) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PRIVATE; - } else if(flags&FLAG_PROTECTED) { - if(access&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PRIVATE; + } else if(mod->flags&FLAG_PROTECTED) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PROTECTED; + ns.access = ACCESS_PROTECTED; } else { - access = ACCESS_PACKAGEINTERNAL; + ns.access = ACCESS_PACKAGEINTERNAL; } - return access; + return ns; +} +static slotinfo_t* find_class(const char*name); + +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); +} + +void add_active_url(const char*url) +{ + NEW(namespace_t,n); + n->name = url; + list_append(state->active_namespace_urls, n); } static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) @@ -845,56 +953,87 @@ 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) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0, 1); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - + if(m->uses_slots) { + dict_dump(m->slots, stdout, ""); + } + 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->scope_code = add_scope_code(m->scope_code, m, 0); + } + + 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) { + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); + } + v->type = type; + } + } + } } char*as3_globalclass=0; -static void startclass(int flags, char*classname, classinfo_t*extends, classinfo_list_t*implements) +static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, classinfo_list_t*implements) { if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; - if(flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) + if(mod->flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) syntaxerror("invalid modifier(s)"); - if((flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) + if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + + //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; char*package=0; - if(!(flags&FLAG_PUBLIC) && state->package==internal_filename_package) { + if(!(mod->flags&FLAG_PUBLIC) && state->package==internal_filename_package) { access = ACCESS_PRIVATE; package = internal_filename_package; - } else if(!(flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { + } else if(!(mod->flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { access = ACCESS_PACKAGEINTERNAL; package = state->package; } else if(state->package!=internal_filename_package) { access = ACCESS_PACKAGE; package = state->package; @@ -922,7 +1061,13 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* build info struct */ int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); - state->cls->info->flags |= flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + + 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) { @@ -936,17 +1081,18 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo 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); @@ -1017,7 +1163,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* flash.display.MovieClip handling */ - if(!as3_globalclass && (flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { + if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { if(state->package && state->package[0]) { as3_globalclass = concat3(state->package, ".", classname); } else { @@ -1027,10 +1173,14 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } -static void setstaticfunction(int x) +static int slotstate_varconst = 0; +static modifiers_t*slotstate_flags = 0; +static void setslotstate(modifiers_t* flags, int varconst) { + slotstate_varconst = varconst; + slotstate_flags = flags; if(state->cls) { - if(x&FLAG_STATIC) { + if(flags && flags->flags&FLAG_STATIC) { state->method = state->cls->static_init; } else { state->method = state->cls->init; @@ -1081,6 +1231,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; } } @@ -1088,6 +1242,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 @@ -1116,12 +1271,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"); @@ -1131,22 +1289,25 @@ static void check_override(memberinfo_t*m, int flags) } } -static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot) +static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot) { methodinfo_t*minfo = 0; - U8 access = flags2access(flags); + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = methodinfo_register_global(access, state->package, name); - minfo->return_type = return_type; + minfo = methodinfo_register_global(ns.access, state->package, name); + minfo->return_type = 0; // save this for pass 2 } else if(getset != KW_GET && getset != KW_SET) { //class method - memberinfo_t* m = registry_findmember(state->cls->info, name, 0); + memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { + printf("%s.%s | %s.%s\n", + m->package, m->name, + ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, access, name); - minfo->return_type = return_type; + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); + minfo->return_type = 0; // save this for pass 2 // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1154,12 +1315,14 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na //class getter/setter int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET; classinfo_t*type=0; - if(getset == KW_GET) + if(getset == KW_GET) { type = return_type; - else if(params->list && params->list->param) + } else if(params->list && params->list->param && !params->list->next) { type = params->list->param->type; + } else + syntaxerror("setter function needs to take exactly one argument"); // not sure wether to look into superclasses here, too - minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1); + minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { if(minfo->kind!=INFOTYPE_SLOT) syntaxerror("class already contains a method called '%s'", name); @@ -1169,24 +1332,30 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ minfo->subtype |= gs; - if(!minfo->return_type) { - minfo->return_type = type; - } else { - if(minfo && minfo->return_type != type) - syntaxerror("different type in getter and setter"); - } + + /* + FIXME: this check needs to be done in pass 2 + + if((!minfo->return_type != !type) || + (minfo->return_type && type && + !strcmp(minfo->return_type->name, type->name))) { + syntaxerror("different type in getter and setter: %s and %s", + minfo->return_type?minfo->return_type->name:"*", + type?type->name:"*"); + }*/ } else { - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; - minfo->return_type = type; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; + if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; + if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + return minfo; } @@ -1219,7 +1388,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); } @@ -1233,7 +1402,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) } } -static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type) { if(state->method && state->method->info) { @@ -1255,10 +1424,9 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n if(state->method->is_constructor) name = "__as3_constructor__"; - return_type = 0; - state->method->info = registerfunction(getset, flags, name, params, return_type, 0); + state->method->info = registerfunction(getset, mod, name, params, return_type, 0); - function_initvars(state->method, params, flags, 1); + function_initvars(state->method, params, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } @@ -1269,8 +1437,8 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n parserassert(state->method); if(state->cls) { - memberinfo_t*m = registry_findmember(state->cls->info, name, 2); - check_override(m, flags); + memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2); + check_override(m, mod->flags); } if(state->cls) { @@ -1278,11 +1446,11 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } state->method->info->return_type = return_type; - function_initvars(state->method, params, flags, 1); + function_initvars(state->method, params, mod->flags, 1); } } -static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { if(as3_pass==1) { @@ -1290,7 +1458,9 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, 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); @@ -1301,7 +1471,8 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, 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); @@ -1316,10 +1487,12 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, } 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++; @@ -1333,8 +1506,6 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; } - dict_destroy(xvars); - old_state(); return 0; } @@ -1354,10 +1525,10 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; + namespace_t mname_ns = modifiers2access(mod); multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) + if(mod->flags&FLAG_STATIC) f = abc_class_staticmethod(state->cls->abc, type2, &mname); else f = abc_class_method(state->cls->abc, type2, &mname); @@ -1373,7 +1544,7 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, //flash doesn't seem to allow us to access function slots //state->method->info->slot = slot; - if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; + if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; if(getset == KW_GET) f->trait->kind = TRAIT_GETTER; if(getset == KW_SET) f->trait->kind = TRAIT_SETTER; if(params->varargs) f->flags |= METHOD_NEED_REST; @@ -1406,6 +1577,11 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, 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; @@ -1552,7 +1728,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; @@ -1589,6 +1795,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) { @@ -1636,7 +1879,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 */ @@ -1685,6 +1928,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"); @@ -1771,7 +2018,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1879,10 +2125,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); } } @@ -1896,7 +2142,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1900 "parser.tab.c" +#line 2146 "parser.tab.c" #ifdef short # undef short @@ -2109,18 +2355,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 145 +#define YYFINAL 147 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2994 +#define YYLAST 3001 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 110 +#define YYNNTS 114 /* YYNRULES -- Number of rules. */ -#define YYNRULES 303 +#define YYNRULES 309 /* YYNRULES -- Number of states. */ -#define YYNSTATES 514 +#define YYNSTATES 521 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -2180,165 +2426,166 @@ static const yytype_uint16 yyprhs[] = 19, 21, 23, 25, 30, 32, 33, 35, 37, 40, 42, 44, 46, 48, 50, 55, 57, 59, 60, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, - 85, 87, 91, 94, 96, 98, 100, 102, 104, 106, - 108, 113, 115, 118, 120, 122, 126, 129, 130, 133, + 85, 87, 89, 93, 96, 98, 100, 102, 104, 106, + 108, 110, 115, 118, 120, 122, 126, 129, 130, 133, 136, 138, 142, 146, 147, 150, 151, 159, 160, 162, 164, 168, 170, 173, 177, 186, 193, 194, 201, 202, 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, 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, 892, 898, 904 + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 619, 621, 623, 625, 627, 629, + 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, + 651, 653, 655, 659, 663, 667, 671, 675, 679, 683, + 687, 691, 695, 698, 701, 705, 709, 713, 717, 721, + 725, 729, 733, 737, 741, 745, 749, 753, 757, 761, + 766, 769, 771, 775, 778, 783, 787, 788, 790, 794, + 800, 804, 808, 812, 816, 820, 824, 828, 832, 836, + 840, 844, 848, 854, 857, 860, 863, 866, 870, 873, + 878, 884, 888, 894, 898, 900, 903, 908, 913, 916 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 185, -1, 197, -1, 195, -1, 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, 243, -1, 126, 143, 132, - -1, 126, 132, -1, 99, -1, 144, -1, 150, -1, - 165, -1, 166, -1, 233, -1, 181, -1, 148, 126, - 143, 132, -1, 242, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 234, -1, -1, + 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, 236, -1, 181, -1, + 148, 126, 143, 132, -1, 145, 99, -1, 145, -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, - 12, -1, 5, -1, 56, -1, 55, -1, 45, -1, - 3, -1, -1, 211, -1, 93, 212, -1, 211, 100, - 93, 212, -1, 211, 100, 212, -1, 212, -1, 3, - 105, 223, 208, -1, 3, 208, -1, 51, -1, 35, - -1, -1, -1, 189, 27, 213, 3, 122, 210, 133, - 224, 126, 215, 142, 132, -1, 3, -1, -1, -1, - 27, 216, 122, 210, 133, 224, 126, 218, 142, 132, - -1, 3, -1, 184, 127, 3, -1, 220, -1, 219, - -1, 221, -1, 222, 100, 221, -1, 221, -1, 115, - -1, 36, -1, 105, 223, -1, -1, -1, 122, 226, - 133, -1, -1, 227, -1, 228, -1, 234, -1, 227, - 100, -1, 228, 234, -1, -1, 25, 237, 229, 225, - -1, 237, 122, 226, 133, -1, 53, 122, 226, 133, - -1, 63, 237, -1, 42, -1, 42, 235, -1, 237, - -1, 237, -1, 235, 100, 237, -1, 235, -1, 217, - -1, 238, -1, 241, -1, 230, -1, 232, -1, 231, - -1, 6, -1, 10, -1, 11, -1, 8, -1, 9, - -1, 12, -1, 5, -1, 29, -1, 56, -1, 55, - -1, 45, -1, 237, 109, 237, -1, 237, 110, 237, - -1, 237, 75, 237, -1, 237, 76, 237, -1, 237, - 71, 237, -1, 237, 72, 237, -1, 237, 74, 237, - -1, 237, 73, 237, -1, 237, 87, 237, -1, 237, - 88, 237, -1, 118, 237, -1, 117, 237, -1, 237, - 108, 237, -1, 237, 107, 237, -1, 237, 106, 237, - -1, 237, 96, 237, -1, 237, 95, 237, -1, 237, - 94, 237, -1, 237, 114, 237, -1, 237, 116, 237, - -1, 237, 113, 237, -1, 237, 112, 237, -1, 237, - 115, 237, -1, 237, 68, 237, -1, 237, 69, 237, - -1, 237, 40, 237, -1, 237, 67, 237, -1, 43, - 122, 237, 133, -1, 36, 237, -1, 36, -1, 122, - 235, 133, -1, 112, 237, -1, 237, 124, 237, 125, - -1, 124, 226, 125, -1, -1, 240, -1, 234, 105, - 234, -1, 240, 100, 234, 105, 234, -1, 70, 239, - 132, -1, 237, 80, 237, -1, 237, 79, 237, -1, - 237, 85, 237, -1, 237, 84, 237, -1, 237, 86, - 237, -1, 237, 78, 237, -1, 237, 77, 237, -1, - 237, 83, 237, -1, 237, 81, 237, -1, 237, 82, - 237, -1, 237, 102, 237, -1, 237, 104, 237, 105, - 237, -1, 237, 91, -1, 237, 90, -1, 91, 237, - -1, 90, 237, -1, 53, 127, 3, -1, 128, 3, - -1, 237, 127, 128, 3, -1, 237, 127, 3, 89, - 3, -1, 237, 92, 3, -1, 237, 127, 122, 237, - 133, -1, 237, 127, 3, -1, 3, -1, 189, 18, - 3, -1, 189, 18, 3, 102, 3, -1, 189, 18, - 3, 102, 5, -1, 23, 18, 3, -1 + 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, + 182, 146, -1, 3, -1, 19, -1, 4, -1, 185, + 127, 184, -1, 184, -1, -1, 19, 185, 126, 187, + 139, 132, -1, -1, 19, 126, 188, 139, 132, -1, + 41, 223, -1, 41, 185, 127, 115, -1, -1, 191, + -1, 192, -1, 191, 192, -1, 21, -1, 22, -1, + 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, + 26, -1, 24, -1, 4, -1, -1, 54, 224, -1, + -1, 54, 225, -1, -1, 17, 225, -1, -1, 190, + 31, 3, 193, 195, 126, 197, 200, 132, -1, -1, + 190, 44, 3, 194, 126, 199, 203, 132, -1, -1, + 201, -1, 202, -1, 201, 202, -1, 99, -1, 148, + 126, 200, 132, -1, 207, -1, 217, -1, 144, -1, + -1, 204, -1, 205, -1, 204, 205, -1, 99, -1, + 46, 3, -1, 190, 27, 216, 3, 122, 213, 133, + 227, -1, 46, -1, 32, -1, -1, 190, 206, 208, + 209, -1, 210, -1, 209, 100, 210, -1, 3, 227, + 149, -1, -1, 102, 212, -1, 10, -1, 8, -1, + 9, -1, 12, -1, 5, -1, 56, -1, 55, -1, + 45, -1, 3, -1, -1, 214, -1, 93, 215, -1, + 214, 100, 93, 215, -1, 214, 100, 215, -1, 215, + -1, 3, 105, 226, 211, -1, 3, 211, -1, 51, + -1, 35, -1, -1, -1, 190, 27, 216, 3, 122, + 213, 133, 227, 126, 218, 142, 132, -1, 3, -1, + -1, -1, 27, 219, 122, 213, 133, 227, 126, 221, + 142, 132, -1, 184, -1, 185, 127, 184, -1, 223, + -1, 222, -1, 224, -1, 225, 100, 224, -1, 224, + -1, 115, -1, 36, -1, 105, 226, -1, -1, -1, + 122, 229, 133, -1, -1, 230, -1, 231, -1, 237, + -1, 230, 100, -1, 231, 237, -1, -1, 25, 240, + 232, 228, -1, 240, 122, 229, 133, -1, 53, 122, + 229, 133, -1, 63, 240, -1, 42, -1, 42, 238, + -1, 240, -1, 240, -1, 238, 100, 240, -1, 238, + -1, 220, -1, 241, -1, 244, -1, 233, -1, 235, + -1, 234, -1, 6, -1, 10, -1, 11, -1, 8, + -1, 9, -1, 12, -1, 5, -1, 29, -1, 56, + -1, 55, -1, 45, -1, 240, 109, 240, -1, 240, + 110, 240, -1, 240, 75, 240, -1, 240, 76, 240, + -1, 240, 71, 240, -1, 240, 72, 240, -1, 240, + 74, 240, -1, 240, 73, 240, -1, 240, 87, 240, + -1, 240, 88, 240, -1, 118, 240, -1, 117, 240, + -1, 240, 108, 240, -1, 240, 107, 240, -1, 240, + 106, 240, -1, 240, 96, 240, -1, 240, 95, 240, + -1, 240, 94, 240, -1, 240, 114, 240, -1, 240, + 116, 240, -1, 240, 113, 240, -1, 240, 112, 240, + -1, 240, 115, 240, -1, 240, 68, 240, -1, 240, + 69, 240, -1, 240, 40, 240, -1, 240, 67, 240, + -1, 43, 122, 240, 133, -1, 36, 240, -1, 36, + -1, 122, 238, 133, -1, 112, 240, -1, 240, 124, + 240, 125, -1, 124, 229, 125, -1, -1, 243, -1, + 237, 105, 237, -1, 243, 100, 237, 105, 237, -1, + 70, 242, 132, -1, 240, 80, 240, -1, 240, 79, + 240, -1, 240, 85, 240, -1, 240, 84, 240, -1, + 240, 86, 240, -1, 240, 78, 240, -1, 240, 77, + 240, -1, 240, 83, 240, -1, 240, 81, 240, -1, + 240, 82, 240, -1, 240, 102, 240, -1, 240, 104, + 240, 105, 240, -1, 240, 91, -1, 240, 90, -1, + 91, 240, -1, 90, 240, -1, 53, 127, 3, -1, + 128, 3, -1, 240, 127, 128, 3, -1, 240, 127, + 3, 89, 3, -1, 240, 92, 3, -1, 240, 127, + 122, 240, 133, -1, 240, 127, 3, -1, 3, -1, + 18, 3, -1, 18, 3, 102, 3, -1, 18, 3, + 102, 5, -1, 190, 245, -1, 23, 18, 224, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1875, 1875, 1877, 1877, 1878, 1879, 1881, 1882, 1883, - 1884, 1885, 1886, 1887, 1888, 1890, 1890, 1891, 1892, 1894, - 1895, 1896, 1897, 1898, 1899, 1900, 1902, 1903, 1905, 1906, - 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916, 1917, 1918, - 1919, 1920, 1921, 1924, 1925, 1926, 1927, 1928, 1929, 1930, - 1931, 1933, 1937, 1938, 1942, 1949, 1953, 1954, 1958, 1959, - 1961, 1962, 1964, 2025, 2026, 2029, 2029, 2048, 2049, 2050, - 2055, 2059, 2064, 2065, 2067, 2087, 2131, 2131, 2150, 2150, - 2165, 2168, 2171, 2174, 2178, 2179, 2180, 2181, 2182, 2183, - 2185, 2196, 2199, 2199, 2228, 2228, 2252, 2252, 2268, 2269, - 2270, 2271, 2279, 2288, 2288, 2333, 2337, 2348, 2357, 2358, - 2360, 2361, 2363, 2363, 2365, 2365, 2368, 2383, 2399, 2400, - 2401, 2402, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2411, - 2412, 2413, 2415, 2416, 2418, 2419, 2421, 2422, 2426, 2424, - 2432, 2430, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, - 2447, 2453, 2454, 2455, 2456, 2457, 2458, 2461, 2474, 2474, - 2476, 2476, 2549, 2550, 2552, 2553, 2554, 2555, 2556, 2558, - 2559, 2560, 2561, 2570, 2574, 2580, 2586, 2594, 2599, 2605, - 2613, 2621, 2622, 2623, 2626, 2625, 2642, 2643, 2645, 2644, - 2668, 2676, 2689, 2690, 2692, 2693, 2695, 2696, 2697, 2706, - 2707, 2711, 2712, 2714, 2715, 2716, 2718, 2722, 2723, 2728, - 2729, 2765, 2811, 2832, 2853, 2856, 2863, 2864, 2865, 2871, - 2877, 2879, 2881, 2883, 2885, 2887, 2889, 2906, 2911, 2914, - 2917, 2920, 2923, 2926, 2929, 2932, 2935, 2939, 2942, 2945, - 2948, 2951, 2954, 2957, 2960, 2964, 2975, 2993, 2998, 3003, - 3008, 3013, 3018, 3022, 3026, 3031, 3035, 3039, 3048, 3057, - 3067, 3072, 3084, 3090, 3095, 3101, 3107, 3111, 3113, 3124, - 3133, 3140, 3141, 3143, 3149, 3158, 3165, 3177, 3183, 3189, - 3195, 3201, 3207, 3213, 3219, 3232, 3243, 3250, 3263, 3290, - 3304, 3318, 3332, 3346, 3353, 3360, 3367, 3374, 3385, 3419, - 3540, 3541, 3542, 3544 + 0, 2124, 2124, 2126, 2126, 2127, 2128, 2130, 2131, 2132, + 2133, 2134, 2135, 2136, 2137, 2139, 2139, 2140, 2141, 2143, + 2144, 2145, 2146, 2147, 2148, 2149, 2151, 2152, 2154, 2155, + 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167, + 2168, 2169, 2170, 2171, 2174, 2175, 2176, 2177, 2178, 2179, + 2180, 2181, 2185, 2186, 2190, 2197, 2201, 2202, 2206, 2207, + 2209, 2210, 2212, 2273, 2274, 2277, 2277, 2296, 2297, 2298, + 2303, 2307, 2312, 2313, 2315, 2335, 2383, 2383, 2402, 2402, + 2417, 2420, 2423, 2426, 2430, 2431, 2432, 2433, 2434, 2435, + 2437, 2448, 2451, 2451, 2482, 2482, 2507, 2507, 2523, 2524, + 2525, 2526, 2534, 2543, 2543, 2592, 2596, 2607, 2617, 2634, + 2635, 2636, 2638, 2639, 2641, 2641, 2643, 2643, 2646, 2660, + 2676, 2677, 2678, 2679, 2686, 2687, 2688, 2689, 2690, 2691, + 2692, 2693, 2694, 2695, 2699, 2700, 2702, 2703, 2705, 2706, + 2710, 2708, 2716, 2714, 2723, 2724, 2725, 2726, 2727, 2728, + 2729, 2730, 2732, 2738, 2739, 2740, 2741, 2742, 2743, 2746, + 2759, 2759, 2761, 2761, 2763, 2764, 2766, 2841, 2842, 2844, + 2845, 2846, 2847, 2848, 2850, 2851, 2852, 2853, 2865, 2869, + 2875, 2881, 2889, 2894, 2900, 2908, 2916, 2917, 2918, 2921, + 2920, 2937, 2938, 2940, 2939, 2963, 2982, 2996, 2997, 2999, + 3000, 3002, 3003, 3004, 3013, 3014, 3018, 3019, 3021, 3022, + 3023, 3025, 3029, 3030, 3035, 3036, 3072, 3118, 3139, 3160, + 3163, 3170, 3171, 3172, 3178, 3184, 3185, 3186, 3187, 3188, + 3190, 3192, 3209, 3214, 3217, 3220, 3223, 3226, 3229, 3232, + 3235, 3238, 3242, 3245, 3248, 3251, 3254, 3257, 3260, 3263, + 3267, 3278, 3296, 3301, 3306, 3311, 3316, 3321, 3325, 3329, + 3334, 3338, 3342, 3351, 3360, 3370, 3375, 3387, 3393, 3398, + 3404, 3410, 3414, 3416, 3427, 3436, 3443, 3444, 3446, 3452, + 3461, 3468, 3480, 3486, 3492, 3498, 3504, 3510, 3516, 3522, + 3535, 3546, 3553, 3566, 3593, 3607, 3621, 3635, 3650, 3657, + 3664, 3671, 3678, 3693, 3749, 3858, 3865, 3872, 3879, 3894 }; #endif @@ -2379,14 +2626,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", @@ -2394,7 +2641,7 @@ static const char *const yytname[] = "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", - "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2427,33 +2674,33 @@ static const yytype_uint8 yyr1[] = 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, + 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, 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, 242, 242, 243 + 178, 178, 178, 180, 179, 181, 181, 182, 183, 184, + 184, 184, 185, 185, 187, 186, 188, 186, 189, 189, + 190, 190, 191, 191, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 193, 193, 194, 194, 195, 195, + 197, 196, 199, 198, 200, 200, 201, 201, 202, 202, + 202, 202, 202, 203, 203, 204, 204, 205, 205, 205, + 206, 206, 208, 207, 209, 209, 210, 211, 211, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, + 213, 213, 214, 214, 215, 215, 216, 216, 216, 218, + 217, 219, 219, 221, 220, 222, 223, 224, 224, 225, + 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 231, 230, 232, 233, 234, 234, 235, 236, + 236, 237, 238, 238, 239, 240, 240, 240, 240, 240, + 240, 240, 241, 241, 241, 241, 241, 241, 241, 241, + 241, 241, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 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. */ @@ -2463,33 +2710,33 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 4, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 4, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 2, 1, 1, 1, 1, 1, 1, 1, - 4, 1, 2, 1, 1, 3, 2, 0, 2, 2, + 1, 1, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 4, 2, 1, 1, 3, 2, 0, 2, 2, 1, 3, 3, 0, 2, 0, 7, 0, 1, 1, 3, 1, 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, 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, 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, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 2, 1, 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 2, 1, 3, 2, 4, - 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 5, 2, 2, - 2, 2, 3, 2, 4, 5, 3, 5, 3, 1, - 3, 5, 5, 3 + 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, + 5, 3, 5, 3, 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2497,695 +2744,707 @@ 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, 40, 0, 0, 72, 76, 118, - 92, 108, 109, 114, 111, 0, 0, 299, 209, 186, - 0, 265, 0, 0, 116, 0, 103, 203, 0, 213, - 65, 0, 216, 0, 272, 291, 290, 268, 248, 247, - 0, 0, 204, 205, 206, 82, 0, 106, 214, 0, - 80, 43, 42, 118, 44, 29, 0, 45, 46, 47, - 49, 0, 48, 51, 293, 1, 6, 118, 299, 0, - 68, 0, 0, 69, 183, 0, 159, 0, 158, 0, - 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 120, 304, 133, 237, 231, 234, 235, 232, 233, 236, + 0, 0, 78, 0, 0, 126, 124, 125, 0, 132, + 0, 131, 192, 238, 271, 127, 0, 0, 0, 241, + 128, 130, 129, 0, 0, 240, 239, 0, 0, 276, + 0, 0, 14, 0, 0, 0, 0, 208, 120, 0, + 0, 2, 120, 5, 54, 12, 0, 36, 67, 31, + 32, 33, 34, 35, 38, 120, 37, 7, 30, 0, + 121, 122, 9, 8, 11, 10, 225, 228, 230, 229, + 224, 39, 222, 226, 227, 41, 40, 0, 0, 72, + 76, 120, 92, 109, 111, 110, 116, 113, 0, 0, + 304, 214, 191, 0, 270, 0, 0, 118, 0, 103, + 208, 0, 218, 65, 0, 221, 0, 277, 296, 295, + 273, 253, 252, 0, 0, 209, 210, 211, 82, 0, + 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, + 46, 47, 48, 50, 0, 49, 298, 1, 6, 120, + 304, 0, 68, 0, 0, 69, 53, 108, 0, 188, + 0, 161, 0, 160, 162, 308, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 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, 303, 201, 173, 0, 0, 0, - 27, 0, 292, 0, 0, 275, 0, 267, 270, 207, - 208, 83, 200, 59, 60, 105, 215, 58, 81, 41, - 28, 118, 0, 0, 200, 0, 0, 182, 181, 0, - 132, 134, 160, 218, 262, 263, 260, 261, 241, 242, - 244, 243, 239, 240, 282, 281, 277, 276, 284, 285, - 283, 279, 278, 280, 245, 246, 296, 254, 253, 252, - 286, 0, 251, 250, 249, 237, 238, 258, 257, 255, - 259, 256, 0, 0, 298, 0, 0, 0, 52, 0, - 0, 25, 0, 118, 17, 23, 0, 20, 19, 22, - 21, 118, 110, 203, 210, 162, 0, 0, 174, 178, - 118, 191, 117, 264, 0, 26, 212, 0, 273, 0, - 0, 57, 0, 118, 300, 13, 57, 0, 0, 0, - 0, 136, 0, 0, 200, 0, 211, 269, 0, 0, - 294, 118, 0, 0, 115, 18, 118, 0, 0, 0, - 0, 180, 175, 200, 0, 107, 0, 118, 0, 190, - 198, 197, 0, 193, 192, 196, 199, 0, 62, 61, - 50, 0, 0, 118, 173, 133, 0, 0, 194, 135, - 140, 57, 287, 295, 297, 77, 0, 84, 0, 113, - 202, 172, 168, 165, 166, 164, 167, 171, 170, 169, - 163, 162, 0, 0, 177, 0, 0, 98, 102, 100, - 104, 63, 274, 0, 56, 301, 302, 0, 75, 0, - 137, 138, 0, 118, 161, 79, 0, 0, 0, 85, - 88, 86, 24, 179, 188, 176, 96, 0, 99, 101, - 118, 66, 118, 200, 118, 195, 0, 155, 0, 0, - 118, 153, 0, 27, 93, 89, 87, 27, 27, 200, - 64, 74, 0, 146, 150, 0, 0, 0, 118, 144, - 148, 149, 156, 183, 141, 154, 27, 91, 0, 0, - 0, 184, 118, 139, 145, 0, 90, 189, 97, 94, - 27, 0, 0, 0, 0, 147, 173, 27, 185, 0, - 0, 200, 95, 157 + 294, 293, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 208, 0, + 0, 55, 73, 0, 0, 0, 120, 114, 0, 195, + 0, 198, 197, 309, 206, 178, 0, 0, 0, 27, + 0, 297, 0, 0, 280, 0, 272, 275, 212, 213, + 83, 205, 59, 60, 105, 220, 58, 81, 42, 28, + 120, 0, 205, 0, 0, 52, 305, 187, 186, 0, + 134, 136, 0, 223, 267, 268, 265, 266, 246, 247, + 249, 248, 244, 245, 287, 286, 282, 281, 289, 290, + 288, 284, 283, 285, 250, 251, 301, 259, 258, 257, + 291, 0, 256, 255, 254, 242, 243, 263, 262, 260, + 264, 261, 0, 0, 303, 0, 0, 0, 0, 0, + 25, 0, 120, 17, 23, 0, 20, 19, 22, 21, + 120, 112, 0, 208, 215, 167, 0, 0, 179, 183, + 107, 119, 196, 269, 0, 26, 217, 0, 278, 0, + 0, 57, 0, 120, 13, 57, 0, 0, 0, 0, + 0, 138, 0, 0, 205, 163, 164, 0, 216, 274, + 0, 0, 299, 120, 0, 0, 117, 18, 120, 0, + 0, 0, 0, 185, 180, 205, 0, 0, 120, 0, + 203, 202, 201, 204, 0, 62, 61, 51, 0, 120, + 306, 307, 178, 135, 0, 0, 199, 137, 142, 57, + 0, 292, 300, 302, 77, 0, 84, 0, 115, 207, + 177, 173, 170, 171, 169, 172, 176, 175, 174, 168, + 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, + 63, 279, 56, 0, 75, 0, 139, 140, 0, 120, + 166, 165, 79, 0, 0, 0, 85, 88, 86, 24, + 184, 193, 181, 96, 0, 99, 101, 120, 66, 120, + 205, 120, 200, 0, 157, 0, 0, 120, 155, 0, + 27, 93, 89, 87, 27, 27, 205, 64, 74, 0, + 148, 152, 0, 0, 0, 120, 146, 150, 151, 158, + 188, 143, 156, 27, 91, 0, 0, 0, 189, 120, + 141, 147, 0, 90, 194, 97, 94, 27, 0, 0, + 0, 0, 149, 178, 27, 190, 0, 0, 205, 95, + 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 302, 303, 304, 324, 325, - 134, 135, 209, 305, 136, 378, 137, 237, 234, 451, - 57, 223, 151, 152, 58, 59, 60, 61, 207, 62, - 89, 138, 139, 438, 439, 440, 441, 63, 210, 417, - 503, 418, 468, 419, 420, 64, 220, 140, 65, 94, - 372, 66, 311, 211, 67, 141, 69, 70, 341, 343, - 387, 307, 454, 308, 433, 477, 478, 479, 459, 460, - 461, 159, 309, 344, 361, 410, 317, 318, 319, 249, - 310, 500, 100, 75, 467, 373, 374, 375, 389, 376, - 331, 314, 121, 122, 123, 215, 76, 77, 78, 142, - 124, 79, 80, 81, 82, 113, 114, 83, 143, 84 + -1, 50, 51, 52, 53, 311, 312, 313, 334, 335, + 137, 138, 157, 314, 139, 385, 140, 246, 243, 458, + 57, 232, 153, 154, 58, 59, 60, 61, 213, 62, + 91, 141, 142, 445, 446, 447, 448, 63, 215, 426, + 510, 427, 475, 428, 429, 64, 229, 143, 65, 66, + 219, 220, 67, 320, 216, 68, 144, 70, 71, 351, + 353, 395, 316, 461, 317, 439, 484, 485, 486, 466, + 467, 468, 164, 318, 262, 355, 356, 373, 419, 327, + 328, 329, 259, 319, 507, 103, 76, 474, 221, 222, + 382, 397, 383, 341, 324, 124, 125, 126, 224, 77, + 78, 79, 145, 127, 80, 81, 82, 83, 116, 117, + 84, 165, 85, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -374 +#define YYPACT_NINF -403 static const yytype_int16 yypact[] = { - 1667, -68, -374, -374, -374, -374, -374, -374, -374, -374, - -30, -97, -374, -57, 20, -374, -374, -374, 49, -374, - 2087, -374, 71, -374, 2157, -374, -37, 85, -35, -374, - -374, -374, -374, 6, 8, -374, -374, 2087, 14, 2087, - 2087, 2087, -374, 2087, 2087, 2087, 2087, 2087, 627, 88, - 177, -374, 497, -374, -374, -374, 81, -374, 2017, -374, - -374, -374, -374, -374, -374, -374, -374, -374, 308, 298, - -374, -374, -374, -374, -374, -374, -374, -374, -374, 79, - -374, 2562, -374, -374, -374, 197, 86, -374, -374, 1919, - -374, -374, -374, -374, -374, -18, 206, -374, -46, -374, - 93, 133, 2087, 83, -374, 2087, -374, 2087, 215, 133, - -374, 117, 2562, 94, 127, 133, 133, 201, 133, 133, - -53, 103, 129, 2087, -374, 227, 228, 2087, 2087, 228, - 232, -374, -374, 757, -374, -374, 107, -374, -374, -374, - -374, 219, -374, -374, -374, -374, -374, 1017, 170, 236, - -374, 141, 176, -374, 70, 242, -374, 243, -374, 244, - -374, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, -374, -374, 245, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 11, -374, -374, 2087, 159, 247, - 2087, 1147, -374, 85, -374, 137, 24, -49, 16, 2182, - 1793, 130, -374, 2087, 2087, -374, 2087, -374, -374, -374, - -374, -374, 157, 164, -374, 79, 79, 164, -374, -374, - -374, 1919, 262, 134, 157, 2087, 2087, -374, -374, 269, - 226, 231, -374, 2562, 1009, 489, 489, 489, 2867, 2867, - 2867, 2867, 1009, 1009, 2562, 2562, 2562, 2562, 2562, 2562, - 2562, 2562, 2562, 2562, 304, 2623, -374, 349, 349, 349, - 2562, 2379, 2684, 2745, 2806, 1009, 1009, 201, 201, 133, - 133, 133, 148, 2440, 193, 2087, 281, -40, -374, 167, - 2253, -374, 154, 1277, -374, -374, 168, -374, -374, -374, - -374, 1147, -374, 2087, -374, 96, 287, 174, 200, -374, - 1919, 181, -374, -374, 169, 1793, -374, -36, -374, 204, - 26, 208, 228, 887, 212, -374, -20, 53, -31, 199, - 125, 309, 125, 205, 157, 2087, -374, -374, 324, 2316, - -374, 1919, 2087, 207, -374, -374, 1147, 202, 209, 67, - 26, -374, -374, 157, 25, -374, 110, 1919, 2087, 181, - -374, -374, 210, -374, -374, -374, -374, 2087, -374, -374, - -374, 39, 2087, 1919, 24, -374, 125, 217, -374, 251, - -374, 208, 2562, -374, -374, -374, -14, 27, 221, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, 253, 233, 287, -374, 234, 241, -374, -374, 110, - -374, 267, -374, 126, -374, -374, -374, 250, -374, 252, - 251, -374, 125, 230, -374, -374, 2087, 259, 235, 27, - -374, -374, -374, -374, -374, -374, -374, 362, -374, -374, - 1919, -374, 1919, 157, 1407, -374, 366, -374, 347, 254, - 249, -374, 2501, 1793, -374, -374, -374, 1793, 1793, 157, - -374, -374, 256, -374, -374, 258, 74, 255, 1537, -374, - -374, -374, -374, 70, -374, -374, 1793, -374, 257, 261, - 264, -374, 1407, -374, -374, 385, -374, -374, -374, -374, - 1793, 270, 268, 265, 271, -374, 24, 1793, -374, 272, - 274, 157, -374, -374 + 1674, -70, -403, -403, -403, -403, -403, -403, -403, -403, + -15, -72, -403, -52, 19, -403, -403, -403, 80, -403, + 2094, -403, 99, -403, 2164, -403, -16, 42, -5, -403, + -403, -403, -403, -1, 5, -403, -403, 2094, 13, 2094, + 2094, 2094, -403, 2094, 2094, 2094, 2094, 2094, 634, 123, + 128, -403, 504, -403, -403, -403, 8, -403, 2024, -403, + -403, -403, -403, -403, -403, 1926, -403, -403, -403, 240, + 361, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 38, -403, 2569, -403, -403, -403, -403, 137, 20, -403, + -403, 1926, -403, -403, -403, -403, -403, -403, -87, 42, + -403, -67, -403, 21, -48, 2094, 79, -403, 2094, -403, + 2094, 138, -48, -403, 43, 2569, 76, 107, -48, -48, + 604, -48, -48, -29, 84, 110, 2094, -403, 210, 211, + 2094, 2094, 211, 212, -403, -403, 764, -403, -403, 85, + -403, -403, -403, -403, 209, -403, -403, -403, -403, 1024, + 158, 232, -403, 139, 171, -403, 141, -403, 238, 12, + 239, -403, 247, -403, -403, -403, -403, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + -403, -403, 249, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 11, -403, -403, 2094, 229, 2094, 1154, -403, 42, 133, + 135, -403, -403, -403, 142, 15, -10, 90, 2189, 1800, + 130, -403, 2094, 2094, -403, 2094, -403, -403, -403, -403, + -403, 161, 169, -403, 38, 38, 169, -403, -403, -403, + 1926, 149, 161, 2094, 2094, -403, 168, -403, -403, 280, + 231, 233, 286, 2569, 1016, 496, 496, 496, 322, 322, + 322, 322, 1016, 1016, 2569, 2569, 2569, 2569, 2569, 2569, + 2569, 2569, 2569, 2569, 2630, 2691, -403, 368, 368, 368, + 2569, 2386, 2752, 2813, 2874, 1016, 1016, 604, 604, -48, + -48, -48, 157, 2447, 202, 2094, 291, 14, 173, 2260, + -403, 165, 1284, -403, -403, 172, -403, -403, -403, -403, + 1154, -403, 42, 2094, -403, -43, 296, 167, 201, -403, + -403, -403, 175, -403, 174, 1800, -403, 44, -403, 200, + 63, 207, 211, 894, -403, -27, -11, 46, 113, 189, + 42, 298, 42, 190, 161, 217, -403, 2094, -403, -403, + 315, 2323, -403, 1926, 2094, 193, -403, -403, 1154, 192, + 194, 75, 63, -403, -403, 161, 26, 96, 1926, 2094, + -403, -403, -403, -403, 2094, -403, -403, -403, 2094, 1926, + -403, -403, 15, -403, 42, 199, -403, 230, -403, 207, + 286, 2569, -403, -403, -403, 103, 24, 197, -403, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 234, 205, 296, -403, 206, 213, -403, -403, 96, -403, + 268, -403, -403, 204, -403, 215, 230, -403, 42, 208, + -403, -403, -403, 2094, 236, 214, 24, -403, -403, -403, + -403, -403, -403, -403, 335, -403, -403, 1926, -403, 1926, + 161, 1414, -403, 339, -403, 316, 219, 227, -403, 2508, + 1800, -403, -403, -403, 1800, 1800, 161, -403, -403, 223, + -403, -403, 226, 250, 221, 1544, -403, -403, -403, -403, + 12, -403, -403, 1800, -403, 222, 224, 225, -403, 1414, + -403, -403, 354, -403, -403, -403, -403, 1800, 228, 241, + 235, 243, -403, 15, 1800, -403, 244, 246, 161, -403, + -403 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -374, -374, 260, -374, 352, -285, -374, 98, -373, -39, - 1, -84, -310, 31, 2, 17, 351, 289, 89, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, -374, -374, -374, -374, -17, -16, -374, -374, 5, - -374, 13, -374, -374, -374, -374, -374, -374, -374, -202, - 36, -374, -374, -374, -374, 0, -374, 356, -374, -374, - -374, 58, -374, 59, -374, -65, -374, -48, -374, -374, - -26, -374, 3, -374, 32, -374, -369, -374, -298, -47, - 4, -374, -374, -374, -374, -374, 408, -318, 51, 78, - -237, -374, -99, -374, -374, -374, -374, -374, -374, -374, - -27, -3, -52, -7, -374, -374, -374, -374, -374, -374 + -403, -403, 218, -403, 312, -299, -403, 61, -402, -31, + 1, -55, -85, 48, 2, -23, 321, 251, 58, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + -403, -403, -403, -403, -403, -62, -60, -403, -403, -40, + -403, -36, -403, -403, -403, -403, -403, -403, -403, -403, + 6, 50, -403, -403, -403, -403, 0, -403, 331, -403, + -403, -403, 49, -403, 51, -403, -96, -403, -80, -403, + -403, -61, -403, 3, -403, -403, 7, 9, -403, -376, + -403, -311, -79, 4, -403, -403, -403, -403, -403, 388, + -91, 25, 52, -239, -403, -98, -403, -403, -403, -403, + -403, -403, -403, -34, -9, -49, -13, -403, -403, -403, + -403, -403, -403, -403 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -153 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 208, 153, 336, 221, 133, - 365, 312, 111, 98, 294, 429, 312, 101, 362, 321, - 86, 85, 385, 91, 388, 88, 357, 315, 315, 369, - 109, 55, 112, 115, 116, 92, 117, 118, 119, 92, - 112, 395, 425, 120, 426, 92, 186, 161, -70, 240, - 95, 161, 68, 54, 56, 73, 74, 421, 71, 72, - 161, 436, 370, 103, 161, 90, 414, 96, 388, 161, - 401, 398, 402, 428, 99, 403, 404, 405, 203, 406, - 227, 204, 377, 55, 320, 102, 161, 105, 91, 437, - 487, 144, 87, 351, 488, 489, 230, 367, 219, 217, - 112, 154, 383, 292, 92, 247, 156, 391, 212, 213, - 71, 72, 407, 496, 455, 445, 112, 316, 413, 435, - 158, 248, 408, 409, 235, 236, 412, 504, 369, 321, - 107, 322, 106, 295, 510, 108, 110, 509, 415, 296, - 470, 371, 471, 416, 92, 92, 93, 68, 54, 56, - 73, 74, 382, 161, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 145, 55, 161, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 112, 293, 328, 359, 329, - 205, 360, 333, 300, 297, 71, 72, 147, 206, 214, - 218, 68, 54, 306, 358, 216, 472, 112, 222, 112, - 327, 312, 224, 184, 185, 186, 225, 226, 228, 229, - 231, 232, 490, 241, 2, 238, 208, 242, -71, 244, - 245, 240, 337, 338, 246, 250, 251, 252, 276, 240, - 15, 16, 17, 2, 19, 202, 21, 203, 298, 313, - 204, 299, 330, 326, 332, 334, 335, 208, 25, 15, - 16, 17, 339, 19, 513, 21, 456, 30, 31, 32, - 340, 346, 348, 208, 350, 342, 354, 25, 349, 352, - 315, 184, 185, 186, 356, 456, 30, 31, 32, 208, - 364, 366, 2, 68, 54, 306, 112, 363, -108, 368, - 377, 68, 54, 306, 381, 199, 200, 201, 15, 16, - 17, 384, 19, 202, 21, 203, 386, 393, 204, 457, - 427, 390, 450, 397, 399, 154, 25, 423, 392, 155, - 156, 422, 400, 431, 162, 30, 31, 32, 457, 396, - 424, 432, 157, 442, 158, 359, 68, 54, 306, 444, - 446, 112, -151, 447, 463, 469, 208, 464, 208, 482, - 112, 163, 164, 165, 483, 166, 167, 168, 169, 170, - 171, -152, 491, 452, 492, 453, 484, 493, 502, 497, - 506, 507, 183, 498, 184, 185, 186, 499, 187, 188, - 189, 355, 505, 508, 146, 511, 512, 243, 434, 150, - 192, 193, 194, 195, 196, 233, 197, 198, 199, 200, - 201, 379, 465, 466, 448, 160, 202, 501, 203, 462, - 494, 204, 449, 458, 485, 104, 495, 430, 411, 184, - 185, 186, 0, 443, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 476, 474, 475, 480, 481, 0, - 458, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 0, 476, 474, - 475, 480, 481, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 476, 474, 475, 480, 481, -4, 0, 0, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 162, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, -153, -153, -153, 0, - 37, 38, 0, 0, 170, 171, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -4, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 69, 54, 56, 74, 75, 114, 214, 101, 223, 155, + 156, 104, 230, 345, 304, 374, 435, 136, 325, 87, + 97, 369, 93, 94, 112, 192, 115, 118, 119, 325, + 120, 121, 122, 97, 115, 88, 156, 123, 95, 217, + 218, -70, 190, 191, 192, 93, 94, 257, 55, 72, + 90, 73, 69, 54, 56, 74, 75, 209, 443, 371, + 210, 95, 372, 258, 98, 423, 93, 94, 494, 407, + 92, 167, 495, 496, 208, 384, 209, 106, 410, 210, + 411, 249, 95, 412, 413, 414, 444, 415, 388, 167, + 167, 503, 239, 93, 94, 228, 226, 115, 99, 380, + 55, 72, 102, 73, 236, 511, 105, 89, 326, 95, + 302, 452, 517, 115, 167, 399, 390, 108, 391, 422, + 416, 244, 245, 330, 424, 109, 146, 110, 147, 425, + 417, 418, 111, 305, 149, 113, 421, 516, 167, 306, + 211, 231, 212, 225, 167, 96, 167, 363, 233, 69, + 54, 56, 74, 75, 263, 264, 265, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 378, 381, 389, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 115, 303, 55, 72, 338, + 73, 339, 309, 167, 307, 331, 227, 235, 234, 237, + 238, 250, 2, 240, 241, 247, 69, 54, 315, 343, + 115, 479, 115, 337, 321, 370, -71, 158, 15, 16, + 17, 2, 19, 332, 21, 252, 442, 497, 253, 254, + 255, 256, 260, 308, 346, 347, 25, 15, 16, 17, + 261, 19, 286, 21, 463, 30, 31, 32, 158, 393, + -113, 396, 322, 336, 323, 25, 340, 159, 158, 342, + 348, 160, 161, 463, 30, 31, 32, 159, 404, 520, + 249, 344, 161, 349, 162, 350, 163, 352, 249, 354, + 358, 360, 361, 430, 362, 364, 163, 366, 368, 325, + 375, 376, -112, 396, 434, 379, 377, 464, 156, 384, + 115, 392, 69, 54, 315, 394, 398, 400, 402, 406, + 69, 54, 315, 156, 408, 437, 464, 409, 332, 449, + 438, 451, 453, 457, 156, 454, 371, 459, 476, 433, + -153, 470, 489, 490, 401, 431, 471, 462, 460, 498, + 432, 491, 499, 500, 504, 405, 505, 509, 506, -154, + 512, 514, 168, 513, 148, 2, 115, 251, 69, 54, + 315, 115, 477, 367, 478, 515, 440, 518, 519, 152, + 242, 15, 16, 17, 472, 19, 473, 21, 455, 169, + 170, 171, 456, -155, -155, -155, -155, 176, 177, 25, + 386, 166, 156, 508, 156, 501, 492, 441, 30, 31, + 32, 502, 190, 191, 192, 107, 193, 194, 195, 436, + 0, 0, 0, 0, 420, 0, 0, 0, 0, 450, + 469, 201, 202, 0, 203, 204, 205, 206, 207, 465, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 0, 0, 0, 0, 0, 0, 0, 0, 190, 191, + 192, 483, 481, 482, 487, 488, 0, 465, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 132, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 203, 204, 205, 206, 207, 483, 481, 482, 487, 488, + 208, 0, 209, 0, 0, 210, 0, 0, 0, 483, + 481, 482, 487, 488, -4, 0, 0, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 168, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, -155, -155, -155, 0, 37, 38, 0, + 0, 176, 177, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -4, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 190, 191, 192, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 205, 206, + 207, 0, 0, 0, 40, 41, 208, 0, 209, 0, + 0, 210, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 135, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 239, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 248, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 380, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, -153, -153, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, -153, -153, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -3, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 387, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, -155, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, -155, -155, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, -155, -155, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -3, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -15, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -16, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 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, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -144, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, -3, 0, -143, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, -3, 0, -145, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, -118, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 125, 0, 126, 0, 0, 0, 24, - 127, 25, 26, 0, 27, 128, 28, 0, 29, 129, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 130, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 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, -120, 0, + 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, + 128, 0, 129, 0, 0, 0, 24, 130, 25, 26, + 0, 27, 131, 28, 0, 29, 132, 30, 31, 32, + 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, + 0, 0, 0, 37, 38, 0, 133, 0, 0, 0, + 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 131, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 0, 23, 125, - 0, 126, 0, 0, 0, 24, 127, 25, 26, 0, - 27, 128, 28, 0, 29, 129, 30, 31, 32, 0, - 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 130, 0, 0, 0, 39, + 40, 41, 0, 0, 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 131, 0, - 148, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 20, 47, 22, 48, 23, 49, 0, 126, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 28, 0, 29, 149, 0, 0, 0, 0, 0, 0, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 43, - 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 0, 0, 162, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, + 0, 0, 46, 0, 47, 0, 48, 0, 49, 1, + 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 0, 0, 0, 15, 16, 17, 18, + 19, 20, 21, 22, 0, 23, 128, 0, 129, 0, + 0, 0, 24, 130, 25, 26, 0, 27, 131, 28, + 0, 29, 132, 30, 31, 32, 0, 0, 33, 34, + 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, + 38, 0, 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 46, - 0, 47, 0, 0, 190, 49, 191, 0, 192, 193, - 194, 195, 196, 162, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 0, 0, 0, 0, 0, 323, 0, 0, 0, 0, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, + 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, + 0, 0, 0, 0, 0, 134, 0, 150, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 43, 0, + 0, 0, 0, 44, 45, 0, 0, 0, 46, 20, + 47, 22, 48, 23, 49, 0, 129, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 0, 28, 0, 29, + 151, 0, 0, 0, 0, 0, 0, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 0, 0, + 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, + 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 43, 28, 0, 29, + 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, + 36, 0, 49, 0, 0, 0, 0, 37, 0, 0, + 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, + 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 29, + 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, + 36, 0, 49, 0, 0, 0, 0, 0, 0, 168, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 0, 190, 162, 191, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 0, 0, 163, 164, 165, 353, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 0, 190, 162, - 191, 0, 192, 193, 194, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 0, 0, 163, 164, 165, 394, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 0, 0, 0, - 162, 190, 0, 191, 345, 192, 193, 194, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 163, 164, 165, - 0, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 0, - 184, 185, 186, 0, 187, 188, 189, 0, 0, 0, - 0, 162, 190, 0, 191, 0, 192, 193, 194, 195, - 196, 0, 197, 198, 199, 200, 201, 0, 0, 0, - 0, 0, 202, 0, 203, 347, 0, 204, 163, 164, - 165, 0, 166, 167, 168, 169, 170, 171, 172, 173, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 46, 0, 47, 0, + 0, 196, 49, 197, 0, 198, 199, 200, 201, 202, + 168, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 0, 0, 0, + 0, 0, 333, 0, 0, 0, 0, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 0, 196, 168, 197, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 0, 0, + 169, 170, 171, 365, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 0, 196, 168, 197, 0, 198, + 199, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 0, 0, 169, 170, 171, 403, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 0, 0, 0, 168, 196, 0, + 197, 357, 198, 199, 200, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 0, 0, 208, 0, + 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 0, 184, 185, 186, 0, 187, 188, 189, 0, 0, - 0, 0, 162, 190, 0, 191, 486, 192, 193, 194, - 195, 196, 0, 197, 198, 199, 200, 201, 0, 0, - 0, 0, 0, 202, 0, 203, 0, 0, 204, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, + 184, 185, 186, 187, 188, 189, 0, 190, 191, 192, + 0, 193, 194, 195, 0, 0, 0, 0, 168, 196, + 0, 197, 0, 198, 199, 200, 201, 202, 0, 203, + 204, 205, 206, 207, 0, 0, 0, 0, 0, 208, + 0, 209, 359, 0, 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 0, - 0, 0, 0, 162, 190, 0, 191, 0, 192, 193, - 194, 195, 196, 0, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, + 183, 184, 185, 186, 187, 188, 189, 0, 190, 191, + 192, 0, 193, 194, 195, 0, 0, 0, 0, 168, + 196, 0, 197, 493, 198, 199, 200, 201, 202, 0, + 203, 204, 205, 206, 207, 0, 0, 0, 0, 0, + 208, 0, 209, 0, 0, 210, 169, 170, 171, 0, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 0, 0, 0, 0, + 168, 196, 0, 197, 0, 198, 199, 200, 201, 202, + 0, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 168, 0, 0, 0, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 169, 170, + 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 190, 191, 192, 0, 193, 194, 195, 0, 0, + 0, 0, 168, 0, 0, 0, 0, 198, 199, 200, + 201, 202, 0, 203, 204, 205, 206, 207, 0, 0, + 0, 0, 0, 208, 0, 209, 0, 0, 210, 169, + 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 162, 0, 0, 0, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 163, 164, 165, 0, 166, 167, 168, 169, 170, - 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 184, 185, 186, 0, 187, 188, - 189, 0, 0, 0, 0, 162, 0, 0, 0, 0, - 0, 193, 194, 195, 196, 0, 197, 198, 199, 200, - 201, 0, 0, 0, 0, 0, 202, 0, 203, 0, - 0, 204, 163, 164, 165, 0, 166, 167, 168, 169, - 170, 171, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 184, 185, 186, 0, 187, - 188, 189, 0, 0, 0, 0, 162, 0, 0, 0, - 0, 0, 0, 194, 195, 196, 0, 197, 198, 199, - 200, 201, 0, 0, 0, 0, 0, 202, 0, 203, - 0, 0, 204, 163, 164, 165, 0, 166, 167, 168, - 169, 170, 171, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 162, 0, 0, - 0, 0, 0, 0, -153, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 163, 164, 165, 0, -153, -153, - -153, -153, 170, 171, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 184, 185, 186, - 0, 187, 188, 189, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 195, 196, 0, 197, - 198, 199, 200, 201, 0, 0, 0, 0, 0, 202, - 0, 203, 0, 0, 204 + 0, 0, 190, 191, 192, 0, 193, 194, 195, 0, + 0, 0, 0, 168, 0, 0, 0, 0, 0, 199, + 200, 201, 202, 0, 203, 204, 205, 206, 207, 0, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, + 0, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, + 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 190, 191, 192, 0, 193, 194, + 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -155, 201, 202, 0, 203, 204, 205, 206, + 207, 0, 0, 0, 0, 0, 208, 0, 209, 0, + 0, 210 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 89, 58, 244, 107, 48, - 320, 213, 39, 20, 3, 384, 218, 24, 316, 3, - 50, 89, 340, 3, 342, 122, 311, 3, 3, 3, - 37, 0, 39, 40, 41, 19, 43, 44, 45, 19, - 47, 351, 3, 46, 5, 19, 92, 100, 68, 133, - 14, 100, 52, 52, 52, 52, 52, 367, 0, 0, - 100, 34, 36, 27, 100, 122, 364, 18, 386, 100, - 3, 356, 5, 383, 3, 8, 9, 10, 124, 12, - 133, 127, 102, 52, 133, 122, 100, 122, 3, 62, - 463, 3, 122, 133, 467, 468, 123, 133, 105, 102, - 107, 27, 133, 202, 19, 35, 32, 344, 126, 127, - 52, 52, 45, 486, 432, 413, 123, 93, 93, 133, - 46, 51, 55, 56, 127, 128, 363, 500, 3, 3, - 122, 115, 126, 122, 507, 127, 122, 506, 28, 128, - 450, 115, 452, 33, 19, 19, 126, 147, 147, 147, - 147, 147, 99, 100, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 0, 147, 100, - 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 224, 102, 226, - 3, 105, 241, 210, 207, 147, 147, 126, 122, 3, - 127, 211, 211, 211, 313, 122, 453, 224, 3, 226, - 223, 423, 105, 90, 91, 92, 132, 100, 125, 100, - 3, 3, 469, 126, 4, 3, 320, 18, 68, 3, - 99, 325, 245, 246, 68, 3, 3, 3, 3, 333, - 20, 21, 22, 4, 24, 122, 26, 124, 99, 122, - 127, 14, 105, 133, 100, 3, 132, 351, 38, 20, - 21, 22, 3, 24, 511, 26, 46, 47, 48, 49, - 54, 133, 89, 367, 3, 54, 132, 38, 295, 122, - 3, 90, 91, 92, 126, 46, 47, 48, 49, 383, - 100, 132, 4, 303, 303, 303, 313, 133, 127, 105, - 102, 311, 311, 311, 102, 114, 115, 116, 20, 21, - 22, 122, 24, 122, 26, 124, 17, 3, 127, 99, - 382, 126, 65, 126, 132, 27, 38, 127, 345, 31, - 32, 368, 133, 126, 40, 47, 48, 49, 99, 352, - 377, 100, 44, 132, 46, 102, 356, 356, 356, 126, - 126, 368, 132, 122, 105, 3, 450, 132, 452, 3, - 377, 67, 68, 69, 27, 71, 72, 73, 74, 75, - 76, 132, 126, 133, 126, 133, 132, 132, 3, 132, - 122, 126, 88, 132, 90, 91, 92, 133, 94, 95, - 96, 303, 132, 132, 52, 133, 132, 147, 391, 58, - 106, 107, 108, 109, 110, 126, 112, 113, 114, 115, - 116, 332, 439, 439, 419, 69, 122, 492, 124, 436, - 478, 127, 419, 433, 460, 27, 483, 386, 360, 90, - 91, 92, -1, 411, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 454, 454, 454, 454, 454, -1, - 460, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, -1, 478, 478, - 478, 478, 478, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 492, 492, 492, 492, 492, 0, -1, -1, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, 67, 68, 69, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + 0, 0, 0, 0, 0, 39, 91, 20, 99, 58, + 65, 24, 110, 252, 3, 326, 392, 48, 3, 89, + 14, 320, 3, 4, 37, 92, 39, 40, 41, 3, + 43, 44, 45, 27, 47, 50, 91, 46, 19, 126, + 127, 68, 90, 91, 92, 3, 4, 35, 0, 0, + 122, 0, 52, 52, 52, 52, 52, 124, 34, 102, + 127, 19, 105, 51, 14, 376, 3, 4, 470, 368, + 122, 100, 474, 475, 122, 102, 124, 27, 3, 127, + 5, 136, 19, 8, 9, 10, 62, 12, 99, 100, + 100, 493, 126, 3, 4, 108, 105, 110, 18, 36, + 52, 52, 3, 52, 133, 507, 122, 122, 93, 19, + 208, 422, 514, 126, 100, 354, 3, 122, 5, 93, + 45, 130, 131, 133, 28, 126, 3, 122, 0, 33, + 55, 56, 127, 122, 126, 122, 375, 513, 100, 128, + 3, 3, 122, 122, 100, 126, 100, 133, 105, 149, + 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 133, 115, 133, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 149, 149, 233, + 149, 235, 215, 100, 213, 115, 127, 100, 132, 125, + 100, 126, 4, 3, 3, 3, 216, 216, 216, 250, + 233, 460, 235, 232, 218, 323, 68, 18, 20, 21, + 22, 4, 24, 227, 26, 3, 133, 476, 99, 68, + 99, 3, 3, 14, 253, 254, 38, 20, 21, 22, + 3, 24, 3, 26, 46, 47, 48, 49, 18, 350, + 127, 352, 127, 133, 122, 38, 105, 27, 18, 100, + 102, 31, 32, 46, 47, 48, 49, 27, 363, 518, + 335, 132, 32, 3, 44, 54, 46, 54, 343, 3, + 133, 89, 305, 378, 3, 122, 46, 132, 126, 3, + 133, 100, 127, 394, 389, 105, 132, 99, 363, 102, + 323, 122, 312, 312, 312, 17, 126, 100, 3, 126, + 320, 320, 320, 378, 132, 126, 99, 133, 322, 132, + 100, 126, 126, 65, 389, 122, 102, 133, 3, 388, + 132, 105, 3, 27, 357, 379, 132, 438, 133, 126, + 384, 132, 126, 132, 132, 364, 132, 3, 133, 132, + 132, 126, 40, 122, 52, 4, 379, 149, 368, 368, + 368, 384, 457, 312, 459, 132, 399, 133, 132, 58, + 129, 20, 21, 22, 446, 24, 446, 26, 428, 67, + 68, 69, 428, 71, 72, 73, 74, 75, 76, 38, + 342, 70, 457, 499, 459, 485, 467, 400, 47, 48, + 49, 490, 90, 91, 92, 27, 94, 95, 96, 394, + -1, -1, -1, -1, 372, -1, -1, -1, -1, 420, + 443, 109, 110, -1, 112, 113, 114, 115, 116, 439, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + 92, 461, 461, 461, 461, 461, -1, 467, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 112, 113, 114, 115, 116, 485, 485, 485, 485, 485, + 122, -1, 124, -1, -1, 127, -1, -1, -1, 499, + 499, 499, 499, 499, 0, -1, -1, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, 67, 68, 69, -1, 63, 64, -1, + -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, + 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, + 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, 90, 91, 92, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 114, 115, + 116, -1, -1, -1, 90, 91, 122, -1, 124, -1, + -1, 127, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 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, 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, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, + 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, + 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, -1, -1, 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, 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, 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, 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, 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, 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, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, 0, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, 0, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, 15, 16, -1, 18, -1, + 20, 21, 22, 23, 24, 25, 26, 27, -1, 29, + 30, -1, 32, -1, -1, -1, 36, 37, 38, 39, + -1, 41, 42, 43, -1, 45, 46, 47, 48, 49, + -1, -1, 52, 53, -1, 55, 56, -1, -1, -1, + -1, -1, -1, 63, 64, -1, 66, -1, -1, -1, + 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, 18, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, 3, 4, 5, 6, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, -1, 20, - 21, 22, 23, 24, 25, 26, 27, -1, 29, 30, - -1, 32, -1, -1, -1, 36, 37, 38, 39, -1, - 41, 42, 43, -1, 45, 46, 47, 48, 49, -1, - -1, 52, 53, -1, 55, 56, -1, -1, -1, -1, - -1, -1, 63, 64, -1, 66, -1, -1, -1, 70, + -1, -1, 112, -1, -1, -1, -1, 117, 118, -1, + -1, -1, 122, -1, 124, -1, 126, -1, 128, 3, + 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, -1, -1, -1, 20, 21, 22, 23, + 24, 25, 26, 27, -1, 29, 30, -1, 32, -1, + -1, -1, 36, 37, 38, 39, -1, 41, 42, 43, + -1, 45, 46, 47, 48, 49, -1, -1, 52, 53, + -1, 55, 56, -1, -1, -1, -1, -1, -1, 63, + 64, -1, 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, 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, -1, -1, -1, 90, 91, 67, - 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, 122, - -1, 124, -1, -1, 102, 128, 104, -1, 106, 107, - 108, 109, 110, 40, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - -1, -1, -1, -1, -1, 133, -1, -1, -1, -1, - 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, + -1, -1, -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, @@ -3194,65 +3453,59 @@ static const yytype_int16 yycheck[] = 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, -1, 102, 40, - 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, + 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, + 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, -1, -1, 67, 68, 69, 133, + 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, + -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, + 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, + -1, 124, 125, -1, 127, 67, 68, 69, -1, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, + 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, + 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, + 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, 102, -1, 104, 105, 106, 107, 108, 109, 110, + 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, + -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, 102, -1, 104, -1, 106, 107, 108, 109, + -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, 125, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, + 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, - -1, -1, 40, 102, -1, 104, 105, 106, 107, 108, + -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, - 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, 40, 102, -1, 104, -1, 106, 107, + 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, -1, 40, -1, -1, -1, -1, -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, - -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, + 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, - -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, - 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, - -1, -1, -1, 108, 109, 110, -1, 112, 113, 114, - 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, - -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, - 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, - 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, - -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 109, 110, -1, 112, - 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, - -1, 124, -1, -1, 127 + -1, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3265,52 +3518,53 @@ static const yytype_uint8 yystos[] = 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, - 160, 161, 163, 171, 179, 182, 185, 188, 189, 190, - 191, 195, 197, 206, 214, 217, 230, 231, 232, 235, - 236, 237, 238, 241, 243, 89, 50, 122, 122, 164, - 122, 3, 19, 126, 183, 184, 18, 3, 237, 3, - 216, 237, 122, 184, 220, 122, 126, 122, 127, 237, - 122, 234, 237, 239, 240, 237, 237, 237, 237, 237, - 235, 226, 227, 228, 234, 30, 32, 37, 42, 46, - 66, 99, 132, 143, 144, 145, 148, 150, 165, 166, - 181, 189, 233, 242, 3, 0, 138, 126, 3, 46, - 150, 156, 157, 236, 27, 31, 32, 44, 46, 205, - 191, 100, 40, 67, 68, 69, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 90, 91, 92, 94, 95, 96, - 102, 104, 106, 107, 108, 109, 110, 112, 113, 114, - 115, 116, 122, 124, 127, 3, 122, 162, 145, 146, - 172, 187, 126, 127, 3, 229, 122, 235, 127, 237, - 180, 226, 3, 155, 105, 132, 100, 133, 125, 100, - 234, 3, 3, 151, 152, 235, 235, 151, 3, 132, - 145, 126, 18, 136, 3, 99, 68, 35, 51, 213, - 3, 3, 3, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 3, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 226, 237, 3, 122, 128, 235, 99, 14, - 237, 99, 139, 140, 141, 147, 148, 195, 197, 206, - 214, 186, 183, 122, 225, 3, 93, 210, 211, 212, - 133, 3, 115, 133, 142, 143, 133, 235, 234, 234, - 105, 224, 100, 143, 3, 132, 224, 235, 235, 3, - 54, 192, 54, 193, 207, 105, 133, 125, 89, 237, - 3, 133, 122, 133, 132, 141, 126, 139, 226, 102, - 105, 208, 212, 133, 100, 146, 132, 133, 105, 3, - 36, 115, 184, 219, 220, 221, 223, 102, 149, 152, - 132, 102, 99, 133, 122, 221, 17, 194, 221, 222, - 126, 224, 237, 3, 133, 146, 235, 126, 139, 132, - 133, 3, 5, 8, 9, 10, 12, 45, 55, 56, - 209, 223, 224, 93, 212, 28, 33, 173, 175, 177, - 178, 146, 234, 127, 234, 3, 5, 236, 146, 210, - 222, 126, 100, 198, 149, 133, 34, 62, 167, 168, - 169, 170, 132, 208, 126, 212, 126, 122, 173, 175, - 65, 153, 133, 133, 196, 221, 46, 99, 189, 202, - 203, 204, 237, 105, 132, 169, 170, 218, 176, 3, - 146, 146, 224, 99, 144, 148, 189, 199, 200, 201, - 206, 214, 3, 27, 132, 204, 105, 142, 142, 142, - 224, 126, 126, 132, 201, 213, 142, 132, 132, 133, - 215, 199, 3, 174, 142, 132, 122, 126, 132, 210, - 142, 133, 132, 224 + 160, 161, 163, 171, 179, 182, 183, 186, 189, 190, + 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, + 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, + 122, 164, 122, 3, 4, 19, 126, 184, 185, 18, + 3, 240, 3, 219, 240, 122, 185, 223, 122, 126, + 122, 127, 240, 122, 237, 240, 242, 243, 240, 240, + 240, 240, 240, 238, 229, 230, 231, 237, 30, 32, + 37, 42, 46, 66, 99, 132, 143, 144, 145, 148, + 150, 165, 166, 181, 190, 236, 3, 0, 138, 126, + 3, 46, 150, 156, 157, 239, 145, 146, 18, 27, + 31, 32, 44, 46, 206, 245, 192, 100, 40, 67, + 68, 69, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 90, 91, 92, 94, 95, 96, 102, 104, 106, 107, + 108, 109, 110, 112, 113, 114, 115, 116, 122, 124, + 127, 3, 122, 162, 146, 172, 188, 126, 127, 184, + 185, 222, 223, 224, 232, 122, 238, 127, 240, 180, + 229, 3, 155, 105, 132, 100, 133, 125, 100, 237, + 3, 3, 151, 152, 238, 238, 151, 3, 132, 145, + 126, 136, 3, 99, 68, 99, 3, 35, 51, 216, + 3, 3, 208, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 3, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 229, 240, 3, 122, 128, 238, 14, 240, + 99, 139, 140, 141, 147, 148, 196, 198, 207, 217, + 187, 184, 127, 122, 228, 3, 93, 213, 214, 215, + 133, 115, 184, 133, 142, 143, 133, 238, 237, 237, + 105, 227, 100, 143, 132, 227, 238, 238, 102, 3, + 54, 193, 54, 194, 3, 209, 210, 105, 133, 125, + 89, 240, 3, 133, 122, 133, 132, 141, 126, 139, + 229, 102, 105, 211, 215, 133, 100, 132, 133, 105, + 36, 115, 224, 226, 102, 149, 152, 132, 99, 133, + 3, 5, 122, 224, 17, 195, 224, 225, 126, 227, + 100, 240, 3, 133, 146, 238, 126, 139, 132, 133, + 3, 5, 8, 9, 10, 12, 45, 55, 56, 212, + 226, 227, 93, 215, 28, 33, 173, 175, 177, 178, + 146, 237, 237, 239, 146, 213, 225, 126, 100, 199, + 149, 210, 133, 34, 62, 167, 168, 169, 170, 132, + 211, 126, 215, 126, 122, 173, 175, 65, 153, 133, + 133, 197, 224, 46, 99, 190, 203, 204, 205, 240, + 105, 132, 169, 170, 221, 176, 3, 146, 146, 227, + 99, 144, 148, 190, 200, 201, 202, 207, 217, 3, + 27, 132, 205, 105, 142, 142, 142, 227, 126, 126, + 132, 202, 216, 142, 132, 132, 133, 218, 200, 3, + 174, 142, 132, 122, 126, 132, 213, 142, 133, 132, + 227 }; #define yyerrok (yyerrstatus = 0) @@ -4126,7 +4380,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1902 "parser.y" +#line 2151 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4137,7 +4391,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1903 "parser.y" +#line 2152 "parser.y" {(yyval.code)=code_new();} } break; @@ -4148,7 +4402,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1905 "parser.y" +#line 2154 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4159,30 +4413,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1906 "parser.y" +#line 2155 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 41: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 1920 "parser.y" - {(yyval.code)=(yyvsp[(2) - (3)].code);} - } - break; - - - case 42: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1921 "parser.y" - {(yyval.code)=0;} +#line 2170 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4192,19 +4435,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1924 "parser.y" +#line 2171 "parser.y" {(yyval.code)=0;} } break; - case 50: + case 44: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1931 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 2174 "parser.y" + {(yyval.code)=0;} } break; @@ -4214,8 +4457,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1933 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 2181 "parser.y" + {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4225,7 +4468,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1937 "parser.y" +#line 2185 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4236,7 +4479,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1938 "parser.y" +#line 2186 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4247,7 +4490,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1942 "parser.y" +#line 2190 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4261,7 +4504,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1953 "parser.y" +#line 2201 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4272,7 +4515,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1954 "parser.y" +#line 2202 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4285,7 +4528,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1958 "parser.y" +#line 2206 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4296,7 +4539,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1959 "parser.y" +#line 2207 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4307,7 +4550,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1961 "parser.y" +#line 2209 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4318,7 +4561,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1962 "parser.y" +#line 2210 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4329,7 +4572,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1965 "parser.y" +#line 2213 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4396,7 +4639,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2025 "parser.y" +#line 2273 "parser.y" {(yyval.code) = code_new();} } break; @@ -4407,7 +4650,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" +#line 2274 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4418,7 +4661,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2029 "parser.y" +#line 2277 "parser.y" {PASS12 new_state();} } break; @@ -4429,7 +4672,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2029 "parser.y" +#line 2277 "parser.y" { (yyval.code) = code_new(); @@ -4457,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2048 "parser.y" +#line 2296 "parser.y" {(yyval.code)=code_new();} } break; @@ -4468,7 +4711,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2055 "parser.y" +#line 2303 "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); @@ -4482,7 +4725,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2059 "parser.y" +#line 2307 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4496,7 +4739,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2064 "parser.y" +#line 2312 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4507,7 +4750,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2313 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4518,7 +4761,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2067 "parser.y" +#line 2315 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4547,9 +4790,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2087 "parser.y" +#line 2335 "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__"); @@ -4600,7 +4847,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2383 "parser.y" {PASS12 new_state();} } break; @@ -4611,7 +4858,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2383 "parser.y" { (yyval.code) = code_new(); @@ -4639,7 +4886,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2150 "parser.y" +#line 2402 "parser.y" {PASS12 new_state();} } break; @@ -4650,7 +4897,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2150 "parser.y" +#line 2402 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4674,7 +4921,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2165 "parser.y" +#line 2417 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4687,7 +4934,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2168 "parser.y" +#line 2420 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4700,7 +4947,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2171 "parser.y" +#line 2423 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4713,7 +4960,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2174 "parser.y" +#line 2426 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4726,7 +4973,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2178 "parser.y" +#line 2430 "parser.y" {(yyval.code)=0;} } break; @@ -4737,7 +4984,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2179 "parser.y" +#line 2431 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4748,7 +4995,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2180 "parser.y" +#line 2432 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4759,7 +5006,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2181 "parser.y" +#line 2433 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4770,7 +5017,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2182 "parser.y" +#line 2434 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4781,7 +5028,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2183 "parser.y" +#line 2435 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4792,9 +5039,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2185 "parser.y" +#line 2437 "parser.y" { - (yyval.code) = abc_dup(0); + (yyval.code) = abc_getlocal(0, state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); @@ -4813,7 +5060,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" +#line 2448 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4826,8 +5073,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" - {PASS12 new_state();} +#line 2451 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -4837,11 +5084,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" +#line 2451 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); - code_t*out = (yyval.code) = abc_pop((yyval.code)); + + code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var); breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out); code_t*c = (yyval.code),*lastblock=0; @@ -4873,7 +5122,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2228 "parser.y" +#line 2482 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -4888,7 +5137,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2233 "parser.y" +#line 2487 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4902,6 +5151,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); @@ -4917,7 +5167,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2507 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -4928,7 +5178,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2507 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4953,7 +5203,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "parser.y" +#line 2523 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4964,7 +5214,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2269 "parser.y" +#line 2524 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4975,7 +5225,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" +#line 2525 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4986,7 +5236,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2271 "parser.y" +#line 2526 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5004,7 +5254,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2279 "parser.y" +#line 2534 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5022,8 +5272,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2288 "parser.y" - {PASS12 new_state();} +#line 2543 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -5033,7 +5286,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2288 "parser.y" +#line 2546 "parser.y" { code_t*out = abc_nop(0); @@ -5059,6 +5312,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)); } @@ -5085,7 +5339,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2333 "parser.y" +#line 2592 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5099,7 +5353,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2337 "parser.y" +#line 2596 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5117,24 +5371,41 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2348 "parser.y" +#line 2607 "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)); - (yyval.code) = abc_popscope((yyval.code)); + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + (yyval.value_list).number = v; + } + (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c; } } break; - case 109: + case 108: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2358 "parser.y" - {PASS12 (yyval.id)="package";} +#line 2617 "parser.y" + { + /* remove getlocal;pushwith from scope code again */ + state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); + + (yyval.code) = (yyvsp[(1) - (2)].value_list).cc; + if(state->method->has_exceptions) { + (yyval.code) = abc_dup((yyval.code)); + (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number); + } + (yyval.code) = abc_pushwith((yyval.code)); + (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code)); + (yyval.code) = abc_popscope((yyval.code)); + old_state(); +} } break; @@ -5144,8 +5415,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2360 "parser.y" - {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} +#line 2635 "parser.y" + {PASS12 (yyval.id)="package";} } break; @@ -5155,8 +5426,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2361 "parser.y" - {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} +#line 2636 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5166,8 +5437,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2363 "parser.y" - {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} +#line 2638 "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; @@ -5177,8 +5448,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2639 "parser.y" + {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5188,8 +5459,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2365 "parser.y" - {PASS12 startpackage("");} +#line 2641 "parser.y" + {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5199,7 +5470,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2366 "parser.y" +#line 2642 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5210,20 +5481,41 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2643 "parser.y" + {PASS12 startpackage("");} + } + break; + + + + case 117: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2644 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} + } + break; + + + + case 118: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2646 "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); } - - PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); (yyval.code)=0; } } @@ -5231,22 +5523,22 @@ PASS2 - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2660 "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)); } - PASS2 NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); state_has_imports(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); (yyval.code)=0; } } @@ -5254,275 +5546,284 @@ PASS2 - case 118: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" - {PASS12 (yyval.flags)=0;} +#line 2676 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 119: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2677 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 120: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2678 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2679 "parser.y" + { + PASS12 + (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; + if((yyvsp[(1) - (2)].flags).ns && (yyvsp[(2) - (2)].flags).ns) syntaxerror("only one namespace allowed in one declaration"); + (yyval.flags).ns=(yyvsp[(1) - (2)].flags).ns?(yyvsp[(1) - (2)].flags).ns:(yyvsp[(2) - (2)].flags).ns; + +} } break; - case 122: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2404 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2686 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 123: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2405 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2687 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 124: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2406 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2688 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 125: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2407 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2689 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 126: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2408 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2690 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 127: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2409 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2691 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 128: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2410 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2692 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 129: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2411 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2693 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 130: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2412 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2694 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 131: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2413 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2695 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; - case 132: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2415 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2699 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 133: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2700 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 134: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2418 "parser.y" +#line 2702 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 135: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2419 "parser.y" +#line 2703 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 136: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2421 "parser.y" +#line 2705 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 137: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2422 "parser.y" +#line 2706 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 138: + case 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2426 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2710 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; - case 139: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2428 "parser.y" +#line 2712 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 140: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2432 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2716 "parser.y" + {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE; + startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} } break; - case 141: + case 143: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2434 "parser.y" +#line 2719 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2732 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5533,11 +5834,11 @@ PASS2 - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2458 "parser.y" +#line 2743 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5546,19 +5847,19 @@ PASS2 - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2461 "parser.y" +#line 2746 "parser.y" { PASS12 - (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; - if((yyvsp[(1) - (8)].flags)&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { + (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; + if((yyvsp[(1) - (8)].flags).flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { syntaxerror("invalid method modifiers: interface methods always need to be public"); } - startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); - endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); + startfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); + endfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); list_deep_free((yyvsp[(6) - (8)].params).list); } } @@ -5566,53 +5867,88 @@ PASS2 - case 160: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2476 "parser.y" - {setstaticfunction((yyvsp[(1) - (3)].flags));} +#line 2761 "parser.y" + {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 161: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2476 "parser.y" +#line 2761 "parser.y" + {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} + } + break; + + + + case 164: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2763 "parser.y" + {(yyval.code) = (yyvsp[(1) - (1)].code);} + } + break; + + + + case 165: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2764 "parser.y" + {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} + } + break; + + + + case 166: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2767 "parser.y" { - int flags = (yyvsp[(1) - (6)].flags); - U8 access = flags2access((yyvsp[(1) - (6)].flags)); + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (6)].id), 1); + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); if(i) { check_override(i, flags); } - info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (6)].id)); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); } - info = varinfo_register_global(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 */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (6)].id)}; + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; trait_list_t**traits; code_t**code; if(!state->cls) { // global variable - mname_ns.name = state->package; + ns.name = state->package; traits = &global->init->traits; code = &global->init->method->body->code; } else if(flags&FLAG_STATIC) { @@ -5626,8 +5962,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); @@ -5636,157 +5972,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 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2549 "parser.y" +#line 2841 "parser.y" {(yyval.constant)=0;} } break; - case 163: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2842 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 164: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2552 "parser.y" +#line 2844 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 165: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2553 "parser.y" +#line 2845 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 166: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2554 "parser.y" +#line 2846 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 167: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2555 "parser.y" +#line 2847 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 168: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2556 "parser.y" +#line 2848 "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 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2558 "parser.y" +#line 2850 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 170: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2559 "parser.y" +#line 2851 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 171: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2560 "parser.y" +#line 2852 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 172: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2561 "parser.y" +#line 2853 "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 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2570 "parser.y" +#line 2865 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5796,11 +6134,11 @@ PASS2 - case 174: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2574 "parser.y" +#line 2869 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5810,11 +6148,11 @@ PASS2 - case 175: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2580 "parser.y" +#line 2875 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5826,11 +6164,11 @@ PASS2 - case 176: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2586 "parser.y" +#line 2881 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5842,11 +6180,11 @@ PASS2 - case 177: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2594 "parser.y" +#line 2889 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5857,11 +6195,11 @@ PASS2 - case 178: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "parser.y" +#line 2894 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5872,11 +6210,11 @@ PASS2 - case 179: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2605 "parser.y" +#line 2900 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5890,11 +6228,11 @@ PASS2 - case 180: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2613 "parser.y" +#line 2908 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5908,43 +6246,43 @@ PASS2 - case 183: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2623 "parser.y" +#line 2918 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 184: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2626 "parser.y" - {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} +#line 2921 "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 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2922 "parser.y" { PASS1 - endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); code_t*c = method_header(state->method); c = wrap_function(c, 0, (yyvsp[(11) - (12)].code)); - endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); PASS12 list_deep_free((yyvsp[(6) - (12)].params).list); (yyval.code)=0; @@ -5954,36 +6292,36 @@ PASS2 - case 187: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2643 "parser.y" +#line 2938 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 188: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2645 "parser.y" +#line 2940 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 189: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2646 "parser.y" +#line 2941 "parser.y" { PASS1 - endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); PASS2 methodinfo_t*f = state->method->info; if(!f || !f->kind) syntaxerror("internal error"); @@ -5992,7 +6330,7 @@ PASS2 c = wrap_function(c, 0, (yyvsp[(9) - (10)].code)); int index = state->method->var_index; - endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); (yyval.value).c = abc_getlocal(0, index); (yyval.value).t = TYPE_FUNCTION(f); @@ -6004,13 +6342,24 @@ PASS2 - case 190: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2668 "parser.y" +#line 2963 "parser.y" { - PASS1 (yyval.classinfo)=0; + 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); @@ -6021,17 +6370,18 @@ PASS2 - case 191: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2982 "parser.y" { - PASS1 static classinfo_t c; - memset(&c, 0, sizeof(c)); - c.package = (yyvsp[(1) - (3)].id); - c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=&c; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->package = (yyvsp[(1) - (3)].id); + c->name = (yyvsp[(3) - (3)].id); + (yyval.classinfo) = (classinfo_t*)c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -6043,122 +6393,122 @@ PASS2 - case 194: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2999 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 195: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 3000 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 196: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2695 "parser.y" - {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} +#line 3002 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 197: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2696 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 3003 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 198: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2697 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 3004 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 199: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2706 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 3013 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 200: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2707 "parser.y" - {(yyval.classinfo)=0;} +#line 3014 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 201: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3018 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 202: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2712 "parser.y" +#line 3019 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 203: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2714 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3021 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 206: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2718 "parser.y" - {(yyval.value_list).len=1; +#line 3025 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6166,24 +6516,24 @@ PASS2 - case 207: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2722 "parser.y" +#line 3029 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 208: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 3030 "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); } } @@ -6191,11 +6541,11 @@ PASS2 - case 210: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2729 "parser.y" +#line 3036 "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); @@ -6205,7 +6555,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]; @@ -6213,10 +6563,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; @@ -6232,11 +6582,11 @@ PASS2 - case 211: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 3072 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6250,7 +6600,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]; @@ -6262,17 +6612,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) { @@ -6287,11 +6637,11 @@ PASS2 - case 212: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2811 "parser.y" +#line 3118 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6308,7 +6658,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; } @@ -6317,11 +6667,11 @@ PASS2 - case 213: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2832 "parser.y" +#line 3139 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6347,11 +6697,11 @@ PASS2 - case 214: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2853 "parser.y" +#line 3160 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6360,11 +6710,11 @@ PASS2 - case 215: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2856 "parser.y" +#line 3163 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6374,33 +6724,33 @@ PASS2 - case 216: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 3170 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 217: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2864 "parser.y" +#line 3171 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 218: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "parser.y" +#line 3172 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6412,11 +6762,11 @@ PASS2 - case 219: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2871 "parser.y" +#line 3178 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6425,55 +6775,55 @@ PASS2 - case 220: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2877 "parser.y" +#line 3184 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2881 "parser.y" +#line 3186 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 223: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2883 "parser.y" +#line 3187 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 224: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2885 "parser.y" +#line 3188 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 226: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2889 "parser.y" +#line 3192 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6495,11 +6845,11 @@ PASS2 - case 227: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2906 "parser.y" +#line 3209 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6510,11 +6860,11 @@ PASS2 - case 228: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "parser.y" +#line 3214 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6523,11 +6873,11 @@ PASS2 - case 229: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 3217 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6536,11 +6886,11 @@ PASS2 - case 230: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2917 "parser.y" +#line 3220 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6549,11 +6899,11 @@ PASS2 - case 231: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2920 "parser.y" +#line 3223 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6562,11 +6912,11 @@ PASS2 - case 232: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2923 "parser.y" +#line 3226 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6575,11 +6925,11 @@ PASS2 - case 233: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2926 "parser.y" +#line 3229 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6588,11 +6938,11 @@ PASS2 - case 234: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2929 "parser.y" +#line 3232 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6601,11 +6951,11 @@ PASS2 - case 235: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2932 "parser.y" +#line 3235 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6614,11 +6964,11 @@ PASS2 - case 236: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2935 "parser.y" +#line 3238 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6627,11 +6977,11 @@ PASS2 - case 237: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2939 "parser.y" +#line 3242 "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; } @@ -6640,11 +6990,11 @@ PASS2 - case 238: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2942 "parser.y" +#line 3245 "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; } @@ -6653,11 +7003,11 @@ PASS2 - case 239: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2945 "parser.y" +#line 3248 "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; } @@ -6666,11 +7016,11 @@ PASS2 - case 240: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2948 "parser.y" +#line 3251 "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; } @@ -6679,11 +7029,11 @@ PASS2 - case 241: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2951 "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_equals((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; } @@ -6692,11 +7042,11 @@ PASS2 - case 242: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2954 "parser.y" +#line 3257 "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; } @@ -6705,11 +7055,11 @@ PASS2 - case 243: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2957 "parser.y" +#line 3260 "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; } @@ -6718,11 +7068,11 @@ PASS2 - case 244: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2960 "parser.y" +#line 3263 "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; } @@ -6731,11 +7081,11 @@ PASS2 - case 245: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2964 "parser.y" +#line 3267 "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); @@ -6752,11 +7102,11 @@ PASS2 - case 246: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2975 "parser.y" +#line 3278 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6779,11 +7129,11 @@ PASS2 - case 247: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2993 "parser.y" +#line 3296 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6793,11 +7143,11 @@ PASS2 - case 248: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "parser.y" +#line 3301 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6807,11 +7157,11 @@ PASS2 - case 249: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3003 "parser.y" +#line 3306 "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; @@ -6821,11 +7171,11 @@ PASS2 - case 250: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3008 "parser.y" +#line 3311 "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; @@ -6835,11 +7185,11 @@ PASS2 - case 251: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3013 "parser.y" +#line 3316 "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; @@ -6849,11 +7199,11 @@ PASS2 - case 252: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3018 "parser.y" +#line 3321 "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; @@ -6863,11 +7213,11 @@ PASS2 - case 253: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3022 "parser.y" +#line 3325 "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; @@ -6877,11 +7227,11 @@ PASS2 - case 254: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3026 "parser.y" +#line 3329 "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; @@ -6891,11 +7241,11 @@ PASS2 - case 255: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3031 "parser.y" +#line 3334 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_divide((yyval.value).c); (yyval.value).t = TYPE_NUMBER; @@ -6905,11 +7255,11 @@ PASS2 - case 256: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3035 "parser.y" +#line 3338 "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; @@ -6919,11 +7269,11 @@ PASS2 - case 257: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3039 "parser.y" +#line 3342 "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); @@ -6938,11 +7288,11 @@ PASS2 - case 258: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "parser.y" +#line 3351 "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); @@ -6957,11 +7307,11 @@ PASS2 - case 259: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3057 "parser.y" +#line 3360 "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); @@ -6976,11 +7326,11 @@ PASS2 - case 260: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3067 "parser.y" +#line 3370 "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; @@ -6990,11 +7340,11 @@ PASS2 - case 261: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3072 "parser.y" +#line 3375 "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)); @@ -7011,11 +7361,11 @@ PASS2 - case 262: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3085 "parser.y" +#line 3388 "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; @@ -7025,11 +7375,11 @@ PASS2 - case 263: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3090 "parser.y" +#line 3393 "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; @@ -7039,11 +7389,11 @@ PASS2 - case 264: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3095 "parser.y" +#line 3398 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7054,11 +7404,11 @@ PASS2 - case 265: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3101 "parser.y" +#line 3404 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7069,11 +7419,11 @@ PASS2 - case 266: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "parser.y" +#line 3410 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7082,22 +7432,22 @@ PASS2 - case 267: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3111 "parser.y" +#line 3414 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 268: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3113 "parser.y" +#line 3416 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -7113,11 +7463,11 @@ PASS2 - case 269: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3124 "parser.y" +#line 3427 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7131,15 +7481,15 @@ PASS2 - case 270: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3133 "parser.y" +#line 3436 "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(); } } @@ -7147,52 +7497,52 @@ PASS2 - case 271: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3443 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 272: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3141 "parser.y" +#line 3444 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 273: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "parser.y" +#line 3446 "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 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3149 "parser.y" +#line 3452 "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); } @@ -7201,15 +7551,15 @@ PASS2 - case 275: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3158 "parser.y" +#line 3461 "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(); } } @@ -7217,11 +7567,11 @@ PASS2 - case 276: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3165 "parser.y" +#line 3468 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7238,11 +7588,11 @@ PASS2 - case 277: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3177 "parser.y" +#line 3480 "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); @@ -7254,11 +7604,11 @@ PASS2 - case 278: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3183 "parser.y" +#line 3486 "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); @@ -7270,11 +7620,11 @@ PASS2 - case 279: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3189 "parser.y" +#line 3492 "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); @@ -7286,11 +7636,11 @@ PASS2 - case 280: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3195 "parser.y" +#line 3498 "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); @@ -7302,11 +7652,11 @@ PASS2 - case 281: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3201 "parser.y" +#line 3504 "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); @@ -7318,11 +7668,11 @@ PASS2 - case 282: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3207 "parser.y" +#line 3510 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7334,11 +7684,11 @@ PASS2 - case 283: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3213 "parser.y" +#line 3516 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7350,11 +7700,11 @@ PASS2 - case 284: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3219 "parser.y" +#line 3522 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7373,11 +7723,11 @@ PASS2 - case 285: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3232 "parser.y" +#line 3535 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7394,11 +7744,11 @@ PASS2 - case 286: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3243 "parser.y" +#line 3546 "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); @@ -7410,11 +7760,11 @@ PASS2 - case 287: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3250 "parser.y" +#line 3553 "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; @@ -7432,14 +7782,14 @@ PASS2 - case 288: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3263 "parser.y" +#line 3566 "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)) { @@ -7467,11 +7817,11 @@ PASS2 - case 289: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3290 "parser.y" +#line 3593 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7490,11 +7840,11 @@ PASS2 - case 290: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3304 "parser.y" +#line 3607 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7513,11 +7863,11 @@ PASS2 - case 291: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3318 "parser.y" +#line 3621 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7536,17 +7886,18 @@ PASS2 - case 292: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3333 "parser.y" +#line 3636 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; (yyval.value).c = abc_getlocal_0((yyval.value).c); @@ -7558,11 +7909,11 @@ PASS2 - case 293: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3346 "parser.y" +#line 3650 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7574,11 +7925,11 @@ PASS2 - case 294: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3353 "parser.y" +#line 3657 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7590,11 +7941,11 @@ PASS2 - case 295: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3360 "parser.y" +#line 3664 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7606,11 +7957,11 @@ PASS2 - case 296: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3367 "parser.y" +#line 3671 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7622,11 +7973,11 @@ PASS2 - case 297: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3374 "parser.y" +#line 3678 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7638,65 +7989,92 @@ PASS2 - case 298: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3386 "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(t, (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 3693 "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 = findmember_nsset(t, (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 { + if(!f) + as3_warning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); + + 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)); + + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(a) { + (yyval.value) = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + syntaxerror("couldn't resolve %s", package2); + } + } 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 */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); + 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 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3419 "parser.y" +#line 3749 "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 want to 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; @@ -7722,8 +8100,11 @@ PASS2 int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC; /* look at current class' members */ - if(state->cls && (f = registry_findmember(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && - (f->flags&FLAG_STATIC) >= i_am_static) { + if(!state->method->inner && + state->cls && + (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && + (f->flags&FLAG_STATIC) >= i_am_static) + { // $1 is a function in this class int var_is_static = (f->flags&FLAG_STATIC); @@ -7739,7 +8120,7 @@ PASS2 static properties of a class */ state->method->late_binding = 1; (yyval.value).t = f->type; - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); (yyval.value).c = abc_getproperty2((yyval.value).c, &m); @@ -7749,7 +8130,7 @@ PASS2 (yyval.value).c = abc_getslot((yyval.value).c, f->slot); break; } else { - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; (yyval.value).c = abc_getlocal_0((yyval.value).c); (yyval.value).c = abc_getproperty2((yyval.value).c, &m); @@ -7759,41 +8140,22 @@ 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)) || + registry_ispackage((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)}; @@ -7808,47 +8170,105 @@ PASS2 - case 300: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3540 "parser.y" - {(yyval.code)=0;} +#line 3858 "parser.y" + { + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (2)].id); + n->url = (yyvsp[(2) - (2)].id); + (yyval.namespace_decl)=n; +} } break; - case 301: + case 306: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3541 "parser.y" - {(yyval.code)=0;} +#line 3865 "parser.y" + { + 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 307: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3542 "parser.y" - {(yyval.code)=0;} +#line 3872 "parser.y" + { + 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 308: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3879 "parser.y" + { + PASS12 + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + + (yyval.code)=0; +} + } + break; + + + + case 309: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3544 "parser.y" +#line 3894 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].id)); + const char*url = (yyvsp[(3) - (3)].classinfo)->name; + + varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo); + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); + } + + if(!s || s->kind != INFOTYPE_SLOT) + syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1); + if(!s->value || !NS_TYPE(s->value->type)) + syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name); + url = s->value->ns->name; + + trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url); + add_active_url(url); (yyval.code)=0; } } @@ -7858,7 +8278,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 7862 "parser.tab.c" +#line 8282 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);