X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=d2ed21d74201dba6078d5ab80bb90fec7a2630f3;hb=4da50aa69285c6f5abd97e41dd195648b8df49fe;hp=b9826cffafdb4b780f09c96e796815ce8c7f2c7d;hpb=a5b36820121471188e8418567cb8e0f4cba32c75;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index b9826cf..d2ed21d 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -189,42 +189,44 @@ extern int a3_lex(); KW_IS = 322, KW_IN = 323, KW_AS = 324, - T_EQEQ = 325, - T_EQEQEQ = 326, - T_NE = 327, - T_NEE = 328, - T_LE = 329, - T_GE = 330, - T_ORBY = 331, - T_DIVBY = 332, - T_MODBY = 333, - T_MULBY = 334, - T_PLUSBY = 335, - T_MINUSBY = 336, - T_SHRBY = 337, - T_SHLBY = 338, - T_USHRBY = 339, - T_OROR = 340, - T_ANDAND = 341, - T_COLONCOLON = 342, - T_MINUSMINUS = 343, - T_PLUSPLUS = 344, - T_DOTDOT = 345, - T_DOTDOTDOT = 346, - T_SHL = 347, - T_USHR = 348, - T_SHR = 349, - prec_none = 350, - below_semicolon = 351, - below_assignment = 352, - below_minus = 355, - minusminus_prefix = 356, - plusplus_prefix = 357, - below_curly = 358, - new2 = 359, - above_identifier = 360, - below_else = 361, - above_function = 362 + T_DICTSTART = 325, + T_EQEQ = 326, + T_EQEQEQ = 327, + T_NE = 328, + T_NEE = 329, + T_LE = 330, + T_GE = 331, + T_ORBY = 332, + T_DIVBY = 333, + T_MODBY = 334, + T_MULBY = 335, + T_PLUSBY = 336, + T_MINUSBY = 337, + T_XORBY = 338, + T_SHRBY = 339, + T_SHLBY = 340, + T_USHRBY = 341, + T_OROR = 342, + T_ANDAND = 343, + T_COLONCOLON = 344, + T_MINUSMINUS = 345, + T_PLUSPLUS = 346, + T_DOTDOT = 347, + T_DOTDOTDOT = 348, + T_SHL = 349, + T_USHR = 350, + T_SHR = 351, + prec_none = 352, + below_semicolon = 353, + below_assignment = 354, + below_minus = 356, + minusminus_prefix = 357, + plusplus_prefix = 358, + below_curly = 359, + new2 = 360, + above_identifier = 361, + below_else = 362, + above_function = 363 }; #endif @@ -241,10 +243,11 @@ tokenunion #line 44 "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; @@ -261,6 +264,8 @@ tokenunion for_start_t for_start; abc_exception_t *exception; regexp_t regexp; + modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -269,7 +274,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 273 "parser.tab.c" +#line 278 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -280,7 +285,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 257 "parser.y" +#line 265 "parser.y" static int a3_error(char*s) @@ -319,34 +324,52 @@ typedef struct _import { DECLARE_LIST(import); +DECLARE(methodstate); +DECLARE_LIST(methodstate); + typedef struct _classstate { /* class data */ classinfo_t*info; abc_class_t*abc; - code_t*init; - code_t*static_init; + + methodstate_t*init; + methodstate_t*static_init; + //code_t*init; + //code_t*static_init; + char has_constructor; } classstate_t; -DECLARE_LIST(methodstate); - -typedef struct _methodstate { +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; -} methodstate_t; +}; typedef struct _state { struct _state*old; @@ -354,7 +377,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 @@ -362,6 +389,8 @@ typedef struct _state { methodstate_t*method; char*exception_name; + + int switch_var; dict_t*vars; } state_t; @@ -388,12 +417,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; \ @@ -430,11 +461,20 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; state->vars = dict_new(); state->old = oldstate; + state->new_vars = 0; + + trie_remember(active_namespaces); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_has_imports() { @@ -442,6 +482,18 @@ static void state_has_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); +} static void state_destroy(state_t*state) { @@ -464,41 +516,51 @@ 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; } - if(leaving->cls && leaving->cls != state->cls) { + if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) { 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, char var0); + + static char* internal_filename_package = 0; void initialize_file(char*filename) { if(state) { syntaxerror("invalid call to initialize_file during parsing of another file"); } + + active_namespaces = trie_new(); + new_state(); state->package = internal_filename_package = strdup(filename); - state->method = rfx_calloc(sizeof(methodstate_t)); - state->method->variable_count = 1; - global->token2info = dict_lookup(global->file2token2info, current_filename // use long version ); @@ -506,6 +568,16 @@ void initialize_file(char*filename) global->token2info = dict_new2(&ptr_type); dict_put(global->file2token2info, current_filename, global->token2info); } + + if(as3_pass==1) { + state->method = rfx_calloc(sizeof(methodstate_t)); + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope + } else { + state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + function_initvars(state->method, 0, 0, 1); + global->init = abc_initscript(global->file); + } } void finish_file() @@ -513,10 +585,15 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } - free(state->method);state->method=0; - //free(state->package);state->package=0; // used in registry + if(as3_pass==2) { + 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; + free(state->method);state->method=0; + } + //free(state->package);state->package=0; // used in registry state_destroy(state);state=0; } @@ -527,23 +604,10 @@ void initialize_parser() global->file->flags &= ~ABCFILE_LAZY; global->file2token2info = dict_new(); global->token2info = 0; - - global->init = abc_initscript(global->file); - code_t*c = global->init->method->body->code; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - global->init->method->body->code = c; } void* finish_parser() { - code_t*c = global->init->method->body->code; - /*c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "[leaving global init function]"); - c = abc_callpropvoid(c, "[package]::trace", 1);*/ - c = abc_returnvoid(c); - global->init->method->body->code = c; - dict_free_all(global->file2token2info, 1, (void*)dict_destroy); global->token2info=0; @@ -581,59 +645,80 @@ static void xx_scopetest() 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); } code_t*defaultvalue(code_t*c, classinfo_t*type); -static int new_variable(const char*name, classinfo_t*type, char init) + +static int alloc_local() { + return state->method->variable_count++; +} + +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() { - variable_t*v = find_variable(TEMPVARNAME); + variable_t*v = find_variable(state, TEMPVARNAME); if(v) return v->index; - return new_variable(TEMPVARNAME, 0, 0); + return new_variable(TEMPVARNAME, 0, 0, 0); } code_t* var_block(code_t*body) @@ -680,6 +765,14 @@ code_t* var_block(code_t*body) return c; } +void unknown_variable(char*name) +{ + 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); +} + #define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} static void parsererror(const char*file, int line, const char*f) @@ -688,32 +781,76 @@ static void parsererror(const char*file, int line, const char*f) } -code_t* method_header() +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - code_t*c = 0; - if(state->method->late_binding && !state->method->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(state->method->innerfunctions) { - c = abc_newactivation(c); - c = abc_pushscope(c); - }*/ - if(state->method->is_constructor && !state->method->has_super) { - // call default constructor - c = abc_getlocal_0(c); - c = abc_constructsuper(c, 0); + 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); + } } - methodstate_list_t*l = state->method->innerfunctions; + 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; } - list_free(state->method->innerfunctions); - state->method->innerfunctions = 0; + if(m->header) { + c = code_append(c, m->header); + m->header = 0; + } + if(m->is_constructor && !m->has_super) { + // call default constructor + 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; } @@ -753,52 +890,150 @@ 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 memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +{ + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); +} + +void add_active_url(const char*url) +{ + NEW(namespace_t,n); + n->name = url; + list_append(state->active_namespace_urls, n); +} + +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); + if(index) + *(int*)0=0; + parserassert(!index); + } + + if(m->uses_slots) { + /* as variables and slots share the same number, make sure + that those variable indices are reserved. It's up to the + optimizer to later shuffle the variables down to lower + indices */ + m->variable_count = m->uses_slots; + } + + if(params) { + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; + } + } + if(m->uses_slots) { + dict_dump(m->slots, stdout, ""); + } + + methodstate_list_t*l = m->innerfunctions; + while(l) { + methodstate_t*m = l->methodstate; + + variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); + m->var_index = v->index; + m->slot_index = v->index; + v->is_inner_method = m; + + l = l->next; + } + + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + + if(as3_pass==2 && m->slots) { + /* exchange unresolved identifiers with the actual objects */ + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); + } + v->type = type; + } + } + } +} + 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(); - state->cls = rfx_calloc(sizeof(classstate_t)); + 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; @@ -807,9 +1042,18 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } if(as3_pass==1) { - state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor - state->method->variable_count = 1; - dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); + state->cls = rfx_calloc(sizeof(classstate_t)); + state->cls->init = rfx_calloc(sizeof(methodstate_t)); + state->cls->static_init = rfx_calloc(sizeof(methodstate_t)); + /* 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 */ + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls); + + /* set current method to constructor- all code within the class-level (except + static variable initializations) will be executed during construction time */ + state->method = state->cls->init; if(registry_find(package, classname)) { syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname); @@ -817,28 +1061,38 @@ 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) { - state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); - - state->cls->info = (classinfo_t*)registry_find(package, classname); - parserassert((int)state->cls->info); + state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + state->method = state->cls->init; + parserassert(state->cls && state->cls->info); + + 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); @@ -909,7 +1163,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 { @@ -919,6 +1173,23 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo } } +static int slotstate_varconst = 0; +static modifiers_t*slotstate_flags = 0; +static void setslotstate(modifiers_t* flags, int varconst) +{ + slotstate_varconst = varconst; + slotstate_flags = flags; + if(state->cls) { + if(flags && flags->flags&FLAG_STATIC) { + state->method = state->cls->static_init; + } else { + state->method = state->cls->init; + } + } else { + parserassert(state->method); + } +} + static void endclass() { if(as3_pass == 2) { @@ -926,23 +1197,23 @@ static void endclass() code_t*c = 0; c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); - state->cls->init = code_append(state->cls->init, c); - } - if(!state->method->late_binding) { - // class initialization code uses late binding - code_t*c = 0; - c = abc_getlocal_0(c); - c = abc_pushscope(c); - state->cls->static_init = code_append(c, state->cls->static_init); + state->cls->init->header = code_append(state->cls->init->header, c); + state->cls->has_constructor=1; } - if(state->cls->init) { - abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->init, m->body->code); + if(state->cls->info->flags&FLAG_INTERFACE) { + if(state->cls->init->header) + syntaxerror("interface can not have class-level code"); + } else { + abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0); + code_t*c = method_header(state->cls->init); + m->body->code = wrap_function(c, 0, m->body->code); + } } if(state->cls->static_init) { abc_method_t*m = abc_class_getstaticconstructor(state->cls->abc, 0); - m->body->code = wrap_function(0, state->cls->static_init, m->body->code); + code_t*c = method_header(state->cls->static_init); + m->body->code = wrap_function(c, 0, m->body->code); } } @@ -960,6 +1231,10 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + 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; } } @@ -967,6 +1242,7 @@ void check_code_for_break(code_t*c) static void check_constant_against_type(classinfo_t*t, constant_t*c) { + return; #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) if(TYPE_IS_NUMBER(t)) { xassert(c->type == CONSTANT_FLOAT @@ -974,7 +1250,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)) { @@ -995,12 +1271,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"); @@ -1010,22 +1289,25 @@ 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) { + printf("%s.%s | %s.%s\n", + m->package, m->name, + ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } - minfo = methodinfo_register_onclass(state->cls->info, 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; @@ -1033,12 +1315,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); @@ -1048,59 +1332,41 @@ 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; - return minfo; -} - -static void function_initvars(params_t*params, int flags) -{ - if(state->method->inner) - new_variable("this", 0, 0); - else if(!state->method->is_global) - new_variable((flags&FLAG_STATIC)?"class":"this", state->cls->info, 0); - else - new_variable("globalscope", 0, 0); + 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; - param_list_t*p=0; - for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0); - } - - methodstate_list_t*l = state->method->innerfunctions; - while(l) { - methodstate_t*m = l->methodstate; - m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0); - l = l->next; - } + return minfo; } static void innerfunction(char*name, params_t*params, classinfo_t*return_type) { - parserassert(state->method && state->method->info); + //parserassert(state->method && state->method->info); 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(); @@ -1113,35 +1379,41 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) state->method->abc = rfx_calloc(sizeof(abc_method_t)); NEW(methodinfo_t,minfo); + minfo->kind = INFOTYPE_METHOD; + minfo->access = ACCESS_PACKAGEINTERNAL; minfo->name = name; state->method->info = minfo; - list_append(parent_method->innerfunctions, state->method); + if(parent_method) + 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(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)); state->method->has_super = 0; - state->method->variable_count = 0; if(state->cls) { state->method->is_constructor = !strcmp(state->cls->info->name,name); @@ -1152,19 +1424,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) { @@ -1172,79 +1446,155 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n } state->method->info->return_type = return_type; - function_initvars(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"); + }*/ - 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}; + abc_method_t*f = 0; - 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 + 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(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; } - 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"); + //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"); + } } - } - check_code_for_break(body); + 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"); + /* 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; } - - old_state(); - return f; + + return 0; } char is_subtype_of(classinfo_t*type, classinfo_t*supertype) @@ -1346,8 +1696,11 @@ 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 + + as3_error("can't convert type %s%s%s to %s%s%s", + from->package, from->package?".":"", from->name, + to->package, to->package?".":"", to->name); + return c; } code_t*defaultvalue(code_t*c, classinfo_t*type) @@ -1375,7 +1728,37 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static const char* get_package_from_name(const char*name) +{ + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, name); + while(e) { + if(!strcmp(e->key, name)) { + slotinfo_t*c = (slotinfo_t*)e->data; + if(c) return c->package; + } + e = e->next; + } + return 0; +} +static namespace_list_t*get_current_imports() +{ + namespace_list_t*searchlist = 0; + + list_append(searchlist, namespace_new_package(state->package)); + + import_list_t*l = state->wildcard_imports; + while(l) { + namespace_t*ns = namespace_new_package(l->import->package); + list_append(searchlist, ns); + l = l->next; + } + list_append(searchlist, namespace_new_package("")); + list_append(searchlist, namespace_new_package(internal_filename_package)); + return searchlist; +} + +static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1412,6 +1795,43 @@ static slotinfo_t* find_class(char*name) return 0; } +typedcode_t push_class(slotinfo_t*a) +{ + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); + } else { + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; + } + } else { + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); + } else { + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); + } + x.t = TYPE_CLASS(c); + } + return x; +} static char is_getlocal(code_t*c) { @@ -1459,7 +1879,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } else { prefix = 0; } - + char use_temp_var = readbefore; /* generate the write instruction, and maybe append a dup to the prefix code */ @@ -1508,6 +1928,10 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETLOCAL_2; } else if(r->opcode == OPCODE_GETLOCAL_3) { write->opcode = OPCODE_SETLOCAL_3; + } else if(r->opcode == OPCODE_GETSUPER) { + write->opcode = OPCODE_SETSUPER; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); } else { code_dump(r); syntaxerror("illegal lvalue: can't assign a value to this expression"); @@ -1594,7 +2018,6 @@ char is_break_or_jump(code_t*c) return 0; } - #define IS_FINALLY_TARGET(op) \ ((op) == OPCODE___CONTINUE__ || \ (op) == OPCODE___BREAK__ || \ @@ -1702,10 +2125,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); } } @@ -1719,7 +2142,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1723 "parser.tab.c" +#line 2146 "parser.tab.c" #ifdef short # undef short @@ -1932,22 +2355,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 125 +#define YYFINAL 147 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3223 +#define YYLAST 3001 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 133 +#define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 109 +#define YYNNTS 114 /* YYNRULES -- Number of rules. */ -#define YYNRULES 301 +#define YYNRULES 309 /* YYNRULES -- Number of states. */ -#define YYNSTATES 512 +#define YYNSTATES 521 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 362 +#define YYMAXUTOK 363 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1958,16 +2381,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, 117, 2, 2, 2, 115, 107, 2, - 121, 132, 114, 112, 98, 111, 126, 113, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 104, 97, - 108, 100, 109, 103, 127, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 123, 2, 124, 106, 2, 2, 2, 2, 2, + 2, 124, 2, 125, 107, 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, 125, 105, 131, 116, 2, 2, 2, + 2, 2, 2, 126, 106, 132, 117, 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, @@ -1990,8 +2413,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, 99, 101, 102, 110, 118, 119, 120, 122, - 128, 129, 130 + 95, 96, 97, 98, 101, 103, 111, 119, 120, 121, + 123, 129, 130, 131 }; #if YYDEBUG @@ -2003,165 +2426,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, 89, 91, 93, 95, 97, 99, 101, 106, - 108, 112, 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, 448, 449, 452, 454, 456, 458, 460, 462, 464, - 466, 468, 470, 471, 473, 476, 481, 485, 487, 492, - 495, 497, 499, 500, 501, 514, 516, 517, 518, 529, - 531, 535, 537, 539, 541, 545, 547, 549, 551, 554, - 555, 556, 560, 561, 563, 565, 567, 570, 573, 574, - 579, 584, 589, 592, 594, 597, 599, 601, 605, 607, - 609, 611, 613, 615, 617, 619, 621, 623, 625, 627, - 629, 631, 633, 635, 637, 639, 641, 645, 649, 653, - 657, 661, 665, 669, 673, 677, 681, 684, 687, 691, - 695, 699, 703, 707, 711, 715, 719, 723, 727, 731, - 735, 739, 743, 747, 752, 755, 757, 761, 764, 769, - 773, 774, 776, 780, 786, 790, 794, 798, 802, 806, - 810, 814, 818, 822, 826, 830, 836, 839, 842, 845, - 848, 852, 855, 860, 866, 870, 876, 880, 882, 886, - 892, 898 + 275, 277, 280, 282, 283, 290, 293, 295, 300, 303, + 305, 307, 309, 313, 315, 316, 323, 324, 330, 333, + 338, 339, 341, 343, 346, 348, 350, 352, 354, 356, + 358, 360, 362, 364, 366, 367, 370, 371, 374, 375, + 378, 379, 389, 390, 399, 400, 402, 404, 407, 409, + 414, 416, 418, 420, 421, 423, 425, 428, 430, 433, + 442, 444, 446, 447, 452, 454, 458, 462, 463, 466, + 468, 470, 472, 474, 476, 478, 480, 482, 484, 485, + 487, 490, 495, 499, 501, 506, 509, 511, 513, 514, + 515, 528, 530, 531, 532, 543, 545, 549, 551, 553, + 555, 559, 561, 563, 565, 568, 569, 570, 574, 575, + 577, 579, 581, 584, 587, 588, 593, 598, 603, 606, + 608, 611, 613, 615, 619, 621, 623, 625, 627, 629, + 631, 633, 635, 637, 639, 641, 643, 645, 647, 649, + 651, 653, 655, 659, 663, 667, 671, 675, 679, 683, + 687, 691, 695, 698, 701, 705, 709, 713, 717, 721, + 725, 729, 733, 737, 741, 745, 749, 753, 757, 761, + 766, 769, 771, 775, 778, 783, 787, 788, 790, 794, + 800, 804, 808, 812, 816, 820, 824, 828, 832, 836, + 840, 844, 848, 854, 857, 860, 863, 866, 870, 873, + 878, 884, 888, 894, 898, 900, 903, 908, 913, 916 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, - 136, 137, -1, 184, -1, 196, -1, 194, -1, 212, - -1, 205, -1, 146, -1, 147, 125, 135, 131, -1, - 97, -1, -1, 139, -1, 140, -1, 139, 140, -1, - 196, -1, 194, -1, 212, -1, 205, -1, 146, -1, - 147, 125, 138, 131, -1, 97, -1, 142, -1, -1, - 142, 144, -1, 144, -1, 187, -1, 158, -1, 159, - -1, 160, -1, 162, -1, 170, -1, 153, -1, 181, - -1, 178, -1, 234, -1, 241, -1, 97, -1, 143, - -1, 149, -1, 164, -1, 165, -1, 231, -1, 180, - -1, 147, 125, 142, 131, -1, 240, -1, 125, 142, - 131, -1, 125, 131, -1, 144, 97, -1, 144, -1, - 143, -1, 3, 87, 3, -1, 100, 232, -1, -1, - 46, 150, -1, 32, 150, -1, 151, -1, 150, 98, - 151, -1, 3, 222, 148, -1, -1, 65, 145, -1, - -1, 64, 121, 154, 233, 132, 145, 152, -1, -1, - 149, -1, 234, -1, 46, 3, 222, -1, 3, -1, - 13, 121, -1, 13, 50, 121, -1, 157, 155, 97, - 233, 97, 234, 132, 145, -1, 157, 156, 68, 233, - 132, 145, -1, -1, 14, 121, 161, 233, 132, 145, - -1, -1, 15, 163, 145, 14, 121, 233, 132, -1, + 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, + 137, 138, -1, 186, -1, 198, -1, 196, -1, 217, + -1, 207, -1, 147, -1, 148, 126, 136, 132, -1, + 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, + 198, -1, 196, -1, 217, -1, 207, -1, 147, -1, + 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, + 143, 145, -1, 145, -1, 189, -1, 159, -1, 160, + -1, 161, -1, 163, -1, 171, -1, 154, -1, 183, + -1, 179, -1, 239, -1, 247, -1, 246, -1, 126, + 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, + 150, -1, 165, -1, 166, -1, 236, -1, 181, -1, + 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, + 144, -1, 3, 89, 3, -1, 102, 237, -1, -1, + 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, + 152, -1, 3, 227, 149, -1, -1, 65, 146, -1, + -1, 64, 122, 155, 238, 133, 146, 153, -1, -1, + 150, -1, 239, -1, 46, 3, 227, -1, 3, -1, + 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, + 238, 99, 239, 133, 146, -1, 158, 157, 68, 238, + 133, 146, -1, -1, 14, 122, 162, 238, 133, 146, + -1, -1, 15, 164, 146, 14, 122, 238, 133, -1, 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 167, -1, 169, -1, 167, 169, -1, 168, -1, - 167, 168, -1, 34, 235, 104, 141, -1, 62, 104, - 141, -1, -1, 16, 121, 171, 235, 132, 125, 166, - 131, -1, -1, 33, 121, 3, 222, 132, 173, 125, - 141, 131, -1, -1, 28, 125, 175, 141, 131, -1, - 172, -1, 176, 172, -1, 176, -1, 176, 174, -1, - 174, -1, -1, 52, 125, 179, 141, 131, 177, -1, - 37, 233, -1, 37, -1, 39, 121, 233, 132, 145, - -1, 3, -1, 19, -1, 183, 126, 182, -1, 182, - -1, -1, 19, 183, 125, 185, 138, 131, -1, -1, - 19, 125, 186, 138, 131, -1, 41, 218, -1, 41, - 183, 126, 114, -1, -1, 189, -1, 190, -1, 189, - 190, -1, 21, -1, 22, -1, 20, -1, 38, -1, - 47, -1, 49, -1, 48, -1, 26, -1, 24, -1, - 4, -1, -1, 54, 219, -1, -1, 54, 220, -1, - -1, 17, 220, -1, -1, 188, 31, 3, 191, 193, - 125, 195, 198, 131, -1, -1, 188, 44, 3, 192, - 125, 197, 201, 131, -1, -1, 199, -1, 200, -1, - 199, 200, -1, 97, -1, 147, 125, 198, 131, -1, - 205, -1, 212, -1, 143, -1, -1, 202, -1, 203, - -1, 202, 203, -1, 97, -1, 46, 3, -1, 188, - 27, 211, 3, 121, 208, 132, 222, -1, 46, -1, - 32, -1, 188, 204, 3, 222, 148, -1, -1, 100, - 207, -1, 10, -1, 8, -1, 9, -1, 12, -1, - 5, -1, 56, -1, 55, -1, 45, -1, 3, -1, - -1, 209, -1, 91, 210, -1, 209, 98, 91, 210, - -1, 209, 98, 210, -1, 210, -1, 3, 104, 221, - 206, -1, 3, 206, -1, 51, -1, 35, -1, -1, - -1, 188, 27, 211, 3, 121, 208, 132, 222, 125, - 213, 141, 131, -1, 3, -1, -1, -1, 27, 214, - 121, 208, 132, 222, 125, 216, 141, 131, -1, 3, - -1, 183, 126, 3, -1, 218, -1, 217, -1, 219, - -1, 220, 98, 219, -1, 219, -1, 114, -1, 36, - -1, 104, 221, -1, -1, -1, 121, 224, 132, -1, - -1, 225, -1, 226, -1, 232, -1, 225, 98, -1, - 226, 232, -1, -1, 25, 235, 227, 223, -1, 235, - 121, 224, 132, -1, 53, 121, 224, 132, -1, 63, - 235, -1, 42, -1, 42, 233, -1, 235, -1, 235, - -1, 233, 98, 235, -1, 233, -1, 215, -1, 236, - -1, 239, -1, 228, -1, 230, -1, 229, -1, 6, - -1, 10, -1, 11, -1, 8, -1, 9, -1, 12, - -1, 5, -1, 29, -1, 56, -1, 55, -1, 45, - -1, 235, 108, 235, -1, 235, 109, 235, -1, 235, - 74, 235, -1, 235, 75, 235, -1, 235, 70, 235, - -1, 235, 71, 235, -1, 235, 73, 235, -1, 235, - 72, 235, -1, 235, 85, 235, -1, 235, 86, 235, - -1, 117, 235, -1, 116, 235, -1, 235, 107, 235, - -1, 235, 106, 235, -1, 235, 105, 235, -1, 235, - 94, 235, -1, 235, 93, 235, -1, 235, 92, 235, - -1, 235, 113, 235, -1, 235, 115, 235, -1, 235, - 112, 235, -1, 235, 111, 235, -1, 235, 114, 235, - -1, 235, 68, 235, -1, 235, 69, 235, -1, 235, - 40, 235, -1, 235, 67, 235, -1, 43, 121, 235, - 132, -1, 36, 235, -1, 36, -1, 121, 233, 132, - -1, 111, 235, -1, 235, 123, 235, 124, -1, 123, - 224, 124, -1, -1, 238, -1, 232, 104, 232, -1, - 238, 98, 232, 104, 232, -1, 125, 237, 131, -1, - 235, 79, 235, -1, 235, 78, 235, -1, 235, 83, - 235, -1, 235, 82, 235, -1, 235, 84, 235, -1, - 235, 77, 235, -1, 235, 76, 235, -1, 235, 80, - 235, -1, 235, 81, 235, -1, 235, 100, 235, -1, - 235, 103, 235, 104, 235, -1, 235, 89, -1, 235, - 88, -1, 89, 235, -1, 88, 235, -1, 53, 126, - 3, -1, 127, 3, -1, 235, 126, 127, 3, -1, - 235, 126, 3, 87, 3, -1, 235, 90, 3, -1, - 235, 126, 121, 235, 132, -1, 235, 126, 3, -1, - 3, -1, 188, 18, 3, -1, 188, 18, 3, 100, - 3, -1, 188, 18, 3, 100, 5, -1, 23, 18, - 3, -1 + -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, + 168, 169, -1, 34, 240, 105, 142, -1, 62, 105, + 142, -1, -1, 16, 122, 172, 240, 133, 126, 167, + 132, -1, -1, 33, 122, 3, 227, 133, 174, 126, + 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, + 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, + 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, + 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, + 182, 146, -1, 3, -1, 19, -1, 4, -1, 185, + 127, 184, -1, 184, -1, -1, 19, 185, 126, 187, + 139, 132, -1, -1, 19, 126, 188, 139, 132, -1, + 41, 223, -1, 41, 185, 127, 115, -1, -1, 191, + -1, 192, -1, 191, 192, -1, 21, -1, 22, -1, + 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, + 26, -1, 24, -1, 4, -1, -1, 54, 224, -1, + -1, 54, 225, -1, -1, 17, 225, -1, -1, 190, + 31, 3, 193, 195, 126, 197, 200, 132, -1, -1, + 190, 44, 3, 194, 126, 199, 203, 132, -1, -1, + 201, -1, 202, -1, 201, 202, -1, 99, -1, 148, + 126, 200, 132, -1, 207, -1, 217, -1, 144, -1, + -1, 204, -1, 205, -1, 204, 205, -1, 99, -1, + 46, 3, -1, 190, 27, 216, 3, 122, 213, 133, + 227, -1, 46, -1, 32, -1, -1, 190, 206, 208, + 209, -1, 210, -1, 209, 100, 210, -1, 3, 227, + 149, -1, -1, 102, 212, -1, 10, -1, 8, -1, + 9, -1, 12, -1, 5, -1, 56, -1, 55, -1, + 45, -1, 3, -1, -1, 214, -1, 93, 215, -1, + 214, 100, 93, 215, -1, 214, 100, 215, -1, 215, + -1, 3, 105, 226, 211, -1, 3, 211, -1, 51, + -1, 35, -1, -1, -1, 190, 27, 216, 3, 122, + 213, 133, 227, 126, 218, 142, 132, -1, 3, -1, + -1, -1, 27, 219, 122, 213, 133, 227, 126, 221, + 142, 132, -1, 184, -1, 185, 127, 184, -1, 223, + -1, 222, -1, 224, -1, 225, 100, 224, -1, 224, + -1, 115, -1, 36, -1, 105, 226, -1, -1, -1, + 122, 229, 133, -1, -1, 230, -1, 231, -1, 237, + -1, 230, 100, -1, 231, 237, -1, -1, 25, 240, + 232, 228, -1, 240, 122, 229, 133, -1, 53, 122, + 229, 133, -1, 63, 240, -1, 42, -1, 42, 238, + -1, 240, -1, 240, -1, 238, 100, 240, -1, 238, + -1, 220, -1, 241, -1, 244, -1, 233, -1, 235, + -1, 234, -1, 6, -1, 10, -1, 11, -1, 8, + -1, 9, -1, 12, -1, 5, -1, 29, -1, 56, + -1, 55, -1, 45, -1, 240, 109, 240, -1, 240, + 110, 240, -1, 240, 75, 240, -1, 240, 76, 240, + -1, 240, 71, 240, -1, 240, 72, 240, -1, 240, + 74, 240, -1, 240, 73, 240, -1, 240, 87, 240, + -1, 240, 88, 240, -1, 118, 240, -1, 117, 240, + -1, 240, 108, 240, -1, 240, 107, 240, -1, 240, + 106, 240, -1, 240, 96, 240, -1, 240, 95, 240, + -1, 240, 94, 240, -1, 240, 114, 240, -1, 240, + 116, 240, -1, 240, 113, 240, -1, 240, 112, 240, + -1, 240, 115, 240, -1, 240, 68, 240, -1, 240, + 69, 240, -1, 240, 40, 240, -1, 240, 67, 240, + -1, 43, 122, 240, 133, -1, 36, 240, -1, 36, + -1, 122, 238, 133, -1, 112, 240, -1, 240, 124, + 240, 125, -1, 124, 229, 125, -1, -1, 243, -1, + 237, 105, 237, -1, 243, 100, 237, 105, 237, -1, + 70, 242, 132, -1, 240, 80, 240, -1, 240, 79, + 240, -1, 240, 85, 240, -1, 240, 84, 240, -1, + 240, 86, 240, -1, 240, 78, 240, -1, 240, 77, + 240, -1, 240, 83, 240, -1, 240, 81, 240, -1, + 240, 82, 240, -1, 240, 102, 240, -1, 240, 104, + 240, 105, 240, -1, 240, 91, -1, 240, 90, -1, + 91, 240, -1, 90, 240, -1, 53, 127, 3, -1, + 128, 3, -1, 240, 127, 128, 3, -1, 240, 127, + 3, 89, 3, -1, 240, 92, 3, -1, 240, 127, + 122, 240, 133, -1, 240, 127, 3, -1, 3, -1, + 18, 3, -1, 18, 3, 102, 3, -1, 18, 3, + 102, 5, -1, 190, 245, -1, 23, 18, 224, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1698, 1698, 1700, 1700, 1701, 1702, 1704, 1705, 1706, - 1707, 1708, 1709, 1710, 1711, 1713, 1713, 1714, 1715, 1717, - 1718, 1719, 1720, 1721, 1722, 1723, 1725, 1726, 1728, 1729, - 1732, 1733, 1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, - 1742, 1745, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1754, - 1756, 1757, 1758, 1759, 1763, 1770, 1774, 1775, 1779, 1780, - 1782, 1783, 1785, 1828, 1829, 1832, 1832, 1851, 1852, 1853, - 1856, 1859, 1863, 1864, 1866, 1886, 1929, 1929, 1948, 1948, - 1963, 1966, 1969, 1972, 1976, 1977, 1978, 1979, 1980, 1981, - 1983, 1994, 1997, 1997, 2026, 2026, 2046, 2046, 2063, 2064, - 2065, 2066, 2074, 2083, 2083, 2128, 2132, 2143, 2152, 2153, - 2155, 2156, 2158, 2158, 2160, 2160, 2163, 2177, 2193, 2194, - 2195, 2196, 2198, 2199, 2200, 2201, 2202, 2203, 2204, 2205, - 2206, 2207, 2209, 2210, 2212, 2213, 2215, 2216, 2220, 2218, - 2226, 2224, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, - 2241, 2247, 2248, 2249, 2250, 2251, 2252, 2255, 2268, 2268, - 2270, 2343, 2344, 2346, 2347, 2348, 2349, 2350, 2352, 2353, - 2354, 2355, 2364, 2368, 2374, 2380, 2388, 2393, 2399, 2407, - 2415, 2416, 2417, 2420, 2419, 2434, 2435, 2437, 2436, 2458, - 2467, 2480, 2481, 2483, 2484, 2486, 2487, 2488, 2497, 2498, - 2502, 2503, 2505, 2506, 2507, 2509, 2513, 2514, 2519, 2520, - 2556, 2602, 2623, 2644, 2647, 2654, 2655, 2656, 2662, 2668, - 2670, 2672, 2674, 2676, 2678, 2680, 2697, 2702, 2705, 2708, - 2711, 2714, 2717, 2720, 2723, 2726, 2730, 2733, 2736, 2739, - 2742, 2745, 2748, 2751, 2755, 2766, 2784, 2789, 2794, 2799, - 2804, 2809, 2813, 2817, 2822, 2826, 2830, 2839, 2848, 2858, - 2863, 2875, 2881, 2886, 2892, 2898, 2902, 2904, 2915, 2924, - 2931, 2932, 2934, 2940, 2949, 2956, 2968, 2974, 2980, 2986, - 2992, 2998, 3004, 3017, 3028, 3035, 3048, 3075, 3089, 3103, - 3117, 3132, 3139, 3146, 3153, 3160, 3171, 3205, 3307, 3308, - 3309, 3311 + 0, 2124, 2124, 2126, 2126, 2127, 2128, 2130, 2131, 2132, + 2133, 2134, 2135, 2136, 2137, 2139, 2139, 2140, 2141, 2143, + 2144, 2145, 2146, 2147, 2148, 2149, 2151, 2152, 2154, 2155, + 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167, + 2168, 2169, 2170, 2171, 2174, 2175, 2176, 2177, 2178, 2179, + 2180, 2181, 2185, 2186, 2190, 2197, 2201, 2202, 2206, 2207, + 2209, 2210, 2212, 2273, 2274, 2277, 2277, 2296, 2297, 2298, + 2303, 2307, 2312, 2313, 2315, 2335, 2383, 2383, 2402, 2402, + 2417, 2420, 2423, 2426, 2430, 2431, 2432, 2433, 2434, 2435, + 2437, 2448, 2451, 2451, 2482, 2482, 2507, 2507, 2523, 2524, + 2525, 2526, 2534, 2543, 2543, 2592, 2596, 2607, 2617, 2634, + 2635, 2636, 2638, 2639, 2641, 2641, 2643, 2643, 2646, 2660, + 2676, 2677, 2678, 2679, 2686, 2687, 2688, 2689, 2690, 2691, + 2692, 2693, 2694, 2695, 2699, 2700, 2702, 2703, 2705, 2706, + 2710, 2708, 2716, 2714, 2723, 2724, 2725, 2726, 2727, 2728, + 2729, 2730, 2732, 2738, 2739, 2740, 2741, 2742, 2743, 2746, + 2759, 2759, 2761, 2761, 2763, 2764, 2766, 2841, 2842, 2844, + 2845, 2846, 2847, 2848, 2850, 2851, 2852, 2853, 2865, 2869, + 2875, 2881, 2889, 2894, 2900, 2908, 2916, 2917, 2918, 2921, + 2920, 2937, 2938, 2940, 2939, 2963, 2982, 2996, 2997, 2999, + 3000, 3002, 3003, 3004, 3013, 3014, 3018, 3019, 3021, 3022, + 3023, 3025, 3029, 3030, 3035, 3036, 3072, 3118, 3139, 3160, + 3163, 3170, 3171, 3172, 3178, 3184, 3185, 3186, 3187, 3188, + 3190, 3192, 3209, 3214, 3217, 3220, 3223, 3226, 3229, 3232, + 3235, 3238, 3242, 3245, 3248, 3251, 3254, 3257, 3260, 3263, + 3267, 3278, 3296, 3301, 3306, 3311, 3316, 3321, 3325, 3329, + 3334, 3338, 3342, 3351, 3360, 3370, 3375, 3387, 3393, 3398, + 3404, 3410, 3414, 3416, 3427, 3436, 3443, 3444, 3446, 3452, + 3461, 3468, 3480, 3486, 3492, 3498, 3504, 3510, 3516, 3522, + 3535, 3546, 3553, 3566, 3593, 3607, 3621, 3635, 3650, 3657, + 3664, 3671, 3678, 3693, 3749, 3858, 3865, 3872, 3879, 3894 }; #endif @@ -2184,13 +2608,13 @@ static const char *const yytname[] = "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"", "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"", - "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", "\">=\"", "\"|=\"", - "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", "\">>=\"", "\"<<=\"", - "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"", - "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", "prec_none", "below_semicolon", - "';'", "','", "below_assignment", "'='", "\"&=\"", "\"^=\"", "'?'", - "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", "'-'", "'+'", - "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix", + "\"{ (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", @@ -2202,21 +2626,22 @@ static const char *const yytname[] = "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6", - "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH", - "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", - "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", + "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH_HEAD", + "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", + "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", - "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "MAYBESTATICCONSTANT", - "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", - "FUNCTION_DECLARATION", "$@12", "MAYBE_IDENTIFIER", "INNERFUNCTION", - "$@13", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", - "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", - "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", - "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", - "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST", - "EXPRPAIR_LIST", "VAR_READ", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST", + "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", + "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", + "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", + "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", + "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", + "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", + "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", + "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", + "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2234,48 +2659,48 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 59, 44, 352, - 61, 353, 354, 63, 58, 124, 94, 38, 60, 62, - 355, 45, 43, 47, 42, 37, 126, 33, 356, 357, - 358, 40, 359, 91, 93, 123, 46, 64, 360, 361, - 362, 125, 41 + 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 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 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, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 145, 145, 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, 182, - 183, 183, 185, 184, 186, 184, 187, 187, 188, 188, - 189, 189, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 191, 191, 192, 192, 193, 193, 195, 194, - 197, 196, 198, 198, 199, 199, 200, 200, 200, 200, - 200, 201, 201, 202, 202, 203, 203, 203, 204, 204, - 205, 206, 206, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 208, 208, 208, 208, 209, 209, 210, 210, - 211, 211, 211, 213, 212, 214, 214, 216, 215, 217, - 218, 219, 219, 220, 220, 221, 221, 221, 222, 222, - 223, 223, 224, 224, 224, 225, 226, 225, 227, 228, - 229, 229, 230, 231, 231, 232, 233, 233, 234, 235, - 235, 235, 235, 235, 235, 235, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 237, 237, 238, 238, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 239, 240, 240, - 240, 241 + 0, 134, 135, 136, 136, 137, 137, 138, 138, 138, + 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, + 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, + 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, + 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, + 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, + 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, + 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, + 178, 178, 178, 180, 179, 181, 181, 182, 183, 184, + 184, 184, 185, 185, 187, 186, 188, 186, 189, 189, + 190, 190, 191, 191, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 193, 193, 194, 194, 195, 195, + 197, 196, 199, 198, 200, 200, 201, 201, 202, 202, + 202, 202, 202, 203, 203, 204, 204, 205, 205, 205, + 206, 206, 208, 207, 209, 209, 210, 211, 211, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, + 213, 213, 214, 214, 215, 215, 216, 216, 216, 218, + 217, 219, 219, 221, 220, 222, 223, 224, 224, 225, + 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 231, 230, 232, 233, 234, 234, 235, 236, + 236, 237, 238, 238, 239, 240, 240, 240, 240, 240, + 240, 240, 241, 241, 241, 241, 241, 241, 241, 241, + 241, 241, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 242, 242, 243, 243, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 244, 245, 245, 245, 246, 247 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2285,33 +2710,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, 1, 1, 1, 1, 1, 1, 1, 4, 1, - 3, 2, 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, - 5, 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, 2, 1, 0, 6, 2, 1, 4, 2, 1, + 1, 1, 3, 1, 0, 6, 0, 5, 2, 4, + 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 0, 9, 0, 8, 0, 1, 1, 2, 1, 4, + 1, 1, 1, 0, 1, 1, 2, 1, 2, 8, + 1, 1, 0, 4, 1, 3, 3, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 2, 4, 3, 1, 4, 2, 1, 1, 0, 0, + 12, 1, 0, 0, 10, 1, 3, 1, 1, 1, + 3, 1, 1, 1, 2, 0, 0, 3, 0, 1, + 1, 1, 2, 2, 0, 4, 4, 4, 2, 1, + 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 2, 1, 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 4, 2, 1, 3, 2, 4, 3, - 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 5, 2, 2, 2, 2, - 3, 2, 4, 5, 3, 5, 3, 1, 3, 5, - 5, 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 @@ -2319,808 +2744,768 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 118, 297, 131, 231, 225, 228, 229, 226, 227, 230, - 0, 0, 78, 0, 0, 124, 122, 123, 0, 130, - 0, 129, 186, 232, 265, 125, 0, 0, 0, 235, - 126, 128, 127, 0, 0, 234, 233, 0, 0, 0, - 0, 14, 0, 0, 0, 0, 202, 270, 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, 219, 222, 224, 223, 218, 39, - 216, 220, 221, 40, 0, 0, 72, 76, 118, 92, - 108, 109, 114, 111, 0, 0, 297, 208, 185, 0, - 264, 0, 0, 116, 0, 103, 202, 0, 212, 65, - 289, 288, 267, 247, 246, 0, 0, 203, 204, 205, - 215, 0, 0, 271, 291, 1, 6, 118, 297, 0, - 0, 68, 0, 0, 69, 182, 0, 159, 0, 158, - 0, 121, 0, 0, 0, 0, 0, 0, 0, 0, + 120, 304, 133, 237, 231, 234, 235, 232, 233, 236, + 0, 0, 78, 0, 0, 126, 124, 125, 0, 132, + 0, 131, 192, 238, 271, 127, 0, 0, 0, 241, + 128, 130, 129, 0, 0, 240, 239, 0, 0, 276, + 0, 0, 14, 0, 0, 0, 0, 208, 120, 0, + 0, 2, 120, 5, 54, 12, 0, 36, 67, 31, + 32, 33, 34, 35, 38, 120, 37, 7, 30, 0, + 121, 122, 9, 8, 11, 10, 225, 228, 230, 229, + 224, 39, 222, 226, 227, 41, 40, 0, 0, 72, + 76, 120, 92, 109, 111, 110, 116, 113, 0, 0, + 304, 214, 191, 0, 270, 0, 0, 118, 0, 103, + 208, 0, 218, 65, 0, 221, 0, 277, 296, 295, + 273, 253, 252, 0, 0, 209, 210, 211, 82, 0, + 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, + 46, 47, 48, 50, 0, 49, 298, 1, 6, 120, + 304, 0, 68, 0, 0, 69, 53, 108, 0, 188, + 0, 161, 0, 160, 162, 308, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 287, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 202, 0, 0, 55, 73, 0, 82, 106, - 213, 0, 80, 41, 118, 42, 53, 0, 0, 43, - 44, 45, 47, 0, 46, 49, 0, 118, 112, 0, - 301, 200, 172, 0, 0, 0, 27, 0, 290, 0, - 266, 269, 206, 207, 0, 274, 0, 0, 199, 59, - 60, 199, 58, 0, 0, 181, 180, 0, 132, 134, - 199, 217, 261, 262, 259, 260, 240, 241, 243, 242, - 238, 239, 281, 280, 276, 275, 282, 283, 278, 277, - 279, 244, 245, 294, 253, 252, 251, 284, 0, 250, - 249, 248, 236, 237, 257, 256, 254, 258, 255, 0, - 0, 296, 0, 0, 0, 83, 105, 214, 81, 51, - 118, 29, 216, 52, 0, 118, 0, 0, 25, 0, - 118, 17, 23, 0, 20, 19, 22, 21, 118, 110, - 202, 209, 161, 0, 0, 173, 177, 118, 190, 117, - 263, 0, 26, 211, 0, 272, 0, 13, 0, 57, - 0, 57, 0, 0, 0, 0, 136, 0, 0, 57, - 0, 210, 268, 0, 0, 292, 118, 50, 28, 0, - 118, 298, 0, 115, 18, 118, 0, 0, 0, 0, - 179, 174, 199, 0, 107, 0, 118, 0, 189, 197, - 196, 0, 192, 191, 195, 198, 0, 62, 61, 0, - 118, 172, 133, 0, 0, 193, 135, 140, 160, 285, - 293, 295, 77, 0, 48, 0, 84, 0, 113, 201, - 171, 167, 164, 165, 163, 166, 170, 169, 168, 162, - 161, 0, 0, 176, 0, 0, 98, 102, 100, 104, - 63, 273, 0, 56, 0, 75, 0, 137, 138, 0, - 118, 79, 299, 300, 0, 0, 0, 85, 88, 86, - 24, 178, 187, 175, 96, 0, 99, 101, 118, 66, - 118, 199, 118, 194, 0, 155, 0, 0, 118, 153, - 0, 27, 93, 89, 87, 27, 27, 199, 64, 74, - 0, 146, 150, 0, 0, 0, 118, 144, 148, 149, - 156, 182, 141, 154, 27, 91, 0, 0, 0, 183, - 118, 139, 145, 0, 90, 188, 97, 94, 27, 0, - 0, 0, 0, 147, 172, 27, 184, 0, 0, 199, - 95, 157 + 294, 293, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 208, 0, + 0, 55, 73, 0, 0, 0, 120, 114, 0, 195, + 0, 198, 197, 309, 206, 178, 0, 0, 0, 27, + 0, 297, 0, 0, 280, 0, 272, 275, 212, 213, + 83, 205, 59, 60, 105, 220, 58, 81, 42, 28, + 120, 0, 205, 0, 0, 52, 305, 187, 186, 0, + 134, 136, 0, 223, 267, 268, 265, 266, 246, 247, + 249, 248, 244, 245, 287, 286, 282, 281, 289, 290, + 288, 284, 283, 285, 250, 251, 301, 259, 258, 257, + 291, 0, 256, 255, 254, 242, 243, 263, 262, 260, + 264, 261, 0, 0, 303, 0, 0, 0, 0, 0, + 25, 0, 120, 17, 23, 0, 20, 19, 22, 21, + 120, 112, 0, 208, 215, 167, 0, 0, 179, 183, + 107, 119, 196, 269, 0, 26, 217, 0, 278, 0, + 0, 57, 0, 120, 13, 57, 0, 0, 0, 0, + 0, 138, 0, 0, 205, 163, 164, 0, 216, 274, + 0, 0, 299, 120, 0, 0, 117, 18, 120, 0, + 0, 0, 0, 185, 180, 205, 0, 0, 120, 0, + 203, 202, 201, 204, 0, 62, 61, 51, 0, 120, + 306, 307, 178, 135, 0, 0, 199, 137, 142, 57, + 0, 292, 300, 302, 77, 0, 84, 0, 115, 207, + 177, 173, 170, 171, 169, 172, 176, 175, 174, 168, + 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, + 63, 279, 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, 49, 50, 51, 52, 299, 300, 301, 321, 322, - 195, 291, 197, 302, 198, 377, 199, 232, 230, 449, - 56, 219, 132, 133, 57, 58, 59, 60, 187, 61, - 88, 200, 201, 436, 437, 438, 439, 62, 206, 416, - 501, 417, 466, 418, 419, 63, 216, 202, 64, 93, - 371, 65, 308, 207, 66, 203, 68, 69, 336, 338, - 384, 304, 452, 305, 430, 475, 476, 477, 457, 458, - 459, 140, 306, 360, 409, 314, 315, 316, 237, 307, - 498, 99, 74, 465, 372, 373, 374, 386, 375, 329, - 311, 116, 117, 118, 211, 75, 76, 77, 204, 119, - 78, 79, 80, 81, 122, 123, 82, 205, 83 + -1, 50, 51, 52, 53, 311, 312, 313, 334, 335, + 137, 138, 157, 314, 139, 385, 140, 246, 243, 458, + 57, 232, 153, 154, 58, 59, 60, 61, 213, 62, + 91, 141, 142, 445, 446, 447, 448, 63, 215, 426, + 510, 427, 475, 428, 429, 64, 229, 143, 65, 66, + 219, 220, 67, 320, 216, 68, 144, 70, 71, 351, + 353, 395, 316, 461, 317, 439, 484, 485, 486, 466, + 467, 468, 164, 318, 262, 355, 356, 373, 419, 327, + 328, 329, 259, 319, 507, 103, 76, 474, 221, 222, + 382, 397, 383, 341, 324, 124, 125, 126, 224, 77, + 78, 79, 145, 127, 80, 81, 82, 83, 116, 117, + 84, 165, 85, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -348 +#define YYPACT_NINF -403 static const yytype_int16 yypact[] = { - 1656, -44, -348, -348, -348, -348, -348, -348, -348, -348, - -31, -41, -348, -30, 7, -348, -348, -348, 82, -348, - 2221, -348, 100, -348, 336, -348, -1, 19, 13, -348, - -348, -348, -348, -2, -77, -348, -348, 2221, 38, 2221, - 2221, -348, 2221, 2221, 2221, 2221, 2221, 2221, 179, 196, - -348, 495, -348, -348, -348, 78, -348, 2128, -348, -348, - -348, -348, -348, -348, -348, -348, -348, 166, 240, -348, - -348, -348, -348, -348, -348, -348, -348, -348, 115, -348, - 2736, -348, -348, -348, 213, 102, -348, -348, 1906, -348, - -348, -348, -348, -348, -102, 222, -348, -4, -348, 109, - -25, 2221, 110, -348, 2221, -348, 2221, 237, -25, -348, - -25, -25, 305, -25, -25, -56, 118, 145, 2221, -348, - 2736, 141, 116, 150, -348, -348, -348, 1011, 181, 247, - 248, -348, 155, 190, -348, -10, 253, -348, 260, -348, - 262, -348, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, -348, -348, 266, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, 2221, - 2221, 2221, 2221, 2221, 64, -348, -348, 2221, 273, 2221, - 2221, 247, 281, -348, 624, -348, 189, 271, 167, -348, - -348, -348, -348, 275, -348, -348, 2221, 1140, -348, 19, - -348, 173, 24, -38, 66, 2282, 1781, 163, -348, 2221, - -348, -348, -348, -348, 2221, -348, 2221, 165, 193, 200, - -348, 193, 200, 2221, 2221, -348, -348, 296, 252, 259, - 193, 2736, 998, 487, 487, 487, 3097, 3097, 3097, 3097, - 998, 998, 2736, 2736, 2736, 2736, 2736, 2736, 2736, 2736, - 2736, 2797, 2857, -348, 287, 287, 287, 2736, 2492, 2917, - 2977, 3037, 998, 998, 305, 305, -25, -25, -25, 175, - 2553, 227, 2221, 312, -28, -348, 115, 115, -348, -348, - 753, -348, 2614, -348, 195, 2031, 314, 2352, -348, 187, - 1269, -348, -348, 194, -348, -348, -348, -348, 1140, -348, - 2221, -348, 131, 317, 191, 223, -348, 1906, 198, -348, - -348, 197, 1781, -348, -27, -348, 218, -348, 12, 226, - 247, -39, 135, -14, 208, 89, 315, 89, 209, 226, - 2221, -348, -348, 332, 2422, -348, 1906, -348, -348, 2221, - 882, 236, 212, -348, -348, 1140, 207, 211, 69, 12, - -348, -348, 193, 25, -348, 60, 1906, 2221, 198, -348, - -348, 224, -348, -348, -348, -348, 2221, -348, -348, 2221, - 1906, 24, -348, 89, 228, -348, 251, -348, -348, 2736, - -348, -348, -348, -11, -348, 178, 11, 220, -348, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - 258, 234, 317, -348, 241, 231, -348, -348, 60, -348, - 297, -348, 202, -348, 235, -348, 238, 251, -348, 89, - 180, -348, -348, -348, 2221, 264, 242, 11, -348, -348, - -348, -348, -348, -348, -348, 368, -348, -348, 1906, -348, - 1906, 193, 1398, -348, 375, -348, 352, 249, 233, -348, - 2675, 1781, -348, -348, -348, 1781, 1781, 193, -348, -348, - 257, -348, -348, 261, 188, 254, 1527, -348, -348, -348, - -348, -10, -348, -348, 1781, -348, 256, 265, 272, -348, - 1398, -348, -348, 380, -348, -348, -348, -348, 1781, 274, - 263, 278, 276, -348, 24, 1781, -348, 277, 280, 193, - -348, -348 + 1674, -70, -403, -403, -403, -403, -403, -403, -403, -403, + -15, -72, -403, -52, 19, -403, -403, -403, 80, -403, + 2094, -403, 99, -403, 2164, -403, -16, 42, -5, -403, + -403, -403, -403, -1, 5, -403, -403, 2094, 13, 2094, + 2094, 2094, -403, 2094, 2094, 2094, 2094, 2094, 634, 123, + 128, -403, 504, -403, -403, -403, 8, -403, 2024, -403, + -403, -403, -403, -403, -403, 1926, -403, -403, -403, 240, + 361, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 38, -403, 2569, -403, -403, -403, -403, 137, 20, -403, + -403, 1926, -403, -403, -403, -403, -403, -403, -87, 42, + -403, -67, -403, 21, -48, 2094, 79, -403, 2094, -403, + 2094, 138, -48, -403, 43, 2569, 76, 107, -48, -48, + 604, -48, -48, -29, 84, 110, 2094, -403, 210, 211, + 2094, 2094, 211, 212, -403, -403, 764, -403, -403, 85, + -403, -403, -403, -403, 209, -403, -403, -403, -403, 1024, + 158, 232, -403, 139, 171, -403, 141, -403, 238, 12, + 239, -403, 247, -403, -403, -403, -403, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + -403, -403, 249, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, + 11, -403, -403, 2094, 229, 2094, 1154, -403, 42, 133, + 135, -403, -403, -403, 142, 15, -10, 90, 2189, 1800, + 130, -403, 2094, 2094, -403, 2094, -403, -403, -403, -403, + -403, 161, 169, -403, 38, 38, 169, -403, -403, -403, + 1926, 149, 161, 2094, 2094, -403, 168, -403, -403, 280, + 231, 233, 286, 2569, 1016, 496, 496, 496, 322, 322, + 322, 322, 1016, 1016, 2569, 2569, 2569, 2569, 2569, 2569, + 2569, 2569, 2569, 2569, 2630, 2691, -403, 368, 368, 368, + 2569, 2386, 2752, 2813, 2874, 1016, 1016, 604, 604, -48, + -48, -48, 157, 2447, 202, 2094, 291, 14, 173, 2260, + -403, 165, 1284, -403, -403, 172, -403, -403, -403, -403, + 1154, -403, 42, 2094, -403, -43, 296, 167, 201, -403, + -403, -403, 175, -403, 174, 1800, -403, 44, -403, 200, + 63, 207, 211, 894, -403, -27, -11, 46, 113, 189, + 42, 298, 42, 190, 161, 217, -403, 2094, -403, -403, + 315, 2323, -403, 1926, 2094, 193, -403, -403, 1154, 192, + 194, 75, 63, -403, -403, 161, 26, 96, 1926, 2094, + -403, -403, -403, -403, 2094, -403, -403, -403, 2094, 1926, + -403, -403, 15, -403, 42, 199, -403, 230, -403, 207, + 286, 2569, -403, -403, -403, 103, 24, 197, -403, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + 234, 205, 296, -403, 206, 213, -403, -403, 96, -403, + 268, -403, -403, 204, -403, 215, 230, -403, 42, 208, + -403, -403, -403, 2094, 236, 214, 24, -403, -403, -403, + -403, -403, -403, -403, 335, -403, -403, 1926, -403, 1926, + 161, 1414, -403, 339, -403, 316, 219, 227, -403, 2508, + 1800, -403, -403, -403, 1800, 1800, 161, -403, -403, 223, + -403, -403, 226, 250, 221, 1544, -403, -403, -403, -403, + 12, -403, -403, 1800, -403, 222, 224, 225, -403, 1414, + -403, -403, 354, -403, -403, -403, -403, 1800, 228, 241, + 235, 243, -403, 15, 1800, -403, 244, 246, 161, -403, + -403 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -348, -348, 270, -348, 337, -287, -348, 90, -193, -178, - 1, -76, -271, 6, 2, 67, 355, 285, 85, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - -348, -348, -348, -348, -348, -21, -20, -348, -348, 14, - -348, 15, -348, -348, -348, -348, -348, -348, -348, -200, - 75, -348, -348, -348, -348, 0, -348, 353, -348, -348, - -348, 59, -348, 62, -348, -68, -348, -53, -348, -348, - -29, -348, 3, 26, -348, -347, -348, -305, -47, 4, - -348, -348, -348, -348, -348, 408, -317, 54, 79, -184, - -348, -99, -348, -348, -348, -348, -348, -348, -348, -36, - 5, -52, -7, -348, -348, -348, -348, -348, -348 + -403, -403, 218, -403, 312, -299, -403, 61, -402, -31, + 1, -55, -85, 48, 2, -23, 321, 251, 58, -403, + -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, + -403, -403, -403, -403, -403, -62, -60, -403, -403, -40, + -403, -36, -403, -403, -403, -403, -403, -403, -403, -403, + 6, 50, -403, -403, -403, -403, 0, -403, 331, -403, + -403, -403, 49, -403, 51, -403, -96, -403, -80, -403, + -403, -61, -403, 3, -403, -403, 7, 9, -403, -376, + -403, -311, -79, 4, -403, -403, -403, -403, -403, 388, + -91, 25, 52, -239, -403, -98, -403, -403, -403, -403, + -403, -403, -403, -34, -9, -49, -13, -403, -403, -403, + -403, -403, -403, -403 }; /* 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 -216 +#define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 67, 53, 55, 72, 73, 134, 54, 217, 361, 309, - 90, 121, 196, 97, 309, 368, 290, 100, 382, 85, - 385, 356, 90, 208, 209, 235, 91, 312, 312, -70, - 108, 91, 110, 111, 426, 112, 113, 114, 91, 120, - 120, 236, 142, 84, 106, 434, 364, 331, 369, 107, - 115, 67, 53, 55, 72, 73, 339, 54, 413, 70, - 142, 376, 71, 164, 165, 166, 385, 281, 397, 318, - 142, 142, 400, 435, 401, 392, 220, 402, 403, 404, - 87, 405, 223, 279, 142, 91, 166, 142, 414, 94, - 86, 89, 368, 415, 317, 420, 182, 215, 183, 120, - 95, 184, 102, 98, 346, 366, 213, 443, 91, 425, - 70, 120, 453, 71, 406, 313, 412, 350, 380, 183, - 101, 431, 184, 105, 407, 408, 370, 67, 53, 55, - 72, 73, 92, 54, 104, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 507, 121, 109, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 120, 280, 468, 411, 469, - 319, 432, 124, 433, 2, 282, 70, 292, 325, 71, - 326, 283, 284, 135, 286, 287, 125, 136, 137, 297, - 15, 16, 17, 127, 19, 318, 21, 67, 53, 303, - 138, 357, 139, 142, 348, 135, 185, 120, 25, 120, - 137, 91, 309, 186, 324, 210, 454, 30, 31, 32, - 212, 358, 379, 142, 139, 359, 214, 2, 332, 333, - 218, 196, 221, 222, 2, 224, 348, 225, 226, -71, - 228, 231, 233, 15, 16, 17, 238, 19, 234, 21, - 15, 16, 17, 239, 19, 240, 21, 470, 485, 263, - 196, 25, 486, 487, 348, 344, 285, 455, 25, 454, - 30, 31, 32, 488, 288, 294, 293, 30, 31, 32, - 196, 494, 295, 296, 310, 323, 327, 328, 330, 334, - 67, 53, 303, 120, 196, 502, 335, 341, 67, 53, - 303, -151, 508, 337, 343, 345, 349, 351, 353, 355, - 312, 363, 367, 362, -108, 511, 376, 424, 365, 381, - 455, 421, 383, 389, 387, 390, 395, 396, 398, 96, - 423, 3, 4, 399, 5, 6, 7, 8, 9, 429, - 422, 440, 445, 428, 393, 67, 53, 303, 358, 442, - 120, 20, 448, 22, -152, 23, 444, 450, 461, 120, - 451, 467, 196, 462, 196, 164, 165, 166, 480, 481, - 482, 29, 489, 500, 504, 491, 490, 495, 126, 34, - 354, 35, 36, 164, 165, 166, 496, 227, 177, 178, - 179, 180, 181, 505, 497, 503, 388, 506, 182, 509, - 183, 510, 131, 184, 229, 378, 463, 464, 179, 180, - 181, 141, 499, 492, 39, 40, 182, 460, 183, 483, - 456, 184, 446, 447, 493, 103, 441, 427, 410, 0, + 69, 54, 56, 74, 75, 114, 214, 101, 223, 155, + 156, 104, 230, 345, 304, 374, 435, 136, 325, 87, + 97, 369, 93, 94, 112, 192, 115, 118, 119, 325, + 120, 121, 122, 97, 115, 88, 156, 123, 95, 217, + 218, -70, 190, 191, 192, 93, 94, 257, 55, 72, + 90, 73, 69, 54, 56, 74, 75, 209, 443, 371, + 210, 95, 372, 258, 98, 423, 93, 94, 494, 407, + 92, 167, 495, 496, 208, 384, 209, 106, 410, 210, + 411, 249, 95, 412, 413, 414, 444, 415, 388, 167, + 167, 503, 239, 93, 94, 228, 226, 115, 99, 380, + 55, 72, 102, 73, 236, 511, 105, 89, 326, 95, + 302, 452, 517, 115, 167, 399, 390, 108, 391, 422, + 416, 244, 245, 330, 424, 109, 146, 110, 147, 425, + 417, 418, 111, 305, 149, 113, 421, 516, 167, 306, + 211, 231, 212, 225, 167, 96, 167, 363, 233, 69, + 54, 56, 74, 75, 263, 264, 265, 266, 267, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 378, 381, 389, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 115, 303, 55, 72, 338, + 73, 339, 309, 167, 307, 331, 227, 235, 234, 237, + 238, 250, 2, 240, 241, 247, 69, 54, 315, 343, + 115, 479, 115, 337, 321, 370, -71, 158, 15, 16, + 17, 2, 19, 332, 21, 252, 442, 497, 253, 254, + 255, 256, 260, 308, 346, 347, 25, 15, 16, 17, + 261, 19, 286, 21, 463, 30, 31, 32, 158, 393, + -113, 396, 322, 336, 323, 25, 340, 159, 158, 342, + 348, 160, 161, 463, 30, 31, 32, 159, 404, 520, + 249, 344, 161, 349, 162, 350, 163, 352, 249, 354, + 358, 360, 361, 430, 362, 364, 163, 366, 368, 325, + 375, 376, -112, 396, 434, 379, 377, 464, 156, 384, + 115, 392, 69, 54, 315, 394, 398, 400, 402, 406, + 69, 54, 315, 156, 408, 437, 464, 409, 332, 449, + 438, 451, 453, 457, 156, 454, 371, 459, 476, 433, + -153, 470, 489, 490, 401, 431, 471, 462, 460, 498, + 432, 491, 499, 500, 504, 405, 505, 509, 506, -154, + 512, 514, 168, 513, 148, 2, 115, 251, 69, 54, + 315, 115, 477, 367, 478, 515, 440, 518, 519, 152, + 242, 15, 16, 17, 472, 19, 473, 21, 455, 169, + 170, 171, 456, -155, -155, -155, -155, 176, 177, 25, + 386, 166, 156, 508, 156, 501, 492, 441, 30, 31, + 32, 502, 190, 191, 192, 107, 193, 194, 195, 436, + 0, 0, 0, 0, 420, 0, 0, 0, 0, 450, + 469, 201, 202, 0, 203, 204, 205, 206, 207, 465, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 0, 0, 0, 0, 0, 0, 0, 0, 190, 191, + 192, 483, 481, 482, 487, 488, 0, 465, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 474, 472, 473, 478, 479, 45, 456, 46, - 0, 47, 0, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 474, 472, 473, 478, - 479, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 474, 472, 473, 478, 479, -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, 143, 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, -216, -216, -216, 0, 37, 38, - 0, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 39, 40, 0, 0, 0, 0, 0, - 0, 0, 41, 0, 0, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 42, 0, 182, 0, - 183, 43, 44, 184, 0, 0, 45, 0, 46, 0, - 47, 0, 48, 0, 0, 0, -4, 1, 2, 3, + 203, 204, 205, 206, 207, 483, 481, 482, 487, 488, + 208, 0, 209, 0, 0, 210, 0, 0, 0, 483, + 481, 482, 487, 488, -4, 0, 0, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 168, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, -155, -155, -155, 0, 37, 38, 0, + 0, 176, 177, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -4, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 188, 0, 129, 0, 0, 0, - 24, 189, 25, 26, 0, 27, 190, 28, 0, 29, - 191, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 190, 191, 192, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 205, 206, + 207, 0, 0, 0, 40, 41, 208, 0, 209, 0, + 0, 210, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 135, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 192, 0, 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, 193, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, - 43, 44, 0, 0, 0, 45, 0, 46, 0, 47, - 0, 48, 0, 0, 0, 289, 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, 188, 0, 129, 0, 0, 0, 24, - 189, 25, 26, 0, 27, 190, 28, 0, 29, 191, - 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 37, 38, 0, 192, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, - 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, - 44, 0, 0, 0, 45, 0, 46, 0, 47, 0, - 48, 0, 0, 0, 347, 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, 188, 0, 129, 0, 0, 0, 24, 189, - 25, 26, 0, 27, 190, 28, 0, 29, 191, 30, - 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, - 0, 0, 0, 0, 0, 37, 38, 0, 192, 0, - 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, 193, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 0, 0, 0, 43, 44, - 0, 0, 0, 45, 0, 46, 0, 47, 0, 48, - 0, 0, 0, 394, 1, 2, 3, 4, 0, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, - 14, 15, 16, 17, 18, 19, 20, 21, -216, 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, -216, -216, 37, 38, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 164, 165, 166, 0, - 167, 168, 169, 0, 0, 0, 0, 0, 0, 39, - 40, 0, 0, 0, 0, 0, -216, -216, 41, 177, - 178, 179, 180, 181, 0, 0, 0, 0, 0, 182, - 0, 183, 42, 0, 184, 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, 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, - 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, 298, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 248, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, + 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, + 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 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, 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, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, 387, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, -155, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, -155, -155, 0, 39, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, -155, -155, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, + 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -3, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 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, 298, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -15, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 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, 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, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -16, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, - 0, 0, 0, 0, 0, 471, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, - 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, - 0, 46, 0, 47, 0, 48, 0, 0, 0, -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, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, 0, 0, -144, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, - 0, 0, 0, 0, 471, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, - 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, - 46, 0, 47, 0, 48, 0, -3, 0, -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, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 480, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 0, -3, 0, -145, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, + 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, + 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, - 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, - 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, - 0, 47, 0, 48, 1, 2, 3, 4, 0, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 0, -118, - 0, 15, 16, 17, 18, 19, 20, 21, 22, 0, - 23, 188, 0, 129, 0, 0, 0, 24, 189, 25, - 26, 0, 27, 190, 28, 0, 29, 191, 30, 31, - 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 192, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, + 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, + 48, 0, 49, 1, 2, 3, 4, 0, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 0, -120, 0, + 15, 16, 17, 18, 19, 20, 21, 22, 0, 23, + 128, 0, 129, 0, 0, 0, 24, 130, 25, 26, + 0, 27, 131, 28, 0, 29, 132, 30, 31, 32, + 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, + 0, 0, 0, 37, 38, 0, 133, 0, 0, 0, + 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 193, 0, + 40, 41, 0, 0, 0, 0, 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, - 0, 0, 45, 0, 46, 0, 47, 0, 48, 1, + 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, 188, 0, 129, 0, - 0, 0, 24, 189, 25, 26, 0, 27, 190, 28, - 0, 29, 191, 30, 31, 32, 0, 0, 33, 34, + 19, 20, 21, 22, 0, 23, 128, 0, 129, 0, + 0, 0, 24, 130, 25, 26, 0, 27, 131, 28, + 0, 29, 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 192, 0, 0, 0, 0, 0, 0, 0, + 38, 0, 133, 0, 0, 0, 39, 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, 193, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, - 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, - 0, 194, 0, 48, 1, 2, 3, 4, 0, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, - 0, 15, 16, 17, 18, 19, 20, 21, 22, 0, - 23, 188, 0, 129, 0, 0, 0, 24, 189, 25, - 26, 0, 27, 190, 28, 0, 29, 191, 30, 31, - 32, 0, 0, 33, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 38, 0, 192, 0, 0, + 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, + 0, 0, 0, 0, 0, 134, 0, 150, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 43, 0, + 0, 0, 0, 44, 45, 0, 0, 0, 46, 20, + 47, 22, 48, 23, 49, 0, 129, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 0, 28, 0, 29, + 151, 0, 0, 0, 0, 0, 0, 34, 0, 35, + 36, 0, 0, 0, 0, 0, 0, 37, 0, 0, + 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, + 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 43, 28, 0, 29, + 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, + 36, 0, 49, 0, 0, 0, 0, 37, 0, 0, + 0, 0, 0, 0, 39, 0, 0, 100, 0, 3, + 4, 0, 5, 6, 7, 8, 9, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 0, 0, 0, 20, + 0, 22, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 43, 0, 0, 29, + 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, + 36, 0, 49, 0, 0, 0, 0, 0, 0, 168, + 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 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, 193, 0, - 0, 128, 0, 3, 4, 0, 5, 6, 7, 8, - 9, 0, 42, 0, 0, 0, 0, 43, 44, 0, - 0, 0, 45, 20, 46, 22, 47, 23, 48, 0, - 129, 0, 0, 0, 24, 0, 0, 0, 0, 0, - 0, 28, 0, 29, 130, 0, 0, 0, 0, 0, - 0, 34, 0, 35, 36, 0, 0, 0, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 40, 41, 169, 170, 171, 0, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 46, 0, 47, 0, + 0, 196, 49, 197, 0, 198, 199, 200, 201, 202, + 168, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 0, 0, 0, + 0, 0, 333, 0, 0, 0, 0, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 0, 196, 168, 197, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 0, 0, + 169, 170, 171, 365, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 0, 196, 168, 197, 0, 198, + 199, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 0, 0, 169, 170, 171, 403, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 0, 190, 191, 192, 0, + 193, 194, 195, 0, 0, 0, 0, 168, 196, 0, + 197, 357, 198, 199, 200, 201, 202, 0, 203, 204, + 205, 206, 207, 0, 0, 0, 0, 0, 208, 0, + 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 0, 190, 191, 192, + 0, 193, 194, 195, 0, 0, 0, 0, 168, 196, + 0, 197, 0, 198, 199, 200, 201, 202, 0, 203, + 204, 205, 206, 207, 0, 0, 0, 0, 0, 208, + 0, 209, 359, 0, 210, 169, 170, 171, 0, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 0, 190, 191, + 192, 0, 193, 194, 195, 0, 0, 0, 0, 168, + 196, 0, 197, 493, 198, 199, 200, 201, 202, 0, + 203, 204, 205, 206, 207, 0, 0, 0, 0, 0, + 208, 0, 209, 0, 0, 210, 169, 170, 171, 0, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 0, 190, + 191, 192, 0, 193, 194, 195, 0, 0, 0, 0, + 168, 196, 0, 197, 0, 198, 199, 200, 201, 202, + 0, 203, 204, 205, 206, 207, 0, 0, 0, 0, + 0, 208, 0, 209, 0, 0, 210, 169, 170, 171, + 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, + 190, 191, 192, 0, 193, 194, 195, 0, 0, 0, + 0, 168, 0, 0, 0, 0, 198, 199, 200, 201, + 202, 0, 203, 204, 205, 206, 207, 0, 0, 0, + 0, 0, 208, 0, 209, 0, 0, 210, 169, 170, + 171, 0, 172, 173, 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, - 0, 0, 0, 0, 96, 0, 3, 4, 0, 5, - 6, 7, 8, 9, 0, 0, 0, 0, 0, 42, - 0, 0, 0, 0, 43, 44, 20, 0, 22, 45, - 23, 46, 0, 47, 0, 48, 0, 24, 0, 0, - 0, 0, 0, 0, 28, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 34, 0, 35, 36, 0, 0, - 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, + 0, 190, 191, 192, 0, 193, 194, 195, 0, 0, + 0, 0, 168, 0, 0, 0, 0, 198, 199, 200, + 201, 202, 0, 203, 204, 205, 206, 207, 0, 0, + 0, 0, 0, 208, 0, 209, 0, 0, 210, 169, + 170, 171, 0, 172, 173, 174, 175, 176, 177, 0, 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, 0, 0, - 0, 0, 143, 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, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 320, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 352, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 0, 0, 171, 0, 172, 173, 174, - 175, 176, 143, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 0, 0, 0, 0, 391, 0, 0, 0, 0, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 0, - 164, 165, 166, 0, 167, 168, 169, 0, 0, 0, - 0, 0, 170, 143, 0, 171, 340, 172, 173, 174, - 175, 176, 0, 177, 178, 179, 180, 181, 0, 0, - 0, 0, 0, 182, 0, 183, 0, 0, 184, 0, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 0, 164, 165, 166, 0, 167, 168, 169, 0, 0, - 0, 0, 0, 170, 143, 0, 171, 0, 172, 173, - 174, 175, 176, 0, 177, 178, 179, 180, 181, 0, - 0, 0, 0, 0, 182, 0, 183, 342, 0, 184, - 0, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 0, 164, 165, 166, 0, 167, 168, 169, 0, - 0, 0, 0, 0, 170, 143, 0, 171, -215, 172, - 173, 174, 175, 176, 0, 177, 178, 179, 180, 181, - 0, 0, 0, 0, 0, 182, 0, 183, 0, 0, - 184, 0, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 0, 164, 165, 166, 0, 167, 168, 169, - 0, 0, 0, 0, 0, 170, 143, 0, 171, 484, - 172, 173, 174, 175, 176, 0, 177, 178, 179, 180, - 181, 0, 0, 0, 0, 0, 182, 0, 183, 0, - 0, 184, 0, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, - 161, 162, 163, 0, 164, 165, 166, 0, 167, 168, - 169, 0, 0, 0, 0, 0, 170, 143, 0, 171, - 0, 172, 173, 174, 175, 176, 0, 177, 178, 179, - 180, 181, 0, 0, 0, 0, 0, 182, 0, 183, - 0, 0, 184, 0, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 163, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 172, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 172, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 173, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 0, 174, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 143, 0, 0, - 0, 0, 0, 0, -216, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184, 144, 145, 146, -216, -216, -216, - -216, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 164, 165, 166, 0, 167, - 168, 169, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 175, 176, 0, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 0, 182, 0, - 183, 0, 0, 184 + 0, 0, 190, 191, 192, 0, 193, 194, 195, 0, + 0, 0, 0, 168, 0, 0, 0, 0, 0, 199, + 200, 201, 202, 0, 203, 204, 205, 206, 207, 0, + 0, 0, 0, 0, 208, 0, 209, 0, 0, 210, + 169, 170, 171, 0, 172, 173, 174, 175, 176, 177, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 190, 191, 192, 0, 193, 194, 195, + 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, + 0, 200, 201, 202, 0, 203, 204, 205, 206, 207, + 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, + 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, + 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 190, 191, 192, 0, 193, 194, + 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -155, 201, 202, 0, 203, 204, 205, 206, + 207, 0, 0, 0, 0, 0, 208, 0, 209, 0, + 0, 210 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 57, 0, 106, 313, 209, - 3, 47, 88, 20, 214, 3, 194, 24, 335, 50, - 337, 308, 3, 125, 126, 35, 19, 3, 3, 68, - 37, 19, 39, 40, 381, 42, 43, 44, 19, 46, - 47, 51, 98, 87, 121, 34, 317, 231, 36, 126, - 45, 51, 51, 51, 51, 51, 240, 51, 363, 0, - 98, 100, 0, 88, 89, 90, 383, 3, 355, 3, - 98, 98, 3, 62, 5, 346, 132, 8, 9, 10, - 121, 12, 118, 182, 98, 19, 90, 98, 28, 14, - 121, 121, 3, 33, 132, 366, 121, 104, 123, 106, - 18, 126, 27, 3, 132, 132, 101, 412, 19, 380, - 51, 118, 429, 51, 45, 91, 91, 295, 132, 123, - 121, 132, 126, 125, 55, 56, 114, 127, 127, 127, - 127, 127, 125, 127, 121, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 504, 194, 121, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 448, 362, 450, - 114, 3, 3, 5, 4, 121, 127, 194, 224, 127, - 226, 127, 187, 27, 189, 190, 0, 31, 32, 206, - 20, 21, 22, 125, 24, 3, 26, 207, 207, 207, - 44, 310, 46, 98, 290, 27, 3, 224, 38, 226, - 32, 19, 422, 121, 219, 3, 46, 47, 48, 49, - 121, 100, 97, 98, 46, 104, 126, 4, 233, 234, - 3, 317, 124, 98, 4, 104, 322, 131, 98, 68, - 3, 3, 97, 20, 21, 22, 3, 24, 68, 26, - 20, 21, 22, 3, 24, 3, 26, 451, 461, 3, - 346, 38, 465, 466, 350, 282, 3, 97, 38, 46, - 47, 48, 49, 467, 3, 14, 97, 47, 48, 49, - 366, 484, 125, 18, 121, 132, 131, 104, 98, 3, - 300, 300, 300, 310, 380, 498, 54, 132, 308, 308, - 308, 131, 505, 54, 87, 3, 121, 3, 131, 125, - 3, 98, 104, 132, 126, 509, 100, 379, 131, 121, - 97, 367, 17, 340, 125, 3, 100, 125, 131, 3, - 376, 5, 6, 132, 8, 9, 10, 11, 12, 98, - 126, 131, 121, 125, 349, 355, 355, 355, 100, 125, - 367, 25, 65, 27, 131, 29, 125, 132, 104, 376, - 132, 3, 448, 131, 450, 88, 89, 90, 3, 27, - 131, 45, 125, 3, 121, 131, 125, 131, 51, 53, - 300, 55, 56, 88, 89, 90, 131, 127, 111, 112, - 113, 114, 115, 125, 132, 131, 339, 131, 121, 132, - 123, 131, 57, 126, 129, 330, 437, 437, 113, 114, - 115, 68, 490, 476, 88, 89, 121, 434, 123, 458, - 430, 126, 418, 418, 481, 27, 410, 383, 359, -1, + 0, 0, 0, 0, 0, 39, 91, 20, 99, 58, + 65, 24, 110, 252, 3, 326, 392, 48, 3, 89, + 14, 320, 3, 4, 37, 92, 39, 40, 41, 3, + 43, 44, 45, 27, 47, 50, 91, 46, 19, 126, + 127, 68, 90, 91, 92, 3, 4, 35, 0, 0, + 122, 0, 52, 52, 52, 52, 52, 124, 34, 102, + 127, 19, 105, 51, 14, 376, 3, 4, 470, 368, + 122, 100, 474, 475, 122, 102, 124, 27, 3, 127, + 5, 136, 19, 8, 9, 10, 62, 12, 99, 100, + 100, 493, 126, 3, 4, 108, 105, 110, 18, 36, + 52, 52, 3, 52, 133, 507, 122, 122, 93, 19, + 208, 422, 514, 126, 100, 354, 3, 122, 5, 93, + 45, 130, 131, 133, 28, 126, 3, 122, 0, 33, + 55, 56, 127, 122, 126, 122, 375, 513, 100, 128, + 3, 3, 122, 122, 100, 126, 100, 133, 105, 149, + 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 133, 115, 133, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 149, 149, 233, + 149, 235, 215, 100, 213, 115, 127, 100, 132, 125, + 100, 126, 4, 3, 3, 3, 216, 216, 216, 250, + 233, 460, 235, 232, 218, 323, 68, 18, 20, 21, + 22, 4, 24, 227, 26, 3, 133, 476, 99, 68, + 99, 3, 3, 14, 253, 254, 38, 20, 21, 22, + 3, 24, 3, 26, 46, 47, 48, 49, 18, 350, + 127, 352, 127, 133, 122, 38, 105, 27, 18, 100, + 102, 31, 32, 46, 47, 48, 49, 27, 363, 518, + 335, 132, 32, 3, 44, 54, 46, 54, 343, 3, + 133, 89, 305, 378, 3, 122, 46, 132, 126, 3, + 133, 100, 127, 394, 389, 105, 132, 99, 363, 102, + 323, 122, 312, 312, 312, 17, 126, 100, 3, 126, + 320, 320, 320, 378, 132, 126, 99, 133, 322, 132, + 100, 126, 126, 65, 389, 122, 102, 133, 3, 388, + 132, 105, 3, 27, 357, 379, 132, 438, 133, 126, + 384, 132, 126, 132, 132, 364, 132, 3, 133, 132, + 132, 126, 40, 122, 52, 4, 379, 149, 368, 368, + 368, 384, 457, 312, 459, 132, 399, 133, 132, 58, + 129, 20, 21, 22, 446, 24, 446, 26, 428, 67, + 68, 69, 428, 71, 72, 73, 74, 75, 76, 38, + 342, 70, 457, 499, 459, 485, 467, 400, 47, 48, + 49, 490, 90, 91, 92, 27, 94, 95, 96, 394, + -1, -1, -1, -1, 372, -1, -1, -1, -1, 420, + 443, 109, 110, -1, 112, 113, 114, 115, 116, 439, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + 92, 461, 461, 461, 461, 461, -1, 467, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 452, 452, 452, 452, 452, 121, 458, 123, - -1, 125, -1, 127, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 476, 476, 476, 476, - 476, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 490, 490, 490, 490, 490, 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, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, 88, 89, -1, -1, -1, -1, -1, - -1, -1, 97, -1, -1, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, 111, -1, 121, -1, - 123, 116, 117, 126, -1, -1, 121, -1, 123, -1, - 125, -1, 127, -1, -1, -1, 131, 3, 4, 5, + 112, 113, 114, 115, 116, 485, 485, 485, 485, 485, + 122, -1, 124, -1, -1, 127, -1, -1, -1, 499, + 499, 499, 499, 499, 0, -1, -1, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, 67, 68, 69, -1, 63, 64, -1, + -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, + 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, + 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, 90, 91, 92, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 114, 115, + 116, -1, -1, -1, 90, 91, 122, -1, 124, -1, + -1, 127, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 88, 89, -1, -1, -1, -1, -1, -1, - -1, 97, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, - 116, 117, -1, -1, -1, 121, -1, 123, -1, 125, - -1, 127, -1, -1, -1, 131, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, - 27, -1, 29, 30, -1, 32, -1, -1, -1, 36, - 37, 38, 39, -1, 41, 42, 43, -1, 45, 46, - 47, 48, 49, -1, -1, 52, 53, -1, 55, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, 66, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 88, 89, -1, -1, -1, -1, -1, -1, -1, - 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, - 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, - 127, -1, -1, -1, 131, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - -1, 29, 30, -1, 32, -1, -1, -1, 36, 37, - 38, 39, -1, 41, 42, 43, -1, 45, 46, 47, - 48, 49, -1, -1, 52, 53, -1, 55, 56, -1, - -1, -1, -1, -1, -1, 63, 64, -1, 66, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, + 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, + 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, -1, -1, -1, -1, -1, -1, 97, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 111, -1, -1, -1, -1, 116, 117, - -1, -1, -1, 121, -1, 123, -1, 125, -1, 127, - -1, -1, -1, 131, 3, 4, 5, 6, -1, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, 21, 22, 23, 24, 25, 26, 40, -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, 74, 75, 63, 64, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 88, 89, 90, -1, - 92, 93, 94, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, 108, 109, 97, 111, - 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, - -1, 123, 111, -1, 126, -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, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, - -1, -1, -1, -1, -1, -1, -1, 97, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, - -1, 121, -1, 123, -1, 125, -1, 127, -1, -1, - -1, 131, 3, 4, 5, 6, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, -1, 20, - 21, 22, 23, 24, 25, 26, -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, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, + 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, + 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, - -1, -1, -1, -1, -1, -1, 97, -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, - 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, -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, -1, -1, 88, 89, -1, -1, - -1, -1, -1, -1, -1, 97, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, - -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, - -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, - 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, -1, 20, 21, 22, - 23, 24, 25, 26, -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, -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, -1, 88, 89, -1, -1, -1, - -1, -1, -1, -1, 97, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, - -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, - 123, -1, 125, -1, 127, -1, 0, -1, 131, 3, - 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 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, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, -1, 0, -1, 132, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, + -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 88, 89, -1, -1, -1, -1, - -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, - -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, - -1, 125, -1, 127, 3, 4, 5, 6, -1, 8, - 9, 10, 11, 12, 13, 14, 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, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, + -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, + 126, -1, 128, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, 15, 16, -1, 18, -1, + 20, 21, 22, 23, 24, 25, 26, 27, -1, 29, + 30, -1, 32, -1, -1, -1, 36, 37, 38, 39, + -1, 41, 42, 43, -1, 45, 46, 47, 48, 49, + -1, -1, 52, 53, -1, 55, 56, -1, -1, -1, + -1, -1, -1, 63, 64, -1, 66, -1, -1, -1, + 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, 97, -1, + 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, - -1, -1, 121, -1, 123, -1, 125, -1, 127, 3, + -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, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 88, 89, -1, -1, -1, -1, - -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, - -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, - -1, 125, -1, 127, 3, 4, 5, 6, -1, 8, - 9, 10, 11, 12, 13, 14, 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, + 64, -1, 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, 97, -1, - -1, 3, -1, 5, 6, -1, 8, 9, 10, 11, - 12, -1, 111, -1, -1, -1, -1, 116, 117, -1, - -1, -1, 121, 25, 123, 27, 125, 29, 127, -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, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, + -1, -1, -1, -1, -1, 99, -1, 3, -1, 5, + 6, -1, 8, 9, 10, 11, 12, -1, 112, -1, + -1, -1, -1, 117, 118, -1, -1, -1, 122, 25, + 124, 27, 126, 29, 128, -1, 32, -1, -1, -1, + 36, -1, -1, -1, -1, -1, -1, 43, -1, 45, + 46, -1, -1, -1, -1, -1, -1, 53, -1, 55, + 56, -1, -1, -1, -1, -1, -1, 63, -1, -1, + -1, -1, -1, -1, 70, -1, -1, 3, -1, 5, + 6, -1, 8, 9, 10, 11, 12, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, 25, + -1, 27, -1, 29, -1, -1, -1, -1, -1, -1, + 36, -1, -1, -1, -1, -1, 112, 43, -1, 45, + -1, 117, 118, -1, -1, -1, 122, 53, 124, 55, + 56, -1, 128, -1, -1, -1, -1, 63, -1, -1, + -1, -1, -1, -1, 70, -1, -1, 3, -1, 5, + 6, -1, 8, 9, 10, 11, 12, -1, -1, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, 25, + -1, 27, -1, 29, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 112, -1, -1, 45, + -1, 117, 118, -1, -1, -1, 122, 53, 124, 55, + 56, -1, 128, -1, -1, -1, -1, -1, -1, 40, + -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 88, 89, -1, -1, - -1, -1, -1, -1, 3, -1, 5, 6, -1, 8, - 9, 10, 11, 12, -1, -1, -1, -1, -1, 111, - -1, -1, -1, -1, 116, 117, 25, -1, 27, 121, - 29, 123, -1, 125, -1, 127, -1, 36, -1, -1, - -1, -1, -1, -1, 43, -1, 45, -1, -1, -1, - -1, -1, -1, -1, 53, -1, 55, 56, -1, -1, - -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, - 89, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 40, -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, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 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, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 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, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, 106, 107, - 108, 109, 40, 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, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, -1, - 88, 89, 90, -1, 92, 93, 94, -1, -1, -1, - -1, -1, 100, 40, -1, 103, 104, 105, 106, 107, - 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, -1, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + -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, - -1, 88, 89, 90, -1, 92, 93, 94, -1, -1, - -1, -1, -1, 100, 40, -1, 103, -1, 105, 106, - 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, - -1, -1, -1, -1, 121, -1, 123, 124, -1, 126, - -1, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, -1, 88, 89, 90, -1, 92, 93, 94, -1, - -1, -1, -1, -1, 100, 40, -1, 103, 104, 105, - 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, - -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, - 126, -1, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, -1, 88, 89, 90, -1, 92, 93, 94, - -1, -1, -1, -1, -1, 100, 40, -1, 103, 104, - 105, 106, 107, 108, 109, -1, 111, 112, 113, 114, - 115, -1, -1, -1, -1, -1, 121, -1, 123, -1, - -1, 126, -1, 67, 68, 69, 70, 71, 72, 73, + 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, -1, 88, 89, 90, -1, 92, 93, - 94, -1, -1, -1, -1, -1, 100, 40, -1, 103, - -1, 105, 106, 107, 108, 109, -1, 111, 112, 113, - 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, - -1, -1, 126, -1, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 86, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -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, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -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, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -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, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -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, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, 40, -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, 67, 68, 69, 70, 71, 72, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, 90, -1, 92, - 93, 94, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 108, 109, -1, 111, 112, - 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, - 123, -1, -1, 126 + 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, + 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, + 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, + 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, + 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, + -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, + 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, + -1, 124, 125, -1, 127, 67, 68, 69, -1, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, + 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, + 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, + 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, + 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, + 40, 102, -1, 104, -1, 106, 107, 108, 109, 110, + -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, + -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, + -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, + 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, + -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, + 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, + -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, + 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, 40, -1, -1, -1, -1, 106, 107, 108, + 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, + -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, + 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, -1, 40, -1, -1, -1, -1, -1, 107, + 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, + 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, 108, 109, 110, -1, 112, 113, 114, 115, 116, + -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, + 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, + 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 108, 109, 110, -1, 112, 113, 114, 115, + 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, + -1, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3130,55 +3515,56 @@ 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, 88, - 89, 97, 111, 116, 117, 121, 123, 125, 127, 134, - 135, 136, 137, 143, 146, 147, 153, 157, 158, 159, - 160, 162, 170, 178, 181, 184, 187, 188, 189, 190, - 194, 196, 205, 212, 215, 228, 229, 230, 233, 234, - 235, 236, 239, 241, 87, 50, 121, 121, 163, 121, - 3, 19, 125, 182, 183, 18, 3, 235, 3, 214, - 235, 121, 183, 218, 121, 125, 121, 126, 235, 121, - 235, 235, 235, 235, 235, 233, 224, 225, 226, 232, - 235, 232, 237, 238, 3, 0, 137, 125, 3, 32, - 46, 149, 155, 156, 234, 27, 31, 32, 44, 46, - 204, 190, 98, 40, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 88, 89, 90, 92, 93, 94, - 100, 103, 105, 106, 107, 108, 109, 111, 112, 113, - 114, 115, 121, 123, 126, 3, 121, 161, 30, 37, - 42, 46, 66, 97, 125, 143, 144, 145, 147, 149, - 164, 165, 180, 188, 231, 240, 171, 186, 125, 126, - 3, 227, 121, 233, 126, 235, 179, 224, 3, 154, - 132, 124, 98, 232, 104, 131, 98, 135, 3, 150, - 151, 3, 150, 97, 68, 35, 51, 211, 3, 3, - 3, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 3, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 235, 224, - 235, 3, 121, 127, 233, 3, 233, 233, 3, 131, - 142, 144, 235, 97, 14, 125, 18, 235, 97, 138, - 139, 140, 146, 147, 194, 196, 205, 212, 185, 182, - 121, 223, 3, 91, 208, 209, 210, 132, 3, 114, - 132, 141, 142, 132, 233, 232, 232, 131, 104, 222, - 98, 222, 233, 233, 3, 54, 191, 54, 192, 222, - 104, 132, 124, 87, 235, 3, 132, 131, 144, 121, - 142, 3, 132, 131, 140, 125, 138, 224, 100, 104, - 206, 210, 132, 98, 145, 131, 132, 104, 3, 36, - 114, 183, 217, 218, 219, 221, 100, 148, 151, 97, - 132, 121, 219, 17, 193, 219, 220, 125, 148, 235, - 3, 132, 145, 233, 131, 100, 125, 138, 131, 132, - 3, 5, 8, 9, 10, 12, 45, 55, 56, 207, - 221, 222, 91, 210, 28, 33, 172, 174, 176, 177, - 145, 232, 126, 232, 234, 145, 208, 220, 125, 98, - 197, 132, 3, 5, 34, 62, 166, 167, 168, 169, - 131, 206, 125, 210, 125, 121, 172, 174, 65, 152, - 132, 132, 195, 219, 46, 97, 188, 201, 202, 203, - 235, 104, 131, 168, 169, 216, 175, 3, 145, 145, - 222, 97, 143, 147, 188, 198, 199, 200, 205, 212, - 3, 27, 131, 203, 104, 141, 141, 141, 222, 125, - 125, 131, 200, 211, 141, 131, 131, 132, 213, 198, - 3, 173, 141, 131, 121, 125, 131, 208, 141, 132, - 131, 222 + 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, + 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, + 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, + 160, 161, 163, 171, 179, 182, 183, 186, 189, 190, + 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, + 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, + 122, 164, 122, 3, 4, 19, 126, 184, 185, 18, + 3, 240, 3, 219, 240, 122, 185, 223, 122, 126, + 122, 127, 240, 122, 237, 240, 242, 243, 240, 240, + 240, 240, 240, 238, 229, 230, 231, 237, 30, 32, + 37, 42, 46, 66, 99, 132, 143, 144, 145, 148, + 150, 165, 166, 181, 190, 236, 3, 0, 138, 126, + 3, 46, 150, 156, 157, 239, 145, 146, 18, 27, + 31, 32, 44, 46, 206, 245, 192, 100, 40, 67, + 68, 69, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 90, 91, 92, 94, 95, 96, 102, 104, 106, 107, + 108, 109, 110, 112, 113, 114, 115, 116, 122, 124, + 127, 3, 122, 162, 146, 172, 188, 126, 127, 184, + 185, 222, 223, 224, 232, 122, 238, 127, 240, 180, + 229, 3, 155, 105, 132, 100, 133, 125, 100, 237, + 3, 3, 151, 152, 238, 238, 151, 3, 132, 145, + 126, 136, 3, 99, 68, 99, 3, 35, 51, 216, + 3, 3, 208, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 3, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 229, 240, 3, 122, 128, 238, 14, 240, + 99, 139, 140, 141, 147, 148, 196, 198, 207, 217, + 187, 184, 127, 122, 228, 3, 93, 213, 214, 215, + 133, 115, 184, 133, 142, 143, 133, 238, 237, 237, + 105, 227, 100, 143, 132, 227, 238, 238, 102, 3, + 54, 193, 54, 194, 3, 209, 210, 105, 133, 125, + 89, 240, 3, 133, 122, 133, 132, 141, 126, 139, + 229, 102, 105, 211, 215, 133, 100, 132, 133, 105, + 36, 115, 224, 226, 102, 149, 152, 132, 99, 133, + 3, 5, 122, 224, 17, 195, 224, 225, 126, 227, + 100, 240, 3, 133, 146, 238, 126, 139, 132, 133, + 3, 5, 8, 9, 10, 12, 45, 55, 56, 212, + 226, 227, 93, 215, 28, 33, 173, 175, 177, 178, + 146, 237, 237, 239, 146, 213, 225, 126, 100, 199, + 149, 210, 133, 34, 62, 167, 168, 169, 170, 132, + 211, 126, 215, 126, 122, 173, 175, 65, 153, 133, + 133, 197, 224, 46, 99, 190, 203, 204, 205, 240, + 105, 132, 169, 170, 221, 176, 3, 146, 146, 227, + 99, 144, 148, 190, 200, 201, 202, 207, 217, 3, + 27, 132, 205, 105, 142, 142, 142, 227, 126, 126, + 132, 202, 216, 142, 132, 132, 133, 218, 200, 3, + 174, 142, 132, 122, 126, 132, 213, 142, 133, 132, + 227 }; #define yyerrok (yyerrstatus = 0) @@ -3994,7 +4380,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1725 "parser.y" +#line 2151 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4005,7 +4391,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1726 "parser.y" +#line 2152 "parser.y" {(yyval.code)=code_new();} } break; @@ -4016,7 +4402,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1728 "parser.y" +#line 2154 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4027,52 +4413,41 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1729 "parser.y" +#line 2155 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; - case 41: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 1745 "parser.y" - {(yyval.code)=0;} - } - break; - - - - case 48: + case 42: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1752 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 2170 "parser.y" + {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; - case 49: + case 43: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1754 "parser.y" - {/*TODO*/(yyval.code)=0;} +#line 2171 "parser.y" + {(yyval.code)=0;} } break; - case 50: + case 44: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1756 "parser.y" - {(yyval.code)=(yyvsp[(2) - (3)].code);} +#line 2174 "parser.y" + {(yyval.code)=0;} } break; @@ -4082,8 +4457,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1757 "parser.y" - {(yyval.code)=0;} +#line 2181 "parser.y" + {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4093,7 +4468,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1758 "parser.y" +#line 2185 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4104,7 +4479,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1759 "parser.y" +#line 2186 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4115,7 +4490,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1763 "parser.y" +#line 2190 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4129,7 +4504,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1774 "parser.y" +#line 2201 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4140,7 +4515,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1775 "parser.y" +#line 2202 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4153,7 +4528,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1779 "parser.y" +#line 2206 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4164,7 +4539,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1780 "parser.y" +#line 2207 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4175,7 +4550,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1782 "parser.y" +#line 2209 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4186,7 +4561,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1783 "parser.y" +#line 2210 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4197,45 +4572,63 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1786 "parser.y" +#line 2213 "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); } - int index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1); + 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); + } + + (yyval.code) = slot?abc_getscopeobject(0, 1):0; 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) = code_append((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); } else { code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo)); - (yyval.code) = abc_setlocal((yyval.code), index); + (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; + (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); (yyval.code) = abc_coerce_a((yyval.code)); - (yyval.code) = abc_setlocal((yyval.code), index); } else { + // don't do anything code_free((yyvsp[(3) - (3)].value).c); - (yyval.code) = code_new(); + 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; @@ -4246,7 +4639,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1828 "parser.y" +#line 2273 "parser.y" {(yyval.code) = code_new();} } break; @@ -4257,7 +4650,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1829 "parser.y" +#line 2274 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4268,8 +4661,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" - {new_state();} +#line 2277 "parser.y" + {PASS12 new_state();} } break; @@ -4279,7 +4672,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1832 "parser.y" +#line 2277 "parser.y" { (yyval.code) = code_new(); @@ -4296,7 +4689,7 @@ yyreduce: myjmp->branch = (yyval.code) = abc_nop((yyval.code)); } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4307,7 +4700,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1851 "parser.y" +#line 2296 "parser.y" {(yyval.code)=code_new();} } break; @@ -4318,9 +4711,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1856 "parser.y" +#line 2303 "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; @@ -4331,8 +4725,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1859 "parser.y" +#line 2307 "parser.y" { + PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); } } @@ -4344,8 +4739,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1863 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} +#line 2312 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4355,8 +4750,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1864 "parser.y" - {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} +#line 2313 "parser.y" + {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4366,7 +4761,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1866 "parser.y" +#line 2315 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4384,7 +4779,7 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4395,13 +4790,17 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1886 "parser.y" +#line 2335 "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); @@ -4433,10 +4832,11 @@ yyreduce: myif->branch = out; (yyval.code) = var_block((yyval.code)); - old_state(); free(tmp1name); free(tmp2name); + + PASS12 old_state(); } } break; @@ -4447,8 +4847,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1929 "parser.y" - {new_state();} +#line 2383 "parser.y" + {PASS12 new_state();} } break; @@ -4458,7 +4858,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1929 "parser.y" +#line 2383 "parser.y" { (yyval.code) = code_new(); @@ -4475,7 +4875,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4486,8 +4886,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" - {new_state();} +#line 2402 "parser.y" + {PASS12 new_state();} } break; @@ -4497,7 +4897,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" +#line 2402 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4510,7 +4910,7 @@ yyreduce: continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont); (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4521,7 +4921,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1963 "parser.y" +#line 2417 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4534,7 +4934,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1966 "parser.y" +#line 2420 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4547,7 +4947,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1969 "parser.y" +#line 2423 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4560,7 +4960,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1972 "parser.y" +#line 2426 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4573,7 +4973,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1976 "parser.y" +#line 2430 "parser.y" {(yyval.code)=0;} } break; @@ -4584,7 +4984,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1977 "parser.y" +#line 2431 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4595,7 +4995,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1978 "parser.y" +#line 2432 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4606,7 +5006,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1979 "parser.y" +#line 2433 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4617,7 +5017,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1980 "parser.y" +#line 2434 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4628,7 +5028,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1981 "parser.y" +#line 2435 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4639,9 +5039,9 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1983 "parser.y" +#line 2437 "parser.y" { - (yyval.code) = abc_dup(0); + (yyval.code) = abc_getlocal(0, state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); @@ -4660,7 +5060,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1994 "parser.y" +#line 2448 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4673,8 +5073,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1997 "parser.y" - {new_state();} +#line 2451 "parser.y" + {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -4684,11 +5084,13 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1997 "parser.y" +#line 2451 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); - code_t*out = (yyval.code) = abc_pop((yyval.code)); + + code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var); breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out); code_t*c = (yyval.code),*lastblock=0; @@ -4709,7 +5111,7 @@ yyreduce: } (yyval.code) = var_block((yyval.code)); - old_state(); + PASS12 old_state(); } } break; @@ -4720,8 +5122,12 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2026 "parser.y" - {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);} +#line 2482 "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; @@ -4731,7 +5137,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2027 "parser.y" +#line 2487 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4742,14 +5148,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; @@ -4760,8 +5167,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" - {new_state();state->exception_name=0;} +#line 2507 "parser.y" + {PASS12 new_state();state->exception_name=0;} } break; @@ -4771,12 +5178,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2046 "parser.y" +#line 2507 "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 @@ -4784,9 +5190,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; @@ -4797,7 +5203,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2063 "parser.y" +#line 2523 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4808,7 +5214,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2064 "parser.y" +#line 2524 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4819,7 +5225,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2065 "parser.y" +#line 2525 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4830,7 +5236,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2066 "parser.y" +#line 2526 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4848,7 +5254,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2074 "parser.y" +#line 2534 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -4866,8 +5272,11 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2083 "parser.y" - {new_state();} +#line 2543 "parser.y" + {PASS12 new_state(); + state->method->has_exceptions=1; + state->method->late_binding=1;//for invariant scope_code + } } break; @@ -4877,7 +5286,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2083 "parser.y" +#line 2546 "parser.y" { code_t*out = abc_nop(0); @@ -4890,7 +5299,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; @@ -4903,6 +5312,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)); } @@ -4918,7 +5328,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; @@ -4929,7 +5339,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2128 "parser.y" +#line 2592 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -4939,134 +5349,173 @@ yyreduce: - case 106: + case 106: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2596 "parser.y" + { + if(!state->exception_name) + syntaxerror("re-throw only possible within a catch block"); + 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)); +} + } + break; + + + + case 107: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2607 "parser.y" + { + new_state(); + if(state->method->has_exceptions) { + int v = alloc_local(); + state->method->scope_code = abc_getlocal(state->method->scope_code, v); + state->method->scope_code = abc_pushwith(state->method->scope_code); + (yyval.value_list).number = v; + } + (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c; +} + } + break; + + + + case 108: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2132 "parser.y" +#line 2617 "parser.y" { - if(!state->exception_name) - syntaxerror("re-throw only possible within a catch block"); - variable_t*v = find_variable(state->exception_name); - (yyval.code)=code_new(); - (yyval.code)=abc_getlocal((yyval.code), v->index); - (yyval.code)=abc_throw((yyval.code)); + /* 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; - case 107: + case 110: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2143 "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)); -} +#line 2635 "parser.y" + {PASS12 (yyval.id)="package";} } break; - case 109: + case 111: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2153 "parser.y" - {PASS12 (yyval.id)="package";} +#line 2636 "parser.y" + {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; - case 110: + case 112: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2155 "parser.y" +#line 2638 "parser.y" {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} } break; - case 111: + case 113: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2156 "parser.y" +#line 2639 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; - case 112: + case 114: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2158 "parser.y" +#line 2641 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; - case 113: + case 115: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2159 "parser.y" +#line 2642 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 114: + case 116: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2160 "parser.y" +#line 2643 "parser.y" {PASS12 startpackage("");} } break; - case 115: + case 117: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2161 "parser.y" +#line 2644 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; - case 116: + case 118: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2163 "parser.y" +#line 2646 "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; } } @@ -5074,22 +5523,22 @@ yyreduce: - case 117: + case 119: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2177 "parser.y" +#line 2660 "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; } } @@ -5097,34 +5546,12 @@ yyreduce: - case 118: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2193 "parser.y" - {PASS12 (yyval.flags)=0;} - } - break; - - - - case 119: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2194 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} - } - break; - - - case 120: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2195 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} +#line 2676 "parser.y" + {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5134,8 +5561,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" - {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} +#line 2677 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5145,8 +5572,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2198 "parser.y" - {PASS12 (yyval.token)=FLAG_PUBLIC;} +#line 2678 "parser.y" + {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5156,8 +5583,14 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" - {PASS12 (yyval.token)=FLAG_PRIVATE;} +#line 2679 "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; @@ -5167,8 +5600,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2200 "parser.y" - {PASS12 (yyval.token)=FLAG_PROTECTED;} +#line 2686 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5178,8 +5611,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2201 "parser.y" - {PASS12 (yyval.token)=FLAG_STATIC;} +#line 2687 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5189,8 +5622,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" - {PASS12 (yyval.token)=FLAG_DYNAMIC;} +#line 2688 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5200,8 +5633,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2203 "parser.y" - {PASS12 (yyval.token)=FLAG_FINAL;} +#line 2689 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5211,8 +5644,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2204 "parser.y" - {PASS12 (yyval.token)=FLAG_OVERRIDE;} +#line 2690 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5222,8 +5655,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2205 "parser.y" - {PASS12 (yyval.token)=FLAG_NATIVE;} +#line 2691 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5233,8 +5666,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2206 "parser.y" - {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} +#line 2692 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5244,8 +5677,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2207 "parser.y" - {PASS12 (yyval.token)=FLAG_NAMESPACE;} +#line 2693 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5255,8 +5688,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2694 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5266,8 +5699,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2210 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 2695 "parser.y" + {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; + (yyval.flags).ns=(yyvsp[(1) - (1)].id); + } } break; @@ -5277,8 +5712,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2212 "parser.y" - {PASS12 (yyval.classinfo_list)=list_new();} +#line 2699 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; @@ -5288,8 +5723,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2213 "parser.y" - {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} +#line 2700 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5299,7 +5734,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2215 "parser.y" +#line 2702 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5310,7 +5745,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2703 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5321,8 +5756,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2220 "parser.y" - {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} +#line 2705 "parser.y" + {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5332,8 +5767,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2222 "parser.y" - {PASS12 endclass();(yyval.code)=0;} +#line 2706 "parser.y" + {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5343,8 +5778,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2226 "parser.y" - {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} +#line 2710 "parser.y" + {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5354,33 +5789,56 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2228 "parser.y" +#line 2712 "parser.y" + {PASS12 endclass();(yyval.code)=0;} + } + break; + + + + case 142: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2716 "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 2719 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; - case 150: + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2241 "parser.y" +#line 2732 "parser.y" { - code_t*c = state->cls->static_init; + code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); - state->cls->static_init = c; + state->cls->static_init->header = c; } } break; - case 156: + case 158: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2252 "parser.y" +#line 2743 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5389,19 +5847,19 @@ yyreduce: - case 157: + case 159: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2255 "parser.y" +#line 2746 "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); } } @@ -5409,58 +5867,103 @@ yyreduce: - case 160: + case 162: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2761 "parser.y" + {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} + } + break; + + + + case 163: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2761 "parser.y" + {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} + } + break; + + + + case 164: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2763 "parser.y" + {(yyval.code) = (yyvsp[(1) - (1)].code);} + } + break; + + + + case 165: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2764 "parser.y" + {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} + } + break; + + + + case 166: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" +#line 2767 "parser.y" { - int flags = (yyvsp[(1) - (5)].flags); - U8 access = flags2access((yyvsp[(1) - (5)].flags)); + int flags = slotstate_flags->flags; + namespace_t ns = modifiers2access(slotstate_flags); varinfo_t* info = 0; if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (5)].id), 1); + 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, access, (yyvsp[(3) - (5)].id)); + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (5)].id)); + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (5)].id)); + 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(access, state->package, (yyvsp[(3) - (5)].id)); + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); } - info->type = (yyvsp[(4) - (5)].classinfo); + info->type = (yyvsp[(2) - (3)].classinfo); info->flags = flags; /* slot name */ - namespace_t mname_ns = {access, ""}; - multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (5)].id)}; + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; trait_list_t**traits; code_t**code; if(!state->cls) { // global variable - mname_ns.name = state->package; + 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; + code = &state->cls->static_init->header; } else { // instance variable traits = &state->cls->abc->traits; - code = &state->cls->init; + code = &state->cls->init->header; } trait_t*t=0; - if((yyvsp[(4) - (5)].classinfo)) { - MULTINAME(m, (yyvsp[(4) - (5)].classinfo)); + 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); @@ -5469,16 +5972,16 @@ yyreduce: /* initalization code (if needed) */ code_t*c = 0; - if((yyvsp[(5) - (5)].value).c && !is_pushundefined((yyvsp[(5) - (5)].value).c)) { + if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(5) - (5)].value).c); - c = converttype(c, (yyvsp[(5) - (5)].value).t, (yyvsp[(4) - (5)].classinfo)); + c = code_append(c, (yyvsp[(3) - (3)].value).c); + c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); c = abc_setslot(c, t->slot_id); } *code = code_append(*code, c); - if((yyvsp[(2) - (5)].token)==KW_CONST) { + if(slotstate_varconst==KW_CONST) { t->kind= TRAIT_CONST; } @@ -5489,136 +5992,139 @@ yyreduce: - case 161: + case 167: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2343 "parser.y" +#line 2841 "parser.y" {(yyval.constant)=0;} } break; - case 162: + case 168: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2344 "parser.y" +#line 2842 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; - case 163: + case 169: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2346 "parser.y" +#line 2844 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; - case 164: + case 170: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2347 "parser.y" +#line 2845 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; - case 165: + case 171: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2348 "parser.y" +#line 2846 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; - case 166: + case 172: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2349 "parser.y" +#line 2847 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; - case 167: + case 173: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2350 "parser.y" +#line 2848 "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 174: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2850 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; - case 169: + case 175: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2353 "parser.y" +#line 2851 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; - case 170: + case 176: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2354 "parser.y" +#line 2852 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; - case 171: + case 177: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2355 "parser.y" +#line 2853 "parser.y" { - // TODO - as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { + (yyval.constant) = constant_new_float(__builtin_nan("")); + } else { + as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); + (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + } } } break; - case 172: + case 178: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2865 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5628,11 +6134,11 @@ yyreduce: - case 173: + case 179: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2869 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5642,11 +6148,11 @@ yyreduce: - case 174: + case 180: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2374 "parser.y" +#line 2875 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5658,11 +6164,11 @@ yyreduce: - case 175: + case 181: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2380 "parser.y" +#line 2881 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5674,11 +6180,11 @@ yyreduce: - case 176: + case 182: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2388 "parser.y" +#line 2889 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5689,11 +6195,11 @@ yyreduce: - case 177: + case 183: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2393 "parser.y" +#line 2894 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5704,17 +6210,17 @@ yyreduce: - case 178: + case 184: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2900 "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); } } @@ -5722,17 +6228,17 @@ yyreduce: - case 179: + case 185: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2407 "parser.y" +#line 2908 "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); } } @@ -5740,64 +6246,44 @@ yyreduce: - case 180: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2415 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 181: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" - {(yyval.token)=(yyvsp[(1) - (1)].token);} - } - break; - - - - case 182: + case 188: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2417 "parser.y" - {(yyval.token)=0;} +#line 2918 "parser.y" + {PASS12 (yyval.token)=0;} } break; - case 183: + case 189: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "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 2921 "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 184: + case 190: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2421 "parser.y" +#line 2922 "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(); + 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; } @@ -5806,65 +6292,77 @@ yyreduce: - case 186: + case 192: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2435 "parser.y" +#line 2938 "parser.y" {PASS12 (yyval.id)=0;} } break; - case 187: + case 193: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2437 "parser.y" +#line 2940 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; - case 188: + case 194: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2438 "parser.y" +#line 2941 "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) syntaxerror("internal error"); + if(!f || !f->kind) syntaxerror("internal error"); - code_t*c = method_header(); + code_t*c = method_header(state->method); 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 189: + case 195: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2458 "parser.y" +#line 2963 "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; } } @@ -5872,17 +6370,18 @@ yyreduce: - case 190: + case 196: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" +#line 2982 "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)); @@ -5894,122 +6393,122 @@ yyreduce: - case 193: + case 199: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2999 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; - case 194: + case 200: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2484 "parser.y" +#line 3000 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; - case 195: + case 201: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2486 "parser.y" - {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} +#line 3002 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; - case 196: + case 202: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2487 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 3003 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 197: + case 203: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2488 "parser.y" - {(yyval.classinfo)=registry_getanytype();} +#line 3004 "parser.y" + {PASS12 (yyval.classinfo)=registry_getanytype();} } break; - case 198: + case 204: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2497 "parser.y" - {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} +#line 3013 "parser.y" + {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; - case 199: + case 205: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2498 "parser.y" - {(yyval.classinfo)=0;} +#line 3014 "parser.y" + {PASS12 (yyval.classinfo)=0;} } break; - case 200: + case 206: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2502 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3018 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 201: + case 207: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2503 "parser.y" +#line 3019 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; - case 202: + case 208: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2505 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3021 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 205: + case 211: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2509 "parser.y" - {(yyval.value_list).len=1; +#line 3025 "parser.y" + {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } } @@ -6017,24 +6516,24 @@ yyreduce: - case 206: + case 212: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2513 "parser.y" +#line 3029 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; - case 207: + case 213: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2514 "parser.y" +#line 3030 "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); } } @@ -6042,11 +6541,11 @@ yyreduce: - case 209: + case 215: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2520 "parser.y" +#line 3036 "parser.y" { (yyval.value).c = (yyvsp[(2) - (4)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); @@ -6056,18 +6555,18 @@ 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; @@ -6083,11 +6582,11 @@ yyreduce: - case 210: + case 216: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2556 "parser.y" +#line 3072 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6101,11 +6600,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. } @@ -6113,17 +6612,17 @@ 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) { @@ -6138,11 +6637,11 @@ yyreduce: - case 211: + case 217: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 3118 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6159,7 +6658,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; } @@ -6168,11 +6667,11 @@ yyreduce: - case 212: + case 218: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2623 "parser.y" +#line 3139 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6183,7 +6682,7 @@ 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 { @@ -6198,11 +6697,11 @@ yyreduce: - case 213: + case 219: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2644 "parser.y" +#line 3160 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6211,11 +6710,11 @@ yyreduce: - case 214: + case 220: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2647 "parser.y" +#line 3163 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6225,33 +6724,33 @@ yyreduce: - case 215: + case 221: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2654 "parser.y" +#line 3170 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; - case 216: + case 222: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2655 "parser.y" +#line 3171 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 217: + case 223: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2656 "parser.y" +#line 3172 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6263,11 +6762,11 @@ yyreduce: - case 218: + case 224: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 3178 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6276,55 +6775,55 @@ yyreduce: - case 219: + case 225: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2668 "parser.y" +#line 3184 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 221: + case 227: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2672 "parser.y" +#line 3186 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 222: + case 228: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "parser.y" +#line 3187 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 223: + case 229: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 3188 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; - case 225: + case 231: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2680 "parser.y" +#line 3192 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6346,11 +6845,11 @@ yyreduce: - case 226: + case 232: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2697 "parser.y" +#line 3209 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6361,11 +6860,11 @@ yyreduce: - case 227: + case 233: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2702 "parser.y" +#line 3214 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6374,11 +6873,11 @@ yyreduce: - case 228: + case 234: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" +#line 3217 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6387,11 +6886,11 @@ yyreduce: - case 229: + case 235: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" +#line 3220 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6400,11 +6899,11 @@ yyreduce: - case 230: + case 236: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2711 "parser.y" +#line 3223 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6413,11 +6912,11 @@ yyreduce: - case 231: + case 237: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2714 "parser.y" +#line 3226 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6426,11 +6925,11 @@ yyreduce: - case 232: + case 238: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 3229 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6439,11 +6938,11 @@ yyreduce: - case 233: + case 239: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2720 "parser.y" +#line 3232 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6452,11 +6951,11 @@ yyreduce: - case 234: + case 240: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 3235 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6465,11 +6964,11 @@ yyreduce: - case 235: + case 241: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 3238 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6478,11 +6977,11 @@ yyreduce: - case 236: + case 242: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2730 "parser.y" +#line 3242 "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; } @@ -6491,11 +6990,11 @@ yyreduce: - case 237: + case 243: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2733 "parser.y" +#line 3245 "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; } @@ -6504,11 +7003,11 @@ yyreduce: - case 238: + case 244: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2736 "parser.y" +#line 3248 "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; } @@ -6517,11 +7016,11 @@ yyreduce: - case 239: + case 245: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2739 "parser.y" +#line 3251 "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; } @@ -6530,11 +7029,11 @@ yyreduce: - case 240: + case 246: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2742 "parser.y" +#line 3254 "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; } @@ -6543,11 +7042,11 @@ yyreduce: - case 241: + case 247: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" +#line 3257 "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; } @@ -6556,11 +7055,11 @@ yyreduce: - case 242: + case 248: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2748 "parser.y" +#line 3260 "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; } @@ -6569,11 +7068,11 @@ yyreduce: - case 243: + case 249: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2751 "parser.y" +#line 3263 "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; } @@ -6582,11 +7081,11 @@ yyreduce: - case 244: + case 250: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2755 "parser.y" +#line 3267 "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); @@ -6603,11 +7102,11 @@ yyreduce: - case 245: + case 251: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2766 "parser.y" +#line 3278 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6630,11 +7129,11 @@ yyreduce: - case 246: + case 252: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2784 "parser.y" +#line 3296 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6644,11 +7143,11 @@ yyreduce: - case 247: + case 253: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2789 "parser.y" +#line 3301 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6658,11 +7157,11 @@ yyreduce: - case 248: + case 254: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2794 "parser.y" +#line 3306 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitand((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6672,11 +7171,11 @@ yyreduce: - case 249: + case 255: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2799 "parser.y" +#line 3311 "parser.y" {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); (yyval.value).c = abc_bitxor((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6686,11 +7185,11 @@ yyreduce: - case 250: + case 256: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2804 "parser.y" +#line 3316 "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; @@ -6700,11 +7199,11 @@ yyreduce: - case 251: + case 257: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2809 "parser.y" +#line 3321 "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; @@ -6714,11 +7213,11 @@ yyreduce: - case 252: + case 258: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2813 "parser.y" +#line 3325 "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; @@ -6728,11 +7227,11 @@ yyreduce: - case 253: + case 259: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2817 "parser.y" +#line 3329 "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; @@ -6742,11 +7241,11 @@ yyreduce: - case 254: + case 260: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2822 "parser.y" +#line 3334 "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; @@ -6756,11 +7255,11 @@ yyreduce: - case 255: + case 261: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2826 "parser.y" +#line 3338 "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; @@ -6770,11 +7269,11 @@ yyreduce: - case 256: + case 262: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2830 "parser.y" +#line 3342 "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); @@ -6789,11 +7288,11 @@ yyreduce: - case 257: + case 263: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2839 "parser.y" +#line 3351 "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); @@ -6808,11 +7307,11 @@ yyreduce: - case 258: + case 264: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2848 "parser.y" +#line 3360 "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); @@ -6827,11 +7326,11 @@ yyreduce: - case 259: + case 265: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2858 "parser.y" +#line 3370 "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; @@ -6841,11 +7340,11 @@ yyreduce: - case 260: + case 266: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 3375 "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)); @@ -6862,11 +7361,11 @@ yyreduce: - case 261: + case 267: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2876 "parser.y" +#line 3388 "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; @@ -6876,11 +7375,11 @@ yyreduce: - case 262: + case 268: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2881 "parser.y" +#line 3393 "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; @@ -6890,11 +7389,11 @@ yyreduce: - case 263: + case 269: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2886 "parser.y" +#line 3398 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -6905,11 +7404,11 @@ yyreduce: - case 264: + case 270: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2892 "parser.y" +#line 3404 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -6920,11 +7419,11 @@ yyreduce: - case 265: + case 271: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2898 "parser.y" +#line 3410 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6933,22 +7432,22 @@ yyreduce: - case 266: + case 272: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2902 "parser.y" +#line 3414 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; - case 267: + case 273: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2904 "parser.y" +#line 3416 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -6964,11 +7463,11 @@ yyreduce: - case 268: + case 274: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2915 "parser.y" +#line 3427 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -6982,15 +7481,15 @@ yyreduce: - case 269: + case 275: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2924 "parser.y" +#line 3436 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len); + (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number); (yyval.value).t = registry_getarrayclass(); } } @@ -6998,52 +7497,52 @@ yyreduce: - case 270: + case 276: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2931 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).len=0;} +#line 3443 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; - case 271: + case 277: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2932 "parser.y" +#line 3444 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; - case 272: + case 278: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2934 "parser.y" +#line 3446 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).len = 2; + (yyval.value_list).number = 2; } } break; - case 273: + case 279: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2940 "parser.y" +#line 3452 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; + (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c); (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); } @@ -7052,15 +7551,15 @@ yyreduce: - case 274: + case 280: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2949 "parser.y" +#line 3461 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2); + (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2); (yyval.value).t = registry_getobjectclass(); } } @@ -7068,11 +7567,11 @@ yyreduce: - case 275: + case 281: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2956 "parser.y" +#line 3468 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7089,11 +7588,11 @@ yyreduce: - case 276: + case 282: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2968 "parser.y" +#line 3480 "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); @@ -7105,11 +7604,11 @@ yyreduce: - case 277: + case 283: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2974 "parser.y" +#line 3486 "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); @@ -7121,11 +7620,11 @@ yyreduce: - case 278: + case 284: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2980 "parser.y" +#line 3492 "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); @@ -7137,11 +7636,11 @@ yyreduce: - case 279: + case 285: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2986 "parser.y" +#line 3498 "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); @@ -7153,11 +7652,11 @@ yyreduce: - case 280: + case 286: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "parser.y" +#line 3504 "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); @@ -7169,11 +7668,11 @@ yyreduce: - case 281: + case 287: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "parser.y" +#line 3510 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7185,11 +7684,27 @@ yyreduce: - case 282: + case 288: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "parser.y" +#line 3516 "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; + } + } + break; + + + + case 289: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3522 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7208,11 +7723,11 @@ yyreduce: - case 283: + case 290: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3017 "parser.y" +#line 3535 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7229,11 +7744,11 @@ yyreduce: - case 284: + case 291: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3028 "parser.y" +#line 3546 "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); @@ -7245,11 +7760,11 @@ yyreduce: - case 285: + case 292: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3035 "parser.y" +#line 3553 "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; @@ -7259,7 +7774,7 @@ yyreduce: 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 = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); (yyval.value).c = j2->branch = abc_label((yyval.value).c); } } @@ -7267,14 +7782,14 @@ yyreduce: - case 286: + case 293: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "parser.y" +#line 3566 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if((is_getlocal((yyvsp[(1) - (2)].value).c) && TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { + if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { int nr = getlocalnr((yyvsp[(1) - (2)].value).c); code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0; if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) { @@ -7302,11 +7817,11 @@ yyreduce: - case 287: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3075 "parser.y" +#line 3593 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7325,11 +7840,11 @@ yyreduce: - case 288: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 3607 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7348,11 +7863,11 @@ yyreduce: - case 289: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3103 "parser.y" +#line 3621 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7371,18 +7886,18 @@ yyreduce: - case 290: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3118 "parser.y" +#line 3636 "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); @@ -7394,11 +7909,11 @@ yyreduce: - case 291: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3132 "parser.y" +#line 3650 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7410,11 +7925,11 @@ yyreduce: - case 292: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3139 "parser.y" +#line 3657 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7426,11 +7941,11 @@ yyreduce: - case 293: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3146 "parser.y" +#line 3664 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7442,11 +7957,11 @@ yyreduce: - case 294: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3153 "parser.y" +#line 3671 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7458,11 +7973,11 @@ yyreduce: - case 295: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3160 "parser.y" +#line 3678 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7474,54 +7989,94 @@ yyreduce: - case 296: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3172 "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 3693 "parser.y" + { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + classinfo_t*t = (yyvsp[(1) - (3)].value).t; + char is_static = 0; + if(TYPE_IS_CLASS(t) && t->data) { + t = t->data; + is_static = 1; + } + if(t) { + if(t->subtype==INFOTYPE_UNRESOLVED) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); + } + memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + (yyval.value).c = abc_getslot((yyval.value).c, f->slot); + } else { + if(!f) + as3_warning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); + + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + } + /* determine type */ + (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + if(!(yyval.value).t) + (yyval.value).c = abc_coerce_a((yyval.value).c); + } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; + char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); + + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(a) { + (yyval.value) = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + syntaxerror("couldn't resolve %s", package2); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + (yyval.value).c = abc_coerce_a((yyval.value).c); + (yyval.value).t = registry_getanytype(); + } +} } break; - case 297: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "parser.y" +#line 3749 "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; @@ -7529,18 +8084,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); @@ -7556,7 +8120,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); @@ -7566,7 +8130,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); @@ -7576,41 +8140,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)}; @@ -7625,47 +8170,105 @@ yyreduce: - case 298: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3307 "parser.y" - {(yyval.code)=0;} +#line 3858 "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 299: + case 306: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3308 "parser.y" - {(yyval.code)=0;} +#line 3865 "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; - case 300: + case 307: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3309 "parser.y" - {(yyval.code)=0;} +#line 3872 "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; - case 301: + case 308: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3311 "parser.y" +#line 3879 "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; + + + + case 309: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3894 "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; } } @@ -7675,7 +8278,7 @@ yyreduce: /* Line 1464 of skeleton.m4 */ -#line 7679 "parser.tab.c" +#line 8282 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);