X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=cfbdb48a18cdd89a144e9039518deb8f31a4d0bd;hb=62a83d162b254d91da418cee25f5b87b067a3f92;hp=59cda49dac493e81d184c251be1e08c4002a3a4a;hpb=15d3df10f09bd780efa101d0c253db96716eb145;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 59cda49..cfbdb48 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -84,18 +84,20 @@ #include "abc.h" #include "pool.h" #include "files.h" +#include "common.h" #include "tokenizer.h" #include "registry.h" #include "code.h" #include "opcodes.h" #include "compiler.h" +#include "ast.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 99 "parser.tab.c" +#line 101 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -129,104 +131,103 @@ extern int a3_lex(); T_EMPTY = 262, T_INT = 263, T_UINT = 264, - T_BYTE = 265, - T_SHORT = 266, - T_FLOAT = 267, - T_FOR = 268, - T_WHILE = 269, - T_DO = 270, - T_SWITCH = 271, - KW_IMPLEMENTS = 272, - KW_NAMESPACE = 273, - KW_PACKAGE = 274, - KW_PROTECTED = 275, - KW_PUBLIC = 276, - KW_PRIVATE = 277, - KW_USE = 278, - KW_INTERNAL = 279, - KW_NEW = 280, - KW_NATIVE = 281, - KW_FUNCTION = 282, - KW_FINALLY = 283, - KW_UNDEFINED = 284, - KW_CONTINUE = 285, - KW_CLASS = 286, - KW_CONST = 287, - KW_CATCH = 288, - KW_CASE = 289, - KW_SET = 290, - KW_VOID = 291, - KW_THROW = 292, - KW_STATIC = 293, - KW_WITH = 294, - KW_INSTANCEOF = 295, - KW_IMPORT = 296, - KW_RETURN = 297, - KW_TYPEOF = 298, - KW_INTERFACE = 299, - KW_NULL = 300, - KW_VAR = 301, - KW_DYNAMIC = 302, - KW_OVERRIDE = 303, - KW_FINAL = 304, - KW_EACH = 305, - KW_GET = 306, - KW_TRY = 307, - KW_SUPER = 308, - KW_EXTENDS = 309, - KW_FALSE = 310, - KW_TRUE = 311, - KW_BOOLEAN = 312, - KW_UINT = 313, - KW_INT = 314, - KW_NUMBER = 315, - KW_STRING = 316, - KW_DEFAULT = 317, - KW_DELETE = 318, - KW_IF = 319, - KW_ELSE = 320, - KW_BREAK = 321, - KW_IS = 322, - KW_IN = 323, - KW_AS = 324, - T_DICTSTART = 325, - T_EQEQ = 326, - T_EQEQEQ = 327, - T_NE = 328, - T_NEE = 329, - T_LE = 330, - T_GE = 331, - T_ORBY = 332, - T_DIVBY = 333, - T_MODBY = 334, - T_MULBY = 335, - T_PLUSBY = 336, - T_MINUSBY = 337, - T_XORBY = 338, - T_SHRBY = 339, - T_SHLBY = 340, - T_USHRBY = 341, - T_OROR = 342, - T_ANDAND = 343, - T_COLONCOLON = 344, - T_MINUSMINUS = 345, - T_PLUSPLUS = 346, - T_DOTDOT = 347, - T_DOTDOTDOT = 348, - T_SHL = 349, - T_USHR = 350, - T_SHR = 351, - prec_none = 352, - below_semicolon = 353, - below_assignment = 354, - below_minus = 356, - minusminus_prefix = 357, - plusplus_prefix = 358, - below_curly = 359, - new2 = 360, - above_identifier = 361, - below_else = 362, - above_function = 363 + T_FLOAT = 265, + T_FOR = 266, + T_WHILE = 267, + T_DO = 268, + T_SWITCH = 269, + KW_IMPLEMENTS = 270, + KW_NAMESPACE = 271, + KW_PACKAGE = 272, + KW_PROTECTED = 273, + KW_PUBLIC = 274, + KW_PRIVATE = 275, + KW_USE = 276, + KW_INTERNAL = 277, + KW_NEW = 278, + KW_NATIVE = 279, + KW_FUNCTION = 280, + KW_FINALLY = 281, + KW_UNDEFINED = 282, + KW_NAN = 283, + KW_CONTINUE = 284, + KW_CLASS = 285, + KW_CONST = 286, + KW_CATCH = 287, + KW_CASE = 288, + KW_SET = 289, + KW_VOID = 290, + KW_THROW = 291, + KW_STATIC = 292, + KW_WITH = 293, + KW_INSTANCEOF = 294, + KW_IMPORT = 295, + KW_RETURN = 296, + KW_TYPEOF = 297, + KW_INTERFACE = 298, + KW_NULL = 299, + KW_VAR = 300, + KW_DYNAMIC = 301, + KW_OVERRIDE = 302, + KW_FINAL = 303, + KW_EACH = 304, + KW_GET = 305, + KW_TRY = 306, + KW_SUPER = 307, + KW_EXTENDS = 308, + KW_FALSE = 309, + KW_TRUE = 310, + KW_BOOLEAN = 311, + KW_UINT = 312, + KW_INT = 313, + KW_NUMBER = 314, + KW_STRING = 315, + KW_DEFAULT = 316, + KW_DELETE = 317, + KW_IF = 318, + KW_ELSE = 319, + KW_BREAK = 320, + KW_IS = 321, + KW_IN = 322, + KW_AS = 323, + T_DICTSTART = 324, + T_EQEQ = 325, + T_EQEQEQ = 326, + T_NE = 327, + T_NEE = 328, + T_LE = 329, + T_GE = 330, + T_ORBY = 331, + T_DIVBY = 332, + T_MODBY = 333, + T_MULBY = 334, + T_PLUSBY = 335, + T_MINUSBY = 336, + T_XORBY = 337, + T_SHRBY = 338, + T_SHLBY = 339, + T_USHRBY = 340, + T_OROR = 341, + T_ANDAND = 342, + T_COLONCOLON = 343, + T_MINUSMINUS = 344, + T_PLUSPLUS = 345, + T_DOTDOT = 346, + T_DOTDOTDOT = 347, + T_SHL = 348, + T_USHR = 349, + T_SHR = 350, + prec_none = 351, + below_semicolon = 352, + below_assignment = 353, + below_minus = 355, + minusminus_prefix = 356, + plusplus_prefix = 357, + below_curly = 358, + new2 = 359, + above_identifier = 360, + below_else = 361, + above_function = 362 }; #endif @@ -235,12 +236,12 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 46 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 46 "parser.y" enum yytokentype token; @@ -274,7 +275,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 278 "parser.tab.c" +#line 279 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -285,7 +286,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 265 "parser.y" +#line 266 "parser.y" static int a3_error(char*s) @@ -294,6 +295,13 @@ static int a3_error(char*s) return 0; //make gcc happy } +static void parsererror(const char*file, int line, const char*f) +{ + syntaxerror("internal error in %s, %s:%d", f, file, line); +} + +#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} + static char* concat2(const char* t1, const char* t2) { @@ -321,7 +329,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3) typedef struct _import { char*package; } import_t; - DECLARE_LIST(import); DECLARE(methodstate); @@ -356,6 +363,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 @@ -378,8 +386,9 @@ typedef struct _state { import_list_t*wildcard_imports; dict_t*import_toplevel_packages; dict_t*imports; - namespace_list_t*active_namespaces; - namespace_decl_list_t*new_namespaces; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -387,6 +396,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -448,6 +459,15 @@ static namespace_list_t nl2 = {&ns2,&nl3}; static namespace_list_t nl1 = {&ns1,&nl2}; static namespace_set_t nopackage_namespace_set = {&nl1}; +static dict_t*definitions=0; +void as3_set_definition(const char*c) +{ + if(!definitions) + definitions = dict_new(); + if(!dict_contains(definitions,c)) + dict_put(definitions,c,0); +} + static void new_state() { NEW(state_t, s); @@ -463,28 +483,14 @@ static void new_state() state = s; state->level++; state->has_own_imports = 0; - state->new_namespaces = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; -} -static void state_has_imports() -{ - state->wildcard_imports = list_clone(state->wildcard_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); + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_destroy(state_t*state) @@ -508,23 +514,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; - namespace_decl_list_t*nl=leaving->new_namespaces; - while(nl) { - tokenizer_unregister_namespace(nl->namespace_decl->name); - nl = nl->next; - } - if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -533,7 +538,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -548,6 +553,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); @@ -599,46 +607,15 @@ void initialize_parser() void* finish_parser() { dict_free_all(global->file2token2info, 1, (void*)dict_destroy); - global->token2info=0; - return global->file; } - -static void xx_scopetest() -{ - /* findpropstrict doesn't just return a scope object- it - also makes it "active" somehow. Push local_0 on the - scope stack and read it back with findpropstrict, it'll - contain properties like "trace". Trying to find the same - property on a "vanilla" local_0 yields only a "undefined" */ - //c = abc_findpropstrict(c, "[package]::trace"); - - /*c = abc_getlocal_0(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_coerce_a(c); - c = abc_setlocal_1(c); - - c = abc_pushbyte(c, 0); - c = abc_setlocal_2(c); - - code_t*xx = c = abc_label(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "prop:"); - c = abc_hasnext2(c, 1, 2); - c = abc_dup(c); - c = abc_setlocal_3(c); - c = abc_callpropvoid(c, "[package]::trace", 2); - c = abc_getlocal_3(c); - c = abc_kill(c, 3); - c = abc_iftrue(c,xx);*/ -} - typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; methodstate_t*is_inner_method; } variable_t; @@ -667,11 +644,37 @@ static variable_t* find_variable_safe(state_t*s, char*name) syntaxerror("undefined variable: %s", name); return v; } + static char variable_exists(char*name) { return dict_contains(state->vars, name); } -code_t*defaultvalue(code_t*c, classinfo_t*type); + +static code_t*defaultvalue(code_t*c, classinfo_t*type) +{ + if(TYPE_IS_INT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_UINT(type)) { + c = abc_pushuint(c, 0); + } else if(TYPE_IS_FLOAT(type)) { + c = abc_pushnan(c); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else if(!type) { + //c = abc_pushundefined(c); + syntaxerror("internal error: can't generate default value for * type"); + } else { + c = abc_pushnull(c); + MULTINAME(m, type); + c = abc_coerce2(c, &m); + } + return c; +} + +static int alloc_local() +{ + return state->method->variable_count++; +} static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { @@ -682,7 +685,7 @@ 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; @@ -705,7 +708,7 @@ static int gettempvar() return new_variable(TEMPVARNAME, 0, 0, 0); } -code_t* var_block(code_t*body) +static code_t* var_block(code_t*body) { code_t*c = 0; code_t*k = 0; @@ -749,7 +752,7 @@ code_t* var_block(code_t*body) return c; } -void unknown_variable(char*name) +static void unknown_variable(char*name) { if(!state->method->unresolved_variables) state->method->unresolved_variables = dict_new(); @@ -757,25 +760,26 @@ void unknown_variable(char*name) dict_put(state->method->unresolved_variables, name, 0); } -#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} - -static void parsererror(const char*file, int line, const char*f) -{ - syntaxerror("internal error in %s, %s:%d", f, file, line); -} - - -static code_t* add_scope_code(code_t*c, methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - 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) { - /* FIXME: does this need to be the same activation object as - in the function header? */ - 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; } @@ -784,7 +788,7 @@ static code_t* method_header(methodstate_t*m) { code_t*c = 0; - c = add_scope_code(c, m); + c = add_scope_code(c, m, 1); methodstate_list_t*l = m->innerfunctions; while(l) { @@ -811,6 +815,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; @@ -829,20 +846,15 @@ static code_t* wrap_function(code_t*c,code_t*header, code_t*body) return c; } - static void startpackage(char*name) { new_state(); - /*printf("entering package \"%s\"\n", name);*/ state->package = strdup(name); } static void endpackage() { - /*printf("leaving package \"%s\"\n", state->package);*/ - //used e.g. in classinfo_register: //free(state->package);state->package=0; - old_state(); } @@ -861,7 +873,15 @@ static namespace_t modifiers2access(modifiers_t*mod) if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels and namespaces"); ns.access = ACCESS_NAMESPACE; - ns.name = mod->ns; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + 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"); @@ -881,6 +901,11 @@ static namespace_t modifiers2access(modifiers_t*mod) } 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); +} + static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { if(var0) { @@ -907,15 +932,11 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char 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(as3_pass==2) { - m->scope_code = add_scope_code(m->scope_code, m); - } - - methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; @@ -928,14 +949,19 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char 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) { - v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); - if(!v->type || v->type->kind != INFOTYPE_CLASS) { - syntaxerror("Couldn't find class %s", v->type->name); + 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; } } } @@ -1111,23 +1137,6 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl } } -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(flags && flags->flags&FLAG_STATIC) { - state->method = state->cls->static_init; - } else { - state->method = state->cls->init; - } - } else { - parserassert(state->method); - } -} - static void endclass() { if(as3_pass == 2) { @@ -1169,6 +1178,12 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___RETHROW__) { + syntaxerror("Unresolved \"rethrow\""); + } + if(c->opcode == OPCODE___FALLTHROUGH__) { + syntaxerror("Unresolved \"fallthrough\""); + } if(c->opcode == OPCODE___PUSHPACKAGE__) { char*name = string_cstr(c->data[0]); syntaxerror("Can't reference a package (%s) as such", name); @@ -1177,10 +1192,8 @@ 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 @@ -1239,9 +1252,6 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c //class method 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, ns.access, ns.name, name); @@ -1391,8 +1401,6 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { - int flags = mod?mod->flags:0; - if(as3_pass==1) { // store inner methods in variables function_initvars(state->method, 0, 0, 0); @@ -1465,10 +1473,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; + namespace_t mname_ns = modifiers2access(mod); multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) + if(mod->flags&FLAG_STATIC) f = abc_class_staticmethod(state->cls->abc, type2, &mname); else f = abc_class_method(state->cls->abc, type2, &mname); @@ -1484,7 +1492,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* //flash doesn't seem to allow us to access function slots //state->method->info->slot = slot; - if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; + if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; if(getset == KW_GET) f->trait->kind = TRAIT_GETTER; if(getset == KW_SET) f->trait->kind = TRAIT_SETTER; if(params->varargs) f->flags |= METHOD_NEED_REST; @@ -1537,11 +1545,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* return 0; } -char is_subtype_of(classinfo_t*type, classinfo_t*supertype) -{ - return 1; // FIXME -} - void breakjumpsto(code_t*c, char*name, code_t*jump) { while(c) { @@ -1569,11 +1572,11 @@ void continuejumpsto(code_t*c, char*name, code_t*jump) } } +/* TODO: move this to ast.c */ #define IS_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a))) #define IS_NUMBER_OR_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)) || TYPE_IS_NUMBER((a))) #define BOTH_INT(a,b) (IS_INT(a) && IS_INT(b)) - -classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op) +static classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op) { if(!type1 || !type2) return registry_getanytype(); @@ -1592,6 +1595,26 @@ classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op) return type1; return registry_getanytype(); } +static char is_getlocal(code_t*c) +{ + if(!c || c->prev || c->next) + return 0; + return(c->opcode == OPCODE_GETLOCAL + || c->opcode == OPCODE_GETLOCAL_0 + || c->opcode == OPCODE_GETLOCAL_1 + || c->opcode == OPCODE_GETLOCAL_2 + || c->opcode == OPCODE_GETLOCAL_3); +} +static int getlocalnr(code_t*c) +{ + if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];} + else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;} + else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;} + else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;} + else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;} + else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode); + return 0; +} code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { if(from==to) @@ -1609,10 +1632,21 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) if((TYPE_IS_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) && (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) { // allow conversion between number types + if(TYPE_IS_UINT(to)) + return abc_convert_u(c); + else if(TYPE_IS_INT(to)) + return abc_convert_i(c); + else if(TYPE_IS_NUMBER(to)) + return abc_convert_d(c); return abc_coerce2(c, &m); } - //printf("%s.%s\n", from.package, from.name); - //printf("%s.%s\n", to.package, to.name); + + if(TYPE_IS_BOOLEAN(to)) + return abc_convert_b(c); + if(TYPE_IS_STRING(to)) + return abc_convert_s(c); + if(TYPE_IS_OBJECT(to)) + return abc_convert_o(c); classinfo_t*supertype = from; while(supertype) { @@ -1638,30 +1672,12 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; as3_error("can't convert type %s%s%s to %s%s%s", - from->package, from->package?".":"", from->name, - to->package, to->package?".":"", to->name); - return c; -} + from->package, from->package[0]?".":"", from->name, + to->package, to->package[0]?".":"", to->name); -code_t*defaultvalue(code_t*c, classinfo_t*type) -{ - if(TYPE_IS_INT(type)) { - c = abc_pushbyte(c, 0); - } else if(TYPE_IS_UINT(type)) { - c = abc_pushuint(c, 0); - } else if(TYPE_IS_FLOAT(type)) { - c = abc_pushnan(c); - } else if(TYPE_IS_BOOLEAN(type)) { - c = abc_pushfalse(c); - } else if(!type) { - //c = abc_pushundefined(c); - } else { - c = abc_pushnull(c); - MULTINAME(m, type); - c = abc_coerce2(c, &m); - } return c; } +/* move to ast.c todo end */ char is_pushundefined(code_t*c) { @@ -1773,28 +1789,8 @@ typedcode_t push_class(slotinfo_t*a) return x; } -static char is_getlocal(code_t*c) -{ - if(!c || c->prev || c->next) - return 0; - return(c->opcode == OPCODE_GETLOCAL - || c->opcode == OPCODE_GETLOCAL_0 - || c->opcode == OPCODE_GETLOCAL_1 - || c->opcode == OPCODE_GETLOCAL_2 - || c->opcode == OPCODE_GETLOCAL_3); -} -static int getlocalnr(code_t*c) -{ - if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];} - else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;} - else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;} - else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;} - else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;} - else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode); - return 0; -} -static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore) +code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore, char pushvalue) { /* converts this: @@ -1891,29 +1887,36 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r temp = gettempvar(); c = code_append(c, prefix); c = code_append(c, r); - if(readbefore) { + if(pushvalue && readbefore) { c = abc_dup(c); c = abc_setlocal(c, temp); } c = code_append(c, middlepart); - if(!readbefore) { + if(pushvalue && !readbefore) { c = abc_dup(c); c = abc_setlocal(c, temp); } c = code_append(c, write); - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); + if(pushvalue) { + c = abc_getlocal(c, temp); + c = abc_kill(c, temp); + } } else { /* if we're allowed to execute the read code twice *and* the middlepart doesn't modify the code, things are easier. */ - code_t* r2 = code_dup(r); //c = code_append(c, prefix); parserassert(!prefix); + code_t* r2 = 0; + if(pushvalue) { + r2 = code_dup(r); + } c = code_append(c, r); c = code_append(c, middlepart); c = code_append(c, write); - c = code_append(c, r2); + if(pushvalue) { + c = code_append(c, r2); + } } } else { /* even smaller version: overwrite the value without reading @@ -1925,7 +1928,9 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } c = code_append(c, middlepart); c = code_append(c, write); - c = code_append(c, r); + if(pushvalue) { + c = code_append(c, r); + } } else { code_free(r);r=0; temp = gettempvar(); @@ -1933,11 +1938,15 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r c = code_append(c, prefix); } c = code_append(c, middlepart); - c = abc_dup(c); - c = abc_setlocal(c, temp); + if(pushvalue) { + c = abc_dup(c); + c = abc_setlocal(c, temp); + } c = code_append(c, write); - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); + if(pushvalue) { + c = abc_getlocal(c, temp); + c = abc_kill(c, temp); + } } } return c; @@ -1958,7 +1967,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -2077,13 +2085,83 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) #define PASS1 }} if(as3_pass == 1) {{ #define PASS1END }} if(as3_pass == 2) {{ #define PASS2 }} if(as3_pass == 2) {{ -#define PASS12 }} {{ +#define PASS12 }} if(as3_pass == 1 || as3_pass == 2) {{ #define PASS12END }} if(as3_pass == 2) {{ +#define PASS_ALWAYS }} {{ /* Line 273 of skeleton.m4 */ -#line 2087 "parser.tab.c" +#line 2096 "parser.tab.c" +/* Unqualified %code blocks. */ + +/* Line 274 of skeleton.m4 */ +#line 2159 "parser.y" + + char is_subtype_of(classinfo_t*type, classinfo_t*supertype) + { + return 1; // FIXME + } + + +/* Line 274 of skeleton.m4 */ +#line 2611 "parser.y" + + static void state_has_imports() + { + state->wildcard_imports = list_clone(state->wildcard_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); + } + + +/* Line 274 of skeleton.m4 */ +#line 2744 "parser.y" + + 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(flags && flags->flags&FLAG_STATIC) { + state->method = state->cls->static_init; + } else { + state->method = state->cls->init; + } + } else { + parserassert(state->method); + } + } + + +/* Line 274 of skeleton.m4 */ +#line 3885 "parser.y" + + void add_active_url(const char*url) + { + NEW(namespace_t,n); + n->name = url; + list_append(state->active_namespace_urls, n); + } + + + +/* Line 274 of skeleton.m4 */ +#line 2165 "parser.tab.c" #ifdef short # undef short @@ -2298,20 +2376,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3061 +#define YYLAST 3050 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 134 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 114 +#define YYNNTS 113 /* YYNRULES -- Number of rules. */ -#define YYNRULES 308 +#define YYNRULES 299 /* YYNRULES -- Number of states. */ -#define YYNSTATES 520 +#define YYNSTATES 511 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 363 +#define YYMAXUTOK 362 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -2322,16 +2400,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 118, 2, 2, 2, 116, 108, 2, - 122, 133, 115, 113, 100, 112, 127, 114, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 105, 99, - 109, 102, 110, 104, 128, 2, 2, 2, 2, 2, + 2, 2, 2, 117, 2, 2, 2, 115, 107, 2, + 121, 132, 114, 112, 99, 111, 126, 113, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 104, 98, + 108, 101, 109, 103, 127, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 124, 2, 125, 107, 2, 2, 2, 2, 2, + 2, 123, 2, 124, 106, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 126, 106, 132, 117, 2, 2, 2, + 2, 2, 2, 125, 105, 131, 116, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2354,8 +2432,8 @@ static const yytype_uint8 yytranslate[] = 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 101, 103, 111, 119, 120, 121, - 123, 129, 130, 131 + 95, 96, 97, 100, 102, 110, 118, 119, 120, 122, + 128, 129, 130 }; #if YYDEBUG @@ -2374,159 +2452,155 @@ static const yytype_uint16 yyprhs[] = 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, 300, 303, - 305, 307, 311, 313, 314, 321, 322, 328, 331, 336, - 337, 339, 341, 344, 346, 348, 350, 352, 354, 356, - 358, 360, 362, 364, 365, 368, 369, 372, 373, 376, - 377, 387, 388, 397, 398, 400, 402, 405, 407, 412, - 414, 416, 418, 419, 421, 423, 426, 428, 431, 440, - 442, 444, 445, 450, 452, 456, 460, 461, 464, 466, - 468, 470, 472, 474, 476, 478, 480, 482, 483, 485, - 488, 493, 497, 499, 504, 507, 509, 511, 512, 513, - 526, 528, 529, 530, 541, 543, 547, 549, 551, 553, - 557, 559, 561, 563, 566, 567, 568, 572, 573, 575, - 577, 579, 582, 585, 586, 591, 596, 601, 604, 606, - 609, 611, 613, 617, 619, 621, 623, 625, 627, 629, - 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, - 651, 653, 657, 661, 665, 669, 673, 677, 681, 685, - 689, 693, 696, 699, 703, 707, 711, 715, 719, 723, - 727, 731, 735, 739, 743, 747, 751, 755, 759, 764, - 767, 769, 773, 776, 781, 785, 786, 788, 792, 798, - 802, 806, 810, 814, 818, 822, 826, 830, 834, 838, - 842, 846, 852, 855, 858, 861, 864, 868, 871, 876, - 882, 886, 892, 896, 898, 901, 906, 911, 914 + 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, 639, 643, 647, 651, 655, 659, 663, + 667, 671, 675, 678, 681, 685, 689, 693, 697, 701, + 705, 709, 713, 717, 721, 725, 729, 733, 737, 741, + 746, 749, 751, 755, 758, 763, 767, 768, 770, 774, + 780, 784, 788, 792, 796, 800, 804, 808, 812, 816, + 820, 824, 828, 834, 837, 840, 843, 846, 850, 853, + 858, 864, 868, 874, 878, 880, 883, 888, 893, 896 }; /* 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, 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, - 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, 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, 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, - 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, 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, 238, -1, 37, -1, 39, 122, 238, 133, -1, - 182, 146, -1, 3, -1, 19, -1, 185, 127, 184, - -1, 184, -1, -1, 19, 185, 126, 187, 139, 132, - -1, -1, 19, 126, 188, 139, 132, -1, 41, 223, - -1, 41, 185, 127, 115, -1, -1, 191, -1, 192, - -1, 191, 192, -1, 21, -1, 22, -1, 20, -1, - 38, -1, 47, -1, 49, -1, 48, -1, 26, -1, - 24, -1, 4, -1, -1, 54, 224, -1, -1, 54, - 225, -1, -1, 17, 225, -1, -1, 190, 31, 3, - 193, 195, 126, 197, 200, 132, -1, -1, 190, 44, - 3, 194, 126, 199, 203, 132, -1, -1, 201, -1, - 202, -1, 201, 202, -1, 99, -1, 148, 126, 200, - 132, -1, 207, -1, 217, -1, 144, -1, -1, 204, - -1, 205, -1, 204, 205, -1, 99, -1, 46, 3, - -1, 190, 27, 216, 3, 122, 213, 133, 227, -1, - 46, -1, 32, -1, -1, 190, 206, 208, 209, -1, - 210, -1, 209, 100, 210, -1, 3, 227, 149, -1, - -1, 102, 212, -1, 10, -1, 8, -1, 9, -1, - 12, -1, 5, -1, 56, -1, 55, -1, 45, -1, - 3, -1, -1, 214, -1, 93, 215, -1, 214, 100, - 93, 215, -1, 214, 100, 215, -1, 215, -1, 3, - 105, 226, 211, -1, 3, 211, -1, 51, -1, 35, - -1, -1, -1, 190, 27, 216, 3, 122, 213, 133, - 227, 126, 218, 142, 132, -1, 3, -1, -1, -1, - 27, 219, 122, 213, 133, 227, 126, 221, 142, 132, - -1, 3, -1, 185, 127, 3, -1, 223, -1, 222, - -1, 224, -1, 225, 100, 224, -1, 224, -1, 115, - -1, 36, -1, 105, 226, -1, -1, -1, 122, 229, - 133, -1, -1, 230, -1, 231, -1, 237, -1, 230, - 100, -1, 231, 237, -1, -1, 25, 240, 232, 228, - -1, 240, 122, 229, 133, -1, 53, 122, 229, 133, - -1, 63, 240, -1, 42, -1, 42, 238, -1, 240, - -1, 240, -1, 238, 100, 240, -1, 238, -1, 220, - -1, 241, -1, 244, -1, 233, -1, 235, -1, 234, - -1, 6, -1, 10, -1, 11, -1, 8, -1, 9, - -1, 12, -1, 5, -1, 29, -1, 56, -1, 55, - -1, 45, -1, 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 + 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, + 136, 137, -1, 185, -1, 197, -1, 195, -1, 216, + -1, 206, -1, 146, -1, 147, 125, 135, 131, -1, + 98, -1, -1, 139, -1, 140, -1, 139, 140, -1, + 197, -1, 195, -1, 216, -1, 206, -1, 146, -1, + 147, 125, 138, 131, -1, 98, -1, 142, -1, -1, + 142, 144, -1, 144, -1, 188, -1, 158, -1, 159, + -1, 160, -1, 162, -1, 170, -1, 153, -1, 182, + -1, 178, -1, 238, -1, 245, -1, 244, -1, 125, + 142, 131, -1, 125, 131, -1, 98, -1, 143, -1, + 149, -1, 164, -1, 165, -1, 235, -1, 180, -1, + 147, 125, 142, 131, -1, 144, 98, -1, 144, -1, + 143, -1, 3, 88, 3, -1, 101, 236, -1, -1, + 45, 150, -1, 31, 150, -1, 151, -1, 150, 99, + 151, -1, 3, 226, 148, -1, -1, 64, 145, -1, + -1, 63, 121, 154, 237, 132, 145, 152, -1, -1, + 149, -1, 238, -1, 45, 3, 226, -1, 3, -1, + 11, 121, -1, 11, 49, 121, -1, 157, 155, 98, + 237, 98, 238, 132, 145, -1, 157, 156, 67, 237, + 132, 145, -1, -1, 12, 121, 161, 237, 132, 145, + -1, -1, 13, 163, 145, 12, 121, 237, 132, -1, + 65, -1, 65, 3, -1, 29, -1, 29, 3, -1, + -1, 167, -1, 169, -1, 167, 169, -1, 168, -1, + 167, 168, -1, 33, 239, 104, 141, -1, 61, 104, + 141, -1, -1, 14, 121, 171, 239, 132, 125, 166, + 131, -1, -1, 32, 121, 3, 226, 132, 173, 125, + 141, 131, -1, -1, 26, 125, 175, 141, 131, -1, + 172, -1, 176, 172, -1, 176, -1, 176, 174, -1, + 174, -1, -1, 51, 125, 179, 141, 131, 177, -1, + 36, 237, -1, 36, -1, 38, 121, 237, 132, -1, + 181, 145, -1, 3, -1, 17, -1, 4, -1, 184, + 126, 183, -1, 183, -1, -1, 17, 184, 125, 186, + 138, 131, -1, -1, 17, 125, 187, 138, 131, -1, + 40, 222, -1, 40, 184, 126, 114, -1, -1, 190, + -1, 191, -1, 190, 191, -1, 19, -1, 20, -1, + 18, -1, 37, -1, 46, -1, 48, -1, 47, -1, + 24, -1, 22, -1, 4, -1, -1, 53, 223, -1, + -1, 53, 224, -1, -1, 15, 224, -1, -1, 189, + 30, 3, 192, 194, 125, 196, 199, 131, -1, -1, + 189, 43, 3, 193, 125, 198, 202, 131, -1, -1, + 200, -1, 201, -1, 200, 201, -1, 98, -1, 147, + 125, 199, 131, -1, 206, -1, 216, -1, 143, -1, + -1, 203, -1, 204, -1, 203, 204, -1, 98, -1, + 45, 3, -1, 189, 25, 215, 3, 121, 212, 132, + 226, -1, 45, -1, 31, -1, -1, 189, 205, 207, + 208, -1, 209, -1, 208, 99, 209, -1, 3, 226, + 148, -1, -1, 101, 211, -1, 8, -1, 9, -1, + 10, -1, 5, -1, 55, -1, 54, -1, 44, -1, + 27, -1, 28, -1, -1, 213, -1, 92, 214, -1, + 213, 99, 92, 214, -1, 213, 99, 214, -1, 214, + -1, 3, 104, 225, 210, -1, 3, 210, -1, 50, + -1, 34, -1, -1, -1, 189, 25, 215, 3, 121, + 212, 132, 226, 125, 217, 141, 131, -1, 3, -1, + -1, -1, 25, 218, 121, 212, 132, 226, 125, 220, + 141, 131, -1, 183, -1, 184, 126, 183, -1, 222, + -1, 221, -1, 223, -1, 224, 99, 223, -1, 223, + -1, 114, -1, 35, -1, 104, 225, -1, -1, -1, + 121, 228, 132, -1, -1, 229, -1, 230, -1, 236, + -1, 229, 99, -1, 230, 236, -1, -1, 23, 239, + 231, 227, -1, 239, 121, 228, 132, -1, 52, 121, + 228, 132, -1, 62, 239, -1, 41, -1, 41, 237, + -1, 239, -1, 239, -1, 237, 99, 239, -1, 237, + -1, 219, -1, 242, -1, 232, -1, 234, -1, 233, + -1, 211, -1, 6, -1, 239, 108, 239, -1, 239, + 109, 239, -1, 239, 74, 239, -1, 239, 75, 239, + -1, 239, 70, 239, -1, 239, 71, 239, -1, 239, + 73, 239, -1, 239, 72, 239, -1, 239, 86, 239, + -1, 239, 87, 239, -1, 117, 239, -1, 116, 239, + -1, 239, 107, 239, -1, 239, 106, 239, -1, 239, + 105, 239, -1, 239, 95, 239, -1, 239, 94, 239, + -1, 239, 93, 239, -1, 239, 113, 239, -1, 239, + 115, 239, -1, 239, 112, 239, -1, 239, 111, 239, + -1, 239, 114, 239, -1, 239, 67, 239, -1, 239, + 68, 239, -1, 239, 39, 239, -1, 239, 66, 239, + -1, 42, 121, 239, 132, -1, 35, 239, -1, 35, + -1, 121, 237, 132, -1, 111, 239, -1, 239, 123, + 239, 124, -1, 123, 228, 124, -1, -1, 241, -1, + 236, 104, 236, -1, 241, 99, 236, 104, 236, -1, + 69, 240, 131, -1, 239, 79, 239, -1, 239, 78, + 239, -1, 239, 84, 239, -1, 239, 83, 239, -1, + 239, 85, 239, -1, 239, 77, 239, -1, 239, 76, + 239, -1, 239, 82, 239, -1, 239, 80, 239, -1, + 239, 81, 239, -1, 239, 101, 239, -1, 239, 103, + 239, 104, 239, -1, 239, 90, -1, 239, 89, -1, + 90, 239, -1, 89, 239, -1, 52, 126, 3, -1, + 127, 3, -1, 239, 126, 127, 3, -1, 239, 126, + 3, 88, 3, -1, 239, 91, 3, -1, 239, 126, + 121, 239, 132, -1, 239, 126, 3, -1, 3, -1, + 16, 3, -1, 16, 3, 101, 3, -1, 16, 3, + 101, 5, -1, 189, 243, -1, 21, 16, 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 2065, 2065, 2067, 2067, 2068, 2069, 2071, 2072, 2073, - 2074, 2075, 2076, 2077, 2078, 2080, 2080, 2081, 2082, 2084, - 2085, 2086, 2087, 2088, 2089, 2090, 2092, 2093, 2095, 2096, - 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, - 2109, 2110, 2111, 2112, 2115, 2116, 2117, 2118, 2119, 2120, - 2121, 2122, 2126, 2127, 2131, 2138, 2142, 2143, 2147, 2148, - 2150, 2151, 2153, 2214, 2215, 2218, 2218, 2237, 2238, 2239, - 2244, 2248, 2253, 2254, 2256, 2276, 2324, 2324, 2343, 2343, - 2358, 2361, 2364, 2367, 2371, 2372, 2373, 2374, 2375, 2376, - 2378, 2389, 2392, 2392, 2421, 2421, 2446, 2446, 2462, 2463, - 2464, 2465, 2473, 2482, 2482, 2531, 2535, 2546, 2558, 2575, - 2576, 2578, 2579, 2581, 2581, 2583, 2583, 2586, 2602, 2619, - 2620, 2621, 2622, 2630, 2631, 2632, 2633, 2634, 2635, 2636, - 2637, 2638, 2639, 2643, 2644, 2646, 2647, 2649, 2650, 2654, - 2652, 2660, 2658, 2667, 2668, 2669, 2670, 2671, 2672, 2673, - 2674, 2676, 2682, 2683, 2684, 2685, 2686, 2687, 2690, 2703, - 2703, 2705, 2705, 2707, 2708, 2710, 2785, 2786, 2788, 2789, - 2790, 2791, 2792, 2794, 2795, 2796, 2797, 2809, 2813, 2819, - 2825, 2833, 2838, 2844, 2852, 2860, 2861, 2862, 2865, 2864, - 2881, 2882, 2884, 2883, 2907, 2926, 2940, 2941, 2943, 2944, - 2946, 2947, 2948, 2957, 2958, 2962, 2963, 2965, 2966, 2967, - 2969, 2973, 2974, 2979, 2980, 3016, 3062, 3083, 3104, 3107, - 3114, 3115, 3116, 3122, 3128, 3130, 3132, 3134, 3136, 3138, - 3140, 3157, 3162, 3165, 3168, 3171, 3174, 3177, 3180, 3183, - 3186, 3190, 3193, 3196, 3199, 3202, 3205, 3208, 3211, 3215, - 3226, 3244, 3249, 3254, 3259, 3264, 3269, 3273, 3277, 3282, - 3286, 3290, 3299, 3308, 3318, 3323, 3335, 3341, 3346, 3352, - 3358, 3362, 3364, 3375, 3384, 3391, 3392, 3394, 3400, 3409, - 3416, 3428, 3434, 3440, 3446, 3452, 3458, 3464, 3470, 3483, - 3494, 3501, 3514, 3541, 3555, 3569, 3583, 3598, 3605, 3612, - 3619, 3626, 3637, 3687, 3792, 3799, 3806, 3813, 3820 + 0, 2074, 2074, 2076, 2076, 2077, 2078, 2080, 2081, 2082, + 2083, 2084, 2085, 2086, 2087, 2089, 2089, 2090, 2091, 2093, + 2094, 2095, 2096, 2097, 2098, 2099, 2101, 2102, 2104, 2105, + 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, + 2118, 2119, 2120, 2121, 2124, 2125, 2126, 2127, 2128, 2129, + 2130, 2131, 2135, 2136, 2140, 2147, 2166, 2167, 2171, 2172, + 2174, 2175, 2177, 2238, 2239, 2242, 2242, 2261, 2262, 2263, + 2268, 2272, 2277, 2278, 2280, 2300, 2348, 2348, 2367, 2367, + 2382, 2385, 2388, 2391, 2395, 2396, 2397, 2398, 2399, 2400, + 2402, 2413, 2416, 2416, 2447, 2447, 2472, 2472, 2488, 2489, + 2490, 2491, 2499, 2508, 2508, 2557, 2561, 2572, 2582, 2599, + 2600, 2601, 2603, 2604, 2606, 2606, 2608, 2608, 2631, 2645, + 2661, 2662, 2663, 2664, 2671, 2672, 2673, 2674, 2675, 2676, + 2677, 2678, 2679, 2680, 2684, 2685, 2687, 2688, 2690, 2691, + 2695, 2693, 2701, 2699, 2708, 2709, 2710, 2711, 2712, 2713, + 2714, 2715, 2717, 2723, 2724, 2725, 2726, 2727, 2728, 2731, + 2763, 2763, 2765, 2765, 2767, 2768, 2770, 2855, 2856, 2859, + 2860, 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2884, 2888, + 2894, 2900, 2908, 2913, 2919, 2927, 2935, 2936, 2937, 2940, + 2939, 2956, 2957, 2959, 2958, 2982, 3001, 3015, 3016, 3018, + 3019, 3021, 3022, 3023, 3032, 3033, 3037, 3038, 3040, 3041, + 3042, 3044, 3048, 3049, 3054, 3055, 3091, 3137, 3158, 3179, + 3182, 3189, 3190, 3191, 3197, 3203, 3204, 3205, 3206, 3208, + 3210, 3215, 3232, 3235, 3238, 3241, 3244, 3247, 3250, 3253, + 3257, 3268, 3286, 3291, 3296, 3301, 3306, 3311, 3315, 3319, + 3324, 3328, 3332, 3341, 3350, 3360, 3365, 3377, 3383, 3388, + 3394, 3400, 3404, 3406, 3417, 3426, 3433, 3434, 3436, 3442, + 3451, 3458, 3470, 3476, 3482, 3488, 3494, 3500, 3506, 3512, + 3525, 3536, 3543, 3556, 3583, 3597, 3611, 3625, 3640, 3647, + 3654, 3661, 3668, 3683, 3740, 3849, 3856, 3863, 3870, 3894 }; #endif @@ -2536,11 +2610,11 @@ static const yytype_uint16 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "T_IDENTIFIER", "T_NAMESPACE", - "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_BYTE", - "T_SHORT", "T_FLOAT", "\"for\"", "\"while\"", "\"do\"", "\"switch\"", - "\"implements\"", "\"namespace\"", "\"package\"", "\"protected\"", - "\"public\"", "\"private\"", "\"use\"", "\"internal\"", "\"new\"", - "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"", + "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_FLOAT", + "\"for\"", "\"while\"", "\"do\"", "\"switch\"", "\"implements\"", + "\"namespace\"", "\"package\"", "\"protected\"", "\"public\"", + "\"private\"", "\"use\"", "\"internal\"", "\"new\"", "\"native\"", + "\"function\"", "\"finally\"", "\"undefined\"", "\"NaN\"", "\"continue\"", "\"class\"", "\"const\"", "\"catch\"", "\"case\"", "\"set\"", "\"void\"", "\"throw\"", "\"static\"", "\"with\"", "\"instanceof\"", "\"import\"", "\"return\"", "\"typeof\"", @@ -2574,15 +2648,15 @@ static const char *const yytname[] = "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST", - "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", + "ONE_SLOT", "MAYBECONSTANT", "CONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", - "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", - "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", "NAMESPACE_ID", + "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2600,48 +2674,47 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 352, 353, 59, - 44, 354, 61, 355, 63, 58, 124, 94, 38, 60, - 62, 356, 45, 43, 47, 42, 37, 126, 33, 357, - 358, 359, 40, 360, 91, 93, 123, 46, 64, 361, - 362, 363, 125, 41 + 345, 346, 347, 348, 349, 350, 351, 352, 59, 44, + 353, 61, 354, 63, 58, 124, 94, 38, 60, 62, + 355, 45, 43, 47, 42, 37, 126, 33, 356, 357, + 358, 40, 359, 91, 93, 123, 46, 64, 360, 361, + 362, 125, 41 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 134, 135, 136, 136, 137, 137, 138, 138, 138, - 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, - 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, - 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, - 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, - 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, - 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, - 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, - 178, 178, 178, 180, 179, 181, 181, 182, 183, 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 + 0, 133, 134, 135, 135, 136, 136, 137, 137, 137, + 137, 137, 137, 137, 137, 138, 138, 139, 139, 140, + 140, 140, 140, 140, 140, 140, 141, 141, 142, 142, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 144, 144, 144, 144, 144, 144, + 144, 144, 145, 145, 146, 147, 148, 148, 149, 149, + 150, 150, 151, 152, 152, 154, 153, 155, 155, 155, + 156, 156, 157, 157, 158, 159, 161, 160, 163, 162, + 164, 164, 165, 165, 166, 166, 166, 166, 167, 167, + 168, 169, 171, 170, 173, 172, 175, 174, 176, 176, + 177, 177, 177, 179, 178, 180, 180, 181, 182, 183, + 183, 183, 184, 184, 186, 185, 187, 185, 188, 188, + 189, 189, 190, 190, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 192, 192, 193, 193, 194, 194, + 196, 195, 198, 197, 199, 199, 200, 200, 201, 201, + 201, 201, 201, 202, 202, 203, 203, 204, 204, 204, + 205, 205, 207, 206, 208, 208, 209, 210, 210, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 213, 213, 214, 214, 215, 215, 215, 217, + 216, 218, 218, 220, 219, 221, 222, 223, 223, 224, + 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, + 228, 229, 230, 229, 231, 232, 233, 233, 234, 235, + 235, 236, 237, 237, 238, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 240, 240, 241, 241, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 242, 243, 243, 243, 244, 245 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2658,26 +2731,25 @@ static const yytype_uint8 yyr2[] = 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, 4, 2, 1, - 1, 3, 1, 0, 6, 0, 5, 2, 4, 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 2, 0, 2, 0, 2, 0, - 9, 0, 8, 0, 1, 1, 2, 1, 4, 1, - 1, 1, 0, 1, 1, 2, 1, 2, 8, 1, - 1, 0, 4, 1, 3, 3, 0, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, - 4, 3, 1, 4, 2, 1, 1, 0, 0, 12, - 1, 0, 0, 10, 1, 3, 1, 1, 1, 3, - 1, 1, 1, 2, 0, 0, 3, 0, 1, 1, - 1, 2, 2, 0, 4, 4, 4, 2, 1, 2, - 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 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, + 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, 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, 5, 2, 2, 2, 2, 3, 2, 4, 5, - 3, 5, 3, 1, 2, 4, 4, 2, 3 + 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, + 5, 3, 5, 3, 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2685,432 +2757,437 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 119, 303, 132, 236, 230, 233, 234, 231, 232, 235, - 0, 0, 78, 0, 0, 125, 123, 124, 0, 131, - 0, 130, 191, 237, 270, 126, 0, 0, 0, 240, - 127, 129, 128, 0, 0, 239, 238, 0, 0, 275, - 0, 0, 14, 0, 0, 0, 0, 207, 119, 0, - 0, 2, 119, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 119, 37, 7, 30, 0, - 120, 121, 9, 8, 11, 10, 224, 227, 229, 228, - 223, 39, 221, 225, 226, 41, 40, 0, 0, 72, - 76, 119, 92, 109, 110, 115, 112, 0, 0, 303, - 213, 190, 0, 269, 0, 0, 117, 0, 103, 207, - 0, 217, 65, 0, 220, 0, 276, 295, 294, 272, - 252, 251, 0, 0, 208, 209, 210, 82, 0, 106, - 218, 0, 80, 44, 43, 119, 45, 29, 0, 46, - 47, 48, 50, 0, 49, 297, 1, 6, 119, 303, - 0, 68, 0, 0, 69, 53, 108, 0, 187, 0, - 160, 0, 159, 161, 307, 122, 0, 0, 0, 0, + 120, 294, 133, 172, 231, 169, 170, 171, 0, 0, + 78, 0, 0, 126, 124, 125, 0, 132, 0, 131, + 192, 176, 177, 261, 127, 0, 0, 0, 175, 128, + 130, 129, 0, 0, 174, 173, 0, 0, 266, 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, 230, 10, 225, 227, 229, 228, + 224, 39, 222, 226, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 294, + 214, 191, 0, 260, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 0, 221, 0, 267, 286, 285, 263, + 243, 242, 0, 0, 209, 210, 211, 82, 0, 106, + 219, 0, 80, 44, 43, 120, 45, 29, 0, 46, + 47, 48, 50, 0, 49, 288, 1, 6, 120, 294, + 0, 68, 0, 0, 69, 53, 108, 0, 188, 0, + 161, 0, 160, 162, 298, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 293, - 292, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 207, 0, 0, - 55, 73, 0, 0, 0, 119, 113, 0, 194, 0, - 197, 196, 308, 205, 177, 0, 0, 0, 27, 0, - 296, 0, 0, 279, 0, 271, 274, 211, 212, 83, - 204, 59, 60, 105, 219, 58, 81, 42, 28, 119, - 0, 204, 0, 0, 52, 304, 186, 185, 0, 133, - 135, 0, 222, 266, 267, 264, 265, 245, 246, 248, - 247, 243, 244, 286, 285, 281, 280, 288, 289, 287, - 283, 282, 284, 249, 250, 300, 258, 257, 256, 290, - 0, 255, 254, 253, 241, 242, 262, 261, 259, 263, - 260, 0, 0, 302, 0, 0, 0, 0, 0, 25, - 0, 119, 17, 23, 0, 20, 19, 22, 21, 119, - 111, 0, 207, 214, 166, 0, 0, 178, 182, 107, - 195, 118, 268, 0, 26, 216, 0, 277, 0, 0, - 57, 0, 119, 13, 57, 0, 0, 0, 0, 0, - 137, 0, 0, 204, 162, 163, 0, 215, 273, 0, - 0, 298, 119, 0, 0, 116, 18, 119, 0, 0, - 0, 0, 184, 179, 204, 0, 0, 119, 0, 202, - 201, 200, 203, 0, 62, 61, 51, 0, 119, 305, - 306, 177, 134, 0, 0, 198, 136, 141, 57, 0, - 291, 299, 301, 77, 0, 84, 0, 114, 206, 176, - 172, 169, 170, 168, 171, 175, 174, 173, 167, 166, - 0, 0, 181, 0, 0, 98, 102, 100, 104, 63, - 278, 56, 0, 75, 0, 138, 139, 0, 119, 165, - 164, 79, 0, 0, 0, 85, 88, 86, 24, 183, - 192, 180, 96, 0, 99, 101, 119, 66, 119, 204, - 119, 199, 0, 156, 0, 0, 119, 154, 0, 27, - 93, 89, 87, 27, 27, 204, 64, 74, 0, 147, - 151, 0, 0, 0, 119, 145, 149, 150, 157, 187, - 142, 155, 27, 91, 0, 0, 0, 188, 119, 140, - 146, 0, 90, 193, 97, 94, 27, 0, 0, 0, - 0, 148, 177, 27, 189, 0, 0, 204, 95, 158 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 284, + 283, 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, 299, 206, 178, 0, 0, 0, 27, 0, + 287, 0, 0, 270, 0, 262, 265, 212, 213, 83, + 205, 59, 60, 105, 220, 58, 81, 42, 28, 120, + 0, 205, 0, 0, 52, 295, 187, 186, 0, 134, + 136, 0, 223, 257, 258, 255, 256, 236, 237, 239, + 238, 234, 235, 277, 276, 272, 271, 279, 280, 278, + 274, 273, 275, 240, 241, 291, 249, 248, 247, 281, + 0, 246, 245, 244, 232, 233, 253, 252, 250, 254, + 251, 0, 0, 293, 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, 259, 0, 26, 217, 0, 268, 0, 0, + 57, 0, 120, 13, 57, 0, 0, 0, 0, 0, + 138, 0, 0, 205, 163, 164, 0, 216, 264, 0, + 0, 289, 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, 296, + 297, 178, 135, 0, 0, 199, 137, 142, 57, 0, + 282, 290, 292, 77, 0, 84, 0, 115, 207, 168, + 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, + 63, 269, 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, 310, 311, 312, 333, 334, - 136, 137, 156, 313, 138, 384, 139, 245, 242, 457, - 57, 231, 152, 153, 58, 59, 60, 61, 212, 62, - 91, 140, 141, 444, 445, 446, 447, 63, 214, 425, - 509, 426, 474, 427, 428, 64, 228, 142, 65, 66, - 96, 219, 67, 319, 215, 68, 143, 70, 71, 350, - 352, 394, 315, 460, 316, 438, 483, 484, 485, 465, - 466, 467, 163, 317, 261, 354, 355, 372, 418, 326, - 327, 328, 258, 318, 506, 102, 76, 473, 220, 221, + -1, 49, 50, 51, 52, 310, 311, 312, 333, 334, + 136, 137, 156, 313, 138, 384, 139, 245, 242, 448, + 56, 231, 152, 153, 57, 58, 59, 60, 212, 61, + 90, 140, 141, 435, 436, 437, 438, 62, 214, 416, + 500, 417, 465, 418, 419, 63, 228, 142, 64, 65, + 218, 219, 66, 319, 215, 67, 143, 69, 70, 350, + 352, 394, 315, 451, 316, 429, 474, 475, 476, 456, + 457, 458, 163, 317, 261, 354, 355, 372, 74, 326, + 327, 328, 258, 318, 497, 102, 76, 464, 220, 221, 381, 396, 382, 340, 323, 123, 124, 125, 223, 77, - 78, 79, 144, 126, 80, 81, 82, 83, 115, 116, - 84, 164, 85, 86 + 78, 79, 144, 126, 80, 81, 82, 115, 116, 83, + 164, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -388 +#define YYPACT_NINF -423 static const yytype_int16 yypact[] = { - 1673, -42, -388, -388, -388, -388, -388, -388, -388, -388, - -29, -72, -388, -47, 16, -388, -388, -388, 74, -388, - 2093, -388, 64, -388, 2163, -388, -24, 42, 25, -388, - -388, -388, -388, -1, 5, -388, -388, 2093, 56, 2093, - 2093, 2093, -388, 2093, 2093, 2093, 2093, 2093, 633, 110, - 144, -388, 503, -388, -388, -388, 50, -388, 2023, -388, - -388, -388, -388, -388, -388, 1925, -388, -388, -388, 97, - 233, -388, -388, -388, -388, -388, -388, -388, -388, -388, - 104, -388, 2568, -388, -388, -388, -388, 196, 84, -388, - -388, 1925, -388, -388, -388, -388, -388, 85, 70, -388, - -59, -388, 91, 237, 2093, 87, -388, 2093, -388, 2093, - 225, 237, -388, 130, 2568, 106, 139, 237, 237, 174, - 237, 237, -61, 121, 147, 2093, -388, 245, 253, 2093, - 2093, 253, 255, -388, -388, 763, -388, -388, 135, -388, - -388, -388, -388, 249, -388, -388, -388, -388, 1023, 195, - 265, -388, 170, 202, -388, 173, -388, 270, 72, 271, - -388, 272, -388, -388, -388, -388, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, -388, - -388, 273, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 11, - -388, -388, 2093, 269, 2093, 1153, -388, 42, 157, 158, - -388, -388, -388, 164, 13, -57, 19, 2188, 1799, 160, - -388, 2093, 2093, -388, 2093, -388, -388, -388, -388, -388, - 189, 197, -388, 104, 104, 197, -388, -388, -388, 1925, - 163, 189, 2093, 2093, -388, 198, -388, -388, 296, 251, - 252, 305, 2568, 301, 495, 495, 495, 2934, 2934, 2934, - 2934, 301, 301, 2568, 2568, 2568, 2568, 2568, 2568, 2568, - 2568, 2568, 2568, 2629, 2690, -388, 118, 118, 118, 2568, - 2385, 2751, 2812, 2873, 301, 301, 174, 174, 237, 237, - 237, 177, 2446, 226, 2093, 311, -56, 194, 2259, -388, - 185, 1283, -388, -388, 192, -388, -388, -388, -388, 1153, - -388, 119, 2093, -388, 100, 320, 191, 230, -388, -388, - 157, -388, -388, 193, 1799, -388, -54, -388, 221, 22, - 229, 253, 893, -388, -28, 31, -16, 99, 210, 70, - 317, 70, 212, 189, 236, -388, 2093, -388, -388, 339, - 2322, -388, 1925, 2093, 213, -388, -388, 1153, 214, 217, - 54, 22, -388, -388, 189, 15, 112, 1925, 2093, -388, - -388, -388, -388, 2093, -388, -388, -388, 2093, 1925, -388, - -388, 13, -388, 70, 219, -388, 247, -388, 229, 305, - 2568, -388, -388, -388, -15, 26, 220, -388, -388, -388, - -388, -388, -388, -388, -388, -388, -388, -388, -388, 261, - 227, 320, -388, 240, 250, -388, -388, 112, -388, 286, - -388, -388, 222, -388, 242, 247, -388, 70, 203, -388, - -388, -388, 2093, 274, 246, 26, -388, -388, -388, -388, - -388, -388, -388, 377, -388, -388, 1925, -388, 1925, 189, - 1413, -388, 378, -388, 359, 256, 336, -388, 2507, 1799, - -388, -388, -388, 1799, 1799, 189, -388, -388, 263, -388, - -388, 264, 51, 262, 1543, -388, -388, -388, -388, 72, - -388, -388, 1799, -388, 266, 267, 254, -388, 1413, -388, - -388, 397, -388, -388, -388, -388, 1799, 275, 280, 278, - 276, -388, 13, 1799, -388, 279, 277, 189, -388, -388 + 1655, -41, -423, -423, -423, -423, -423, -423, -30, -61, + -423, -52, 17, -423, -423, -423, 61, -423, 2098, -423, + 87, -423, -423, 2153, -423, -19, 42, 11, -423, -423, + -423, -423, -1, -3, -423, -423, 2098, 19, 2098, 2098, + 2098, -423, 2098, 2098, 2098, 2098, 2098, 623, 95, 136, + -423, 494, -423, -423, -423, 13, -423, 2028, -423, -423, + -423, -423, -423, -423, 1905, -423, -423, -423, 211, 394, + -423, -423, -423, -423, -423, -423, -423, -423, -423, -423, + 44, -423, 2558, -423, -423, -423, 174, 83, -423, -423, + 1905, -423, -423, -423, -423, -423, -423, 20, 42, -423, + -34, -423, 85, 18, 2098, 79, -423, 2098, -423, 2098, + 204, 18, -423, 105, 2558, 80, 113, 18, 18, -50, + 18, 18, -29, 89, 119, 2098, -423, 217, 226, 2098, + 2098, 226, 230, -423, -423, 752, -423, -423, 109, -423, + -423, -423, -423, 214, -423, -423, -423, -423, 1010, 168, + 234, -423, 140, 172, -423, 142, -423, 245, 16, 247, + -423, 249, -423, -423, -423, -423, 2098, 2098, 2098, 2098, + 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, + 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, -423, + -423, 250, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, + 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 10, + -423, -423, 2098, 243, 2098, 1139, -423, 42, 131, 133, + -423, -423, -423, 141, 12, -27, 64, 2178, 1780, 129, + -423, 2098, 2098, -423, 2098, -423, -423, -423, -423, -423, + 159, 166, -423, 44, 44, 166, -423, -423, -423, 1905, + 135, 159, 2098, 2098, -423, 169, -423, -423, 264, 216, + 218, 273, 2558, 486, 313, 313, 313, 2924, 2924, 2924, + 2924, 486, 486, 2558, 2558, 2558, 2558, 2558, 2558, 2558, + 2558, 2558, 2558, 2619, 2680, -423, 359, 359, 359, 2558, + 2375, 2741, 2802, 2863, 486, 486, -50, -50, 18, 18, + 18, 145, 2436, 190, 2098, 277, -16, 160, 2249, -423, + 151, 1268, -423, -423, 158, -423, -423, -423, -423, 1139, + -423, 42, 2098, -423, 21, 281, 153, 187, -423, -423, + -423, 163, -423, 161, 1780, -423, -15, -423, 186, 84, + 192, 226, 881, -423, -23, 29, -2, 130, 173, 42, + 282, 42, 171, 159, 202, -423, 2098, -423, -423, 301, + 2312, -423, 1905, 2098, 180, -423, -423, 1139, 175, 176, + 290, 84, -423, -423, 159, 14, 30, 1905, 2098, -423, + -423, -423, -423, 2098, -423, -423, -423, 2098, 1905, -423, + -423, 12, -423, 42, 185, -423, 224, -423, 192, 273, + 2558, -423, -423, -423, 15, 25, 184, -423, -423, -423, + 215, 199, 281, -423, 201, 207, -423, -423, 30, -423, + 265, -423, -423, 198, -423, 200, 224, -423, 42, 227, + -423, -423, -423, 2098, 231, 205, 25, -423, -423, -423, + -423, -423, -423, -423, 328, -423, -423, 1905, -423, 1905, + 159, 1397, -423, 336, -423, 315, 219, 337, -423, 2497, + 1780, -423, -423, -423, 1780, 1780, 159, -423, -423, 222, + -423, -423, 223, 183, 229, 1526, -423, -423, -423, -423, + 16, -423, -423, 1780, -423, 232, 233, 210, -423, 1397, + -423, -423, 346, -423, -423, -423, -423, 1780, 235, 241, + 228, 240, -423, 12, 1780, -423, 244, 246, 159, -423, + -423 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -388, -388, 257, -388, 354, -296, -388, 107, -387, -31, - 1, -55, -85, 29, 2, 21, 362, 293, 81, -388, - -388, -388, -388, -388, -388, -388, -388, -388, -388, -388, - -388, -388, -388, -388, -388, -21, -19, -388, -388, 6, - -388, 7, -388, -388, -388, -388, -388, -388, -388, -388, - -175, 76, -388, -388, -388, -388, 0, -388, 357, -388, - -388, -388, 48, -388, 49, -388, -68, -388, -53, -388, - -388, -30, -388, 3, -388, -388, 33, 18, -388, -376, - -388, -305, -49, 4, -388, -388, -388, -388, -388, 412, - -89, 52, 71, -239, -388, -96, -388, -388, -388, -388, - -388, -388, -388, -34, -9, -50, -13, -388, -388, -388, - -388, -388, -388, -388 + -423, -423, 238, -423, 321, -282, -423, 67, -422, -25, + 1, -55, -74, 28, 2, -8, 332, 263, 52, -423, + -423, -423, -423, -423, -423, -423, -423, -423, -423, -423, + -423, -423, -423, -423, -423, -40, -39, -423, -423, -18, + -423, -17, -423, -423, -423, -423, -423, -423, -423, -423, + 6, 103, -423, -423, -423, -423, 0, -423, 326, -423, + -423, -423, 48, -423, 49, -423, -90, -423, -70, -423, + -423, -48, -423, 3, -423, -423, 24, 5, 40, -377, + -423, -301, -69, 4, -423, -423, -423, -423, -423, 391, + -91, 26, 59, -240, -423, -97, -423, -423, -423, -423, + -423, -423, -423, -32, -9, -49, -13, -423, -423, -423, + -423, -423, -423 }; /* 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 -154 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 69, 54, 56, 74, 75, 113, 213, 100, 154, 222, - 155, 103, 344, 229, 303, 434, 324, 135, 324, 93, - 373, 88, 330, 368, 111, 218, 114, 117, 118, 55, - 119, 120, 121, 191, 114, 94, 155, 122, 94, 166, - -70, 94, 320, 166, 166, 93, 166, 87, 72, 73, - 90, 320, 69, 54, 56, 74, 75, 409, 379, 410, - 442, 94, 411, 412, 413, 208, 414, 101, 209, 157, - 422, 406, 235, 218, 383, 92, 329, 362, 158, 377, - 248, 55, 493, 160, 166, 166, 494, 495, 443, 94, - 97, 238, 98, 89, 227, 225, 114, 162, 104, 415, - 72, 73, 389, 105, 390, 502, 325, 256, 421, 416, - 417, 301, 114, 145, 398, 157, 451, 388, 441, 510, - 243, 244, 330, 257, 158, 108, 516, 109, 159, 160, - 387, 166, 110, 304, 331, 420, 515, 380, 94, 305, - 423, 161, 95, 162, 146, 424, 320, 107, 69, 54, - 56, 74, 75, 262, 263, 264, 265, 266, 267, 268, + 68, 53, 55, 73, 75, 100, 113, 222, 154, 155, + 103, 344, 229, 303, 425, 324, 213, 324, 96, 87, + 92, 93, 135, 111, 373, 114, 117, 118, 54, 119, + 120, 121, 96, 114, 94, 155, 122, 368, 484, 189, + 190, 191, 485, 486, -70, 92, 93, 86, 71, 72, + 256, 68, 53, 55, 73, 75, 414, 191, 433, 94, + 89, 493, 415, 204, 205, 206, 257, 92, 93, 91, + 166, 207, 166, 208, 413, 501, 209, 98, 383, 54, + 248, 94, 507, 166, 166, 406, 434, 92, 93, 208, + 101, 88, 209, 238, 227, 225, 114, 166, 145, 71, + 72, 94, 104, 235, 325, 329, 412, 189, 190, 191, + 301, 442, 114, 398, 166, 97, 362, 377, 109, 379, + 243, 244, 370, 110, 108, 371, 506, 387, 166, 105, + 388, 304, 107, 389, 411, 390, 146, 305, 148, 207, + 112, 208, 95, 166, 209, 216, 217, 432, 68, 53, + 55, 73, 75, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 284, 148, 55, 112, 286, + 279, 280, 281, 282, 283, 284, 54, 210, 330, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 114, 302, 72, 73, 337, 210, - 338, 308, 370, 306, 166, 371, 211, 2, 189, 190, - 191, 216, 217, 224, 226, 69, 54, 314, 342, 114, - 478, 114, 336, 15, 16, 17, 369, 19, 230, 21, - 202, 203, 204, 205, 206, 232, 496, 2, 233, 234, - 207, 25, 208, 345, 346, 209, 236, 237, 239, 462, - 30, 31, 32, 15, 16, 17, 240, 19, 246, 21, - 392, 249, 395, -71, 189, 190, 191, 157, 251, 252, - 253, 25, 254, 255, 259, 260, 285, 403, 519, 248, - 30, 31, 32, 307, -109, 321, 322, 248, 204, 205, - 206, 360, 429, 335, 339, 343, 207, 341, 208, 348, - 347, 209, 463, 433, 395, 349, 351, 155, 353, 114, - 357, 69, 54, 314, 361, 359, 363, 365, 367, 69, - 54, 314, 155, 324, 374, 376, 378, 189, 190, 191, - 375, 383, 391, 155, 393, -152, 399, 432, 397, 405, - 2, -154, 401, 400, 430, 436, 407, 437, 461, 431, - 408, 456, 448, 450, 404, 458, 15, 16, 17, 207, - 19, 208, 21, 370, 209, 114, 452, 69, 54, 314, - 114, 476, 453, 477, 25, 459, -154, -154, 470, 469, - 475, 488, 462, 30, 31, 32, 489, 505, 490, 497, - 498, 189, 190, 191, 499, 192, 193, 194, 503, 504, - 508, 155, 512, 155, 513, 250, 147, 511, 514, 518, - -154, -154, 517, 202, 203, 204, 205, 206, 366, 439, - 151, 241, 385, 207, 471, 208, 472, 165, 209, 468, - 507, 500, 440, 454, 455, 463, 491, 449, 464, 106, - 501, 0, 419, 0, 0, 435, 0, 0, 0, 0, + 297, 298, 299, 300, 114, 302, 71, 72, 380, 157, + 337, 308, 338, 306, 211, 226, 224, 230, 158, 232, + 469, 233, 234, 236, 160, 68, 53, 314, 237, 114, + 239, 114, 336, 320, 342, 369, 487, 157, 162, 240, + 157, 2, 331, 246, 249, -71, 158, 251, 252, 253, + 254, 159, 160, 345, 346, 13, 14, 15, 255, 17, + 259, 19, 260, 285, 161, 307, 162, -113, 392, 321, + 395, 335, 322, 339, 24, 341, 343, 348, 510, 349, + 347, 351, 453, 29, 30, 31, 353, 357, 359, 248, + 361, 363, 365, 367, 324, 374, 375, 248, 403, -112, + 378, 360, 376, 383, 391, 3, 397, 393, 5, 6, + 7, 399, 395, 420, 401, 405, 407, 155, 408, 114, + 427, 68, 53, 314, 424, 439, 370, 21, 22, 68, + 53, 314, 155, 428, 441, 454, 443, 331, 444, 447, + 449, 466, 450, 155, 28, 460, 461, 452, 423, 479, + 480, 2, 496, 400, 34, 35, 421, 488, 489, 499, + 481, 422, 167, 504, 404, 13, 14, 15, -153, 17, + 490, 19, 503, 494, 495, 114, 502, 68, 53, 314, + 114, 505, 147, 467, 24, 468, 508, 509, 366, -155, + -155, -155, 453, 29, 30, 31, 250, 175, 176, 151, + 430, 241, 155, 385, 155, 165, 462, 463, 2, 498, + 445, 446, 189, 190, 191, 491, 192, 193, 194, 482, + 409, 492, 13, 14, 15, 440, 17, 106, 19, 426, + 459, 200, 201, 431, 202, 203, 204, 205, 206, 455, + 410, 24, 0, 0, 207, 454, 208, 0, 0, 209, + 29, 30, 31, 0, 0, 0, 0, 0, 189, 190, + 191, 473, 471, 472, 477, 478, 0, 455, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -154, 0, + 202, 203, 204, 205, 206, 473, 471, 472, 477, 478, + 207, 0, 208, 0, 0, 209, 0, 0, 0, 473, + 471, 472, 477, 478, -4, 0, 0, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 0, + 0, 12, 13, 14, 15, 16, 17, 18, 19, 0, + 0, 21, 22, 0, 0, -155, 0, 0, 0, 23, + 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, + 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, + 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, + -155, -155, 0, 38, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, + 193, 194, 0, 39, 40, 0, 0, 0, 0, 0, + 0, 0, 41, 0, -155, -155, 0, 202, 203, 204, + 205, 206, 0, 0, 0, 42, 0, 207, 0, 208, + 43, 44, 209, 0, 0, 45, 0, 46, 0, 47, + 0, 48, 0, 0, 0, -4, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 0, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 0, + 21, 22, 127, 0, 128, 0, 0, 0, 23, 129, + 24, 25, 0, 26, 130, 27, 0, 28, 131, 29, + 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, + 0, 0, 0, 0, 0, 36, 37, 0, 132, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 482, 480, 481, 486, 487, 0, 464, 0, -153, 0, + 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, + 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, + 44, 0, 0, 0, 45, 0, 46, 0, 47, 0, + 48, 0, 0, 0, 134, 1, 2, 3, 4, 0, + 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, + 13, 14, 15, 16, 17, 18, 19, 20, 0, 21, + 22, 127, 0, 128, 0, 0, 0, 23, 129, 24, + 25, 0, 26, 130, 27, 0, 28, 131, 29, 30, + 31, 0, 0, 32, 33, 0, 34, 35, 0, 0, + 0, 0, 0, 0, 36, 37, 0, 132, 0, 0, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 482, 480, 481, 486, 487, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 482, 480, - 481, 486, 487, -4, 0, 0, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 167, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, -154, -154, -154, 0, 37, 38, 0, 0, - 175, 176, 0, 39, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, - 193, 194, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 200, 201, 0, 202, 203, 204, - 205, 206, 0, 0, 0, 43, 0, 207, 0, 208, - 44, 45, 209, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -4, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, + 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 0, 0, 0, 43, 44, + 0, 0, 0, 45, 0, 46, 0, 47, 0, 48, + 0, 0, 0, 247, 1, 2, 3, 4, 0, 5, + 6, 7, 8, 9, 10, 11, 0, 0, 0, 13, + 14, 15, 16, 17, 18, 19, 20, 0, 21, 22, + 127, 0, 128, 0, 0, 0, 23, 129, 24, 25, + 0, 26, 130, 27, 0, 28, 131, 29, 30, 31, + 0, 0, 32, 33, 0, 34, 35, 0, 0, 0, + 0, 0, 0, 36, 37, 0, 132, 0, 0, 0, + 38, 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, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 134, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 247, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, + 0, 0, 45, 0, 46, 0, 47, 0, 48, 0, + 0, 0, 386, 1, 2, 3, 4, 0, 5, 6, + 7, 8, 9, 10, 11, 0, 0, 12, 13, 14, + 15, 16, 17, 18, 19, 0, 0, 21, 22, 0, + 0, 0, 0, 0, 0, 23, 0, 24, 25, 0, + 26, 0, 27, 0, 28, 0, 29, 30, 31, 0, + 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, + 0, 0, 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 386, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -3, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, + 0, 45, 0, 46, 0, 47, 0, 48, 0, 0, + 0, -3, 1, 2, 3, 4, 0, 5, 6, 7, + 8, 9, 10, 11, 0, 0, 0, 13, 14, 15, + 16, 17, 18, 19, 0, 0, 21, 22, 0, 0, + 0, 0, 0, 0, 23, 0, 24, 25, 0, 26, + 0, 27, 0, 28, 0, 29, 30, 31, 0, 0, + 32, 33, 0, 34, 35, 0, 0, 0, 0, 0, + 0, 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 309, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -15, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 309, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 309, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -16, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 45, 0, 46, 0, 47, 0, 48, 0, 0, 0, + -15, 1, 2, 3, 4, 0, 5, 6, 7, 8, + 9, 10, 11, 0, 0, 0, 13, 14, 15, 16, + 17, 18, 19, 0, 0, 21, 22, 0, 0, 0, + 0, 0, 0, 23, 0, 24, 25, 0, 26, 0, + 27, 0, 28, 0, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 479, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -143, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 309, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, + 0, 46, 0, 47, 0, 48, 0, 0, 0, -16, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 0, 0, 0, 13, 14, 15, 16, 17, + 18, 19, 0, 0, 21, 22, 0, 0, 0, 0, + 0, 0, 23, 0, 24, 25, 0, 26, 0, 27, + 0, 28, 0, 29, 30, 31, 0, 0, 32, 33, + 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, + 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 479, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, -3, 0, -144, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 470, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, + 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, + 46, 0, 47, 0, 48, 0, 0, 0, -144, 1, + 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, + 11, 0, 0, 0, 13, 14, 15, 16, 17, 18, + 19, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 0, 23, 0, 24, 25, 0, 26, 0, 27, 0, + 28, 0, 29, 30, 31, 0, 0, 32, 33, 0, + 34, 35, 0, 0, 0, 0, 0, 0, 36, 37, + 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, + 0, 0, 0, 0, 470, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, + 0, 47, 0, 48, 0, -3, 0, -145, 1, 2, + 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, + 0, 0, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, + 23, 0, 24, 25, 0, 26, 0, 27, 0, 28, + 0, 29, 30, 31, 0, 0, 32, 33, 0, 34, + 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, + 0, 0, 0, 0, 38, 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, -119, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, - 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, - 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, - 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 132, 0, 0, 0, 39, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, + 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, + 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, + 47, 0, 48, 1, 2, 3, 4, 0, 5, 6, + 7, 8, 9, 10, 11, 0, -120, 0, 13, 14, + 15, 16, 17, 18, 19, 20, 0, 21, 22, 127, + 0, 128, 0, 0, 0, 23, 129, 24, 25, 0, + 26, 130, 27, 0, 28, 131, 29, 30, 31, 0, + 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, + 0, 0, 36, 37, 0, 132, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 133, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 0, 47, 0, 48, 0, 49, 1, 2, + 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, + 0, 45, 0, 46, 0, 47, 0, 48, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 0, 0, 0, 15, 16, 17, 18, 19, - 20, 21, 22, 0, 23, 127, 0, 128, 0, 0, - 0, 24, 129, 25, 26, 0, 27, 130, 28, 0, - 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, - 35, 36, 0, 0, 0, 0, 0, 0, 37, 38, - 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, + 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, + 20, 0, 21, 22, 127, 0, 128, 0, 0, 0, + 23, 129, 24, 25, 0, 26, 130, 27, 0, 28, + 131, 29, 30, 31, 0, 0, 32, 33, 0, 34, + 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, + 132, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, - 0, 0, 0, 0, 133, 0, 149, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 43, 0, 0, - 0, 0, 44, 45, 0, 0, 0, 46, 20, 47, - 22, 48, 23, 49, 0, 128, 0, 0, 0, 24, - 0, 0, 0, 0, 0, 0, 28, 0, 29, 150, - 0, 0, 0, 0, 0, 0, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, - 22, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 0, 0, 0, 0, 43, 28, 0, 29, 0, - 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, - 0, 49, 0, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, - 22, 0, 23, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 29, 0, - 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, - 0, 49, 0, 0, 0, 0, 0, 0, 167, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, + 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, + 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, + 47, 149, 48, 3, 4, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 168, 169, 170, 0, 171, + 0, 18, 0, 20, 0, 21, 22, 0, 0, 128, + 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 27, 0, 28, 150, 0, 0, 0, 0, 0, 0, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 0, 0, 0, 0, 0, 0, 38, 0, 0, + 0, 99, 0, 3, 4, 0, 5, 6, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 18, 0, 20, 0, 21, 22, 0, 0, 0, + 0, 0, 0, 23, 0, 0, 0, 0, 0, 42, + 27, 0, 28, 0, 43, 44, 0, 0, 0, 45, + 33, 46, 34, 35, 0, 48, 99, 0, 3, 4, + 36, 5, 6, 7, 0, 0, 0, 38, 0, 0, + 0, 0, 0, 0, 0, 0, 18, 0, 20, 0, + 21, 22, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, + 0, 0, 0, 0, 0, 33, 0, 34, 35, 42, + 0, 0, 0, 0, 43, 44, 0, 167, 0, 45, + 0, 46, 38, 0, 0, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 39, 40, 168, 169, 170, 0, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, + 0, 192, 193, 194, 45, 0, 46, 0, 0, 195, + 48, 196, 0, 197, 198, 199, 200, 201, 167, 202, + 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, + 0, 208, 0, 0, 209, 0, 0, 0, 0, 0, + 332, 0, 0, 0, 0, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, - 191, 0, 192, 193, 194, 46, 0, 47, 0, 0, - 195, 49, 196, 0, 197, 198, 199, 200, 201, 167, + 191, 0, 192, 193, 194, 0, 0, 0, 0, 0, + 195, 167, 196, 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, - 207, 0, 208, 0, 0, 209, 0, 0, 0, 0, - 0, 332, 0, 0, 0, 0, 168, 169, 170, 0, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, - 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, - 0, 195, 167, 196, 0, 197, 198, 199, 200, 201, - 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, - 0, 207, 0, 208, 0, 0, 209, 0, 0, 168, - 169, 170, 364, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, - 0, 0, 0, 0, 195, 167, 196, 0, 197, 198, - 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, - 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, - 0, 0, 168, 169, 170, 402, 171, 172, 173, 174, + 207, 0, 208, 0, 0, 209, 0, 0, 168, 169, + 170, 364, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, + 0, 0, 0, 195, 167, 196, 0, 197, 198, 199, + 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, + 0, 0, 0, 207, 0, 208, 0, 0, 209, 0, + 0, 168, 169, 170, 402, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, + 194, 0, 0, 0, 0, 167, 195, 0, 196, 356, + 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, + 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, + 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, - 356, 197, 198, 199, 200, 201, 0, 202, 203, 204, + 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, - 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, + 358, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, - 196, 0, 197, 198, 199, 200, 201, 0, 202, 203, + 196, 483, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, - 208, 358, 0, 209, 168, 169, 170, 0, 171, 172, + 208, 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, - 0, 196, 492, 197, 198, 199, 200, 201, 0, 202, + 0, 196, 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, + 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, - 195, 0, 196, 0, 197, 198, 199, 200, 201, 0, + 0, 0, 0, 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 188, 0, 189, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, 0, 0, 0, 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, @@ -3118,345 +3195,338 @@ static const yytype_int16 yytable[] = 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, - 0, 167, 0, 0, 0, 0, 197, 198, 199, 200, + 0, 167, 0, 0, 0, 0, 0, 198, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, - 0, 0, 167, 0, 0, 0, 0, 0, 198, 199, + 0, 0, 167, 0, 0, 0, 0, 0, 0, 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, 0, 0, 0, 0, 0, 0, - 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, + -155, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, - 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, + 168, 169, 170, 0, -155, -155, -155, -155, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, - 0, 0, 0, 0, 167, 0, 0, 0, 0, 0, - 0, -154, 200, 201, 0, 202, 203, 204, 205, 206, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, - 209, 168, 169, 170, 0, -154, -154, -154, -154, 175, - 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, - 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 200, 201, 0, 202, 203, 204, 205, - 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, - 0, 209 + 209 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 39, 91, 20, 58, 98, - 65, 24, 251, 109, 3, 391, 3, 48, 3, 3, - 325, 50, 3, 319, 37, 3, 39, 40, 41, 0, - 43, 44, 45, 92, 47, 19, 91, 46, 19, 100, - 68, 19, 217, 100, 100, 3, 100, 89, 0, 0, - 122, 226, 52, 52, 52, 52, 52, 3, 36, 5, - 34, 19, 8, 9, 10, 124, 12, 3, 127, 18, - 375, 367, 133, 3, 102, 122, 133, 133, 27, 133, - 135, 52, 469, 32, 100, 100, 473, 474, 62, 19, - 14, 125, 18, 122, 107, 104, 109, 46, 122, 45, - 52, 52, 3, 27, 5, 492, 93, 35, 93, 55, - 56, 207, 125, 3, 353, 18, 421, 133, 133, 506, - 129, 130, 3, 51, 27, 126, 513, 122, 31, 32, - 99, 100, 127, 122, 115, 374, 512, 115, 19, 128, - 28, 44, 126, 46, 0, 33, 321, 122, 148, 148, + 0, 0, 0, 0, 0, 18, 38, 98, 57, 64, + 23, 251, 109, 3, 391, 3, 90, 3, 12, 49, + 3, 4, 47, 36, 325, 38, 39, 40, 0, 42, + 43, 44, 26, 46, 17, 90, 45, 319, 460, 89, + 90, 91, 464, 465, 67, 3, 4, 88, 0, 0, + 34, 51, 51, 51, 51, 51, 26, 91, 33, 17, + 121, 483, 32, 113, 114, 115, 50, 3, 4, 121, + 99, 121, 99, 123, 375, 497, 126, 16, 101, 51, + 135, 17, 504, 99, 99, 367, 61, 3, 4, 123, + 3, 121, 126, 125, 107, 104, 109, 99, 3, 51, + 51, 17, 121, 132, 92, 132, 92, 89, 90, 91, + 207, 412, 125, 353, 99, 12, 132, 132, 121, 35, + 129, 130, 101, 126, 125, 104, 503, 98, 99, 26, + 132, 121, 121, 3, 374, 5, 0, 127, 125, 121, + 121, 123, 125, 99, 126, 125, 126, 132, 148, 148, 148, 148, 148, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 126, 148, 122, 192, + 183, 184, 185, 186, 187, 188, 148, 3, 114, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 148, 148, 232, 3, - 234, 214, 102, 212, 100, 105, 122, 4, 90, 91, - 92, 126, 127, 122, 127, 215, 215, 215, 249, 232, - 459, 234, 231, 20, 21, 22, 322, 24, 3, 26, - 112, 113, 114, 115, 116, 105, 475, 4, 132, 100, - 122, 38, 124, 252, 253, 127, 125, 100, 3, 46, - 47, 48, 49, 20, 21, 22, 3, 24, 3, 26, - 349, 126, 351, 68, 90, 91, 92, 18, 3, 99, - 68, 38, 99, 3, 3, 3, 3, 362, 517, 334, - 47, 48, 49, 14, 127, 127, 122, 342, 114, 115, - 116, 304, 377, 133, 105, 132, 122, 100, 124, 3, - 102, 127, 99, 388, 393, 54, 54, 362, 3, 322, - 133, 311, 311, 311, 3, 89, 122, 132, 126, 319, - 319, 319, 377, 3, 133, 132, 105, 90, 91, 92, - 100, 102, 122, 388, 17, 132, 100, 387, 126, 126, - 4, 40, 3, 356, 378, 126, 132, 100, 437, 383, - 133, 65, 132, 126, 363, 133, 20, 21, 22, 122, - 24, 124, 26, 102, 127, 378, 126, 367, 367, 367, - 383, 456, 122, 458, 38, 133, 75, 76, 132, 105, - 3, 3, 46, 47, 48, 49, 27, 133, 132, 126, - 126, 90, 91, 92, 132, 94, 95, 96, 132, 132, - 3, 456, 122, 458, 126, 148, 52, 132, 132, 132, - 109, 110, 133, 112, 113, 114, 115, 116, 311, 398, - 58, 128, 341, 122, 445, 124, 445, 70, 127, 442, - 498, 484, 399, 427, 427, 99, 466, 419, 438, 27, - 489, -1, 371, -1, -1, 393, -1, -1, -1, -1, + 203, 204, 205, 206, 207, 208, 148, 148, 114, 16, + 232, 214, 234, 212, 121, 126, 121, 3, 25, 104, + 450, 131, 99, 124, 31, 215, 215, 215, 99, 232, + 3, 234, 231, 217, 249, 322, 466, 16, 45, 3, + 16, 4, 226, 3, 125, 67, 25, 3, 98, 67, + 98, 30, 31, 252, 253, 18, 19, 20, 3, 22, + 3, 24, 3, 3, 43, 12, 45, 126, 349, 126, + 351, 132, 121, 104, 37, 99, 131, 3, 508, 53, + 101, 53, 45, 46, 47, 48, 3, 132, 88, 334, + 3, 121, 131, 125, 3, 132, 99, 342, 362, 126, + 104, 304, 131, 101, 121, 5, 125, 15, 8, 9, + 10, 99, 393, 377, 3, 125, 131, 362, 132, 322, + 125, 311, 311, 311, 388, 131, 101, 27, 28, 319, + 319, 319, 377, 99, 125, 98, 125, 321, 121, 64, + 132, 3, 132, 388, 44, 104, 131, 428, 387, 3, + 25, 4, 132, 356, 54, 55, 378, 125, 125, 3, + 131, 383, 39, 125, 363, 18, 19, 20, 131, 22, + 131, 24, 121, 131, 131, 378, 131, 367, 367, 367, + 383, 131, 51, 447, 37, 449, 132, 131, 311, 66, + 67, 68, 45, 46, 47, 48, 148, 74, 75, 57, + 398, 128, 447, 341, 449, 69, 436, 436, 4, 489, + 418, 418, 89, 90, 91, 475, 93, 94, 95, 457, + 370, 480, 18, 19, 20, 410, 22, 26, 24, 393, + 433, 108, 109, 399, 111, 112, 113, 114, 115, 429, + 371, 37, -1, -1, 121, 98, 123, -1, -1, 126, + 46, 47, 48, -1, -1, -1, -1, -1, 89, 90, + 91, 451, 451, 451, 451, 451, -1, 457, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 131, -1, + 111, 112, 113, 114, 115, 475, 475, 475, 475, 475, + 121, -1, 123, -1, -1, 126, -1, -1, -1, 489, + 489, 489, 489, 489, 0, -1, -1, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, -1, + -1, 17, 18, 19, 20, 21, 22, 23, 24, -1, + -1, 27, 28, -1, -1, 39, -1, -1, -1, 35, + -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, + 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, + -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, + 74, 75, -1, 69, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 89, 90, 91, -1, 93, + 94, 95, -1, 89, 90, -1, -1, -1, -1, -1, + -1, -1, 98, -1, 108, 109, -1, 111, 112, 113, + 114, 115, -1, -1, -1, 111, -1, 121, -1, 123, + 116, 117, 126, -1, -1, 121, -1, 123, -1, 125, + -1, 127, -1, -1, -1, 131, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, + -1, 18, 19, 20, 21, 22, 23, 24, 25, -1, + 27, 28, 29, -1, 31, -1, -1, -1, 35, 36, + 37, 38, -1, 40, 41, 42, -1, 44, 45, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, 65, -1, + -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 460, 460, 460, 460, 460, -1, 466, -1, 132, -1, + -1, -1, 89, 90, -1, -1, -1, -1, -1, -1, + -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, + 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, + 127, -1, -1, -1, 131, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, + 18, 19, 20, 21, 22, 23, 24, 25, -1, 27, + 28, 29, -1, 31, -1, -1, -1, 35, 36, 37, + 38, -1, 40, 41, 42, -1, 44, 45, 46, 47, + 48, -1, -1, 51, 52, -1, 54, 55, -1, -1, + -1, -1, -1, -1, 62, 63, -1, 65, -1, -1, + -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 484, 484, 484, 484, 484, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 498, 498, - 498, 498, 498, 0, -1, -1, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, 40, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, 67, 68, 69, -1, 63, 64, -1, -1, - 75, 76, -1, 70, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, 109, 110, -1, 112, 113, 114, - 115, 116, -1, -1, -1, 112, -1, 122, -1, 124, - 117, 118, 127, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, 89, 90, -1, -1, -1, -1, -1, -1, -1, + 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 111, -1, -1, -1, -1, 116, 117, + -1, -1, -1, 121, -1, 123, -1, 125, -1, 127, + -1, -1, -1, 131, 3, 4, 5, 6, -1, 8, + 9, 10, 11, 12, 13, 14, -1, -1, -1, 18, + 19, 20, 21, 22, 23, 24, 25, -1, 27, 28, + 29, -1, 31, -1, -1, -1, 35, 36, 37, 38, + -1, 40, 41, 42, -1, 44, 45, 46, 47, 48, + -1, -1, 51, 52, -1, 54, 55, -1, -1, -1, + -1, -1, -1, 62, 63, -1, 65, -1, -1, -1, + 69, -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, + 89, 90, -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, + -1, -1, 121, -1, 123, -1, 125, -1, 127, -1, + -1, -1, 131, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, -1, -1, 17, 18, 19, + 20, 21, 22, 23, 24, -1, -1, 27, 28, -1, + -1, -1, -1, -1, -1, 35, -1, 37, 38, -1, + 40, -1, 42, -1, 44, -1, 46, 47, 48, -1, + -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, + -1, -1, 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, + 90, -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, + -1, 121, -1, 123, -1, 125, -1, 127, -1, -1, + -1, 131, 3, 4, 5, 6, -1, 8, 9, 10, + 11, 12, 13, 14, -1, -1, -1, 18, 19, 20, + 21, 22, 23, 24, -1, -1, 27, 28, -1, -1, + -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, + -1, 42, -1, 44, -1, 46, 47, 48, -1, -1, + 51, 52, -1, 54, 55, -1, -1, -1, -1, -1, + -1, 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 89, 90, + -1, -1, -1, -1, -1, -1, -1, 98, -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, + 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, + 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, + 131, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, -1, -1, 18, 19, 20, 21, + 22, 23, 24, -1, -1, 27, 28, -1, -1, -1, + -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, + 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 89, 90, -1, + -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, + -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, + 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, -1, -1, -1, 18, 19, 20, 21, 22, + 23, 24, -1, -1, 27, 28, -1, -1, -1, -1, + -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, + -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, 0, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 89, 90, -1, -1, + -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, + -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, + 123, -1, 125, -1, 127, -1, -1, -1, 131, 3, + 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, -1, -1, -1, 18, 19, 20, 21, 22, 23, + 24, -1, -1, 27, 28, -1, -1, -1, -1, -1, + -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, + 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, + 54, 55, -1, -1, -1, -1, -1, -1, 62, 63, + -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 89, 90, -1, -1, -1, + -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, + -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, + -1, 125, -1, 127, -1, 0, -1, 131, 3, 4, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + -1, -1, 17, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, -1, -1, -1, -1, -1, -1, + 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, + -1, 46, 47, 48, -1, -1, 51, 52, -1, 54, + 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, + -1, -1, -1, -1, 69, -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, 89, 90, -1, -1, -1, -1, + -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, + -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, + 125, -1, 127, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, -1, 16, -1, 18, 19, + 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, + -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, + 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, + -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, + -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, -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, 89, + 90, -1, -1, -1, -1, -1, -1, -1, 98, -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, + -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, + -1, 121, -1, 123, -1, 125, -1, 127, 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, - 15, 16, -1, -1, -1, 20, 21, 22, 23, 24, - 25, 26, 27, -1, 29, 30, -1, 32, -1, -1, - -1, 36, 37, 38, 39, -1, 41, 42, 43, -1, - 45, 46, 47, 48, 49, -1, -1, 52, 53, -1, - 55, 56, -1, -1, -1, -1, -1, -1, 63, 64, - -1, 66, -1, -1, -1, 70, -1, -1, -1, -1, + -1, -1, -1, 18, 19, 20, 21, 22, 23, 24, + 25, -1, 27, 28, 29, -1, 31, -1, -1, -1, + 35, 36, 37, 38, -1, 40, 41, 42, -1, 44, + 45, 46, 47, 48, -1, -1, 51, 52, -1, 54, + 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, + 65, -1, -1, -1, 69, -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, -1, -1, 89, 90, -1, -1, -1, -1, + -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, + -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, + 125, 3, 127, 5, 6, -1, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, 67, 68, 69, -1, 71, + -1, 23, -1, 25, -1, 27, 28, -1, -1, 31, + -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, + 42, -1, 44, 45, -1, -1, -1, -1, -1, -1, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, -1, -1, -1, -1, -1, -1, 69, -1, -1, + -1, 3, -1, 5, 6, -1, 8, 9, 10, -1, + -1, -1, -1, -1, -1, -1, -1, 89, 90, -1, + -1, 23, -1, 25, -1, 27, 28, -1, -1, -1, + -1, -1, -1, 35, -1, -1, -1, -1, -1, 111, + 42, -1, 44, -1, 116, 117, -1, -1, -1, 121, + 52, 123, 54, 55, -1, 127, 3, -1, 5, 6, + 62, 8, 9, 10, -1, -1, -1, 69, -1, -1, + -1, -1, -1, -1, -1, -1, 23, -1, 25, -1, + 27, 28, -1, -1, -1, -1, -1, 89, 90, -1, + -1, -1, -1, -1, -1, -1, -1, 44, -1, -1, + -1, -1, -1, -1, -1, 52, -1, 54, 55, 111, + -1, -1, -1, -1, 116, 117, -1, 39, -1, 121, + -1, 123, 69, -1, -1, 127, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 89, 90, 66, 67, 68, -1, 70, 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, + 82, 83, 84, 85, 86, 87, -1, 89, 90, 91, + -1, 93, 94, 95, 121, -1, 123, -1, -1, 101, + 127, 103, -1, 105, 106, 107, 108, 109, 39, 111, + 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, + -1, 123, -1, -1, 126, -1, -1, -1, -1, -1, + 132, -1, -1, -1, -1, 66, 67, 68, -1, 70, 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, + 81, 82, 83, 84, 85, 86, 87, -1, 89, 90, + 91, -1, 93, 94, 95, -1, -1, -1, -1, -1, + 101, 39, 103, -1, 105, 106, 107, 108, 109, -1, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, -1, -1, 66, 67, + 68, 132, 70, 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, + -1, 89, 90, 91, -1, 93, 94, 95, -1, -1, + -1, -1, -1, 101, 39, 103, -1, 105, 106, 107, + 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, + -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, + -1, 66, 67, 68, 132, 70, 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, + 85, 86, 87, -1, 89, 90, 91, -1, 93, 94, + 95, -1, -1, -1, -1, 39, 101, -1, 103, 104, + 105, 106, 107, 108, 109, -1, 111, 112, 113, 114, + 115, -1, -1, -1, -1, -1, 121, -1, 123, -1, + -1, 126, 66, 67, 68, -1, 70, 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, + 84, 85, 86, 87, -1, 89, 90, 91, -1, 93, + 94, 95, -1, -1, -1, -1, 39, 101, -1, 103, + -1, 105, 106, 107, 108, 109, -1, 111, 112, 113, + 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, + 124, -1, 126, 66, 67, 68, -1, 70, 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, + 83, 84, 85, 86, 87, -1, 89, 90, 91, -1, + 93, 94, 95, -1, -1, -1, -1, 39, 101, -1, + 103, 104, 105, 106, 107, 108, 109, -1, 111, 112, + 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, + 123, -1, -1, 126, 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, - 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, - 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, - 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, - 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, -1, 90, - 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + 82, 83, 84, 85, 86, 87, -1, 89, 90, 91, + -1, 93, 94, 95, -1, -1, -1, -1, 39, 101, + -1, 103, -1, 105, 106, 107, 108, 109, -1, 111, + 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, + -1, 123, -1, -1, 126, 66, 67, 68, -1, 70, + 71, 72, 73, 74, 75, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 87, -1, 89, 90, + 91, -1, 93, 94, 95, -1, -1, -1, -1, 39, + -1, -1, -1, -1, 105, 106, 107, 108, 109, -1, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, 66, 67, 68, -1, + 70, 71, 72, 73, 74, 75, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, + 90, 91, -1, 93, 94, 95, -1, -1, -1, -1, + 39, -1, -1, -1, -1, 105, 106, 107, 108, 109, + -1, 111, 112, 113, 114, 115, -1, -1, -1, -1, + -1, 121, -1, 123, -1, -1, 126, 66, 67, 68, + -1, 70, 71, 72, 73, 74, 75, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 89, 90, 91, -1, 93, 94, 95, -1, -1, -1, + -1, 39, -1, -1, -1, -1, -1, 106, 107, 108, + 109, -1, 111, 112, 113, 114, 115, -1, -1, -1, + -1, -1, 121, -1, 123, -1, -1, 126, 66, 67, + 68, -1, 70, 71, 72, 73, 74, 75, -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, -1, 122, -1, 124, -1, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + -1, 89, 90, 91, -1, 93, 94, 95, -1, -1, + -1, -1, 39, -1, -1, -1, -1, -1, -1, 107, + 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, + -1, -1, -1, 121, -1, 123, -1, -1, 126, 66, + 67, 68, -1, 70, 71, 72, 73, 74, 75, -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, 89, 90, 91, -1, 93, 94, 95, -1, + -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, + 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, + -1, -1, -1, -1, 121, -1, 123, -1, -1, 126, + 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, -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, 89, 90, 91, -1, 93, 94, 95, -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, -1, 108, 109, -1, 111, 112, 113, 114, 115, + -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, + 126 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3464,57 +3534,57 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 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, 183, 186, 189, 190, - 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, - 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, - 122, 164, 122, 3, 19, 126, 184, 185, 18, 3, - 240, 3, 219, 240, 122, 185, 223, 122, 126, 122, - 127, 240, 122, 237, 240, 242, 243, 240, 240, 240, - 240, 240, 238, 229, 230, 231, 237, 30, 32, 37, - 42, 46, 66, 99, 132, 143, 144, 145, 148, 150, - 165, 166, 181, 190, 236, 3, 0, 138, 126, 3, - 46, 150, 156, 157, 239, 145, 146, 18, 27, 31, - 32, 44, 46, 206, 245, 192, 100, 40, 67, 68, - 69, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, - 91, 92, 94, 95, 96, 102, 104, 106, 107, 108, - 109, 110, 112, 113, 114, 115, 116, 122, 124, 127, - 3, 122, 162, 146, 172, 188, 126, 127, 3, 185, - 222, 223, 224, 232, 122, 238, 127, 240, 180, 229, - 3, 155, 105, 132, 100, 133, 125, 100, 237, 3, - 3, 151, 152, 238, 238, 151, 3, 132, 145, 126, - 136, 3, 99, 68, 99, 3, 35, 51, 216, 3, - 3, 208, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 3, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 229, 240, 3, 122, 128, 238, 14, 240, 99, - 139, 140, 141, 147, 148, 196, 198, 207, 217, 187, - 184, 127, 122, 228, 3, 93, 213, 214, 215, 133, - 3, 115, 133, 142, 143, 133, 238, 237, 237, 105, - 227, 100, 143, 132, 227, 238, 238, 102, 3, 54, - 193, 54, 194, 3, 209, 210, 105, 133, 125, 89, - 240, 3, 133, 122, 133, 132, 141, 126, 139, 229, - 102, 105, 211, 215, 133, 100, 132, 133, 105, 36, - 115, 224, 226, 102, 149, 152, 132, 99, 133, 3, - 5, 122, 224, 17, 195, 224, 225, 126, 227, 100, - 240, 3, 133, 146, 238, 126, 139, 132, 133, 3, - 5, 8, 9, 10, 12, 45, 55, 56, 212, 226, - 227, 93, 215, 28, 33, 173, 175, 177, 178, 146, - 237, 237, 239, 146, 213, 225, 126, 100, 199, 149, - 210, 133, 34, 62, 167, 168, 169, 170, 132, 211, - 126, 215, 126, 122, 173, 175, 65, 153, 133, 133, - 197, 224, 46, 99, 190, 203, 204, 205, 240, 105, - 132, 169, 170, 221, 176, 3, 146, 146, 227, 99, - 144, 148, 190, 200, 201, 202, 207, 217, 3, 27, - 132, 205, 105, 142, 142, 142, 227, 126, 126, 132, - 202, 216, 142, 132, 132, 133, 218, 200, 3, 174, - 142, 132, 122, 126, 132, 213, 142, 133, 132, 227 + 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 27, 28, 35, 37, 38, 40, 42, 44, 46, + 47, 48, 51, 52, 54, 55, 62, 63, 69, 89, + 90, 98, 111, 116, 117, 121, 123, 125, 127, 134, + 135, 136, 137, 143, 146, 147, 153, 157, 158, 159, + 160, 162, 170, 178, 181, 182, 185, 188, 189, 190, + 191, 195, 197, 206, 211, 216, 219, 232, 233, 234, + 237, 238, 239, 242, 244, 245, 88, 49, 121, 121, + 163, 121, 3, 4, 17, 125, 183, 184, 16, 3, + 239, 3, 218, 239, 121, 184, 222, 121, 125, 121, + 126, 239, 121, 236, 239, 240, 241, 239, 239, 239, + 239, 239, 237, 228, 229, 230, 236, 29, 31, 36, + 41, 45, 65, 98, 131, 142, 143, 144, 147, 149, + 164, 165, 180, 189, 235, 3, 0, 137, 125, 3, + 45, 149, 155, 156, 238, 144, 145, 16, 25, 30, + 31, 43, 45, 205, 243, 191, 99, 39, 66, 67, + 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 89, + 90, 91, 93, 94, 95, 101, 103, 105, 106, 107, + 108, 109, 111, 112, 113, 114, 115, 121, 123, 126, + 3, 121, 161, 145, 171, 187, 125, 126, 183, 184, + 221, 222, 223, 231, 121, 237, 126, 239, 179, 228, + 3, 154, 104, 131, 99, 132, 124, 99, 236, 3, + 3, 150, 151, 237, 237, 150, 3, 131, 144, 125, + 135, 3, 98, 67, 98, 3, 34, 50, 215, 3, + 3, 207, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 3, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 228, 239, 3, 121, 127, 237, 12, 239, 98, + 138, 139, 140, 146, 147, 195, 197, 206, 216, 186, + 183, 126, 121, 227, 3, 92, 212, 213, 214, 132, + 114, 183, 132, 141, 142, 132, 237, 236, 236, 104, + 226, 99, 142, 131, 226, 237, 237, 101, 3, 53, + 192, 53, 193, 3, 208, 209, 104, 132, 124, 88, + 239, 3, 132, 121, 132, 131, 140, 125, 138, 228, + 101, 104, 210, 214, 132, 99, 131, 132, 104, 35, + 114, 223, 225, 101, 148, 151, 131, 98, 132, 3, + 5, 121, 223, 15, 194, 223, 224, 125, 226, 99, + 239, 3, 132, 145, 237, 125, 138, 131, 132, 211, + 225, 226, 92, 214, 26, 32, 172, 174, 176, 177, + 145, 236, 236, 238, 145, 212, 224, 125, 99, 198, + 148, 209, 132, 33, 61, 166, 167, 168, 169, 131, + 210, 125, 214, 125, 121, 172, 174, 64, 152, 132, + 132, 196, 223, 45, 98, 189, 202, 203, 204, 239, + 104, 131, 168, 169, 220, 175, 3, 145, 145, 226, + 98, 143, 147, 189, 199, 200, 201, 206, 216, 3, + 25, 131, 204, 104, 141, 141, 141, 226, 125, 125, + 131, 201, 215, 141, 131, 131, 132, 217, 199, 3, + 173, 141, 131, 121, 125, 131, 212, 141, 132, 131, + 226 }; #define yyerrok (yyerrstatus = 0) @@ -4326,11 +4396,33 @@ yyreduce: switch (yyn) { + case 13: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2086 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 24: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2098 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + case 26: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2092 "parser.y" +#line 2101 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4341,7 +4433,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2093 "parser.y" +#line 2102 "parser.y" {(yyval.code)=code_new();} } break; @@ -4352,7 +4444,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2095 "parser.y" +#line 2104 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4363,7 +4455,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2096 "parser.y" +#line 2105 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4374,7 +4466,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" +#line 2120 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4385,7 +4477,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 2121 "parser.y" {(yyval.code)=0;} } break; @@ -4396,7 +4488,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2115 "parser.y" +#line 2124 "parser.y" {(yyval.code)=0;} } break; @@ -4407,8 +4499,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2122 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 2131 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4418,7 +4510,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2126 "parser.y" +#line 2135 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4429,7 +4521,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2127 "parser.y" +#line 2136 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4440,7 +4532,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2140 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4450,14 +4542,33 @@ yyreduce: - case 56: + case 55: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2142 "parser.y" - {(yyval.value)=(yyvsp[(2) - (2)].value);} - } - break; +#line 2147 "parser.y" + { + PASS12 + (yyval.number_int)=as3_pass; + char*key = concat3((yyvsp[(1) - (3)].id),"::",(yyvsp[(3) - (3)].id)); + if(!definitions || !dict_contains(definitions, key)) { + as3_pass=0; + } + free(key); +} + } + break; + + + + case 56: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2166 "parser.y" + {(yyval.value)=(yyvsp[(2) - (2)].value);} + } + break; @@ -4465,7 +4576,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2143 "parser.y" +#line 2167 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4478,7 +4589,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2147 "parser.y" +#line 2171 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4489,7 +4600,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2148 "parser.y" +#line 2172 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4500,7 +4611,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2150 "parser.y" +#line 2174 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4511,7 +4622,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2151 "parser.y" +#line 2175 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4522,7 +4633,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2154 "parser.y" +#line 2178 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4589,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2214 "parser.y" +#line 2238 "parser.y" {(yyval.code) = code_new();} } break; @@ -4600,7 +4711,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2215 "parser.y" +#line 2239 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4611,7 +4722,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2218 "parser.y" +#line 2242 "parser.y" {PASS12 new_state();} } break; @@ -4622,7 +4733,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2218 "parser.y" +#line 2242 "parser.y" { (yyval.code) = code_new(); @@ -4650,7 +4761,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2237 "parser.y" +#line 2261 "parser.y" {(yyval.code)=code_new();} } break; @@ -4661,7 +4772,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2244 "parser.y" +#line 2268 "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); @@ -4675,7 +4786,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2248 "parser.y" +#line 2272 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4689,7 +4800,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2253 "parser.y" +#line 2277 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4700,7 +4811,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2254 "parser.y" +#line 2278 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4711,7 +4822,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2256 "parser.y" +#line 2280 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4740,7 +4851,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2276 "parser.y" +#line 2300 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4797,7 +4908,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2324 "parser.y" +#line 2348 "parser.y" {PASS12 new_state();} } break; @@ -4808,7 +4919,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2324 "parser.y" +#line 2348 "parser.y" { (yyval.code) = code_new(); @@ -4836,7 +4947,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2343 "parser.y" +#line 2367 "parser.y" {PASS12 new_state();} } break; @@ -4847,7 +4958,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2343 "parser.y" +#line 2367 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4871,7 +4982,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2358 "parser.y" +#line 2382 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4884,7 +4995,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2361 "parser.y" +#line 2385 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4897,7 +5008,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2388 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4910,7 +5021,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2367 "parser.y" +#line 2391 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4923,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2371 "parser.y" +#line 2395 "parser.y" {(yyval.code)=0;} } break; @@ -4934,7 +5045,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2372 "parser.y" +#line 2396 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4945,7 +5056,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2373 "parser.y" +#line 2397 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4956,7 +5067,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2374 "parser.y" +#line 2398 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4967,7 +5078,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2375 "parser.y" +#line 2399 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4978,7 +5089,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2376 "parser.y" +#line 2400 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4989,9 +5100,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2378 "parser.y" +#line 2402 "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)); @@ -5010,7 +5121,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2413 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -5023,8 +5134,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" - {PASS12 new_state();} +#line 2416 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -5034,11 +5145,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2416 "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; @@ -5070,7 +5183,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2421 "parser.y" +#line 2447 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -5085,7 +5198,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2426 "parser.y" +#line 2452 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5115,7 +5228,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2446 "parser.y" +#line 2472 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5126,7 +5239,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2446 "parser.y" +#line 2472 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5151,7 +5264,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2462 "parser.y" +#line 2488 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -5162,7 +5275,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2463 "parser.y" +#line 2489 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -5173,7 +5286,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" +#line 2490 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5184,7 +5297,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2465 "parser.y" +#line 2491 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5202,7 +5315,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2473 "parser.y" +#line 2499 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5220,7 +5333,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2482 "parser.y" +#line 2508 "parser.y" {PASS12 new_state(); state->method->has_exceptions=1; state->method->late_binding=1;//for invariant scope_code @@ -5234,7 +5347,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2485 "parser.y" +#line 2511 "parser.y" { code_t*out = abc_nop(0); @@ -5287,7 +5400,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2531 "parser.y" +#line 2557 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5301,7 +5414,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2535 "parser.y" +#line 2561 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5319,13 +5432,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" +#line 2572 "parser.y" { new_state(); if(state->method->has_exceptions) { - char var[32]; - sprintf(var, "#with#_%d", as3_tokencount); - int v = new_variable(var,(yyvsp[(3) - (4)].value).t,0,0); + 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; @@ -5341,7 +5452,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2558 "parser.y" +#line 2582 "parser.y" { /* remove getlocal;pushwith from scope code again */ state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); @@ -5365,7 +5476,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2576 "parser.y" +#line 2600 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5376,8 +5487,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2578 "parser.y" - {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} +#line 2601 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5387,8 +5498,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2579 "parser.y" - {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} +#line 2603 "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; @@ -5398,8 +5509,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2581 "parser.y" - {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} +#line 2604 "parser.y" + {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5409,8 +5520,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2582 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2606 "parser.y" + {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5420,8 +5531,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2583 "parser.y" - {PASS12 startpackage("");} +#line 2607 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5431,8 +5542,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2584 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2608 "parser.y" + {PASS12 startpackage("");} } break; @@ -5442,15 +5553,24 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2586 "parser.y" +#line 2609 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} + } + break; + + + + case 118: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2631 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } - - PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); @@ -5464,18 +5584,17 @@ PASS2 - case 118: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2645 "parser.y" { PASS12 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(); @@ -5488,44 +5607,44 @@ PASS2 - case 119: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2619 "parser.y" +#line 2661 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 120: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2620 "parser.y" +#line 2662 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2663 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 122: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2622 "parser.y" +#line 2664 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5538,110 +5657,110 @@ PASS2 - case 123: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2630 "parser.y" +#line 2671 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 124: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2631 "parser.y" +#line 2672 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 125: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2632 "parser.y" +#line 2673 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 126: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2633 "parser.y" +#line 2674 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 127: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2634 "parser.y" +#line 2675 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 128: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2635 "parser.y" +#line 2676 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 129: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2636 "parser.y" +#line 2677 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 130: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2637 "parser.y" +#line 2678 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 131: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2638 "parser.y" +#line 2679 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 132: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2639 "parser.y" +#line 2680 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5650,99 +5769,99 @@ PASS2 - case 133: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2643 "parser.y" +#line 2684 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 134: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2644 "parser.y" +#line 2685 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 135: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2646 "parser.y" +#line 2687 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 136: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2647 "parser.y" +#line 2688 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 137: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2649 "parser.y" +#line 2690 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 138: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2691 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 139: + case 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2654 "parser.y" +#line 2695 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; - case 140: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2656 "parser.y" +#line 2697 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 141: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2701 "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));} } @@ -5750,22 +5869,33 @@ PASS2 - case 142: + case 143: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2663 "parser.y" +#line 2704 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 151: + case 149: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2713 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 152: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2717 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5776,11 +5906,11 @@ PASS2 - case 157: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2687 "parser.y" +#line 2728 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5789,11 +5919,11 @@ PASS2 - case 158: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2731 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5809,122 +5939,132 @@ PASS2 - case 161: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" - {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} +#line 2765 "parser.y" + {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 162: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" - {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} +#line 2765 "parser.y" + {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; - case 163: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2707 "parser.y" - {(yyval.code) = (yyvsp[(1) - (1)].code);} +#line 2767 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 164: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" - {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} +#line 2768 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 165: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" +#line 2771 "parser.y" { +PASS12 int flags = slotstate_flags->flags; namespace_t ns = modifiers2access(slotstate_flags); - varinfo_t* info = 0; - if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); - if(i) { - check_override(i, flags); - } - info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); - } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); - if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); - } - if(ns.name && ns.name[0]) { - syntaxerror("namespaces not allowed on package-level variables"); - } - info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); - } + if(as3_pass == 1) { - info->type = (yyvsp[(2) - (3)].classinfo); - info->flags = flags; + varinfo_t* info = 0; + if(state->cls) { + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); + if(i) { + check_override(i, flags); + } + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); + } else { + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); + if(i) { + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); + } - /* slot name */ - multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; - - trait_list_t**traits; - code_t**code; - if(!state->cls) { - // global variable - ns.name = state->package; - traits = &global->init->traits; - code = &global->init->method->body->code; - } else if(flags&FLAG_STATIC) { - // static variable - traits = &state->cls->abc->static_traits; - code = &state->cls->static_init->header; - } else { - // instance variable - traits = &state->cls->abc->traits; - code = &state->cls->init->header; - } - - trait_t*t=0; - 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); - } - info->slot = t->slot_id; - - /* initalization code (if needed) */ - code_t*c = 0; - if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { - c = abc_getlocal_0(c); - 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); + info->type = (yyvsp[(2) - (3)].classinfo); + info->flags = flags; + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info); } - *code = code_append(*code, c); + if(as3_pass == 2) { + varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + /* slot name */ + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; + + trait_list_t**traits; + code_t**code; + if(!state->cls) { + // global variable + ns.name = state->package; + traits = &global->init->traits; + code = &global->init->method->body->code; + } else if(flags&FLAG_STATIC) { + // static variable + traits = &state->cls->abc->static_traits; + code = &state->cls->static_init->header; + } else { + // instance variable + traits = &state->cls->abc->traits; + code = &state->cls->init->header; + } + + trait_t*t=0; + 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); + } + info->slot = t->slot_id; + + /* initalization code (if needed) */ + code_t*c = 0; + if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { + c = abc_getlocal_0(c); + 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(slotstate_varconst==KW_CONST) { - t->kind= TRAIT_CONST; + if(slotstate_varconst==KW_CONST) { + t->kind= TRAIT_CONST; + } } (yyval.code)=0; @@ -5934,23 +6074,12 @@ PASS2 - case 166: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2785 "parser.y" - {(yyval.constant)=0;} - } - break; - - - case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2786 "parser.y" - {(yyval.constant)=(yyvsp[(2) - (2)].constant);} +#line 2855 "parser.y" + {(yyval.constant)=0;} } break; @@ -5960,8 +6089,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2788 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} +#line 2856 "parser.y" + {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5971,7 +6100,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2789 "parser.y" +#line 2859 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5982,8 +6111,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2790 "parser.y" - {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} +#line 2860 "parser.y" + { + (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); +} } break; @@ -5993,7 +6124,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2791 "parser.y" +#line 2863 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -6004,7 +6135,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2792 "parser.y" +#line 2864 "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; @@ -6015,7 +6146,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2794 "parser.y" +#line 2865 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -6026,7 +6157,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2795 "parser.y" +#line 2866 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -6037,7 +6168,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2796 "parser.y" +#line 2867 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -6048,15 +6179,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2797 "parser.y" - { - 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)); - } -} +#line 2868 "parser.y" + {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; @@ -6066,7 +6190,18 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2809 "parser.y" +#line 2869 "parser.y" + {(yyval.constant) = constant_new_float(__builtin_nan(""));} + } + break; + + + + case 178: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2884 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6076,11 +6211,11 @@ PASS2 - case 178: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2813 "parser.y" +#line 2888 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -6090,11 +6225,11 @@ PASS2 - case 179: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2819 "parser.y" +#line 2894 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6106,11 +6241,11 @@ PASS2 - case 180: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2825 "parser.y" +#line 2900 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6122,11 +6257,11 @@ PASS2 - case 181: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2833 "parser.y" +#line 2908 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6137,11 +6272,11 @@ PASS2 - case 182: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2838 "parser.y" +#line 2913 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6152,11 +6287,11 @@ PASS2 - case 183: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2844 "parser.y" +#line 2919 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6170,11 +6305,11 @@ PASS2 - case 184: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2852 "parser.y" +#line 2927 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6188,33 +6323,33 @@ PASS2 - case 187: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2862 "parser.y" +#line 2937 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 188: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "parser.y" +#line 2940 "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 189: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2866 "parser.y" +#line 2941 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -6234,33 +6369,33 @@ PASS2 - case 191: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2882 "parser.y" +#line 2957 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 192: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2884 "parser.y" +#line 2959 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 193: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2885 "parser.y" +#line 2960 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6284,11 +6419,11 @@ PASS2 - case 194: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2907 "parser.y" +#line 2982 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6312,11 +6447,11 @@ PASS2 - case 195: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2926 "parser.y" +#line 3001 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6335,121 +6470,121 @@ PASS2 - case 198: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2943 "parser.y" +#line 3018 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 199: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2944 "parser.y" +#line 3019 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 200: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2946 "parser.y" +#line 3021 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 201: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2947 "parser.y" +#line 3022 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 202: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2948 "parser.y" +#line 3023 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 203: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2957 "parser.y" +#line 3032 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 204: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2958 "parser.y" +#line 3033 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 205: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2962 "parser.y" +#line 3037 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 206: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "parser.y" +#line 3038 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 207: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2965 "parser.y" +#line 3040 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 210: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2969 "parser.y" +#line 3044 "parser.y" {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6458,22 +6593,22 @@ PASS2 - case 211: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "parser.y" +#line 3048 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 212: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2974 "parser.y" +#line 3049 "parser.y" { (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); @@ -6483,11 +6618,11 @@ PASS2 - case 214: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 3055 "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); @@ -6524,11 +6659,11 @@ PASS2 - case 215: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3016 "parser.y" +#line 3091 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6579,11 +6714,11 @@ PASS2 - case 216: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3062 "parser.y" +#line 3137 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6609,11 +6744,11 @@ PASS2 - case 217: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3083 "parser.y" +#line 3158 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6639,11 +6774,11 @@ PASS2 - case 218: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3104 "parser.y" +#line 3179 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6652,11 +6787,11 @@ PASS2 - case 219: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "parser.y" +#line 3182 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6666,33 +6801,33 @@ PASS2 - case 220: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3114 "parser.y" +#line 3189 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 221: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3115 "parser.y" +#line 3190 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3116 "parser.y" +#line 3191 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6704,11 +6839,11 @@ PASS2 - case 223: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3122 "parser.y" +#line 3197 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6717,11 +6852,11 @@ PASS2 - case 224: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3128 "parser.y" +#line 3203 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6732,7 +6867,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3132 "parser.y" +#line 3204 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6743,7 +6878,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3134 "parser.y" +#line 3205 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6754,7 +6889,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3136 "parser.y" +#line 3206 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6765,7 +6900,21 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "parser.y" +#line 3210 "parser.y" + { + node_t*n = mkconstnode((yyvsp[(1) - (1)].constant)); + (yyval.value) = node_read(n); +} + } + break; + + + + case 231: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3215 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6787,143 +6936,11 @@ PASS2 - case 231: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3157 "parser.y" - {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); - //MULTINAME(m, registry_getintclass()); - //$$.c = abc_coerce2($$.c, &m); // FIXME - (yyval.value).t = TYPE_INT; - } - } - break; - - - case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3162 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - - case 233: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3165 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - - case 234: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3168 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } - } - break; - - - - case 235: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3171 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } - } - break; - - - - case 236: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3174 "parser.y" - {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); - (yyval.value).t = TYPE_STRING; - } - } - break; - - - - case 237: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3177 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } - } - break; - - - - case 238: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3180 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 239: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3183 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 240: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3186 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } - } - break; - - - - case 241: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3190 "parser.y" +#line 3232 "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; } @@ -6932,11 +6949,11 @@ PASS2 - case 242: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" +#line 3235 "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; } @@ -6945,11 +6962,11 @@ PASS2 - case 243: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3196 "parser.y" +#line 3238 "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; } @@ -6958,11 +6975,11 @@ PASS2 - case 244: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3199 "parser.y" +#line 3241 "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; } @@ -6971,11 +6988,11 @@ PASS2 - case 245: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3202 "parser.y" +#line 3244 "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; } @@ -6984,11 +7001,11 @@ PASS2 - case 246: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "parser.y" +#line 3247 "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; } @@ -6997,11 +7014,11 @@ PASS2 - case 247: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3208 "parser.y" +#line 3250 "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; } @@ -7010,11 +7027,11 @@ PASS2 - case 248: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3211 "parser.y" +#line 3253 "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; } @@ -7023,11 +7040,11 @@ PASS2 - case 249: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3215 "parser.y" +#line 3257 "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); @@ -7044,11 +7061,11 @@ PASS2 - case 250: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3226 "parser.y" +#line 3268 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -7071,11 +7088,11 @@ PASS2 - case 251: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3244 "parser.y" +#line 3286 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -7085,11 +7102,11 @@ PASS2 - case 252: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3249 "parser.y" +#line 3291 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -7099,11 +7116,11 @@ PASS2 - case 253: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3254 "parser.y" +#line 3296 "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; @@ -7113,11 +7130,11 @@ PASS2 - case 254: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3259 "parser.y" +#line 3301 "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; @@ -7127,11 +7144,11 @@ PASS2 - case 255: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3264 "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_bitor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -7141,11 +7158,11 @@ PASS2 - case 256: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3269 "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_rshift((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -7155,11 +7172,11 @@ PASS2 - case 257: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3273 "parser.y" +#line 3315 "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; @@ -7169,11 +7186,11 @@ PASS2 - case 258: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3277 "parser.y" +#line 3319 "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; @@ -7183,11 +7200,11 @@ PASS2 - case 259: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3282 "parser.y" +#line 3324 "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; @@ -7197,11 +7214,11 @@ PASS2 - case 260: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3286 "parser.y" +#line 3328 "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; @@ -7211,11 +7228,11 @@ PASS2 - case 261: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3290 "parser.y" +#line 3332 "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); @@ -7230,11 +7247,11 @@ PASS2 - case 262: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3299 "parser.y" +#line 3341 "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); @@ -7249,11 +7266,11 @@ PASS2 - case 263: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3308 "parser.y" +#line 3350 "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); @@ -7268,11 +7285,11 @@ PASS2 - case 264: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3318 "parser.y" +#line 3360 "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; @@ -7282,11 +7299,11 @@ PASS2 - case 265: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3323 "parser.y" +#line 3365 "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)); @@ -7303,11 +7320,11 @@ PASS2 - case 266: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3336 "parser.y" +#line 3378 "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; @@ -7317,11 +7334,11 @@ PASS2 - case 267: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3341 "parser.y" +#line 3383 "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; @@ -7331,11 +7348,11 @@ PASS2 - case 268: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3346 "parser.y" +#line 3388 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7346,11 +7363,11 @@ PASS2 - case 269: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3352 "parser.y" +#line 3394 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7361,11 +7378,11 @@ PASS2 - case 270: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3358 "parser.y" +#line 3400 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7374,24 +7391,24 @@ PASS2 - case 271: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3362 "parser.y" +#line 3404 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 272: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3364 "parser.y" +#line 3406 "parser.y" { - (yyval.value)=(yyvsp[(2) - (2)].value); + (yyval.value).c = (yyvsp[(2) - (2)].value).c; if(IS_INT((yyvsp[(2) - (2)].value).t)) { (yyval.value).c=abc_negate_i((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -7405,11 +7422,11 @@ PASS2 - case 273: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3375 "parser.y" +#line 3417 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7423,11 +7440,11 @@ PASS2 - case 274: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3384 "parser.y" +#line 3426 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7439,33 +7456,33 @@ PASS2 - case 275: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3391 "parser.y" +#line 3433 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 276: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3392 "parser.y" +#line 3434 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 277: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3394 "parser.y" +#line 3436 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7477,11 +7494,11 @@ PASS2 - case 278: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3400 "parser.y" +#line 3442 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; @@ -7493,11 +7510,11 @@ PASS2 - case 279: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3409 "parser.y" +#line 3451 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7509,11 +7526,11 @@ PASS2 - case 280: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3416 "parser.y" +#line 3458 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7522,7 +7539,7 @@ PASS2 c=abc_multiply(c); } c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '*'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7530,15 +7547,15 @@ PASS2 - case 281: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3428 "parser.y" +#line 3470 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7546,15 +7563,15 @@ PASS2 - case 282: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3434 "parser.y" +#line 3476 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7562,15 +7579,15 @@ PASS2 - case 283: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3440 "parser.y" +#line 3482 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7578,15 +7595,15 @@ PASS2 - case 284: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3446 "parser.y" +#line 3488 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7594,15 +7611,15 @@ PASS2 - case 285: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3452 "parser.y" +#line 3494 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7610,15 +7627,15 @@ PASS2 - case 286: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3458 "parser.y" +#line 3500 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7626,15 +7643,15 @@ PASS2 - case 287: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3464 "parser.y" +#line 3506 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7642,11 +7659,11 @@ PASS2 - case 288: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3470 "parser.y" +#line 3512 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7657,7 +7674,7 @@ PASS2 c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '+'), (yyvsp[(1) - (3)].value).t); } - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7665,11 +7682,11 @@ PASS2 - case 289: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3483 "parser.y" +#line 3525 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7678,7 +7695,7 @@ PASS2 c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '-'), (yyvsp[(1) - (3)].value).t); } - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7686,15 +7703,15 @@ PASS2 - case 290: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3494 "parser.y" +#line 3536 "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); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0); + (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0, 1); (yyval.value).t = (yyvsp[(1) - (3)].value).t; } } @@ -7702,11 +7719,11 @@ PASS2 - case 291: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3501 "parser.y" +#line 3543 "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; @@ -7724,11 +7741,11 @@ PASS2 - case 292: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3514 "parser.y" +#line 3556 "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))) { @@ -7750,7 +7767,7 @@ PASS2 type = TYPE_NUMBER; } c=converttype(c, type, (yyvsp[(1) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1); + (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1, 1); (yyval.value).t = (yyvsp[(1) - (2)].value).t; } } @@ -7759,11 +7776,11 @@ PASS2 - case 293: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3541 "parser.y" +#line 3583 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7774,7 +7791,7 @@ PASS2 type = TYPE_NUMBER; } c=converttype(c, type, (yyvsp[(1) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1); + (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1, 1); (yyval.value).t = (yyvsp[(1) - (2)].value).t; } } @@ -7782,11 +7799,11 @@ PASS2 - case 294: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3555 "parser.y" +#line 3597 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7797,7 +7814,7 @@ PASS2 type = TYPE_NUMBER; } c=converttype(c, type, (yyvsp[(2) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(2) - (2)].value).t; } } @@ -7805,11 +7822,11 @@ PASS2 - case 295: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3569 "parser.y" +#line 3611 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7820,7 +7837,7 @@ PASS2 type = TYPE_NUMBER; } c=converttype(c, type, (yyvsp[(2) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0); + (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0, 1); (yyval.value).t = (yyvsp[(2) - (2)].value).t; } } @@ -7828,17 +7845,17 @@ PASS2 - case 296: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3584 "parser.y" +#line 3626 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; @@ -7851,11 +7868,11 @@ PASS2 - case 297: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3598 "parser.y" +#line 3640 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7867,11 +7884,11 @@ PASS2 - case 298: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3605 "parser.y" +#line 3647 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7883,11 +7900,11 @@ PASS2 - case 299: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3612 "parser.y" +#line 3654 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7899,11 +7916,11 @@ PASS2 - case 300: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3619 "parser.y" +#line 3661 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7915,11 +7932,11 @@ PASS2 - case 301: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3626 "parser.y" +#line 3668 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7931,11 +7948,11 @@ PASS2 - case 302: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3637 "parser.y" +#line 3683 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; @@ -7948,13 +7965,17 @@ PASS2 if(t->subtype==INFOTYPE_UNRESOLVED) { syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); } - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); char noslot = 0; if(f && !is_static != !(f->flags&FLAG_STATIC)) noslot=1; 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); } @@ -7965,20 +7986,23 @@ PASS2 } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); - if(dict_contains(state->import_toplevel_packages, package2)) { + + 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 { - slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); - if(!a) - syntaxerror("couldn't resolve %s", package2); - (yyval.value) = push_class(a); + 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); @@ -7990,11 +8014,11 @@ PASS2 - case 303: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3687 "parser.y" +#line 3740 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -8008,7 +8032,7 @@ PASS2 unknown_variable((yyvsp[(1) - (1)].id)); } - /* let the compiler know that it might check the current directory/package + /* 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 @@ -8036,8 +8060,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_nsset(state->cls->info, state->active_namespaces, (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); @@ -8053,7 +8080,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); @@ -8063,7 +8090,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); @@ -8078,7 +8105,8 @@ PASS2 } /* look through package prefixes */ - if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) { + 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; @@ -8102,16 +8130,16 @@ PASS2 - case 304: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3792 "parser.y" +#line 3849 "parser.y" { PASS12 NEW(namespace_decl_t,n); n->name = (yyvsp[(2) - (2)].id); - n->url = 0; + n->url = (yyvsp[(2) - (2)].id); (yyval.namespace_decl)=n; } } @@ -8119,11 +8147,11 @@ PASS2 - case 305: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3799 "parser.y" +#line 3856 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8136,11 +8164,11 @@ PASS2 - case 306: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3806 "parser.y" +#line 3863 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8153,15 +8181,23 @@ PASS2 - case 307: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3813 "parser.y" +#line 3870 "parser.y" { PASS12 - list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl)); - tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name); + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + (yyval.code)=0; } } @@ -8169,20 +8205,30 @@ PASS2 - case 308: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3820 "parser.y" +#line 3894 "parser.y" { PASS12 - NEW(namespace_decl_t,n); - n->name = (yyvsp[(3) - (3)].classinfo)->name; - n->url = 0; - /* FIXME: for pass2, we should now try to figure out what the URL of - this thing is */ - list_append(state->new_namespaces, n); - tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); + 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; } } @@ -8192,7 +8238,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 8196 "parser.tab.c" +#line 8242 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);