X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=cfbdb48a18cdd89a144e9039518deb8f31a4d0bd;hb=62a83d162b254d91da418cee25f5b87b067a3f92;hp=9b0f2b56b629d2cbebb59c95b2bff767696489d9;hpb=98274d31d2a91c0f8a577e6779219e11aaf293bb;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 9b0f2b5..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; @@ -265,6 +266,7 @@ tokenunion abc_exception_t *exception; regexp_t regexp; modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -273,7 +275,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 277 "parser.tab.c" +#line 279 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -284,7 +286,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 263 "parser.y" +#line 266 "parser.y" static int a3_error(char*s) @@ -293,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) { @@ -320,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); @@ -342,6 +350,7 @@ typedef struct _classstate { struct _methodstate { /* method data */ methodinfo_t*info; + char has_exceptions; char late_binding; char is_constructor; char has_super; @@ -354,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 @@ -361,6 +371,8 @@ struct _methodstate { char is_a_slot; // for inner methods code_t*header; + + code_t*scope_code; abc_exception_list_t*exceptions; methodstate_list_t*innerfunctions; @@ -372,8 +384,11 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; - namespace_list_t*active_namespaces; + dict_t*import_toplevel_packages; dict_t*imports; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -381,6 +396,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -442,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); @@ -451,18 +477,20 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; -} -static void state_has_imports() -{ - state->wildcard_imports = list_clone(state->wildcard_imports); - state->imports = dict_clone(state->imports); - state->has_own_imports = 1; + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_destroy(state_t*state) @@ -486,17 +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; - + if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -505,7 +538,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -520,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); @@ -534,11 +570,11 @@ void initialize_file(char*filename) if(as3_pass==1) { state->method = rfx_calloc(sizeof(methodstate_t)); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); function_initvars(state->method, 0, 0, 1); global->init = abc_initscript(global->file); - state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } } @@ -571,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; @@ -639,11 +644,37 @@ static variable_t* find_variable_safe(state_t*s, char*name) syntaxerror("undefined variable: %s", name); return v; } + static char variable_exists(char*name) { return dict_contains(state->vars, name); } -code_t*defaultvalue(code_t*c, classinfo_t*type); + +static code_t*defaultvalue(code_t*c, classinfo_t*type) +{ + if(TYPE_IS_INT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_UINT(type)) { + c = abc_pushuint(c, 0); + } else if(TYPE_IS_FLOAT(type)) { + c = abc_pushnan(c); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else if(!type) { + //c = abc_pushundefined(c); + syntaxerror("internal error: can't generate default value for * type"); + } else { + c = abc_pushnull(c); + MULTINAME(m, type); + c = abc_coerce2(c, &m); + } + return c; +} + +static int alloc_local() +{ + return state->method->variable_count++; +} static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { @@ -654,11 +685,12 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c } NEW(variable_t, v); - v->index = state->method->variable_count++; + v->index = alloc_local(); v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); return v; } @@ -676,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; @@ -720,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(); @@ -728,25 +760,36 @@ 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* method_header(methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - code_t*c = 0; - if(m->uses_slots || (m->late_binding && !m->inner)) { + if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { - c = abc_newactivation(c); - c = abc_pushscope(c); + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } } + return c; +} + +static code_t* method_header(methodstate_t*m) +{ + code_t*c = 0; + + c = add_scope_code(c, m, 1); + methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); @@ -772,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; @@ -790,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(); } @@ -822,7 +873,15 @@ static namespace_t modifiers2access(modifiers_t*mod) if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels and namespaces"); ns.access = ACCESS_NAMESPACE; - ns.name = mod->ns; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + trie_dump(active_namespaces); + syntaxerror("unknown namespace: %s", mod->ns); + } + ns.name = url; } else if(mod->flags&FLAG_PUBLIC) { if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); @@ -840,6 +899,12 @@ static namespace_t modifiers2access(modifiers_t*mod) } return ns; } +static slotinfo_t* find_class(const char*name); + +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); +} static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { @@ -855,30 +920,51 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char *(int*)0=0; parserassert(!index); } + if(m->uses_slots) { /* as variables and slots share the same number, make sure that those variable indices are reserved. It's up to the optimizer to later shuffle the variables down to lower indices */ - m->variable_count = m->uses_slots; + m->variable_count = m->uses_slots; } if(params) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0, 1); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - + methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); m->var_index = v->index; m->slot_index = v->index; v->is_inner_method = m; + l = l->next; } + + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + + if(as3_pass==2 && m->slots) { + /* exchange unresolved identifiers with the actual objects */ + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); + } + v->type = type; + } + } + } } @@ -888,6 +974,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; @@ -897,6 +984,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + + //if(!(mod->flags&FLAG_INTERFACE) && !extends) { + if(!(mod->flags&FLAG_INTERFACE) && !extends) { + // all classes extend object + extends = registry_getobjectclass(); + } /* create the class name, together with the proper attributes */ int access=0; @@ -933,6 +1026,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + + int pos = 0; + classinfo_list_t*l = implements; + for(l=implements;l;l=l->next) { + state->cls->info->interfaces[pos++] = l->classinfo; + } } if(as3_pass == 2) { @@ -946,17 +1045,18 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); - - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + int pos = 0; - classinfo_list_t*l = implements; - for(l=implements;l;l=l->next) { - if(!(l->classinfo->flags & FLAG_INTERFACE)) - syntaxerror("'%s' is not an interface", l->classinfo->name); - state->cls->info->interfaces[pos++] = l->classinfo; + while(state->cls->info->interfaces[pos]) { + if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE)) + syntaxerror("'%s' is not an interface", + state->cls->info->interfaces[pos]->name); + pos++; } + /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ + state->cls->info->superclass = extends; + /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); multiname_t*extends2 = sig2mname(extends); @@ -1037,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) { @@ -1095,11 +1178,20 @@ 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); + } c=c->prev; } } - static void check_constant_against_type(classinfo_t*t, constant_t*c) { #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) @@ -1130,12 +1222,15 @@ static void check_override(memberinfo_t*m, int flags) return; if(m->flags & FLAG_FINAL) syntaxerror("can't override final member %s", m->name); + + /* allow this. it's no issue. if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC)) - syntaxerror("can't override static member %s", m->name); + syntaxerror("can't override static member %s", m->name);*/ + if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC)) syntaxerror("can't override non-static member %s with static declaration", m->name); - if(!(flags&FLAG_OVERRIDE)) { + if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) { if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) { if(m->kind == INFOTYPE_METHOD) syntaxerror("can't override without explicit 'override' declaration"); @@ -1157,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); @@ -1244,7 +1336,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); - + function_initvars(state->method, params, 0, 1); } @@ -1309,14 +1401,14 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { - int flags = mod?mod->flags:0; - if(as3_pass==1) { // store inner methods in variables function_initvars(state->method, 0, 0, 0); methodstate_list_t*ml = state->method->innerfunctions; + dict_t*xvars = dict_new(); + while(ml) { methodstate_t*m = ml->methodstate; parserassert(m->inner); @@ -1327,7 +1419,8 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* dictentry_t*l = d->slots[t]; while(l) { /* check parent method's variables */ - if(find_variable(state, l->key)) { + variable_t*v; + if((v=find_variable(state, l->key))) { m->uses_parent_function = 1; state->method->uses_slots = 1; dict_put(xvars, l->key, 0); @@ -1342,10 +1435,12 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } ml = ml->next; } + if(state->method->uses_slots) { state->method->slots = dict_new(); int i = 1; DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) { + if(!name) syntaxerror("internal error"); if(v->index && dict_contains(xvars, name)) { v->init = 0; v->index = i++; @@ -1359,8 +1454,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; } - dict_destroy(xvars); - old_state(); return 0; } @@ -1380,10 +1473,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } else if(state->method->is_constructor) { f = abc_class_getconstructor(state->cls->abc, type2); } else if(!state->method->is_global) { - namespace_t mname_ns = {state->method->info->access, ""}; + namespace_t mname_ns = modifiers2access(mod); multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) + if(mod->flags&FLAG_STATIC) f = abc_class_staticmethod(state->cls->abc, type2, &mname); else f = abc_class_method(state->cls->abc, type2, &mname); @@ -1399,7 +1492,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* //flash doesn't seem to allow us to access function slots //state->method->info->slot = slot; - if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; + if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE; if(getset == KW_GET) f->trait->kind = TRAIT_GETTER; if(getset == KW_SET) f->trait->kind = TRAIT_SETTER; if(params->varargs) f->flags |= METHOD_NEED_REST; @@ -1432,9 +1525,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* check_code_for_break(body); - if(state->method->exceptions && - (state->method->late_binding || state->method->uses_slots)) - syntaxerror("try/catch and activation or late binding not supported yet within the same method"); + /* Seems this works now. + if(state->method->exceptions && state->method->uses_slots) { + as3_warning("try/catch and activation not supported yet within the same method"); + }*/ if(f->body) { f->body->code = body; @@ -1451,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) { @@ -1483,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(); @@ -1506,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) @@ -1523,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) { @@ -1552,37 +1672,49 @@ 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) { return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static const char* get_package_from_name(const char*name) +{ + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + +static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1619,29 +1751,46 @@ static slotinfo_t* find_class(char*name) return 0; } - -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) +typedcode_t push_class(slotinfo_t*a) { - 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; + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); + } else { + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; + } + } else { + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); + } else { + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); + } + x.t = TYPE_CLASS(c); + } + return x; } -static 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: @@ -1666,7 +1815,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } else { prefix = 0; } - + char use_temp_var = readbefore; /* generate the write instruction, and maybe append a dup to the prefix code */ @@ -1715,6 +1864,10 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETLOCAL_2; } else if(r->opcode == OPCODE_GETLOCAL_3) { write->opcode = OPCODE_SETLOCAL_3; + } else if(r->opcode == OPCODE_GETSUPER) { + write->opcode = OPCODE_SETSUPER; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); } else { code_dump(r); syntaxerror("illegal lvalue: can't assign a value to this expression"); @@ -1734,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 @@ -1768,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(); @@ -1776,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; @@ -1801,7 +1967,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1909,10 +2074,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) int lookup_version_cost = 4*num_insertion_points + 5; if(cantdup || simple_version_cost > lookup_version_cost) { - printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost); + //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_lookup(c, finally, tempvar); } else { - printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost); + //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_simple(c, finally, tempvar); } } @@ -1920,16 +2085,86 @@ 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 1930 "parser.tab.c" +#line 2096 "parser.tab.c" +/* Unqualified %code blocks. */ -#ifdef short -# undef short +/* 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 #endif #ifdef YYTYPE_UINT8 @@ -2139,22 +2374,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 145 +#define YYFINAL 146 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3015 +#define YYLAST 3050 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 134 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 113 /* YYNRULES -- Number of rules. */ -#define YYNRULES 307 +#define YYNRULES 299 /* YYNRULES -- Number of states. */ -#define YYNSTATES 519 +#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) @@ -2165,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, @@ -2197,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 @@ -2216,160 +2451,156 @@ static const yytype_uint16 yyprhs[] = 164, 168, 170, 173, 177, 186, 193, 194, 201, 202, 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, 233, 238, 242, 243, 252, 253, 263, 264, 270, 272, - 275, 277, 280, 282, 283, 290, 293, 295, 301, 303, - 305, 309, 311, 312, 319, 320, 326, 329, 334, 335, - 337, 339, 342, 344, 346, 348, 350, 352, 354, 356, - 358, 360, 362, 363, 366, 367, 370, 371, 374, 375, - 385, 386, 395, 396, 398, 400, 403, 405, 410, 412, - 414, 416, 417, 419, 421, 424, 426, 429, 438, 440, - 442, 443, 448, 450, 454, 458, 459, 462, 464, 466, - 468, 470, 472, 474, 476, 478, 480, 481, 483, 486, - 491, 495, 497, 502, 505, 507, 509, 510, 511, 524, - 526, 527, 528, 539, 541, 545, 547, 549, 551, 555, - 557, 559, 561, 564, 565, 566, 570, 571, 573, 575, - 577, 580, 583, 584, 589, 594, 599, 602, 604, 607, - 609, 611, 615, 617, 619, 621, 623, 625, 627, 629, - 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, - 651, 655, 659, 663, 667, 671, 675, 679, 683, 687, - 691, 694, 697, 701, 705, 709, 713, 717, 721, 725, - 729, 733, 737, 741, 745, 749, 753, 757, 762, 765, - 767, 771, 774, 779, 783, 784, 786, 790, 796, 800, - 804, 808, 812, 816, 820, 824, 828, 832, 836, 840, - 844, 850, 853, 856, 859, 862, 866, 869, 874, 880, - 884, 890, 894, 896, 899, 902, 907, 912 + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 619, 621, 623, 625, 627, 629, + 631, 633, 635, 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, 185, -1, 197, -1, 195, -1, 216, - -1, 206, -1, 147, -1, 148, 126, 136, 132, -1, - 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 197, -1, 195, -1, 216, -1, 206, -1, 147, -1, - 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, - 143, 145, -1, 145, -1, 188, -1, 159, -1, 160, - -1, 161, -1, 163, -1, 171, -1, 154, -1, 182, - -1, 179, -1, 238, -1, 246, -1, 245, -1, 126, - 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, - 150, -1, 165, -1, 166, -1, 235, -1, 181, -1, - 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 236, -1, -1, - 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 226, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 237, 133, 146, 153, -1, -1, - 150, -1, 238, -1, 46, 3, 226, -1, 3, -1, - 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 237, 99, 238, 133, 146, -1, 158, 157, 68, 237, - 133, 146, -1, -1, 14, 122, 162, 237, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 237, 133, -1, - 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 239, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 239, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 226, 133, 174, 126, - 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, - 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, - 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, - 37, 237, -1, 37, -1, 39, 122, 237, 133, 146, - -1, 3, -1, 19, -1, 184, 127, 183, -1, 183, - -1, -1, 19, 184, 126, 186, 139, 132, -1, -1, - 19, 126, 187, 139, 132, -1, 41, 222, -1, 41, - 184, 127, 115, -1, -1, 190, -1, 191, -1, 190, - 191, -1, 21, -1, 22, -1, 20, -1, 38, -1, - 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 223, -1, -1, 54, 224, -1, - -1, 17, 224, -1, -1, 189, 31, 3, 192, 194, - 126, 196, 199, 132, -1, -1, 189, 44, 3, 193, - 126, 198, 202, 132, -1, -1, 200, -1, 201, -1, - 200, 201, -1, 99, -1, 148, 126, 199, 132, -1, - 206, -1, 216, -1, 144, -1, -1, 203, -1, 204, - -1, 203, 204, -1, 99, -1, 46, 3, -1, 189, - 27, 215, 3, 122, 212, 133, 226, -1, 46, -1, - 32, -1, -1, 189, 205, 207, 208, -1, 209, -1, - 208, 100, 209, -1, 3, 226, 149, -1, -1, 102, - 211, -1, 10, -1, 8, -1, 9, -1, 12, -1, - 5, -1, 56, -1, 55, -1, 45, -1, 3, -1, - -1, 213, -1, 93, 214, -1, 213, 100, 93, 214, - -1, 213, 100, 214, -1, 214, -1, 3, 105, 225, - 210, -1, 3, 210, -1, 51, -1, 35, -1, -1, - -1, 189, 27, 215, 3, 122, 212, 133, 226, 126, - 217, 142, 132, -1, 3, -1, -1, -1, 27, 218, - 122, 212, 133, 226, 126, 220, 142, 132, -1, 3, - -1, 184, 127, 3, -1, 222, -1, 221, -1, 223, - -1, 224, 100, 223, -1, 223, -1, 115, -1, 36, - -1, 105, 225, -1, -1, -1, 122, 228, 133, -1, - -1, 229, -1, 230, -1, 236, -1, 229, 100, -1, - 230, 236, -1, -1, 25, 239, 231, 227, -1, 239, - 122, 228, 133, -1, 53, 122, 228, 133, -1, 63, - 239, -1, 42, -1, 42, 237, -1, 239, -1, 239, - -1, 237, 100, 239, -1, 237, -1, 219, -1, 240, - -1, 243, -1, 232, -1, 234, -1, 233, -1, 6, - -1, 10, -1, 11, -1, 8, -1, 9, -1, 12, - -1, 5, -1, 29, -1, 56, -1, 55, -1, 45, - -1, 239, 109, 239, -1, 239, 110, 239, -1, 239, - 75, 239, -1, 239, 76, 239, -1, 239, 71, 239, - -1, 239, 72, 239, -1, 239, 74, 239, -1, 239, - 73, 239, -1, 239, 87, 239, -1, 239, 88, 239, - -1, 118, 239, -1, 117, 239, -1, 239, 108, 239, + 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, - 96, 239, -1, 239, 95, 239, -1, 239, 94, 239, - -1, 239, 114, 239, -1, 239, 116, 239, -1, 239, - 113, 239, -1, 239, 112, 239, -1, 239, 115, 239, - -1, 239, 68, 239, -1, 239, 69, 239, -1, 239, - 40, 239, -1, 239, 67, 239, -1, 43, 122, 239, - 133, -1, 36, 239, -1, 36, -1, 122, 237, 133, - -1, 112, 239, -1, 239, 124, 239, 125, -1, 124, - 228, 125, -1, -1, 242, -1, 236, 105, 236, -1, - 242, 100, 236, 105, 236, -1, 70, 241, 132, -1, - 239, 80, 239, -1, 239, 79, 239, -1, 239, 85, - 239, -1, 239, 84, 239, -1, 239, 86, 239, -1, - 239, 78, 239, -1, 239, 77, 239, -1, 239, 83, - 239, -1, 239, 81, 239, -1, 239, 82, 239, -1, - 239, 102, 239, -1, 239, 104, 239, 105, 239, -1, - 239, 91, -1, 239, 90, -1, 91, 239, -1, 90, - 239, -1, 53, 127, 3, -1, 128, 3, -1, 239, - 127, 128, 3, -1, 239, 127, 3, 89, 3, -1, - 239, 92, 3, -1, 239, 127, 122, 239, 133, -1, - 239, 127, 3, -1, 3, -1, 18, 3, -1, 189, - 244, -1, 189, 244, 102, 3, -1, 189, 244, 102, - 5, -1, 23, 18, 223, -1 + 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, 1907, 1907, 1909, 1909, 1910, 1911, 1913, 1914, 1915, - 1916, 1917, 1918, 1919, 1920, 1922, 1922, 1923, 1924, 1926, - 1927, 1928, 1929, 1930, 1931, 1932, 1934, 1935, 1937, 1938, - 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, - 1951, 1952, 1953, 1954, 1957, 1958, 1959, 1960, 1961, 1962, - 1963, 1964, 1968, 1969, 1973, 1980, 1984, 1985, 1989, 1990, - 1992, 1993, 1995, 2056, 2057, 2060, 2060, 2079, 2080, 2081, - 2086, 2090, 2095, 2096, 2098, 2118, 2162, 2162, 2181, 2181, - 2196, 2199, 2202, 2205, 2209, 2210, 2211, 2212, 2213, 2214, - 2216, 2227, 2230, 2230, 2259, 2259, 2283, 2283, 2299, 2300, - 2301, 2302, 2310, 2319, 2319, 2364, 2368, 2379, 2388, 2389, - 2391, 2392, 2394, 2394, 2396, 2396, 2399, 2414, 2430, 2431, - 2432, 2433, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, - 2449, 2450, 2454, 2455, 2457, 2458, 2460, 2461, 2465, 2463, - 2471, 2469, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, - 2487, 2493, 2494, 2495, 2496, 2497, 2498, 2501, 2514, 2514, - 2516, 2516, 2518, 2519, 2521, 2596, 2597, 2599, 2600, 2601, - 2602, 2603, 2605, 2606, 2607, 2608, 2617, 2621, 2627, 2633, - 2641, 2646, 2652, 2660, 2668, 2669, 2670, 2673, 2672, 2689, - 2690, 2692, 2691, 2715, 2726, 2739, 2740, 2742, 2743, 2745, - 2746, 2747, 2756, 2757, 2761, 2762, 2764, 2765, 2766, 2768, - 2772, 2773, 2778, 2779, 2815, 2861, 2882, 2903, 2906, 2913, - 2914, 2915, 2921, 2927, 2929, 2931, 2933, 2935, 2937, 2939, - 2956, 2961, 2964, 2967, 2970, 2973, 2976, 2979, 2982, 2985, - 2989, 2992, 2995, 2998, 3001, 3004, 3007, 3010, 3014, 3025, - 3043, 3048, 3053, 3058, 3063, 3068, 3072, 3076, 3081, 3085, - 3089, 3098, 3107, 3117, 3122, 3134, 3140, 3145, 3151, 3157, - 3161, 3163, 3174, 3183, 3190, 3191, 3193, 3199, 3208, 3215, - 3227, 3233, 3239, 3245, 3251, 3257, 3263, 3269, 3282, 3293, - 3300, 3313, 3340, 3354, 3368, 3382, 3397, 3404, 3411, 3418, - 3425, 3436, 3470, 3591, 3597, 3600, 3603, 3606 + 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 @@ -2379,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\"", @@ -2410,22 +2641,22 @@ static const char *const yytname[] = "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6", - "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH", - "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", - "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", + "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH_HEAD", + "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", + "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "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 @@ -2443,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, 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, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 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, 241, 241, 242, 242, 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, 243, 244, 245, 245, 245, 246 + 239, 239, 239, 239, 242, 243, 243, 243, 244, 245 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2500,27 +2730,26 @@ static const yytype_uint8 yyr2[] = 3, 1, 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, 4, 3, 0, 8, 0, 9, 0, 5, 1, 2, - 1, 2, 1, 0, 6, 2, 1, 5, 1, 1, - 3, 1, 0, 6, 0, 5, 2, 4, 0, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2, 0, 2, 0, 2, 0, 9, - 0, 8, 0, 1, 1, 2, 1, 4, 1, 1, - 1, 0, 1, 1, 2, 1, 2, 8, 1, 1, - 0, 4, 1, 3, 3, 0, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, 2, 4, - 3, 1, 4, 2, 1, 1, 0, 0, 12, 1, - 0, 0, 10, 1, 3, 1, 1, 1, 3, 1, - 1, 1, 2, 0, 0, 3, 0, 1, 1, 1, - 2, 2, 0, 4, 4, 4, 2, 1, 2, 1, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 4, 2, 1, - 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, + 1, 2, 1, 0, 6, 2, 1, 4, 2, 1, + 1, 1, 3, 1, 0, 6, 0, 5, 2, 4, + 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 0, 9, 0, 8, 0, 1, 1, 2, 1, 4, + 1, 1, 1, 0, 1, 1, 2, 1, 2, 8, + 1, 1, 0, 4, 1, 3, 3, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 2, 4, 3, 1, 4, 2, 1, 1, 0, 0, + 12, 1, 0, 0, 10, 1, 3, 1, 1, 1, + 3, 1, 1, 1, 2, 0, 0, 3, 0, 1, + 1, 1, 2, 2, 0, 4, 4, 4, 2, 1, + 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 2, 1, 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 5, 2, 2, 2, 2, 3, 2, 4, 5, 3, - 5, 3, 1, 2, 2, 4, 4, 3 + 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, + 5, 3, 5, 3, 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2528,768 +2757,776 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 302, 131, 235, 229, 232, 233, 230, 231, 234, - 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 190, 236, 269, 125, 0, 0, 0, 239, - 126, 128, 127, 0, 0, 238, 237, 0, 0, 274, - 0, 0, 14, 0, 0, 0, 0, 206, 118, 0, - 0, 2, 118, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 37, 7, 30, 0, 119, - 120, 9, 8, 11, 10, 223, 226, 228, 227, 222, - 39, 220, 224, 225, 41, 40, 0, 0, 72, 76, - 118, 92, 108, 109, 114, 111, 0, 0, 302, 212, - 189, 0, 268, 0, 0, 116, 0, 103, 206, 0, - 216, 65, 0, 219, 0, 275, 294, 293, 271, 251, - 250, 0, 0, 207, 208, 209, 82, 0, 106, 217, - 0, 80, 44, 43, 118, 45, 29, 0, 46, 47, - 48, 50, 0, 49, 296, 1, 6, 118, 302, 0, - 68, 0, 0, 69, 0, 186, 0, 159, 0, 158, - 160, 304, 121, 0, 0, 0, 0, 0, 0, 0, + 120, 294, 133, 172, 231, 169, 170, 171, 0, 0, + 78, 0, 0, 126, 124, 125, 0, 132, 0, 131, + 192, 176, 177, 261, 127, 0, 0, 0, 175, 128, + 130, 129, 0, 0, 174, 173, 0, 0, 266, 0, + 0, 14, 0, 0, 0, 0, 208, 120, 0, 0, + 2, 120, 5, 54, 12, 0, 36, 67, 31, 32, + 33, 34, 35, 38, 120, 37, 7, 30, 0, 121, + 122, 9, 8, 11, 230, 10, 225, 227, 229, 228, + 224, 39, 222, 226, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 294, + 214, 191, 0, 260, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 0, 221, 0, 267, 286, 285, 263, + 243, 242, 0, 0, 209, 210, 211, 82, 0, 106, + 219, 0, 80, 44, 43, 120, 45, 29, 0, 46, + 47, 48, 50, 0, 49, 288, 1, 6, 120, 294, + 0, 68, 0, 0, 69, 53, 108, 0, 188, 0, + 161, 0, 160, 162, 298, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 292, 291, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 206, 0, 0, 55, 73, 0, - 53, 0, 0, 118, 112, 0, 193, 0, 196, 195, - 307, 204, 176, 0, 0, 0, 27, 0, 295, 0, - 0, 278, 0, 270, 273, 210, 211, 83, 203, 59, - 60, 105, 218, 58, 81, 42, 28, 118, 0, 203, - 0, 0, 303, 185, 184, 0, 132, 134, 0, 0, - 221, 265, 266, 263, 264, 244, 245, 247, 246, 242, - 243, 285, 284, 280, 279, 287, 288, 286, 282, 281, - 283, 248, 249, 299, 257, 256, 255, 289, 0, 254, - 253, 252, 240, 241, 261, 260, 258, 262, 259, 0, - 0, 301, 0, 0, 0, 52, 0, 0, 25, 0, - 118, 17, 23, 0, 20, 19, 22, 21, 118, 110, - 0, 206, 213, 165, 0, 0, 177, 181, 118, 194, - 117, 267, 0, 26, 215, 0, 276, 0, 0, 57, - 0, 118, 13, 57, 0, 0, 0, 0, 136, 0, - 0, 203, 161, 162, 305, 306, 0, 214, 272, 0, - 0, 297, 118, 0, 0, 115, 18, 118, 0, 0, - 0, 0, 183, 178, 203, 0, 107, 0, 118, 0, - 201, 200, 199, 202, 0, 62, 61, 51, 0, 118, - 176, 133, 0, 0, 197, 135, 140, 57, 0, 290, - 298, 300, 77, 0, 84, 0, 113, 205, 175, 171, - 168, 169, 167, 170, 174, 173, 172, 166, 165, 0, - 0, 180, 0, 0, 98, 102, 100, 104, 63, 277, - 56, 0, 75, 0, 137, 138, 0, 118, 164, 163, - 79, 0, 0, 0, 85, 88, 86, 24, 182, 191, - 179, 96, 0, 99, 101, 118, 66, 118, 203, 118, - 198, 0, 155, 0, 0, 118, 153, 0, 27, 93, - 89, 87, 27, 27, 203, 64, 74, 0, 146, 150, - 0, 0, 0, 118, 144, 148, 149, 156, 186, 141, - 154, 27, 91, 0, 0, 0, 187, 118, 139, 145, - 0, 90, 192, 97, 94, 27, 0, 0, 0, 0, - 147, 176, 27, 188, 0, 0, 203, 95, 157 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 284, + 283, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 208, 0, 0, + 55, 73, 0, 0, 0, 120, 114, 0, 195, 0, + 198, 197, 299, 206, 178, 0, 0, 0, 27, 0, + 287, 0, 0, 270, 0, 262, 265, 212, 213, 83, + 205, 59, 60, 105, 220, 58, 81, 42, 28, 120, + 0, 205, 0, 0, 52, 295, 187, 186, 0, 134, + 136, 0, 223, 257, 258, 255, 256, 236, 237, 239, + 238, 234, 235, 277, 276, 272, 271, 279, 280, 278, + 274, 273, 275, 240, 241, 291, 249, 248, 247, 281, + 0, 246, 245, 244, 232, 233, 253, 252, 250, 254, + 251, 0, 0, 293, 0, 0, 0, 0, 0, 25, + 0, 120, 17, 23, 0, 20, 19, 22, 21, 120, + 112, 0, 208, 215, 167, 0, 0, 179, 183, 107, + 119, 196, 259, 0, 26, 217, 0, 268, 0, 0, + 57, 0, 120, 13, 57, 0, 0, 0, 0, 0, + 138, 0, 0, 205, 163, 164, 0, 216, 264, 0, + 0, 289, 120, 0, 0, 117, 18, 120, 0, 0, + 0, 0, 185, 180, 205, 0, 0, 120, 0, 203, + 202, 201, 204, 0, 62, 61, 51, 0, 120, 296, + 297, 178, 135, 0, 0, 199, 137, 142, 57, 0, + 282, 290, 292, 77, 0, 84, 0, 115, 207, 168, + 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, + 63, 269, 56, 0, 75, 0, 139, 140, 0, 120, + 166, 165, 79, 0, 0, 0, 85, 88, 86, 24, + 184, 193, 181, 96, 0, 99, 101, 120, 66, 120, + 205, 120, 200, 0, 157, 0, 0, 120, 155, 0, + 27, 93, 89, 87, 27, 27, 205, 64, 74, 0, + 148, 152, 0, 0, 0, 120, 146, 150, 151, 158, + 188, 143, 156, 27, 91, 0, 0, 0, 189, 120, + 141, 147, 0, 90, 194, 97, 94, 27, 0, 0, + 0, 0, 149, 178, 27, 190, 0, 0, 205, 95, + 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 309, 310, 311, 332, 333, - 135, 136, 211, 312, 137, 385, 138, 243, 240, 456, - 57, 229, 151, 152, 58, 59, 60, 61, 209, 62, - 90, 139, 140, 443, 444, 445, 446, 63, 212, 424, - 508, 425, 473, 426, 427, 64, 226, 141, 65, 95, - 217, 66, 318, 213, 67, 142, 69, 70, 348, 350, - 393, 314, 459, 315, 437, 482, 483, 484, 464, 465, - 466, 160, 316, 258, 352, 353, 372, 417, 325, 326, - 327, 255, 317, 505, 101, 75, 472, 218, 219, 382, - 395, 383, 339, 322, 122, 123, 124, 221, 76, 77, - 78, 143, 125, 79, 80, 81, 82, 114, 115, 83, - 161, 84, 85 + -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 -426 +#define YYPACT_NINF -423 static const yytype_int16 yypact[] = { - 1672, 12, -426, -426, -426, -426, -426, -426, -426, -426, - -16, -19, -426, -18, 11, -426, -426, -426, 107, -426, - 2092, -426, 132, -426, 350, -426, 58, 25, 79, -426, - -426, -426, -426, 84, -20, -426, -426, 2092, 83, 2092, - 2092, 2092, -426, 2092, 2092, 2092, 2092, 2092, 632, 209, - 216, -426, 502, -426, -426, -426, 93, -426, 2022, -426, - -426, -426, -426, -426, -426, -426, -426, -426, 356, 248, - -426, -426, -426, -426, -426, -426, -426, -426, -426, 118, - -426, 2522, -426, -426, -426, -426, 218, 105, -426, -426, - 1924, -426, -426, -426, -426, -426, -106, 86, -426, -46, - -426, 106, 139, 2092, 108, -426, 2092, -426, 2092, 229, - 139, -426, 129, 2522, 104, 138, 139, 139, 294, 139, - 139, -75, 115, 141, 2092, -426, 239, 243, 2092, 2092, - 243, 244, -426, -426, 762, -426, -426, 123, -426, -426, - -426, -426, 232, -426, -426, -426, -426, 1022, 183, 255, - -426, 165, 197, -426, 264, 92, 270, -426, 273, -426, - -426, 176, -426, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, -426, -426, 280, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 14, -426, -426, 2092, - 185, 271, 2092, 1152, -426, 25, 160, 161, -426, -426, - -426, 167, 20, -12, 19, 2150, 1798, 157, -426, 2092, - 2092, -426, 2092, -426, -426, -426, -426, -426, 186, 192, - -426, 118, 118, 192, -426, -426, -426, 1924, 166, 186, - 2092, 2092, -426, -426, -426, 296, 246, 252, 304, 149, - 2522, 1014, 494, 494, 494, 2888, 2888, 2888, 2888, 1014, - 1014, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, - 2522, 2583, 2644, -426, 211, 211, 211, 2522, 2339, 2705, - 2766, 2827, 1014, 1014, 294, 294, 139, 139, 139, 175, - 2400, 220, 2092, 311, -9, -426, 194, 2213, -426, 189, - 1282, -426, -426, 191, -426, -426, -426, -426, 1152, -426, - 125, 2092, -426, 97, 312, 195, 222, -426, 1924, 160, - -426, -426, 198, 1798, -426, -1, -426, 224, 38, 235, - 243, 892, -426, -26, -35, 8, 212, 86, 314, 86, - 213, 186, 240, -426, -426, -426, 2092, -426, -426, 338, - 2276, -426, 1924, 2092, 217, -426, -426, 1152, 210, 221, - 74, 38, -426, -426, 186, 24, -426, 98, 1924, 2092, - -426, -426, -426, -426, 2092, -426, -426, -426, 2092, 1924, - 20, -426, 86, 219, -426, 250, -426, 235, 304, 2522, - -426, -426, -426, 45, 56, 214, -426, -426, -426, -426, - -426, -426, -426, -426, -426, -426, -426, -426, 242, 225, - 312, -426, 237, 251, -426, -426, 98, -426, 299, -426, - -426, 245, -426, 247, 250, -426, 86, 47, -426, -426, - -426, 2092, 261, 249, 56, -426, -426, -426, -426, -426, - -426, -426, 379, -426, -426, 1924, -426, 1924, 186, 1412, - -426, 386, -426, 363, 259, 233, -426, 2461, 1798, -426, - -426, -426, 1798, 1798, 186, -426, -426, 266, -426, -426, - 267, 193, 262, 1542, -426, -426, -426, -426, 92, -426, - -426, 1798, -426, 265, 269, 263, -426, 1412, -426, -426, - 395, -426, -426, -426, -426, 1798, 272, 277, 281, 279, - -426, 20, 1798, -426, 282, 285, 186, -426, -426 + 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[] = { - -426, -426, 275, -426, 360, -292, -426, 103, -425, -39, - 1, -85, -317, 59, 2, 17, 361, 297, 85, -426, - -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, - -426, -426, -426, -426, -426, -21, -17, -426, -426, 5, - -426, 6, -426, -426, -426, -426, -426, -426, -426, -200, - 36, -426, -426, -426, -426, 0, -426, 357, -426, -426, - -426, 60, -426, 62, -426, -69, -426, -54, -426, -426, - -31, -426, 3, -426, -426, 32, 18, -426, -372, -426, - -305, -53, 4, -426, -426, -426, -426, -426, 411, -87, - 50, 68, -241, -426, -95, -426, -426, -426, -426, -426, - -426, -426, -32, -6, -52, -8, -426, -426, -426, -426, - -426, -426, -426 + -423, -423, 238, -423, 321, -282, -423, 67, -422, -25, + 1, -55, -74, 28, 2, -8, 332, 263, 52, -423, + -423, -423, -423, -423, -423, -423, -423, -423, -423, -423, + -423, -423, -423, -423, -423, -40, -39, -423, -423, -18, + -423, -17, -423, -423, -423, -423, -423, -423, -423, -423, + 6, 103, -423, -423, -423, -423, 0, -423, 326, -423, + -423, -423, 48, -423, 49, -423, -90, -423, -70, -423, + -423, -48, -423, 3, -423, -423, 24, 5, 40, -377, + -423, -301, -69, 4, -423, -423, -423, -423, -423, 391, + -91, 26, 59, -240, -423, -97, -423, -423, -423, -423, + -423, -423, -423, -32, -9, -49, -13, -423, -423, -423, + -423, -423, -423 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -153 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 210, 153, 112, 343, 134, - 220, 376, 99, 227, 92, 319, 102, 301, 433, 373, - 214, 215, 329, 323, 319, 163, 368, 323, 92, 110, - 93, 113, 116, 117, 87, 118, 119, 120, 93, 113, - 121, 216, -70, 492, 93, 402, 188, 493, 494, 246, - 96, 2, 68, 54, 56, 73, 74, 93, 233, 55, - 71, 428, 72, 104, 388, 163, 501, 15, 16, 17, - 421, 19, 432, 21, 380, 405, 384, 408, 205, 409, - 509, 206, 410, 411, 412, 25, 413, 515, 163, 216, - 441, 163, 236, 461, 30, 31, 32, 223, 225, 163, - 113, 86, 108, 89, 91, 93, 88, 109, 163, 299, - 397, 55, 71, 324, 72, 450, 113, 420, 442, 414, - 319, 328, 241, 242, 362, 97, 422, 253, 329, 415, - 416, 423, 378, 419, 330, 100, 302, 94, 475, 514, - 476, 389, 303, 254, 93, 163, 462, 68, 54, 56, - 73, 74, 354, 381, 355, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 440, -151, - 103, 284, 285, 286, 287, 288, 289, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 113, 300, 336, 370, - 337, 106, 371, 304, 307, 111, 55, 71, 341, 72, - 107, 154, 144, 68, 54, 313, 145, 477, 163, 147, - 155, 207, 113, 335, 113, 157, 369, 208, 222, 186, - 187, 188, 228, 495, 230, 224, 231, 2, 232, 159, - 234, 235, 237, 210, 344, 345, 238, 244, 246, 247, - 154, -71, 2, 15, 16, 17, 246, 19, 249, 21, - 391, 204, 394, 205, 250, 251, 206, 252, 15, 16, - 17, 25, 19, 256, 21, 518, 257, 210, 259, 461, - 30, 31, 32, 283, 305, 306, 25, -108, 320, 321, - 334, 338, 340, 210, 360, 30, 31, 32, 342, 346, - 347, 186, 187, 188, 210, 394, 349, 351, 357, 359, - 68, 54, 313, 113, 361, 323, 363, 367, 68, 54, - 313, 365, 375, 199, 200, 201, 202, 203, 374, 379, - 377, 392, 462, 204, 390, 205, 431, 384, 206, 396, - 398, 400, 406, 404, 370, 435, 447, 429, 399, 460, - 436, 449, 430, 98, 407, 3, 4, 403, 5, 6, - 7, 8, 9, 451, 455, -152, 468, 68, 54, 313, - 210, 113, 210, 452, 154, 20, 113, 22, 457, 23, - 458, 469, 474, 155, 186, 187, 188, 156, 157, 487, - 488, 489, 496, 497, 498, 29, 504, 502, 507, 511, - 158, 503, 159, 34, 510, 35, 36, 512, 201, 202, - 203, 513, 146, 366, 438, 516, 204, 517, 205, 150, - 39, 206, 248, 470, 239, 386, 162, 471, 506, 499, - 439, 453, 454, 467, 490, 500, 448, 463, 105, 418, - 40, 41, 434, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 481, - 479, 480, 485, 486, 0, 463, 0, 0, 0, 0, - 0, 0, 46, 0, 47, 0, 0, 0, 49, 0, - 0, 0, 0, 481, 479, 480, 485, 486, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 481, 479, 480, - 485, 486, -4, 0, 0, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 164, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, -153, -153, -153, 0, 37, 38, 0, 0, 172, - 173, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 197, 198, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, - 45, 206, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -4, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 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, 54, 210, 330, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 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, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 133, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 245, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 22, - 0, 23, 126, 0, 127, 0, 0, 0, 24, 128, - 25, 26, 0, 27, 129, 28, 0, 29, 130, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 131, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 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, -153, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, -153, - -153, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, -153, -153, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 43, 0, 204, 0, 205, 44, - 45, 206, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -3, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 308, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -15, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 308, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -16, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 478, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, -142, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 0, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 478, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, -3, 0, -143, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, - 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 25, 26, 0, 27, 0, 28, 0, 29, 0, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 0, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 1, 2, 3, 4, 0, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 0, -118, 0, 15, 16, - 17, 18, 19, 20, 21, 22, 0, 23, 126, 0, - 127, 0, 0, 0, 24, 128, 25, 26, 0, 27, - 129, 28, 0, 29, 130, 30, 31, 32, 0, 0, - 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, - 0, 37, 38, 0, 131, 0, 0, 0, 39, 0, + 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 45, 0, 46, 0, 47, 0, 48, 0, 0, 0, + -15, 1, 2, 3, 4, 0, 5, 6, 7, 8, + 9, 10, 11, 0, 0, 0, 13, 14, 15, 16, + 17, 18, 19, 0, 0, 21, 22, 0, 0, 0, + 0, 0, 0, 23, 0, 24, 25, 0, 26, 0, + 27, 0, 28, 0, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, - 0, 0, 0, 0, 0, 0, 0, 132, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 309, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, + 0, 46, 0, 47, 0, 48, 0, 0, 0, -16, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 0, 0, 0, 13, 14, 15, 16, 17, + 18, 19, 0, 0, 21, 22, 0, 0, 0, 0, + 0, 0, 23, 0, 24, 25, 0, 26, 0, 27, + 0, 28, 0, 29, 30, 31, 0, 0, 32, 33, + 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, + 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, - 46, 0, 47, 0, 48, 0, 49, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 126, 0, 127, 0, 0, 0, - 24, 128, 25, 26, 0, 27, 129, 28, 0, 29, - 130, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 131, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 470, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, + 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, + 46, 0, 47, 0, 48, 0, 0, 0, -144, 1, + 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, + 11, 0, 0, 0, 13, 14, 15, 16, 17, 18, + 19, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 0, 23, 0, 24, 25, 0, 26, 0, 27, 0, + 28, 0, 29, 30, 31, 0, 0, 32, 33, 0, + 34, 35, 0, 0, 0, 0, 0, 0, 36, 37, + 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 132, 0, 148, 0, 3, 4, 0, - 5, 6, 7, 8, 9, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 20, 47, 22, - 48, 23, 49, 0, 127, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 0, 28, 0, 29, 149, 0, - 0, 0, 0, 0, 0, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 98, 0, 3, 4, 0, - 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, - 0, 23, 0, 0, 0, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 43, 28, 0, 29, 0, 44, - 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, - 49, 0, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 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, 40, 41, 0, 0, 0, 0, 0, 0, - 164, 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, 165, 166, 167, - 49, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, - 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, - 0, 0, 192, 164, 193, 0, 194, 195, 196, 197, - 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, - 0, 0, 204, 0, 205, 0, 0, 206, 0, 0, - 165, 166, 167, 331, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 0, 186, 187, 188, 0, 189, 190, 191, - 0, 0, 0, 0, 0, 192, 164, 193, 0, 194, - 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, - 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, - 206, 0, 0, 165, 166, 167, 364, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, - 189, 190, 191, 0, 0, 0, 0, 0, 192, 164, - 193, 0, 194, 195, 196, 197, 198, 0, 199, 200, - 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, - 205, 0, 0, 206, 0, 0, 165, 166, 167, 401, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 0, 186, - 187, 188, 0, 189, 190, 191, 0, 0, 0, 0, - 164, 192, 0, 193, 356, 194, 195, 196, 197, 198, - 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, - 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, - 0, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, - 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, - 0, 164, 192, 0, 193, 0, 194, 195, 196, 197, - 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, - 0, 0, 204, 0, 205, 358, 0, 206, 165, 166, - 167, 0, 168, 169, 170, 171, 172, 173, 174, 175, + 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, 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, 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, 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, - 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, - 0, 0, 164, 192, 0, 193, 491, 194, 195, 196, - 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, - 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, - 166, 167, 0, 168, 169, 170, 171, 172, 173, 174, + 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, 0, 186, 187, 188, 0, 189, 190, 191, 0, - 0, 0, 0, 164, 192, 0, 193, 0, 194, 195, - 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, - 0, 0, 0, 0, 204, 0, 205, 0, 0, 206, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 173, + 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, + 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, + 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, + 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, + 358, 0, 209, 168, 169, 170, 0, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, + 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, + 196, 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, 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, + 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, 185, 0, 186, 187, 188, 0, 189, 190, 191, - 0, 0, 0, 0, 164, 0, 0, 0, 0, 194, - 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, - 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, - 206, 165, 166, 167, 0, 168, 169, 170, 171, 172, - 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 0, 0, 0, 164, 0, 0, 0, 0, - 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, - 203, 0, 0, 0, 0, 0, 204, 0, 205, 0, - 0, 206, 165, 166, 167, 0, 168, 169, 170, 171, - 172, 173, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 186, 187, 188, 0, 189, - 190, 191, 0, 0, 0, 0, 164, 0, 0, 0, - 0, 0, 195, 196, 197, 198, 0, 199, 200, 201, - 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, - 0, 0, 206, 165, 166, 167, 0, 168, 169, 170, - 171, 172, 173, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 186, 187, 188, 0, - 189, 190, 191, 0, 0, 0, 0, 164, 0, 0, - 0, 0, 0, 0, 196, 197, 198, 0, 199, 200, - 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, - 205, 0, 0, 206, 165, 166, 167, 0, 168, 169, - 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 186, 187, 188, - 0, 189, 190, 191, 0, 0, 0, 0, 164, 0, - 0, 0, 0, 0, 0, -153, 197, 198, 0, 199, - 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, - 0, 205, 0, 0, 206, 165, 166, 167, 0, -153, - -153, -153, -153, 172, 173, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 186, 187, - 188, 0, 189, 190, 191, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 197, 198, 0, - 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, - 204, 0, 205, 0, 0, 206 + 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, + 0, 0, 167, 0, 0, 0, 0, 0, 0, 199, + 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, + 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, + 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, + 0, 0, 0, 167, 0, 0, 0, 0, 0, 0, + -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, 90, 58, 39, 249, 48, - 97, 328, 20, 108, 3, 215, 24, 3, 390, 324, - 126, 127, 3, 3, 224, 100, 318, 3, 3, 37, - 19, 39, 40, 41, 50, 43, 44, 45, 19, 47, - 46, 3, 68, 468, 19, 362, 92, 472, 473, 134, - 14, 4, 52, 52, 52, 52, 52, 19, 133, 0, - 0, 378, 0, 27, 99, 100, 491, 20, 21, 22, - 375, 24, 389, 26, 36, 367, 102, 3, 124, 5, - 505, 127, 8, 9, 10, 38, 12, 512, 100, 3, - 34, 100, 124, 46, 47, 48, 49, 103, 106, 100, - 108, 89, 122, 122, 122, 19, 122, 127, 100, 204, - 351, 52, 52, 93, 52, 420, 124, 93, 62, 45, - 320, 133, 128, 129, 133, 18, 28, 35, 3, 55, - 56, 33, 133, 374, 115, 3, 122, 126, 455, 511, - 457, 133, 128, 51, 19, 100, 99, 147, 147, 147, - 147, 147, 3, 115, 5, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 133, 132, - 122, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 230, 102, - 232, 122, 105, 209, 212, 122, 147, 147, 247, 147, - 126, 18, 3, 213, 213, 213, 0, 458, 100, 126, - 27, 3, 230, 229, 232, 32, 321, 122, 122, 90, - 91, 92, 3, 474, 105, 127, 132, 4, 100, 46, - 125, 100, 3, 328, 250, 251, 3, 3, 333, 126, - 18, 68, 4, 20, 21, 22, 341, 24, 3, 26, - 347, 122, 349, 124, 99, 68, 127, 3, 20, 21, - 22, 38, 24, 3, 26, 516, 3, 362, 102, 46, - 47, 48, 49, 3, 99, 14, 38, 127, 127, 122, - 133, 105, 100, 378, 302, 47, 48, 49, 132, 3, - 54, 90, 91, 92, 389, 392, 54, 3, 133, 89, - 310, 310, 310, 321, 3, 3, 122, 126, 318, 318, - 318, 132, 100, 112, 113, 114, 115, 116, 133, 105, - 132, 17, 99, 122, 122, 124, 388, 102, 127, 126, - 100, 3, 132, 126, 102, 126, 132, 379, 356, 436, - 100, 126, 384, 3, 133, 5, 6, 363, 8, 9, - 10, 11, 12, 126, 65, 132, 105, 367, 367, 367, - 455, 379, 457, 122, 18, 25, 384, 27, 133, 29, - 133, 132, 3, 27, 90, 91, 92, 31, 32, 3, - 27, 132, 126, 126, 132, 45, 133, 132, 3, 122, - 44, 132, 46, 53, 132, 55, 56, 126, 114, 115, - 116, 132, 52, 310, 397, 133, 122, 132, 124, 58, - 70, 127, 147, 444, 127, 340, 69, 444, 497, 483, - 398, 426, 426, 441, 465, 488, 418, 437, 27, 371, - 90, 91, 392, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 459, - 459, 459, 459, 459, -1, 465, -1, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, -1, 128, -1, - -1, -1, -1, 483, 483, 483, 483, 483, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 497, 497, 497, - 497, 497, 0, -1, -1, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, 40, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, 67, 68, 69, -1, 63, 64, -1, -1, 75, - 76, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, 109, 110, -1, 112, 113, 114, 115, - 116, -1, -1, -1, 112, -1, 122, -1, 124, 117, - 118, 127, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + 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, 148, 3, 114, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 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, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 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, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, 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, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, 40, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, 75, - 76, -1, 70, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, 109, 110, -1, 112, 113, 114, 115, - 116, -1, -1, -1, 112, -1, 122, -1, 124, 117, - 118, 127, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + 89, 90, -1, -1, -1, -1, -1, -1, -1, 98, -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, 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, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, + 90, -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, -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, 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, 90, 91, -1, -1, -1, -1, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, -1, 126, -1, - 128, -1, 0, -1, 132, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, 29, -1, -1, -1, -1, -1, -1, 36, -1, - 38, 39, -1, 41, -1, 43, -1, 45, -1, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 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, 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, + 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, + 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, + 131, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, -1, -1, 18, 19, 20, 21, + 22, 23, 24, -1, -1, 27, 28, -1, -1, -1, + -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, + 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, - -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 89, 90, -1, + -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, + -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, + 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, -1, -1, -1, 18, 19, 20, 21, 22, + 23, 24, -1, -1, 27, 28, -1, -1, -1, -1, + -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, + -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 112, -1, -1, -1, -1, 117, 118, -1, -1, -1, - 122, -1, 124, -1, 126, -1, 128, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, - 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, - 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 89, 90, -1, -1, + -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, + -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, + 123, -1, 125, -1, 127, -1, -1, -1, 131, 3, + 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, -1, -1, -1, 18, 19, 20, 21, 22, 23, + 24, -1, -1, 27, 28, -1, -1, -1, -1, -1, + -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, + 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, + 54, 55, -1, -1, -1, -1, -1, -1, 62, 63, + -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 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, -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, 90, 91, -1, -1, -1, -1, -1, -1, - 40, -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, 67, 68, 69, - 128, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, -1, 102, 40, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, -1, -1, - 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, -1, 102, 40, 104, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, -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, + -1, -1, -1, -1, 89, 90, -1, -1, -1, -1, + -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, + -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, + 125, -1, 127, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, -1, 16, -1, 18, 19, + 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, + -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, + 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, + -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, + -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, -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, -1, -1, -1, -1, - 40, 102, -1, 104, 105, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, 102, -1, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, 125, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 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, + 81, 82, 83, 84, 85, 86, 87, -1, 89, 90, + 91, -1, 93, 94, 95, -1, -1, -1, -1, -1, + 101, 39, 103, -1, 105, 106, 107, 108, 109, -1, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, -1, -1, 66, 67, + 68, 132, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, 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, 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, -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, -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, -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, - -1, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, - 76, -1, -1, -1, -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, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, - -1, -1, 107, 108, 109, 110, -1, 112, 113, 114, - 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, - -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, - 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, - 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, - -1, 94, 95, 96, -1, -1, -1, -1, 40, -1, - -1, -1, -1, -1, -1, 108, 109, 110, -1, 112, - 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, - -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, - 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, - 92, -1, 94, 95, 96, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 109, 110, -1, - 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127 + 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, -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, -1, 89, 90, 91, -1, 93, 94, 95, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -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 @@ -3297,57 +3534,57 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, - 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, - 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, - 160, 161, 163, 171, 179, 182, 185, 188, 189, 190, - 191, 195, 197, 206, 216, 219, 232, 233, 234, 237, - 238, 239, 240, 243, 245, 246, 89, 50, 122, 122, - 164, 122, 3, 19, 126, 183, 184, 18, 3, 239, - 3, 218, 239, 122, 184, 222, 122, 126, 122, 127, - 239, 122, 236, 239, 241, 242, 239, 239, 239, 239, - 239, 237, 228, 229, 230, 236, 30, 32, 37, 42, - 46, 66, 99, 132, 143, 144, 145, 148, 150, 165, - 166, 181, 189, 235, 3, 0, 138, 126, 3, 46, - 150, 156, 157, 238, 18, 27, 31, 32, 44, 46, - 205, 244, 191, 100, 40, 67, 68, 69, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 90, 91, 92, 94, - 95, 96, 102, 104, 106, 107, 108, 109, 110, 112, - 113, 114, 115, 116, 122, 124, 127, 3, 122, 162, - 145, 146, 172, 187, 126, 127, 3, 184, 221, 222, - 223, 231, 122, 237, 127, 239, 180, 228, 3, 155, - 105, 132, 100, 133, 125, 100, 236, 3, 3, 151, - 152, 237, 237, 151, 3, 132, 145, 126, 136, 3, - 99, 68, 3, 35, 51, 215, 3, 3, 207, 102, + 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, 239, 239, 3, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 228, - 239, 3, 122, 128, 237, 99, 14, 239, 99, 139, - 140, 141, 147, 148, 195, 197, 206, 216, 186, 183, - 127, 122, 227, 3, 93, 212, 213, 214, 133, 3, - 115, 133, 142, 143, 133, 237, 236, 236, 105, 226, - 100, 143, 132, 226, 237, 237, 3, 54, 192, 54, - 193, 3, 208, 209, 3, 5, 105, 133, 125, 89, - 239, 3, 133, 122, 133, 132, 141, 126, 139, 228, - 102, 105, 210, 214, 133, 100, 146, 132, 133, 105, - 36, 115, 223, 225, 102, 149, 152, 132, 99, 133, - 122, 223, 17, 194, 223, 224, 126, 226, 100, 239, - 3, 133, 146, 237, 126, 139, 132, 133, 3, 5, - 8, 9, 10, 12, 45, 55, 56, 211, 225, 226, - 93, 214, 28, 33, 173, 175, 177, 178, 146, 236, - 236, 238, 146, 212, 224, 126, 100, 198, 149, 209, - 133, 34, 62, 167, 168, 169, 170, 132, 210, 126, - 214, 126, 122, 173, 175, 65, 153, 133, 133, 196, - 223, 46, 99, 189, 202, 203, 204, 239, 105, 132, - 169, 170, 220, 176, 3, 146, 146, 226, 99, 144, - 148, 189, 199, 200, 201, 206, 216, 3, 27, 132, - 204, 105, 142, 142, 142, 226, 126, 126, 132, 201, - 215, 142, 132, 132, 133, 217, 199, 3, 174, 142, - 132, 122, 126, 132, 212, 142, 133, 132, 226 + 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) @@ -4159,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 1934 "parser.y" +#line 2101 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4174,7 +4433,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1935 "parser.y" +#line 2102 "parser.y" {(yyval.code)=code_new();} } break; @@ -4185,7 +4444,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1937 "parser.y" +#line 2104 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4196,7 +4455,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1938 "parser.y" +#line 2105 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4207,7 +4466,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1953 "parser.y" +#line 2120 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4218,7 +4477,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1954 "parser.y" +#line 2121 "parser.y" {(yyval.code)=0;} } break; @@ -4229,7 +4488,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1957 "parser.y" +#line 2124 "parser.y" {(yyval.code)=0;} } break; @@ -4240,8 +4499,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1964 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 2131 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4251,7 +4510,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1968 "parser.y" +#line 2135 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4262,7 +4521,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1969 "parser.y" +#line 2136 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4273,7 +4532,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1973 "parser.y" +#line 2140 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4283,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 1984 "parser.y" +#line 2166 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4298,7 +4576,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1985 "parser.y" +#line 2167 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4311,7 +4589,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1989 "parser.y" +#line 2171 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4322,7 +4600,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1990 "parser.y" +#line 2172 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4333,7 +4611,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1992 "parser.y" +#line 2174 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4344,7 +4622,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1993 "parser.y" +#line 2175 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4355,7 +4633,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2178 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4422,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2056 "parser.y" +#line 2238 "parser.y" {(yyval.code) = code_new();} } break; @@ -4433,7 +4711,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2057 "parser.y" +#line 2239 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4444,7 +4722,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2060 "parser.y" +#line 2242 "parser.y" {PASS12 new_state();} } break; @@ -4455,7 +4733,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2060 "parser.y" +#line 2242 "parser.y" { (yyval.code) = code_new(); @@ -4483,7 +4761,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2079 "parser.y" +#line 2261 "parser.y" {(yyval.code)=code_new();} } break; @@ -4494,7 +4772,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2086 "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); @@ -4508,7 +4786,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2090 "parser.y" +#line 2272 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4522,7 +4800,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2095 "parser.y" +#line 2277 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4533,7 +4811,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2096 "parser.y" +#line 2278 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4544,7 +4822,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2098 "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(); @@ -4573,9 +4851,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2118 "parser.y" +#line 2300 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); + if(!var) { + syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id)); + } + char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); @@ -4626,7 +4908,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2348 "parser.y" {PASS12 new_state();} } break; @@ -4637,7 +4919,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2348 "parser.y" { (yyval.code) = code_new(); @@ -4665,7 +4947,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2181 "parser.y" +#line 2367 "parser.y" {PASS12 new_state();} } break; @@ -4676,7 +4958,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2181 "parser.y" +#line 2367 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4700,7 +4982,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" +#line 2382 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4713,7 +4995,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" +#line 2385 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4726,7 +5008,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" +#line 2388 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4739,7 +5021,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2205 "parser.y" +#line 2391 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4752,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2395 "parser.y" {(yyval.code)=0;} } break; @@ -4763,7 +5045,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2210 "parser.y" +#line 2396 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4774,7 +5056,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2211 "parser.y" +#line 2397 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4785,7 +5067,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2212 "parser.y" +#line 2398 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4796,7 +5078,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2213 "parser.y" +#line 2399 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4807,7 +5089,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2214 "parser.y" +#line 2400 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4818,9 +5100,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2402 "parser.y" { - (yyval.code) = abc_dup(0); + (yyval.code) = abc_getlocal(0, state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); @@ -4839,7 +5121,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2227 "parser.y" +#line 2413 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4852,8 +5134,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2230 "parser.y" - {PASS12 new_state();} +#line 2416 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -4863,11 +5145,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2230 "parser.y" +#line 2416 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); - code_t*out = (yyval.code) = abc_pop((yyval.code)); + + code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var); breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out); code_t*c = (yyval.code),*lastblock=0; @@ -4899,7 +5183,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2259 "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); @@ -4914,7 +5198,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2452 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4928,6 +5212,7 @@ PASS2 int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index; e->target = c = abc_nop(0); c = abc_setlocal(c, i); + c = code_append(c, code_dup(state->method->scope_code)); c = code_append(c, (yyvsp[(8) - (9)].code)); c = abc_kill(c, i); @@ -4943,7 +5228,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2283 "parser.y" +#line 2472 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -4954,7 +5239,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2283 "parser.y" +#line 2472 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4979,7 +5264,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2299 "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; @@ -4990,7 +5275,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2300 "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; @@ -5001,7 +5286,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2301 "parser.y" +#line 2490 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5012,7 +5297,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2302 "parser.y" +#line 2491 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5030,7 +5315,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2310 "parser.y" +#line 2499 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5048,8 +5333,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2319 "parser.y" - {PASS12 new_state();} +#line 2508 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -5059,7 +5347,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2319 "parser.y" +#line 2511 "parser.y" { code_t*out = abc_nop(0); @@ -5085,6 +5373,7 @@ PASS2 parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally); // finally block e->target = (yyval.code) = abc_nop((yyval.code)); + (yyval.code) = code_append((yyval.code), code_dup(state->method->scope_code)); (yyval.code) = abc___rethrow__((yyval.code)); } @@ -5111,7 +5400,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2557 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5125,7 +5414,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2561 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5143,113 +5432,151 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2379 "parser.y" +#line 2572 "parser.y" + { + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + (yyval.value_list).number = v; + } + (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c; +} + } + break; + + + + case 108: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2582 "parser.y" { - (yyval.code) = (yyvsp[(3) - (5)].value).c; + /* remove getlocal;pushwith from scope code again */ + state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); + + (yyval.code) = (yyvsp[(1) - (2)].value_list).cc; + if(state->method->has_exceptions) { + (yyval.code) = abc_dup((yyval.code)); + (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number); + } (yyval.code) = abc_pushwith((yyval.code)); - (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code)); + (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code)); (yyval.code) = abc_popscope((yyval.code)); + old_state(); } } break; - case 109: + case 110: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2600 "parser.y" {PASS12 (yyval.id)="package";} } break; - case 110: + case 111: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2601 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} + } + break; + + + + case 112: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#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; - case 111: + case 113: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2604 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; - case 112: + case 114: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2606 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; - case 113: + case 115: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2607 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 114: + case 116: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2608 "parser.y" {PASS12 startpackage("");} } break; - case 115: + case 117: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2397 "parser.y" +#line 2609 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 116: + case 118: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2631 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); - if(!s) {// || !(s->flags&FLAG_BUILTIN)) { + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } - - PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); (yyval.code)=0; } } @@ -5257,22 +5584,22 @@ PASS2 - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2414 "parser.y" +#line 2645 "parser.y" { PASS12 - if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { + if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { as3_schedule_package((yyvsp[(2) - (4)].id)); } - PASS2 NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); state_has_imports(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); (yyval.code)=0; } } @@ -5280,44 +5607,44 @@ PASS2 - case 118: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2430 "parser.y" +#line 2661 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 119: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2431 "parser.y" +#line 2662 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 120: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2432 "parser.y" +#line 2663 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2433 "parser.y" +#line 2664 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5330,110 +5657,110 @@ PASS2 - case 122: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2671 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 123: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2442 "parser.y" +#line 2672 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 124: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2443 "parser.y" +#line 2673 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 125: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2444 "parser.y" +#line 2674 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 126: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2445 "parser.y" +#line 2675 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 127: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2446 "parser.y" +#line 2676 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 128: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2677 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 129: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2448 "parser.y" +#line 2678 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 130: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2449 "parser.y" +#line 2679 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 131: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2450 "parser.y" +#line 2680 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5442,99 +5769,99 @@ PASS2 - case 132: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2454 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2684 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 133: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2455 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2685 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 134: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2457 "parser.y" +#line 2687 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 135: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2458 "parser.y" +#line 2688 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 136: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2460 "parser.y" +#line 2690 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 137: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2461 "parser.y" +#line 2691 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 138: + case 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2465 "parser.y" +#line 2695 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; - case 139: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" +#line 2697 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 140: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2471 "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));} } @@ -5542,22 +5869,33 @@ PASS2 - case 141: + case 143: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2474 "parser.y" +#line 2704 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 149: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2487 "parser.y" +#line 2713 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 152: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2717 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5568,11 +5906,11 @@ PASS2 - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2498 "parser.y" +#line 2728 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5581,11 +5919,11 @@ PASS2 - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2501 "parser.y" +#line 2731 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5601,261 +5939,269 @@ PASS2 - case 160: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2516 "parser.y" - {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} +#line 2765 "parser.y" + {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 161: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2516 "parser.y" - {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} +#line 2765 "parser.y" + {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; - case 162: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2518 "parser.y" - {(yyval.code) = (yyvsp[(1) - (1)].code);} +#line 2767 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 163: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2519 "parser.y" - {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} +#line 2768 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 164: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2522 "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); + if(as3_pass == 1) { + + 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)); } - 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)); + + info->type = (yyvsp[(2) - (3)].classinfo); + info->flags = flags; + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info); + } + + 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); } - if(ns.name && ns.name[0]) { - syntaxerror("namespaces not allowed on package-level variables"); + + *code = code_append(*code, c); + + if(slotstate_varconst==KW_CONST) { + t->kind= TRAIT_CONST; } - info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); } - info->type = (yyvsp[(2) - (3)].classinfo); - info->flags = flags; + (yyval.code)=0; +} + } + break; + - /* 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; - } - - (yyval.code)=0; -} - } - break; - - - - case 165: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2596 "parser.y" +#line 2855 "parser.y" {(yyval.constant)=0;} } break; - case 166: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2597 "parser.y" +#line 2856 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 167: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "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; - case 168: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "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; - case 169: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2601 "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; - case 170: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "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; - case 171: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2603 "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; - case 172: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2605 "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; - case 173: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2606 "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; - case 174: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2607 "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; - case 175: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" - { - // TODO - 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; - case 176: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2617 "parser.y" +#line 2884 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5865,11 +6211,11 @@ PASS2 - case 177: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2888 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5879,11 +6225,11 @@ PASS2 - case 178: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2894 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5895,11 +6241,11 @@ PASS2 - case 179: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2633 "parser.y" +#line 2900 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5911,11 +6257,11 @@ PASS2 - case 180: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2641 "parser.y" +#line 2908 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5926,11 +6272,11 @@ PASS2 - case 181: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2646 "parser.y" +#line 2913 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5941,11 +6287,11 @@ PASS2 - case 182: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2652 "parser.y" +#line 2919 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5959,11 +6305,11 @@ PASS2 - case 183: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2927 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5977,33 +6323,33 @@ PASS2 - case 186: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2670 "parser.y" +#line 2937 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 187: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2673 "parser.y" +#line 2940 "parser.y" {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; - case 188: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "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); @@ -6023,33 +6369,33 @@ PASS2 - case 190: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2957 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 191: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2959 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 192: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2960 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6073,16 +6419,24 @@ PASS2 - case 193: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2715 "parser.y" +#line 2982 "parser.y" { - PASS1 static slotinfo_t c; - memset(&c, 0, sizeof(c)); - c.name = (yyvsp[(1) - (1)].id); - (yyval.classinfo) = (classinfo_t*)&c; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->name = (yyvsp[(1) - (1)].id); + c->package = get_package_from_name((yyvsp[(1) - (1)].id)); + if(!c->package) { + c->nsset = get_current_imports(); + /* make the compiler look for this class in the current directory, + just in case: */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); + } + (yyval.classinfo) = (classinfo_t*)c; PASS2 slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); @@ -6093,17 +6447,18 @@ PASS2 - case 194: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 3001 "parser.y" { - PASS1 static slotinfo_t c; - memset(&c, 0, sizeof(c)); - c.package = (yyvsp[(1) - (3)].id); - c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=(classinfo_t*)&c; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->package = (yyvsp[(1) - (3)].id); + c->name = (yyvsp[(3) - (3)].id); + (yyval.classinfo) = (classinfo_t*)c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -6115,122 +6470,122 @@ PASS2 - case 197: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2742 "parser.y" +#line 3018 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 198: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2743 "parser.y" +#line 3019 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 199: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" +#line 3021 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 200: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2746 "parser.y" +#line 3022 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 201: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2747 "parser.y" +#line 3023 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 202: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2756 "parser.y" +#line 3032 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 203: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2757 "parser.y" +#line 3033 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 204: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2761 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3037 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 205: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2762 "parser.y" +#line 3038 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 206: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2764 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3040 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 209: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" - {(yyval.value_list).len=1; +#line 3044 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6238,24 +6593,24 @@ PASS2 - case 210: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2772 "parser.y" +#line 3048 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 211: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2773 "parser.y" +#line 3049 "parser.y" { - (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; + (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); } } @@ -6263,11 +6618,11 @@ PASS2 - case 213: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2779 "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); @@ -6277,7 +6632,7 @@ PASS2 multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; @@ -6285,10 +6640,10 @@ PASS2 multiname_t*name = t->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); } else { (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number); } (yyval.value).t = TYPE_ANY; @@ -6304,11 +6659,11 @@ PASS2 - case 214: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2815 "parser.y" +#line 3091 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6322,7 +6677,7 @@ PASS2 multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; @@ -6334,17 +6689,17 @@ PASS2 (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); } else if((yyval.value).c->opcode == OPCODE_GETSUPER) { multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); } else { (yyval.value).c = abc_getglobalscope((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); } if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) { @@ -6359,11 +6714,11 @@ PASS2 - case 215: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2861 "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"); @@ -6380,7 +6735,7 @@ PASS2 */ state->method->has_super = 1; - (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); (yyval.value).c = abc_pushundefined((yyval.value).c); (yyval.value).t = TYPE_ANY; } @@ -6389,11 +6744,11 @@ PASS2 - case 216: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2882 "parser.y" +#line 3158 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6419,11 +6774,11 @@ PASS2 - case 217: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2903 "parser.y" +#line 3179 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6432,11 +6787,11 @@ PASS2 - case 218: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2906 "parser.y" +#line 3182 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6446,33 +6801,33 @@ PASS2 - case 219: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2913 "parser.y" +#line 3189 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 220: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 3190 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 221: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2915 "parser.y" +#line 3191 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6484,11 +6839,11 @@ PASS2 - case 222: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2921 "parser.y" +#line 3197 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6497,55 +6852,69 @@ PASS2 - case 223: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2927 "parser.y" +#line 3203 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 225: + case 226: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2931 "parser.y" +#line 3204 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 226: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2933 "parser.y" +#line 3205 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 227: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2935 "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 2939 "parser.y" +#line 3210 "parser.y" + { + node_t*n = mkconstnode((yyvsp[(1) - (1)].constant)); + (yyval.value) = node_read(n); +} + } + break; + + + + case 231: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3215 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6567,143 +6936,11 @@ PASS2 - case 230: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2956 "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 231: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2961 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2964 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } - } - break; - - - - case 233: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2967 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } - } - break; - - - - case 234: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2970 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } - } - break; - - - - case 235: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2973 "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 236: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2976 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } - } - break; - - - - case 237: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 238: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } - } - break; - - - - case 239: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2985 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } - } - break; - - - - case 240: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2989 "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; } @@ -6712,11 +6949,11 @@ PASS2 - case 241: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "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; } @@ -6725,11 +6962,11 @@ PASS2 - case 242: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2995 "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; } @@ -6738,11 +6975,11 @@ PASS2 - case 243: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "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; } @@ -6751,11 +6988,11 @@ PASS2 - case 244: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3001 "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; } @@ -6764,11 +7001,11 @@ PASS2 - case 245: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "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; } @@ -6777,11 +7014,11 @@ PASS2 - case 246: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3007 "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; } @@ -6790,11 +7027,11 @@ PASS2 - case 247: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3010 "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; } @@ -6803,11 +7040,11 @@ PASS2 - case 248: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3014 "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); @@ -6824,11 +7061,11 @@ PASS2 - case 249: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3025 "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); @@ -6851,11 +7088,11 @@ PASS2 - case 250: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3043 "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; @@ -6865,11 +7102,11 @@ PASS2 - case 251: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "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; @@ -6879,11 +7116,11 @@ PASS2 - case 252: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3053 "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; @@ -6893,11 +7130,11 @@ PASS2 - case 253: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3058 "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; @@ -6907,11 +7144,11 @@ PASS2 - case 254: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3063 "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; @@ -6921,11 +7158,11 @@ PASS2 - case 255: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3068 "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; @@ -6935,11 +7172,11 @@ PASS2 - case 256: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3072 "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; @@ -6949,11 +7186,11 @@ PASS2 - case 257: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3076 "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; @@ -6963,11 +7200,11 @@ PASS2 - case 258: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3081 "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; @@ -6977,11 +7214,11 @@ PASS2 - case 259: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3085 "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; @@ -6991,11 +7228,11 @@ PASS2 - case 260: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "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); @@ -7010,11 +7247,11 @@ PASS2 - case 261: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3098 "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); @@ -7029,11 +7266,11 @@ PASS2 - case 262: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "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); @@ -7048,11 +7285,11 @@ PASS2 - case 263: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3117 "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; @@ -7062,11 +7299,11 @@ PASS2 - case 264: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3122 "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)); @@ -7083,11 +7320,11 @@ PASS2 - case 265: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3135 "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; @@ -7097,11 +7334,11 @@ PASS2 - case 266: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "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; @@ -7111,11 +7348,11 @@ PASS2 - case 267: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3145 "parser.y" +#line 3388 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7126,11 +7363,11 @@ PASS2 - case 268: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3151 "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); @@ -7141,11 +7378,11 @@ PASS2 - case 269: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3157 "parser.y" +#line 3400 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7154,24 +7391,24 @@ PASS2 - case 270: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3161 "parser.y" +#line 3404 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 271: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3163 "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; @@ -7185,11 +7422,11 @@ PASS2 - case 272: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3174 "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); @@ -7203,15 +7440,15 @@ PASS2 - case 273: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3183 "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); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len); + (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number); (yyval.value).t = registry_getarrayclass(); } } @@ -7219,52 +7456,52 @@ PASS2 - case 274: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3190 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3433 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 275: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3191 "parser.y" +#line 3434 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 276: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "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); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).len = 2; + (yyval.value_list).number = 2; } } break; - case 277: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3199 "parser.y" +#line 3442 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; + (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); } @@ -7273,15 +7510,15 @@ PASS2 - case 278: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3208 "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); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2); + (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2); (yyval.value).t = registry_getobjectclass(); } } @@ -7289,11 +7526,11 @@ PASS2 - case 279: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3215 "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)) { @@ -7302,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; } } @@ -7310,15 +7547,15 @@ PASS2 - case 280: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3227 "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; } } @@ -7326,15 +7563,15 @@ PASS2 - case 281: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3233 "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; } } @@ -7342,15 +7579,15 @@ PASS2 - case 282: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3239 "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; } } @@ -7358,15 +7595,15 @@ PASS2 - case 283: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3245 "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; } } @@ -7374,15 +7611,15 @@ PASS2 - case 284: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3251 "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; } } @@ -7390,15 +7627,15 @@ PASS2 - case 285: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "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; } } @@ -7406,15 +7643,15 @@ PASS2 - case 286: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3263 "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; } } @@ -7422,11 +7659,11 @@ PASS2 - case 287: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3269 "parser.y" +#line 3512 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7437,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; } } @@ -7445,11 +7682,11 @@ PASS2 - case 288: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3282 "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); @@ -7458,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; } } @@ -7466,15 +7703,15 @@ PASS2 - case 289: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3293 "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; } } @@ -7482,11 +7719,11 @@ PASS2 - case 290: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3300 "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; @@ -7504,14 +7741,14 @@ PASS2 - case 291: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3313 "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)) { + if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { int nr = getlocalnr((yyvsp[(1) - (2)].value).c); code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0; if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) { @@ -7530,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; } } @@ -7539,11 +7776,11 @@ PASS2 - case 292: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3340 "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)) { @@ -7554,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; } } @@ -7562,11 +7799,11 @@ PASS2 - case 293: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3354 "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)) { @@ -7577,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; } } @@ -7585,11 +7822,11 @@ PASS2 - case 294: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3368 "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)) { @@ -7600,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; } } @@ -7608,17 +7845,17 @@ PASS2 - case 295: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3383 "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; @@ -7631,11 +7868,11 @@ PASS2 - case 296: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3397 "parser.y" +#line 3640 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7647,11 +7884,11 @@ PASS2 - case 297: + case 289: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3404 "parser.y" +#line 3647 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7663,11 +7900,11 @@ PASS2 - case 298: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3411 "parser.y" +#line 3654 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7679,11 +7916,11 @@ PASS2 - case 299: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3418 "parser.y" +#line 3661 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7695,11 +7932,11 @@ PASS2 - case 300: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3425 "parser.y" +#line 3668 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7711,65 +7948,93 @@ PASS2 - case 301: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3437 "parser.y" - {(yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->data) { - t = t->data; - is_static = 1; - } - if(t) { - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); - char noslot = 0; - if(f && !is_static != !(f->flags&FLAG_STATIC)) - noslot=1; - if(f && f->slot && !noslot) { - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - } else { - MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - } - /* determine type */ - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); - if(!(yyval.value).t) - (yyval.value).c = abc_coerce_a((yyval.value).c); - } else { - /* when resolving a property on an unknown type, we do know the - name of the property (and don't seem to need the package), but - we need to make avm2 try out all access modes */ - multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); - } +#line 3683 "parser.y" + { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + classinfo_t*t = (yyvsp[(1) - (3)].value).t; + char is_static = 0; + if(TYPE_IS_CLASS(t) && t->data) { + t = t->data; + is_static = 1; + } + if(t) { + if(t->subtype==INFOTYPE_UNRESOLVED) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); + } + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + (yyval.value).c = abc_getslot((yyval.value).c, f->slot); + } else { + if(!f) { + as3_warning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); } + + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + } + /* determine type */ + (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + if(!(yyval.value).t) + (yyval.value).c = abc_coerce_a((yyval.value).c); + } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; + char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); + + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(a) { + (yyval.value) = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + syntaxerror("couldn't resolve %s", package2); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + (yyval.value).c = abc_coerce_a((yyval.value).c); + (yyval.value).t = registry_getanytype(); + } +} } break; - case 302: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3470 "parser.y" +#line 3740 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent function's variables. We consider everything which is not a local variable "unresolved". This encompasses class names, members of the surrounding class - etc. which *correct* because local variables of the parent function + etc. which is *correct* because local variables of the parent function would shadow those. */ if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { unknown_variable((yyvsp[(1) - (1)].id)); } + + /* let the compiler know that it might want to check the current directory/package + for this identifier- maybe there's a file $1.as defining $1. */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 (yyval.value).t = 0; @@ -7795,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); @@ -7812,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); @@ -7822,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); @@ -7832,41 +8100,22 @@ PASS2 /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - if(a->access == ACCESS_PACKAGEINTERNAL && - strcmp(a->package, state->package) && - strcmp(a->package, internal_filename_package) - ) - syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", - infotypename(a),(yyvsp[(1) - (1)].id), a->package, state->package); - - if(a->kind != INFOTYPE_CLASS) { - MULTINAME(m, a); - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - if(a->kind == INFOTYPE_METHOD) { - methodinfo_t*f = (methodinfo_t*)a; - (yyval.value).t = TYPE_FUNCTION(f); - } else { - varinfo_t*v = (varinfo_t*)a; - (yyval.value).t = v->type; - } - } else { - classinfo_t*c = (classinfo_t*)a; - if(c->slot) { - (yyval.value).c = abc_getglobalscope((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, c->slot); - } else { - MULTINAME(m, c); - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - } - (yyval.value).t = TYPE_CLASS(c); - } + (yyval.value) = push_class(a); + break; + } + + /* look through package prefixes */ + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id)) || + registry_ispackage((yyvsp[(1) - (1)].id))) { + (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); + (yyval.value).t = 0; break; } /* unknown object, let the avm2 resolve it */ if(1) { - as3_softwarning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); + //as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); state->method->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; @@ -7881,53 +8130,74 @@ PASS2 - case 303: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3591 "parser.y" +#line 3849 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(2) - (2)].id)); - (yyval.id)=(yyvsp[(2) - (2)].id); + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (2)].id); + n->url = (yyvsp[(2) - (2)].id); + (yyval.namespace_decl)=n; } } break; - case 304: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3597 "parser.y" +#line 3856 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].id); + (yyval.namespace_decl)=n; } } break; - case 305: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3600 "parser.y" +#line 3863 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].str).str; + (yyval.namespace_decl)=n; } } break; - case 306: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3603 "parser.y" +#line 3870 "parser.y" { + PASS12 + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + (yyval.code)=0; } } @@ -7935,14 +8205,30 @@ PASS2 - case 307: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3606 "parser.y" +#line 3894 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); + const char*url = (yyvsp[(3) - (3)].classinfo)->name; + + varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo); + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); + } + + if(!s || s->kind != INFOTYPE_SLOT) + syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1); + if(!s->value || !NS_TYPE(s->value->type)) + syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name); + url = s->value->ns->name; + + trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url); + add_active_url(url); (yyval.code)=0; } } @@ -7952,7 +8238,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 7956 "parser.tab.c" +#line 8242 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);