X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=7069fc367d80c48b3d8a98d8fc0485047f10c5e6;hp=0623611e58bdcca292a56593aaee95d62933a545;hb=b8aa0577aae67db4da5221459102202febc5c103;hpb=6b14c68239f98b818a7aacacc49bb7a16bfa7812 diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 0623611..7069fc3 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -84,18 +84,21 @@ #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 "expr.h" +#include "initcode.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 99 "parser.tab.c" +#line 102 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -129,77 +132,77 @@ 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_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_ANDBY = 335, T_PLUSBY = 336, T_MINUSBY = 337, T_XORBY = 338, @@ -219,14 +222,14 @@ extern int a3_lex(); 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 + 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 +238,12 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 47 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 47 "parser.y" enum yytokentype token; @@ -266,6 +269,7 @@ tokenunion regexp_t regexp; modifiers_t flags; namespace_decl_t* namespace_decl; + node_t*node; struct { abc_exception_list_t *l; code_t*finally; @@ -274,7 +278,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 278 "parser.tab.c" +#line 282 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -285,7 +289,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 265 "parser.y" +#line 273 "parser.y" static int a3_error(char*s) @@ -294,6 +298,13 @@ static int a3_error(char*s) return 0; //make gcc happy } +static void parsererror(const char*file, int line, const char*f) +{ + syntaxerror("internal error in %s, %s:%d", f, file, line); +} + +#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} + static char* concat2(const char* t1, const char* t2) { @@ -321,7 +332,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3) typedef struct _import { char*package; } import_t; - DECLARE_LIST(import); DECLARE(methodstate); @@ -356,6 +366,7 @@ struct _methodstate { char uses_parent_function; int uses_slots; dict_t*slots; + int activation_var; abc_method_t*abc; int var_index; // for inner methods @@ -378,8 +389,9 @@ typedef struct _state { import_list_t*wildcard_imports; dict_t*import_toplevel_packages; dict_t*imports; - namespace_list_t*active_namespaces; - namespace_decl_list_t*new_namespaces; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -391,11 +403,17 @@ typedef struct _state { int switch_var; dict_t*vars; + dict_t*allvars; // also contains variables from sublevels } state_t; typedef struct _global { abc_file_t*file; - abc_script_t*init; + + parsedclass_list_t*classes; + abc_script_t*classinit; + + abc_script_t*init; //package-level code + dict_t*token2info; dict_t*file2token2info; } global_t; @@ -405,12 +423,6 @@ static state_t* state = 0; DECLARE_LIST(state); -#define MULTINAME(m,x) \ - multiname_t m;\ - namespace_t m##_ns;\ - (x)->package; \ - registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x)); - #define MEMBER_MULTINAME(m,f,n) \ multiname_t m;\ namespace_t m##_ns;\ @@ -450,6 +462,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_define(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); @@ -465,28 +486,14 @@ static void new_state() state = s; state->level++; state->has_own_imports = 0; - state->new_namespaces = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; -} -static void state_has_imports() -{ - state->wildcard_imports = list_clone(state->wildcard_imports); - state->imports = dict_clone(state->imports); - state->has_own_imports = 1; -} -static void import_toplevel(const char*package) -{ - char* s = strdup(package); - while(1) { - dict_put(state->import_toplevel_packages, s, 0); - char*x = strrchr(s, '.'); - if(!x) - break; - *x = 0; - } - free(s); + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_destroy(state_t*state) @@ -499,34 +506,32 @@ static void state_destroy(state_t*state) dict_destroy(state->imports);state->imports=0; } if(state->vars) { - int t; - for(t=0;tvars->hashsize;t++) { - dictentry_t*e =state->vars->slots[t]; - while(e) { - free(e->data);e->data=0; - e = e->next; - } - } dict_destroy(state->vars);state->vars=0; } + if(state->new_vars && state->allvars) { + parserassert(!state->old || state->old->allvars != state->allvars); + DICT_ITERATE_DATA(state->allvars, void*, data) { + free(data); + } + dict_destroy(state->allvars); + } + + list_free(state->active_namespace_urls) + state->active_namespace_urls = 0; free(state); } static void old_state() { + trie_rollback(active_namespaces); + if(!state || !state->old) syntaxerror("invalid nesting"); state_t*leaving = state; state = state->old; - namespace_decl_list_t*nl=leaving->new_namespaces; - while(nl) { - tokenizer_unregister_namespace(nl->namespace_decl->name); - nl = nl->next; - } - if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -535,7 +540,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -550,8 +555,12 @@ 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); + state->allvars = dict_new(); global->token2info = dict_lookup(global->file2token2info, current_filename // use long version @@ -567,7 +576,10 @@ void initialize_file(char*filename) 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); + if(!state->method) + syntaxerror("internal error: skewed tokencount"); function_initvars(state->method, 0, 0, 1); + global->classinit = abc_initscript(global->file); global->init = abc_initscript(global->file); } } @@ -577,8 +589,10 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } - + if(as3_pass==2) { + dict_del(global->file2token2info, current_filename); + code_t*header = method_header(state->method); code_t*c = wrap_function(header, 0, global->init->method->body->code); global->init->method->body->code = c; @@ -601,51 +615,24 @@ 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); + initcode_add_classlist(global->classinit, global->classes); - 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);*/ + return global->file; } typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; methodstate_t*is_inner_method; } variable_t; static variable_t* find_variable(state_t*s, char*name) { + state_t*top = s; while(s) { variable_t*v = 0; v = dict_lookup(s->vars, name); @@ -653,7 +640,7 @@ static variable_t* find_variable(state_t*s, char*name) if(s->new_vars) break; s = s->old; } - return 0; + return dict_lookup(top->allvars, name); } static variable_t* find_slot(state_t*s, const char*name) { @@ -669,11 +656,32 @@ static variable_t* find_variable_safe(state_t*s, char*name) syntaxerror("undefined variable: %s", name); return v; } + static char variable_exists(char*name) { return dict_contains(state->vars, name); } -code_t*defaultvalue(code_t*c, classinfo_t*type); + +static code_t*defaultvalue(code_t*c, classinfo_t*type) +{ + if(TYPE_IS_INT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_UINT(type)) { + c = abc_pushuint(c, 0); + } else if(TYPE_IS_FLOAT(type)) { + c = abc_pushnan(c); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else if(!type) { + //c = abc_pushundefined(c); + syntaxerror("internal error: can't generate default value for * type"); + } else { + c = abc_pushnull(c); + MULTINAME(m, type); + c = abc_coerce2(c, &m); + } + return c; +} static int alloc_local() { @@ -693,8 +701,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c v->type = type; v->init = init; - if(name) + if(name) { dict_put(state->vars, name, v); + dict_put(state->allvars, name, v); + } return v; } @@ -704,15 +714,19 @@ static int new_variable(const char*name, classinfo_t*type, char init, char maybe } #define TEMPVARNAME "__as3_temp__" -static int gettempvar() +int gettempvar() { variable_t*v = find_variable(state, TEMPVARNAME); + int i; if(v) - return v->index; - return new_variable(TEMPVARNAME, 0, 0, 0); + i = v->index; + else + i = new_variable(TEMPVARNAME, 0, 0, 0); + parserassert(i); + return i; } -code_t* var_block(code_t*body) +static code_t* var_block(code_t*body) { code_t*c = 0; code_t*k = 0; @@ -756,7 +770,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(); @@ -764,25 +778,26 @@ void unknown_variable(char*name) dict_put(state->method->unresolved_variables, name, 0); } -#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} - -static void parsererror(const char*file, int line, const char*f) -{ - syntaxerror("internal error in %s, %s:%d", f, file, line); -} - - -static code_t* add_scope_code(code_t*c, methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - if(m->uses_slots || (m->late_binding && !m->inner)) { + if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { - /* FIXME: does this need to be the same activation object as - in the function header? */ - c = abc_newactivation(c); - c = abc_pushscope(c); + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } } return c; } @@ -791,7 +806,7 @@ static code_t* method_header(methodstate_t*m) { code_t*c = 0; - c = add_scope_code(c, m); + c = add_scope_code(c, m, 1); methodstate_list_t*l = m->innerfunctions; while(l) { @@ -818,6 +833,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; @@ -836,20 +864,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(); } @@ -868,7 +891,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"); @@ -888,6 +919,11 @@ static namespace_t modifiers2access(modifiers_t*mod) } static slotinfo_t* find_class(const char*name); +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); +} + static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { if(var0) { @@ -898,8 +934,6 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0); else index = new_variable("globalscope", 0, 0, 0); - if(index) - *(int*)0=0; parserassert(!index); } @@ -914,15 +948,11 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char if(params) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0, 1); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - if(as3_pass==2) { - m->scope_code = add_scope_code(m->scope_code, m); - } - - methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; @@ -935,14 +965,19 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char l = l->next; } + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + if(as3_pass==2 && m->slots) { /* exchange unresolved identifiers with the actual objects */ DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { - v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); - if(!v->type || v->type->kind != INFOTYPE_CLASS) { - syntaxerror("Couldn't find class %s", v->type->name); + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); } + v->type = type; } } } @@ -990,6 +1025,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl state->cls = rfx_calloc(sizeof(classstate_t)); state->cls->init = rfx_calloc(sizeof(methodstate_t)); state->cls->static_init = rfx_calloc(sizeof(methodstate_t)); + state->cls->static_init->variable_count=1; /* notice: we make no effort to initialize the top variable (local0) here, even though it has special meaning. We just rely on the facat that pass 1 won't do anything with variables */ @@ -1007,6 +1043,7 @@ 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); + state->cls->info->superclass = extends; int pos = 0; classinfo_list_t*l = implements; @@ -1035,14 +1072,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl 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); - state->cls->abc = abc_class_new(global->file, &classname2, extends2); + multiname_destroy(extends2); + if(state->cls->info->flags&FLAG_FINAL) abc_class_final(state->cls->abc); if(!(state->cls->info->flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc); if(state->cls->info->flags&FLAG_INTERFACE) { @@ -1056,58 +1091,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl abc_class_add_interface(state->cls->abc, &m); } - /* write the construction code for this class to the global init - function */ - int slotindex = abc_initscript_addClassTrait(global->init, &classname2, state->cls->abc); - - abc_method_body_t*m = global->init->method->body; - __ getglobalscope(m); - classinfo_t*s = extends; - - int count=0; - - while(s) { - //TODO: take a look at the current scope stack, maybe - // we can re-use something - s = s->superclass; - if(!s) - break; - - multiname_t*s2 = sig2mname(s); - __ getlex2(m, s2); - multiname_destroy(s2); - - __ pushscope(m); count++; - m->code = m->code->prev->prev; // invert - } - /* continue appending after last op end */ - while(m->code && m->code->next) m->code = m->code->next; - - /* TODO: if this is one of *our* classes, we can also - do a getglobalscope/getslot (which references - the init function's slots) */ - if(extends2) { - __ getlex2(m, extends2); - __ dup(m); - /* notice: we get a Verify Error #1107 if the top elemnt on the scope - stack is not the superclass */ - __ pushscope(m);count++; - } else { - __ pushnull(m); - /* notice: we get a verify error #1107 if the top element on the scope - stack is not the global object */ - __ getlocal_0(m); - __ pushscope(m);count++; - } - __ newclass(m,state->cls->abc); - while(count--) { - __ popscope(m); - } - __ setslot(m, slotindex); - multiname_destroy(extends2); + NEW(parsedclass_t,p); + p->cls = state->cls->info; + p->abc = state->cls->abc; + list_append(global->classes, p); /* flash.display.MovieClip handling */ - if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { if(state->package && state->package[0]) { as3_globalclass = concat3(state->package, ".", classname); @@ -1118,23 +1107,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) { @@ -1176,6 +1148,12 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___RETHROW__) { + syntaxerror("Unresolved \"rethrow\""); + } + if(c->opcode == OPCODE___FALLTHROUGH__) { + syntaxerror("Unresolved \"fallthrough\""); + } if(c->opcode == OPCODE___PUSHPACKAGE__) { char*name = string_cstr(c->data[0]); syntaxerror("Can't reference a package (%s) as such", name); @@ -1184,7 +1162,6 @@ void check_code_for_break(code_t*c) } } - 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) @@ -1240,18 +1217,15 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c if(!state->cls) { //package method minfo = methodinfo_register_global(ns.access, state->package, name); - minfo->return_type = 0; // save this for pass 2 + minfo->return_type = return_type; } else if(getset != KW_GET && getset != KW_SET) { //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); - minfo->return_type = 0; // save this for pass 2 + minfo->return_type = return_type; // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1268,7 +1242,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c // not sure wether to look into superclasses here, too minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { - if(minfo->kind!=INFOTYPE_SLOT) + if(minfo->kind!=INFOTYPE_VAR) syntaxerror("class already contains a method called '%s'", name); if(!(minfo->subtype & (SUBTYPE_GETSET))) syntaxerror("class already contains a field called '%s'", name); @@ -1289,10 +1263,11 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c }*/ } else { minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); - minfo->kind = INFOTYPE_SLOT; //hack + minfo->kind = INFOTYPE_VAR; //hack minfo->subtype = gs; - minfo->return_type = 0; + minfo->return_type = return_type; } + /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } @@ -1315,6 +1290,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) new_state(); state->new_vars = 1; + state->allvars = dict_new(); if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); @@ -1354,7 +1330,8 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, } new_state(); state->new_vars = 1; - + state->allvars = dict_new(); + if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); state->method->has_super = 0; @@ -1389,7 +1366,6 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, state->cls->has_constructor |= state->method->is_constructor; } - state->method->info->return_type = return_type; function_initvars(state->method, params, mod->flags, 1); } } @@ -1397,8 +1373,6 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { - int flags = mod?mod->flags:0; - if(as3_pass==1) { // store inner methods in variables function_initvars(state->method, 0, 0, 0); @@ -1451,6 +1425,8 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; + parserassert(state->new_vars); + dict_destroy(state->allvars);state->allvars = 0; } old_state(); return 0; @@ -1471,10 +1447,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); @@ -1490,7 +1466,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; @@ -1543,11 +1519,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) { @@ -1575,29 +1546,8 @@ void continuejumpsto(code_t*c, char*name, code_t*jump) } } -#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) -{ - if(!type1 || !type2) - return registry_getanytype(); - if(TYPE_IS_ANY(type1) || TYPE_IS_ANY(type2)) - return registry_getanytype(); - - if(op=='+') { - if(IS_NUMBER_OR_INT(type1) && IS_NUMBER_OR_INT(type2)) { - return TYPE_NUMBER; - } else { - return TYPE_ANY; - } - } - if(type1 == type2) - return type1; - return registry_getanytype(); -} code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { if(from==to) @@ -1615,10 +1565,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) { @@ -1644,30 +1605,12 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; as3_error("can't convert type %s%s%s to %s%s%s", - from->package, from->package?".":"", from->name, - to->package, to->package?".":"", to->name); - return c; -} + from->package, from->package[0]?".":"", from->name, + to->package, to->package[0]?".":"", to->name); -code_t*defaultvalue(code_t*c, classinfo_t*type) -{ - if(TYPE_IS_INT(type)) { - c = abc_pushbyte(c, 0); - } else if(TYPE_IS_UINT(type)) { - c = abc_pushuint(c, 0); - } else if(TYPE_IS_FLOAT(type)) { - c = abc_pushnan(c); - } else if(TYPE_IS_BOOLEAN(type)) { - c = abc_pushfalse(c); - } else if(!type) { - //c = abc_pushundefined(c); - } else { - c = abc_pushnull(c); - MULTINAME(m, type); - c = abc_coerce2(c, &m); - } return c; } +/* move to ast.c todo end */ char is_pushundefined(code_t*c) { @@ -1779,175 +1722,6 @@ typedcode_t push_class(slotinfo_t*a) return x; } -static char is_getlocal(code_t*c) -{ - if(!c || c->prev || c->next) - return 0; - return(c->opcode == OPCODE_GETLOCAL - || c->opcode == OPCODE_GETLOCAL_0 - || c->opcode == OPCODE_GETLOCAL_1 - || c->opcode == OPCODE_GETLOCAL_2 - || c->opcode == OPCODE_GETLOCAL_3); -} -static int getlocalnr(code_t*c) -{ - if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];} - else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;} - else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;} - else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;} - else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;} - else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode); - return 0; -} - -static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore) -{ - /* converts this: - - [prefix code] [read instruction] - - to this: - - [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar] - */ - if(in && in->opcode == OPCODE_COERCE_A) { - in = code_cutlast(in); - } - if(in->next) - syntaxerror("internal error"); - - /* chop off read instruction */ - code_t*prefix = in; - code_t*r = in; - if(r->prev) { - prefix = r->prev;r->prev = 0; - prefix->next=0; - } else { - prefix = 0; - } - - char use_temp_var = readbefore; - - /* generate the write instruction, and maybe append a dup to the prefix code */ - code_t* write = abc_nop(0); - if(r->opcode == OPCODE_GETPROPERTY) { - write->opcode = OPCODE_SETPROPERTY; - multiname_t*m = (multiname_t*)r->data[0]; - write->data[0] = multiname_clone(m); - if(m->type == QNAME || m->type == MULTINAME) { - if(!justassign) { - prefix = abc_dup(prefix); // we need the object, too - } - use_temp_var = 1; - } else if(m->type == MULTINAMEL) { - if(!justassign) { - /* dupping two values on the stack requires 5 operations and one register- - couldn't adobe just have given us a dup2? */ - int temp = gettempvar(); - prefix = abc_setlocal(prefix, temp); - prefix = abc_dup(prefix); - prefix = abc_getlocal(prefix, temp); - prefix = abc_swap(prefix); - prefix = abc_getlocal(prefix, temp); - if(!use_temp_var); - prefix = abc_kill(prefix, temp); - } - use_temp_var = 1; - } else { - syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname/multiname)"); - } - } else if(r->opcode == OPCODE_GETSLOT) { - write->opcode = OPCODE_SETSLOT; - write->data[0] = r->data[0]; - if(!justassign) { - prefix = abc_dup(prefix); // we need the object, too - } - use_temp_var = 1; - } else if(r->opcode == OPCODE_GETLOCAL) { - write->opcode = OPCODE_SETLOCAL; - write->data[0] = r->data[0]; - } else if(r->opcode == OPCODE_GETLOCAL_0) { - write->opcode = OPCODE_SETLOCAL_0; - } else if(r->opcode == OPCODE_GETLOCAL_1) { - write->opcode = OPCODE_SETLOCAL_1; - } else if(r->opcode == OPCODE_GETLOCAL_2) { - 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"); - } - code_t* c = 0; - - int temp = -1; - if(!justassign) { - if(use_temp_var) { - /* with getproperty/getslot, we have to be extra careful not - to execute the read code twice, as it might have side-effects - (e.g. if the property is in fact a setter/getter combination) - - So read the value, modify it, and write it again, - using prefix only once and making sure (by using a temporary - register) that the return value is what we just wrote */ - temp = gettempvar(); - c = code_append(c, prefix); - c = code_append(c, r); - if(readbefore) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, middlepart); - if(!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); - } 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); - c = code_append(c, r); - c = code_append(c, middlepart); - c = code_append(c, write); - c = code_append(c, r2); - } - } else { - /* even smaller version: overwrite the value without reading - it out first */ - if(!use_temp_var) { - if(prefix) { - c = code_append(c, prefix); - c = abc_dup(c); - } - c = code_append(c, middlepart); - c = code_append(c, write); - c = code_append(c, r); - } else { - code_free(r);r=0; - temp = gettempvar(); - if(prefix) { - c = code_append(c, prefix); - } - c = code_append(c, middlepart); - c = abc_dup(c); - c = abc_setlocal(c, temp); - c = code_append(c, write); - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); - } - } - return c; -} char is_break_or_jump(code_t*c) { @@ -1964,7 +1738,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -2083,13 +1856,83 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) #define PASS1 }} if(as3_pass == 1) {{ #define PASS1END }} if(as3_pass == 2) {{ #define PASS2 }} if(as3_pass == 2) {{ -#define PASS12 }} {{ +#define PASS12 }} if(as3_pass == 1 || as3_pass == 2) {{ #define PASS12END }} if(as3_pass == 2) {{ +#define PASS_ALWAYS }} {{ /* Line 273 of skeleton.m4 */ -#line 2093 "parser.tab.c" +#line 1867 "parser.tab.c" +/* Unqualified %code blocks. */ + +/* Line 274 of skeleton.m4 */ +#line 1944 "parser.y" + + char is_subtype_of(classinfo_t*type, classinfo_t*supertype) + { + return 1; // FIXME + } + + +/* Line 274 of skeleton.m4 */ +#line 2393 "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 2526 "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 3414 "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 1936 "parser.tab.c" #ifdef short # undef short @@ -2302,22 +2145,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 146 +#define YYFINAL 149 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3061 +#define YYLAST 3107 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 134 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 114 +#define YYNNTS 116 /* YYNRULES -- Number of rules. */ -#define YYNRULES 308 +#define YYNRULES 305 /* YYNRULES -- Number of states. */ -#define YYNSTATES 520 +#define YYNSTATES 519 /* 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) @@ -2328,16 +2171,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, 100, 111, 126, 113, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 104, 99, + 108, 102, 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, @@ -2360,8 +2203,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, 98, 101, 110, 118, 119, 120, 122, + 128, 129, 130 }; #if YYDEBUG @@ -2380,159 +2223,159 @@ static const yytype_uint16 yyprhs[] = 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, 233, 238, 242, 243, 252, 253, 263, 264, 270, 272, 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, - 305, 307, 311, 313, 314, 321, 322, 328, 331, 336, - 337, 339, 341, 344, 346, 348, 350, 352, 354, 356, - 358, 360, 362, 364, 365, 368, 369, 372, 373, 376, - 377, 387, 388, 397, 398, 400, 402, 405, 407, 412, - 414, 416, 418, 419, 421, 423, 426, 428, 431, 440, - 442, 444, 445, 450, 452, 456, 460, 461, 464, 466, - 468, 470, 472, 474, 476, 478, 480, 482, 483, 485, - 488, 493, 497, 499, 504, 507, 509, 511, 512, 513, - 526, 528, 529, 530, 541, 543, 547, 549, 551, 553, - 557, 559, 561, 563, 566, 567, 568, 572, 573, 575, - 577, 579, 582, 585, 586, 591, 596, 601, 604, 606, - 609, 611, 613, 617, 619, 621, 623, 625, 627, 629, - 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, - 651, 653, 657, 661, 665, 669, 673, 677, 681, 685, - 689, 693, 696, 699, 703, 707, 711, 715, 719, 723, - 727, 731, 735, 739, 743, 747, 751, 755, 759, 764, - 767, 769, 773, 776, 781, 785, 786, 788, 792, 798, - 802, 806, 810, 814, 818, 822, 826, 830, 834, 838, - 842, 846, 852, 855, 858, 861, 864, 868, 871, 876, - 882, 886, 892, 896, 898, 901, 906, 911, 914 + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 617, 621, 623, 627, 628, 630, + 632, 634, 638, 644, 646, 648, 650, 652, 654, 656, + 658, 660, 664, 668, 672, 676, 680, 684, 688, 692, + 696, 700, 704, 708, 711, 714, 718, 722, 726, 730, + 734, 738, 742, 746, 750, 754, 758, 762, 766, 770, + 774, 779, 782, 784, 788, 791, 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, 904, 909, 912 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 186, -1, 198, -1, 196, -1, 217, - -1, 207, -1, 147, -1, 148, 126, 136, 132, -1, - 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 198, -1, 196, -1, 217, -1, 207, -1, 147, -1, - 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, - 143, 145, -1, 145, -1, 189, -1, 159, -1, 160, - -1, 161, -1, 163, -1, 171, -1, 154, -1, 183, - -1, 179, -1, 239, -1, 247, -1, 246, -1, 126, - 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, - 150, -1, 165, -1, 166, -1, 236, -1, 181, -1, - 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 237, -1, -1, - 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 227, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 238, 133, 146, 153, -1, -1, - 150, -1, 239, -1, 46, 3, 227, -1, 3, -1, - 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 238, 99, 239, 133, 146, -1, 158, 157, 68, 238, - 133, 146, -1, -1, 14, 122, 162, 238, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 238, 133, -1, - 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 240, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 240, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 227, 133, 174, 126, - 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, - 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, - 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, - 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, - 182, 146, -1, 3, -1, 19, -1, 185, 127, 184, - -1, 184, -1, -1, 19, 185, 126, 187, 139, 132, - -1, -1, 19, 126, 188, 139, 132, -1, 41, 223, - -1, 41, 185, 127, 115, -1, -1, 191, -1, 192, - -1, 191, 192, -1, 21, -1, 22, -1, 20, -1, - 38, -1, 47, -1, 49, -1, 48, -1, 26, -1, - 24, -1, 4, -1, -1, 54, 224, -1, -1, 54, - 225, -1, -1, 17, 225, -1, -1, 190, 31, 3, - 193, 195, 126, 197, 200, 132, -1, -1, 190, 44, - 3, 194, 126, 199, 203, 132, -1, -1, 201, -1, - 202, -1, 201, 202, -1, 99, -1, 148, 126, 200, - 132, -1, 207, -1, 217, -1, 144, -1, -1, 204, - -1, 205, -1, 204, 205, -1, 99, -1, 46, 3, - -1, 190, 27, 216, 3, 122, 213, 133, 227, -1, - 46, -1, 32, -1, -1, 190, 206, 208, 209, -1, - 210, -1, 209, 100, 210, -1, 3, 227, 149, -1, - -1, 102, 212, -1, 10, -1, 8, -1, 9, -1, - 12, -1, 5, -1, 56, -1, 55, -1, 45, -1, - 3, -1, -1, 214, -1, 93, 215, -1, 214, 100, - 93, 215, -1, 214, 100, 215, -1, 215, -1, 3, - 105, 226, 211, -1, 3, 211, -1, 51, -1, 35, - -1, -1, -1, 190, 27, 216, 3, 122, 213, 133, - 227, 126, 218, 142, 132, -1, 3, -1, -1, -1, - 27, 219, 122, 213, 133, 227, 126, 221, 142, 132, - -1, 3, -1, 185, 127, 3, -1, 223, -1, 222, - -1, 224, -1, 225, 100, 224, -1, 224, -1, 115, - -1, 36, -1, 105, 226, -1, -1, -1, 122, 229, - 133, -1, -1, 230, -1, 231, -1, 237, -1, 230, - 100, -1, 231, 237, -1, -1, 25, 240, 232, 228, - -1, 240, 122, 229, 133, -1, 53, 122, 229, 133, - -1, 63, 240, -1, 42, -1, 42, 238, -1, 240, - -1, 240, -1, 238, 100, 240, -1, 238, -1, 220, - -1, 241, -1, 244, -1, 233, -1, 235, -1, 234, - -1, 6, -1, 10, -1, 11, -1, 8, -1, 9, - -1, 12, -1, 5, -1, 29, -1, 56, -1, 55, - -1, 45, -1, 240, 109, 240, -1, 240, 110, 240, - -1, 240, 75, 240, -1, 240, 76, 240, -1, 240, - 71, 240, -1, 240, 72, 240, -1, 240, 74, 240, - -1, 240, 73, 240, -1, 240, 87, 240, -1, 240, - 88, 240, -1, 118, 240, -1, 117, 240, -1, 240, - 108, 240, -1, 240, 107, 240, -1, 240, 106, 240, - -1, 240, 96, 240, -1, 240, 95, 240, -1, 240, - 94, 240, -1, 240, 114, 240, -1, 240, 116, 240, - -1, 240, 113, 240, -1, 240, 112, 240, -1, 240, - 115, 240, -1, 240, 68, 240, -1, 240, 69, 240, - -1, 240, 40, 240, -1, 240, 67, 240, -1, 43, - 122, 240, 133, -1, 36, 240, -1, 36, -1, 122, - 238, 133, -1, 112, 240, -1, 240, 124, 240, 125, - -1, 124, 229, 125, -1, -1, 243, -1, 237, 105, - 237, -1, 243, 100, 237, 105, 237, -1, 70, 242, - 132, -1, 240, 80, 240, -1, 240, 79, 240, -1, - 240, 85, 240, -1, 240, 84, 240, -1, 240, 86, - 240, -1, 240, 78, 240, -1, 240, 77, 240, -1, - 240, 83, 240, -1, 240, 81, 240, -1, 240, 82, - 240, -1, 240, 102, 240, -1, 240, 104, 240, 105, - 240, -1, 240, 91, -1, 240, 90, -1, 91, 240, - -1, 90, 240, -1, 53, 127, 3, -1, 128, 3, - -1, 240, 127, 128, 3, -1, 240, 127, 3, 89, - 3, -1, 240, 92, 3, -1, 240, 127, 122, 240, - 133, -1, 240, 127, 3, -1, 3, -1, 18, 3, - -1, 18, 3, 102, 3, -1, 18, 3, 102, 5, - -1, 190, 245, -1, 23, 18, 224, -1 + 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, + 136, 137, -1, 185, -1, 197, -1, 195, -1, 216, + -1, 206, -1, 146, -1, 147, 125, 135, 131, -1, + 99, -1, -1, 139, -1, 140, -1, 139, 140, -1, + 197, -1, 195, -1, 216, -1, 206, -1, 146, -1, + 147, 125, 138, 131, -1, 99, -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, 239, -1, 248, -1, 247, -1, 125, + 142, 131, -1, 125, 131, -1, 99, -1, 143, -1, + 149, -1, 164, -1, 165, -1, 235, -1, 180, -1, + 147, 125, 142, 131, -1, 144, 99, -1, 144, -1, + 143, -1, 3, 89, 3, -1, 102, 243, -1, -1, + 45, 150, -1, 31, 150, -1, 151, -1, 150, 100, + 151, -1, 3, 226, 148, -1, -1, 64, 145, -1, + -1, 63, 121, 154, 237, 132, 145, 152, -1, -1, + 149, -1, 239, -1, 45, 3, 226, -1, 3, -1, + 11, 121, -1, 11, 49, 121, -1, 157, 155, 99, + 237, 99, 239, 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, 243, 104, 141, -1, 61, 104, + 141, -1, -1, 14, 121, 171, 243, 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, 99, -1, 147, + 125, 199, 131, -1, 206, -1, 216, -1, 143, -1, + -1, 203, -1, 204, -1, 203, 204, -1, 99, -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, 100, 209, -1, 3, 226, + 148, -1, -1, 102, 243, -1, 8, -1, 9, -1, + 10, -1, 5, -1, 55, -1, 54, -1, 44, -1, + 27, -1, 28, -1, -1, 213, -1, 93, 214, -1, + 213, 100, 93, 214, -1, 213, 100, 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, 100, 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, 100, -1, 230, 236, -1, -1, 23, 243, + 231, 227, -1, 243, 121, 228, 132, -1, 52, 121, + 228, 132, -1, 62, 243, -1, 41, -1, 41, 237, + -1, 243, -1, 238, -1, 243, -1, 238, 100, 243, + -1, 243, -1, 239, 100, 243, -1, -1, 242, -1, + 3, -1, 5, -1, 241, 104, 236, -1, 242, 100, + 241, 104, 236, -1, 219, -1, 244, -1, 232, -1, + 234, -1, 233, -1, 245, -1, 211, -1, 6, -1, + 123, 228, 124, -1, 69, 240, 131, -1, 243, 108, + 243, -1, 243, 109, 243, -1, 243, 74, 243, -1, + 243, 75, 243, -1, 243, 70, 243, -1, 243, 71, + 243, -1, 243, 73, 243, -1, 243, 72, 243, -1, + 243, 87, 243, -1, 243, 88, 243, -1, 117, 243, + -1, 116, 243, -1, 243, 107, 243, -1, 243, 106, + 243, -1, 243, 105, 243, -1, 243, 96, 243, -1, + 243, 95, 243, -1, 243, 94, 243, -1, 243, 113, + 243, -1, 243, 115, 243, -1, 243, 112, 243, -1, + 243, 111, 243, -1, 243, 114, 243, -1, 243, 67, + 243, -1, 243, 68, 243, -1, 243, 39, 243, -1, + 243, 66, 243, -1, 42, 121, 243, 132, -1, 35, + 243, -1, 35, -1, 121, 238, 132, -1, 111, 243, + -1, 243, 123, 243, 124, -1, 243, 79, 243, -1, + 243, 78, 243, -1, 243, 85, 243, -1, 243, 84, + 243, -1, 243, 86, 243, -1, 243, 77, 243, -1, + 243, 76, 243, -1, 243, 83, 243, -1, 243, 80, + 243, -1, 243, 81, 243, -1, 243, 82, 243, -1, + 243, 102, 243, -1, 243, 103, 243, 104, 243, -1, + 243, 91, -1, 243, 90, -1, 91, 243, -1, 90, + 243, -1, 52, 126, 3, -1, 127, 3, -1, 243, + 126, 127, 3, -1, 243, 126, 3, 89, 3, -1, + 243, 92, 3, -1, 243, 126, 121, 243, 132, -1, + 243, 126, 3, -1, 3, -1, 16, 3, -1, 16, + 3, 102, 3, -1, 16, 3, 102, 5, -1, 189, + 246, -1, 21, 16, 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 2071, 2071, 2073, 2073, 2074, 2075, 2077, 2078, 2079, - 2080, 2081, 2082, 2083, 2084, 2086, 2086, 2087, 2088, 2090, - 2091, 2092, 2093, 2094, 2095, 2096, 2098, 2099, 2101, 2102, - 2105, 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, - 2115, 2116, 2117, 2118, 2121, 2122, 2123, 2124, 2125, 2126, - 2127, 2128, 2132, 2133, 2137, 2144, 2148, 2149, 2153, 2154, - 2156, 2157, 2159, 2220, 2221, 2224, 2224, 2243, 2244, 2245, - 2250, 2254, 2259, 2260, 2262, 2282, 2330, 2330, 2349, 2349, - 2364, 2367, 2370, 2373, 2377, 2378, 2379, 2380, 2381, 2382, - 2384, 2395, 2398, 2398, 2429, 2429, 2454, 2454, 2470, 2471, - 2472, 2473, 2481, 2490, 2490, 2539, 2543, 2554, 2564, 2581, - 2582, 2584, 2585, 2587, 2587, 2589, 2589, 2592, 2608, 2625, - 2626, 2627, 2628, 2636, 2637, 2638, 2639, 2640, 2641, 2642, - 2643, 2644, 2645, 2649, 2650, 2652, 2653, 2655, 2656, 2660, - 2658, 2666, 2664, 2673, 2674, 2675, 2676, 2677, 2678, 2679, - 2680, 2682, 2688, 2689, 2690, 2691, 2692, 2693, 2696, 2709, - 2709, 2711, 2711, 2713, 2714, 2716, 2791, 2792, 2794, 2795, - 2796, 2797, 2798, 2800, 2801, 2802, 2803, 2815, 2819, 2825, - 2831, 2839, 2844, 2850, 2858, 2866, 2867, 2868, 2871, 2870, - 2887, 2888, 2890, 2889, 2913, 2932, 2946, 2947, 2949, 2950, - 2952, 2953, 2954, 2963, 2964, 2968, 2969, 2971, 2972, 2973, - 2975, 2979, 2980, 2985, 2986, 3022, 3068, 3089, 3110, 3113, - 3120, 3121, 3122, 3128, 3134, 3136, 3138, 3140, 3142, 3144, - 3146, 3163, 3168, 3171, 3174, 3177, 3180, 3183, 3186, 3189, - 3192, 3196, 3199, 3202, 3205, 3208, 3211, 3214, 3217, 3221, - 3232, 3250, 3255, 3260, 3265, 3270, 3275, 3279, 3283, 3288, - 3292, 3296, 3305, 3314, 3324, 3329, 3341, 3347, 3352, 3358, - 3364, 3368, 3370, 3381, 3390, 3397, 3398, 3400, 3406, 3415, - 3422, 3434, 3440, 3446, 3452, 3458, 3464, 3470, 3476, 3489, - 3500, 3507, 3520, 3547, 3561, 3575, 3589, 3604, 3611, 3618, - 3625, 3632, 3643, 3693, 3798, 3805, 3812, 3819, 3826 + 0, 1849, 1849, 1851, 1851, 1852, 1853, 1855, 1856, 1857, + 1858, 1859, 1860, 1861, 1862, 1864, 1864, 1865, 1866, 1868, + 1869, 1870, 1871, 1872, 1873, 1874, 1876, 1877, 1879, 1882, + 1885, 1886, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, + 1895, 1896, 1897, 1898, 1901, 1902, 1903, 1904, 1905, 1906, + 1907, 1908, 1920, 1921, 1925, 1932, 1951, 1952, 1954, 1955, + 1957, 1958, 1960, 2020, 2021, 2024, 2024, 2043, 2044, 2045, + 2050, 2054, 2059, 2060, 2062, 2082, 2130, 2130, 2149, 2149, + 2164, 2167, 2170, 2173, 2177, 2178, 2179, 2180, 2181, 2182, + 2184, 2195, 2198, 2198, 2229, 2229, 2254, 2254, 2270, 2271, + 2272, 2273, 2281, 2290, 2290, 2339, 2343, 2354, 2364, 2381, + 2382, 2383, 2385, 2386, 2388, 2388, 2390, 2390, 2413, 2427, + 2443, 2444, 2445, 2446, 2453, 2454, 2455, 2456, 2457, 2458, + 2459, 2460, 2461, 2462, 2466, 2467, 2469, 2470, 2472, 2473, + 2477, 2475, 2483, 2481, 2490, 2491, 2492, 2493, 2494, 2495, + 2496, 2497, 2499, 2505, 2506, 2507, 2508, 2509, 2510, 2513, + 2545, 2545, 2547, 2547, 2549, 2550, 2552, 2646, 2647, 2655, + 2656, 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2680, 2684, + 2690, 2696, 2704, 2709, 2715, 2723, 2731, 2732, 2733, 2736, + 2735, 2752, 2753, 2755, 2754, 2778, 2797, 2811, 2812, 2814, + 2815, 2817, 2818, 2819, 2828, 2829, 2833, 2834, 2836, 2837, + 2838, 2840, 2844, 2845, 2850, 2851, 2888, 2938, 2959, 2981, + 2984, 2991, 2994, 2997, 3000, 3003, 3006, 3011, 3012, 3014, + 3015, 3017, 3023, 3032, 3033, 3034, 3035, 3036, 3037, 3039, + 3044, 3064, 3074, 3083, 3084, 3085, 3086, 3087, 3088, 3089, + 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, + 3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, + 3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, + 3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128, 3130, + 3131, 3132, 3133, 3135, 3150, 3156, 3162, 3168, 3174, 3187, + 3245, 3378, 3385, 3392, 3399, 3423 }; #endif @@ -2542,11 +2385,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\"", @@ -2556,38 +2399,39 @@ static const char *const yytname[] = "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"", "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", - "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", - "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", - "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", - "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='", - "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", - "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix", - "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'", - "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'", - "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST", - "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST", - "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE", - "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE", - "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION", - "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT", - "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_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", - "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", + "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"", "\"+=\"", + "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", + "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", + "\">>\"", "prec_none", "below_semicolon", "';'", "','", + "below_assignment", "'='", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", + "'>'", "below_minus", "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", + "minusminus_prefix", "plusplus_prefix", "below_curly", "'('", "new2", + "'['", "']'", "'{'", "'.'", "'@'", "above_identifier", "below_else", + "above_function", "'}'", "')'", "$accept", "PROGRAM", + "MAYBE_PROGRAM_CODE_LIST", "PROGRAM_CODE_LIST", "PROGRAM_CODE", + "MAYBE_INPACKAGE_CODE_LIST", "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", + "MAYBECODE", "CODE", "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", + "PACKAGE_INITCODE", "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", + "VARIABLE_DECLARATION", "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", + "IF", "$@1", "FOR_INIT", "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_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", "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", + "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST", + "DICTLH", "DICT_EXPRPAIR_LIST", "E", "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2607,47 +2451,47 @@ static const yytype_uint16 yytoknum[] = 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 + 44, 354, 61, 63, 58, 124, 94, 38, 60, 62, + 355, 45, 43, 47, 42, 37, 126, 33, 356, 357, + 358, 40, 359, 91, 93, 123, 46, 64, 360, 361, + 362, 125, 41 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 134, 135, 136, 136, 137, 137, 138, 138, 138, - 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, - 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, - 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, - 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, - 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, - 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, - 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, - 178, 178, 178, 180, 179, 181, 181, 182, 183, 184, - 184, 185, 185, 187, 186, 188, 186, 189, 189, 190, - 190, 191, 191, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 193, 193, 194, 194, 195, 195, 197, - 196, 199, 198, 200, 200, 201, 201, 202, 202, 202, - 202, 202, 203, 203, 204, 204, 205, 205, 205, 206, - 206, 208, 207, 209, 209, 210, 211, 211, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 213, 213, 213, - 213, 214, 214, 215, 215, 216, 216, 216, 218, 217, - 219, 219, 221, 220, 222, 223, 224, 224, 225, 225, - 226, 226, 226, 227, 227, 228, 228, 229, 229, 229, - 230, 231, 230, 232, 233, 234, 234, 235, 236, 236, - 237, 238, 238, 239, 240, 240, 240, 240, 240, 240, - 240, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 242, 242, 243, 243, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 244, 245, 245, 245, 246, 247 + 0, 133, 134, 135, 135, 136, 136, 137, 137, 137, + 137, 137, 137, 137, 137, 138, 138, 139, 139, 140, + 140, 140, 140, 140, 140, 140, 141, 141, 142, 142, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 144, 144, 144, 144, 144, 144, + 144, 144, 145, 145, 146, 147, 148, 148, 149, 149, + 150, 150, 151, 152, 152, 154, 153, 155, 155, 155, + 156, 156, 157, 157, 158, 159, 161, 160, 163, 162, + 164, 164, 165, 165, 166, 166, 166, 166, 167, 167, + 168, 169, 171, 170, 173, 172, 175, 174, 176, 176, + 177, 177, 177, 179, 178, 180, 180, 181, 182, 183, + 183, 183, 184, 184, 186, 185, 187, 185, 188, 188, + 189, 189, 190, 190, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 192, 192, 193, 193, 194, 194, + 196, 195, 198, 197, 199, 199, 200, 200, 201, 201, + 201, 201, 201, 202, 202, 203, 203, 204, 204, 204, + 205, 205, 207, 206, 208, 208, 209, 210, 210, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 213, 213, 214, 214, 215, 215, 215, 217, + 216, 218, 218, 220, 219, 221, 222, 223, 223, 224, + 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, + 228, 229, 230, 229, 231, 232, 233, 233, 234, 235, + 235, 236, 237, 238, 238, 239, 239, 240, 240, 241, + 241, 242, 242, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 244, + 245, 246, 246, 246, 247, 248 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2664,26 +2508,26 @@ static const yytype_uint8 yyr2[] = 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, 4, 3, 0, 8, 0, 9, 0, 5, 1, 2, 1, 2, 1, 0, 6, 2, 1, 4, 2, 1, - 1, 3, 1, 0, 6, 0, 5, 2, 4, 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 2, 0, 2, 0, 2, 0, - 9, 0, 8, 0, 1, 1, 2, 1, 4, 1, - 1, 1, 0, 1, 1, 2, 1, 2, 8, 1, - 1, 0, 4, 1, 3, 3, 0, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, - 4, 3, 1, 4, 2, 1, 1, 0, 0, 12, - 1, 0, 0, 10, 1, 3, 1, 1, 1, 3, - 1, 1, 1, 2, 0, 0, 3, 0, 1, 1, - 1, 2, 2, 0, 4, 4, 4, 2, 1, 2, - 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 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, 1, 3, 1, 3, 0, 1, 1, + 1, 3, 5, 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, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 5, 2, 2, 2, 2, 3, 2, 4, 5, - 3, 5, 3, 1, 2, 4, 4, 2, 3 + 4, 2, 1, 3, 2, 4, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 2, + 2, 2, 2, 3, 2, 4, 5, 3, 5, 3, + 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2691,778 +2535,786 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 119, 303, 132, 236, 230, 233, 234, 231, 232, 235, - 0, 0, 78, 0, 0, 125, 123, 124, 0, 131, - 0, 130, 191, 237, 270, 126, 0, 0, 0, 240, - 127, 129, 128, 0, 0, 239, 238, 0, 0, 275, - 0, 0, 14, 0, 0, 0, 0, 207, 119, 0, - 0, 2, 119, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 119, 37, 7, 30, 0, - 120, 121, 9, 8, 11, 10, 224, 227, 229, 228, - 223, 39, 221, 225, 226, 41, 40, 0, 0, 72, - 76, 119, 92, 109, 110, 115, 112, 0, 0, 303, - 213, 190, 0, 269, 0, 0, 117, 0, 103, 207, - 0, 217, 65, 0, 220, 0, 276, 295, 294, 272, - 252, 251, 0, 0, 208, 209, 210, 82, 0, 106, - 218, 0, 80, 44, 43, 119, 45, 29, 0, 46, - 47, 48, 50, 0, 49, 297, 1, 6, 119, 303, - 0, 68, 0, 0, 69, 53, 108, 0, 187, 0, - 160, 0, 159, 161, 307, 122, 0, 0, 0, 0, + 120, 300, 133, 172, 240, 169, 170, 171, 0, 0, + 78, 0, 0, 126, 124, 125, 0, 132, 0, 131, + 192, 176, 177, 272, 127, 0, 0, 0, 175, 128, + 130, 129, 0, 0, 174, 173, 0, 0, 227, 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, 239, 10, 233, 235, 237, 236, + 39, 225, 234, 238, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 300, + 214, 191, 0, 271, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 229, 230, 0, 0, 228, 292, 291, + 274, 254, 253, 0, 223, 0, 209, 210, 211, 221, + 82, 0, 106, 219, 0, 80, 44, 43, 120, 45, + 29, 0, 46, 47, 48, 50, 0, 49, 294, 1, + 6, 120, 300, 0, 68, 0, 0, 69, 53, 108, + 0, 188, 0, 161, 0, 160, 162, 304, 123, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 290, 289, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 293, - 292, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 207, 0, 0, - 55, 73, 0, 0, 0, 119, 113, 0, 194, 0, - 197, 196, 308, 205, 177, 0, 0, 0, 27, 0, - 296, 0, 0, 279, 0, 271, 274, 211, 212, 83, - 204, 59, 60, 105, 219, 58, 81, 42, 28, 119, - 0, 204, 0, 0, 52, 304, 186, 185, 0, 133, - 135, 0, 222, 266, 267, 264, 265, 245, 246, 248, - 247, 243, 244, 286, 285, 281, 280, 288, 289, 287, - 283, 282, 284, 249, 250, 300, 258, 257, 256, 290, - 0, 255, 254, 253, 241, 242, 262, 261, 259, 263, - 260, 0, 0, 302, 0, 0, 0, 0, 0, 25, - 0, 119, 17, 23, 0, 20, 19, 22, 21, 119, - 111, 0, 207, 214, 166, 0, 0, 178, 182, 107, - 195, 118, 268, 0, 26, 216, 0, 277, 0, 0, - 57, 0, 119, 13, 57, 0, 0, 0, 0, 0, - 137, 0, 0, 204, 162, 163, 0, 215, 273, 0, - 0, 298, 119, 0, 0, 116, 18, 119, 0, 0, - 0, 0, 184, 179, 204, 0, 0, 119, 0, 202, - 201, 200, 203, 0, 62, 61, 51, 0, 119, 305, - 306, 177, 134, 0, 0, 198, 136, 141, 57, 0, - 291, 299, 301, 77, 0, 84, 0, 114, 206, 176, - 172, 169, 170, 168, 171, 175, 174, 173, 167, 166, - 0, 0, 181, 0, 0, 98, 102, 100, 104, 63, - 278, 56, 0, 75, 0, 138, 139, 0, 119, 165, - 164, 79, 0, 0, 0, 85, 88, 86, 24, 183, - 192, 180, 96, 0, 99, 101, 119, 66, 119, 204, - 119, 199, 0, 156, 0, 0, 119, 154, 0, 27, - 93, 89, 87, 27, 27, 204, 64, 74, 0, 147, - 151, 0, 0, 0, 119, 145, 149, 150, 157, 187, - 142, 155, 27, 91, 0, 0, 0, 188, 119, 140, - 146, 0, 90, 193, 97, 94, 27, 0, 0, 0, - 0, 148, 177, 27, 189, 0, 0, 204, 95, 158 + 0, 208, 0, 0, 55, 73, 0, 0, 0, 120, + 114, 0, 195, 0, 198, 197, 305, 206, 178, 0, + 222, 0, 0, 27, 0, 293, 0, 242, 0, 0, + 0, 273, 241, 212, 213, 83, 205, 59, 60, 105, + 220, 58, 81, 42, 28, 120, 0, 205, 0, 0, + 52, 301, 187, 186, 0, 134, 136, 0, 226, 268, + 269, 266, 267, 247, 248, 250, 249, 245, 246, 282, + 281, 277, 276, 284, 285, 286, 283, 279, 278, 280, + 251, 252, 297, 260, 259, 258, 287, 0, 257, 256, + 255, 243, 244, 264, 263, 261, 265, 262, 0, 0, + 299, 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, 270, + 0, 26, 217, 0, 231, 0, 224, 0, 57, 0, + 120, 13, 57, 0, 0, 0, 0, 0, 138, 0, + 0, 205, 163, 164, 0, 216, 275, 0, 0, 295, + 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, 302, 303, 178, + 135, 0, 0, 199, 137, 142, 57, 0, 288, 296, + 298, 77, 0, 84, 0, 115, 207, 168, 167, 0, + 0, 182, 0, 0, 98, 102, 100, 104, 63, 232, + 56, 0, 75, 0, 139, 140, 0, 120, 166, 165, + 79, 0, 0, 0, 85, 88, 86, 24, 184, 193, + 181, 96, 0, 99, 101, 120, 66, 120, 205, 120, + 200, 0, 157, 0, 0, 120, 155, 0, 27, 93, + 89, 87, 27, 27, 205, 64, 74, 0, 148, 152, + 0, 0, 0, 120, 146, 150, 151, 158, 188, 143, + 156, 27, 91, 0, 0, 0, 189, 120, 141, 147, + 0, 90, 194, 97, 94, 27, 0, 0, 0, 0, + 149, 178, 27, 190, 0, 0, 205, 95, 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 310, 311, 312, 333, 334, - 136, 137, 156, 313, 138, 384, 139, 245, 242, 457, - 57, 231, 152, 153, 58, 59, 60, 61, 212, 62, - 91, 140, 141, 444, 445, 446, 447, 63, 214, 425, - 509, 426, 474, 427, 428, 64, 228, 142, 65, 66, - 96, 219, 67, 319, 215, 68, 143, 70, 71, 350, - 352, 394, 315, 460, 316, 438, 483, 484, 485, 465, - 466, 467, 163, 317, 261, 354, 355, 372, 418, 326, - 327, 328, 258, 318, 506, 102, 76, 473, 220, 221, - 381, 396, 382, 340, 323, 123, 124, 125, 223, 77, - 78, 79, 144, 126, 80, 81, 82, 83, 115, 116, - 84, 164, 85, 86 + -1, 49, 50, 51, 52, 317, 318, 319, 340, 341, + 139, 140, 159, 320, 141, 392, 142, 251, 248, 456, + 56, 236, 155, 156, 57, 58, 59, 60, 216, 61, + 90, 143, 144, 443, 444, 445, 446, 62, 218, 424, + 508, 425, 473, 426, 427, 63, 233, 145, 64, 65, + 222, 223, 66, 326, 219, 67, 146, 69, 70, 358, + 360, 402, 322, 459, 323, 437, 482, 483, 484, 464, + 465, 466, 166, 324, 267, 362, 363, 380, 74, 333, + 334, 335, 264, 325, 505, 102, 76, 472, 224, 225, + 389, 404, 390, 348, 330, 125, 126, 127, 227, 77, + 78, 79, 147, 128, 229, 230, 80, 115, 116, 117, + 81, 82, 83, 167, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -388 +#define YYPACT_NINF -400 static const yytype_int16 yypact[] = { - 1673, -42, -388, -388, -388, -388, -388, -388, -388, -388, - -29, -72, -388, -47, 16, -388, -388, -388, 74, -388, - 2093, -388, 64, -388, 2163, -388, -24, 42, 25, -388, - -388, -388, -388, -1, 5, -388, -388, 2093, 56, 2093, - 2093, 2093, -388, 2093, 2093, 2093, 2093, 2093, 633, 110, - 144, -388, 503, -388, -388, -388, 50, -388, 2023, -388, - -388, -388, -388, -388, -388, 1925, -388, -388, -388, 97, - 233, -388, -388, -388, -388, -388, -388, -388, -388, -388, - 104, -388, 2568, -388, -388, -388, -388, 196, 84, -388, - -388, 1925, -388, -388, -388, -388, -388, 85, 70, -388, - -59, -388, 91, 237, 2093, 87, -388, 2093, -388, 2093, - 225, 237, -388, 130, 2568, 106, 139, 237, 237, 174, - 237, 237, -61, 121, 147, 2093, -388, 245, 253, 2093, - 2093, 253, 255, -388, -388, 763, -388, -388, 135, -388, - -388, -388, -388, 249, -388, -388, -388, -388, 1023, 195, - 265, -388, 170, 202, -388, 173, -388, 270, 72, 271, - -388, 272, -388, -388, -388, -388, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, -388, - -388, 273, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 2093, 11, - -388, -388, 2093, 269, 2093, 1153, -388, 42, 157, 158, - -388, -388, -388, 164, 13, -57, 19, 2188, 1799, 160, - -388, 2093, 2093, -388, 2093, -388, -388, -388, -388, -388, - 189, 197, -388, 104, 104, 197, -388, -388, -388, 1925, - 163, 189, 2093, 2093, -388, 198, -388, -388, 296, 251, - 252, 305, 2568, 301, 495, 495, 495, 2934, 2934, 2934, - 2934, 301, 301, 2568, 2568, 2568, 2568, 2568, 2568, 2568, - 2568, 2568, 2568, 2629, 2690, -388, 118, 118, 118, 2568, - 2385, 2751, 2812, 2873, 301, 301, 174, 174, 237, 237, - 237, 177, 2446, 226, 2093, 311, -56, 194, 2259, -388, - 185, 1283, -388, -388, 192, -388, -388, -388, -388, 1153, - -388, 119, 2093, -388, 100, 320, 191, 230, -388, -388, - 157, -388, -388, 193, 1799, -388, -54, -388, 221, 22, - 229, 253, 893, -388, -28, 31, -16, 99, 210, 70, - 317, 70, 212, 189, 236, -388, 2093, -388, -388, 339, - 2322, -388, 1925, 2093, 213, -388, -388, 1153, 214, 217, - 54, 22, -388, -388, 189, 15, 112, 1925, 2093, -388, - -388, -388, -388, 2093, -388, -388, -388, 2093, 1925, -388, - -388, 13, -388, 70, 219, -388, 247, -388, 229, 305, - 2568, -388, -388, -388, -15, 26, 220, -388, -388, -388, - -388, -388, -388, -388, -388, -388, -388, -388, -388, 261, - 227, 320, -388, 240, 250, -388, -388, 112, -388, 286, - -388, -388, 222, -388, 242, 247, -388, 70, 203, -388, - -388, -388, 2093, 274, 246, 26, -388, -388, -388, -388, - -388, -388, -388, 377, -388, -388, 1925, -388, 1925, 189, - 1413, -388, 378, -388, 359, 256, 336, -388, 2507, 1799, - -388, -388, -388, 1799, 1799, 189, -388, -388, 263, -388, - -388, 264, 51, 262, 1543, -388, -388, -388, -388, 72, - -388, -388, 1799, -388, 266, 267, 254, -388, 1413, -388, - -388, 397, -388, -388, -388, -388, 1799, 275, 280, 278, - 276, -388, 13, 1799, -388, 279, 277, 189, -388, -388 + 1663, -67, -400, -400, -400, -400, -400, -400, -10, -17, + -400, -16, 21, -400, -400, -400, 92, -400, 2106, -400, + 62, -400, -400, 2161, -400, 5, 125, 13, -400, -400, + -400, -400, -3, -60, -400, -400, 2106, 22, 90, 2106, + 2106, -400, 2106, 2106, 2106, 2106, 2106, 631, 122, 137, + -400, 502, -400, -400, -400, 19, -400, 2036, -400, -400, + -400, -400, -400, -400, 1913, -400, -400, -400, 186, 40, + -400, -400, -400, -400, -400, -400, -400, -400, -400, -400, + 38, 2615, -400, -400, -400, -400, 142, 26, -400, -400, + 1913, -400, -400, -400, -400, -400, -400, -84, 125, -400, + -2, -400, 27, -45, 2106, 23, -400, 2106, -400, 2106, + 147, -45, -400, -400, -400, 51, 76, 104, -45, -45, + 356, -45, -45, -57, 2615, 82, 108, 2106, -400, 2615, + 207, 210, 2106, 2106, 210, 211, -400, -400, 760, -400, + -400, 93, -400, -400, -400, -400, 199, -400, -400, -400, + -400, 1018, 155, 221, -400, 134, 167, 38, 138, -400, + 235, 33, 236, -400, 239, -400, -400, -400, -400, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, -400, -400, 240, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 14, -400, -400, 2106, 232, 2106, 1147, + -400, 125, 130, 131, -400, -400, -400, 127, 16, 126, + 154, 95, 2219, 1788, 132, -400, 2106, -400, 2106, 90, + 2106, -400, -400, -400, -400, -400, 156, 159, -400, -400, + -400, 159, -400, -400, -400, 1913, 135, 156, 2106, 2106, + -400, 160, -400, -400, 260, 219, 220, 266, 2615, 494, + 330, 330, 330, 2981, 2981, 2981, 2981, 494, 494, 2615, + 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, + 2676, 2737, -400, 269, 269, 269, 2615, 2432, 2798, 2859, + 2920, 494, 494, 356, 356, -45, -45, -45, 143, 2493, + 185, 2106, 277, 149, 161, 2290, -400, 152, 1276, -400, + -400, 163, -400, -400, -400, -400, 1147, -400, 125, 2106, + -400, 28, 281, 157, 191, -400, -400, -400, 166, -400, + 162, 1788, -400, 164, -400, 182, 2615, 67, 193, 210, + 889, -400, -30, 198, 168, 128, 178, 125, 288, 125, + 176, 156, 212, -400, 2106, -400, -400, 304, 2361, -400, + 1913, 2106, 190, -400, -400, 1147, 180, 189, 2106, 67, + -400, -400, 156, 17, 31, 1913, 2106, -400, -400, -400, + -400, 2106, -400, -400, -400, 2106, 1913, -400, -400, 16, + -400, 125, 192, -400, 222, -400, 193, 266, 2615, -400, + -400, -400, 203, 7, 194, -400, -400, 2615, 234, 213, + 281, -400, 214, 224, -400, -400, 31, -400, 278, -400, + 2615, -52, -400, 209, 222, -400, 125, 231, -400, -400, + -400, 2106, 242, 217, 7, -400, -400, -400, -400, -400, + -400, -400, 321, -400, -400, 1913, -400, 1913, 156, 1405, + -400, 340, -400, 324, 223, 286, -400, 2554, 1788, -400, + -400, -400, 1788, 1788, 156, -400, -400, 225, -400, -400, + 227, 216, 226, 1534, -400, -400, -400, -400, 33, -400, + -400, 1788, -400, 233, 237, 238, -400, 1405, -400, -400, + 350, -400, -400, -400, -400, 1788, 248, 245, 230, 255, + -400, 16, 1788, -400, 256, 258, 156, -400, -400 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -388, -388, 257, -388, 354, -296, -388, 107, -387, -31, - 1, -55, -85, 29, 2, 21, 362, 293, 81, -388, - -388, -388, -388, -388, -388, -388, -388, -388, -388, -388, - -388, -388, -388, -388, -388, -21, -19, -388, -388, 6, - -388, 7, -388, -388, -388, -388, -388, -388, -388, -388, - -175, 76, -388, -388, -388, -388, 0, -388, 357, -388, - -388, -388, 48, -388, 49, -388, -68, -388, -53, -388, - -388, -30, -388, 3, -388, -388, 33, 18, -388, -376, - -388, -305, -49, 4, -388, -388, -388, -388, -388, 412, - -89, 52, 71, -239, -388, -96, -388, -388, -388, -388, - -388, -388, -388, -34, -9, -50, -13, -388, -388, -388, - -388, -388, -388, -388 + -400, -400, 205, -400, 312, -290, -400, 53, -399, -29, + 1, -56, -83, 49, 2, -39, 334, 262, 45, -400, + -400, -400, -400, -400, -400, -400, -400, -400, -400, -400, + -400, -400, -400, -400, -400, -44, -42, -400, -400, -23, + -400, -20, -400, -400, -400, -400, -400, -400, -400, -400, + 9, 77, -400, -400, -400, -400, 0, -400, 318, -400, + -400, -400, 50, -400, 56, -400, -90, -400, -75, -400, + -400, -55, -400, 3, -400, -400, 6, -9, -400, -384, + -400, -304, -77, 4, -400, -400, -400, -400, -400, 386, + -92, 15, 35, -246, -400, -93, -400, -400, -400, -400, + -400, -400, -400, -115, -119, 370, -48, -400, 179, -400, + -13, -400, -400, -400, -400, -400 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -154 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 69, 54, 56, 74, 75, 113, 213, 100, 154, 222, - 155, 103, 344, 229, 303, 434, 324, 135, 324, 93, - 373, 88, 330, 368, 111, 218, 114, 117, 118, 55, - 119, 120, 121, 191, 114, 94, 155, 122, 94, 166, - -70, 94, 320, 166, 166, 93, 166, 87, 72, 73, - 90, 320, 69, 54, 56, 74, 75, 409, 379, 410, - 442, 94, 411, 412, 413, 208, 414, 101, 209, 157, - 422, 406, 235, 218, 383, 92, 329, 362, 158, 377, - 248, 55, 493, 160, 166, 166, 494, 495, 443, 94, - 97, 238, 98, 89, 227, 225, 114, 162, 104, 415, - 72, 73, 389, 105, 390, 502, 325, 256, 421, 416, - 417, 301, 114, 145, 398, 157, 451, 388, 441, 510, - 243, 244, 330, 257, 158, 108, 516, 109, 159, 160, - 387, 166, 110, 304, 331, 420, 515, 380, 94, 305, - 423, 161, 95, 162, 146, 424, 320, 107, 69, 54, - 56, 74, 75, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 284, 148, 55, 112, 286, - 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 114, 302, 72, 73, 337, 210, - 338, 308, 370, 306, 166, 371, 211, 2, 189, 190, - 191, 216, 217, 224, 226, 69, 54, 314, 342, 114, - 478, 114, 336, 15, 16, 17, 369, 19, 230, 21, - 202, 203, 204, 205, 206, 232, 496, 2, 233, 234, - 207, 25, 208, 345, 346, 209, 236, 237, 239, 462, - 30, 31, 32, 15, 16, 17, 240, 19, 246, 21, - 392, 249, 395, -71, 189, 190, 191, 157, 251, 252, - 253, 25, 254, 255, 259, 260, 285, 403, 519, 248, - 30, 31, 32, 307, -109, 321, 322, 248, 204, 205, - 206, 360, 429, 335, 339, 343, 207, 341, 208, 348, - 347, 209, 463, 433, 395, 349, 351, 155, 353, 114, - 357, 69, 54, 314, 361, 359, 363, 365, 367, 69, - 54, 314, 155, 324, 374, 376, 378, 189, 190, 191, - 375, 383, 391, 155, 393, -152, 399, 432, 397, 405, - 2, -154, 401, 400, 430, 436, 407, 437, 461, 431, - 408, 456, 448, 450, 404, 458, 15, 16, 17, 207, - 19, 208, 21, 370, 209, 114, 452, 69, 54, 314, - 114, 476, 453, 477, 25, 459, -154, -154, 470, 469, - 475, 488, 462, 30, 31, 32, 489, 505, 490, 497, - 498, 189, 190, 191, 499, 192, 193, 194, 503, 504, - 508, 155, 512, 155, 513, 250, 147, 511, 514, 518, - -154, -154, 517, 202, 203, 204, 205, 206, 366, 439, - 151, 241, 385, 207, 471, 208, 472, 165, 209, 468, - 507, 500, 440, 454, 455, 463, 491, 449, 464, 106, - 501, 0, 419, 0, 0, 435, 0, 0, 0, 0, + 68, 53, 55, 73, 75, 100, 226, 217, 158, 157, + 103, 352, 244, 249, 250, 433, 234, 310, 138, 331, + 331, 96, 86, 111, 92, 93, 118, 119, 381, 120, + 121, 122, 124, 129, 158, 96, 376, -70, 94, 87, + 441, 220, 221, 240, 2, 193, 194, 195, 169, 54, + 71, 68, 53, 55, 73, 75, 72, 422, 13, 14, + 15, 109, 17, 423, 19, 101, 110, 262, 442, 492, + 92, 93, 391, 493, 494, 241, 211, 24, 212, 421, + 457, 213, 254, 263, 94, 414, 29, 30, 31, 97, + 195, 124, 501, 113, 232, 114, 129, 313, 92, 93, + 54, 71, 387, 105, 89, 91, 509, 72, 98, 332, + 420, 88, 94, 515, 129, 406, 450, 343, 308, 124, + 124, 212, 108, 344, 213, 148, 104, 514, 92, 93, + 378, 397, 379, 398, 107, 311, 419, 149, 169, 353, + 354, 312, 94, 112, 151, 214, 95, 215, 228, 231, + 235, 68, 53, 55, 73, 75, 268, 269, 270, 271, + 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, + 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, + 238, 388, 237, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 129, 309, + 54, 71, 160, 124, 239, 315, 242, 72, 243, 337, + 245, 161, 477, 246, 252, 160, 162, 163, 255, 68, + 53, 321, -71, 124, 257, 129, 350, 346, 495, 164, + 327, 165, 160, 258, 259, 2, 377, 260, 261, 265, + 338, 161, 266, 292, 314, 124, 124, 163, 329, 13, + 14, 15, 412, 17, 240, 19, -113, 328, 336, 349, + 347, 165, 355, 356, 342, 400, 351, 403, 24, 361, + 518, 429, 357, 359, 367, 365, 461, 29, 30, 31, + 369, 370, 371, 373, 331, 254, 386, 411, 375, 382, + 2, 383, -112, 384, 254, 391, 385, 395, 368, 399, + 396, 405, 428, 401, 13, 14, 15, 409, 17, 403, + 19, 415, 407, 432, 158, 413, 129, 435, 68, 53, + 321, 416, 436, 24, 474, 447, 68, 53, 321, 158, + 462, 461, 29, 30, 31, 440, 378, 338, 449, 451, + 158, 458, 455, 487, 460, 452, 468, 431, 469, 488, + 496, 408, 497, 507, 489, 512, 256, 498, 124, 193, + 194, 195, -153, 150, 502, 417, 511, 438, 503, 170, + 504, 374, 475, 129, 476, 68, 53, 321, 430, 510, + 206, 207, 208, 209, 210, 462, 513, 168, 516, 517, + 211, 154, 212, 247, 393, 213, -155, -155, -155, 158, + 470, 158, 471, 453, 178, 179, 454, 506, 499, 448, + 490, 500, 106, 439, 418, 123, 434, -154, 345, 0, + 193, 194, 195, 0, 196, 197, 198, 0, 467, 0, + 0, 0, 0, 0, 0, 0, 0, 463, 204, 205, + 0, 206, 207, 208, 209, 210, 193, 194, 195, 0, + 0, 211, 0, 212, 0, 0, 213, 0, 0, 481, + 479, 480, 485, 486, 0, 463, 0, 0, 0, 208, + 209, 210, 0, 0, 0, 0, 0, 211, 0, 212, + 0, 0, 213, 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, 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, 0, 193, 194, 195, 0, 196, 197, + 198, 0, 39, 40, 0, 0, 0, 0, 0, 0, + 0, 41, -155, -155, 0, 206, 207, 208, 209, 210, + 0, 0, 0, 42, 0, 211, 0, 212, 43, 44, + 213, 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, + 130, 0, 131, 0, 0, 0, 23, 132, 24, 25, + 0, 26, 133, 27, 0, 28, 134, 29, 30, 31, + 0, 0, 32, 33, 0, 34, 35, 0, 0, 0, + 0, 0, 0, 36, 37, 0, 135, 0, 0, 0, + 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 482, 480, 481, 486, 487, 0, 464, 0, -153, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, + 136, 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, 137, 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, 130, + 0, 131, 0, 0, 0, 23, 132, 24, 25, 0, + 26, 133, 27, 0, 28, 134, 29, 30, 31, 0, + 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, + 0, 0, 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 482, 480, 481, 486, 487, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 482, 480, - 481, 486, 487, -4, 0, 0, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 167, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, -154, -154, -154, 0, 37, 38, 0, 0, - 175, 176, 0, 39, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, - 193, 194, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 200, 201, 0, 202, 203, 204, - 205, 206, 0, 0, 0, 43, 0, 207, 0, 208, - 44, 45, 209, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -4, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 134, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 247, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 127, 0, 128, 0, 0, 0, 24, - 129, 25, 26, 0, 27, 130, 28, 0, 29, 131, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 132, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, + 0, 45, 0, 46, 0, 47, 0, 48, 0, 0, + 0, 253, 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, 130, 0, + 131, 0, 0, 0, 23, 132, 24, 25, 0, 26, + 133, 27, 0, 28, 134, 29, 30, 31, 0, 0, + 32, 33, 0, 34, 35, 0, 0, 0, 0, 0, + 0, 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, 386, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -3, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 45, 0, 46, 0, 47, 0, 48, 0, 0, 0, + 394, 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, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 309, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -15, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 41, 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, -3, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 0, 0, 0, 13, 14, 15, 16, 17, + 18, 19, 0, 0, 21, 22, 0, 0, 0, 0, + 0, 0, 23, 0, 24, 25, 0, 26, 0, 27, + 0, 28, 0, 29, 30, 31, 0, 0, 32, 33, + 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, + 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 309, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -16, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 316, 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, -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, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 479, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, 0, 0, -143, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 0, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 316, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, + 0, 47, 0, 48, 0, 0, 0, -16, 1, 2, + 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, + 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, + 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, + 23, 0, 24, 25, 0, 26, 0, 27, 0, 28, + 0, 29, 30, 31, 0, 0, 32, 33, 0, 34, + 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, + 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 479, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 0, -3, 0, -144, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 25, 26, 0, 27, 0, 28, 0, 29, 0, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, + 0, 0, 0, 0, 478, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, + 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, + 47, 0, 48, 0, 0, 0, -144, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 0, + 0, 0, 13, 14, 15, 16, 17, 18, 19, 0, + 0, 21, 22, 0, 0, 0, 0, 0, 0, 23, + 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, + 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, + 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, + 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 0, -119, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 0, 23, 127, - 0, 128, 0, 0, 0, 24, 129, 25, 26, 0, - 27, 130, 28, 0, 29, 131, 30, 31, 32, 0, - 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 132, 0, 0, 0, 39, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, + 0, 0, 0, 478, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, + 43, 44, 0, 0, 0, 45, 0, 46, 0, 47, + 0, 48, 0, -3, 0, -145, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 0, 0, + 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, + 21, 22, 0, 0, 0, 0, 0, 0, 23, 0, + 24, 25, 0, 26, 0, 27, 0, 28, 0, 29, + 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, + 0, 0, 0, 0, 0, 36, 37, 0, 0, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 133, 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, 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, 130, 0, 131, + 0, 0, 0, 23, 132, 24, 25, 0, 26, 133, + 27, 0, 28, 134, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 135, 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, 127, 0, 128, 0, 0, - 0, 24, 129, 25, 26, 0, 27, 130, 28, 0, - 29, 131, 30, 31, 32, 0, 0, 33, 34, 0, - 35, 36, 0, 0, 0, 0, 0, 0, 37, 38, - 0, 132, 0, 0, 0, 39, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 136, 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, 130, 0, 131, 0, 0, 0, 23, 132, + 24, 25, 0, 26, 133, 27, 0, 28, 134, 29, + 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, + 0, 0, 0, 0, 0, 36, 37, 0, 135, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, - 0, 0, 0, 0, 133, 0, 149, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 43, 0, 0, - 0, 0, 44, 45, 0, 0, 0, 46, 20, 47, - 22, 48, 23, 49, 0, 128, 0, 0, 0, 24, - 0, 0, 0, 0, 0, 0, 28, 0, 29, 150, - 0, 0, 0, 0, 0, 0, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, - 22, 0, 23, 0, 0, 0, 0, 0, 0, 24, - 0, 0, 0, 0, 0, 43, 28, 0, 29, 0, - 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, - 0, 49, 0, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 39, 0, 0, 99, 0, 3, 4, - 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 0, 0, 0, 20, 0, - 22, 0, 23, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 29, 0, - 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, - 0, 49, 0, 0, 0, 0, 0, 0, 167, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, + 0, 0, 136, 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, 152, + 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, 131, 0, 0, + 0, 23, 0, 0, 0, 0, 0, 0, 27, 0, + 28, 153, 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, 0, 39, 40, 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, 0, 39, 40, 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, 0, 0, 45, 0, 46, + 38, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 41, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, - 191, 0, 192, 193, 194, 46, 0, 47, 0, 0, - 195, 49, 196, 0, 197, 198, 199, 200, 201, 167, - 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, - 207, 0, 208, 0, 0, 209, 0, 0, 0, 0, - 0, 332, 0, 0, 0, 0, 168, 169, 170, 0, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 0, 189, - 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, - 0, 195, 167, 196, 0, 197, 198, 199, 200, 201, - 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, - 0, 207, 0, 208, 0, 0, 209, 0, 0, 168, - 169, 170, 364, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 0, 189, 190, 191, 0, 192, 193, 194, 0, - 0, 0, 0, 0, 195, 167, 196, 0, 197, 198, - 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, - 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, - 0, 0, 168, 169, 170, 402, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, - 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, - 356, 197, 198, 199, 200, 201, 0, 202, 203, 204, - 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, - 0, 0, 209, 168, 169, 170, 0, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, - 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, - 196, 0, 197, 198, 199, 200, 201, 0, 202, 203, - 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, - 208, 358, 0, 209, 168, 169, 170, 0, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, - 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, - 0, 196, 492, 197, 198, 199, 200, 201, 0, 202, - 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, - 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, - 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, - 195, 0, 196, 0, 197, 198, 199, 200, 201, 0, - 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, - 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, - 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 188, 0, 189, - 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, - 167, 0, 0, 0, 0, 197, 198, 199, 200, 201, - 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, - 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, - 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 170, 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, 45, 0, 46, 171, 172, 173, 48, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 0, + 0, 199, 200, 0, 201, 202, 203, 204, 205, 170, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 0, 0, 0, 0, + 0, 339, 0, 0, 0, 0, 171, 172, 173, 0, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 0, + 193, 194, 195, 0, 196, 197, 198, 0, 0, 0, + 0, 0, 199, 200, 0, 201, 202, 203, 204, 205, + 170, 206, 207, 208, 209, 210, 0, 0, 0, 0, + 0, 211, 0, 212, 0, 0, 213, 0, 0, 0, + 0, 0, 372, 0, 0, 0, 0, 171, 172, 173, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 199, 200, 0, 201, 202, 203, 204, + 205, 170, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213, 0, 0, + 0, 0, 0, 410, 0, 0, 0, 0, 171, 172, + 173, 0, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 0, 193, 194, 195, 0, 196, 197, 198, 0, + 0, 0, 170, 0, 199, 200, 364, 201, 202, 203, + 204, 205, 0, 206, 207, 208, 209, 210, 0, 0, + 0, 0, 0, 211, 0, 212, 0, 0, 213, 171, + 172, 173, 0, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 0, 193, 194, 195, 0, 196, 197, 198, + 0, 0, 0, 170, 0, 199, 200, 0, 201, 202, + 203, 204, 205, 0, 206, 207, 208, 209, 210, 0, + 0, 0, 0, 0, 211, 0, 212, 366, 0, 213, + 171, 172, 173, 0, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 0, 193, 194, 195, 0, 196, 197, + 198, 0, 0, 0, 170, 0, 199, 200, 491, 201, + 202, 203, 204, 205, 0, 206, 207, 208, 209, 210, + 0, 0, 0, 0, 0, 211, 0, 212, 0, 0, + 213, 171, 172, 173, 0, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 0, 193, 194, 195, 0, 196, + 197, 198, 0, 0, 0, 170, 0, 199, 200, 0, + 201, 202, 203, 204, 205, 0, 206, 207, 208, 209, + 210, 0, 0, 0, 0, 0, 211, 0, 212, 0, + 0, 213, 171, 172, 173, 0, 174, 175, 176, 177, + 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 192, 0, 193, 194, 195, 0, + 196, 197, 198, 0, 0, 0, 170, 0, 0, 0, + 0, 201, 202, 203, 204, 205, 0, 206, 207, 208, + 209, 210, 0, 0, 0, 0, 0, 211, 0, 212, + 0, 0, 213, 171, 172, 173, 0, 174, 175, 176, + 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 194, 195, + 0, 196, 197, 198, 0, 0, 0, 170, 0, 0, + 0, 0, 201, 202, 203, 204, 205, 0, 206, 207, + 208, 209, 210, 0, 0, 0, 0, 0, 211, 0, + 212, 0, 0, 213, 171, 172, 173, 0, 174, 175, + 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 193, 194, + 195, 0, 196, 197, 198, 0, 0, 0, 170, 0, + 0, 0, 0, 0, 202, 203, 204, 205, 0, 206, + 207, 208, 209, 210, 0, 0, 0, 0, 0, 211, + 0, 212, 0, 0, 213, 171, 172, 173, 0, 174, + 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 170, + 0, 0, 0, 0, 0, 0, 203, 204, 205, 0, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 171, 172, 173, 0, + 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, - 0, 0, 0, 167, 0, 0, 0, 0, 0, 0, - 199, 200, 201, 0, 202, 203, 204, 205, 206, 0, - 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, - 168, 169, 170, 0, 171, 172, 173, 174, 175, 176, + 193, 194, 195, 0, 196, 197, 198, 0, 0, 0, + 170, 0, 0, 0, 0, 0, 0, -155, 204, 205, + 0, 206, 207, 208, 209, 210, 0, 0, 0, 0, + 0, 211, 0, 212, 0, 0, 213, 171, 172, 173, + 0, -155, -155, -155, -155, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, - 0, 0, 0, 0, 167, 0, 0, 0, 0, 0, - 0, -154, 200, 201, 0, 202, 203, 204, 205, 206, - 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, - 209, 168, 169, 170, 0, -154, -154, -154, -154, 175, - 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 189, 190, 191, 0, 192, 193, - 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 200, 201, 0, 202, 203, 204, 205, - 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, - 0, 209 + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, + 205, 0, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 39, 91, 20, 58, 98, - 65, 24, 251, 109, 3, 391, 3, 48, 3, 3, - 325, 50, 3, 319, 37, 3, 39, 40, 41, 0, - 43, 44, 45, 92, 47, 19, 91, 46, 19, 100, - 68, 19, 217, 100, 100, 3, 100, 89, 0, 0, - 122, 226, 52, 52, 52, 52, 52, 3, 36, 5, - 34, 19, 8, 9, 10, 124, 12, 3, 127, 18, - 375, 367, 133, 3, 102, 122, 133, 133, 27, 133, - 135, 52, 469, 32, 100, 100, 473, 474, 62, 19, - 14, 125, 18, 122, 107, 104, 109, 46, 122, 45, - 52, 52, 3, 27, 5, 492, 93, 35, 93, 55, - 56, 207, 125, 3, 353, 18, 421, 133, 133, 506, - 129, 130, 3, 51, 27, 126, 513, 122, 31, 32, - 99, 100, 127, 122, 115, 374, 512, 115, 19, 128, - 28, 44, 126, 46, 0, 33, 321, 122, 148, 148, - 148, 148, 148, 166, 167, 168, 169, 170, 171, 172, + 0, 0, 0, 0, 0, 18, 98, 90, 64, 57, + 23, 257, 127, 132, 133, 399, 109, 3, 47, 3, + 3, 12, 89, 36, 3, 4, 39, 40, 332, 42, + 43, 44, 45, 46, 90, 26, 326, 67, 17, 49, + 33, 125, 126, 100, 4, 90, 91, 92, 100, 0, + 0, 51, 51, 51, 51, 51, 0, 26, 18, 19, + 20, 121, 22, 32, 24, 3, 126, 34, 61, 468, + 3, 4, 102, 472, 473, 132, 121, 37, 123, 383, + 132, 126, 138, 50, 17, 375, 46, 47, 48, 12, + 92, 104, 491, 3, 107, 5, 109, 216, 3, 4, + 51, 51, 35, 26, 121, 121, 505, 51, 16, 93, + 93, 121, 17, 512, 127, 361, 420, 236, 211, 132, + 133, 123, 125, 238, 126, 3, 121, 511, 3, 4, + 102, 3, 104, 5, 121, 121, 382, 0, 100, 258, + 259, 127, 17, 121, 125, 3, 125, 121, 121, 126, + 3, 151, 151, 151, 151, 151, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 126, 148, 122, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 148, 148, 232, 3, - 234, 214, 102, 212, 100, 105, 122, 4, 90, 91, - 92, 126, 127, 122, 127, 215, 215, 215, 249, 232, - 459, 234, 231, 20, 21, 22, 322, 24, 3, 26, - 112, 113, 114, 115, 116, 105, 475, 4, 132, 100, - 122, 38, 124, 252, 253, 127, 125, 100, 3, 46, - 47, 48, 49, 20, 21, 22, 3, 24, 3, 26, - 349, 126, 351, 68, 90, 91, 92, 18, 3, 99, - 68, 38, 99, 3, 3, 3, 3, 362, 517, 334, - 47, 48, 49, 14, 127, 127, 122, 342, 114, 115, - 116, 304, 377, 133, 105, 132, 122, 100, 124, 3, - 102, 127, 99, 388, 393, 54, 54, 362, 3, 322, - 133, 311, 311, 311, 3, 89, 122, 132, 126, 319, - 319, 319, 377, 3, 133, 132, 105, 90, 91, 92, - 100, 102, 122, 388, 17, 132, 100, 387, 126, 126, - 4, 40, 3, 356, 378, 126, 132, 100, 437, 383, - 133, 65, 132, 126, 363, 133, 20, 21, 22, 122, - 24, 124, 26, 102, 127, 378, 126, 367, 367, 367, - 383, 456, 122, 458, 38, 133, 75, 76, 132, 105, - 3, 3, 46, 47, 48, 49, 27, 133, 132, 126, - 126, 90, 91, 92, 132, 94, 95, 96, 132, 132, - 3, 456, 122, 458, 126, 148, 52, 132, 132, 132, - 109, 110, 133, 112, 113, 114, 115, 116, 311, 398, - 58, 128, 341, 122, 445, 124, 445, 70, 127, 442, - 498, 484, 399, 427, 427, 99, 466, 419, 438, 27, - 489, -1, 371, -1, -1, 393, -1, -1, -1, -1, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 104, 114, 131, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 151, 151, 16, 216, 100, 218, 124, 151, 100, 114, + 3, 25, 458, 3, 3, 16, 30, 31, 125, 219, + 219, 219, 67, 236, 3, 238, 255, 240, 474, 43, + 221, 45, 16, 99, 67, 4, 329, 99, 3, 3, + 231, 25, 3, 3, 12, 258, 259, 31, 121, 18, + 19, 20, 371, 22, 100, 24, 126, 126, 132, 100, + 104, 45, 102, 3, 132, 357, 131, 359, 37, 3, + 516, 386, 53, 53, 89, 132, 45, 46, 47, 48, + 3, 132, 121, 131, 3, 341, 104, 370, 125, 132, + 4, 100, 126, 131, 350, 102, 132, 99, 311, 121, + 132, 125, 385, 15, 18, 19, 20, 3, 22, 401, + 24, 131, 100, 396, 370, 125, 329, 125, 318, 318, + 318, 132, 100, 37, 3, 131, 326, 326, 326, 385, + 99, 45, 46, 47, 48, 132, 102, 328, 125, 125, + 396, 132, 64, 3, 436, 121, 104, 395, 131, 25, + 125, 364, 125, 3, 131, 125, 151, 131, 371, 90, + 91, 92, 131, 51, 131, 378, 121, 406, 131, 39, + 132, 318, 455, 386, 457, 375, 375, 375, 391, 131, + 111, 112, 113, 114, 115, 99, 131, 69, 132, 131, + 121, 57, 123, 131, 349, 126, 66, 67, 68, 455, + 444, 457, 444, 426, 74, 75, 426, 497, 483, 418, + 465, 488, 26, 407, 379, 45, 401, 131, 239, -1, + 90, 91, 92, -1, 94, 95, 96, -1, 441, -1, + -1, -1, -1, -1, -1, -1, -1, 437, 108, 109, + -1, 111, 112, 113, 114, 115, 90, 91, 92, -1, + -1, 121, -1, 123, -1, -1, 126, -1, -1, 459, + 459, 459, 459, 459, -1, 465, -1, -1, -1, 113, + 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, + -1, -1, 126, 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, -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, -1, 90, 91, 92, -1, 94, 95, + 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, 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, - 460, 460, 460, 460, 460, -1, 466, -1, 132, -1, + -1, 90, 91, -1, -1, -1, -1, -1, -1, -1, + 99, -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, 484, 484, 484, 484, 484, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 498, 498, - 498, 498, 498, 0, -1, -1, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, 40, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, 67, 68, 69, -1, 63, 64, -1, -1, - 75, 76, -1, 70, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, 109, 110, -1, 112, 113, 114, - 115, 116, -1, -1, -1, 112, -1, 122, -1, 124, - 117, 118, 127, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -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, 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, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - -1, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, 38, 39, -1, 41, -1, 43, -1, 45, -1, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, + 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, + 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, + 131, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, -1, 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, 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, 90, 91, + -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, + -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, + 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, -1, -1, -1, 18, 19, 20, 21, 22, + 23, 24, -1, -1, 27, 28, -1, -1, -1, -1, + -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, + -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, -1, -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, 90, 91, -1, + -1, -1, -1, -1, -1, -1, 99, -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, 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, 90, 91, -1, -1, + -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, + -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, + -1, 125, -1, 127, -1, -1, -1, 131, 3, 4, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + -1, -1, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, -1, -1, -1, -1, -1, -1, + 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, + -1, 46, 47, 48, -1, -1, 51, 52, -1, 54, + 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, + -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, + -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, + 125, -1, 127, -1, -1, -1, 131, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, -1, + -1, -1, 18, 19, 20, 21, 22, 23, 24, -1, + -1, 27, 28, -1, -1, -1, -1, -1, -1, 35, + -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, + 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, + -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, + -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, + 116, 117, -1, -1, -1, 121, -1, 123, -1, 125, + -1, 127, -1, 0, -1, 131, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, + 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, + 27, 28, -1, -1, -1, -1, -1, -1, 35, -1, + 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, -1, -1, + -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, 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, -1, 90, 91, + -1, -1, -1, -1, -1, -1, -1, 99, -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, -1, 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, -1, -1, - 117, 118, -1, -1, -1, 122, -1, 124, -1, 126, - -1, 128, 3, 4, 5, 6, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, 18, -1, 20, - 21, 22, 23, 24, 25, 26, 27, -1, 29, 30, - -1, 32, -1, -1, -1, 36, 37, 38, 39, -1, - 41, 42, 43, -1, 45, 46, 47, 48, 49, -1, - -1, 52, 53, -1, 55, 56, -1, -1, -1, -1, - -1, -1, 63, 64, -1, 66, -1, -1, -1, 70, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, -1, -1, -1, -1, -1, -1, -1, 99, -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, -1, 90, 91, -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, -1, 90, 91, -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, -1, -1, 121, -1, 123, + 69, -1, -1, 127, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 112, -1, -1, -1, -1, 117, 118, -1, -1, - -1, 122, -1, 124, -1, 126, -1, 128, 3, 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, 90, 91, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, - -1, -1, -1, -1, 99, -1, 3, -1, 5, 6, - -1, 8, 9, 10, 11, 12, -1, 112, -1, -1, - -1, -1, 117, 118, -1, -1, -1, 122, 25, 124, - 27, 126, 29, 128, -1, 32, -1, -1, -1, 36, - -1, -1, -1, -1, -1, -1, 43, -1, 45, 46, - -1, -1, -1, -1, -1, -1, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, - -1, -1, -1, 70, -1, -1, 3, -1, 5, 6, - -1, 8, 9, 10, 11, 12, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, 25, -1, - 27, -1, 29, -1, -1, -1, -1, -1, -1, 36, - -1, -1, -1, -1, -1, 112, 43, -1, 45, -1, - 117, 118, -1, -1, -1, 122, 53, 124, 55, 56, - -1, 128, -1, -1, -1, -1, 63, -1, -1, -1, - -1, -1, -1, 70, -1, -1, 3, -1, 5, 6, - -1, 8, 9, 10, 11, 12, -1, -1, -1, -1, - -1, -1, -1, 90, 91, -1, -1, -1, 25, -1, - 27, -1, 29, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 112, -1, -1, 45, -1, - 117, 118, -1, -1, -1, 122, 53, 124, 55, 56, - -1, 128, -1, -1, -1, -1, -1, -1, 40, -1, - -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, 91, 67, 68, 69, -1, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, - 92, -1, 94, 95, 96, 122, -1, 124, -1, -1, - 102, 128, 104, -1, 106, 107, 108, 109, 110, 40, - 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127, -1, -1, -1, -1, - -1, 133, -1, -1, -1, -1, 67, 68, 69, -1, + -1, -1, 121, -1, 123, 66, 67, 68, 127, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - -1, 102, 40, 104, -1, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, -1, -1, 67, - 68, 69, 133, 71, 72, 73, 74, 75, 76, 77, + -1, 102, 103, -1, 105, 106, 107, 108, 109, 39, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, -1, -1, -1, -1, + -1, 132, -1, -1, -1, -1, 66, 67, 68, -1, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, + 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, + -1, -1, 102, 103, -1, 105, 106, 107, 108, 109, + 39, 111, 112, 113, 114, 115, -1, -1, -1, -1, + -1, 121, -1, 123, -1, -1, 126, -1, -1, -1, + -1, -1, 132, -1, -1, -1, -1, 66, 67, 68, + -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, -1, 102, 103, -1, 105, 106, 107, 108, + 109, 39, 111, 112, 113, 114, 115, -1, -1, -1, + -1, -1, 121, -1, 123, -1, -1, 126, -1, -1, + -1, -1, -1, 132, -1, -1, -1, -1, 66, 67, + 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, -1, 102, 40, 104, -1, 106, 107, - 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - -1, -1, 67, 68, 69, 133, 71, 72, 73, 74, + -1, -1, 39, -1, 102, 103, 104, 105, 106, 107, + 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, + -1, -1, -1, 121, -1, 123, -1, -1, 126, 66, + 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, + -1, -1, -1, 39, -1, 102, 103, -1, 105, 106, + 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, + -1, -1, -1, -1, 121, -1, 123, 124, -1, 126, + 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, 39, -1, 102, 103, 104, 105, + 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, + -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, + 126, 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, 40, 102, -1, 104, - 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, - 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, - -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, - 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, 125, -1, 127, 67, 68, 69, -1, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, - -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, - -1, 104, 105, 106, 107, 108, 109, 110, -1, 112, - 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, - -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, - 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, - 102, -1, 104, -1, 106, 107, 108, 109, 110, -1, - 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, - 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, -1, 90, - 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, -1, -1, -1, -1, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + 95, 96, -1, -1, -1, 39, -1, 102, 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, -1, 88, -1, 90, 91, 92, -1, + 94, 95, 96, -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, 90, 91, 92, + -1, 94, 95, 96, -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, 90, 91, + 92, -1, 94, 95, 96, -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, -1, 90, + 91, 92, -1, 94, 95, 96, -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, -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, + 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, -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 + -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 @@ -3470,57 +3322,57 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, - 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, - 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, - 160, 161, 163, 171, 179, 182, 183, 186, 189, 190, - 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, - 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, - 122, 164, 122, 3, 19, 126, 184, 185, 18, 3, - 240, 3, 219, 240, 122, 185, 223, 122, 126, 122, - 127, 240, 122, 237, 240, 242, 243, 240, 240, 240, - 240, 240, 238, 229, 230, 231, 237, 30, 32, 37, - 42, 46, 66, 99, 132, 143, 144, 145, 148, 150, - 165, 166, 181, 190, 236, 3, 0, 138, 126, 3, - 46, 150, 156, 157, 239, 145, 146, 18, 27, 31, - 32, 44, 46, 206, 245, 192, 100, 40, 67, 68, - 69, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, - 91, 92, 94, 95, 96, 102, 104, 106, 107, 108, - 109, 110, 112, 113, 114, 115, 116, 122, 124, 127, - 3, 122, 162, 146, 172, 188, 126, 127, 3, 185, - 222, 223, 224, 232, 122, 238, 127, 240, 180, 229, - 3, 155, 105, 132, 100, 133, 125, 100, 237, 3, - 3, 151, 152, 238, 238, 151, 3, 132, 145, 126, - 136, 3, 99, 68, 99, 3, 35, 51, 216, 3, - 3, 208, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 3, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 229, 240, 3, 122, 128, 238, 14, 240, 99, - 139, 140, 141, 147, 148, 196, 198, 207, 217, 187, - 184, 127, 122, 228, 3, 93, 213, 214, 215, 133, - 3, 115, 133, 142, 143, 133, 238, 237, 237, 105, - 227, 100, 143, 132, 227, 238, 238, 102, 3, 54, - 193, 54, 194, 3, 209, 210, 105, 133, 125, 89, - 240, 3, 133, 122, 133, 132, 141, 126, 139, 229, - 102, 105, 211, 215, 133, 100, 132, 133, 105, 36, - 115, 224, 226, 102, 149, 152, 132, 99, 133, 3, - 5, 122, 224, 17, 195, 224, 225, 126, 227, 100, - 240, 3, 133, 146, 238, 126, 139, 132, 133, 3, - 5, 8, 9, 10, 12, 45, 55, 56, 212, 226, - 227, 93, 215, 28, 33, 173, 175, 177, 178, 146, - 237, 237, 239, 146, 213, 225, 126, 100, 199, 149, - 210, 133, 34, 62, 167, 168, 169, 170, 132, 211, - 126, 215, 126, 122, 173, 175, 65, 153, 133, 133, - 197, 224, 46, 99, 190, 203, 204, 205, 240, 105, - 132, 169, 170, 221, 176, 3, 146, 146, 227, 99, - 144, 148, 190, 200, 201, 202, 207, 217, 3, 27, - 132, 205, 105, 142, 142, 142, 227, 126, 126, 132, - 202, 216, 142, 132, 132, 133, 218, 200, 3, 174, - 142, 132, 122, 126, 132, 213, 142, 133, 132, 227 + 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 27, 28, 35, 37, 38, 40, 42, 44, 46, + 47, 48, 51, 52, 54, 55, 62, 63, 69, 90, + 91, 99, 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, + 239, 243, 244, 245, 247, 248, 89, 49, 121, 121, + 163, 121, 3, 4, 17, 125, 183, 184, 16, 3, + 243, 3, 218, 243, 121, 184, 222, 121, 125, 121, + 126, 243, 121, 3, 5, 240, 241, 242, 243, 243, + 243, 243, 243, 238, 243, 228, 229, 230, 236, 243, + 29, 31, 36, 41, 45, 65, 99, 131, 142, 143, + 144, 147, 149, 164, 165, 180, 189, 235, 3, 0, + 137, 125, 3, 45, 149, 155, 156, 239, 144, 145, + 16, 25, 30, 31, 43, 45, 205, 246, 191, 100, + 39, 66, 67, 68, 70, 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, + 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, + 238, 126, 243, 179, 228, 3, 154, 131, 104, 100, + 100, 132, 124, 100, 236, 3, 3, 150, 151, 237, + 237, 150, 3, 131, 144, 125, 135, 3, 99, 67, + 99, 3, 34, 50, 215, 3, 3, 207, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 3, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 228, 243, + 3, 121, 127, 237, 12, 243, 99, 138, 139, 140, + 146, 147, 195, 197, 206, 216, 186, 183, 126, 121, + 227, 3, 93, 212, 213, 214, 132, 114, 183, 132, + 141, 142, 132, 237, 236, 241, 243, 104, 226, 100, + 142, 131, 226, 237, 237, 102, 3, 53, 192, 53, + 193, 3, 208, 209, 104, 132, 124, 89, 243, 3, + 132, 121, 132, 131, 140, 125, 138, 228, 102, 104, + 210, 214, 132, 100, 131, 132, 104, 35, 114, 223, + 225, 102, 148, 151, 131, 99, 132, 3, 5, 121, + 223, 15, 194, 223, 224, 125, 226, 100, 243, 3, + 132, 145, 237, 125, 138, 131, 132, 243, 225, 226, + 93, 214, 26, 32, 172, 174, 176, 177, 145, 236, + 243, 239, 145, 212, 224, 125, 100, 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, 99, 189, 202, 203, 204, 243, 104, 131, + 168, 169, 220, 175, 3, 145, 145, 226, 99, 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) @@ -4332,11 +4184,33 @@ yyreduce: switch (yyn) { + case 13: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1861 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 24: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1873 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + case 26: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2098 "parser.y" +#line 1876 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4347,7 +4221,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2099 "parser.y" +#line 1877 "parser.y" {(yyval.code)=code_new();} } break; @@ -4358,8 +4232,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2101 "parser.y" - {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} +#line 1879 "parser.y" + { + (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code)); +} } break; @@ -4369,7 +4245,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2102 "parser.y" +#line 1882 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4380,7 +4256,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2117 "parser.y" +#line 1897 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4391,7 +4267,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2118 "parser.y" +#line 1898 "parser.y" {(yyval.code)=0;} } break; @@ -4402,7 +4278,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2121 "parser.y" +#line 1901 "parser.y" {(yyval.code)=0;} } break; @@ -4413,8 +4289,16 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2128 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 1908 "parser.y" + { + PASS_ALWAYS + if(as3_pass) { + (yyval.code) = (yyvsp[(3) - (4)].code); + } else { + (yyval.code) = 0; + } + as3_pass=(yyvsp[(1) - (4)].number_int); +} } break; @@ -4424,7 +4308,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2132 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4435,7 +4319,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2133 "parser.y" +#line 1921 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4446,7 +4330,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2137 "parser.y" +#line 1925 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4456,12 +4340,31 @@ yyreduce: + case 55: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1932 "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 2148 "parser.y" - {(yyval.value)=(yyvsp[(2) - (2)].value);} +#line 1951 "parser.y" + {(yyval.node)=(yyvsp[(2) - (2)].node);} } break; @@ -4471,10 +4374,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2149 "parser.y" - {(yyval.value).c=abc_pushundefined(0); - (yyval.value).t=TYPE_ANY; - } +#line 1952 "parser.y" + {(yyval.node)=mkdummynode();} } break; @@ -4484,7 +4385,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2153 "parser.y" +#line 1954 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4495,7 +4396,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2154 "parser.y" +#line 1955 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4506,7 +4407,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2156 "parser.y" +#line 1957 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4517,7 +4418,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2157 "parser.y" +#line 1958 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4528,7 +4429,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2160 "parser.y" +#line 1961 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4537,11 +4438,6 @@ PASS1 new_variable((yyvsp[(1) - (3)].id), 0, 1, 0); PASS2 - if(!is_subtype_of((yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo))) { - syntaxerror("Can't convert %s to %s", (yyvsp[(3) - (3)].value).t->name, - (yyvsp[(2) - (3)].classinfo)->name); - } - char slot = 0; int index = 0; if(state->method->uses_slots) { @@ -4560,21 +4456,25 @@ PASS2 (yyval.code) = slot?abc_getscopeobject(0, 1):0; + typedcode_t v = node_read((yyvsp[(3) - (3)].node)); + if(!is_subtype_of(v.t, (yyvsp[(2) - (3)].classinfo))) { + syntaxerror("Can't convert %s to %s", v.t->name, (yyvsp[(2) - (3)].classinfo)->name); + } if((yyvsp[(2) - (3)].classinfo)) { - if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); - (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); + if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) { + (yyval.code) = code_append((yyval.code), v.c); + (yyval.code) = converttype((yyval.code), v.t, (yyvsp[(2) - (3)].classinfo)); } else { - code_free((yyvsp[(3) - (3)].value).c); + code_free(v.c); (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo)); } } else { - if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); + if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) { + (yyval.code) = code_append((yyval.code), v.c); (yyval.code) = abc_coerce_a((yyval.code)); } else { // don't do anything - code_free((yyvsp[(3) - (3)].value).c); + code_free(v.c); code_free((yyval.code)); (yyval.code) = 0; break; @@ -4595,7 +4495,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2220 "parser.y" +#line 2020 "parser.y" {(yyval.code) = code_new();} } break; @@ -4606,7 +4506,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2221 "parser.y" +#line 2021 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4617,7 +4517,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2224 "parser.y" +#line 2024 "parser.y" {PASS12 new_state();} } break; @@ -4628,7 +4528,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2224 "parser.y" +#line 2024 "parser.y" { (yyval.code) = code_new(); @@ -4656,7 +4556,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2243 "parser.y" +#line 2043 "parser.y" {(yyval.code)=code_new();} } break; @@ -4667,7 +4567,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2250 "parser.y" +#line 2050 "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); @@ -4681,7 +4581,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2254 "parser.y" +#line 2054 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4695,7 +4595,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2259 "parser.y" +#line 2059 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4706,7 +4606,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2260 "parser.y" +#line 2060 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4717,7 +4617,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2062 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4746,7 +4646,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2282 "parser.y" +#line 2082 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4803,7 +4703,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2330 "parser.y" +#line 2130 "parser.y" {PASS12 new_state();} } break; @@ -4814,7 +4714,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2330 "parser.y" +#line 2130 "parser.y" { (yyval.code) = code_new(); @@ -4842,7 +4742,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2349 "parser.y" +#line 2149 "parser.y" {PASS12 new_state();} } break; @@ -4853,7 +4753,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2349 "parser.y" +#line 2149 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4877,7 +4777,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2164 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4890,7 +4790,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2367 "parser.y" +#line 2167 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4903,7 +4803,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2370 "parser.y" +#line 2170 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4916,7 +4816,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2373 "parser.y" +#line 2173 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4929,7 +4829,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2377 "parser.y" +#line 2177 "parser.y" {(yyval.code)=0;} } break; @@ -4940,7 +4840,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2378 "parser.y" +#line 2178 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4951,7 +4851,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2379 "parser.y" +#line 2179 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4962,7 +4862,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2380 "parser.y" +#line 2180 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4973,7 +4873,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2381 "parser.y" +#line 2181 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4984,7 +4884,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2382 "parser.y" +#line 2182 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4995,10 +4895,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2384 "parser.y" +#line 2184 "parser.y" { (yyval.code) = abc_getlocal(0, state->switch_var); - (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); + (yyval.code) = code_append((yyval.code), node_read((yyvsp[(2) - (4)].node)).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); if((yyval.code)->opcode != OPCODE___BREAK__) { @@ -5016,7 +4916,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2195 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -5029,7 +4929,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2198 "parser.y" {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -5040,9 +4940,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2198 "parser.y" { - (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = node_read((yyvsp[(4) - (8)].node)).c; (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -5078,7 +4978,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2429 "parser.y" +#line 2229 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -5093,7 +4993,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2434 "parser.y" +#line 2234 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5123,7 +5023,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2454 "parser.y" +#line 2254 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5134,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2454 "parser.y" +#line 2254 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5159,7 +5059,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2470 "parser.y" +#line 2270 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -5170,7 +5070,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2471 "parser.y" +#line 2271 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -5181,7 +5081,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2472 "parser.y" +#line 2272 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5192,7 +5092,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2473 "parser.y" +#line 2273 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5210,7 +5110,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2481 "parser.y" +#line 2281 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5228,7 +5128,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2490 "parser.y" +#line 2290 "parser.y" {PASS12 new_state(); state->method->has_exceptions=1; state->method->late_binding=1;//for invariant scope_code @@ -5242,7 +5142,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2493 "parser.y" +#line 2293 "parser.y" { code_t*out = abc_nop(0); @@ -5295,7 +5195,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2539 "parser.y" +#line 2339 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5309,7 +5209,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2543 "parser.y" +#line 2343 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5327,7 +5227,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2554 "parser.y" +#line 2354 "parser.y" { new_state(); if(state->method->has_exceptions) { @@ -5347,7 +5247,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2564 "parser.y" +#line 2364 "parser.y" { /* remove getlocal;pushwith from scope code again */ state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); @@ -5371,7 +5271,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2582 "parser.y" +#line 2382 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5382,8 +5282,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2584 "parser.y" - {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} +#line 2383 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5393,8 +5293,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2585 "parser.y" - {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} +#line 2385 "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; @@ -5404,8 +5304,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2587 "parser.y" - {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} +#line 2386 "parser.y" + {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5415,8 +5315,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2588 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2388 "parser.y" + {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5426,8 +5326,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2589 "parser.y" - {PASS12 startpackage("");} +#line 2389 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5437,8 +5337,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2590 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2390 "parser.y" + {PASS12 startpackage("");} } break; @@ -5448,15 +5348,24 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2592 "parser.y" +#line 2391 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} + } + break; + + + + case 118: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2413 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } - - PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); @@ -5470,18 +5379,17 @@ PASS2 - case 118: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" +#line 2427 "parser.y" { PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { as3_schedule_package((yyvsp[(2) - (4)].id)); } - PASS2 NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); state_has_imports(); @@ -5494,44 +5402,44 @@ PASS2 - case 119: + case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2625 "parser.y" +#line 2443 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; - case 120: + case 121: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2626 "parser.y" +#line 2444 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 121: + case 122: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2445 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; - case 122: + case 123: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2628 "parser.y" +#line 2446 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5544,110 +5452,110 @@ PASS2 - case 123: + case 124: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2636 "parser.y" +#line 2453 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; - case 124: + case 125: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2637 "parser.y" +#line 2454 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; - case 125: + case 126: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2638 "parser.y" +#line 2455 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; - case 126: + case 127: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2639 "parser.y" +#line 2456 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; - case 127: + case 128: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2640 "parser.y" +#line 2457 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; - case 128: + case 129: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2641 "parser.y" +#line 2458 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; - case 129: + case 130: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2642 "parser.y" +#line 2459 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; - case 130: + case 131: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2643 "parser.y" +#line 2460 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; - case 131: + case 132: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2644 "parser.y" +#line 2461 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; - case 132: + case 133: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2645 "parser.y" +#line 2462 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5656,99 +5564,99 @@ PASS2 - case 133: + case 134: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2649 "parser.y" +#line 2466 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 134: + case 135: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2467 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 135: + case 136: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2652 "parser.y" +#line 2469 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 136: + case 137: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2653 "parser.y" +#line 2470 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 137: + case 138: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2655 "parser.y" +#line 2472 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; - case 138: + case 139: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2656 "parser.y" +#line 2473 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; - case 139: + case 140: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2477 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; - case 140: + case 141: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2479 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 141: + case 142: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2666 "parser.y" +#line 2483 "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));} } @@ -5756,22 +5664,33 @@ PASS2 - case 142: + case 143: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2669 "parser.y" +#line 2486 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 151: + case 149: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2495 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2682 "parser.y" +#line 2499 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5782,11 +5701,11 @@ PASS2 - case 157: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2510 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5795,11 +5714,11 @@ PASS2 - case 158: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2696 "parser.y" +#line 2513 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5815,122 +5734,141 @@ PASS2 - case 161: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" - {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} +#line 2547 "parser.y" + {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 162: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" - {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} +#line 2547 "parser.y" + {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; - case 163: + case 164: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2713 "parser.y" - {(yyval.code) = (yyvsp[(1) - (1)].code);} +#line 2549 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 164: + case 165: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2714 "parser.y" - {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} +#line 2550 "parser.y" + {PASS12 (yyval.code)=0;} } break; - case 165: + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 2553 "parser.y" { +PASS12 int flags = slotstate_flags->flags; namespace_t ns = modifiers2access(slotstate_flags); - varinfo_t* info = 0; - if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); - if(i) { - check_override(i, flags); - } - info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); - } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); - if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); - } - if(ns.name && ns.name[0]) { - syntaxerror("namespaces not allowed on package-level variables"); - } - info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); - } + if(as3_pass == 1) { - info->type = (yyvsp[(2) - (3)].classinfo); - info->flags = flags; + varinfo_t* info = 0; + if(state->cls) { + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); + if(i) { + check_override(i, flags); + } + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); + } else { + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); + if(i) { + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); + } - /* slot name */ - multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; - - trait_list_t**traits; - code_t**code; - if(!state->cls) { - // global variable - ns.name = state->package; - traits = &global->init->traits; - code = &global->init->method->body->code; - } else if(flags&FLAG_STATIC) { - // static variable - traits = &state->cls->abc->static_traits; - code = &state->cls->static_init->header; - } else { - // instance variable - traits = &state->cls->abc->traits; - code = &state->cls->init->header; - } - - trait_t*t=0; - if((yyvsp[(2) - (3)].classinfo)) { - MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); - t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); - } else { - t = trait_new_member(traits, 0, multiname_clone(&mname), 0); - } - info->slot = t->slot_id; - - /* initalization code (if needed) */ - code_t*c = 0; - if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { - c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(3) - (3)].value).c); - c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); - c = abc_setslot(c, t->slot_id); + info->type = (yyvsp[(2) - (3)].classinfo); + info->flags = flags; + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info); } - *code = code_append(*code, c); + if(as3_pass == 2) { + varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + /* slot name */ + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; + + trait_list_t**traits; + code_t**code; + if(!state->cls) { + // global variable + ns.name = state->package; + traits = &global->init->traits; + code = &global->init->method->body->code; + } else if(flags&FLAG_STATIC) { + // static variable + traits = &state->cls->abc->static_traits; + code = &state->cls->static_init->header; + } else { + // instance variable + traits = &state->cls->abc->traits; + code = &state->cls->init->header; + } + + trait_t*t=0; + if((yyvsp[(2) - (3)].classinfo)) { + MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); + t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); + } else { + t = trait_new_member(traits, 0, multiname_clone(&mname), 0); + } + info->slot = t->slot_id; + + constant_t cval = (yyvsp[(3) - (3)].node)->type->eval((yyvsp[(3) - (3)].node)); + if(cval.type!=CONSTANT_UNKNOWN) { + /* compile time constant */ + t->value = malloc(sizeof(constant_t)); + memcpy(t->value, &cval, sizeof(constant_t)); + info->value = constant_clone(t->value); + } else { + typedcode_t v = node_read((yyvsp[(3) - (3)].node)); + /* initalization code (if needed) */ + code_t*c = 0; + if(v.c && !is_pushundefined(v.c)) { + c = abc_getlocal_0(c); + c = code_append(c, v.c); + c = converttype(c, v.t, (yyvsp[(2) - (3)].classinfo)); + c = abc_setslot(c, t->slot_id); + } + *code = code_append(*code, c); + } - if(slotstate_varconst==KW_CONST) { - t->kind= TRAIT_CONST; + if(slotstate_varconst==KW_CONST) { + t->kind= TRAIT_CONST; + info->flags |= FLAG_CONST; + } } (yyval.code)=0; @@ -5940,23 +5878,12 @@ PASS2 - case 166: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2791 "parser.y" - {(yyval.constant)=0;} - } - break; - - - case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2792 "parser.y" - {(yyval.constant)=(yyvsp[(2) - (2)].constant);} +#line 2646 "parser.y" + {(yyval.constant)=0;} } break; @@ -5966,8 +5893,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2794 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} +#line 2647 "parser.y" + { + (yyval.constant) = malloc(sizeof(constant_t)); + *(yyval.constant) = node_eval((yyvsp[(2) - (2)].node)); + if((yyval.constant)->type == CONSTANT_UNKNOWN) + syntaxerror("can't evaluate default parameter value (needs to be a compile-time constant)"); +} } break; @@ -5977,7 +5909,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2795 "parser.y" +#line 2655 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5988,8 +5920,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2796 "parser.y" - {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} +#line 2656 "parser.y" + { + (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); +} } break; @@ -5999,7 +5933,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2797 "parser.y" +#line 2659 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -6010,7 +5944,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2798 "parser.y" +#line 2660 "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; @@ -6021,7 +5955,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2800 "parser.y" +#line 2661 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -6032,7 +5966,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2801 "parser.y" +#line 2662 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -6043,7 +5977,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2802 "parser.y" +#line 2663 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -6054,15 +5988,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2803 "parser.y" - { - if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { - (yyval.constant) = constant_new_float(__builtin_nan("")); - } else { - as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); - } -} +#line 2664 "parser.y" + {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; @@ -6072,7 +5999,18 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2815 "parser.y" +#line 2665 "parser.y" + {(yyval.constant) = constant_new_float(__builtin_nan(""));} + } + break; + + + + case 178: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2680 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6082,11 +6020,11 @@ PASS2 - case 178: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2819 "parser.y" +#line 2684 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -6096,11 +6034,11 @@ PASS2 - case 179: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2825 "parser.y" +#line 2690 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6112,11 +6050,11 @@ PASS2 - case 180: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2831 "parser.y" +#line 2696 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6128,11 +6066,11 @@ PASS2 - case 181: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2839 "parser.y" +#line 2704 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6143,11 +6081,11 @@ PASS2 - case 182: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2844 "parser.y" +#line 2709 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6158,11 +6096,11 @@ PASS2 - case 183: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2850 "parser.y" +#line 2715 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6176,11 +6114,11 @@ PASS2 - case 184: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2858 "parser.y" +#line 2723 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6194,33 +6132,33 @@ PASS2 - case 187: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 2733 "parser.y" {PASS12 (yyval.token)=0;} } break; - case 188: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2871 "parser.y" +#line 2736 "parser.y" {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; - case 189: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2872 "parser.y" +#line 2737 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -6240,33 +6178,33 @@ PASS2 - case 191: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2888 "parser.y" +#line 2753 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 192: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2890 "parser.y" +#line 2755 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 193: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2891 "parser.y" +#line 2756 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6290,11 +6228,11 @@ PASS2 - case 194: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2913 "parser.y" +#line 2778 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6318,11 +6256,11 @@ PASS2 - case 195: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2932 "parser.y" +#line 2797 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6341,121 +6279,121 @@ PASS2 - case 198: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2949 "parser.y" +#line 2814 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 199: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2950 "parser.y" +#line 2815 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 200: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2952 "parser.y" +#line 2817 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 201: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2953 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2818 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; - case 202: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2954 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2819 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; - case 203: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "parser.y" +#line 2828 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 204: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2964 "parser.y" +#line 2829 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; - case 205: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2968 "parser.y" +#line 2833 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 206: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2969 "parser.y" +#line 2834 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 207: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2971 "parser.y" +#line 2836 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 210: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2975 "parser.y" +#line 2840 "parser.y" {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6464,22 +6402,22 @@ PASS2 - case 211: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 2844 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 212: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 2845 "parser.y" { (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); @@ -6489,13 +6427,14 @@ PASS2 - case 214: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2986 "parser.y" +#line 2851 "parser.y" { - (yyval.value).c = (yyvsp[(2) - (4)].value).c; + typedcode_t v = node_read((yyvsp[(2) - (4)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); code_t*paramcode = (yyvsp[(4) - (4)].value_list).cc; @@ -6518,8 +6457,8 @@ PASS2 } (yyval.value).t = TYPE_ANY; - if(TYPE_IS_CLASS((yyvsp[(2) - (4)].value).t) && (yyvsp[(2) - (4)].value).t->data) { - (yyval.value).t = (yyvsp[(2) - (4)].value).t->data; + if(TYPE_IS_CLASS(v.t) && v.t->data) { + (yyval.value).t = v.t->data; } else { (yyval.value).c = abc_coerce_a((yyval.value).c); (yyval.value).t = TYPE_ANY; @@ -6530,14 +6469,15 @@ PASS2 - case 215: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3022 "parser.y" +#line 2888 "parser.y" { - - (yyval.value).c = (yyvsp[(1) - (4)].value).c; + + typedcode_t v = node_read((yyvsp[(1) - (4)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { (yyval.value).c = code_cutlast((yyval.value).c); } @@ -6573,8 +6513,11 @@ PASS2 (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) { - (yyval.value).t = ((methodinfo_t*)((yyvsp[(1) - (4)].value).t->data))->return_type; + if(TYPE_IS_FUNCTION(v.t) && v.t->data) { + (yyval.value).t = ((methodinfo_t*)(v.t->data))->return_type; + } else if(TYPE_IS_CLASS(v.t) && v.t->data) { + // calling a class is like a typecast + (yyval.value).t = (classinfo_t*)v.t->data; } else { (yyval.value).c = abc_coerce_a((yyval.value).c); (yyval.value).t = TYPE_ANY; @@ -6585,11 +6528,11 @@ PASS2 - case 216: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3068 "parser.y" +#line 2938 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6615,13 +6558,14 @@ PASS2 - case 217: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 2959 "parser.y" { - (yyval.value).c = (yyvsp[(2) - (2)].value).c; + typedcode_t v = node_read((yyvsp[(2) - (2)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { (yyval.value).c = code_cutlast((yyval.value).c); } @@ -6635,7 +6579,7 @@ PASS2 (yyval.value).c = abc_deleteproperty2((yyval.value).c, name); } else { (yyval.value).c = abc_getlocal_0((yyval.value).c); - MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, ""); + MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, ""); (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m); } (yyval.value).t = TYPE_BOOLEAN; @@ -6645,11 +6589,11 @@ PASS2 - case 218: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3110 "parser.y" +#line 2981 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6658,11 +6602,11 @@ PASS2 - case 219: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3113 "parser.y" +#line 2984 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6672,63 +6616,66 @@ PASS2 - case 220: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3120 "parser.y" - {(yyval.value)=(yyvsp[(1) - (1)].value);} +#line 2991 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; - case 221: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3121 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 2994 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; - case 222: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3122 "parser.y" +#line 2997 "parser.y" { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).t = (yyvsp[(3) - (3)].value).t; + (yyval.node) = mkmultinode(&node_comma, (yyvsp[(1) - (1)].node)); } } break; - case 223: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3128 "parser.y" +#line 3000 "parser.y" { - (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); + (yyval.node) = multinode_extend((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } } break; - case 224: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3134 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3003 "parser.y" + { + (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); +} } break; @@ -6738,8 +6685,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3138 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3006 "parser.y" + { + (yyval.code) = (yyvsp[(1) - (3)].code); + (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); +} } break; @@ -6749,8 +6699,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3011 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6760,34 +6710,30 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3142 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3012 "parser.y" + {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 230: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3146 "parser.y" - { - (yyval.value).c = 0; - namespace_t ns = {ACCESS_PACKAGE, ""}; - multiname_t m = {QNAME, &ns, 0, "RegExp"}; - if(!(yyvsp[(1) - (1)].regexp).options) { - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern); - (yyval.value).c = abc_construct((yyval.value).c, 1); - } else { - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).options); - (yyval.value).c = abc_construct((yyval.value).c, 2); +#line 3014 "parser.y" + {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));} } - (yyval.value).t = TYPE_REGEXP; -} + break; + + + + case 230: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3015 "parser.y" + {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));} } break; @@ -6797,12 +6743,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3163 "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; - } +#line 3017 "parser.y" + { + (yyval.value_list).cc = 0; + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].code)); + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); + (yyval.value_list).number = 2; +} } break; @@ -6812,10 +6759,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3168 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } +#line 3023 "parser.y" + { + (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; + (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].code)); + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); +} } break; @@ -6825,10 +6775,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3171 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } +#line 3032 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6838,10 +6786,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3174 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } +#line 3033 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6851,10 +6797,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3177 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } +#line 3034 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6864,10 +6808,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3180 "parser.y" - {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); - (yyval.value).t = TYPE_STRING; - } +#line 3035 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6877,10 +6819,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3183 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3036 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6890,10 +6830,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3186 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3037 "parser.y" + {(yyval.node) = (yyvsp[(1) - (1)].node);} } break; @@ -6903,10 +6841,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3189 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3039 "parser.y" + { + (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant)); +} } break; @@ -6916,10 +6854,25 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3192 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } +#line 3044 "parser.y" + { + typedcode_t v; + v.c = 0; + namespace_t ns = {ACCESS_PACKAGE, ""}; + multiname_t m = {QNAME, &ns, 0, "RegExp"}; + if(!(yyvsp[(1) - (1)].regexp).options) { + v.c = abc_getlex2(v.c, &m); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern); + v.c = abc_construct(v.c, 1); + } else { + v.c = abc_getlex2(v.c, &m); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).options); + v.c = abc_construct(v.c, 2); + } + v.t = TYPE_REGEXP; + (yyval.node) = mkcodenode(v); +} } break; @@ -6929,10 +6882,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3196 "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; - } +#line 3064 "parser.y" + { + typedcode_t v; + v.c = code_new(); + v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc); + v.c = abc_newarray(v.c, (yyvsp[(2) - (3)].value_list).number); + v.t = registry_getarrayclass(); + (yyval.node) = mkcodenode(v); +} } break; @@ -6942,10 +6900,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3199 "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; - } +#line 3074 "parser.y" + { + typedcode_t v; + v.c = code_new(); + v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc); + v.c = abc_newobject(v.c, (yyvsp[(2) - (3)].value_list).number/2); + v.t = registry_getobjectclass(); + (yyval.node) = mkcodenode(v); +} } break; @@ -6955,10 +6918,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3202 "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; - } +#line 3083 "parser.y" + {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6968,10 +6929,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "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; - } +#line 3084 "parser.y" + {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6981,10 +6940,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3208 "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; - } +#line 3085 "parser.y" + {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6994,10 +6951,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3211 "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; - } +#line 3086 "parser.y" + {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7007,10 +6962,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3214 "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; - } +#line 3087 "parser.y" + {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7020,10 +6973,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3217 "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; - } +#line 3088 "parser.y" + {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7033,18 +6984,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3221 "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); - (yyval.value).c = abc_dup((yyval.value).c); - code_t*jmp = (yyval.value).c = abc_iftrue((yyval.value).c, 0); - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t); - code_t*label = (yyval.value).c = abc_label((yyval.value).c); - jmp->branch = label; - } +#line 3089 "parser.y" + {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7054,24 +6995,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3232 "parser.y" - { - (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); - /*printf("%08x:\n",$1.t); - code_dump($1.c, 0, 0, "", stdout); - printf("%08x:\n",$3.t); - code_dump($3.c, 0, 0, "", stdout); - printf("joining %08x and %08x to %08x\n", $1.t, $3.t, $$.t);*/ - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); - (yyval.value).c = abc_dup((yyval.value).c); - code_t*jmp = (yyval.value).c = abc_iffalse((yyval.value).c, 0); - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t); - code_t*label = (yyval.value).c = abc_label((yyval.value).c); - jmp->branch = label; - } +#line 3090 "parser.y" + {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7081,11 +7006,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3250 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3091 "parser.y" + {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7095,11 +7017,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3255 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_bitnot((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3092 "parser.y" + {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7109,11 +7028,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3260 "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; - } +#line 3093 "parser.y" + {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));} } break; @@ -7123,11 +7039,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3265 "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; - } +#line 3094 "parser.y" + {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));} } break; @@ -7137,11 +7050,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3270 "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; - } +#line 3095 "parser.y" + {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7151,11 +7061,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3275 "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; - } +#line 3096 "parser.y" + {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7165,11 +7072,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3279 "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; - } +#line 3097 "parser.y" + {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7179,11 +7083,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3283 "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; - } +#line 3098 "parser.y" + {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7193,11 +7094,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3288 "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; - } +#line 3099 "parser.y" + {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7207,11 +7105,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3292 "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; - } +#line 3100 "parser.y" + {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7221,16 +7116,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3296 "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); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_add((yyval.value).c); - (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t,'+'); - } - } +#line 3101 "parser.y" + {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7240,16 +7127,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3305 "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); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_subtract((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3102 "parser.y" + {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7259,16 +7138,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3314 "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); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_multiply((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3103 "parser.y" + {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7278,11 +7149,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3324 "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; - } +#line 3104 "parser.y" + {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7292,18 +7160,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3329 "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)); - (yyval.value).c = abc_astype2((yyvsp[(1) - (3)].value).c, &m); - (yyval.value).t = (yyvsp[(3) - (3)].value).t->data; - } else { - (yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_astypelate((yyval.value).c); - (yyval.value).t = TYPE_ANY; - } - } +#line 3105 "parser.y" + {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7313,11 +7171,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3342 "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; - } +#line 3106 "parser.y" + {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7327,11 +7182,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3347 "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; - } +#line 3107 "parser.y" + {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7341,12 +7193,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3352 "parser.y" - { - (yyval.value).c = (yyvsp[(3) - (4)].value).c; - (yyval.value).c = abc_typeof((yyval.value).c); - (yyval.value).t = TYPE_STRING; - } +#line 3108 "parser.y" + {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7356,12 +7204,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3358 "parser.y" - { - (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); - (yyval.value).c = abc_pushundefined((yyval.value).c); - (yyval.value).t = TYPE_ANY; - } +#line 3109 "parser.y" + {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7371,10 +7215,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3364 "parser.y" - { (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3110 "parser.y" + {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));} } break; @@ -7384,8 +7226,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3368 "parser.y" - {(yyval.value)=(yyvsp[(2) - (3)].value);} +#line 3111 "parser.y" + {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));} } break; @@ -7395,17 +7237,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3370 "parser.y" - { - (yyval.value)=(yyvsp[(2) - (2)].value); - if(IS_INT((yyvsp[(2) - (2)].value).t)) { - (yyval.value).c=abc_negate_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c=abc_negate((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } -} +#line 3112 "parser.y" + { (yyval.node) = mkconstnode(constant_new_undefined());} } break; @@ -7415,15 +7248,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3381 "parser.y" - { - (yyval.value).c = (yyvsp[(1) - (4)].value).c; - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); - - MULTINAME_LATE(m, (yyvsp[(1) - (4)].value).t?(yyvsp[(1) - (4)].value).t->access:ACCESS_PACKAGE, ""); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).t = 0; // array elements have unknown type -} +#line 3113 "parser.y" + { (yyval.node)=(yyvsp[(2) - (3)].node);} } break; @@ -7433,13 +7259,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3390 "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).number); - (yyval.value).t = registry_getarrayclass(); -} +#line 3114 "parser.y" + {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));} } break; @@ -7449,8 +7270,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3397 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).number=0;} +#line 3115 "parser.y" + {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));} } break; @@ -7460,8 +7281,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3398 "parser.y" - {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} +#line 3116 "parser.y" + {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7471,13 +7292,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3400 "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).number = 2; -} +#line 3117 "parser.y" + {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7487,13 +7303,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3406 "parser.y" - { - (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (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); -} +#line 3118 "parser.y" + {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7503,13 +7314,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3415 "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).number/2); - (yyval.value).t = registry_getobjectclass(); -} +#line 3119 "parser.y" + {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7519,18 +7325,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3422 "parser.y" - { - code_t*c = (yyvsp[(3) - (3)].value).c; - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - c=abc_multiply_i(c); - } else { - 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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3120 "parser.y" + {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7540,13 +7336,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3434 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3121 "parser.y" + { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7556,13 +7347,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3440 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3122 "parser.y" + { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7572,13 +7358,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3446 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3123 "parser.y" + { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7588,13 +7369,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3452 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3124 "parser.y" + { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7604,13 +7380,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3458 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3125 "parser.y" + { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7620,13 +7391,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3464 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3126 "parser.y" + { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7636,13 +7402,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3470 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3127 "parser.y" + { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7652,20 +7413,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3476 "parser.y" - { - code_t*c = (yyvsp[(3) - (3)].value).c; - - if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { - c=abc_add_i(c); - } else { - c=abc_add(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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3128 "parser.y" + { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));} } break; @@ -7675,18 +7424,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3489 "parser.y" - { code_t*c = (yyvsp[(3) - (3)].value).c; - if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { - c=abc_subtract_i(c); - } else { - c=abc_subtract(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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3130 "parser.y" + { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));} } break; @@ -7696,13 +7435,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3500 "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).t = (yyvsp[(1) - (3)].value).t; - } +#line 3131 "parser.y" + { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));} } break; @@ -7712,19 +7446,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3507 "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; - code_t*j1 = (yyval.value).c = abc_iffalse((yyval.value).c, 0); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t); - code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0); - (yyval.value).c = j1->branch = abc_label((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); - (yyval.value).c = j2->branch = abc_label((yyval.value).c); - } +#line 3132 "parser.y" + {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); } } break; @@ -7734,32 +7457,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3520 "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))) { - 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)) { - (yyval.value).c = abc_getlocal(0, nr); - (yyval.value).c = abc_inclocal_i((yyval.value).c, nr); - } else if(TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { - (yyval.value).c = abc_getlocal(0, nr); - (yyval.value).c = abc_inclocal((yyval.value).c, nr); - } else syntaxerror("internal error"); - } else { - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_increment_i(c); - type = TYPE_INT; - } else { - c=abc_increment(c); - 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).t = (yyvsp[(1) - (2)].value).t; - } - } +#line 3133 "parser.y" + {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); } } break; @@ -7769,103 +7468,33 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3547 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_decrement_i(c); - type = TYPE_INT; - } else { - c=abc_decrement(c); - 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).t = (yyvsp[(1) - (2)].value).t; - } - } - break; - - - - case 294: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3561 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_increment_i(c); - type = TYPE_INT; - } else { - c=abc_increment(c); - 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).t = (yyvsp[(2) - (2)].value).t; - } - } - break; - - - - case 295: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3575 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_decrement_i(c); - type = TYPE_INT; - } else { - c=abc_decrement(c); - 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).t = (yyvsp[(2) - (2)].value).t; - } - } - break; - - - - case 296: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3590 "parser.y" +#line 3136 "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; - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getsuper2((yyval.value).c, &m); - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + typedcode_t v; + v.c = 0; + v.c = abc_getlocal_0(v.c); + v.c = abc_getsuper2(v.c, &m); + v.t = slotinfo_gettype((slotinfo_t*)f); + (yyval.node) = mkcodenode(v); } } break; - case 297: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3604 "parser.y" +#line 3150 "parser.y" { // attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored @ operator"); } } @@ -7873,15 +7502,14 @@ PASS2 - case 298: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3611 "parser.y" +#line 3156 "parser.y" { // child attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .@ operator"); } } @@ -7889,15 +7517,14 @@ PASS2 - case 299: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3618 "parser.y" +#line 3162 "parser.y" { // namespace declaration TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored :: operator"); } } @@ -7905,15 +7532,14 @@ PASS2 - case 300: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3625 "parser.y" +#line 3168 "parser.y" { // descendants TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .. operator"); } } @@ -7921,15 +7547,14 @@ PASS2 - case 301: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3632 "parser.y" +#line 3174 "parser.y" { // filter TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .() operator"); } } @@ -7937,14 +7562,15 @@ PASS2 - case 302: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3643 "parser.y" +#line 3187 "parser.y" { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; + typedcode_t v1 = node_read((yyvsp[(1) - (3)].node)); + (yyval.value).c = v1.c; + classinfo_t*t = v1.t; char is_static = 0; if(TYPE_IS_CLASS(t) && t->data) { t = t->data; @@ -7954,13 +7580,16 @@ PASS2 if(t->subtype==INFOTYPE_UNRESOLVED) { syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); } - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); char noslot = 0; if(f && !is_static != !(f->flags&FLAG_STATIC)) noslot=1; if(f && f->slot && !noslot) { (yyval.value).c = abc_getslot((yyval.value).c, f->slot); } else { + if(!f) { + as3_softwarning("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); } @@ -7968,27 +7597,31 @@ PASS2 (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]; + + } else if(v1.c && v1.c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = v1.c->data[0]; char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); - if(dict_contains(state->import_toplevel_packages, package2)) { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; + + 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 = v1.c; (yyval.value).c->data[0] = string_new4(package2); (yyval.value).t = 0; } else { - slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); - if(!a) - syntaxerror("couldn't resolve %s", package2); - (yyval.value) = push_class(a); + syntaxerror("couldn't resolve %s", package2); } } else { /* when resolving a property on an unknown type, we do know the name of the property (and don't seem to need the package), but we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; (yyval.value).c = abc_getproperty2((yyval.value).c, &m); (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); + (yyval.value).t = TYPE_ANY; } } } @@ -7996,11 +7629,11 @@ PASS2 - case 303: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3693 "parser.y" +#line 3245 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -8014,13 +7647,16 @@ PASS2 unknown_variable((yyvsp[(1) - (1)].id)); } - /* let the compiler know that it might check the current directory/package + /* let the compiler know that it might want to check the current directory/package for this identifier- maybe there's a file $1.as defining $1. */ as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 - (yyval.value).t = 0; - (yyval.value).c = 0; + typedcode_t o; + o.t = 0; + o.c = 0; + (yyval.node) = 0; + slotinfo_t*a = 0; memberinfo_t*f = 0; @@ -8028,65 +7664,88 @@ PASS2 /* look at variables */ if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) { // $1 is a local variable - (yyval.value).c = abc_getlocal((yyval.value).c, v->index); - (yyval.value).t = v->type; + o.c = abc_getlocal(o.c, v->index); + o.t = v->type; + (yyval.node) = mkcodenode(o); break; } if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) { - (yyval.value).c = abc_getscopeobject((yyval.value).c, 1); - (yyval.value).c = abc_getslot((yyval.value).c, v->index); - (yyval.value).t = v->type; + o.c = abc_getscopeobject(o.c, 1); + o.c = abc_getslot(o.c, v->index); + o.t = v->type; + (yyval.node) = mkcodenode(o); break; } 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) { - // $1 is a function in this class + if(!state->method->inner && + state->cls && + (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1))) + { + // $1 is a member or attribute in this class int var_is_static = (f->flags&FLAG_STATIC); - if(f->kind == INFOTYPE_METHOD) { - (yyval.value).t = TYPE_FUNCTION(f); - } else { - (yyval.value).t = f->type; + if(f->kind == INFOTYPE_VAR && (f->flags&FLAG_CONST)) { + /* if the variable is a constant (and we know what is evaluates to), we + can just use the value itself */ + varinfo_t*v = (varinfo_t*)f; + if(v->value) { + (yyval.node) = mkconstnode(v->value); + break; + } } - if(var_is_static && !i_am_static) { - /* access to a static member from a non-static location. - do this via findpropstrict: - there doesn't seem to be any non-lookup way to access - static properties of a class */ - state->method->late_binding = 1; - (yyval.value).t = f->type; - namespace_t ns = {f->access, ""}; - 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); - break; - } else if(f->slot>0) { - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - break; - } else { - namespace_t ns = {f->access, ""}; - 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); - break; + + if(var_is_static >= i_am_static) { + if(f->kind == INFOTYPE_METHOD) { + o.t = TYPE_FUNCTION(f); + } else { + o.t = f->type; + } + + if(var_is_static && !i_am_static) { + /* access to a static member from a non-static location. + do this via findpropstrict: + there doesn't seem to be any non-lookup way to access + static properties of a class */ + state->method->late_binding = 1; + o.t = f->type; + namespace_t ns = {f->access, f->package}; + multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; + o.c = abc_findpropstrict2(o.c, &m); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; + } else if(f->slot>0) { + o.c = abc_getlocal_0(o.c); + o.c = abc_getslot(o.c, f->slot); + (yyval.node) = mkcodenode(o); + break; + } else { + namespace_t ns = {f->access, f->package}; + multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; + o.c = abc_getlocal_0(o.c); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; + } } } /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - (yyval.value) = push_class(a); + o = push_class(a); + (yyval.node) = mkcodenode(o); break; } /* look through package prefixes */ - if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) { - (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); - (yyval.value).t = 0; + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id)) || + registry_ispackage((yyvsp[(1) - (1)].id))) { + o.c = abc___pushpackage__(o.c, (yyvsp[(1) - (1)].id)); + o.t = 0; + (yyval.node) = mkcodenode(o); //? break; } @@ -8098,9 +7757,11 @@ PASS2 multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; - (yyval.value).t = 0; - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + o.t = 0; + o.c = abc_findpropstrict2(o.c, &m); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; } } } @@ -8108,16 +7769,16 @@ PASS2 - case 304: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3798 "parser.y" +#line 3378 "parser.y" { PASS12 NEW(namespace_decl_t,n); n->name = (yyvsp[(2) - (2)].id); - n->url = 0; + n->url = (yyvsp[(2) - (2)].id); (yyval.namespace_decl)=n; } } @@ -8125,11 +7786,11 @@ PASS2 - case 305: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3805 "parser.y" +#line 3385 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8142,11 +7803,11 @@ PASS2 - case 306: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3812 "parser.y" +#line 3392 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8159,15 +7820,23 @@ PASS2 - case 307: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3819 "parser.y" +#line 3399 "parser.y" { PASS12 - list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl)); - tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name); + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + (yyval.code)=0; } } @@ -8175,20 +7844,30 @@ PASS2 - case 308: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3826 "parser.y" +#line 3423 "parser.y" { PASS12 - NEW(namespace_decl_t,n); - n->name = (yyvsp[(3) - (3)].classinfo)->name; - n->url = 0; - /* FIXME: for pass2, we should now try to figure out what the URL of - this thing is */ - list_append(state->new_namespaces, n); - tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); + const char*url = (yyvsp[(3) - (3)].classinfo)->name; + + varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo); + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); + } + + if(!s || s->kind != INFOTYPE_VAR) + 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; } } @@ -8198,7 +7877,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 8202 "parser.tab.c" +#line 7881 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);