X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=cfbdb48a18cdd89a144e9039518deb8f31a4d0bd;hb=62a83d162b254d91da418cee25f5b87b067a3f92;hp=d2960e507845ce540c69eeb575de9371b7894a8a;hpb=f5d494794ee290c1a0f1dc4d4b2156b04c9a5a97;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index d2960e5..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,9 +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; - dict_t*namespace2url; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -451,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); @@ -466,29 +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; - state->namespace2url = 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) @@ -512,25 +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(leaving->namespace2url) - dict_destroy(leaving->namespace2url); - if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -539,7 +538,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -554,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); @@ -605,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; @@ -673,11 +644,32 @@ 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() { @@ -716,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; @@ -760,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(); @@ -768,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; } @@ -795,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) { @@ -822,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; @@ -840,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(); } @@ -873,10 +874,11 @@ static namespace_t modifiers2access(modifiers_t*mod) syntaxerror("invalid combination of access levels and namespaces"); ns.access = ACCESS_NAMESPACE; state_t*s = state; - const char*url = (const char*)dict_lookup(state->namespace2url, mod->ns); + 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; @@ -899,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) { @@ -925,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; @@ -946,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; } } } @@ -1129,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) { @@ -1187,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); @@ -1195,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 @@ -1257,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); @@ -1500,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(mod->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; @@ -1553,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) { @@ -1585,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(); @@ -1608,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) @@ -1625,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) { @@ -1654,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) { @@ -1789,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: @@ -1907,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 @@ -1941,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(); @@ -1949,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; @@ -1974,19 +1967,6 @@ char is_break_or_jump(code_t*c) return 0; } -void register_namespace(const char*name, const char*url) -{ - NEW(namespace_decl_t,n); - n->name = name; - n->url = url; - if(!state->namespace2url) { - state->namespace2url = dict_new(); - } - dict_put(state->namespace2url, name, url); - list_append(state->new_namespaces, n); - tokenizer_register_namespace(name); -} - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -2105,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 2115 "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 @@ -2324,22 +2374,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 147 +#define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3001 +#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 309 +#define YYNRULES 299 /* YYNRULES -- Number of states. */ -#define YYNSTATES 521 +#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) @@ -2350,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, @@ -2382,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 @@ -2414,147 +2464,143 @@ static const yytype_uint16 yyprhs[] = 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, 608, 611, 613, 615, 619, 621, 623, 625, 627, 629, - 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, - 651, 653, 655, 659, 663, 667, 671, 675, 679, 683, - 687, 691, 695, 698, 701, 705, 709, 713, 717, 721, - 725, 729, 733, 737, 741, 745, 749, 753, 757, 761, - 766, 769, 771, 775, 778, 783, 787, 788, 790, 794, - 800, 804, 808, 812, 816, 820, 824, 828, 832, 836, - 840, 844, 848, 854, 857, 860, 863, 866, 870, 873, - 878, 884, 888, 894, 898, 900, 903, 908, 913, 916 + 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, 4, -1, 185, - 127, 184, -1, 184, -1, -1, 19, 185, 126, 187, - 139, 132, -1, -1, 19, 126, 188, 139, 132, -1, - 41, 223, -1, 41, 185, 127, 115, -1, -1, 191, - -1, 192, -1, 191, 192, -1, 21, -1, 22, -1, - 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, - 26, -1, 24, -1, 4, -1, -1, 54, 224, -1, - -1, 54, 225, -1, -1, 17, 225, -1, -1, 190, - 31, 3, 193, 195, 126, 197, 200, 132, -1, -1, - 190, 44, 3, 194, 126, 199, 203, 132, -1, -1, - 201, -1, 202, -1, 201, 202, -1, 99, -1, 148, - 126, 200, 132, -1, 207, -1, 217, -1, 144, -1, - -1, 204, -1, 205, -1, 204, 205, -1, 99, -1, - 46, 3, -1, 190, 27, 216, 3, 122, 213, 133, - 227, -1, 46, -1, 32, -1, -1, 190, 206, 208, - 209, -1, 210, -1, 209, 100, 210, -1, 3, 227, - 149, -1, -1, 102, 212, -1, 10, -1, 8, -1, - 9, -1, 12, -1, 5, -1, 56, -1, 55, -1, - 45, -1, 3, -1, -1, 214, -1, 93, 215, -1, - 214, 100, 93, 215, -1, 214, 100, 215, -1, 215, - -1, 3, 105, 226, 211, -1, 3, 211, -1, 51, - -1, 35, -1, -1, -1, 190, 27, 216, 3, 122, - 213, 133, 227, 126, 218, 142, 132, -1, 3, -1, - -1, -1, 27, 219, 122, 213, 133, 227, 126, 221, - 142, 132, -1, 184, -1, 185, 127, 184, -1, 223, - -1, 222, -1, 224, -1, 225, 100, 224, -1, 224, - -1, 115, -1, 36, -1, 105, 226, -1, -1, -1, - 122, 229, 133, -1, -1, 230, -1, 231, -1, 237, - -1, 230, 100, -1, 231, 237, -1, -1, 25, 240, - 232, 228, -1, 240, 122, 229, 133, -1, 53, 122, - 229, 133, -1, 63, 240, -1, 42, -1, 42, 238, - -1, 240, -1, 240, -1, 238, 100, 240, -1, 238, - -1, 220, -1, 241, -1, 244, -1, 233, -1, 235, - -1, 234, -1, 6, -1, 10, -1, 11, -1, 8, - -1, 9, -1, 12, -1, 5, -1, 29, -1, 56, - -1, 55, -1, 45, -1, 240, 109, 240, -1, 240, - 110, 240, -1, 240, 75, 240, -1, 240, 76, 240, - -1, 240, 71, 240, -1, 240, 72, 240, -1, 240, - 74, 240, -1, 240, 73, 240, -1, 240, 87, 240, - -1, 240, 88, 240, -1, 118, 240, -1, 117, 240, - -1, 240, 108, 240, -1, 240, 107, 240, -1, 240, - 106, 240, -1, 240, 96, 240, -1, 240, 95, 240, - -1, 240, 94, 240, -1, 240, 114, 240, -1, 240, - 116, 240, -1, 240, 113, 240, -1, 240, 112, 240, - -1, 240, 115, 240, -1, 240, 68, 240, -1, 240, - 69, 240, -1, 240, 40, 240, -1, 240, 67, 240, - -1, 43, 122, 240, 133, -1, 36, 240, -1, 36, - -1, 122, 238, 133, -1, 112, 240, -1, 240, 124, - 240, 125, -1, 124, 229, 125, -1, -1, 243, -1, - 237, 105, 237, -1, 243, 100, 237, 105, 237, -1, - 70, 242, 132, -1, 240, 80, 240, -1, 240, 79, - 240, -1, 240, 85, 240, -1, 240, 84, 240, -1, - 240, 86, 240, -1, 240, 78, 240, -1, 240, 77, - 240, -1, 240, 83, 240, -1, 240, 81, 240, -1, - 240, 82, 240, -1, 240, 102, 240, -1, 240, 104, - 240, 105, 240, -1, 240, 91, -1, 240, 90, -1, - 91, 240, -1, 90, 240, -1, 53, 127, 3, -1, - 128, 3, -1, 240, 127, 128, 3, -1, 240, 127, - 3, 89, 3, -1, 240, 92, 3, -1, 240, 127, - 122, 240, 133, -1, 240, 127, 3, -1, 3, -1, - 18, 3, -1, 18, 3, 102, 3, -1, 18, 3, - 102, 5, -1, 190, 245, -1, 23, 18, 224, -1 + 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, 2093, 2093, 2095, 2095, 2096, 2097, 2099, 2100, 2101, - 2102, 2103, 2104, 2105, 2106, 2108, 2108, 2109, 2110, 2112, - 2113, 2114, 2115, 2116, 2117, 2118, 2120, 2121, 2123, 2124, - 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, - 2137, 2138, 2139, 2140, 2143, 2144, 2145, 2146, 2147, 2148, - 2149, 2150, 2154, 2155, 2159, 2166, 2170, 2171, 2175, 2176, - 2178, 2179, 2181, 2242, 2243, 2246, 2246, 2265, 2266, 2267, - 2272, 2276, 2281, 2282, 2284, 2304, 2352, 2352, 2371, 2371, - 2386, 2389, 2392, 2395, 2399, 2400, 2401, 2402, 2403, 2404, - 2406, 2417, 2420, 2420, 2451, 2451, 2476, 2476, 2492, 2493, - 2494, 2495, 2503, 2512, 2512, 2561, 2565, 2576, 2586, 2603, - 2604, 2605, 2607, 2608, 2610, 2610, 2612, 2612, 2615, 2631, - 2648, 2649, 2650, 2651, 2659, 2660, 2661, 2662, 2663, 2664, - 2665, 2666, 2667, 2668, 2672, 2673, 2675, 2676, 2678, 2679, - 2683, 2681, 2689, 2687, 2696, 2697, 2698, 2699, 2700, 2701, - 2702, 2703, 2705, 2711, 2712, 2713, 2714, 2715, 2716, 2719, - 2732, 2732, 2734, 2734, 2736, 2737, 2739, 2814, 2815, 2817, - 2818, 2819, 2820, 2821, 2823, 2824, 2825, 2826, 2838, 2842, - 2848, 2854, 2862, 2867, 2873, 2881, 2889, 2890, 2891, 2894, - 2893, 2910, 2911, 2913, 2912, 2936, 2955, 2969, 2970, 2972, - 2973, 2975, 2976, 2977, 2986, 2987, 2991, 2992, 2994, 2995, - 2996, 2998, 3002, 3003, 3008, 3009, 3045, 3091, 3112, 3133, - 3136, 3143, 3144, 3145, 3151, 3157, 3159, 3161, 3163, 3165, - 3167, 3169, 3186, 3191, 3194, 3197, 3200, 3203, 3206, 3209, - 3212, 3215, 3219, 3222, 3225, 3228, 3231, 3234, 3237, 3240, - 3244, 3255, 3273, 3278, 3283, 3288, 3293, 3298, 3302, 3306, - 3311, 3315, 3319, 3328, 3337, 3347, 3352, 3364, 3370, 3375, - 3381, 3387, 3391, 3393, 3404, 3413, 3420, 3421, 3423, 3429, - 3438, 3445, 3457, 3463, 3469, 3475, 3481, 3487, 3493, 3499, - 3512, 3523, 3530, 3543, 3570, 3584, 3598, 3612, 3627, 3634, - 3641, 3648, 3655, 3666, 3716, 3821, 3828, 3835, 3842, 3857 + 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 @@ -2564,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\"", @@ -2602,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 @@ -2628,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, 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. */ @@ -2698,7 +2743,6 @@ static const yytype_uint8 yyr2[] = 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, @@ -2713,50 +2757,49 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 120, 304, 133, 237, 231, 234, 235, 232, 233, 236, - 0, 0, 78, 0, 0, 126, 124, 125, 0, 132, - 0, 131, 192, 238, 271, 127, 0, 0, 0, 241, - 128, 130, 129, 0, 0, 240, 239, 0, 0, 276, - 0, 0, 14, 0, 0, 0, 0, 208, 120, 0, - 0, 2, 120, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 120, 37, 7, 30, 0, - 121, 122, 9, 8, 11, 10, 225, 228, 230, 229, - 224, 39, 222, 226, 227, 41, 40, 0, 0, 72, - 76, 120, 92, 109, 111, 110, 116, 113, 0, 0, - 304, 214, 191, 0, 270, 0, 0, 118, 0, 103, - 208, 0, 218, 65, 0, 221, 0, 277, 296, 295, - 273, 253, 252, 0, 0, 209, 210, 211, 82, 0, - 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, - 46, 47, 48, 50, 0, 49, 298, 1, 6, 120, - 304, 0, 68, 0, 0, 69, 53, 108, 0, 188, - 0, 161, 0, 160, 162, 308, 123, 0, 0, 0, + 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, 0, - 294, 293, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 208, 0, - 0, 55, 73, 0, 0, 0, 120, 114, 0, 195, - 0, 198, 197, 309, 206, 178, 0, 0, 0, 27, - 0, 297, 0, 0, 280, 0, 272, 275, 212, 213, - 83, 205, 59, 60, 105, 220, 58, 81, 42, 28, - 120, 0, 205, 0, 0, 52, 305, 187, 186, 0, - 134, 136, 0, 223, 267, 268, 265, 266, 246, 247, - 249, 248, 244, 245, 287, 286, 282, 281, 289, 290, - 288, 284, 283, 285, 250, 251, 301, 259, 258, 257, - 291, 0, 256, 255, 254, 242, 243, 263, 262, 260, - 264, 261, 0, 0, 303, 0, 0, 0, 0, 0, - 25, 0, 120, 17, 23, 0, 20, 19, 22, 21, - 120, 112, 0, 208, 215, 167, 0, 0, 179, 183, - 107, 119, 196, 269, 0, 26, 217, 0, 278, 0, - 0, 57, 0, 120, 13, 57, 0, 0, 0, 0, - 0, 138, 0, 0, 205, 163, 164, 0, 216, 274, - 0, 0, 299, 120, 0, 0, 117, 18, 120, 0, - 0, 0, 0, 185, 180, 205, 0, 0, 120, 0, - 203, 202, 201, 204, 0, 62, 61, 51, 0, 120, - 306, 307, 178, 135, 0, 0, 199, 137, 142, 57, - 0, 292, 300, 302, 77, 0, 84, 0, 115, 207, - 177, 173, 170, 171, 169, 172, 176, 175, 174, 168, + 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, 279, 56, 0, 75, 0, 139, 140, 0, 120, + 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, @@ -2771,95 +2814,94 @@ static const yytype_uint16 yydefact[] = /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 311, 312, 313, 334, 335, - 137, 138, 157, 314, 139, 385, 140, 246, 243, 458, - 57, 232, 153, 154, 58, 59, 60, 61, 213, 62, - 91, 141, 142, 445, 446, 447, 448, 63, 215, 426, - 510, 427, 475, 428, 429, 64, 229, 143, 65, 66, - 219, 220, 67, 320, 216, 68, 144, 70, 71, 351, - 353, 395, 316, 461, 317, 439, 484, 485, 486, 466, - 467, 468, 164, 318, 262, 355, 356, 373, 419, 327, - 328, 329, 259, 319, 507, 103, 76, 474, 221, 222, - 382, 397, 383, 341, 324, 124, 125, 126, 224, 77, - 78, 79, 145, 127, 80, 81, 82, 83, 116, 117, - 84, 165, 85, 86 + -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, 115, 116, 83, + 164, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -403 +#define YYPACT_NINF -423 static const yytype_int16 yypact[] = { - 1674, -70, -403, -403, -403, -403, -403, -403, -403, -403, - -15, -72, -403, -52, 19, -403, -403, -403, 80, -403, - 2094, -403, 99, -403, 2164, -403, -16, 42, -5, -403, - -403, -403, -403, -1, 5, -403, -403, 2094, 13, 2094, - 2094, 2094, -403, 2094, 2094, 2094, 2094, 2094, 634, 123, - 128, -403, 504, -403, -403, -403, 8, -403, 2024, -403, - -403, -403, -403, -403, -403, 1926, -403, -403, -403, 240, - 361, -403, -403, -403, -403, -403, -403, -403, -403, -403, - 38, -403, 2569, -403, -403, -403, -403, 137, 20, -403, - -403, 1926, -403, -403, -403, -403, -403, -403, -87, 42, - -403, -67, -403, 21, -48, 2094, 79, -403, 2094, -403, - 2094, 138, -48, -403, 43, 2569, 76, 107, -48, -48, - 604, -48, -48, -29, 84, 110, 2094, -403, 210, 211, - 2094, 2094, 211, 212, -403, -403, 764, -403, -403, 85, - -403, -403, -403, -403, 209, -403, -403, -403, -403, 1024, - 158, 232, -403, 139, 171, -403, 141, -403, 238, 12, - 239, -403, 247, -403, -403, -403, -403, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - -403, -403, 249, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 11, -403, -403, 2094, 229, 2094, 1154, -403, 42, 133, - 135, -403, -403, -403, 142, 15, -10, 90, 2189, 1800, - 130, -403, 2094, 2094, -403, 2094, -403, -403, -403, -403, - -403, 161, 169, -403, 38, 38, 169, -403, -403, -403, - 1926, 149, 161, 2094, 2094, -403, 168, -403, -403, 280, - 231, 233, 286, 2569, 1016, 496, 496, 496, 322, 322, - 322, 322, 1016, 1016, 2569, 2569, 2569, 2569, 2569, 2569, - 2569, 2569, 2569, 2569, 2630, 2691, -403, 368, 368, 368, - 2569, 2386, 2752, 2813, 2874, 1016, 1016, 604, 604, -48, - -48, -48, 157, 2447, 202, 2094, 291, 14, 173, 2260, - -403, 165, 1284, -403, -403, 172, -403, -403, -403, -403, - 1154, -403, 42, 2094, -403, -43, 296, 167, 201, -403, - -403, -403, 175, -403, 174, 1800, -403, 44, -403, 200, - 63, 207, 211, 894, -403, -27, -11, 46, 113, 189, - 42, 298, 42, 190, 161, 217, -403, 2094, -403, -403, - 315, 2323, -403, 1926, 2094, 193, -403, -403, 1154, 192, - 194, 75, 63, -403, -403, 161, 26, 96, 1926, 2094, - -403, -403, -403, -403, 2094, -403, -403, -403, 2094, 1926, - -403, -403, 15, -403, 42, 199, -403, 230, -403, 207, - 286, 2569, -403, -403, -403, 103, 24, 197, -403, -403, - -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, - 234, 205, 296, -403, 206, 213, -403, -403, 96, -403, - 268, -403, -403, 204, -403, 215, 230, -403, 42, 208, - -403, -403, -403, 2094, 236, 214, 24, -403, -403, -403, - -403, -403, -403, -403, 335, -403, -403, 1926, -403, 1926, - 161, 1414, -403, 339, -403, 316, 219, 227, -403, 2508, - 1800, -403, -403, -403, 1800, 1800, 161, -403, -403, 223, - -403, -403, 226, 250, 221, 1544, -403, -403, -403, -403, - 12, -403, -403, 1800, -403, 222, 224, 225, -403, 1414, - -403, -403, 354, -403, -403, -403, -403, 1800, 228, 241, - 235, 243, -403, 15, 1800, -403, 244, 246, 161, -403, - -403 + 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[] = { - -403, -403, 218, -403, 312, -299, -403, 61, -402, -31, - 1, -55, -85, 48, 2, -23, 321, 251, 58, -403, - -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, - -403, -403, -403, -403, -403, -62, -60, -403, -403, -40, - -403, -36, -403, -403, -403, -403, -403, -403, -403, -403, - 6, 50, -403, -403, -403, -403, 0, -403, 331, -403, - -403, -403, 49, -403, 51, -403, -96, -403, -80, -403, - -403, -61, -403, 3, -403, -403, 7, 9, -403, -376, - -403, -311, -79, 4, -403, -403, -403, -403, -403, 388, - -91, 25, 52, -239, -403, -98, -403, -403, -403, -403, - -403, -403, -403, -34, -9, -49, -13, -403, -403, -403, - -403, -403, -403, -403 + -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 @@ -2869,612 +2911,622 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 69, 54, 56, 74, 75, 114, 214, 101, 223, 155, - 156, 104, 230, 345, 304, 374, 435, 136, 325, 87, - 97, 369, 93, 94, 112, 192, 115, 118, 119, 325, - 120, 121, 122, 97, 115, 88, 156, 123, 95, 217, - 218, -70, 190, 191, 192, 93, 94, 257, 55, 72, - 90, 73, 69, 54, 56, 74, 75, 209, 443, 371, - 210, 95, 372, 258, 98, 423, 93, 94, 494, 407, - 92, 167, 495, 496, 208, 384, 209, 106, 410, 210, - 411, 249, 95, 412, 413, 414, 444, 415, 388, 167, - 167, 503, 239, 93, 94, 228, 226, 115, 99, 380, - 55, 72, 102, 73, 236, 511, 105, 89, 326, 95, - 302, 452, 517, 115, 167, 399, 390, 108, 391, 422, - 416, 244, 245, 330, 424, 109, 146, 110, 147, 425, - 417, 418, 111, 305, 149, 113, 421, 516, 167, 306, - 211, 231, 212, 225, 167, 96, 167, 363, 233, 69, - 54, 56, 74, 75, 263, 264, 265, 266, 267, 268, + 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, 285, 378, 381, 389, + 279, 280, 281, 282, 283, 284, 54, 210, 330, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 301, 115, 303, 55, 72, 338, - 73, 339, 309, 167, 307, 331, 227, 235, 234, 237, - 238, 250, 2, 240, 241, 247, 69, 54, 315, 343, - 115, 479, 115, 337, 321, 370, -71, 158, 15, 16, - 17, 2, 19, 332, 21, 252, 442, 497, 253, 254, - 255, 256, 260, 308, 346, 347, 25, 15, 16, 17, - 261, 19, 286, 21, 463, 30, 31, 32, 158, 393, - -113, 396, 322, 336, 323, 25, 340, 159, 158, 342, - 348, 160, 161, 463, 30, 31, 32, 159, 404, 520, - 249, 344, 161, 349, 162, 350, 163, 352, 249, 354, - 358, 360, 361, 430, 362, 364, 163, 366, 368, 325, - 375, 376, -112, 396, 434, 379, 377, 464, 156, 384, - 115, 392, 69, 54, 315, 394, 398, 400, 402, 406, - 69, 54, 315, 156, 408, 437, 464, 409, 332, 449, - 438, 451, 453, 457, 156, 454, 371, 459, 476, 433, - -153, 470, 489, 490, 401, 431, 471, 462, 460, 498, - 432, 491, 499, 500, 504, 405, 505, 509, 506, -154, - 512, 514, 168, 513, 148, 2, 115, 251, 69, 54, - 315, 115, 477, 367, 478, 515, 440, 518, 519, 152, - 242, 15, 16, 17, 472, 19, 473, 21, 455, 169, - 170, 171, 456, -155, -155, -155, -155, 176, 177, 25, - 386, 166, 156, 508, 156, 501, 492, 441, 30, 31, - 32, 502, 190, 191, 192, 107, 193, 194, 195, 436, - 0, 0, 0, 0, 420, 0, 0, 0, 0, 450, - 469, 201, 202, 0, 203, 204, 205, 206, 207, 465, - 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, - 0, 0, 0, 0, 0, 0, 0, 0, 190, 191, - 192, 483, 481, 482, 487, 488, 0, 465, 0, 0, + 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, - 203, 204, 205, 206, 207, 483, 481, 482, 487, 488, - 208, 0, 209, 0, 0, 210, 0, 0, 0, 483, - 481, 482, 487, 488, -4, 0, 0, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 168, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, -155, -155, -155, 0, 37, 38, 0, - 0, 176, 177, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, - 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 201, 202, 0, 203, 204, - 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, - 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -4, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 190, 191, 192, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 205, 206, - 207, 0, 0, 0, 40, 41, 208, 0, 209, 0, - 0, 210, 0, 134, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, 135, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 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, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, 248, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 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, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, 387, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, -155, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, -155, -155, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, - 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 42, 0, -155, -155, 0, 203, 204, - 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, - 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -3, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -15, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 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, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -16, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -144, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 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, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, -3, 0, -145, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 1, 2, 3, 4, 0, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 0, -120, 0, - 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, - 128, 0, 129, 0, 0, 0, 24, 130, 25, 26, - 0, 27, 131, 28, 0, 29, 132, 30, 31, 32, - 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, - 0, 0, 0, 37, 38, 0, 133, 0, 0, 0, - 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 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, - 40, 41, 0, 0, 0, 0, 0, 0, 0, 134, + 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, 43, 0, 0, 0, 0, 44, 45, 0, - 0, 0, 46, 0, 47, 0, 48, 0, 49, 1, + 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, 12, 13, 0, 0, 0, 15, 16, 17, 18, - 19, 20, 21, 22, 0, 23, 128, 0, 129, 0, - 0, 0, 24, 130, 25, 26, 0, 27, 131, 28, - 0, 29, 132, 30, 31, 32, 0, 0, 33, 34, - 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 133, 0, 0, 0, 39, 0, 0, 0, + 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, 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, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, - 0, 0, 0, 0, 0, 134, 0, 150, 0, 3, - 4, 0, 5, 6, 7, 8, 9, 0, 43, 0, - 0, 0, 0, 44, 45, 0, 0, 0, 46, 20, - 47, 22, 48, 23, 49, 0, 129, 0, 0, 0, - 24, 0, 0, 0, 0, 0, 0, 28, 0, 29, - 151, 0, 0, 0, 0, 0, 0, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 0, 0, - 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, - 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, - 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 0, 0, 0, 0, 43, 28, 0, 29, - 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, - 36, 0, 49, 0, 0, 0, 0, 37, 0, 0, - 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, - 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, - 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 29, - 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, - 36, 0, 49, 0, 0, 0, 0, 0, 0, 168, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 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, 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, 40, 41, 169, 170, 171, 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, 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, 189, 0, 190, - 191, 192, 0, 193, 194, 195, 46, 0, 47, 0, - 0, 196, 49, 197, 0, 198, 199, 200, 201, 202, - 168, 203, 204, 205, 206, 207, 0, 0, 0, 0, - 0, 208, 0, 209, 0, 0, 210, 0, 0, 0, - 0, 0, 333, 0, 0, 0, 0, 169, 170, 171, - 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 0, - 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, - 0, 0, 196, 168, 197, 0, 198, 199, 200, 201, - 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, - 0, 0, 208, 0, 209, 0, 0, 210, 0, 0, - 169, 170, 171, 365, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 0, 190, 191, 192, 0, 193, 194, 195, - 0, 0, 0, 0, 0, 196, 168, 197, 0, 198, - 199, 200, 201, 202, 0, 203, 204, 205, 206, 207, - 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, - 210, 0, 0, 169, 170, 171, 403, 172, 173, 174, + 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, + 191, 0, 192, 193, 194, 0, 0, 0, 0, 0, + 195, 167, 196, 0, 197, 198, 199, 200, 201, 0, + 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, + 207, 0, 208, 0, 0, 209, 0, 0, 168, 169, + 170, 364, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, + 0, 0, 0, 195, 167, 196, 0, 197, 198, 199, + 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, + 0, 0, 0, 207, 0, 208, 0, 0, 209, 0, + 0, 168, 169, 170, 402, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, + 194, 0, 0, 0, 0, 167, 195, 0, 196, 356, + 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, + 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, + 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 0, 190, 191, 192, 0, - 193, 194, 195, 0, 0, 0, 0, 168, 196, 0, - 197, 357, 198, 199, 200, 201, 202, 0, 203, 204, - 205, 206, 207, 0, 0, 0, 0, 0, 208, 0, - 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, + 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, + 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, + 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, + 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, + 358, 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 0, 190, 191, 192, - 0, 193, 194, 195, 0, 0, 0, 0, 168, 196, - 0, 197, 0, 198, 199, 200, 201, 202, 0, 203, - 204, 205, 206, 207, 0, 0, 0, 0, 0, 208, - 0, 209, 359, 0, 210, 169, 170, 171, 0, 172, + 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, + 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, + 196, 483, 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, 189, 0, 190, 191, - 192, 0, 193, 194, 195, 0, 0, 0, 0, 168, - 196, 0, 197, 493, 198, 199, 200, 201, 202, 0, - 203, 204, 205, 206, 207, 0, 0, 0, 0, 0, - 208, 0, 209, 0, 0, 210, 169, 170, 171, 0, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, - 191, 192, 0, 193, 194, 195, 0, 0, 0, 0, - 168, 196, 0, 197, 0, 198, 199, 200, 201, 202, - 0, 203, 204, 205, 206, 207, 0, 0, 0, 0, - 0, 208, 0, 209, 0, 0, 210, 169, 170, 171, - 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, - 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, - 0, 168, 0, 0, 0, 0, 198, 199, 200, 201, - 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, - 0, 0, 208, 0, 209, 0, 0, 210, 169, 170, - 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, + 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, + 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, + 0, 196, 0, 197, 198, 199, 200, 201, 0, 202, + 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, + 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, + 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 188, 0, 189, 190, + 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, + 0, 0, 0, 0, 197, 198, 199, 200, 201, 0, + 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, + 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, + 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, + 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, + 167, 0, 0, 0, 0, 197, 198, 199, 200, 201, + 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, + 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, + 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 190, 191, 192, 0, 193, 194, 195, 0, 0, - 0, 0, 168, 0, 0, 0, 0, 198, 199, 200, - 201, 202, 0, 203, 204, 205, 206, 207, 0, 0, - 0, 0, 0, 208, 0, 209, 0, 0, 210, 169, - 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, + 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, + 0, 167, 0, 0, 0, 0, 0, 198, 199, 200, + 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, + 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, + 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 190, 191, 192, 0, 193, 194, 195, 0, - 0, 0, 0, 168, 0, 0, 0, 0, 0, 199, - 200, 201, 202, 0, 203, 204, 205, 206, 207, 0, - 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, - 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, + 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, + 0, 0, 167, 0, 0, 0, 0, 0, 0, 199, + 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, + 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, + 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 190, 191, 192, 0, 193, 194, 195, - 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, - 0, 200, 201, 202, 0, 203, 204, 205, 206, 207, - 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, - 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, - 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 190, 191, 192, 0, 193, 194, - 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -155, 201, 202, 0, 203, 204, 205, 206, - 207, 0, 0, 0, 0, 0, 208, 0, 209, 0, - 0, 210 + 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, + 0, 0, 0, 167, 0, 0, 0, 0, 0, 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, -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, 0, 0, 0, 0, 0, 0, + 0, 0, 200, 201, 0, 202, 203, 204, 205, 206, + 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, + 209 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 39, 91, 20, 99, 58, - 65, 24, 110, 252, 3, 326, 392, 48, 3, 89, - 14, 320, 3, 4, 37, 92, 39, 40, 41, 3, - 43, 44, 45, 27, 47, 50, 91, 46, 19, 126, - 127, 68, 90, 91, 92, 3, 4, 35, 0, 0, - 122, 0, 52, 52, 52, 52, 52, 124, 34, 102, - 127, 19, 105, 51, 14, 376, 3, 4, 470, 368, - 122, 100, 474, 475, 122, 102, 124, 27, 3, 127, - 5, 136, 19, 8, 9, 10, 62, 12, 99, 100, - 100, 493, 126, 3, 4, 108, 105, 110, 18, 36, - 52, 52, 3, 52, 133, 507, 122, 122, 93, 19, - 208, 422, 514, 126, 100, 354, 3, 122, 5, 93, - 45, 130, 131, 133, 28, 126, 3, 122, 0, 33, - 55, 56, 127, 122, 126, 122, 375, 513, 100, 128, - 3, 3, 122, 122, 100, 126, 100, 133, 105, 149, - 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 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, 189, 133, 115, 133, + 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, 209, 149, 149, 233, - 149, 235, 215, 100, 213, 115, 127, 100, 132, 125, - 100, 126, 4, 3, 3, 3, 216, 216, 216, 250, - 233, 460, 235, 232, 218, 323, 68, 18, 20, 21, - 22, 4, 24, 227, 26, 3, 133, 476, 99, 68, - 99, 3, 3, 14, 253, 254, 38, 20, 21, 22, - 3, 24, 3, 26, 46, 47, 48, 49, 18, 350, - 127, 352, 127, 133, 122, 38, 105, 27, 18, 100, - 102, 31, 32, 46, 47, 48, 49, 27, 363, 518, - 335, 132, 32, 3, 44, 54, 46, 54, 343, 3, - 133, 89, 305, 378, 3, 122, 46, 132, 126, 3, - 133, 100, 127, 394, 389, 105, 132, 99, 363, 102, - 323, 122, 312, 312, 312, 17, 126, 100, 3, 126, - 320, 320, 320, 378, 132, 126, 99, 133, 322, 132, - 100, 126, 126, 65, 389, 122, 102, 133, 3, 388, - 132, 105, 3, 27, 357, 379, 132, 438, 133, 126, - 384, 132, 126, 132, 132, 364, 132, 3, 133, 132, - 132, 126, 40, 122, 52, 4, 379, 149, 368, 368, - 368, 384, 457, 312, 459, 132, 399, 133, 132, 58, - 129, 20, 21, 22, 446, 24, 446, 26, 428, 67, - 68, 69, 428, 71, 72, 73, 74, 75, 76, 38, - 342, 70, 457, 499, 459, 485, 467, 400, 47, 48, - 49, 490, 90, 91, 92, 27, 94, 95, 96, 394, - -1, -1, -1, -1, 372, -1, -1, -1, -1, 420, - 443, 109, 110, -1, 112, 113, 114, 115, 116, 439, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, - 92, 461, 461, 461, 461, 461, -1, 467, -1, -1, + 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, - 112, 113, 114, 115, 116, 485, 485, 485, 485, 485, - 122, -1, 124, -1, -1, 127, -1, -1, -1, 499, - 499, 499, 499, 499, 0, -1, -1, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, 67, 68, 69, -1, 63, 64, -1, - -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, - 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, - 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, - 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, 90, 91, 92, 63, 64, -1, - 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 114, 115, - 116, -1, -1, -1, 90, 91, 122, -1, 124, -1, - -1, 127, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, - 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, - 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, 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, 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, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, - 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + 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, 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, 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, 0, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 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, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, 3, 4, 5, 6, -1, 8, 9, - 10, 11, 12, 13, 14, 15, 16, -1, 18, -1, - 20, 21, 22, 23, 24, 25, 26, 27, -1, 29, - 30, -1, 32, -1, -1, -1, 36, 37, 38, 39, - -1, 41, 42, 43, -1, 45, 46, 47, 48, 49, - -1, -1, 52, 53, -1, 55, 56, -1, -1, -1, - -1, -1, -1, 63, 64, -1, 66, -1, -1, -1, - 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 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, - 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, + -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, 112, -1, -1, -1, -1, 117, 118, -1, - -1, -1, 122, -1, 124, -1, 126, -1, 128, 3, + -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, 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, + 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, -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, 90, 91, -1, -1, - -1, -1, -1, -1, -1, 99, -1, 3, -1, 5, - 6, -1, 8, 9, 10, 11, 12, -1, 112, -1, - -1, -1, -1, 117, 118, -1, -1, -1, 122, 25, - 124, 27, 126, 29, 128, -1, 32, -1, -1, -1, - 36, -1, -1, -1, -1, -1, -1, 43, -1, 45, - 46, -1, -1, -1, -1, -1, -1, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, -1, -1, - -1, -1, -1, -1, 70, -1, -1, 3, -1, 5, - 6, -1, 8, 9, 10, 11, 12, -1, -1, -1, - -1, -1, -1, -1, 90, 91, -1, -1, -1, 25, - -1, 27, -1, 29, -1, -1, -1, -1, -1, -1, - 36, -1, -1, -1, -1, -1, 112, 43, -1, 45, - -1, 117, 118, -1, -1, -1, 122, 53, 124, 55, - 56, -1, 128, -1, -1, -1, -1, 63, -1, -1, - -1, -1, -1, -1, 70, -1, -1, 3, -1, 5, - 6, -1, 8, 9, 10, 11, 12, -1, -1, -1, - -1, -1, -1, -1, 90, 91, -1, -1, -1, 25, - -1, 27, -1, 29, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, 45, - -1, 117, 118, -1, -1, -1, 122, 53, 124, 55, - 56, -1, 128, -1, -1, -1, -1, -1, -1, 40, - -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, 67, 68, 69, -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, -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, 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, 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, -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, 122, -1, 124, -1, - -1, 102, 128, 104, -1, 106, 107, 108, 109, 110, - 40, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, -1, -1, -1, - -1, -1, 133, -1, -1, -1, -1, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, -1, 102, 40, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, -1, -1, - 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, -1, 102, 40, 104, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, + 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, + -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, -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, 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, + 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, -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, + 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, 105, 106, 107, 108, 109, 110, -1, - 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, - 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + 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, + -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, 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, -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, 108, 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 @@ -3482,58 +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, 4, 19, 126, 184, 185, 18, - 3, 240, 3, 219, 240, 122, 185, 223, 122, 126, - 122, 127, 240, 122, 237, 240, 242, 243, 240, 240, - 240, 240, 240, 238, 229, 230, 231, 237, 30, 32, - 37, 42, 46, 66, 99, 132, 143, 144, 145, 148, - 150, 165, 166, 181, 190, 236, 3, 0, 138, 126, - 3, 46, 150, 156, 157, 239, 145, 146, 18, 27, - 31, 32, 44, 46, 206, 245, 192, 100, 40, 67, - 68, 69, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 90, 91, 92, 94, 95, 96, 102, 104, 106, 107, - 108, 109, 110, 112, 113, 114, 115, 116, 122, 124, - 127, 3, 122, 162, 146, 172, 188, 126, 127, 184, - 185, 222, 223, 224, 232, 122, 238, 127, 240, 180, - 229, 3, 155, 105, 132, 100, 133, 125, 100, 237, - 3, 3, 151, 152, 238, 238, 151, 3, 132, 145, - 126, 136, 3, 99, 68, 99, 3, 35, 51, 216, - 3, 3, 208, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 3, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 229, 240, 3, 122, 128, 238, 14, 240, - 99, 139, 140, 141, 147, 148, 196, 198, 207, 217, - 187, 184, 127, 122, 228, 3, 93, 213, 214, 215, - 133, 115, 184, 133, 142, 143, 133, 238, 237, 237, - 105, 227, 100, 143, 132, 227, 238, 238, 102, 3, - 54, 193, 54, 194, 3, 209, 210, 105, 133, 125, - 89, 240, 3, 133, 122, 133, 132, 141, 126, 139, - 229, 102, 105, 211, 215, 133, 100, 132, 133, 105, - 36, 115, 224, 226, 102, 149, 152, 132, 99, 133, - 3, 5, 122, 224, 17, 195, 224, 225, 126, 227, - 100, 240, 3, 133, 146, 238, 126, 139, 132, 133, - 3, 5, 8, 9, 10, 12, 45, 55, 56, 212, - 226, 227, 93, 215, 28, 33, 173, 175, 177, 178, - 146, 237, 237, 239, 146, 213, 225, 126, 100, 199, - 149, 210, 133, 34, 62, 167, 168, 169, 170, 132, - 211, 126, 215, 126, 122, 173, 175, 65, 153, 133, - 133, 197, 224, 46, 99, 190, 203, 204, 205, 240, - 105, 132, 169, 170, 221, 176, 3, 146, 146, 227, - 99, 144, 148, 190, 200, 201, 202, 207, 217, 3, - 27, 132, 205, 105, 142, 142, 142, 227, 126, 126, - 132, 202, 216, 142, 132, 132, 133, 218, 200, 3, - 174, 142, 132, 122, 126, 132, 213, 142, 133, 132, - 227 + 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) @@ -4345,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 2120 "parser.y" +#line 2101 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4360,7 +4433,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2121 "parser.y" +#line 2102 "parser.y" {(yyval.code)=code_new();} } break; @@ -4371,7 +4444,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2123 "parser.y" +#line 2104 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4382,7 +4455,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2124 "parser.y" +#line 2105 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4393,7 +4466,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2139 "parser.y" +#line 2120 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4404,7 +4477,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2140 "parser.y" +#line 2121 "parser.y" {(yyval.code)=0;} } break; @@ -4415,7 +4488,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2143 "parser.y" +#line 2124 "parser.y" {(yyval.code)=0;} } break; @@ -4426,8 +4499,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2150 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 2131 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4437,7 +4510,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2154 "parser.y" +#line 2135 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4448,7 +4521,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2155 "parser.y" +#line 2136 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4459,7 +4532,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2159 "parser.y" +#line 2140 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4469,11 +4542,30 @@ yyreduce: + case 55: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#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 2170 "parser.y" +#line 2166 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4484,7 +4576,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2171 "parser.y" +#line 2167 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4497,7 +4589,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2175 "parser.y" +#line 2171 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4508,7 +4600,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2176 "parser.y" +#line 2172 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4519,7 +4611,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2178 "parser.y" +#line 2174 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4530,7 +4622,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2179 "parser.y" +#line 2175 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4541,7 +4633,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2182 "parser.y" +#line 2178 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4608,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2238 "parser.y" {(yyval.code) = code_new();} } break; @@ -4619,7 +4711,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2243 "parser.y" +#line 2239 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4630,7 +4722,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" +#line 2242 "parser.y" {PASS12 new_state();} } break; @@ -4641,7 +4733,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" +#line 2242 "parser.y" { (yyval.code) = code_new(); @@ -4669,7 +4761,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2265 "parser.y" +#line 2261 "parser.y" {(yyval.code)=code_new();} } break; @@ -4680,7 +4772,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2272 "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); @@ -4694,7 +4786,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2276 "parser.y" +#line 2272 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4708,7 +4800,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2281 "parser.y" +#line 2277 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4719,7 +4811,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2282 "parser.y" +#line 2278 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4730,7 +4822,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2284 "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(); @@ -4759,7 +4851,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2304 "parser.y" +#line 2300 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4816,7 +4908,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2348 "parser.y" {PASS12 new_state();} } break; @@ -4827,7 +4919,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2348 "parser.y" { (yyval.code) = code_new(); @@ -4855,7 +4947,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2371 "parser.y" +#line 2367 "parser.y" {PASS12 new_state();} } break; @@ -4866,7 +4958,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2371 "parser.y" +#line 2367 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4890,7 +4982,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2386 "parser.y" +#line 2382 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4903,7 +4995,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2385 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4916,7 +5008,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2388 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4929,7 +5021,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2391 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4942,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2395 "parser.y" {(yyval.code)=0;} } break; @@ -4953,7 +5045,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2396 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4964,7 +5056,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" +#line 2397 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4975,7 +5067,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" +#line 2398 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4986,7 +5078,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2403 "parser.y" +#line 2399 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4997,7 +5089,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2404 "parser.y" +#line 2400 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -5008,7 +5100,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2406 "parser.y" +#line 2402 "parser.y" { (yyval.code) = abc_getlocal(0, state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -5029,7 +5121,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2417 "parser.y" +#line 2413 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -5042,7 +5134,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "parser.y" +#line 2416 "parser.y" {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -5053,7 +5145,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "parser.y" +#line 2416 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = abc_setlocal((yyval.code), state->switch_var); @@ -5091,7 +5183,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2451 "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); @@ -5106,7 +5198,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2456 "parser.y" +#line 2452 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5136,7 +5228,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2476 "parser.y" +#line 2472 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5147,7 +5239,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2476 "parser.y" +#line 2472 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5172,7 +5264,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2492 "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; @@ -5183,7 +5275,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2493 "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; @@ -5194,7 +5286,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2494 "parser.y" +#line 2490 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5205,7 +5297,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2495 "parser.y" +#line 2491 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5223,7 +5315,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2503 "parser.y" +#line 2499 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5241,7 +5333,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2512 "parser.y" +#line 2508 "parser.y" {PASS12 new_state(); state->method->has_exceptions=1; state->method->late_binding=1;//for invariant scope_code @@ -5255,7 +5347,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2515 "parser.y" +#line 2511 "parser.y" { code_t*out = abc_nop(0); @@ -5308,7 +5400,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2561 "parser.y" +#line 2557 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5322,7 +5414,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2565 "parser.y" +#line 2561 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5340,7 +5432,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2576 "parser.y" +#line 2572 "parser.y" { new_state(); if(state->method->has_exceptions) { @@ -5360,7 +5452,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2586 "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)); @@ -5384,7 +5476,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2604 "parser.y" +#line 2600 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5395,7 +5487,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2605 "parser.y" +#line 2601 "parser.y" {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5406,7 +5498,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2607 "parser.y" +#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; @@ -5417,7 +5509,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" +#line 2604 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5428,7 +5520,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2610 "parser.y" +#line 2606 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5439,7 +5531,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2611 "parser.y" +#line 2607 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5450,7 +5542,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2612 "parser.y" +#line 2608 "parser.y" {PASS12 startpackage("");} } break; @@ -5461,7 +5553,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2613 "parser.y" +#line 2609 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5472,15 +5564,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2615 "parser.y" +#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"); @@ -5498,14 +5588,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2631 "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(); @@ -5522,7 +5611,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2648 "parser.y" +#line 2661 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5533,7 +5622,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2649 "parser.y" +#line 2662 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5544,7 +5633,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2663 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5555,7 +5644,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2651 "parser.y" +#line 2664 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5572,7 +5661,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2659 "parser.y" +#line 2671 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5583,7 +5672,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2672 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5594,7 +5683,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2661 "parser.y" +#line 2673 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5605,7 +5694,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2674 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5616,7 +5705,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2663 "parser.y" +#line 2675 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5627,7 +5716,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2664 "parser.y" +#line 2676 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5638,7 +5727,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2665 "parser.y" +#line 2677 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5649,7 +5738,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2666 "parser.y" +#line 2678 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5660,7 +5749,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2667 "parser.y" +#line 2679 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5671,7 +5760,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2668 "parser.y" +#line 2680 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5684,7 +5773,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2672 "parser.y" +#line 2684 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -5695,7 +5784,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2673 "parser.y" +#line 2685 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5706,7 +5795,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2675 "parser.y" +#line 2687 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5717,7 +5806,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2688 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5728,7 +5817,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2678 "parser.y" +#line 2690 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5739,7 +5828,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2679 "parser.y" +#line 2691 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5750,7 +5839,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2683 "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; @@ -5761,7 +5850,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2685 "parser.y" +#line 2697 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5772,7 +5861,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2689 "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));} } @@ -5784,18 +5873,29 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2704 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; + case 149: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#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 2705 "parser.y" +#line 2717 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5810,7 +5910,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2716 "parser.y" +#line 2728 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5823,7 +5923,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2719 "parser.y" +#line 2731 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5843,8 +5943,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2734 "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; @@ -5854,8 +5954,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2734 "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; @@ -5865,8 +5965,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2736 "parser.y" - {(yyval.code) = (yyvsp[(1) - (1)].code);} +#line 2767 "parser.y" + {PASS12 (yyval.code)=0;} } break; @@ -5876,8 +5976,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2737 "parser.y" - {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} +#line 2768 "parser.y" + {PASS12 (yyval.code)=0;} } break; @@ -5887,74 +5987,84 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2740 "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; @@ -5968,7 +6078,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2814 "parser.y" +#line 2855 "parser.y" {(yyval.constant)=0;} } break; @@ -5979,7 +6089,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2815 "parser.y" +#line 2856 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5990,8 +6100,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2817 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} +#line 2859 "parser.y" + {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -6001,8 +6111,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2818 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} +#line 2860 "parser.y" + { + (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); +} } break; @@ -6012,8 +6124,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2819 "parser.y" - {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} +#line 2863 "parser.y" + {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -6023,8 +6135,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2820 "parser.y" - {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} +#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; @@ -6034,8 +6146,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2821 "parser.y" - {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} +#line 2865 "parser.y" + {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -6045,8 +6157,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2823 "parser.y" - {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} +#line 2866 "parser.y" + {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -6056,8 +6168,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2824 "parser.y" - {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} +#line 2867 "parser.y" + {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -6067,8 +6179,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2825 "parser.y" - {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} +#line 2868 "parser.y" + {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; @@ -6078,15 +6190,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2826 "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 2869 "parser.y" + {(yyval.constant) = constant_new_float(__builtin_nan(""));} } break; @@ -6096,7 +6201,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2838 "parser.y" +#line 2884 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6110,7 +6215,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2842 "parser.y" +#line 2888 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -6124,7 +6229,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2848 "parser.y" +#line 2894 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6140,7 +6245,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2854 "parser.y" +#line 2900 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6156,7 +6261,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2862 "parser.y" +#line 2908 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6171,7 +6276,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2867 "parser.y" +#line 2913 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6186,7 +6291,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2873 "parser.y" +#line 2919 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6204,7 +6309,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2881 "parser.y" +#line 2927 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6222,7 +6327,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2891 "parser.y" +#line 2937 "parser.y" {PASS12 (yyval.token)=0;} } break; @@ -6233,7 +6338,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2894 "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; @@ -6244,7 +6349,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2895 "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); @@ -6268,7 +6373,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "parser.y" +#line 2957 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -6279,7 +6384,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2913 "parser.y" +#line 2959 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -6290,7 +6395,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 2960 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6318,7 +6423,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2936 "parser.y" +#line 2982 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6346,7 +6451,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2955 "parser.y" +#line 3001 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6369,7 +6474,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2972 "parser.y" +#line 3018 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -6380,7 +6485,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "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; @@ -6391,7 +6496,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2975 "parser.y" +#line 3021 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -6402,7 +6507,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2976 "parser.y" +#line 3022 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; @@ -6413,7 +6518,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2977 "parser.y" +#line 3023 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; @@ -6424,7 +6529,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2986 "parser.y" +#line 3032 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -6435,7 +6540,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2987 "parser.y" +#line 3033 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -6446,7 +6551,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2991 "parser.y" +#line 3037 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6457,7 +6562,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "parser.y" +#line 3038 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6468,7 +6573,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2994 "parser.y" +#line 3040 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6479,7 +6584,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "parser.y" +#line 3044 "parser.y" {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6492,7 +6597,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3002 "parser.y" +#line 3048 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6503,7 +6608,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3003 "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); @@ -6517,7 +6622,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3009 "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); @@ -6558,7 +6663,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3045 "parser.y" +#line 3091 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6613,7 +6718,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3091 "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"); @@ -6643,7 +6748,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3112 "parser.y" +#line 3158 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6673,7 +6778,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3133 "parser.y" +#line 3179 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6686,7 +6791,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3136 "parser.y" +#line 3182 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6700,7 +6805,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "parser.y" +#line 3189 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; @@ -6711,7 +6816,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3144 "parser.y" +#line 3190 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6722,7 +6827,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3145 "parser.y" +#line 3191 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6738,7 +6843,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3151 "parser.y" +#line 3197 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6751,7 +6856,18 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3157 "parser.y" +#line 3203 "parser.y" + {(yyval.value) = (yyvsp[(1) - (1)].value);} + } + break; + + + + case 226: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3204 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6762,7 +6878,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3161 "parser.y" +#line 3205 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6773,19 +6889,22 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3163 "parser.y" +#line 3206 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 229: + case 230: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3165 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3210 "parser.y" + { + node_t*n = mkconstnode((yyvsp[(1) - (1)].constant)); + (yyval.value) = node_read(n); +} } break; @@ -6795,7 +6914,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3169 "parser.y" +#line 3215 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6821,139 +6940,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3186 "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 233: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3191 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - - case 234: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3194 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - - case 235: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3197 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } - } - break; - - - - case 236: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3200 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } - } - break; - - - - case 237: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3203 "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 238: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3206 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } - } - break; - - - - case 239: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3209 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 240: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3212 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 241: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3215 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } - } - break; - - - - case 242: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3219 "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; } @@ -6962,11 +6949,11 @@ PASS2 - case 243: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3222 "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; } @@ -6975,11 +6962,11 @@ PASS2 - case 244: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3225 "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; } @@ -6988,11 +6975,11 @@ PASS2 - case 245: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3228 "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; } @@ -7001,11 +6988,11 @@ PASS2 - case 246: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3231 "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; } @@ -7014,11 +7001,11 @@ PASS2 - case 247: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3234 "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; } @@ -7027,11 +7014,11 @@ PASS2 - case 248: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3237 "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; } @@ -7040,11 +7027,11 @@ PASS2 - case 249: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3240 "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; } @@ -7053,11 +7040,11 @@ PASS2 - case 250: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3244 "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); @@ -7074,11 +7061,11 @@ PASS2 - case 251: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3255 "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); @@ -7101,11 +7088,11 @@ PASS2 - case 252: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3273 "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; @@ -7115,11 +7102,11 @@ PASS2 - case 253: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3278 "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; @@ -7129,11 +7116,11 @@ PASS2 - case 254: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3283 "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; @@ -7143,11 +7130,11 @@ PASS2 - case 255: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3288 "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; @@ -7157,11 +7144,11 @@ PASS2 - case 256: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3293 "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; @@ -7171,11 +7158,11 @@ PASS2 - case 257: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3298 "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; @@ -7185,11 +7172,11 @@ PASS2 - case 258: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3302 "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; @@ -7199,11 +7186,11 @@ PASS2 - case 259: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3306 "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; @@ -7213,11 +7200,11 @@ PASS2 - case 260: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3311 "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; @@ -7227,11 +7214,11 @@ PASS2 - case 261: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3315 "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; @@ -7241,11 +7228,11 @@ PASS2 - case 262: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3319 "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); @@ -7260,11 +7247,11 @@ PASS2 - case 263: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3328 "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); @@ -7279,11 +7266,11 @@ PASS2 - case 264: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3337 "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); @@ -7298,11 +7285,11 @@ PASS2 - case 265: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3347 "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; @@ -7312,11 +7299,11 @@ PASS2 - case 266: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3352 "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)); @@ -7333,11 +7320,11 @@ PASS2 - case 267: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3365 "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; @@ -7347,11 +7334,11 @@ PASS2 - case 268: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3370 "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; @@ -7361,11 +7348,11 @@ PASS2 - case 269: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3375 "parser.y" +#line 3388 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7376,11 +7363,11 @@ PASS2 - case 270: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3381 "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); @@ -7391,11 +7378,11 @@ PASS2 - case 271: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3387 "parser.y" +#line 3400 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7404,24 +7391,24 @@ PASS2 - case 272: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3391 "parser.y" +#line 3404 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 273: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3393 "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; @@ -7435,11 +7422,11 @@ PASS2 - case 274: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3404 "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); @@ -7453,11 +7440,11 @@ PASS2 - case 275: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3413 "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); @@ -7469,33 +7456,33 @@ PASS2 - case 276: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3420 "parser.y" +#line 3433 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 277: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3421 "parser.y" +#line 3434 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 278: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3423 "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); @@ -7507,11 +7494,11 @@ PASS2 - case 279: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3429 "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; @@ -7523,11 +7510,11 @@ PASS2 - case 280: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3438 "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); @@ -7539,11 +7526,11 @@ PASS2 - case 281: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3445 "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)) { @@ -7552,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; } } @@ -7560,15 +7547,15 @@ PASS2 - case 282: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3457 "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; } } @@ -7576,15 +7563,15 @@ PASS2 - case 283: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3463 "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; } } @@ -7592,15 +7579,15 @@ PASS2 - case 284: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3469 "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; } } @@ -7608,15 +7595,15 @@ PASS2 - case 285: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3475 "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; } } @@ -7624,15 +7611,15 @@ PASS2 - case 286: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3481 "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; } } @@ -7640,15 +7627,15 @@ PASS2 - case 287: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3487 "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; } } @@ -7656,15 +7643,15 @@ PASS2 - case 288: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3493 "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; } } @@ -7672,11 +7659,11 @@ PASS2 - case 289: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3499 "parser.y" +#line 3512 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7687,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; } } @@ -7695,11 +7682,11 @@ PASS2 - case 290: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3512 "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); @@ -7708,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; } } @@ -7716,15 +7703,15 @@ PASS2 - case 291: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3523 "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; } } @@ -7732,11 +7719,11 @@ PASS2 - case 292: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3530 "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; @@ -7754,11 +7741,11 @@ PASS2 - case 293: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3543 "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))) { @@ -7780,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; } } @@ -7789,11 +7776,11 @@ PASS2 - case 294: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3570 "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)) { @@ -7804,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; } } @@ -7812,11 +7799,11 @@ PASS2 - case 295: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3584 "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)) { @@ -7827,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; } } @@ -7835,11 +7822,11 @@ PASS2 - case 296: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3598 "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)) { @@ -7850,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; } } @@ -7858,17 +7845,17 @@ PASS2 - case 297: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3613 "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; @@ -7881,11 +7868,11 @@ PASS2 - case 298: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3627 "parser.y" +#line 3640 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7897,11 +7884,11 @@ PASS2 - case 299: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3634 "parser.y" +#line 3647 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7913,11 +7900,11 @@ PASS2 - case 300: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3641 "parser.y" +#line 3654 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7929,11 +7916,11 @@ PASS2 - case 301: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3648 "parser.y" +#line 3661 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7945,11 +7932,11 @@ PASS2 - case 302: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3655 "parser.y" +#line 3668 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7961,11 +7948,11 @@ PASS2 - case 303: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3666 "parser.y" +#line 3683 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; @@ -7978,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); } @@ -7995,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); @@ -8020,11 +8014,11 @@ PASS2 - case 304: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3716 "parser.y" +#line 3740 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -8038,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 @@ -8066,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); @@ -8083,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); @@ -8093,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); @@ -8108,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; @@ -8132,11 +8130,11 @@ PASS2 - case 305: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3821 "parser.y" +#line 3849 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8149,11 +8147,11 @@ PASS2 - case 306: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3828 "parser.y" +#line 3856 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8166,11 +8164,11 @@ PASS2 - case 307: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3835 "parser.y" +#line 3863 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8183,14 +8181,14 @@ PASS2 - case 308: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3842 "parser.y" +#line 3870 "parser.y" { PASS12 - register_namespace((yyvsp[(2) - (2)].namespace_decl)->name, (yyvsp[(2) - (2)].namespace_decl)->url); + 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); @@ -8207,15 +8205,30 @@ PASS2 - case 309: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3857 "parser.y" +#line 3894 "parser.y" { PASS12 - char*url = 0; - register_namespace((yyvsp[(3) - (3)].classinfo)->name, url); + 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; } } @@ -8225,7 +8238,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 8229 "parser.tab.c" +#line 8242 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);