X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=0ccd08fb08998be6d46a8388e9dcb9469f2bc90a;hb=3dea7306ae2c9590673c10dec1fbabcd6d7e1806;hp=c6a086d63f4aeee920cd12e2b239faf4147ae1ab;hpb=d2bcd477230b4ac8d7e69fc253d94250b13eb37a;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index c6a086d..0ccd08f 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -84,18 +84,20 @@ #include "abc.h" #include "pool.h" #include "files.h" +#include "common.h" #include "tokenizer.h" #include "registry.h" #include "code.h" #include "opcodes.h" #include "compiler.h" +#include "expr.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 99 "parser.tab.c" +#line 101 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -129,77 +131,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 +221,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,18 +237,19 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 46 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 46 "parser.y" enum yytokentype token; - int flags; classinfo_t*classinfo; classinfo_list_t*classinfo_list; + slotinfo_t*slotinfo; + slotinfo_list_t*slotinfo_list; int number_int; unsigned int number_uint; @@ -263,6 +266,9 @@ tokenunion for_start_t for_start; abc_exception_t *exception; regexp_t regexp; + modifiers_t flags; + namespace_decl_t* namespace_decl; + node_t*node; struct { abc_exception_list_t *l; code_t*finally; @@ -271,7 +277,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 275 "parser.tab.c" +#line 281 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -282,7 +288,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 259 "parser.y" +#line 269 "parser.y" static int a3_error(char*s) @@ -291,6 +297,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) { @@ -318,7 +331,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); @@ -340,17 +352,29 @@ typedef struct _classstate { struct _methodstate { /* method data */ methodinfo_t*info; + char has_exceptions; char late_binding; char is_constructor; char has_super; char is_global; int variable_count; + dict_t*unresolved_variables; + char inner; + char uses_parent_function; + int uses_slots; + dict_t*slots; + int activation_var; + abc_method_t*abc; int var_index; // for inner methods + int slot_index; // for inner methods + char is_a_slot; // for inner methods code_t*header; + + code_t*scope_code; abc_exception_list_t*exceptions; methodstate_list_t*innerfunctions; @@ -362,7 +386,11 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; + dict_t*import_toplevel_packages; dict_t*imports; + + namespace_list_t*active_namespace_urls; + char has_own_imports; char new_vars; // e.g. transition between two functions @@ -370,6 +398,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -396,12 +426,14 @@ DECLARE_LIST(state); multiname_t m;\ namespace_t m##_ns;\ if(f) { \ - m##_ns.access = (f)->access; \ - m##_ns.name = ""; \ + if((m##_ns.access = ((slotinfo_t*)(f))->access)==ACCESS_NAMESPACE) \ + m##_ns.name = ((slotinfo_t*)(f))->package; \ + else \ + m##_ns.name = ""; \ m.type = QNAME; \ m.ns = &m##_ns; \ m.namespace_set = 0; \ - m.name = f->name; \ + m.name = ((slotinfo_t*)(f))->name; \ } else { \ m.type = MULTINAME; \ m.ns =0; \ @@ -429,6 +461,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); @@ -438,17 +479,20 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; state->vars = dict_new(); state->old = oldstate; -} -static void state_has_imports() -{ - state->wildcard_imports = list_clone(state->wildcard_imports); - state->imports = dict_clone(state->imports); - state->has_own_imports = 1; + state->new_vars = 0; + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_destroy(state_t*state) @@ -472,17 +516,22 @@ static void state_destroy(state_t*state) dict_destroy(state->vars);state->vars=0; } + list_free(state->active_namespace_urls) + state->active_namespace_urls = 0; + free(state); } static void old_state() { + trie_rollback(active_namespaces); + if(!state || !state->old) syntaxerror("invalid nesting"); state_t*leaving = state; state = state->old; - + if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); leaving->method=0; @@ -491,13 +540,13 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } static code_t* method_header(methodstate_t*m); static code_t* wrap_function(code_t*c,code_t*header, code_t*body); -static void function_initvars(methodstate_t*m, params_t*params, int flags); +static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0); static char* internal_filename_package = 0; @@ -506,6 +555,9 @@ void initialize_file(char*filename) if(state) { syntaxerror("invalid call to initialize_file during parsing of another file"); } + + active_namespaces = trie_new(); + new_state(); state->package = internal_filename_package = strdup(filename); @@ -520,11 +572,13 @@ void initialize_file(char*filename) if(as3_pass==1) { state->method = rfx_calloc(sizeof(methodstate_t)); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); - function_initvars(state->method, 0, 0); + if(!state->method) + syntaxerror("internal error: skewed tokencount"); + function_initvars(state->method, 0, 0, 1); global->init = abc_initscript(global->file); - state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } } @@ -533,8 +587,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; @@ -557,98 +613,112 @@ void initialize_parser() void* finish_parser() { dict_free_all(global->file2token2info, 1, (void*)dict_destroy); - global->token2info=0; - return global->file; } - -static void xx_scopetest() -{ - /* findpropstrict doesn't just return a scope object- it - also makes it "active" somehow. Push local_0 on the - scope stack and read it back with findpropstrict, it'll - contain properties like "trace". Trying to find the same - property on a "vanilla" local_0 yields only a "undefined" */ - //c = abc_findpropstrict(c, "[package]::trace"); - - /*c = abc_getlocal_0(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_coerce_a(c); - c = abc_setlocal_1(c); - - c = abc_pushbyte(c, 0); - c = abc_setlocal_2(c); - - code_t*xx = c = abc_label(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "prop:"); - c = abc_hasnext2(c, 1, 2); - c = abc_dup(c); - c = abc_setlocal_3(c); - c = abc_callpropvoid(c, "[package]::trace", 2); - c = abc_getlocal_3(c); - c = abc_kill(c, 3); - c = abc_iftrue(c,xx);*/ -} - - typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; + methodstate_t*is_inner_method; } variable_t; -static variable_t* find_variable(char*name) +static variable_t* find_variable(state_t*s, char*name) { - state_t* s = state; while(s) { variable_t*v = 0; - if(s->method) - v = dict_lookup(s->vars, name); - if(v) { - return v; - } - if(s->new_vars) - break; + v = dict_lookup(s->vars, name); + if(v) return v; + if(s->new_vars) break; s = s->old; } return 0; -} -static variable_t* find_variable_safe(char*name) +} +static variable_t* find_slot(state_t*s, const char*name) +{ + if(s->method && s->method->slots) + return dict_lookup(s->method->slots, name); + return 0; +} + +static variable_t* find_variable_safe(state_t*s, char*name) { - variable_t* v = find_variable(name); + variable_t* v = find_variable(s, name); if(!v) syntaxerror("undefined variable: %s", name); return v; } + static char variable_exists(char*name) { - return dict_lookup(state->vars, name)!=0; + return dict_contains(state->vars, name); +} + +static code_t*defaultvalue(code_t*c, classinfo_t*type) +{ + if(TYPE_IS_INT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_UINT(type)) { + c = abc_pushuint(c, 0); + } else if(TYPE_IS_FLOAT(type)) { + c = abc_pushnan(c); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else if(!type) { + //c = abc_pushundefined(c); + syntaxerror("internal error: can't generate default value for * type"); + } else { + c = abc_pushnull(c); + MULTINAME(m, type); + c = abc_coerce2(c, &m); + } + return c; +} + +static int alloc_local() +{ + return state->method->variable_count++; } -code_t*defaultvalue(code_t*c, classinfo_t*type); -static int new_variable(const char*name, classinfo_t*type, char init) + +static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot) { + if(maybeslot) { + variable_t*v = find_slot(state, name); + if(v) + return v; + } + NEW(variable_t, v); - v->index = state->method->variable_count; + v->index = alloc_local(); v->type = type; v->init = init; - - dict_put(state->vars, name, v); + + if(name) + dict_put(state->vars, name, v); - return state->method->variable_count++; + return v; +} +static int new_variable(const char*name, classinfo_t*type, char init, char maybeslot) +{ + return new_variable2(name, type, init, maybeslot)->index; } + #define TEMPVARNAME "__as3_temp__" -static int gettempvar() +int gettempvar() { - variable_t*v = find_variable(TEMPVARNAME); + variable_t*v = find_variable(state, TEMPVARNAME); + int i; if(v) - return v->index; - return new_variable(TEMPVARNAME, 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; @@ -692,30 +762,57 @@ code_t* var_block(code_t*body) return c; } -#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} - -static void parsererror(const char*file, int line, const char*f) +static void unknown_variable(char*name) { - syntaxerror("internal error in %s, %s:%d", f, file, line); + if(!state->method->unresolved_variables) + state->method->unresolved_variables = dict_new(); + if(!dict_contains(state->method->unresolved_variables, name)) + dict_put(state->method->unresolved_variables, name, 0); } - -static code_t* method_header(methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - code_t*c = 0; - if(m->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->innerfunctions) { - c = abc_newactivation(c); - c = abc_pushscope(c); - }*/ + if(m->uses_slots) { + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } + } + return c; +} + +static code_t* method_header(methodstate_t*m) +{ + code_t*c = 0; + + c = add_scope_code(c, m, 1); + methodstate_list_t*l = m->innerfunctions; while(l) { parserassert(l->methodstate->abc); - c = abc_newfunction(c, l->methodstate->abc); - c = abc_setlocal(c, l->methodstate->var_index); + if(m->uses_slots && l->methodstate->is_a_slot) { + c = abc_getscopeobject(c, 1); + c = abc_newfunction(c, l->methodstate->abc); + c = abc_dup(c); + c = abc_setlocal(c, l->methodstate->var_index); + c = abc_setslot(c, l->methodstate->slot_index); + } else { + c = abc_newfunction(c, l->methodstate->abc); + c = abc_setlocal(c, l->methodstate->var_index); + } free(l->methodstate);l->methodstate=0; l = l->next; } @@ -728,6 +825,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; @@ -746,20 +856,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(); } @@ -769,75 +874,138 @@ static void endpackage() #define FLAG_PACKAGEINTERNAL 2048 #define FLAG_NAMESPACE 4096 -static int flags2access(int flags) +static namespace_t modifiers2access(modifiers_t*mod) { - int access = 0; - if(flags&FLAG_PUBLIC) { - if(access&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + namespace_t ns; + ns.access = 0; + ns.name = ""; + if(mod->flags&FLAG_NAMESPACE) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + syntaxerror("invalid combination of access levels and namespaces"); + ns.access = ACCESS_NAMESPACE; + state_t*s = state; + const char*url = (const char*)trie_lookup(active_namespaces, mod->ns); + if(!url) { + /* shouldn't happen- the tokenizer only reports something as a namespace + if it was already registered */ + trie_dump(active_namespaces); + syntaxerror("unknown namespace: %s", mod->ns); + } + ns.name = url; + } else if(mod->flags&FLAG_PUBLIC) { + if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PACKAGE; - } else if(flags&FLAG_PRIVATE) { - if(access&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PACKAGE; + } else if(mod->flags&FLAG_PRIVATE) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PRIVATE; - } else if(flags&FLAG_PROTECTED) { - if(access&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) + ns.access = ACCESS_PRIVATE; + } else if(mod->flags&FLAG_PROTECTED) { + if(mod->flags&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) syntaxerror("invalid combination of access levels"); - access = ACCESS_PROTECTED; + ns.access = ACCESS_PROTECTED; } else { - access = ACCESS_PACKAGEINTERNAL; + ns.access = ACCESS_PACKAGEINTERNAL; } - return access; + return ns; } +static slotinfo_t* find_class(const char*name); -static void function_initvars(methodstate_t*m, params_t*params, int flags) +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) { - if(m->inner) - new_variable("this", 0, 0); - else if(!m->is_global) - new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0); - else - new_variable("globalscope", 0, 0); + 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) { + int index = -1; + if(m->inner) + index = new_variable("this", 0, 0, 0); + else if(!m->is_global) + index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0); + else + index = new_variable("globalscope", 0, 0, 0); + parserassert(!index); + } + + if(m->uses_slots) { + /* as variables and slots share the same number, make sure + that those variable indices are reserved. It's up to the + optimizer to later shuffle the variables down to lower + indices */ + m->variable_count = m->uses_slots; + } if(params) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - + methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; - m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0); + + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); + m->var_index = v->index; + m->slot_index = v->index; + v->is_inner_method = m; + l = l->next; } + + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + + if(as3_pass==2 && m->slots) { + /* exchange unresolved identifiers with the actual objects */ + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); + } + v->type = type; + } + } + } } char*as3_globalclass=0; -static void startclass(int flags, char*classname, classinfo_t*extends, classinfo_list_t*implements) +static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, classinfo_list_t*implements) { if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; - if(flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) + if(mod->flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE)) syntaxerror("invalid modifier(s)"); - if((flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) + if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + + //if(!(mod->flags&FLAG_INTERFACE) && !extends) { + if(!(mod->flags&FLAG_INTERFACE) && !extends) { + // all classes extend object + extends = registry_getobjectclass(); + } /* create the class name, together with the proper attributes */ int access=0; char*package=0; - if(!(flags&FLAG_PUBLIC) && state->package==internal_filename_package) { + if(!(mod->flags&FLAG_PUBLIC) && state->package==internal_filename_package) { access = ACCESS_PRIVATE; package = internal_filename_package; - } else if(!(flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { + } else if(!(mod->flags&FLAG_PUBLIC) && state->package!=internal_filename_package) { access = ACCESS_PACKAGEINTERNAL; package = state->package; } else if(state->package!=internal_filename_package) { access = ACCESS_PACKAGE; package = state->package; @@ -849,6 +1017,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo 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 */ @@ -865,7 +1034,13 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* build info struct */ int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); - state->cls->info->flags |= flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + + int pos = 0; + classinfo_list_t*l = implements; + for(l=implements;l;l=l->next) { + state->cls->info->interfaces[pos++] = l->classinfo; + } } if(as3_pass == 2) { @@ -873,23 +1048,24 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo state->method = state->cls->init; parserassert(state->cls && state->cls->info); - - function_initvars(state->cls->init, 0, 0); - function_initvars(state->cls->static_init, 0, 0); + + function_initvars(state->cls->init, 0, 0, 1); + function_initvars(state->cls->static_init, 0, 0, 0); if(extends && (extends->flags & FLAG_FINAL)) syntaxerror("Can't extend final class '%s'", extends->name); - - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + int pos = 0; - classinfo_list_t*l = implements; - for(l=implements;l;l=l->next) { - if(!(l->classinfo->flags & FLAG_INTERFACE)) - syntaxerror("'%s' is not an interface", l->classinfo->name); - state->cls->info->interfaces[pos++] = l->classinfo; + while(state->cls->info->interfaces[pos]) { + if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE)) + syntaxerror("'%s' is not an interface", + state->cls->info->interfaces[pos]->name); + pos++; } + /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ + state->cls->info->superclass = extends; + /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); multiname_t*extends2 = sig2mname(extends); @@ -960,7 +1136,7 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo /* flash.display.MovieClip handling */ - if(!as3_globalclass && (flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { + if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { if(state->package && state->package[0]) { as3_globalclass = concat3(state->package, ".", classname); } else { @@ -970,19 +1146,6 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } -static void setstaticfunction(int x) -{ - if(state->cls) { - if(x&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) { @@ -1024,11 +1187,20 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___RETHROW__) { + syntaxerror("Unresolved \"rethrow\""); + } + if(c->opcode == OPCODE___FALLTHROUGH__) { + syntaxerror("Unresolved \"fallthrough\""); + } + if(c->opcode == OPCODE___PUSHPACKAGE__) { + char*name = string_cstr(c->data[0]); + syntaxerror("Can't reference a package (%s) as such", name); + } c=c->prev; } } - static void check_constant_against_type(classinfo_t*t, constant_t*c) { #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) @@ -1038,7 +1210,7 @@ static void check_constant_against_type(classinfo_t*t, constant_t*c) || c->type == CONSTANT_UINT); } else if(TYPE_IS_UINT(t)) { xassert(c->type == CONSTANT_UINT || - (c->type == CONSTANT_INT && c->i>0)); + (c->type == CONSTANT_INT && c->i>=0)); } else if(TYPE_IS_INT(t)) { xassert(c->type == CONSTANT_INT); } else if(TYPE_IS_BOOLEAN(t)) { @@ -1059,12 +1231,15 @@ static void check_override(memberinfo_t*m, int flags) return; if(m->flags & FLAG_FINAL) syntaxerror("can't override final member %s", m->name); + + /* allow this. it's no issue. if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC)) - syntaxerror("can't override static member %s", m->name); + syntaxerror("can't override static member %s", m->name);*/ + if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC)) syntaxerror("can't override non-static member %s with static declaration", m->name); - if(!(flags&FLAG_OVERRIDE)) { + if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) { if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) { if(m->kind == INFOTYPE_METHOD) syntaxerror("can't override without explicit 'override' declaration"); @@ -1074,22 +1249,22 @@ static void check_override(memberinfo_t*m, int flags) } } -static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot) +static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot) { methodinfo_t*minfo = 0; - U8 access = flags2access(flags); + namespace_t ns = modifiers2access(mod); if(!state->cls) { //package method - minfo = methodinfo_register_global(access, state->package, name); - minfo->return_type = return_type; + minfo = methodinfo_register_global(ns.access, state->package, name); + minfo->return_type = 0; // save this for pass 2 } else if(getset != KW_GET && getset != KW_SET) { //class method - memberinfo_t* m = registry_findmember(state->cls->info, name, 0); + memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, access, name); - minfo->return_type = return_type; + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); + minfo->return_type = 0; // save this for pass 2 // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1097,12 +1272,14 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na //class getter/setter int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET; classinfo_t*type=0; - if(getset == KW_GET) + if(getset == KW_GET) { type = return_type; - else if(params->list && params->list->param) + } else if(params->list && params->list->param && !params->list->next) { type = params->list->param->type; + } else + syntaxerror("setter function needs to take exactly one argument"); // not sure wether to look into superclasses here, too - minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1); + minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { if(minfo->kind!=INFOTYPE_SLOT) syntaxerror("class already contains a method called '%s'", name); @@ -1112,24 +1289,30 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na syntaxerror("getter/setter for '%s' already defined", name); /* make a setter or getter into a getset */ minfo->subtype |= gs; - if(!minfo->return_type) { - minfo->return_type = type; - } else { - if(minfo && minfo->return_type != type) - syntaxerror("different type in getter and setter"); - } + + /* + FIXME: this check needs to be done in pass 2 + + if((!minfo->return_type != !type) || + (minfo->return_type && type && + !strcmp(minfo->return_type->name, type->name))) { + syntaxerror("different type in getter and setter: %s and %s", + minfo->return_type?minfo->return_type->name:"*", + type?type->name:"*"); + }*/ } else { - minfo = methodinfo_register_onclass(state->cls->info, access, name); + minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); minfo->kind = INFOTYPE_SLOT; //hack minfo->subtype = gs; - minfo->return_type = type; + minfo->return_type = 0; } /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } - if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; - if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; - if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL; + if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC; + if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE; + return minfo; } @@ -1140,9 +1323,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) methodstate_t*parent_method = state->method; if(as3_pass==1) { - // not valid yet - params = 0; - return_type = 0; + return_type = 0; // not valid in pass 1 } new_state(); @@ -1164,24 +1345,28 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + + function_initvars(state->method, params, 0, 1); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); state->method->info->return_type = return_type; - function_initvars(state->method, params, 0); + function_initvars(state->method, params, 0, 1); } } -static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type) { if(state->method && state->method->info) { syntaxerror("not able to start another method scope"); } new_state(); + state->new_vars = 1; if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); @@ -1196,19 +1381,21 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n if(state->method->is_constructor) name = "__as3_constructor__"; - return_type = 0; - state->method->info = registerfunction(getset, flags, name, params, return_type, 0); + state->method->info = registerfunction(getset, mod, name, params, return_type, 0); + + function_initvars(state->method, params, mod->flags, 1); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); } if(as3_pass == 2) { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + state->method->variable_count = 0; parserassert(state->method); - + if(state->cls) { - memberinfo_t*m = registry_findmember(state->cls->info, name, 2); - check_override(m, flags); + memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2); + check_override(m, mod->flags); } if(state->cls) { @@ -1216,84 +1403,155 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } state->method->info->return_type = return_type; - function_initvars(state->method, params, flags); + function_initvars(state->method, params, mod->flags, 1); } } -static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, char*name, +static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name, params_t*params, classinfo_t*return_type, code_t*body) { if(as3_pass==1) { + // store inner methods in variables + function_initvars(state->method, 0, 0, 0); + + methodstate_list_t*ml = state->method->innerfunctions; + + dict_t*xvars = dict_new(); + + while(ml) { + methodstate_t*m = ml->methodstate; + parserassert(m->inner); + if(m->unresolved_variables) { + dict_t*d = m->unresolved_variables; + int t; + for(t=0;thashsize;t++) { + dictentry_t*l = d->slots[t]; + while(l) { + /* check parent method's variables */ + variable_t*v; + if((v=find_variable(state, l->key))) { + m->uses_parent_function = 1; + state->method->uses_slots = 1; + dict_put(xvars, l->key, 0); + } + l = l->next; + } + if(l) break; + } + + dict_destroy(m->unresolved_variables); + m->unresolved_variables = 0; + } + ml = ml->next; + } + + if(state->method->uses_slots) { + state->method->slots = dict_new(); + int i = 1; + DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) { + if(!name) syntaxerror("internal error"); + if(v->index && dict_contains(xvars, name)) { + v->init = 0; + v->index = i++; + if(v->is_inner_method) { + v->is_inner_method->is_a_slot = 1; + } + //v->type = 0; + dict_put(state->method->slots, name, v); + } + } + state->method->uses_slots = i; + dict_destroy(state->vars);state->vars = 0; + } old_state(); return 0; } - abc_method_t*f = 0; + if(as3_pass==2) { + /*if(state->method->uses_parent_function){ + syntaxerror("accessing variables of parent function from inner functions not supported yet"); + }*/ + + abc_method_t*f = 0; - multiname_t*type2 = sig2mname(return_type); - int slot = 0; - if(state->method->inner) { - f = state->method->abc; - abc_method_init(f, global->file, type2, 1); - } 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, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, name}; + multiname_t*type2 = sig2mname(return_type); + int slot = 0; + if(state->method->inner) { + f = state->method->abc; + abc_method_init(f, global->file, type2, 1); + } else if(state->method->is_constructor) { + f = abc_class_getconstructor(state->cls->abc, type2); + } else if(!state->method->is_global) { + namespace_t mname_ns = modifiers2access(mod); + multiname_t mname = {QNAME, &mname_ns, 0, name}; - if(flags&FLAG_STATIC) - f = abc_class_staticmethod(state->cls->abc, type2, &mname); - else - f = abc_class_method(state->cls->abc, type2, &mname); - slot = f->trait->slot_id; - } else { - namespace_t mname_ns = {state->method->info->access, state->package}; - multiname_t mname = {QNAME, &mname_ns, 0, name}; - - f = abc_method_new(global->file, type2, 1); - trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f); - //abc_code_t*c = global->init->method->body->code; - } - //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(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; - - char opt=0; - param_list_t*p=0; - for(p=params->list;p;p=p->next) { - if(params->varargs && !p->next) { - break; //varargs: omit last parameter in function signature + if(mod->flags&FLAG_STATIC) + f = abc_class_staticmethod(state->cls->abc, type2, &mname); + else + f = abc_class_method(state->cls->abc, type2, &mname); + slot = f->trait->slot_id; + } else { + namespace_t mname_ns = {state->method->info->access, state->package}; + multiname_t mname = {QNAME, &mname_ns, 0, name}; + + f = abc_method_new(global->file, type2, 1); + trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f); + //abc_code_t*c = global->init->method->body->code; + } + //flash doesn't seem to allow us to access function slots + //state->method->info->slot = slot; + + 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; + + char opt=0; + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + if(params->varargs && !p->next) { + break; //varargs: omit last parameter in function signature + } + multiname_t*m = sig2mname(p->param->type); + list_append(f->parameters, m); + if(p->param->value) { + check_constant_against_type(p->param->type, p->param->value); + opt=1;list_append(f->optional_parameters, p->param->value); + } else if(opt) { + syntaxerror("non-optional parameter not allowed after optional parameters"); + } } - multiname_t*m = sig2mname(p->param->type); - list_append(f->parameters, m); - if(p->param->value) { - check_constant_against_type(p->param->type, p->param->value); - opt=1;list_append(f->optional_parameters, p->param->value); - } else if(opt) { - syntaxerror("non-optional parameter not allowed after optional parameters"); + if(state->method->slots) { + DICT_ITERATE_ITEMS(state->method->slots, char*, name, variable_t*, v) { + if(v->index) { + multiname_t*mname = multiname_new(namespace_new(ACCESS_PACKAGE, ""), name); + multiname_t*type = sig2mname(v->type); + trait_t*t = trait_new_member(&f->body->traits, type, mname, 0); + t->slot_id = v->index; + } + } } - } - check_code_for_break(body); - if(f->body) { - f->body->code = body; - f->body->exceptions = state->method->exceptions; - } else { //interface - if(body) - syntaxerror("interface methods can't have a method body"); - } - - old_state(); - return f; -} + check_code_for_break(body); -char is_subtype_of(classinfo_t*type, classinfo_t*supertype) -{ - return 1; // FIXME + /* Seems this works now. + if(state->method->exceptions && state->method->uses_slots) { + as3_warning("try/catch and activation not supported yet within the same method"); + }*/ + + if(f->body) { + f->body->code = body; + f->body->exceptions = state->method->exceptions; + } else { //interface + if(body) + syntaxerror("interface methods can't have a method body"); + } + + old_state(); + return f; + } + + return 0; } void breakjumpsto(code_t*c, char*name, code_t*jump) @@ -1323,29 +1581,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) @@ -1363,10 +1600,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) { @@ -1390,40 +1638,55 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; if(TYPE_IS_NULL(from) && !IS_NUMBER_OR_INT(to)) return c; - syntaxerror("can't convert type %s to %s", from->name, to->name); - return 0; // make gcc happy -} -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); - } + as3_error("can't convert type %s%s%s to %s%s%s", + from->package, from->package[0]?".":"", from->name, + to->package, to->package[0]?".":"", to->name); + return c; } +/* move to ast.c todo end */ char is_pushundefined(code_t*c) { return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static const char* get_package_from_name(const char*name) { - slotinfo_t*c=0; - - c = registry_find(state->package, name); + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + +static slotinfo_t* find_class(const char*name) +{ + slotinfo_t*c=0; + + c = registry_find(state->package, name); if(c) return c; /* try explicit imports */ @@ -1456,173 +1719,45 @@ static slotinfo_t* find_class(char*name) return 0; } - -static char is_getlocal(code_t*c) -{ - if(!c || c->prev || c->next) - return 0; - return(c->opcode == OPCODE_GETLOCAL - || c->opcode == OPCODE_GETLOCAL_0 - || c->opcode == OPCODE_GETLOCAL_1 - || c->opcode == OPCODE_GETLOCAL_2 - || c->opcode == OPCODE_GETLOCAL_3); -} -static int getlocalnr(code_t*c) -{ - 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) +typedcode_t push_class(slotinfo_t*a) { - /* 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 { - 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); + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); } else { - /* 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); + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; } } 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); + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); } 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); + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); } + x.t = TYPE_CLASS(c); } - return c; + return x; } + char is_break_or_jump(code_t*c) { if(!c) @@ -1638,7 +1773,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1746,10 +1880,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) int lookup_version_cost = 4*num_insertion_points + 5; if(cantdup || simple_version_cost > lookup_version_cost) { - printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost); + //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_lookup(c, finally, tempvar); } else { - printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost); + //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost); return insert_finally_simple(c, finally, tempvar); } } @@ -1757,13 +1891,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 1767 "parser.tab.c" +#line 1902 "parser.tab.c" +/* Unqualified %code blocks. */ + +/* Line 274 of skeleton.m4 */ +#line 1966 "parser.y" + + char is_subtype_of(classinfo_t*type, classinfo_t*supertype) + { + return 1; // FIXME + } + + +/* Line 274 of skeleton.m4 */ +#line 2415 "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 2548 "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 3399 "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 1971 "parser.tab.c" #ifdef short # undef short @@ -1976,22 +2180,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 145 +#define YYFINAL 147 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2994 +#define YYLAST 3105 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 134 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 110 +#define YYNNTS 115 /* YYNRULES -- Number of rules. */ #define YYNRULES 303 /* YYNRULES -- Number of states. */ -#define YYNSTATES 514 +#define YYNSTATES 517 /* 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) @@ -2002,16 +2206,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, @@ -2034,8 +2238,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 @@ -2047,165 +2251,166 @@ static const yytype_uint16 yyprhs[] = 19, 21, 23, 25, 30, 32, 33, 35, 37, 40, 42, 44, 46, 48, 50, 55, 57, 59, 60, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, - 85, 87, 91, 94, 96, 98, 100, 102, 104, 106, - 108, 113, 115, 118, 120, 122, 126, 129, 130, 133, + 85, 87, 89, 93, 96, 98, 100, 102, 104, 106, + 108, 110, 115, 118, 120, 122, 126, 129, 130, 133, 136, 138, 142, 146, 147, 150, 151, 159, 160, 162, 164, 168, 170, 173, 177, 186, 193, 194, 201, 202, 210, 212, 215, 217, 220, 221, 223, 225, 228, 230, 233, 238, 242, 243, 252, 253, 263, 264, 270, 272, - 275, 277, 280, 282, 283, 290, 293, 295, 301, 303, - 305, 309, 311, 312, 319, 320, 326, 329, 334, 335, - 337, 339, 342, 344, 346, 348, 350, 352, 354, 356, - 358, 360, 362, 363, 366, 367, 370, 371, 374, 375, - 385, 386, 395, 396, 398, 400, 403, 405, 410, 412, - 414, 416, 417, 419, 421, 424, 426, 429, 438, 440, - 442, 443, 450, 451, 454, 456, 458, 460, 462, 464, - 466, 468, 470, 472, 473, 475, 478, 483, 487, 489, - 494, 497, 499, 501, 502, 503, 516, 518, 519, 520, - 531, 533, 537, 539, 541, 543, 547, 549, 551, 553, - 556, 557, 558, 562, 563, 565, 567, 569, 572, 575, - 576, 581, 586, 591, 594, 596, 599, 601, 603, 607, - 609, 611, 613, 615, 617, 619, 621, 623, 625, 627, - 629, 631, 633, 635, 637, 639, 641, 643, 647, 651, - 655, 659, 663, 667, 671, 675, 679, 683, 686, 689, - 693, 697, 701, 705, 709, 713, 717, 721, 725, 729, - 733, 737, 741, 745, 749, 754, 757, 759, 763, 766, - 771, 775, 776, 778, 782, 788, 792, 796, 800, 804, - 808, 812, 816, 820, 824, 828, 832, 836, 842, 845, - 848, 851, 854, 858, 861, 866, 872, 876, 882, 886, - 888, 892, 898, 904 + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 617, 621, 623, 627, 628, 630, + 634, 640, 642, 644, 646, 648, 650, 652, 654, 656, + 660, 664, 668, 672, 676, 680, 684, 688, 692, 696, + 700, 704, 707, 710, 714, 718, 722, 726, 730, 734, + 738, 742, 746, 750, 754, 758, 762, 766, 770, 775, + 778, 780, 784, 787, 792, 796, 800, 804, 808, 812, + 816, 820, 824, 828, 832, 836, 840, 846, 849, 852, + 855, 858, 862, 865, 870, 876, 880, 886, 890, 892, + 895, 900, 905, 908 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 185, -1, 197, -1, 195, -1, 214, - -1, 206, -1, 147, -1, 148, 126, 136, 132, -1, - 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 197, -1, 195, -1, 214, -1, 206, -1, 147, -1, - 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, - 143, 145, -1, 145, -1, 188, -1, 159, -1, 160, - -1, 161, -1, 163, -1, 171, -1, 154, -1, 182, - -1, 179, -1, 236, -1, 243, -1, 126, 143, 132, - -1, 126, 132, -1, 99, -1, 144, -1, 150, -1, - 165, -1, 166, -1, 233, -1, 181, -1, 148, 126, - 143, 132, -1, 242, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 234, -1, -1, - 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 224, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 235, 133, 146, 153, -1, -1, - 150, -1, 236, -1, 46, 3, 224, -1, 3, -1, - 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 235, 99, 236, 133, 146, -1, 158, 157, 68, 235, - 133, 146, -1, -1, 14, 122, 162, 235, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 235, 133, -1, - 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 237, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 237, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 224, 133, 174, 126, - 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, - 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, - 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, - 37, 235, -1, 37, -1, 39, 122, 235, 133, 146, - -1, 3, -1, 19, -1, 184, 127, 183, -1, 183, - -1, -1, 19, 184, 126, 186, 139, 132, -1, -1, - 19, 126, 187, 139, 132, -1, 41, 220, -1, 41, - 184, 127, 115, -1, -1, 190, -1, 191, -1, 190, - 191, -1, 21, -1, 22, -1, 20, -1, 38, -1, - 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 221, -1, -1, 54, 222, -1, - -1, 17, 222, -1, -1, 189, 31, 3, 192, 194, - 126, 196, 199, 132, -1, -1, 189, 44, 3, 193, - 126, 198, 202, 132, -1, -1, 200, -1, 201, -1, - 200, 201, -1, 99, -1, 148, 126, 199, 132, -1, - 206, -1, 214, -1, 144, -1, -1, 203, -1, 204, - -1, 203, 204, -1, 99, -1, 46, 3, -1, 189, - 27, 213, 3, 122, 210, 133, 224, -1, 46, -1, - 32, -1, -1, 189, 205, 3, 207, 224, 149, -1, - -1, 102, 209, -1, 10, -1, 8, -1, 9, -1, - 12, -1, 5, -1, 56, -1, 55, -1, 45, -1, - 3, -1, -1, 211, -1, 93, 212, -1, 211, 100, - 93, 212, -1, 211, 100, 212, -1, 212, -1, 3, - 105, 223, 208, -1, 3, 208, -1, 51, -1, 35, - -1, -1, -1, 189, 27, 213, 3, 122, 210, 133, - 224, 126, 215, 142, 132, -1, 3, -1, -1, -1, - 27, 216, 122, 210, 133, 224, 126, 218, 142, 132, - -1, 3, -1, 184, 127, 3, -1, 220, -1, 219, - -1, 221, -1, 222, 100, 221, -1, 221, -1, 115, - -1, 36, -1, 105, 223, -1, -1, -1, 122, 226, - 133, -1, -1, 227, -1, 228, -1, 234, -1, 227, - 100, -1, 228, 234, -1, -1, 25, 237, 229, 225, - -1, 237, 122, 226, 133, -1, 53, 122, 226, 133, - -1, 63, 237, -1, 42, -1, 42, 235, -1, 237, - -1, 237, -1, 235, 100, 237, -1, 235, -1, 217, - -1, 238, -1, 241, -1, 230, -1, 232, -1, 231, - -1, 6, -1, 10, -1, 11, -1, 8, -1, 9, - -1, 12, -1, 5, -1, 29, -1, 56, -1, 55, - -1, 45, -1, 237, 109, 237, -1, 237, 110, 237, - -1, 237, 75, 237, -1, 237, 76, 237, -1, 237, - 71, 237, -1, 237, 72, 237, -1, 237, 74, 237, - -1, 237, 73, 237, -1, 237, 87, 237, -1, 237, - 88, 237, -1, 118, 237, -1, 117, 237, -1, 237, - 108, 237, -1, 237, 107, 237, -1, 237, 106, 237, - -1, 237, 96, 237, -1, 237, 95, 237, -1, 237, - 94, 237, -1, 237, 114, 237, -1, 237, 116, 237, - -1, 237, 113, 237, -1, 237, 112, 237, -1, 237, - 115, 237, -1, 237, 68, 237, -1, 237, 69, 237, - -1, 237, 40, 237, -1, 237, 67, 237, -1, 43, - 122, 237, 133, -1, 36, 237, -1, 36, -1, 122, - 235, 133, -1, 112, 237, -1, 237, 124, 237, 125, - -1, 124, 226, 125, -1, -1, 240, -1, 234, 105, - 234, -1, 240, 100, 234, 105, 234, -1, 70, 239, - 132, -1, 237, 80, 237, -1, 237, 79, 237, -1, - 237, 85, 237, -1, 237, 84, 237, -1, 237, 86, - 237, -1, 237, 78, 237, -1, 237, 77, 237, -1, - 237, 83, 237, -1, 237, 81, 237, -1, 237, 82, - 237, -1, 237, 102, 237, -1, 237, 104, 237, 105, - 237, -1, 237, 91, -1, 237, 90, -1, 91, 237, - -1, 90, 237, -1, 53, 127, 3, -1, 128, 3, - -1, 237, 127, 128, 3, -1, 237, 127, 3, 89, - 3, -1, 237, 92, 3, -1, 237, 127, 122, 237, - 133, -1, 237, 127, 3, -1, 3, -1, 189, 18, - 3, -1, 189, 18, 3, 102, 3, -1, 189, 18, - 3, 102, 5, -1, 23, 18, 3, -1 + 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, 247, -1, 246, -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, 242, -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, 242, 104, 141, -1, 61, 104, + 141, -1, -1, 14, 121, 171, 242, 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, 211, -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, 242, + 231, 227, -1, 242, 121, 228, 132, -1, 52, 121, + 228, 132, -1, 62, 242, -1, 41, -1, 41, 237, + -1, 242, -1, 238, -1, 242, -1, 238, 100, 242, + -1, 242, -1, 239, 100, 242, -1, -1, 241, -1, + 236, 104, 236, -1, 241, 100, 236, 104, 236, -1, + 219, -1, 244, -1, 243, -1, 232, -1, 234, -1, + 233, -1, 211, -1, 6, -1, 123, 228, 124, -1, + 69, 240, 131, -1, 242, 108, 242, -1, 242, 109, + 242, -1, 242, 74, 242, -1, 242, 75, 242, -1, + 242, 70, 242, -1, 242, 71, 242, -1, 242, 73, + 242, -1, 242, 72, 242, -1, 242, 87, 242, -1, + 242, 88, 242, -1, 117, 242, -1, 116, 242, -1, + 242, 107, 242, -1, 242, 106, 242, -1, 242, 105, + 242, -1, 242, 96, 242, -1, 242, 95, 242, -1, + 242, 94, 242, -1, 242, 113, 242, -1, 242, 115, + 242, -1, 242, 112, 242, -1, 242, 111, 242, -1, + 242, 114, 242, -1, 242, 67, 242, -1, 242, 68, + 242, -1, 242, 39, 242, -1, 242, 66, 242, -1, + 42, 121, 242, 132, -1, 35, 242, -1, 35, -1, + 121, 238, 132, -1, 111, 242, -1, 242, 123, 242, + 124, -1, 242, 79, 242, -1, 242, 78, 242, -1, + 242, 85, 242, -1, 242, 84, 242, -1, 242, 86, + 242, -1, 242, 77, 242, -1, 242, 76, 242, -1, + 242, 83, 242, -1, 242, 80, 242, -1, 242, 81, + 242, -1, 242, 82, 242, -1, 242, 102, 242, -1, + 242, 103, 242, 104, 242, -1, 242, 91, -1, 242, + 90, -1, 91, 242, -1, 90, 242, -1, 52, 126, + 3, -1, 127, 3, -1, 242, 126, 127, 3, -1, + 242, 126, 3, 89, 3, -1, 242, 92, 3, -1, + 242, 126, 121, 242, 132, -1, 242, 126, 3, -1, + 3, -1, 16, 3, -1, 16, 3, 102, 3, -1, + 16, 3, 102, 5, -1, 189, 245, -1, 21, 16, + 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1742, 1742, 1744, 1744, 1745, 1746, 1748, 1749, 1750, - 1751, 1752, 1753, 1754, 1755, 1757, 1757, 1758, 1759, 1761, - 1762, 1763, 1764, 1765, 1766, 1767, 1769, 1770, 1772, 1773, - 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, - 1786, 1787, 1788, 1791, 1792, 1793, 1794, 1795, 1796, 1797, - 1798, 1800, 1804, 1805, 1809, 1816, 1820, 1821, 1825, 1826, - 1828, 1829, 1831, 1874, 1875, 1878, 1878, 1897, 1898, 1899, - 1904, 1907, 1911, 1912, 1914, 1934, 1977, 1977, 1996, 1996, - 2011, 2014, 2017, 2020, 2024, 2025, 2026, 2027, 2028, 2029, - 2031, 2042, 2045, 2045, 2074, 2074, 2094, 2094, 2111, 2112, - 2113, 2114, 2122, 2131, 2131, 2176, 2180, 2191, 2200, 2201, - 2203, 2204, 2206, 2206, 2208, 2208, 2211, 2225, 2241, 2242, - 2243, 2244, 2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, - 2254, 2255, 2257, 2258, 2260, 2261, 2263, 2264, 2268, 2266, - 2274, 2272, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, - 2289, 2295, 2296, 2297, 2298, 2299, 2300, 2303, 2316, 2316, - 2318, 2318, 2391, 2392, 2394, 2395, 2396, 2397, 2398, 2400, - 2401, 2402, 2403, 2412, 2416, 2422, 2428, 2436, 2441, 2447, - 2455, 2463, 2464, 2465, 2468, 2467, 2482, 2483, 2485, 2484, - 2506, 2515, 2528, 2529, 2531, 2532, 2534, 2535, 2536, 2545, - 2546, 2550, 2551, 2553, 2554, 2555, 2557, 2561, 2562, 2567, - 2568, 2604, 2650, 2671, 2692, 2695, 2702, 2703, 2704, 2710, - 2716, 2718, 2720, 2722, 2724, 2726, 2728, 2745, 2750, 2753, - 2756, 2759, 2762, 2765, 2768, 2771, 2774, 2778, 2781, 2784, - 2787, 2790, 2793, 2796, 2799, 2803, 2814, 2832, 2837, 2842, - 2847, 2852, 2857, 2861, 2865, 2870, 2874, 2878, 2887, 2896, - 2906, 2911, 2923, 2929, 2934, 2940, 2946, 2950, 2952, 2963, - 2972, 2979, 2980, 2982, 2988, 2997, 3004, 3016, 3022, 3028, - 3034, 3040, 3046, 3052, 3058, 3071, 3082, 3089, 3102, 3129, - 3143, 3157, 3171, 3186, 3193, 3200, 3207, 3214, 3225, 3259, - 3361, 3362, 3363, 3365 + 0, 1881, 1881, 1883, 1883, 1884, 1885, 1887, 1888, 1889, + 1890, 1891, 1892, 1893, 1894, 1896, 1896, 1897, 1898, 1900, + 1901, 1902, 1903, 1904, 1905, 1906, 1908, 1909, 1911, 1912, + 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, + 1925, 1926, 1927, 1928, 1931, 1932, 1933, 1934, 1935, 1936, + 1937, 1938, 1942, 1943, 1947, 1954, 1973, 1974, 1976, 1977, + 1979, 1980, 1982, 2042, 2043, 2046, 2046, 2065, 2066, 2067, + 2072, 2076, 2081, 2082, 2084, 2104, 2152, 2152, 2171, 2171, + 2186, 2189, 2192, 2195, 2199, 2200, 2201, 2202, 2203, 2204, + 2206, 2217, 2220, 2220, 2251, 2251, 2276, 2276, 2292, 2293, + 2294, 2295, 2303, 2312, 2312, 2361, 2365, 2376, 2386, 2403, + 2404, 2405, 2407, 2408, 2410, 2410, 2412, 2412, 2435, 2449, + 2465, 2466, 2467, 2468, 2475, 2476, 2477, 2478, 2479, 2480, + 2481, 2482, 2483, 2484, 2488, 2489, 2491, 2492, 2494, 2495, + 2499, 2497, 2505, 2503, 2512, 2513, 2514, 2515, 2516, 2517, + 2518, 2519, 2521, 2527, 2528, 2529, 2530, 2531, 2532, 2535, + 2567, 2567, 2569, 2569, 2571, 2572, 2574, 2666, 2667, 2670, + 2671, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2695, 2699, + 2705, 2711, 2719, 2724, 2730, 2738, 2746, 2747, 2748, 2751, + 2750, 2767, 2768, 2770, 2769, 2793, 2812, 2826, 2827, 2829, + 2830, 2832, 2833, 2834, 2843, 2844, 2848, 2849, 2851, 2852, + 2853, 2855, 2859, 2860, 2865, 2866, 2903, 2950, 2971, 2993, + 2996, 3003, 3006, 3009, 3012, 3015, 3018, 3023, 3024, 3026, + 3032, 3041, 3042, 3043, 3044, 3045, 3046, 3048, 3053, 3073, + 3083, 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, 3129, 3130, + 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3139, 3140, 3141, + 3142, 3144, 3159, 3165, 3171, 3177, 3183, 3196, 3254, 3363, + 3370, 3377, 3384, 3408 }; #endif @@ -2215,11 +2420,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\"", @@ -2229,38 +2434,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", - "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", - "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", - "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", - "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", - "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", - "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", - "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", - "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_EXPRPAIR_LIST", + "EXPRPAIR_LIST", "E", "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2280,47 +2486,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, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, - 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, - 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, - 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, - 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, - 178, 178, 178, 180, 179, 181, 181, 182, 183, 183, - 184, 184, 186, 185, 187, 185, 188, 188, 189, 189, - 190, 190, 191, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 192, 192, 193, 193, 194, 194, 196, 195, - 198, 197, 199, 199, 200, 200, 201, 201, 201, 201, - 201, 202, 202, 203, 203, 204, 204, 204, 205, 205, - 207, 206, 208, 208, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 210, 210, 210, 210, 211, 211, 212, - 212, 213, 213, 213, 215, 214, 216, 216, 218, 217, - 219, 220, 221, 221, 222, 222, 223, 223, 223, 224, - 224, 225, 225, 226, 226, 226, 227, 228, 227, 229, - 230, 231, 231, 232, 233, 233, 234, 235, 235, 236, - 237, 237, 237, 237, 237, 237, 237, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 239, 239, 240, 240, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 241, - 242, 242, 242, 243 + 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, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 243, 244, 245, + 245, 245, 246, 247 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2330,33 +2536,33 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 4, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 4, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 2, 1, 1, 1, 1, 1, 1, 1, - 4, 1, 2, 1, 1, 3, 2, 0, 2, 2, + 1, 1, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 4, 2, 1, 1, 3, 2, 0, 2, 2, 1, 3, 3, 0, 2, 0, 7, 0, 1, 1, 3, 1, 2, 3, 8, 6, 0, 6, 0, 7, 1, 2, 1, 2, 0, 1, 1, 2, 1, 2, 4, 3, 0, 8, 0, 9, 0, 5, 1, 2, - 1, 2, 1, 0, 6, 2, 1, 5, 1, 1, - 3, 1, 0, 6, 0, 5, 2, 4, 0, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 2, 0, 2, 0, 2, 0, 9, - 0, 8, 0, 1, 1, 2, 1, 4, 1, 1, - 1, 0, 1, 1, 2, 1, 2, 8, 1, 1, - 0, 6, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 1, 2, 4, 3, 1, 4, - 2, 1, 1, 0, 0, 12, 1, 0, 0, 10, - 1, 3, 1, 1, 1, 3, 1, 1, 1, 2, - 0, 0, 3, 0, 1, 1, 1, 2, 2, 0, - 4, 4, 4, 2, 1, 2, 1, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, + 1, 2, 1, 0, 6, 2, 1, 4, 2, 1, + 1, 1, 3, 1, 0, 6, 0, 5, 2, 4, + 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 0, 9, 0, 8, 0, 1, 1, 2, 1, 4, + 1, 1, 1, 0, 1, 1, 2, 1, 2, 8, + 1, 1, 0, 4, 1, 3, 3, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 2, 4, 3, 1, 4, 2, 1, 1, 0, 0, + 12, 1, 0, 0, 10, 1, 3, 1, 1, 1, + 3, 1, 1, 1, 2, 0, 0, 3, 0, 1, + 1, 1, 2, 2, 0, 4, 4, 4, 2, 1, + 2, 1, 1, 1, 3, 1, 3, 0, 1, 3, + 5, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 2, 1, 3, 2, 4, - 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 5, 2, 2, - 2, 2, 3, 2, 4, 5, 3, 5, 3, 1, - 3, 5, 5, 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, 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 @@ -2364,762 +2570,786 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 299, 131, 232, 226, 229, 230, 227, 228, 231, - 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 187, 233, 266, 125, 0, 0, 0, 236, - 126, 128, 127, 0, 0, 235, 234, 0, 0, 271, - 0, 0, 14, 0, 0, 0, 0, 203, 118, 0, - 0, 2, 118, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 37, 7, 30, 0, 119, - 120, 9, 8, 11, 10, 220, 223, 225, 224, 219, - 39, 217, 221, 222, 40, 0, 0, 72, 76, 118, - 92, 108, 109, 114, 111, 0, 0, 299, 209, 186, - 0, 265, 0, 0, 116, 0, 103, 203, 0, 213, - 65, 0, 216, 0, 272, 291, 290, 268, 248, 247, - 0, 0, 204, 205, 206, 82, 0, 106, 214, 0, - 80, 43, 42, 118, 44, 29, 0, 45, 46, 47, - 49, 0, 48, 51, 293, 1, 6, 118, 299, 0, - 68, 0, 0, 69, 183, 0, 159, 0, 158, 0, - 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 120, 298, 133, 172, 238, 169, 170, 171, 0, 0, + 78, 0, 0, 126, 124, 125, 0, 132, 0, 131, + 192, 176, 177, 270, 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, 237, 10, 231, 234, 236, 235, + 39, 225, 233, 232, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 298, + 214, 191, 0, 269, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 0, 0, 228, 221, 290, 289, 272, + 252, 251, 0, 223, 0, 209, 210, 211, 82, 0, + 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, + 46, 47, 48, 50, 0, 49, 292, 1, 6, 120, + 298, 0, 68, 0, 0, 69, 53, 108, 0, 188, + 0, 161, 0, 160, 162, 302, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 289, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 203, 0, 0, 55, 73, 0, 53, 0, - 0, 118, 112, 0, 303, 201, 173, 0, 0, 0, - 27, 0, 292, 0, 0, 275, 0, 267, 270, 207, - 208, 83, 200, 59, 60, 105, 215, 58, 81, 41, - 28, 118, 0, 0, 200, 0, 0, 182, 181, 0, - 132, 134, 160, 218, 262, 263, 260, 261, 241, 242, - 244, 243, 239, 240, 282, 281, 277, 276, 284, 285, - 283, 279, 278, 280, 245, 246, 296, 254, 253, 252, - 286, 0, 251, 250, 249, 237, 238, 258, 257, 255, - 259, 256, 0, 0, 298, 0, 0, 0, 52, 0, - 0, 25, 0, 118, 17, 23, 0, 20, 19, 22, - 21, 118, 110, 203, 210, 162, 0, 0, 174, 178, - 118, 191, 117, 264, 0, 26, 212, 0, 273, 0, - 0, 57, 0, 118, 300, 13, 57, 0, 0, 0, - 0, 136, 0, 0, 200, 0, 211, 269, 0, 0, - 294, 118, 0, 0, 115, 18, 118, 0, 0, 0, - 0, 180, 175, 200, 0, 107, 0, 118, 0, 190, - 198, 197, 0, 193, 192, 196, 199, 0, 62, 61, - 50, 0, 0, 118, 173, 133, 0, 0, 194, 135, - 140, 57, 287, 295, 297, 77, 0, 84, 0, 113, - 202, 172, 168, 165, 166, 164, 167, 171, 170, 169, - 163, 162, 0, 0, 177, 0, 0, 98, 102, 100, - 104, 63, 274, 0, 56, 301, 302, 0, 75, 0, - 137, 138, 0, 118, 161, 79, 0, 0, 0, 85, - 88, 86, 24, 179, 188, 176, 96, 0, 99, 101, - 118, 66, 118, 200, 118, 195, 0, 155, 0, 0, - 118, 153, 0, 27, 93, 89, 87, 27, 27, 200, - 64, 74, 0, 146, 150, 0, 0, 0, 118, 144, - 148, 149, 156, 183, 141, 154, 27, 91, 0, 0, - 0, 184, 118, 139, 145, 0, 90, 189, 97, 94, - 27, 0, 0, 0, 0, 147, 173, 27, 185, 0, - 0, 200, 95, 157 + 0, 288, 287, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, + 0, 0, 55, 73, 0, 0, 0, 120, 114, 0, + 195, 0, 198, 197, 303, 206, 178, 0, 222, 0, + 0, 27, 0, 291, 0, 0, 240, 0, 0, 271, + 239, 212, 213, 83, 205, 59, 60, 105, 220, 58, + 81, 42, 28, 120, 0, 205, 0, 0, 52, 299, + 187, 186, 0, 134, 136, 0, 226, 266, 267, 264, + 265, 245, 246, 248, 247, 243, 244, 280, 279, 275, + 274, 282, 283, 284, 281, 277, 276, 278, 249, 250, + 295, 258, 257, 256, 285, 0, 255, 254, 253, 241, + 242, 262, 261, 259, 263, 260, 0, 0, 297, 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, 268, 0, 26, + 217, 0, 229, 0, 224, 0, 57, 0, 120, 13, + 57, 0, 0, 0, 0, 0, 138, 0, 0, 205, + 163, 164, 0, 216, 273, 0, 0, 293, 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, 300, 301, 178, 135, 0, + 0, 199, 137, 142, 57, 0, 286, 294, 296, 77, + 0, 84, 0, 115, 207, 168, 167, 0, 0, 182, + 0, 0, 98, 102, 100, 104, 63, 230, 56, 0, + 75, 0, 139, 140, 0, 120, 166, 165, 79, 0, + 0, 0, 85, 88, 86, 24, 184, 193, 181, 96, + 0, 99, 101, 120, 66, 120, 205, 120, 200, 0, + 157, 0, 0, 120, 155, 0, 27, 93, 89, 87, + 27, 27, 205, 64, 74, 0, 148, 152, 0, 0, + 0, 120, 146, 150, 151, 158, 188, 143, 156, 27, + 91, 0, 0, 0, 189, 120, 141, 147, 0, 90, + 194, 97, 94, 27, 0, 0, 0, 0, 149, 178, + 27, 190, 0, 0, 205, 95, 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 302, 303, 304, 324, 325, - 134, 135, 209, 305, 136, 378, 137, 237, 234, 451, - 57, 223, 151, 152, 58, 59, 60, 61, 207, 62, - 89, 138, 139, 438, 439, 440, 441, 63, 210, 417, - 503, 418, 468, 419, 420, 64, 220, 140, 65, 94, - 372, 66, 311, 211, 67, 141, 69, 70, 341, 343, - 387, 307, 454, 308, 433, 477, 478, 479, 459, 460, - 461, 159, 309, 344, 361, 410, 317, 318, 319, 249, - 310, 500, 100, 75, 467, 373, 374, 375, 389, 376, - 331, 314, 121, 122, 123, 215, 76, 77, 78, 142, - 124, 79, 80, 81, 82, 113, 114, 83, 143, 84 + -1, 49, 50, 51, 52, 315, 316, 317, 338, 339, + 137, 138, 157, 318, 139, 390, 140, 249, 246, 454, + 56, 234, 153, 154, 57, 58, 59, 60, 214, 61, + 90, 141, 142, 441, 442, 443, 444, 62, 216, 422, + 506, 423, 471, 424, 425, 63, 231, 143, 64, 65, + 220, 221, 66, 324, 217, 67, 144, 69, 70, 356, + 358, 400, 320, 457, 321, 435, 480, 481, 482, 462, + 463, 464, 164, 322, 265, 360, 361, 378, 74, 331, + 332, 333, 262, 323, 503, 102, 76, 470, 222, 223, + 387, 402, 388, 346, 328, 124, 125, 126, 225, 77, + 78, 79, 145, 127, 227, 228, 80, 114, 115, 81, + 82, 83, 165, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -374 +#define YYPACT_NINF -406 static const yytype_int16 yypact[] = { - 1667, -68, -374, -374, -374, -374, -374, -374, -374, -374, - -30, -97, -374, -57, 20, -374, -374, -374, 49, -374, - 2087, -374, 71, -374, 2157, -374, -37, 85, -35, -374, - -374, -374, -374, 6, 8, -374, -374, 2087, 14, 2087, - 2087, 2087, -374, 2087, 2087, 2087, 2087, 2087, 627, 88, - 177, -374, 497, -374, -374, -374, 81, -374, 2017, -374, - -374, -374, -374, -374, -374, -374, -374, -374, 308, 298, - -374, -374, -374, -374, -374, -374, -374, -374, -374, 79, - -374, 2562, -374, -374, -374, 197, 86, -374, -374, 1919, - -374, -374, -374, -374, -374, -18, 206, -374, -46, -374, - 93, 133, 2087, 83, -374, 2087, -374, 2087, 215, 133, - -374, 117, 2562, 94, 127, 133, 133, 201, 133, 133, - -53, 103, 129, 2087, -374, 227, 228, 2087, 2087, 228, - 232, -374, -374, 757, -374, -374, 107, -374, -374, -374, - -374, 219, -374, -374, -374, -374, -374, 1017, 170, 236, - -374, 141, 176, -374, 70, 242, -374, 243, -374, 244, - -374, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, -374, -374, 245, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, 2087, - 2087, 2087, 2087, 2087, 11, -374, -374, 2087, 159, 247, - 2087, 1147, -374, 85, -374, 137, 24, -49, 16, 2182, - 1793, 130, -374, 2087, 2087, -374, 2087, -374, -374, -374, - -374, -374, 157, 164, -374, 79, 79, 164, -374, -374, - -374, 1919, 262, 134, 157, 2087, 2087, -374, -374, 269, - 226, 231, -374, 2562, 1009, 489, 489, 489, 2867, 2867, - 2867, 2867, 1009, 1009, 2562, 2562, 2562, 2562, 2562, 2562, - 2562, 2562, 2562, 2562, 304, 2623, -374, 349, 349, 349, - 2562, 2379, 2684, 2745, 2806, 1009, 1009, 201, 201, 133, - 133, 133, 148, 2440, 193, 2087, 281, -40, -374, 167, - 2253, -374, 154, 1277, -374, -374, 168, -374, -374, -374, - -374, 1147, -374, 2087, -374, 96, 287, 174, 200, -374, - 1919, 181, -374, -374, 169, 1793, -374, -36, -374, 204, - 26, 208, 228, 887, 212, -374, -20, 53, -31, 199, - 125, 309, 125, 205, 157, 2087, -374, -374, 324, 2316, - -374, 1919, 2087, 207, -374, -374, 1147, 202, 209, 67, - 26, -374, -374, 157, 25, -374, 110, 1919, 2087, 181, - -374, -374, 210, -374, -374, -374, -374, 2087, -374, -374, - -374, 39, 2087, 1919, 24, -374, 125, 217, -374, 251, - -374, 208, 2562, -374, -374, -374, -14, 27, 221, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, 253, 233, 287, -374, 234, 241, -374, -374, 110, - -374, 267, -374, 126, -374, -374, -374, 250, -374, 252, - 251, -374, 125, 230, -374, -374, 2087, 259, 235, 27, - -374, -374, -374, -374, -374, -374, -374, 362, -374, -374, - 1919, -374, 1919, 157, 1407, -374, 366, -374, 347, 254, - 249, -374, 2501, 1793, -374, -374, -374, 1793, 1793, 157, - -374, -374, 256, -374, -374, 258, 74, 255, 1537, -374, - -374, -374, -374, 70, -374, -374, 1793, -374, 257, 261, - 264, -374, 1407, -374, -374, 385, -374, -374, -374, -374, - 1793, 270, 268, 265, 271, -374, 24, 1793, -374, 272, - 274, 157, -374, -374 + 1661, -65, -406, -406, -406, -406, -406, -406, -10, -85, + -406, -59, 54, -406, -406, -406, 66, -406, 2104, -406, + 101, -406, -406, 2159, -406, -9, 89, -6, -406, -406, + -406, -406, -3, -51, -406, -406, 2104, 7, 2104, 2104, + 2104, -406, 2104, 2104, 2104, 2104, 2104, 629, 120, 130, + -406, 500, -406, -406, -406, -1, -406, 2034, -406, -406, + -406, -406, -406, -406, 1911, -406, -406, -406, 225, 344, + -406, -406, -406, -406, -406, -406, -406, -406, -406, -406, + 31, 2613, -406, -406, -406, -406, 129, 12, -406, -406, + 1911, -406, -406, -406, -406, -406, -406, -81, 89, -406, + -54, -406, 18, 119, 2104, 8, -406, 2104, -406, 2104, + 132, 119, -406, 36, 5, 43, 2613, 119, 119, 595, + 119, 119, -53, 2613, 21, 46, 2104, -406, 144, 145, + 2104, 2104, 145, 177, -406, -406, 758, -406, -406, 77, + -406, -406, -406, -406, 188, -406, -406, -406, -406, 1016, + 140, 209, -406, 115, 148, 31, 117, -406, 217, 14, + 223, -406, 224, -406, -406, -406, -406, 2104, 2104, 2104, + 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, + 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, + 2104, -406, -406, 227, 2104, 2104, 2104, 2104, 2104, 2104, + 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, 2104, + 2104, 17, -406, -406, 2104, 219, 2104, 1145, -406, 89, + 108, 109, -406, -406, -406, 116, 15, 104, 139, 64, + 2217, 1786, 114, -406, 2104, 2104, -406, 2104, 2104, -406, + -406, -406, -406, -406, 153, 158, -406, -406, -406, 158, + -406, -406, -406, 1911, 128, 153, 2104, 2104, -406, 160, + -406, -406, 257, 211, 216, 269, 2613, 492, 328, 328, + 328, 2979, 2979, 2979, 2979, 492, 492, 2613, 2613, 2613, + 2613, 2613, 2613, 2613, 2613, 2613, 2613, 2613, 2674, 2735, + -406, 354, 354, 354, 2613, 2430, 2796, 2857, 2918, 492, + 492, 595, 595, 119, 119, 119, 141, 2491, 189, 2104, + 276, 150, 159, 2288, -406, 155, 1274, -406, -406, 162, + -406, -406, -406, -406, 1145, -406, 89, 2104, -406, -19, + 281, 157, 190, -406, -406, -406, 165, -406, 163, 1786, + -406, 161, -406, 191, 2613, 86, 195, 145, 887, -406, + -24, 199, 167, 124, 180, 89, 290, 89, 184, 153, + 210, -406, 2104, -406, -406, 310, 2359, -406, 1911, 2104, + 194, -406, -406, 1145, 192, 183, 32, 86, -406, -406, + 153, 16, 94, 1911, 2104, -406, -406, -406, -406, 2104, + -406, -406, -406, 2104, 1911, -406, -406, 15, -406, 89, + 197, -406, 220, -406, 195, 269, 2613, -406, -406, -406, + 201, 13, 203, -406, -406, -406, 234, 212, 281, -406, + 214, 222, -406, -406, 94, -406, 277, -406, 2613, -37, + -406, 208, 220, -406, 89, 229, -406, -406, -406, 2104, + 240, 215, 13, -406, -406, -406, -406, -406, -406, -406, + 342, -406, -406, 1911, -406, 1911, 153, 1403, -406, 347, + -406, 326, 221, 284, -406, 2552, 1786, -406, -406, -406, + 1786, 1786, 153, -406, -406, 228, -406, -406, 232, 236, + 230, 1532, -406, -406, -406, -406, 14, -406, -406, 1786, + -406, 238, 246, 226, -406, 1403, -406, -406, 351, -406, + -406, -406, -406, 1786, 247, 244, 254, 249, -406, 15, + 1786, -406, 250, 253, 153, -406, -406 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -374, -374, 260, -374, 352, -285, -374, 98, -373, -39, - 1, -84, -310, 31, 2, 17, 351, 289, 89, -374, - -374, -374, -374, -374, -374, -374, -374, -374, -374, -374, - -374, -374, -374, -374, -374, -17, -16, -374, -374, 5, - -374, 13, -374, -374, -374, -374, -374, -374, -374, -202, - 36, -374, -374, -374, -374, 0, -374, 356, -374, -374, - -374, 58, -374, 59, -374, -65, -374, -48, -374, -374, - -26, -374, 3, -374, 32, -374, -369, -374, -298, -47, - 4, -374, -374, -374, -374, -374, 408, -318, 51, 78, - -237, -374, -99, -374, -374, -374, -374, -374, -374, -374, - -27, -3, -52, -7, -374, -374, -374, -374, -374, -374 + -406, -406, 237, -406, 308, -296, -406, 69, -405, -30, + 1, -56, -83, 49, 2, -17, 331, 260, 51, -406, + -406, -406, -406, -406, -406, -406, -406, -406, -406, -406, + -406, -406, -406, -406, -406, -49, -42, -406, -406, -23, + -406, -20, -406, -406, -406, -406, -406, -406, -406, -406, + 9, 76, -406, -406, -406, -406, 0, -406, 336, -406, + -406, -406, 50, -406, 56, -406, -89, -406, -74, -406, + -406, -55, -406, 3, -406, -406, 6, -7, 34, -384, + -406, -308, -73, 4, -406, -406, -406, -406, -406, 386, + -92, 22, 37, -243, -406, -95, -406, -406, -406, -406, + -406, -406, -406, -29, -115, 371, -46, -406, -406, -13, + -406, -406, -406, -406, -406 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -153 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 208, 153, 336, 221, 133, - 365, 312, 111, 98, 294, 429, 312, 101, 362, 321, - 86, 85, 385, 91, 388, 88, 357, 315, 315, 369, - 109, 55, 112, 115, 116, 92, 117, 118, 119, 92, - 112, 395, 425, 120, 426, 92, 186, 161, -70, 240, - 95, 161, 68, 54, 56, 73, 74, 421, 71, 72, - 161, 436, 370, 103, 161, 90, 414, 96, 388, 161, - 401, 398, 402, 428, 99, 403, 404, 405, 203, 406, - 227, 204, 377, 55, 320, 102, 161, 105, 91, 437, - 487, 144, 87, 351, 488, 489, 230, 367, 219, 217, - 112, 154, 383, 292, 92, 247, 156, 391, 212, 213, - 71, 72, 407, 496, 455, 445, 112, 316, 413, 435, - 158, 248, 408, 409, 235, 236, 412, 504, 369, 321, - 107, 322, 106, 295, 510, 108, 110, 509, 415, 296, - 470, 371, 471, 416, 92, 92, 93, 68, 54, 56, - 73, 74, 382, 161, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 145, 55, 161, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 112, 293, 328, 359, 329, - 205, 360, 333, 300, 297, 71, 72, 147, 206, 214, - 218, 68, 54, 306, 358, 216, 472, 112, 222, 112, - 327, 312, 224, 184, 185, 186, 225, 226, 228, 229, - 231, 232, 490, 241, 2, 238, 208, 242, -71, 244, - 245, 240, 337, 338, 246, 250, 251, 252, 276, 240, - 15, 16, 17, 2, 19, 202, 21, 203, 298, 313, - 204, 299, 330, 326, 332, 334, 335, 208, 25, 15, - 16, 17, 339, 19, 513, 21, 456, 30, 31, 32, - 340, 346, 348, 208, 350, 342, 354, 25, 349, 352, - 315, 184, 185, 186, 356, 456, 30, 31, 32, 208, - 364, 366, 2, 68, 54, 306, 112, 363, -108, 368, - 377, 68, 54, 306, 381, 199, 200, 201, 15, 16, - 17, 384, 19, 202, 21, 203, 386, 393, 204, 457, - 427, 390, 450, 397, 399, 154, 25, 423, 392, 155, - 156, 422, 400, 431, 162, 30, 31, 32, 457, 396, - 424, 432, 157, 442, 158, 359, 68, 54, 306, 444, - 446, 112, -151, 447, 463, 469, 208, 464, 208, 482, - 112, 163, 164, 165, 483, 166, 167, 168, 169, 170, - 171, -152, 491, 452, 492, 453, 484, 493, 502, 497, - 506, 507, 183, 498, 184, 185, 186, 499, 187, 188, - 189, 355, 505, 508, 146, 511, 512, 243, 434, 150, - 192, 193, 194, 195, 196, 233, 197, 198, 199, 200, - 201, 379, 465, 466, 448, 160, 202, 501, 203, 462, - 494, 204, 449, 458, 485, 104, 495, 430, 411, 184, - 185, 186, 0, 443, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 476, 474, 475, 480, 481, 0, - 458, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 0, 476, 474, - 475, 480, 481, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 476, 474, 475, 480, 481, -4, 0, 0, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 162, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, -153, -153, -153, 0, - 37, 38, 0, 0, 170, 171, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -4, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 68, 53, 55, 73, 75, 100, 224, 215, 156, 113, + 103, 155, 350, 431, 232, 247, 248, 136, 329, 329, + 308, 96, 379, 111, 86, 116, 117, 118, 374, 119, + 120, 121, 123, 116, 156, 96, 89, 3, 193, 87, + 5, 6, 7, -70, 218, 219, 439, 238, 260, 54, + 71, 68, 53, 55, 73, 75, 72, 92, 93, 21, + 22, 490, 91, 167, 261, 491, 492, 92, 93, 210, + 109, 94, 211, 419, 440, 110, 28, 412, 389, 239, + 252, 94, 98, 376, 499, 377, 34, 35, 97, 92, + 93, 123, 92, 93, 230, 455, 116, 242, 507, 311, + 54, 71, 105, 94, 101, 513, 94, 72, 330, 418, + 448, 88, 104, 116, 306, 107, 404, 123, 123, 341, + 420, 385, 108, 146, 149, 512, 421, 395, 112, 396, + 147, 167, 212, 213, 229, 233, 236, 417, 309, 226, + 235, 351, 352, 237, 310, 240, 241, 243, 244, 68, + 53, 55, 73, 75, 266, 267, 268, 269, 270, 271, + 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, + 282, 283, 284, 285, 286, 287, 288, 289, 335, 95, + 250, 291, 292, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 116, 307, 54, 71, + 386, 123, 253, 313, 158, 72, 342, -71, 343, 191, + 192, 193, 255, 475, 256, 257, 258, 68, 53, 319, + 259, 123, 116, 348, 116, 344, 263, 264, 325, 493, + 290, 312, 375, 2, -113, 326, 334, 327, 336, 238, + 209, 158, 210, 123, 123, 211, 340, 13, 14, 15, + 159, 17, 158, 19, 410, 160, 161, 345, 347, 349, + 354, 159, 353, 398, 355, 401, 24, 161, 162, 357, + 163, 516, 359, 363, 459, 29, 30, 31, 365, 367, + 369, 163, 368, 252, 329, 409, 371, 373, 2, 380, + 381, -112, 252, 383, 382, 384, 366, 389, 393, 394, + 426, 397, 13, 14, 15, 399, 17, 401, 19, 403, + 405, 430, 156, 407, 116, 414, 68, 53, 319, 411, + 434, 24, 433, 413, 68, 53, 319, 156, 460, 459, + 29, 30, 31, 438, 445, 336, 376, 447, 156, 449, + 456, 453, 458, 450, 466, 472, 467, 429, 2, 406, + 485, 486, 487, 494, 505, 427, 123, 495, 502, 148, + -153, 496, 13, 14, 15, 509, 17, 168, 19, 500, + 473, 116, 474, 68, 53, 319, 428, 501, 508, 510, + 511, 24, 514, 460, 515, 372, 254, 436, 152, 245, + 29, 30, 31, 468, -155, -155, -155, 156, 391, 156, + 469, 451, 176, 177, 452, 166, 504, 497, 488, 446, + 415, 437, 106, 498, 416, -154, 122, 0, 191, 192, + 193, 432, 194, 195, 196, 0, 465, 0, 0, 0, + 0, 0, 0, 0, 0, 461, 202, 203, 0, 204, + 205, 206, 207, 208, 191, 192, 193, 0, 0, 209, + 0, 210, 0, 0, 211, 0, 0, 479, 477, 478, + 483, 484, 0, 461, 0, 204, 205, 206, 207, 208, + 0, 0, 0, 0, 0, 209, 0, 210, 0, 0, + 211, 479, 477, 478, 483, 484, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 479, 477, 478, 483, 484, + -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, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 132, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 0, 0, 191, 192, 193, 0, 194, 195, 196, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 41, + -155, -155, 0, 204, 205, 206, 207, 208, 0, 0, + 0, 42, 0, 209, 0, 210, 43, 44, 211, 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, 128, 0, + 129, 0, 0, 0, 23, 130, 24, 25, 0, 26, + 131, 27, 0, 28, 132, 29, 30, 31, 0, 0, + 32, 33, 0, 34, 35, 191, 192, 193, 0, 0, + 0, 36, 37, 0, 133, 0, 0, 0, 38, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 206, 207, + 208, 0, 0, 0, 0, 0, 209, 0, 210, 39, + 40, 211, 0, 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 239, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 23, 125, 0, 126, - 0, 0, 0, 24, 127, 25, 26, 0, 27, 128, - 28, 0, 29, 129, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 130, 0, 0, 0, 39, 0, 0, + 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 45, 0, 46, 0, 47, 0, 48, 0, 0, 0, + 135, 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, 128, 0, 129, + 0, 0, 0, 23, 130, 24, 25, 0, 26, 131, + 27, 0, 28, 132, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 133, 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, 131, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, 380, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, -153, -153, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, -153, -153, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 43, - 0, 202, 0, 203, 44, 45, 204, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -3, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 134, 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, 251, 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, + 10, 11, 0, 0, 0, 13, 14, 15, 16, 17, + 18, 19, 20, 0, 21, 22, 128, 0, 129, 0, + 0, 0, 23, 130, 24, 25, 0, 26, 131, 27, + 0, 28, 132, 29, 30, 31, 0, 0, 32, 33, + 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, + 37, 0, 133, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 134, 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, 392, 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, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, 0, 0, -142, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, + 0, 0, 0, 0, 314, 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, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 473, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 0, -3, 0, -143, - 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, - 18, 19, 20, 21, 0, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 25, 26, 0, 27, 0, - 28, 0, 29, 0, 30, 31, 32, 0, 0, 33, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 0, 39, 0, 0, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, + 0, 0, 0, 314, 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, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, - 0, 47, 0, 48, 0, 49, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 0, -118, 0, 15, 16, 17, 18, 19, 20, 21, - 22, 0, 23, 125, 0, 126, 0, 0, 0, 24, - 127, 25, 26, 0, 27, 128, 28, 0, 29, 129, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 130, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, + 0, 0, 476, 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, 0, 0, 40, 41, 0, 0, 0, 0, 0, - 0, 0, 131, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, - 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, - 0, 49, 1, 2, 3, 4, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 0, 23, 125, - 0, 126, 0, 0, 0, 24, 127, 25, 26, 0, - 27, 128, 28, 0, 29, 129, 30, 31, 32, 0, - 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, - 0, 0, 37, 38, 0, 130, 0, 0, 0, 39, + 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, + 0, 476, 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, 0, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 131, 0, - 148, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, - 0, 46, 20, 47, 22, 48, 23, 49, 0, 126, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 28, 0, 29, 149, 0, 0, 0, 0, 0, 0, - 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 43, - 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 39, 0, 0, - 97, 0, 3, 4, 0, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, - 0, 0, 20, 0, 22, 0, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 29, 0, 44, 45, 0, 0, 0, 46, - 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, - 0, 0, 162, 0, 0, 0, 0, 39, 0, 0, + 0, 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, 128, 0, 129, 0, 0, + 0, 23, 130, 24, 25, 0, 26, 131, 27, 0, + 28, 132, 29, 30, 31, 0, 0, 32, 33, 0, + 34, 35, 0, 0, 0, 0, 0, 0, 36, 37, + 0, 133, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 41, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 46, - 0, 47, 0, 0, 190, 49, 191, 0, 192, 193, - 194, 195, 196, 162, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 0, 0, 0, 0, 0, 323, 0, 0, 0, 0, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 0, 190, 162, 191, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 0, 0, 163, 164, 165, 353, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 0, 190, 162, - 191, 0, 192, 193, 194, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 0, 0, 163, 164, 165, 394, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 0, 184, - 185, 186, 0, 187, 188, 189, 0, 0, 0, 0, - 162, 190, 0, 191, 345, 192, 193, 194, 195, 196, - 0, 197, 198, 199, 200, 201, 0, 0, 0, 0, - 0, 202, 0, 203, 0, 0, 204, 163, 164, 165, - 0, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 0, - 184, 185, 186, 0, 187, 188, 189, 0, 0, 0, - 0, 162, 190, 0, 191, 0, 192, 193, 194, 195, - 196, 0, 197, 198, 199, 200, 201, 0, 0, 0, - 0, 0, 202, 0, 203, 347, 0, 204, 163, 164, - 165, 0, 166, 167, 168, 169, 170, 171, 172, 173, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 134, 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, + 128, 0, 129, 0, 0, 0, 23, 130, 24, 25, + 0, 26, 131, 27, 0, 28, 132, 29, 30, 31, + 0, 0, 32, 33, 0, 34, 35, 0, 0, 0, + 0, 0, 0, 36, 37, 0, 133, 0, 0, 0, + 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, + 134, 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, 150, 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, 129, 0, 0, 0, 23, + 0, 0, 0, 0, 0, 0, 27, 0, 28, 151, + 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, 39, + 40, 0, 0, 0, 0, 0, 168, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 45, 0, 46, 169, 170, 171, 48, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 0, 191, 192, 193, + 0, 194, 195, 196, 0, 0, 0, 0, 0, 197, + 198, 0, 199, 200, 201, 202, 203, 168, 204, 205, + 206, 207, 208, 0, 0, 0, 0, 0, 209, 0, + 210, 0, 0, 211, 0, 0, 0, 0, 0, 337, + 0, 0, 0, 0, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 0, 184, 185, 186, 0, 187, 188, 189, 0, 0, - 0, 0, 162, 190, 0, 191, 486, 192, 193, 194, - 195, 196, 0, 197, 198, 199, 200, 201, 0, 0, - 0, 0, 0, 202, 0, 203, 0, 0, 204, 163, - 164, 165, 0, 166, 167, 168, 169, 170, 171, 172, + 184, 185, 186, 187, 188, 189, 190, 0, 191, 192, + 193, 0, 194, 195, 196, 0, 0, 0, 0, 0, + 197, 198, 0, 199, 200, 201, 202, 203, 168, 204, + 205, 206, 207, 208, 0, 0, 0, 0, 0, 209, + 0, 210, 0, 0, 211, 0, 0, 0, 0, 0, + 370, 0, 0, 0, 0, 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 0, 184, 185, 186, 0, 187, 188, 189, 0, - 0, 0, 0, 162, 190, 0, 191, 0, 192, 193, - 194, 195, 196, 0, 197, 198, 199, 200, 201, 0, - 0, 0, 0, 0, 202, 0, 203, 0, 0, 204, - 163, 164, 165, 0, 166, 167, 168, 169, 170, 171, + 183, 184, 185, 186, 187, 188, 189, 190, 0, 191, + 192, 193, 0, 194, 195, 196, 0, 0, 0, 0, + 0, 197, 198, 0, 199, 200, 201, 202, 203, 168, + 204, 205, 206, 207, 208, 0, 0, 0, 0, 0, + 209, 0, 210, 0, 0, 211, 0, 0, 0, 0, + 0, 408, 0, 0, 0, 0, 169, 170, 171, 0, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 0, + 191, 192, 193, 0, 194, 195, 196, 0, 0, 0, + 168, 0, 197, 198, 362, 199, 200, 201, 202, 203, + 0, 204, 205, 206, 207, 208, 0, 0, 0, 0, + 0, 209, 0, 210, 0, 0, 211, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 0, 191, 192, 193, 0, 194, 195, 196, 0, 0, + 0, 168, 0, 197, 198, 0, 199, 200, 201, 202, + 203, 0, 204, 205, 206, 207, 208, 0, 0, 0, + 0, 0, 209, 0, 210, 364, 0, 211, 169, 170, + 171, 0, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 0, 191, 192, 193, 0, 194, 195, 196, 0, + 0, 0, 168, 0, 197, 198, 489, 199, 200, 201, + 202, 203, 0, 204, 205, 206, 207, 208, 0, 0, + 0, 0, 0, 209, 0, 210, 0, 0, 211, 169, + 170, 171, 0, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 0, 191, 192, 193, 0, 194, 195, 196, + 0, 0, 0, 168, 0, 197, 198, 0, 199, 200, + 201, 202, 203, 0, 204, 205, 206, 207, 208, 0, + 0, 0, 0, 0, 209, 0, 210, 0, 0, 211, + 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 184, 185, 186, 0, 187, 188, 189, - 0, 0, 0, 0, 162, 0, 0, 0, 0, 192, - 193, 194, 195, 196, 0, 197, 198, 199, 200, 201, - 0, 0, 0, 0, 0, 202, 0, 203, 0, 0, - 204, 163, 164, 165, 0, 166, 167, 168, 169, 170, - 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 184, 185, 186, 0, 187, 188, - 189, 0, 0, 0, 0, 162, 0, 0, 0, 0, - 0, 193, 194, 195, 196, 0, 197, 198, 199, 200, - 201, 0, 0, 0, 0, 0, 202, 0, 203, 0, - 0, 204, 163, 164, 165, 0, 166, 167, 168, 169, - 170, 171, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 184, 185, 186, 0, 187, - 188, 189, 0, 0, 0, 0, 162, 0, 0, 0, - 0, 0, 0, 194, 195, 196, 0, 197, 198, 199, - 200, 201, 0, 0, 0, 0, 0, 202, 0, 203, - 0, 0, 204, 163, 164, 165, 0, 166, 167, 168, - 169, 170, 171, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 184, 185, 186, 0, - 187, 188, 189, 0, 0, 0, 0, 162, 0, 0, - 0, 0, 0, 0, -153, 195, 196, 0, 197, 198, - 199, 200, 201, 0, 0, 0, 0, 0, 202, 0, - 203, 0, 0, 204, 163, 164, 165, 0, -153, -153, - -153, -153, 170, 171, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 184, 185, 186, - 0, 187, 188, 189, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 195, 196, 0, 197, - 198, 199, 200, 201, 0, 0, 0, 0, 0, 202, - 0, 203, 0, 0, 204 + 0, 0, 190, 0, 191, 192, 193, 0, 194, 195, + 196, 0, 0, 0, 168, 0, 0, 0, 0, 199, + 200, 201, 202, 203, 0, 204, 205, 206, 207, 208, + 0, 0, 0, 0, 0, 209, 0, 210, 0, 0, + 211, 169, 170, 171, 0, 172, 173, 174, 175, 176, + 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 191, 192, 193, 0, 194, + 195, 196, 0, 0, 0, 168, 0, 0, 0, 0, + 199, 200, 201, 202, 203, 0, 204, 205, 206, 207, + 208, 0, 0, 0, 0, 0, 209, 0, 210, 0, + 0, 211, 169, 170, 171, 0, 172, 173, 174, 175, + 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 191, 192, 193, 0, + 194, 195, 196, 0, 0, 0, 168, 0, 0, 0, + 0, 0, 200, 201, 202, 203, 0, 204, 205, 206, + 207, 208, 0, 0, 0, 0, 0, 209, 0, 210, + 0, 0, 211, 169, 170, 171, 0, 172, 173, 174, + 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 191, 192, 193, + 0, 194, 195, 196, 0, 0, 0, 168, 0, 0, + 0, 0, 0, 0, 201, 202, 203, 0, 204, 205, + 206, 207, 208, 0, 0, 0, 0, 0, 209, 0, + 210, 0, 0, 211, 169, 170, 171, 0, 172, 173, + 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 191, 192, + 193, 0, 194, 195, 196, 0, 0, 0, 168, 0, + 0, 0, 0, 0, 0, -155, 202, 203, 0, 204, + 205, 206, 207, 208, 0, 0, 0, 0, 0, 209, + 0, 210, 0, 0, 211, 169, 170, 171, 0, -155, + -155, -155, -155, 176, 177, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, + 192, 193, 0, 194, 195, 196, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 202, 203, 0, + 204, 205, 206, 207, 208, 0, 0, 0, 0, 0, + 209, 0, 210, 0, 0, 211 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 89, 58, 244, 107, 48, - 320, 213, 39, 20, 3, 384, 218, 24, 316, 3, - 50, 89, 340, 3, 342, 122, 311, 3, 3, 3, - 37, 0, 39, 40, 41, 19, 43, 44, 45, 19, - 47, 351, 3, 46, 5, 19, 92, 100, 68, 133, - 14, 100, 52, 52, 52, 52, 52, 367, 0, 0, - 100, 34, 36, 27, 100, 122, 364, 18, 386, 100, - 3, 356, 5, 383, 3, 8, 9, 10, 124, 12, - 133, 127, 102, 52, 133, 122, 100, 122, 3, 62, - 463, 3, 122, 133, 467, 468, 123, 133, 105, 102, - 107, 27, 133, 202, 19, 35, 32, 344, 126, 127, - 52, 52, 45, 486, 432, 413, 123, 93, 93, 133, - 46, 51, 55, 56, 127, 128, 363, 500, 3, 3, - 122, 115, 126, 122, 507, 127, 122, 506, 28, 128, - 450, 115, 452, 33, 19, 19, 126, 147, 147, 147, - 147, 147, 99, 100, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 0, 147, 100, - 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 224, 102, 226, - 3, 105, 241, 210, 207, 147, 147, 126, 122, 3, - 127, 211, 211, 211, 313, 122, 453, 224, 3, 226, - 223, 423, 105, 90, 91, 92, 132, 100, 125, 100, - 3, 3, 469, 126, 4, 3, 320, 18, 68, 3, - 99, 325, 245, 246, 68, 3, 3, 3, 3, 333, - 20, 21, 22, 4, 24, 122, 26, 124, 99, 122, - 127, 14, 105, 133, 100, 3, 132, 351, 38, 20, - 21, 22, 3, 24, 511, 26, 46, 47, 48, 49, - 54, 133, 89, 367, 3, 54, 132, 38, 295, 122, - 3, 90, 91, 92, 126, 46, 47, 48, 49, 383, - 100, 132, 4, 303, 303, 303, 313, 133, 127, 105, - 102, 311, 311, 311, 102, 114, 115, 116, 20, 21, - 22, 122, 24, 122, 26, 124, 17, 3, 127, 99, - 382, 126, 65, 126, 132, 27, 38, 127, 345, 31, - 32, 368, 133, 126, 40, 47, 48, 49, 99, 352, - 377, 100, 44, 132, 46, 102, 356, 356, 356, 126, - 126, 368, 132, 122, 105, 3, 450, 132, 452, 3, - 377, 67, 68, 69, 27, 71, 72, 73, 74, 75, - 76, 132, 126, 133, 126, 133, 132, 132, 3, 132, - 122, 126, 88, 132, 90, 91, 92, 133, 94, 95, - 96, 303, 132, 132, 52, 133, 132, 147, 391, 58, - 106, 107, 108, 109, 110, 126, 112, 113, 114, 115, - 116, 332, 439, 439, 419, 69, 122, 492, 124, 436, - 478, 127, 419, 433, 460, 27, 483, 386, 360, 90, - 91, 92, -1, 411, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 454, 454, 454, 454, 454, -1, - 460, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, -1, 478, 478, - 478, 478, 478, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 492, 492, 492, 492, 492, 0, -1, -1, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, 67, 68, 69, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, - -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, - 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, 66, -1, -1, -1, 70, -1, -1, + 0, 0, 0, 0, 0, 18, 98, 90, 64, 38, + 23, 57, 255, 397, 109, 130, 131, 47, 3, 3, + 3, 12, 330, 36, 89, 38, 39, 40, 324, 42, + 43, 44, 45, 46, 90, 26, 121, 5, 92, 49, + 8, 9, 10, 67, 125, 126, 33, 100, 34, 0, + 0, 51, 51, 51, 51, 51, 0, 3, 4, 27, + 28, 466, 121, 100, 50, 470, 471, 3, 4, 123, + 121, 17, 126, 381, 61, 126, 44, 373, 102, 132, + 136, 17, 16, 102, 489, 104, 54, 55, 12, 3, + 4, 104, 3, 4, 107, 132, 109, 126, 503, 214, + 51, 51, 26, 17, 3, 510, 17, 51, 93, 93, + 418, 121, 121, 126, 209, 121, 359, 130, 131, 234, + 26, 35, 125, 3, 125, 509, 32, 3, 121, 5, + 0, 100, 3, 121, 126, 3, 131, 380, 121, 121, + 104, 256, 257, 100, 127, 124, 100, 3, 3, 149, + 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 114, 125, + 3, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 149, 149, + 114, 214, 125, 216, 16, 149, 235, 67, 237, 90, + 91, 92, 3, 456, 99, 67, 99, 217, 217, 217, + 3, 234, 235, 253, 237, 238, 3, 3, 219, 472, + 3, 12, 327, 4, 126, 126, 132, 121, 229, 100, + 121, 16, 123, 256, 257, 126, 132, 18, 19, 20, + 25, 22, 16, 24, 369, 30, 31, 104, 100, 131, + 3, 25, 102, 355, 53, 357, 37, 31, 43, 53, + 45, 514, 3, 132, 45, 46, 47, 48, 89, 3, + 121, 45, 132, 339, 3, 368, 131, 125, 4, 132, + 100, 126, 348, 132, 131, 104, 309, 102, 99, 132, + 383, 121, 18, 19, 20, 15, 22, 399, 24, 125, + 100, 394, 368, 3, 327, 132, 316, 316, 316, 125, + 100, 37, 125, 131, 324, 324, 324, 383, 99, 45, + 46, 47, 48, 132, 131, 326, 102, 125, 394, 125, + 132, 64, 434, 121, 104, 3, 131, 393, 4, 362, + 3, 25, 131, 125, 3, 384, 369, 125, 132, 51, + 131, 131, 18, 19, 20, 121, 22, 39, 24, 131, + 453, 384, 455, 373, 373, 373, 389, 131, 131, 125, + 131, 37, 132, 99, 131, 316, 149, 404, 57, 129, + 46, 47, 48, 442, 66, 67, 68, 453, 347, 455, + 442, 424, 74, 75, 424, 69, 495, 481, 463, 416, + 376, 405, 26, 486, 377, 131, 45, -1, 90, 91, + 92, 399, 94, 95, 96, -1, 439, -1, -1, -1, + -1, -1, -1, -1, -1, 435, 108, 109, -1, 111, + 112, 113, 114, 115, 90, 91, 92, -1, -1, 121, + -1, 123, -1, -1, 126, -1, -1, 457, 457, 457, + 457, 457, -1, 463, -1, 111, 112, 113, 114, 115, + -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, + 126, 481, 481, 481, 481, 481, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 495, 495, 495, 495, 495, + 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, -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, 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, 90, 91, 92, -1, -1, + -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 113, 114, + 115, -1, -1, -1, -1, -1, 121, -1, 123, 90, + 91, 126, -1, -1, -1, -1, -1, -1, 99, -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, + 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, + 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, + 131, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, -1, -1, 18, 19, 20, 21, + 22, 23, 24, 25, -1, 27, 28, 29, -1, 31, + -1, -1, -1, 35, 36, 37, 38, -1, 40, 41, + 42, -1, 44, 45, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, 40, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, 75, 76, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, - 91, 92, -1, 94, 95, 96, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, 112, - -1, 122, -1, 124, 117, 118, 127, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, + -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, 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, + 13, 14, -1, -1, -1, 18, 19, 20, 21, 22, + 23, 24, 25, -1, 27, 28, 29, -1, 31, -1, + -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, + -1, 44, 45, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -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, -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, -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, 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, -1, -1, 90, 91, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 112, - -1, -1, -1, -1, 117, 118, -1, -1, -1, 122, - -1, 124, -1, 126, -1, 128, -1, -1, -1, 132, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -1, -1, 29, -1, -1, -1, - -1, -1, -1, 36, -1, 38, 39, -1, 41, -1, - 43, -1, 45, -1, 47, 48, 49, -1, -1, 52, - 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 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, 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, -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, 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, -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, 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, 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, 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, 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, + 91, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 67, - 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, 122, - -1, 124, -1, -1, 102, 128, 104, -1, 106, 107, - 108, 109, 110, 40, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - -1, -1, -1, -1, -1, 133, -1, -1, -1, -1, - 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, -1, 102, 40, 104, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, -1, 102, 40, - 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, -1, -1, 67, 68, 69, 133, + -1, -1, -1, -1, -1, -1, -1, -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, + 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, - 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, + -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, 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, + 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, + -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, -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, 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, -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, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, - 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, - -1, 107, 108, 109, 110, -1, 112, 113, 114, 115, - 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, - -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, - 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 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, -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, + 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, -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, + 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, -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, 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, 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, + -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 @@ -3127,57 +3357,57 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, - 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, - 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, - 160, 161, 163, 171, 179, 182, 185, 188, 189, 190, - 191, 195, 197, 206, 214, 217, 230, 231, 232, 235, - 236, 237, 238, 241, 243, 89, 50, 122, 122, 164, - 122, 3, 19, 126, 183, 184, 18, 3, 237, 3, - 216, 237, 122, 184, 220, 122, 126, 122, 127, 237, - 122, 234, 237, 239, 240, 237, 237, 237, 237, 237, - 235, 226, 227, 228, 234, 30, 32, 37, 42, 46, - 66, 99, 132, 143, 144, 145, 148, 150, 165, 166, - 181, 189, 233, 242, 3, 0, 138, 126, 3, 46, - 150, 156, 157, 236, 27, 31, 32, 44, 46, 205, - 191, 100, 40, 67, 68, 69, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 90, 91, 92, 94, 95, 96, - 102, 104, 106, 107, 108, 109, 110, 112, 113, 114, - 115, 116, 122, 124, 127, 3, 122, 162, 145, 146, - 172, 187, 126, 127, 3, 229, 122, 235, 127, 237, - 180, 226, 3, 155, 105, 132, 100, 133, 125, 100, - 234, 3, 3, 151, 152, 235, 235, 151, 3, 132, - 145, 126, 18, 136, 3, 99, 68, 35, 51, 213, - 3, 3, 3, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 3, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 226, 237, 3, 122, 128, 235, 99, 14, - 237, 99, 139, 140, 141, 147, 148, 195, 197, 206, - 214, 186, 183, 122, 225, 3, 93, 210, 211, 212, - 133, 3, 115, 133, 142, 143, 133, 235, 234, 234, - 105, 224, 100, 143, 3, 132, 224, 235, 235, 3, - 54, 192, 54, 193, 207, 105, 133, 125, 89, 237, - 3, 133, 122, 133, 132, 141, 126, 139, 226, 102, - 105, 208, 212, 133, 100, 146, 132, 133, 105, 3, - 36, 115, 184, 219, 220, 221, 223, 102, 149, 152, - 132, 102, 99, 133, 122, 221, 17, 194, 221, 222, - 126, 224, 237, 3, 133, 146, 235, 126, 139, 132, - 133, 3, 5, 8, 9, 10, 12, 45, 55, 56, - 209, 223, 224, 93, 212, 28, 33, 173, 175, 177, - 178, 146, 234, 127, 234, 3, 5, 236, 146, 210, - 222, 126, 100, 198, 149, 133, 34, 62, 167, 168, - 169, 170, 132, 208, 126, 212, 126, 122, 173, 175, - 65, 153, 133, 133, 196, 221, 46, 99, 189, 202, - 203, 204, 237, 105, 132, 169, 170, 218, 176, 3, - 146, 146, 224, 99, 144, 148, 189, 199, 200, 201, - 206, 214, 3, 27, 132, 204, 105, 142, 142, 142, - 224, 126, 126, 132, 201, 213, 142, 132, 132, 133, - 215, 199, 3, 174, 142, 132, 122, 126, 132, 210, - 142, 133, 132, 224 + 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, 242, 243, 244, 246, 247, 89, 49, 121, 121, + 163, 121, 3, 4, 17, 125, 183, 184, 16, 3, + 242, 3, 218, 242, 121, 184, 222, 121, 125, 121, + 126, 242, 121, 236, 240, 241, 242, 242, 242, 242, + 242, 242, 238, 242, 228, 229, 230, 236, 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, 245, 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, + 242, 179, 228, 3, 154, 104, 131, 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, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 3, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 228, 242, 3, 121, + 127, 237, 12, 242, 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, 236, 242, 104, 226, 100, 142, 131, + 226, 237, 237, 102, 3, 53, 192, 53, 193, 3, + 208, 209, 104, 132, 124, 89, 242, 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, 242, 3, 132, 145, + 237, 125, 138, 131, 132, 211, 225, 226, 93, 214, + 26, 32, 172, 174, 176, 177, 145, 236, 242, 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, 242, 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) @@ -3989,56 +4219,67 @@ yyreduce: switch (yyn) { - case 26: + case 13: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1769 "parser.y" - {(yyval.code)=(yyvsp[(1) - (1)].code);} +#line 1893 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; - case 27: + case 24: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1770 "parser.y" - {(yyval.code)=code_new();} +#line 1905 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; - case 28: + case 26: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1772 "parser.y" - {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} +#line 1908 "parser.y" + {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 29: + case 27: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1773 "parser.y" - {(yyval.code)=(yyvsp[(1) - (1)].code);} +#line 1909 "parser.y" + {(yyval.code)=code_new();} } break; - case 41: + case 28: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1787 "parser.y" - {(yyval.code)=(yyvsp[(2) - (3)].code);} +#line 1911 "parser.y" + {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} + } + break; + + + + case 29: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1912 "parser.y" + {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4048,8 +4289,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1788 "parser.y" - {(yyval.code)=0;} +#line 1927 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4059,19 +4300,19 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1791 "parser.y" +#line 1928 "parser.y" {(yyval.code)=0;} } break; - case 50: + case 44: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1798 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 1931 "parser.y" + {(yyval.code)=0;} } break; @@ -4081,8 +4322,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1800 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 1938 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4092,7 +4333,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1804 "parser.y" +#line 1942 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4103,7 +4344,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1805 "parser.y" +#line 1943 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4114,7 +4355,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1809 "parser.y" +#line 1947 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4124,12 +4365,31 @@ yyreduce: + case 55: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1954 "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 1820 "parser.y" - {(yyval.value)=(yyvsp[(2) - (2)].value);} +#line 1973 "parser.y" + {(yyval.node)=(yyvsp[(2) - (2)].node);} } break; @@ -4139,10 +4399,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1821 "parser.y" - {(yyval.value).c=abc_pushundefined(0); - (yyval.value).t=TYPE_ANY; - } +#line 1974 "parser.y" + {(yyval.node)=mkdummynode();} } break; @@ -4152,7 +4410,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1825 "parser.y" +#line 1976 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4163,7 +4421,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1826 "parser.y" +#line 1977 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4174,7 +4432,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1828 "parser.y" +#line 1979 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4185,7 +4443,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1829 "parser.y" +#line 1980 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4196,45 +4454,62 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" +#line 1983 "parser.y" { +PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id)); +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) { + variable_t* v = find_slot(state, (yyvsp[(1) - (3)].id)); + if(v && !v->init) { + // this variable is stored in a slot + v->init = 1; + v->type = (yyvsp[(2) - (3)].classinfo); + slot = 1; + index = v->index; + } + } + if(!index) { + index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0); } - int index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1); + (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) = (yyvsp[(3) - (3)].value).c; - (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); + 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); - (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); + 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) = (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)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { - code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = code_new(); + // don't do anything + code_free(v.c); + code_free((yyval.code)); + (yyval.code) = 0; + break; } } - - /* that's the default for a local register, anyway - else { - state->method->initcode = abc_pushundefined(state->method->initcode); - state->method->initcode = abc_setlocal(state->method->initcode, index); - }*/ - //printf("variable %s -> %d (%s)\n", $2->text, index, $4.t?$4.t->name:""); + if(slot) { + (yyval.code) = abc_setslot((yyval.code), index); + } else { + (yyval.code) = abc_setlocal((yyval.code), index); + } } } break; @@ -4245,7 +4520,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1874 "parser.y" +#line 2042 "parser.y" {(yyval.code) = code_new();} } break; @@ -4256,7 +4531,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1875 "parser.y" +#line 2043 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4267,8 +4542,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" - {new_state();} +#line 2046 "parser.y" + {PASS12 new_state();} } break; @@ -4278,7 +4553,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1878 "parser.y" +#line 2046 "parser.y" { (yyval.code) = code_new(); @@ -4295,7 +4570,7 @@ yyreduce: myjmp->branch = (yyval.code) = abc_nop((yyval.code)); } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4306,7 +4581,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1897 "parser.y" +#line 2065 "parser.y" {(yyval.code)=code_new();} } break; @@ -4317,9 +4592,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1904 "parser.y" +#line 2072 "parser.y" { - (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1); + 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); } } break; @@ -4330,8 +4606,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1907 "parser.y" +#line 2076 "parser.y" { + PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); } } @@ -4343,8 +4620,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1911 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} +#line 2081 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4354,8 +4631,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1912 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} +#line 2082 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4365,7 +4642,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1914 "parser.y" +#line 2084 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4383,7 +4660,7 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4394,13 +4671,17 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1934 "parser.y" +#line 2104 "parser.y" { - variable_t*var = find_variable((yyvsp[(2) - (6)].id)); + variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); + if(!var) { + syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id)); + } + char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); - int it = new_variable(tmp1name, TYPE_INT, 0); + int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); - int array = new_variable(tmp1name, 0, 0); + int array = new_variable(tmp1name, 0, 0, 0); (yyval.code) = code_new(); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c); @@ -4432,10 +4713,11 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } } break; @@ -4446,8 +4728,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" - {new_state();} +#line 2152 "parser.y" + {PASS12 new_state();} } break; @@ -4457,7 +4739,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" +#line 2152 "parser.y" { (yyval.code) = code_new(); @@ -4474,7 +4756,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4485,8 +4767,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" - {new_state();} +#line 2171 "parser.y" + {PASS12 new_state();} } break; @@ -4496,7 +4778,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2171 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4509,7 +4791,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4520,7 +4802,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2011 "parser.y" +#line 2186 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4533,7 +4815,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2014 "parser.y" +#line 2189 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4546,7 +4828,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2017 "parser.y" +#line 2192 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4559,7 +4841,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2020 "parser.y" +#line 2195 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4572,7 +4854,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2024 "parser.y" +#line 2199 "parser.y" {(yyval.code)=0;} } break; @@ -4583,7 +4865,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2025 "parser.y" +#line 2200 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4594,7 +4876,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" +#line 2201 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4605,7 +4887,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2202 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4616,7 +4898,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2028 "parser.y" +#line 2203 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4627,7 +4909,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2029 "parser.y" +#line 2204 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4638,10 +4920,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2031 "parser.y" +#line 2206 "parser.y" { - (yyval.code) = abc_dup(0); - (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); + (yyval.code) = abc_getlocal(0, state->switch_var); + (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__) { @@ -4659,7 +4941,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2042 "parser.y" +#line 2217 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4672,8 +4954,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2045 "parser.y" - {new_state();} +#line 2220 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -4683,11 +4965,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2045 "parser.y" +#line 2220 "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)); - code_t*out = (yyval.code) = abc_pop((yyval.code)); + + code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var); breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out); code_t*c = (yyval.code),*lastblock=0; @@ -4708,7 +4992,7 @@ yyreduce: } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4719,8 +5003,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2074 "parser.y" - {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} +#line 2251 "parser.y" + {PASS12 new_state(); + state->exception_name=(yyvsp[(3) - (5)].id); + PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); + PASS2 new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0); + } } break; @@ -4730,7 +5018,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2075 "parser.y" +#line 2256 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4741,14 +5029,15 @@ yyreduce: (yyval.exception) = e; code_t*c = 0; - int i = find_variable_safe((yyvsp[(3) - (9)].id))->index; + int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index; e->target = c = abc_nop(0); c = abc_setlocal(c, i); + c = code_append(c, code_dup(state->method->scope_code)); c = code_append(c, (yyvsp[(8) - (9)].code)); c = abc_kill(c, i); c = var_block(c); - old_state(); + PASS12 old_state(); } } break; @@ -4759,8 +5048,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2094 "parser.y" - {new_state();state->exception_name=0;} +#line 2276 "parser.y" + {PASS12 new_state();state->exception_name=0;} } break; @@ -4770,12 +5059,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2094 "parser.y" +#line 2276 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { (yyval.exception)=0; - old_state(); } else { NEW(abc_exception_t, e) e->exc_type = 0; //all exceptions @@ -4783,9 +5071,9 @@ yyreduce: e->target = 0; e->to = abc_nop(0); e->to = code_append(e->to, (yyvsp[(4) - (5)].code)); - old_state(); (yyval.exception) = e; } + PASS12 old_state(); } } break; @@ -4796,7 +5084,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" +#line 2292 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4807,7 +5095,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 2293 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4818,7 +5106,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2113 "parser.y" +#line 2294 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4829,7 +5117,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2114 "parser.y" +#line 2295 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4847,7 +5135,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2122 "parser.y" +#line 2303 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4865,8 +5153,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" - {new_state();} +#line 2312 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -4876,7 +5167,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 2315 "parser.y" { code_t*out = abc_nop(0); @@ -4889,7 +5180,7 @@ yyreduce: int tmp; if((yyvsp[(6) - (6)].catch_list).finally) - tmp = new_variable("__finally__", 0, 0); + tmp = new_variable("__finally__", 0, 0, 0); abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l; int count=0; @@ -4902,6 +5193,7 @@ yyreduce: parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally); // finally block e->target = (yyval.code) = abc_nop((yyval.code)); + (yyval.code) = code_append((yyval.code), code_dup(state->method->scope_code)); (yyval.code) = abc___rethrow__((yyval.code)); } @@ -4917,7 +5209,7 @@ yyreduce: list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4928,7 +5220,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2176 "parser.y" +#line 2361 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4942,11 +5234,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2180 "parser.y" +#line 2365 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); - variable_t*v = find_variable(state->exception_name); + variable_t*v = find_variable(state, state->exception_name); (yyval.code)=code_new(); (yyval.code)=abc_getlocal((yyval.code), v->index); (yyval.code)=abc_throw((yyval.code)); @@ -4960,24 +5252,41 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2191 "parser.y" +#line 2376 "parser.y" { - (yyval.code) = (yyvsp[(3) - (5)].value).c; - (yyval.code) = abc_pushscope((yyval.code)); - (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code)); - (yyval.code) = abc_popscope((yyval.code)); + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + (yyval.value_list).number = v; + } + (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c; } } break; - case 109: + case 108: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2201 "parser.y" - {PASS12 (yyval.id)="package";} +#line 2386 "parser.y" + { + /* remove getlocal;pushwith from scope code again */ + state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); + + (yyval.code) = (yyvsp[(1) - (2)].value_list).cc; + if(state->method->has_exceptions) { + (yyval.code) = abc_dup((yyval.code)); + (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number); + } + (yyval.code) = abc_pushwith((yyval.code)); + (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code)); + (yyval.code) = abc_popscope((yyval.code)); + old_state(); +} } break; @@ -4987,8 +5296,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2203 "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 2404 "parser.y" + {PASS12 (yyval.id)="package";} } break; @@ -4998,8 +5307,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2204 "parser.y" - {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} +#line 2405 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5009,8 +5318,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2206 "parser.y" - {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} +#line 2407 "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; @@ -5020,8 +5329,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2207 "parser.y" - {PASS12 endpackage();(yyval.code)=0;} +#line 2408 "parser.y" + {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5031,8 +5340,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2208 "parser.y" - {PASS12 startpackage("");} +#line 2410 "parser.y" + {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5042,7 +5351,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2411 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5053,19 +5362,41 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2211 "parser.y" +#line 2412 "parser.y" + {PASS12 startpackage("");} + } + break; + + + + case 117: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2413 "parser.y" + {PASS12 endpackage();(yyval.code)=0;} + } + break; + + + + case 118: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2435 "parser.y" { - PASS1 - if(!registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name)) { + 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"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); (yyval.code)=0; } } @@ -5073,22 +5404,22 @@ yyreduce: - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2225 "parser.y" +#line 2449 "parser.y" { - PASS1 - if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { + 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(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); (yyval.code)=0; } } @@ -5096,34 +5427,12 @@ yyreduce: - case 118: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" - {PASS12 (yyval.flags)=0;} - } - break; - - - - case 119: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} - } - break; - - - case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2243 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2465 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5133,8 +5442,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2244 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2466 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5144,8 +5453,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2467 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5155,8 +5464,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2247 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2468 "parser.y" + { + PASS12 + (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; + if((yyvsp[(1) - (2)].flags).ns && (yyvsp[(2) - (2)].flags).ns) syntaxerror("only one namespace allowed in one declaration"); + (yyval.flags).ns=(yyvsp[(1) - (2)].flags).ns?(yyvsp[(1) - (2)].flags).ns:(yyvsp[(2) - (2)].flags).ns; + +} } break; @@ -5166,8 +5481,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2248 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2475 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5177,8 +5492,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2249 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2476 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5188,8 +5503,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2250 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2477 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5199,8 +5514,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2251 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2478 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5210,8 +5525,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2479 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5221,8 +5536,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2253 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2480 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5232,8 +5547,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2254 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2481 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5243,8 +5558,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2255 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2482 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5254,8 +5569,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2257 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2483 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5265,8 +5580,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2258 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2484 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; @@ -5276,8 +5593,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2260 "parser.y" - {PASS12 (yyval.classinfo_list)=list_new();} +#line 2488 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; @@ -5287,8 +5604,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2261 "parser.y" - {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} +#line 2489 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5298,7 +5615,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2263 "parser.y" +#line 2491 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5309,7 +5626,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2492 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5320,8 +5637,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2494 "parser.y" + {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5331,8 +5648,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" - {PASS12 endclass();(yyval.code)=0;} +#line 2495 "parser.y" + {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5342,8 +5659,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2274 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2499 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5353,18 +5670,52 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2276 "parser.y" +#line 2501 "parser.y" + {PASS12 endclass();(yyval.code)=0;} + } + break; + + + + case 142: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2505 "parser.y" + {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE; + startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} + } + break; + + + + case 143: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2508 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 149: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2289 "parser.y" +#line 2517 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 152: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2521 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5375,11 +5726,11 @@ yyreduce: - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2300 "parser.y" +#line 2532 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5388,19 +5739,19 @@ yyreduce: - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2303 "parser.y" +#line 2535 "parser.y" { PASS12 - (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; - if((yyvsp[(1) - (8)].flags)&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { + (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; + if((yyvsp[(1) - (8)].flags).flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) { syntaxerror("invalid method modifiers: interface methods always need to be public"); } - startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); - endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); + startfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo)); + endfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0); list_deep_free((yyvsp[(6) - (8)].params).list); } } @@ -5408,227 +5759,276 @@ yyreduce: - case 160: + case 162: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2318 "parser.y" - {setstaticfunction((yyvsp[(1) - (3)].flags));} +#line 2569 "parser.y" + {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; - case 161: + case 163: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2318 "parser.y" - { - int flags = (yyvsp[(1) - (6)].flags); - U8 access = flags2access((yyvsp[(1) - (6)].flags)); - - varinfo_t* info = 0; - if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (6)].id), 1); - if(i) { - check_override(i, flags); - } - info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (6)].id)); - } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id)); - if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id)); - } - info = varinfo_register_global(access, state->package, (yyvsp[(3) - (6)].id)); +#line 2569 "parser.y" + {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } + break; - info->type = (yyvsp[(5) - (6)].classinfo); - info->flags = flags; - /* slot name */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (6)].id)}; - trait_list_t**traits; - code_t**code; - if(!state->cls) { - // global variable - mname_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; + case 164: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2571 "parser.y" + {PASS12 (yyval.code)=0;} } - - trait_t*t=0; - if((yyvsp[(5) - (6)].classinfo)) { - MULTINAME(m, (yyvsp[(5) - (6)].classinfo)); - t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); - } else { - t = trait_new_member(traits, 0, multiname_clone(&mname), 0); + break; + + + + case 165: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2572 "parser.y" + {PASS12 (yyval.code)=0;} } - info->slot = t->slot_id; - - /* initalization code (if needed) */ - code_t*c = 0; - if((yyvsp[(6) - (6)].value).c && !is_pushundefined((yyvsp[(6) - (6)].value).c)) { - c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(6) - (6)].value).c); - c = converttype(c, (yyvsp[(6) - (6)].value).t, (yyvsp[(5) - (6)].classinfo)); - c = abc_setslot(c, t->slot_id); + break; + + + + case 166: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2575 "parser.y" + { +PASS12 + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); + + if(as3_pass == 1) { + + varinfo_t* info = 0; + if(state->cls) { + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); + if(i) { + check_override(i, flags); + } + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); + } else { + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); + if(i) { + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); + } + + info->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)); + } 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((yyvsp[(2) - (6)].token)==KW_CONST) { - t->kind= TRAIT_CONST; + if(slotstate_varconst==KW_CONST) { + t->kind= TRAIT_CONST; + } } (yyval.code)=0; - setstaticfunction(0); } } break; - case 162: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2666 "parser.y" {(yyval.constant)=0;} } break; - case 163: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2667 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 164: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} +#line 2670 "parser.y" + {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 165: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} +#line 2671 "parser.y" + { + (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); +} } break; - case 166: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" - {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} +#line 2674 "parser.y" + {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 167: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2397 "parser.y" - {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} +#line 2675 "parser.y" + {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; - case 168: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" - {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} +#line 2676 "parser.y" + {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 169: + case 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" - {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} +#line 2677 "parser.y" + {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 170: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" - {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} +#line 2678 "parser.y" + {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 171: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" - {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} +#line 2679 "parser.y" + {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; - case 172: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2403 "parser.y" - { - // TODO - as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); -} +#line 2680 "parser.y" + {(yyval.constant) = constant_new_float(__builtin_nan(""));} } break; - case 173: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2412 "parser.y" +#line 2695 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5638,11 +6038,11 @@ yyreduce: - case 174: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2699 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5652,11 +6052,11 @@ yyreduce: - case 175: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2422 "parser.y" +#line 2705 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5668,11 +6068,11 @@ yyreduce: - case 176: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2428 "parser.y" +#line 2711 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5684,11 +6084,11 @@ yyreduce: - case 177: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2436 "parser.y" +#line 2719 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5699,11 +6099,11 @@ yyreduce: - case 178: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2724 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5714,17 +6114,17 @@ yyreduce: - case 179: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2730 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (4)].id); (yyval.param)->type = (yyvsp[(3) - (4)].classinfo); + PASS2 (yyval.param)->value = (yyvsp[(4) - (4)].constant); } } @@ -5732,17 +6132,17 @@ yyreduce: - case 180: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2455 "parser.y" +#line 2738 "parser.y" { - PASS1 (yyval.param)=0; - PASS2 - (yyval.param) = malloc(sizeof(param_t)); + PASS12 + (yyval.param) = rfx_calloc(sizeof(param_t)); (yyval.param)->name=(yyvsp[(1) - (2)].id); (yyval.param)->type = TYPE_ANY; + PASS2 (yyval.param)->value = (yyvsp[(2) - (2)].constant); } } @@ -5750,64 +6150,44 @@ yyreduce: - case 181: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2463 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 182: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 183: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2465 "parser.y" - {(yyval.token)=0;} +#line 2748 "parser.y" + {PASS12 (yyval.token)=0;} } break; - case 184: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2468 "parser.y" - {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} +#line 2751 "parser.y" + {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; - case 185: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2469 "parser.y" +#line 2752 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list); + PASS1 + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); PASS2 if(!state->method->info) syntaxerror("internal error"); code_t*c = method_header(state->method); c = wrap_function(c, 0, (yyvsp[(11) - (12)].code)); - endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c); + PASS12 list_deep_free((yyvsp[(6) - (12)].params).list); (yyval.code)=0; } @@ -5816,35 +6196,36 @@ yyreduce: - case 187: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2768 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 188: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2485 "parser.y" +#line 2770 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 189: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2486 "parser.y" +#line 2771 "parser.y" { - PASS1 old_state();list_deep_free((yyvsp[(4) - (10)].params).list); + PASS1 + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); PASS2 methodinfo_t*f = state->method->info; if(!f || !f->kind) syntaxerror("internal error"); @@ -5853,28 +6234,39 @@ yyreduce: c = wrap_function(c, 0, (yyvsp[(9) - (10)].code)); int index = state->method->var_index; - endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); - list_deep_free((yyvsp[(4) - (10)].params).list); + endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c); (yyval.value).c = abc_getlocal(0, index); (yyval.value).t = TYPE_FUNCTION(f); + + PASS12 list_deep_free((yyvsp[(4) - (10)].params).list); } } break; - case 190: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2506 "parser.y" +#line 2793 "parser.y" { - PASS1 (yyval.classinfo)=0; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->name = (yyvsp[(1) - (1)].id); + c->package = get_package_from_name((yyvsp[(1) - (1)].id)); + if(!c->package) { + c->nsset = get_current_imports(); + /* make the compiler look for this class in the current directory, + just in case: */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); + } + (yyval.classinfo) = (classinfo_t*)c; PASS2 - /* try current package */ slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); - if(!s) syntaxerror("Could not find class/method %s\n", (yyvsp[(1) - (1)].id)); + if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); (yyval.classinfo) = (classinfo_t*)s; } } @@ -5882,17 +6274,18 @@ yyreduce: - case 191: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2515 "parser.y" +#line 2812 "parser.y" { - PASS1 static classinfo_t c; - memset(&c, 0, sizeof(c)); - c.package = (yyvsp[(1) - (3)].id); - c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=&c; + PASS1 NEW(unresolvedinfo_t,c); + memset(c, 0, sizeof(*c)); + c->kind = INFOTYPE_UNRESOLVED; + c->package = (yyvsp[(1) - (3)].id); + c->name = (yyvsp[(3) - (3)].id); + (yyval.classinfo) = (classinfo_t*)c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -5904,122 +6297,122 @@ yyreduce: - case 194: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2531 "parser.y" +#line 2829 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 195: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2532 "parser.y" +#line 2830 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 196: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2534 "parser.y" - {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} +#line 2832 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 197: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2535 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2833 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; - case 198: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2536 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 2834 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; - case 199: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2545 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2843 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 200: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" - {(yyval.classinfo)=0;} +#line 2844 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 201: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2848 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 202: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2551 "parser.y" +#line 2849 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 203: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2553 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 2851 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 206: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2557 "parser.y" - {(yyval.value_list).len=1; +#line 2855 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6027,24 +6420,24 @@ yyreduce: - case 207: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2561 "parser.y" +#line 2859 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 208: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2562 "parser.y" +#line 2860 "parser.y" { - (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; + (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); } } @@ -6052,13 +6445,14 @@ yyreduce: - case 210: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2568 "parser.y" +#line 2866 "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; @@ -6066,23 +6460,23 @@ yyreduce: multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); multiname_destroy(name); } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME multiname_t*name = t->name; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number); } else { (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).len); + (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number); } (yyval.value).t = TYPE_ANY; - 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; @@ -6093,14 +6487,15 @@ yyreduce: - case 211: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2604 "parser.y" +#line 2903 "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); } @@ -6111,11 +6506,11 @@ yyreduce: multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); - } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { + } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME + trait_t*t = traits_find_slotid(state->cls->abc->traits,slot); if(t->kind!=TRAIT_METHOD) { //ok: flash allows to assign closures to members. } @@ -6123,21 +6518,21 @@ yyreduce: (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding - (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); } else if((yyval.value).c->opcode == OPCODE_GETSUPER) { multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0; (yyval.value).c = code_cutlast((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number); multiname_destroy(name); } else { (yyval.value).c = abc_getglobalscope((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, paramcode); - (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); } - if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) { - (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 { (yyval.value).c = abc_coerce_a((yyval.value).c); (yyval.value).t = TYPE_ANY; @@ -6148,11 +6543,11 @@ yyreduce: - case 212: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2950 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6169,7 +6564,7 @@ yyreduce: */ state->method->has_super = 1; - (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).len); + (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); (yyval.value).c = abc_pushundefined((yyval.value).c); (yyval.value).t = TYPE_ANY; } @@ -6178,13 +6573,14 @@ yyreduce: - case 213: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2671 "parser.y" +#line 2971 "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); } @@ -6193,12 +6589,12 @@ yyreduce: (yyval.value).c->opcode = OPCODE_DELETEPROPERTY; } else if((yyval.value).c->opcode == OPCODE_GETSLOT) { int slot = (int)(ptroff_t)(yyval.value).c->data[0]; - multiname_t*name = abc_class_find_slotid(state->cls->abc,slot)->name; + multiname_t*name = traits_find_slotid(state->cls->abc->traits,slot)->name; (yyval.value).c = code_cutlast((yyval.value).c); (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; @@ -6208,11 +6604,11 @@ yyreduce: - case 214: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2993 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6221,11 +6617,11 @@ yyreduce: - case 215: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2695 "parser.y" +#line 2996 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6235,96 +6631,66 @@ yyreduce: - case 216: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" - {(yyval.value)=(yyvsp[(1) - (1)].value);} - } - break; - - - - case 217: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2703 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} - } - break; - - - - case 218: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2704 "parser.y" +#line 3003 "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.value) = node_read((yyvsp[(1) - (1)].node)); } } break; - case 219: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2710 "parser.y" +#line 3006 "parser.y" { - (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); } } break; - case 220: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2716 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} - } - break; - - - - case 222: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2720 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3009 "parser.y" + { + (yyval.node) = mkmultinode(&node_comma, (yyvsp[(1) - (1)].node)); +} } break; - case 223: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2722 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3012 "parser.y" + { + (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 2724 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3015 "parser.y" + { + (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); +} } break; @@ -6334,22 +6700,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2728 "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); - } - (yyval.value).t = TYPE_REGEXP; +#line 3018 "parser.y" + { + (yyval.code) = (yyvsp[(1) - (3)].code); + (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); } } break; @@ -6360,12 +6714,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "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 3023 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6375,10 +6725,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2750 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } +#line 3024 "parser.y" + {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; @@ -6388,10 +6736,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2753 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } +#line 3026 "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; +} } break; @@ -6401,10 +6752,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2756 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } +#line 3032 "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); +} } break; @@ -6414,10 +6768,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2759 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } +#line 3041 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6427,10 +6779,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2762 "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 3042 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6440,10 +6790,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3043 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6453,10 +6801,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3044 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6466,10 +6812,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2771 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3045 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6479,10 +6823,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2774 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } +#line 3046 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6492,10 +6834,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2778 "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 3048 "parser.y" + { + (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant)); +} } break; @@ -6505,10 +6847,25 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2781 "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 3053 "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; @@ -6518,10 +6875,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2784 "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 3073 "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; @@ -6531,10 +6893,15 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2787 "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 3083 "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; @@ -6544,10 +6911,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2790 "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 3092 "parser.y" + {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6557,10 +6922,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2793 "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 3093 "parser.y" + {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6570,10 +6933,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2796 "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 3094 "parser.y" + {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6583,10 +6944,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2799 "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 3095 "parser.y" + {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6596,18 +6955,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2803 "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 3096 "parser.y" + {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6617,24 +6966,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2814 "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 3097 "parser.y" + {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6644,11 +6977,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2832 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3098 "parser.y" + {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6658,11 +6988,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2837 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_bitnot((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3099 "parser.y" + {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6672,11 +6999,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2842 "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 3100 "parser.y" + {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6686,11 +7010,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2847 "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 3101 "parser.y" + {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6700,11 +7021,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2852 "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 3102 "parser.y" + {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));} } break; @@ -6714,11 +7032,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2857 "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 3103 "parser.y" + {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));} } break; @@ -6728,11 +7043,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2861 "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 3104 "parser.y" + {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6742,11 +7054,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "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 3105 "parser.y" + {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6756,11 +7065,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2870 "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 3106 "parser.y" + {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6770,11 +7076,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2874 "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 3107 "parser.y" + {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6784,16 +7087,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2878 "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 3108 "parser.y" + {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6803,16 +7098,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2887 "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 3109 "parser.y" + {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6822,16 +7109,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2896 "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 3110 "parser.y" + {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6841,11 +7120,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2906 "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 3111 "parser.y" + {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6855,18 +7131,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "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 3112 "parser.y" + {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6876,11 +7142,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2924 "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 3113 "parser.y" + {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6890,11 +7153,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2929 "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 3114 "parser.y" + {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6904,12 +7164,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2934 "parser.y" - { - (yyval.value).c = (yyvsp[(3) - (4)].value).c; - (yyval.value).c = abc_typeof((yyval.value).c); - (yyval.value).t = TYPE_STRING; - } +#line 3115 "parser.y" + {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6919,12 +7175,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2940 "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 3116 "parser.y" + {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6934,10 +7186,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2946 "parser.y" - { (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3117 "parser.y" + {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6947,8 +7197,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2950 "parser.y" - {(yyval.value)=(yyvsp[(2) - (3)].value);} +#line 3118 "parser.y" + {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -6958,17 +7208,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2952 "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 3119 "parser.y" + {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));} } break; @@ -6978,15 +7219,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "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 3120 "parser.y" + {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));} } break; @@ -6996,13 +7230,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2972 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len); - (yyval.value).t = registry_getarrayclass(); -} +#line 3121 "parser.y" + { (yyval.node) = mkconstnode(constant_new_undefined());} } break; @@ -7012,8 +7241,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3122 "parser.y" + { (yyval.node)=(yyvsp[(2) - (3)].node);} } break; @@ -7023,8 +7252,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" - {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} +#line 3123 "parser.y" + {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));} } break; @@ -7034,13 +7263,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" - { - (yyval.value_list).cc = 0; - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).len = 2; -} +#line 3124 "parser.y" + {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));} } break; @@ -7050,13 +7274,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2988 "parser.y" - { - (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; - (yyval.value_list).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 3125 "parser.y" + {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7066,13 +7285,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2997 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2); - (yyval.value).t = registry_getobjectclass(); -} +#line 3126 "parser.y" + {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7082,18 +7296,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "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 3127 "parser.y" + {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7103,13 +7307,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3016 "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 3128 "parser.y" + {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7119,13 +7318,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3022 "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 3129 "parser.y" + {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7135,13 +7329,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3028 "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 3130 "parser.y" + { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7151,13 +7340,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3034 "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 3131 "parser.y" + { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7167,13 +7351,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3040 "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 3132 "parser.y" + { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7183,13 +7362,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3046 "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 3133 "parser.y" + { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7199,13 +7373,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3052 "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 3134 "parser.y" + { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7215,20 +7384,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3058 "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 3135 "parser.y" + { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7238,18 +7395,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3071 "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 3136 "parser.y" + { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7259,13 +7406,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3082 "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 3137 "parser.y" + { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));} } break; @@ -7275,19 +7417,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "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[(3) - (5)].value).t, (yyval.value).t); - (yyval.value).c = j2->branch = abc_label((yyval.value).c); - } +#line 3139 "parser.y" + { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));} } break; @@ -7297,32 +7428,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3102 "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 3140 "parser.y" + { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));} } break; @@ -7332,20 +7439,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3129 "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; - } +#line 3141 "parser.y" + {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); } } break; @@ -7355,20 +7450,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "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; - } +#line 3142 "parser.y" + {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); } } break; @@ -7378,57 +7461,33 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3157 "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 292: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3172 "parser.y" +#line 3145 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); - namespace_t ns = {f->access, ""}; + 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 293: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3186 "parser.y" +#line 3159 "parser.y" { // attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored @ operator"); } } @@ -7436,15 +7495,14 @@ yyreduce: - case 294: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" +#line 3165 "parser.y" { // child attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .@ operator"); } } @@ -7452,15 +7510,14 @@ yyreduce: - case 295: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3200 "parser.y" +#line 3171 "parser.y" { // namespace declaration TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored :: operator"); } } @@ -7468,15 +7525,14 @@ yyreduce: - case 296: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3207 "parser.y" +#line 3177 "parser.y" { // descendants TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .. operator"); } } @@ -7484,15 +7540,14 @@ yyreduce: - case 297: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3214 "parser.y" +#line 3183 "parser.y" { // filter TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .() operator"); } } @@ -7500,54 +7555,96 @@ yyreduce: - case 298: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3226 "parser.y" - {(yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->data) { - t = t->data; - is_static = 1; - } - if(t) { - memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); - char noslot = 0; - if(f && !is_static != !(f->flags&FLAG_STATIC)) - noslot=1; - if(f && f->slot && !noslot) { - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - } else { - MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - } - /* determine type */ - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); - if(!(yyval.value).t) - (yyval.value).c = abc_coerce_a((yyval.value).c); - } else { - /* when resolving a property on an unknown type, we do know the - name of the property (and don't seem to need the package), but - we need to make avm2 try out all access modes */ - multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); - } +#line 3196 "parser.y" + { + 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; + is_static = 1; + } + if(t) { + if(t->subtype==INFOTYPE_UNRESOLVED) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); + } + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + (yyval.value).c = abc_getslot((yyval.value).c, f->slot); + } else { + if(!f) { + as3_warning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); } + + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + } + /* determine type */ + (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + if(!(yyval.value).t) + (yyval.value).c = abc_coerce_a((yyval.value).c); + } else if(v1.c && v1.c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = v1.c->data[0]; + char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); + + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(a) { + (yyval.value) = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + (yyval.value).c = v1.c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + syntaxerror("couldn't resolve %s", package2); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + (yyval.value).c = abc_coerce_a((yyval.value).c); + (yyval.value).t = TYPE_ANY; + } +} } break; - case 299: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3259 "parser.y" +#line 3254 "parser.y" { + PASS1 + /* Queue unresolved identifiers for checking against the parent + function's variables. + We consider everything which is not a local variable "unresolved". + This encompasses class names, members of the surrounding class + etc. which is *correct* because local variables of the parent function + would shadow those. + */ + if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { + unknown_variable((yyvsp[(1) - (1)].id)); + } + + /* let the compiler know that it might want to check the current directory/package + for this identifier- maybe there's a file $1.as defining $1. */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); + PASS2 + (yyval.value).t = 0; (yyval.value).c = 0; slotinfo_t*a = 0; @@ -7555,18 +7652,27 @@ yyreduce: variable_t*v; /* look at variables */ - if((v = find_variable((yyvsp[(1) - (1)].id)))) { + 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; 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; + 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(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && - (f->flags&FLAG_STATIC) >= i_am_static) { + if(!state->method->inner && + state->cls && + (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && + (f->flags&FLAG_STATIC) >= i_am_static) + { // $1 is a function in this class int var_is_static = (f->flags&FLAG_STATIC); @@ -7582,7 +7688,7 @@ yyreduce: static properties of a class */ state->method->late_binding = 1; (yyval.value).t = f->type; - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); (yyval.value).c = abc_getproperty2((yyval.value).c, &m); @@ -7592,7 +7698,7 @@ yyreduce: (yyval.value).c = abc_getslot((yyval.value).c, f->slot); break; } else { - namespace_t ns = {f->access, ""}; + namespace_t ns = {f->access, f->package}; multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; (yyval.value).c = abc_getlocal_0((yyval.value).c); (yyval.value).c = abc_getproperty2((yyval.value).c, &m); @@ -7602,41 +7708,22 @@ yyreduce: /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - if(a->access == ACCESS_PACKAGEINTERNAL && - strcmp(a->package, state->package) && - strcmp(a->package, internal_filename_package) - ) - syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", - infotypename(a),(yyvsp[(1) - (1)].id), a->package, state->package); - - if(a->kind != INFOTYPE_CLASS) { - MULTINAME(m, a); - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - if(a->kind == INFOTYPE_METHOD) { - methodinfo_t*f = (methodinfo_t*)a; - (yyval.value).t = TYPE_FUNCTION(f); - } else { - varinfo_t*v = (varinfo_t*)a; - (yyval.value).t = v->type; - } - } else { - classinfo_t*c = (classinfo_t*)a; - if(c->slot) { - (yyval.value).c = abc_getglobalscope((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, c->slot); - } else { - MULTINAME(m, c); - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - } - (yyval.value).t = TYPE_CLASS(c); - } + (yyval.value) = push_class(a); + break; + } + + /* look through package prefixes */ + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id)) || + registry_ispackage((yyvsp[(1) - (1)].id))) { + (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); + (yyval.value).t = 0; break; } /* unknown object, let the avm2 resolve it */ if(1) { - as3_softwarning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); + //as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); state->method->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; @@ -7651,12 +7738,35 @@ yyreduce: + case 299: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3363 "parser.y" + { + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (2)].id); + n->url = (yyvsp[(2) - (2)].id); + (yyval.namespace_decl)=n; +} + } + break; + + + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3361 "parser.y" - {(yyval.code)=0;} +#line 3370 "parser.y" + { + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].id); + (yyval.namespace_decl)=n; +} } break; @@ -7666,8 +7776,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3362 "parser.y" - {(yyval.code)=0;} +#line 3377 "parser.y" + { + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].str).str; + (yyval.namespace_decl)=n; +} } break; @@ -7677,8 +7793,21 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3363 "parser.y" - {(yyval.code)=0;} +#line 3384 "parser.y" + { + PASS12 + trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); + + namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags)); + varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name); + var->type = TYPE_NAMESPACE; + namespace_t ns; + ns.access = ACCESS_NAMESPACE; + ns.name = (yyvsp[(2) - (2)].namespace_decl)->url; + var->value = constant_new_namespace(&ns); + + (yyval.code)=0; +} } break; @@ -7688,10 +7817,26 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3365 "parser.y" +#line 3408 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(3) - (3)].id)); + const char*url = (yyvsp[(3) - (3)].classinfo)->name; + + varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo); + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); + } + + if(!s || s->kind != INFOTYPE_SLOT) + syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1); + if(!s->value || !NS_TYPE(s->value->type)) + syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name); + url = s->value->ns->name; + + trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url); + add_active_url(url); (yyval.code)=0; } } @@ -7701,7 +7846,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7705 "parser.tab.c" +#line 7850 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);