X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fas3%2Fparser.tab.c;h=7069fc367d80c48b3d8a98d8fc0485047f10c5e6;hb=b8aa0577aae67db4da5221459102202febc5c103;hp=f4565e570d8fb525e243dbd07e64ffb653be78a5;hpb=71c8242a8242eeb6e8b6dcf57239550a6f35c88a;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index f4565e5..7069fc3 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -84,18 +84,21 @@ #include "abc.h" #include "pool.h" #include "files.h" +#include "common.h" #include "tokenizer.h" #include "registry.h" #include "code.h" #include "opcodes.h" #include "compiler.h" +#include "expr.h" +#include "initcode.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 99 "parser.tab.c" +#line 102 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -129,77 +132,77 @@ extern int a3_lex(); T_EMPTY = 262, T_INT = 263, T_UINT = 264, - T_BYTE = 265, - T_SHORT = 266, - T_FLOAT = 267, - T_FOR = 268, - T_WHILE = 269, - T_DO = 270, - T_SWITCH = 271, - KW_IMPLEMENTS = 272, - KW_NAMESPACE = 273, - KW_PACKAGE = 274, - KW_PROTECTED = 275, - KW_PUBLIC = 276, - KW_PRIVATE = 277, - KW_USE = 278, - KW_INTERNAL = 279, - KW_NEW = 280, - KW_NATIVE = 281, - KW_FUNCTION = 282, - KW_FINALLY = 283, - KW_UNDEFINED = 284, - KW_CONTINUE = 285, - KW_CLASS = 286, - KW_CONST = 287, - KW_CATCH = 288, - KW_CASE = 289, - KW_SET = 290, - KW_VOID = 291, - KW_THROW = 292, - KW_STATIC = 293, - KW_WITH = 294, - KW_INSTANCEOF = 295, - KW_IMPORT = 296, - KW_RETURN = 297, - KW_TYPEOF = 298, - KW_INTERFACE = 299, - KW_NULL = 300, - KW_VAR = 301, - KW_DYNAMIC = 302, - KW_OVERRIDE = 303, - KW_FINAL = 304, - KW_EACH = 305, - KW_GET = 306, - KW_TRY = 307, - KW_SUPER = 308, - KW_EXTENDS = 309, - KW_FALSE = 310, - KW_TRUE = 311, - KW_BOOLEAN = 312, - KW_UINT = 313, - KW_INT = 314, - KW_NUMBER = 315, - KW_STRING = 316, - KW_DEFAULT = 317, - KW_DELETE = 318, - KW_IF = 319, - KW_ELSE = 320, - KW_BREAK = 321, - KW_IS = 322, - KW_IN = 323, - KW_AS = 324, - T_DICTSTART = 325, - T_EQEQ = 326, - T_EQEQEQ = 327, - T_NE = 328, - T_NEE = 329, - T_LE = 330, - T_GE = 331, - T_ORBY = 332, - T_DIVBY = 333, - T_MODBY = 334, - T_MULBY = 335, + T_FLOAT = 265, + T_FOR = 266, + T_WHILE = 267, + T_DO = 268, + T_SWITCH = 269, + KW_IMPLEMENTS = 270, + KW_NAMESPACE = 271, + KW_PACKAGE = 272, + KW_PROTECTED = 273, + KW_PUBLIC = 274, + KW_PRIVATE = 275, + KW_USE = 276, + KW_INTERNAL = 277, + KW_NEW = 278, + KW_NATIVE = 279, + KW_FUNCTION = 280, + KW_FINALLY = 281, + KW_UNDEFINED = 282, + KW_NAN = 283, + KW_CONTINUE = 284, + KW_CLASS = 285, + KW_CONST = 286, + KW_CATCH = 287, + KW_CASE = 288, + KW_SET = 289, + KW_VOID = 290, + KW_THROW = 291, + KW_STATIC = 292, + KW_WITH = 293, + KW_INSTANCEOF = 294, + KW_IMPORT = 295, + KW_RETURN = 296, + KW_TYPEOF = 297, + KW_INTERFACE = 298, + KW_NULL = 299, + KW_VAR = 300, + KW_DYNAMIC = 301, + KW_OVERRIDE = 302, + KW_FINAL = 303, + KW_EACH = 304, + KW_GET = 305, + KW_TRY = 306, + KW_SUPER = 307, + KW_EXTENDS = 308, + KW_FALSE = 309, + KW_TRUE = 310, + KW_BOOLEAN = 311, + KW_UINT = 312, + KW_INT = 313, + KW_NUMBER = 314, + KW_STRING = 315, + KW_DEFAULT = 316, + KW_DELETE = 317, + KW_IF = 318, + KW_ELSE = 319, + KW_BREAK = 320, + KW_IS = 321, + KW_IN = 322, + KW_AS = 323, + T_DICTSTART = 324, + T_EQEQ = 325, + T_EQEQEQ = 326, + T_NE = 327, + T_NEE = 328, + T_LE = 329, + T_GE = 330, + T_ORBY = 331, + T_DIVBY = 332, + T_MODBY = 333, + T_MULBY = 334, + T_ANDBY = 335, T_PLUSBY = 336, T_MINUSBY = 337, T_XORBY = 338, @@ -219,14 +222,14 @@ extern int a3_lex(); prec_none = 352, below_semicolon = 353, below_assignment = 354, - below_minus = 356, - minusminus_prefix = 357, - plusplus_prefix = 358, - below_curly = 359, - new2 = 360, - above_identifier = 361, - below_else = 362, - above_function = 363 + below_minus = 355, + minusminus_prefix = 356, + plusplus_prefix = 357, + below_curly = 358, + new2 = 359, + above_identifier = 360, + below_else = 361, + above_function = 362 }; #endif @@ -235,12 +238,12 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 47 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 44 "parser.y" +#line 47 "parser.y" enum yytokentype token; @@ -266,6 +269,7 @@ tokenunion regexp_t regexp; modifiers_t flags; namespace_decl_t* namespace_decl; + node_t*node; struct { abc_exception_list_t *l; code_t*finally; @@ -274,7 +278,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 278 "parser.tab.c" +#line 282 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -285,7 +289,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 265 "parser.y" +#line 273 "parser.y" static int a3_error(char*s) @@ -294,6 +298,13 @@ static int a3_error(char*s) return 0; //make gcc happy } +static void parsererror(const char*file, int line, const char*f) +{ + syntaxerror("internal error in %s, %s:%d", f, file, line); +} + +#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} + static char* concat2(const char* t1, const char* t2) { @@ -321,7 +332,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3) typedef struct _import { char*package; } import_t; - DECLARE_LIST(import); DECLARE(methodstate); @@ -356,6 +366,7 @@ struct _methodstate { char uses_parent_function; int uses_slots; dict_t*slots; + int activation_var; abc_method_t*abc; int var_index; // for inner methods @@ -378,6 +389,8 @@ typedef struct _state { 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 @@ -390,11 +403,17 @@ typedef struct _state { int switch_var; dict_t*vars; + dict_t*allvars; // also contains variables from sublevels } state_t; typedef struct _global { abc_file_t*file; - abc_script_t*init; + + parsedclass_list_t*classes; + abc_script_t*classinit; + + abc_script_t*init; //package-level code + dict_t*token2info; dict_t*file2token2info; } global_t; @@ -404,12 +423,6 @@ static state_t* state = 0; DECLARE_LIST(state); -#define MULTINAME(m,x) \ - multiname_t m;\ - namespace_t m##_ns;\ - (x)->package; \ - registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x)); - #define MEMBER_MULTINAME(m,f,n) \ multiname_t m;\ namespace_t m##_ns;\ @@ -449,6 +462,15 @@ static namespace_list_t nl2 = {&ns2,&nl3}; static namespace_list_t nl1 = {&ns1,&nl2}; static namespace_set_t nopackage_namespace_set = {&nl1}; +static dict_t*definitions=0; +void as3_set_define(const char*c) +{ + if(!definitions) + definitions = dict_new(); + if(!dict_contains(definitions,c)) + dict_put(definitions,c,0); +} + static void new_state() { NEW(state_t, s); @@ -469,24 +491,9 @@ static void new_state() state->new_vars = 0; trie_remember(active_namespaces); -} -static void state_has_imports() -{ - state->wildcard_imports = list_clone(state->wildcard_imports); - state->imports = dict_clone(state->imports); - state->has_own_imports = 1; -} -static void import_toplevel(const char*package) -{ - char* s = strdup(package); - while(1) { - dict_put(state->import_toplevel_packages, s, 0); - char*x = strrchr(s, '.'); - if(!x) - break; - *x = 0; - } - free(s); + + if(oldstate) + state->active_namespace_urls = list_clone(oldstate->active_namespace_urls); } static void state_destroy(state_t*state) @@ -499,16 +506,18 @@ static void state_destroy(state_t*state) dict_destroy(state->imports);state->imports=0; } if(state->vars) { - int t; - for(t=0;tvars->hashsize;t++) { - dictentry_t*e =state->vars->slots[t]; - while(e) { - free(e->data);e->data=0; - e = e->next; - } - } dict_destroy(state->vars);state->vars=0; } + if(state->new_vars && state->allvars) { + parserassert(!state->old || state->old->allvars != state->allvars); + DICT_ITERATE_DATA(state->allvars, void*, data) { + free(data); + } + dict_destroy(state->allvars); + } + + list_free(state->active_namespace_urls) + state->active_namespace_urls = 0; free(state); } @@ -531,7 +540,7 @@ static void old_state() free(leaving->cls); leaving->cls=0; } - + state_destroy(leaving); } @@ -551,6 +560,7 @@ void initialize_file(char*filename) new_state(); state->package = internal_filename_package = strdup(filename); + state->allvars = dict_new(); global->token2info = dict_lookup(global->file2token2info, current_filename // use long version @@ -566,7 +576,10 @@ void initialize_file(char*filename) state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope } else { state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + if(!state->method) + syntaxerror("internal error: skewed tokencount"); function_initvars(state->method, 0, 0, 1); + global->classinit = abc_initscript(global->file); global->init = abc_initscript(global->file); } } @@ -576,8 +589,10 @@ void finish_file() if(!state || state->level!=1) { syntaxerror("unexpected end of file in pass %d", as3_pass); } - + if(as3_pass==2) { + dict_del(global->file2token2info, current_filename); + code_t*header = method_header(state->method); code_t*c = wrap_function(header, 0, global->init->method->body->code); global->init->method->body->code = c; @@ -600,51 +615,24 @@ void initialize_parser() void* finish_parser() { dict_free_all(global->file2token2info, 1, (void*)dict_destroy); - global->token2info=0; - - return global->file; -} - - -static void xx_scopetest() -{ - /* findpropstrict doesn't just return a scope object- it - also makes it "active" somehow. Push local_0 on the - scope stack and read it back with findpropstrict, it'll - contain properties like "trace". Trying to find the same - property on a "vanilla" local_0 yields only a "undefined" */ - //c = abc_findpropstrict(c, "[package]::trace"); - /*c = abc_getlocal_0(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_coerce_a(c); - c = abc_setlocal_1(c); + initcode_add_classlist(global->classinit, global->classes); - c = abc_pushbyte(c, 0); - c = abc_setlocal_2(c); - - code_t*xx = c = abc_label(c); - c = abc_findpropstrict(c, "[package]::trace"); - c = abc_pushstring(c, "prop:"); - c = abc_hasnext2(c, 1, 2); - c = abc_dup(c); - c = abc_setlocal_3(c); - c = abc_callpropvoid(c, "[package]::trace", 2); - c = abc_getlocal_3(c); - c = abc_kill(c, 3); - c = abc_iftrue(c,xx);*/ + return global->file; } typedef struct _variable { int index; classinfo_t*type; char init; + char is_parameter; methodstate_t*is_inner_method; } variable_t; static variable_t* find_variable(state_t*s, char*name) { + state_t*top = s; while(s) { variable_t*v = 0; v = dict_lookup(s->vars, name); @@ -652,7 +640,7 @@ static variable_t* find_variable(state_t*s, char*name) if(s->new_vars) break; s = s->old; } - return 0; + return dict_lookup(top->allvars, name); } static variable_t* find_slot(state_t*s, const char*name) { @@ -668,11 +656,32 @@ static variable_t* find_variable_safe(state_t*s, char*name) syntaxerror("undefined variable: %s", name); return v; } + static char variable_exists(char*name) { return dict_contains(state->vars, name); } -code_t*defaultvalue(code_t*c, classinfo_t*type); + +static code_t*defaultvalue(code_t*c, classinfo_t*type) +{ + if(TYPE_IS_INT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_UINT(type)) { + c = abc_pushuint(c, 0); + } else if(TYPE_IS_FLOAT(type)) { + c = abc_pushnan(c); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else if(!type) { + //c = abc_pushundefined(c); + syntaxerror("internal error: can't generate default value for * type"); + } else { + c = abc_pushnull(c); + MULTINAME(m, type); + c = abc_coerce2(c, &m); + } + return c; +} static int alloc_local() { @@ -692,8 +701,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c v->type = type; v->init = init; - if(name) + if(name) { dict_put(state->vars, name, v); + dict_put(state->allvars, name, v); + } return v; } @@ -703,15 +714,19 @@ static int new_variable(const char*name, classinfo_t*type, char init, char maybe } #define TEMPVARNAME "__as3_temp__" -static int gettempvar() +int gettempvar() { variable_t*v = find_variable(state, TEMPVARNAME); + int i; if(v) - return v->index; - return new_variable(TEMPVARNAME, 0, 0, 0); + i = v->index; + else + i = new_variable(TEMPVARNAME, 0, 0, 0); + parserassert(i); + return i; } -code_t* var_block(code_t*body) +static code_t* var_block(code_t*body) { code_t*c = 0; code_t*k = 0; @@ -755,7 +770,7 @@ code_t* var_block(code_t*body) return c; } -void unknown_variable(char*name) +static void unknown_variable(char*name) { if(!state->method->unresolved_variables) state->method->unresolved_variables = dict_new(); @@ -763,25 +778,26 @@ void unknown_variable(char*name) dict_put(state->method->unresolved_variables, name, 0); } -#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);} - -static void parsererror(const char*file, int line, const char*f) -{ - syntaxerror("internal error in %s, %s:%d", f, file, line); -} - - -static code_t* add_scope_code(code_t*c, methodstate_t*m) +static code_t* add_scope_code(code_t*c, methodstate_t*m, char init) { - if(m->uses_slots || (m->late_binding && !m->inner)) { + if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope c = abc_getlocal_0(c); c = abc_pushscope(c); } if(m->uses_slots) { - /* FIXME: does this need to be the same activation object as - in the function header? */ - c = abc_newactivation(c); - c = abc_pushscope(c); + /* FIXME: this alloc_local() causes variable indexes to be + different in pass2 than in pass1 */ + if(!m->activation_var) + m->activation_var = alloc_local(); + if(init) { + c = abc_newactivation(c); + c = abc_dup(c); + c = abc_pushscope(c); + c = abc_setlocal(c, m->activation_var); + } else { + c = abc_getlocal(c, m->activation_var); + c = abc_pushscope(c); + } } return c; } @@ -790,7 +806,7 @@ static code_t* method_header(methodstate_t*m) { code_t*c = 0; - c = add_scope_code(c, m); + c = add_scope_code(c, m, 1); methodstate_list_t*l = m->innerfunctions; while(l) { @@ -817,6 +833,19 @@ static code_t* method_header(methodstate_t*m) c = abc_getlocal_0(c); c = abc_constructsuper(c, 0); } + + if(m->slots) { + /* all parameters that are used by inner functions + need to be copied from local to slot */ + parserassert(m->activation_var); + DICT_ITERATE_ITEMS(m->slots,char*,name,variable_t*,v) { + if(v->is_parameter) { + c = abc_getlocal(c, m->activation_var); + c = abc_getlocal(c, v->index); + c = abc_setslot(c, v->index); + } + } + } list_free(m->innerfunctions); m->innerfunctions = 0; return c; @@ -835,20 +864,15 @@ static code_t* wrap_function(code_t*c,code_t*header, code_t*body) return c; } - static void startpackage(char*name) { new_state(); - /*printf("entering package \"%s\"\n", name);*/ state->package = strdup(name); } static void endpackage() { - /*printf("leaving package \"%s\"\n", state->package);*/ - //used e.g. in classinfo_register: //free(state->package);state->package=0; - old_state(); } @@ -872,6 +896,7 @@ static namespace_t modifiers2access(modifiers_t*mod) 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; @@ -894,10 +919,9 @@ static namespace_t modifiers2access(modifiers_t*mod) } static slotinfo_t* find_class(const char*name); -memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) +static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse) { - /* FIXME- we need to loop through namespaces here */ - return registry_findmember(cls, "", name, recurse); + return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse); } static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) @@ -910,8 +934,6 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0); else index = new_variable("globalscope", 0, 0, 0); - if(index) - *(int*)0=0; parserassert(!index); } @@ -926,15 +948,11 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char if(params) { param_list_t*p=0; for(p=params->list;p;p=p->next) { - new_variable(p->param->name, p->param->type, 0, 1); + variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1); + v->is_parameter = 1; } } - if(as3_pass==2) { - m->scope_code = add_scope_code(m->scope_code, m); - } - - methodstate_list_t*l = m->innerfunctions; while(l) { methodstate_t*m = l->methodstate; @@ -947,14 +965,19 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char l = l->next; } + if(as3_pass==2) { + m->scope_code = add_scope_code(m->scope_code, m, 0); + } + if(as3_pass==2 && m->slots) { /* exchange unresolved identifiers with the actual objects */ DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) { - v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); - if(!v->type || v->type->kind != INFOTYPE_CLASS) { - syntaxerror("Couldn't find class %s", v->type->name); + classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type); + if(!type || type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name); } + v->type = type; } } } @@ -1002,6 +1025,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl state->cls = rfx_calloc(sizeof(classstate_t)); state->cls->init = rfx_calloc(sizeof(methodstate_t)); state->cls->static_init = rfx_calloc(sizeof(methodstate_t)); + state->cls->static_init->variable_count=1; /* notice: we make no effort to initialize the top variable (local0) here, even though it has special meaning. We just rely on the facat that pass 1 won't do anything with variables */ @@ -1019,6 +1043,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl int num_interfaces = (list_length(implements)); state->cls->info = classinfo_register(access, package, classname, num_interfaces); state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL); + state->cls->info->superclass = extends; int pos = 0; classinfo_list_t*l = implements; @@ -1047,14 +1072,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl pos++; } - /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends; - /* generate the abc code for this class */ MULTINAME(classname2,state->cls->info); multiname_t*extends2 = sig2mname(extends); - state->cls->abc = abc_class_new(global->file, &classname2, extends2); + multiname_destroy(extends2); + if(state->cls->info->flags&FLAG_FINAL) abc_class_final(state->cls->abc); if(!(state->cls->info->flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc); if(state->cls->info->flags&FLAG_INTERFACE) { @@ -1068,58 +1091,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl abc_class_add_interface(state->cls->abc, &m); } - /* write the construction code for this class to the global init - function */ - int slotindex = abc_initscript_addClassTrait(global->init, &classname2, state->cls->abc); - - abc_method_body_t*m = global->init->method->body; - __ getglobalscope(m); - classinfo_t*s = extends; - - int count=0; - - while(s) { - //TODO: take a look at the current scope stack, maybe - // we can re-use something - s = s->superclass; - if(!s) - break; - - multiname_t*s2 = sig2mname(s); - __ getlex2(m, s2); - multiname_destroy(s2); - - __ pushscope(m); count++; - m->code = m->code->prev->prev; // invert - } - /* continue appending after last op end */ - while(m->code && m->code->next) m->code = m->code->next; - - /* TODO: if this is one of *our* classes, we can also - do a getglobalscope/getslot (which references - the init function's slots) */ - if(extends2) { - __ getlex2(m, extends2); - __ dup(m); - /* notice: we get a Verify Error #1107 if the top elemnt on the scope - stack is not the superclass */ - __ pushscope(m);count++; - } else { - __ pushnull(m); - /* notice: we get a verify error #1107 if the top element on the scope - stack is not the global object */ - __ getlocal_0(m); - __ pushscope(m);count++; - } - __ newclass(m,state->cls->abc); - while(count--) { - __ popscope(m); - } - __ setslot(m, slotindex); - multiname_destroy(extends2); + NEW(parsedclass_t,p); + p->cls = state->cls->info; + p->abc = state->cls->abc; + list_append(global->classes, p); /* flash.display.MovieClip handling */ - if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) { if(state->package && state->package[0]) { as3_globalclass = concat3(state->package, ".", classname); @@ -1130,23 +1107,6 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl } } -static int slotstate_varconst = 0; -static modifiers_t*slotstate_flags = 0; -static void setslotstate(modifiers_t* flags, int varconst) -{ - slotstate_varconst = varconst; - slotstate_flags = flags; - if(state->cls) { - if(flags && flags->flags&FLAG_STATIC) { - state->method = state->cls->static_init; - } else { - state->method = state->cls->init; - } - } else { - parserassert(state->method); - } -} - static void endclass() { if(as3_pass == 2) { @@ -1188,6 +1148,12 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___RETHROW__) { + syntaxerror("Unresolved \"rethrow\""); + } + if(c->opcode == OPCODE___FALLTHROUGH__) { + syntaxerror("Unresolved \"fallthrough\""); + } if(c->opcode == OPCODE___PUSHPACKAGE__) { char*name = string_cstr(c->data[0]); syntaxerror("Can't reference a package (%s) as such", name); @@ -1196,10 +1162,8 @@ void check_code_for_break(code_t*c) } } - static void check_constant_against_type(classinfo_t*t, constant_t*c) { - return; #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) if(TYPE_IS_NUMBER(t)) { xassert(c->type == CONSTANT_FLOAT @@ -1253,18 +1217,15 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c if(!state->cls) { //package method minfo = methodinfo_register_global(ns.access, state->package, name); - minfo->return_type = 0; // save this for pass 2 + minfo->return_type = return_type; } else if(getset != KW_GET && getset != KW_SET) { //class method memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0); if(m) { - printf("%s.%s | %s.%s\n", - m->package, m->name, - ns.name, name); syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name); } minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); - minfo->return_type = 0; // save this for pass 2 + minfo->return_type = return_type; // getslot on a member slot only returns "undefined", so no need // to actually store these //state->minfo->slot = state->method->abc->method->trait->slot_id; @@ -1281,7 +1242,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c // not sure wether to look into superclasses here, too minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1); if(minfo) { - if(minfo->kind!=INFOTYPE_SLOT) + if(minfo->kind!=INFOTYPE_VAR) syntaxerror("class already contains a method called '%s'", name); if(!(minfo->subtype & (SUBTYPE_GETSET))) syntaxerror("class already contains a field called '%s'", name); @@ -1302,10 +1263,11 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c }*/ } else { minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name); - minfo->kind = INFOTYPE_SLOT; //hack + minfo->kind = INFOTYPE_VAR; //hack minfo->subtype = gs; - minfo->return_type = 0; + minfo->return_type = return_type; } + /* can't assign a slot as getter and setter might have different slots */ //minfo->slot = slot; } @@ -1328,6 +1290,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) new_state(); state->new_vars = 1; + state->allvars = dict_new(); if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); @@ -1367,7 +1330,8 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, } new_state(); state->new_vars = 1; - + state->allvars = dict_new(); + if(as3_pass == 1) { state->method = rfx_calloc(sizeof(methodstate_t)); state->method->has_super = 0; @@ -1402,7 +1366,6 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name, state->cls->has_constructor |= state->method->is_constructor; } - state->method->info->return_type = return_type; function_initvars(state->method, params, mod->flags, 1); } } @@ -1462,6 +1425,8 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; + parserassert(state->new_vars); + dict_destroy(state->allvars);state->allvars = 0; } old_state(); return 0; @@ -1554,11 +1519,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* return 0; } -char is_subtype_of(classinfo_t*type, classinfo_t*supertype) -{ - return 1; // FIXME -} - void breakjumpsto(code_t*c, char*name, code_t*jump) { while(c) { @@ -1586,29 +1546,8 @@ void continuejumpsto(code_t*c, char*name, code_t*jump) } } -#define IS_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a))) #define IS_NUMBER_OR_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)) || TYPE_IS_NUMBER((a))) -#define BOTH_INT(a,b) (IS_INT(a) && IS_INT(b)) - -classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op) -{ - if(!type1 || !type2) - return registry_getanytype(); - if(TYPE_IS_ANY(type1) || TYPE_IS_ANY(type2)) - return registry_getanytype(); - - if(op=='+') { - if(IS_NUMBER_OR_INT(type1) && IS_NUMBER_OR_INT(type2)) { - return TYPE_NUMBER; - } else { - return TYPE_ANY; - } - } - if(type1 == type2) - return type1; - return registry_getanytype(); -} code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { if(from==to) @@ -1626,10 +1565,21 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) if((TYPE_IS_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) && (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) { // allow conversion between number types + if(TYPE_IS_UINT(to)) + return abc_convert_u(c); + else if(TYPE_IS_INT(to)) + return abc_convert_i(c); + else if(TYPE_IS_NUMBER(to)) + return abc_convert_d(c); return abc_coerce2(c, &m); } - //printf("%s.%s\n", from.package, from.name); - //printf("%s.%s\n", to.package, to.name); + + if(TYPE_IS_BOOLEAN(to)) + return abc_convert_b(c); + if(TYPE_IS_STRING(to)) + return abc_convert_s(c); + if(TYPE_IS_OBJECT(to)) + return abc_convert_o(c); classinfo_t*supertype = from; while(supertype) { @@ -1655,30 +1605,12 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) return c; as3_error("can't convert type %s%s%s to %s%s%s", - from->package, from->package?".":"", from->name, - to->package, to->package?".":"", to->name); - return c; -} + from->package, from->package[0]?".":"", from->name, + to->package, to->package[0]?".":"", to->name); -code_t*defaultvalue(code_t*c, classinfo_t*type) -{ - if(TYPE_IS_INT(type)) { - c = abc_pushbyte(c, 0); - } else if(TYPE_IS_UINT(type)) { - c = abc_pushuint(c, 0); - } else if(TYPE_IS_FLOAT(type)) { - c = abc_pushnan(c); - } else if(TYPE_IS_BOOLEAN(type)) { - c = abc_pushfalse(c); - } else if(!type) { - //c = abc_pushundefined(c); - } else { - c = abc_pushnull(c); - MULTINAME(m, type); - c = abc_coerce2(c, &m); - } return c; } +/* move to ast.c todo end */ char is_pushundefined(code_t*c) { @@ -1790,175 +1722,6 @@ typedcode_t push_class(slotinfo_t*a) return x; } -static char is_getlocal(code_t*c) -{ - if(!c || c->prev || c->next) - return 0; - return(c->opcode == OPCODE_GETLOCAL - || c->opcode == OPCODE_GETLOCAL_0 - || c->opcode == OPCODE_GETLOCAL_1 - || c->opcode == OPCODE_GETLOCAL_2 - || c->opcode == OPCODE_GETLOCAL_3); -} -static int getlocalnr(code_t*c) -{ - if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];} - else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;} - else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;} - else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;} - else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;} - else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode); - return 0; -} - -static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore) -{ - /* converts this: - - [prefix code] [read instruction] - - to this: - - [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar] - */ - if(in && in->opcode == OPCODE_COERCE_A) { - in = code_cutlast(in); - } - if(in->next) - syntaxerror("internal error"); - - /* chop off read instruction */ - code_t*prefix = in; - code_t*r = in; - if(r->prev) { - prefix = r->prev;r->prev = 0; - prefix->next=0; - } else { - prefix = 0; - } - - char use_temp_var = readbefore; - - /* generate the write instruction, and maybe append a dup to the prefix code */ - code_t* write = abc_nop(0); - if(r->opcode == OPCODE_GETPROPERTY) { - write->opcode = OPCODE_SETPROPERTY; - multiname_t*m = (multiname_t*)r->data[0]; - write->data[0] = multiname_clone(m); - if(m->type == QNAME || m->type == MULTINAME) { - if(!justassign) { - prefix = abc_dup(prefix); // we need the object, too - } - use_temp_var = 1; - } else if(m->type == MULTINAMEL) { - if(!justassign) { - /* dupping two values on the stack requires 5 operations and one register- - couldn't adobe just have given us a dup2? */ - int temp = gettempvar(); - prefix = abc_setlocal(prefix, temp); - prefix = abc_dup(prefix); - prefix = abc_getlocal(prefix, temp); - prefix = abc_swap(prefix); - prefix = abc_getlocal(prefix, temp); - if(!use_temp_var); - prefix = abc_kill(prefix, temp); - } - use_temp_var = 1; - } else { - syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname/multiname)"); - } - } else if(r->opcode == OPCODE_GETSLOT) { - write->opcode = OPCODE_SETSLOT; - write->data[0] = r->data[0]; - if(!justassign) { - prefix = abc_dup(prefix); // we need the object, too - } - use_temp_var = 1; - } else if(r->opcode == OPCODE_GETLOCAL) { - write->opcode = OPCODE_SETLOCAL; - write->data[0] = r->data[0]; - } else if(r->opcode == OPCODE_GETLOCAL_0) { - write->opcode = OPCODE_SETLOCAL_0; - } else if(r->opcode == OPCODE_GETLOCAL_1) { - write->opcode = OPCODE_SETLOCAL_1; - } else if(r->opcode == OPCODE_GETLOCAL_2) { - write->opcode = OPCODE_SETLOCAL_2; - } else if(r->opcode == OPCODE_GETLOCAL_3) { - write->opcode = OPCODE_SETLOCAL_3; - } else if(r->opcode == OPCODE_GETSUPER) { - write->opcode = OPCODE_SETSUPER; - multiname_t*m = (multiname_t*)r->data[0]; - write->data[0] = multiname_clone(m); - } else { - code_dump(r); - syntaxerror("illegal lvalue: can't assign a value to this expression"); - } - code_t* c = 0; - - int temp = -1; - if(!justassign) { - if(use_temp_var) { - /* with getproperty/getslot, we have to be extra careful not - to execute the read code twice, as it might have side-effects - (e.g. if the property is in fact a setter/getter combination) - - So read the value, modify it, and write it again, - using prefix only once and making sure (by using a temporary - register) that the return value is what we just wrote */ - temp = gettempvar(); - c = code_append(c, prefix); - c = code_append(c, r); - if(readbefore) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, middlepart); - if(!readbefore) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, write); - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); - } else { - /* if we're allowed to execute the read code twice *and* - the middlepart doesn't modify the code, things are easier. - */ - code_t* r2 = code_dup(r); - //c = code_append(c, prefix); - parserassert(!prefix); - c = code_append(c, r); - c = code_append(c, middlepart); - c = code_append(c, write); - c = code_append(c, r2); - } - } else { - /* even smaller version: overwrite the value without reading - it out first */ - if(!use_temp_var) { - if(prefix) { - c = code_append(c, prefix); - c = abc_dup(c); - } - c = code_append(c, middlepart); - c = code_append(c, write); - c = code_append(c, r); - } else { - code_free(r);r=0; - temp = gettempvar(); - if(prefix) { - c = code_append(c, prefix); - } - c = code_append(c, middlepart); - c = abc_dup(c); - c = abc_setlocal(c, temp); - c = code_append(c, write); - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); - } - } - return c; -} char is_break_or_jump(code_t*c) { @@ -2093,13 +1856,83 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) #define PASS1 }} if(as3_pass == 1) {{ #define PASS1END }} if(as3_pass == 2) {{ #define PASS2 }} if(as3_pass == 2) {{ -#define PASS12 }} {{ +#define PASS12 }} if(as3_pass == 1 || as3_pass == 2) {{ #define PASS12END }} if(as3_pass == 2) {{ +#define PASS_ALWAYS }} {{ /* Line 273 of skeleton.m4 */ -#line 2103 "parser.tab.c" +#line 1867 "parser.tab.c" +/* Unqualified %code blocks. */ + +/* Line 274 of skeleton.m4 */ +#line 1944 "parser.y" + + char is_subtype_of(classinfo_t*type, classinfo_t*supertype) + { + return 1; // FIXME + } + + +/* Line 274 of skeleton.m4 */ +#line 2393 "parser.y" + + static void state_has_imports() + { + state->wildcard_imports = list_clone(state->wildcard_imports); + state->imports = dict_clone(state->imports); + state->has_own_imports = 1; + } + static void import_toplevel(const char*package) + { + char* s = strdup(package); + while(1) { + dict_put(state->import_toplevel_packages, s, 0); + char*x = strrchr(s, '.'); + if(!x) + break; + *x = 0; + } + free(s); + } + + +/* Line 274 of skeleton.m4 */ +#line 2526 "parser.y" + + static int slotstate_varconst = 0; + static modifiers_t*slotstate_flags = 0; + static void setslotstate(modifiers_t* flags, int varconst) + { + slotstate_varconst = varconst; + slotstate_flags = flags; + if(state->cls) { + if(flags && flags->flags&FLAG_STATIC) { + state->method = state->cls->static_init; + } else { + state->method = state->cls->init; + } + } else { + parserassert(state->method); + } + } + + +/* Line 274 of skeleton.m4 */ +#line 3414 "parser.y" + + void add_active_url(const char*url) + { + NEW(namespace_t,n); + n->name = url; + list_append(state->active_namespace_urls, n); + } + + + +/* Line 274 of skeleton.m4 */ +#line 1936 "parser.tab.c" #ifdef short # undef short @@ -2312,22 +2145,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 147 +#define YYFINAL 149 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3001 +#define YYLAST 3107 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 134 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 114 +#define YYNNTS 116 /* YYNRULES -- Number of rules. */ -#define YYNRULES 309 +#define YYNRULES 305 /* YYNRULES -- Number of states. */ -#define YYNSTATES 521 +#define YYNSTATES 519 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 363 +#define YYMAXUTOK 362 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -2338,16 +2171,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 118, 2, 2, 2, 116, 108, 2, - 122, 133, 115, 113, 100, 112, 127, 114, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 105, 99, - 109, 102, 110, 104, 128, 2, 2, 2, 2, 2, + 2, 2, 2, 117, 2, 2, 2, 115, 107, 2, + 121, 132, 114, 112, 100, 111, 126, 113, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 104, 99, + 108, 102, 109, 103, 127, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 124, 2, 125, 107, 2, 2, 2, 2, 2, + 2, 123, 2, 124, 106, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 126, 106, 132, 117, 2, 2, 2, + 2, 2, 2, 125, 105, 131, 116, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2370,8 +2203,8 @@ static const yytype_uint8 yytranslate[] = 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 101, 103, 111, 119, 120, 121, - 123, 129, 130, 131 + 95, 96, 97, 98, 101, 110, 118, 119, 120, 122, + 128, 129, 130 }; #if YYDEBUG @@ -2401,148 +2234,148 @@ static const yytype_uint16 yyprhs[] = 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 + 608, 611, 613, 615, 617, 621, 623, 627, 628, 630, + 632, 634, 638, 644, 646, 648, 650, 652, 654, 656, + 658, 660, 664, 668, 672, 676, 680, 684, 688, 692, + 696, 700, 704, 708, 711, 714, 718, 722, 726, 730, + 734, 738, 742, 746, 750, 754, 758, 762, 766, 770, + 774, 779, 782, 784, 788, 791, 796, 800, 804, 808, + 812, 816, 820, 824, 828, 832, 836, 840, 844, 850, + 853, 856, 859, 862, 866, 869, 874, 880, 884, 890, + 894, 896, 899, 904, 909, 912 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 135, 0, -1, 136, -1, -1, 137, -1, 138, -1, - 137, 138, -1, 186, -1, 198, -1, 196, -1, 217, - -1, 207, -1, 147, -1, 148, 126, 136, 132, -1, - 99, -1, -1, 140, -1, 141, -1, 140, 141, -1, - 198, -1, 196, -1, 217, -1, 207, -1, 147, -1, - 148, 126, 139, 132, -1, 99, -1, 143, -1, -1, - 143, 145, -1, 145, -1, 189, -1, 159, -1, 160, - -1, 161, -1, 163, -1, 171, -1, 154, -1, 183, - -1, 179, -1, 239, -1, 247, -1, 246, -1, 126, - 143, 132, -1, 126, 132, -1, 99, -1, 144, -1, - 150, -1, 165, -1, 166, -1, 236, -1, 181, -1, - 148, 126, 143, 132, -1, 145, 99, -1, 145, -1, - 144, -1, 3, 89, 3, -1, 102, 237, -1, -1, - 46, 151, -1, 32, 151, -1, 152, -1, 151, 100, - 152, -1, 3, 227, 149, -1, -1, 65, 146, -1, - -1, 64, 122, 155, 238, 133, 146, 153, -1, -1, - 150, -1, 239, -1, 46, 3, 227, -1, 3, -1, - 13, 122, -1, 13, 50, 122, -1, 158, 156, 99, - 238, 99, 239, 133, 146, -1, 158, 157, 68, 238, - 133, 146, -1, -1, 14, 122, 162, 238, 133, 146, - -1, -1, 15, 164, 146, 14, 122, 238, 133, -1, - 66, -1, 66, 3, -1, 30, -1, 30, 3, -1, - -1, 168, -1, 170, -1, 168, 170, -1, 169, -1, - 168, 169, -1, 34, 240, 105, 142, -1, 62, 105, - 142, -1, -1, 16, 122, 172, 240, 133, 126, 167, - 132, -1, -1, 33, 122, 3, 227, 133, 174, 126, - 142, 132, -1, -1, 28, 126, 176, 142, 132, -1, - 173, -1, 177, 173, -1, 177, -1, 177, 175, -1, - 175, -1, -1, 52, 126, 180, 142, 132, 178, -1, - 37, 238, -1, 37, -1, 39, 122, 238, 133, -1, - 182, 146, -1, 3, -1, 19, -1, 4, -1, 185, - 127, 184, -1, 184, -1, -1, 19, 185, 126, 187, - 139, 132, -1, -1, 19, 126, 188, 139, 132, -1, - 41, 223, -1, 41, 185, 127, 115, -1, -1, 191, - -1, 192, -1, 191, 192, -1, 21, -1, 22, -1, - 20, -1, 38, -1, 47, -1, 49, -1, 48, -1, - 26, -1, 24, -1, 4, -1, -1, 54, 224, -1, - -1, 54, 225, -1, -1, 17, 225, -1, -1, 190, - 31, 3, 193, 195, 126, 197, 200, 132, -1, -1, - 190, 44, 3, 194, 126, 199, 203, 132, -1, -1, - 201, -1, 202, -1, 201, 202, -1, 99, -1, 148, - 126, 200, 132, -1, 207, -1, 217, -1, 144, -1, - -1, 204, -1, 205, -1, 204, 205, -1, 99, -1, - 46, 3, -1, 190, 27, 216, 3, 122, 213, 133, - 227, -1, 46, -1, 32, -1, -1, 190, 206, 208, - 209, -1, 210, -1, 209, 100, 210, -1, 3, 227, - 149, -1, -1, 102, 212, -1, 10, -1, 8, -1, - 9, -1, 12, -1, 5, -1, 56, -1, 55, -1, - 45, -1, 3, -1, -1, 214, -1, 93, 215, -1, - 214, 100, 93, 215, -1, 214, 100, 215, -1, 215, - -1, 3, 105, 226, 211, -1, 3, 211, -1, 51, - -1, 35, -1, -1, -1, 190, 27, 216, 3, 122, - 213, 133, 227, 126, 218, 142, 132, -1, 3, -1, - -1, -1, 27, 219, 122, 213, 133, 227, 126, 221, - 142, 132, -1, 184, -1, 185, 127, 184, -1, 223, - -1, 222, -1, 224, -1, 225, 100, 224, -1, 224, - -1, 115, -1, 36, -1, 105, 226, -1, -1, -1, - 122, 229, 133, -1, -1, 230, -1, 231, -1, 237, - -1, 230, 100, -1, 231, 237, -1, -1, 25, 240, - 232, 228, -1, 240, 122, 229, 133, -1, 53, 122, - 229, 133, -1, 63, 240, -1, 42, -1, 42, 238, - -1, 240, -1, 240, -1, 238, 100, 240, -1, 238, - -1, 220, -1, 241, -1, 244, -1, 233, -1, 235, - -1, 234, -1, 6, -1, 10, -1, 11, -1, 8, - -1, 9, -1, 12, -1, 5, -1, 29, -1, 56, - -1, 55, -1, 45, -1, 240, 109, 240, -1, 240, - 110, 240, -1, 240, 75, 240, -1, 240, 76, 240, - -1, 240, 71, 240, -1, 240, 72, 240, -1, 240, - 74, 240, -1, 240, 73, 240, -1, 240, 87, 240, - -1, 240, 88, 240, -1, 118, 240, -1, 117, 240, - -1, 240, 108, 240, -1, 240, 107, 240, -1, 240, - 106, 240, -1, 240, 96, 240, -1, 240, 95, 240, - -1, 240, 94, 240, -1, 240, 114, 240, -1, 240, - 116, 240, -1, 240, 113, 240, -1, 240, 112, 240, - -1, 240, 115, 240, -1, 240, 68, 240, -1, 240, - 69, 240, -1, 240, 40, 240, -1, 240, 67, 240, - -1, 43, 122, 240, 133, -1, 36, 240, -1, 36, - -1, 122, 238, 133, -1, 112, 240, -1, 240, 124, - 240, 125, -1, 124, 229, 125, -1, -1, 243, -1, - 237, 105, 237, -1, 243, 100, 237, 105, 237, -1, - 70, 242, 132, -1, 240, 80, 240, -1, 240, 79, - 240, -1, 240, 85, 240, -1, 240, 84, 240, -1, - 240, 86, 240, -1, 240, 78, 240, -1, 240, 77, - 240, -1, 240, 83, 240, -1, 240, 81, 240, -1, - 240, 82, 240, -1, 240, 102, 240, -1, 240, 104, - 240, 105, 240, -1, 240, 91, -1, 240, 90, -1, - 91, 240, -1, 90, 240, -1, 53, 127, 3, -1, - 128, 3, -1, 240, 127, 128, 3, -1, 240, 127, - 3, 89, 3, -1, 240, 92, 3, -1, 240, 127, - 122, 240, 133, -1, 240, 127, 3, -1, 3, -1, - 18, 3, -1, 18, 3, 102, 3, -1, 18, 3, - 102, 5, -1, 190, 245, -1, 23, 18, 224, -1 + 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, + 136, 137, -1, 185, -1, 197, -1, 195, -1, 216, + -1, 206, -1, 146, -1, 147, 125, 135, 131, -1, + 99, -1, -1, 139, -1, 140, -1, 139, 140, -1, + 197, -1, 195, -1, 216, -1, 206, -1, 146, -1, + 147, 125, 138, 131, -1, 99, -1, 142, -1, -1, + 142, 144, -1, 144, -1, 188, -1, 158, -1, 159, + -1, 160, -1, 162, -1, 170, -1, 153, -1, 182, + -1, 178, -1, 239, -1, 248, -1, 247, -1, 125, + 142, 131, -1, 125, 131, -1, 99, -1, 143, -1, + 149, -1, 164, -1, 165, -1, 235, -1, 180, -1, + 147, 125, 142, 131, -1, 144, 99, -1, 144, -1, + 143, -1, 3, 89, 3, -1, 102, 243, -1, -1, + 45, 150, -1, 31, 150, -1, 151, -1, 150, 100, + 151, -1, 3, 226, 148, -1, -1, 64, 145, -1, + -1, 63, 121, 154, 237, 132, 145, 152, -1, -1, + 149, -1, 239, -1, 45, 3, 226, -1, 3, -1, + 11, 121, -1, 11, 49, 121, -1, 157, 155, 99, + 237, 99, 239, 132, 145, -1, 157, 156, 67, 237, + 132, 145, -1, -1, 12, 121, 161, 237, 132, 145, + -1, -1, 13, 163, 145, 12, 121, 237, 132, -1, + 65, -1, 65, 3, -1, 29, -1, 29, 3, -1, + -1, 167, -1, 169, -1, 167, 169, -1, 168, -1, + 167, 168, -1, 33, 243, 104, 141, -1, 61, 104, + 141, -1, -1, 14, 121, 171, 243, 132, 125, 166, + 131, -1, -1, 32, 121, 3, 226, 132, 173, 125, + 141, 131, -1, -1, 26, 125, 175, 141, 131, -1, + 172, -1, 176, 172, -1, 176, -1, 176, 174, -1, + 174, -1, -1, 51, 125, 179, 141, 131, 177, -1, + 36, 237, -1, 36, -1, 38, 121, 237, 132, -1, + 181, 145, -1, 3, -1, 17, -1, 4, -1, 184, + 126, 183, -1, 183, -1, -1, 17, 184, 125, 186, + 138, 131, -1, -1, 17, 125, 187, 138, 131, -1, + 40, 222, -1, 40, 184, 126, 114, -1, -1, 190, + -1, 191, -1, 190, 191, -1, 19, -1, 20, -1, + 18, -1, 37, -1, 46, -1, 48, -1, 47, -1, + 24, -1, 22, -1, 4, -1, -1, 53, 223, -1, + -1, 53, 224, -1, -1, 15, 224, -1, -1, 189, + 30, 3, 192, 194, 125, 196, 199, 131, -1, -1, + 189, 43, 3, 193, 125, 198, 202, 131, -1, -1, + 200, -1, 201, -1, 200, 201, -1, 99, -1, 147, + 125, 199, 131, -1, 206, -1, 216, -1, 143, -1, + -1, 203, -1, 204, -1, 203, 204, -1, 99, -1, + 45, 3, -1, 189, 25, 215, 3, 121, 212, 132, + 226, -1, 45, -1, 31, -1, -1, 189, 205, 207, + 208, -1, 209, -1, 208, 100, 209, -1, 3, 226, + 148, -1, -1, 102, 243, -1, 8, -1, 9, -1, + 10, -1, 5, -1, 55, -1, 54, -1, 44, -1, + 27, -1, 28, -1, -1, 213, -1, 93, 214, -1, + 213, 100, 93, 214, -1, 213, 100, 214, -1, 214, + -1, 3, 104, 225, 210, -1, 3, 210, -1, 50, + -1, 34, -1, -1, -1, 189, 25, 215, 3, 121, + 212, 132, 226, 125, 217, 141, 131, -1, 3, -1, + -1, -1, 25, 218, 121, 212, 132, 226, 125, 220, + 141, 131, -1, 183, -1, 184, 126, 183, -1, 222, + -1, 221, -1, 223, -1, 224, 100, 223, -1, 223, + -1, 114, -1, 35, -1, 104, 225, -1, -1, -1, + 121, 228, 132, -1, -1, 229, -1, 230, -1, 236, + -1, 229, 100, -1, 230, 236, -1, -1, 23, 243, + 231, 227, -1, 243, 121, 228, 132, -1, 52, 121, + 228, 132, -1, 62, 243, -1, 41, -1, 41, 237, + -1, 243, -1, 238, -1, 243, -1, 238, 100, 243, + -1, 243, -1, 239, 100, 243, -1, -1, 242, -1, + 3, -1, 5, -1, 241, 104, 236, -1, 242, 100, + 241, 104, 236, -1, 219, -1, 244, -1, 232, -1, + 234, -1, 233, -1, 245, -1, 211, -1, 6, -1, + 123, 228, 124, -1, 69, 240, 131, -1, 243, 108, + 243, -1, 243, 109, 243, -1, 243, 74, 243, -1, + 243, 75, 243, -1, 243, 70, 243, -1, 243, 71, + 243, -1, 243, 73, 243, -1, 243, 72, 243, -1, + 243, 87, 243, -1, 243, 88, 243, -1, 117, 243, + -1, 116, 243, -1, 243, 107, 243, -1, 243, 106, + 243, -1, 243, 105, 243, -1, 243, 96, 243, -1, + 243, 95, 243, -1, 243, 94, 243, -1, 243, 113, + 243, -1, 243, 115, 243, -1, 243, 112, 243, -1, + 243, 111, 243, -1, 243, 114, 243, -1, 243, 67, + 243, -1, 243, 68, 243, -1, 243, 39, 243, -1, + 243, 66, 243, -1, 42, 121, 243, 132, -1, 35, + 243, -1, 35, -1, 121, 238, 132, -1, 111, 243, + -1, 243, 123, 243, 124, -1, 243, 79, 243, -1, + 243, 78, 243, -1, 243, 85, 243, -1, 243, 84, + 243, -1, 243, 86, 243, -1, 243, 77, 243, -1, + 243, 76, 243, -1, 243, 83, 243, -1, 243, 80, + 243, -1, 243, 81, 243, -1, 243, 82, 243, -1, + 243, 102, 243, -1, 243, 103, 243, 104, 243, -1, + 243, 91, -1, 243, 90, -1, 91, 243, -1, 90, + 243, -1, 52, 126, 3, -1, 127, 3, -1, 243, + 126, 127, 3, -1, 243, 126, 3, 89, 3, -1, + 243, 92, 3, -1, 243, 126, 121, 243, 132, -1, + 243, 126, 3, -1, 3, -1, 16, 3, -1, 16, + 3, 102, 3, -1, 16, 3, 102, 5, -1, 189, + 246, -1, 21, 16, 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 2081, 2081, 2083, 2083, 2084, 2085, 2087, 2088, 2089, - 2090, 2091, 2092, 2093, 2094, 2096, 2096, 2097, 2098, 2100, - 2101, 2102, 2103, 2104, 2105, 2106, 2108, 2109, 2111, 2112, - 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, - 2125, 2126, 2127, 2128, 2131, 2132, 2133, 2134, 2135, 2136, - 2137, 2138, 2142, 2143, 2147, 2154, 2158, 2159, 2163, 2164, - 2166, 2167, 2169, 2230, 2231, 2234, 2234, 2253, 2254, 2255, - 2260, 2264, 2269, 2270, 2272, 2292, 2340, 2340, 2359, 2359, - 2374, 2377, 2380, 2383, 2387, 2388, 2389, 2390, 2391, 2392, - 2394, 2405, 2408, 2408, 2439, 2439, 2464, 2464, 2480, 2481, - 2482, 2483, 2491, 2500, 2500, 2549, 2553, 2564, 2574, 2591, - 2592, 2593, 2595, 2596, 2598, 2598, 2600, 2600, 2603, 2619, - 2636, 2637, 2638, 2639, 2646, 2647, 2648, 2649, 2650, 2651, - 2652, 2653, 2654, 2655, 2659, 2660, 2662, 2663, 2665, 2666, - 2670, 2668, 2676, 2674, 2683, 2684, 2685, 2686, 2687, 2688, - 2689, 2690, 2692, 2698, 2699, 2700, 2701, 2702, 2703, 2706, - 2719, 2719, 2721, 2721, 2723, 2724, 2726, 2801, 2802, 2804, - 2805, 2806, 2807, 2808, 2810, 2811, 2812, 2813, 2825, 2829, - 2835, 2841, 2849, 2854, 2860, 2868, 2876, 2877, 2878, 2881, - 2880, 2897, 2898, 2900, 2899, 2923, 2942, 2956, 2957, 2959, - 2960, 2962, 2963, 2964, 2973, 2974, 2978, 2979, 2981, 2982, - 2983, 2985, 2989, 2990, 2995, 2996, 3032, 3078, 3099, 3120, - 3123, 3130, 3131, 3132, 3138, 3144, 3146, 3148, 3150, 3152, - 3154, 3156, 3173, 3178, 3181, 3184, 3187, 3190, 3193, 3196, - 3199, 3202, 3206, 3209, 3212, 3215, 3218, 3221, 3224, 3227, - 3231, 3242, 3260, 3265, 3270, 3275, 3280, 3285, 3289, 3293, - 3298, 3302, 3306, 3315, 3324, 3334, 3339, 3351, 3357, 3362, - 3368, 3374, 3378, 3380, 3391, 3400, 3407, 3408, 3410, 3416, - 3425, 3432, 3444, 3450, 3456, 3462, 3468, 3474, 3480, 3486, - 3499, 3510, 3517, 3530, 3557, 3571, 3585, 3599, 3614, 3621, - 3628, 3635, 3642, 3653, 3703, 3808, 3815, 3822, 3829, 3844 + 0, 1849, 1849, 1851, 1851, 1852, 1853, 1855, 1856, 1857, + 1858, 1859, 1860, 1861, 1862, 1864, 1864, 1865, 1866, 1868, + 1869, 1870, 1871, 1872, 1873, 1874, 1876, 1877, 1879, 1882, + 1885, 1886, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, + 1895, 1896, 1897, 1898, 1901, 1902, 1903, 1904, 1905, 1906, + 1907, 1908, 1920, 1921, 1925, 1932, 1951, 1952, 1954, 1955, + 1957, 1958, 1960, 2020, 2021, 2024, 2024, 2043, 2044, 2045, + 2050, 2054, 2059, 2060, 2062, 2082, 2130, 2130, 2149, 2149, + 2164, 2167, 2170, 2173, 2177, 2178, 2179, 2180, 2181, 2182, + 2184, 2195, 2198, 2198, 2229, 2229, 2254, 2254, 2270, 2271, + 2272, 2273, 2281, 2290, 2290, 2339, 2343, 2354, 2364, 2381, + 2382, 2383, 2385, 2386, 2388, 2388, 2390, 2390, 2413, 2427, + 2443, 2444, 2445, 2446, 2453, 2454, 2455, 2456, 2457, 2458, + 2459, 2460, 2461, 2462, 2466, 2467, 2469, 2470, 2472, 2473, + 2477, 2475, 2483, 2481, 2490, 2491, 2492, 2493, 2494, 2495, + 2496, 2497, 2499, 2505, 2506, 2507, 2508, 2509, 2510, 2513, + 2545, 2545, 2547, 2547, 2549, 2550, 2552, 2646, 2647, 2655, + 2656, 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2680, 2684, + 2690, 2696, 2704, 2709, 2715, 2723, 2731, 2732, 2733, 2736, + 2735, 2752, 2753, 2755, 2754, 2778, 2797, 2811, 2812, 2814, + 2815, 2817, 2818, 2819, 2828, 2829, 2833, 2834, 2836, 2837, + 2838, 2840, 2844, 2845, 2850, 2851, 2888, 2938, 2959, 2981, + 2984, 2991, 2994, 2997, 3000, 3003, 3006, 3011, 3012, 3014, + 3015, 3017, 3023, 3032, 3033, 3034, 3035, 3036, 3037, 3039, + 3044, 3064, 3074, 3083, 3084, 3085, 3086, 3087, 3088, 3089, + 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, + 3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, + 3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, + 3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128, 3130, + 3131, 3132, 3133, 3135, 3150, 3156, 3162, 3168, 3174, 3187, + 3245, 3378, 3385, 3392, 3399, 3423 }; #endif @@ -2552,11 +2385,11 @@ static const yytype_uint16 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "T_IDENTIFIER", "T_NAMESPACE", - "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_BYTE", - "T_SHORT", "T_FLOAT", "\"for\"", "\"while\"", "\"do\"", "\"switch\"", - "\"implements\"", "\"namespace\"", "\"package\"", "\"protected\"", - "\"public\"", "\"private\"", "\"use\"", "\"internal\"", "\"new\"", - "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"", + "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_FLOAT", + "\"for\"", "\"while\"", "\"do\"", "\"switch\"", "\"implements\"", + "\"namespace\"", "\"package\"", "\"protected\"", "\"public\"", + "\"private\"", "\"use\"", "\"internal\"", "\"new\"", "\"native\"", + "\"function\"", "\"finally\"", "\"undefined\"", "\"NaN\"", "\"continue\"", "\"class\"", "\"const\"", "\"catch\"", "\"case\"", "\"set\"", "\"void\"", "\"throw\"", "\"static\"", "\"with\"", "\"instanceof\"", "\"import\"", "\"return\"", "\"typeof\"", @@ -2566,38 +2399,39 @@ static const char *const yytname[] = "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"", "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", - "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", - "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", - "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", - "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='", - "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", - "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix", - "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'", - "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'", - "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST", - "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST", - "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE", - "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE", - "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION", - "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT", - "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE", - "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE", - "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6", - "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH_HEAD", - "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", - "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS", - "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", - "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", - "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", - "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST", - "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST", - "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", - "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", - "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", - "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", - "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", - "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", - "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", + "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"", "\"+=\"", + "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", + "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", + "\">>\"", "prec_none", "below_semicolon", "';'", "','", + "below_assignment", "'='", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", + "'>'", "below_minus", "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", + "minusminus_prefix", "plusplus_prefix", "below_curly", "'('", "new2", + "'['", "']'", "'{'", "'.'", "'@'", "above_identifier", "below_else", + "above_function", "'}'", "')'", "$accept", "PROGRAM", + "MAYBE_PROGRAM_CODE_LIST", "PROGRAM_CODE_LIST", "PROGRAM_CODE", + "MAYBE_INPACKAGE_CODE_LIST", "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", + "MAYBECODE", "CODE", "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", + "PACKAGE_INITCODE", "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", + "VARIABLE_DECLARATION", "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", + "IF", "$@1", "FOR_INIT", "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", + "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE", + "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4", + "CATCH", "$@5", "FINALLY", "$@6", "CATCH_LIST", "CATCH_FINALLY_LIST", + "TRY", "$@7", "THROW", "WITH_HEAD", "WITH", "X_IDENTIFIER", "PACKAGE", + "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", "MAYBE_MODIFIERS", + "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST", + "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION", + "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM", + "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST", + "SLOT_DECLARATION", "$@12", "SLOT_LIST", "ONE_SLOT", "MAYBECONSTANT", + "CONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET", + "FUNCTION_DECLARATION", "$@13", "MAYBE_IDENTIFIER", "INNERFUNCTION", + "$@14", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST", + "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", + "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", + "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", + "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST", + "DICTLH", "DICT_EXPRPAIR_LIST", "E", "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 }; #endif @@ -2617,47 +2451,47 @@ static const yytype_uint16 yytoknum[] = 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 59, - 44, 354, 61, 355, 63, 58, 124, 94, 38, 60, - 62, 356, 45, 43, 47, 42, 37, 126, 33, 357, - 358, 359, 40, 360, 91, 93, 123, 46, 64, 361, - 362, 363, 125, 41 + 44, 354, 61, 63, 58, 124, 94, 38, 60, 62, + 355, 45, 43, 47, 42, 37, 126, 33, 356, 357, + 358, 40, 359, 91, 93, 123, 46, 64, 360, 361, + 362, 125, 41 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 134, 135, 136, 136, 137, 137, 138, 138, 138, - 138, 138, 138, 138, 138, 139, 139, 140, 140, 141, - 141, 141, 141, 141, 141, 141, 142, 142, 143, 143, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, - 145, 145, 146, 146, 147, 148, 149, 149, 150, 150, - 151, 151, 152, 153, 153, 155, 154, 156, 156, 156, - 157, 157, 158, 158, 159, 160, 162, 161, 164, 163, - 165, 165, 166, 166, 167, 167, 167, 167, 168, 168, - 169, 170, 172, 171, 174, 173, 176, 175, 177, 177, - 178, 178, 178, 180, 179, 181, 181, 182, 183, 184, - 184, 184, 185, 185, 187, 186, 188, 186, 189, 189, - 190, 190, 191, 191, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 193, 193, 194, 194, 195, 195, - 197, 196, 199, 198, 200, 200, 201, 201, 202, 202, - 202, 202, 202, 203, 203, 204, 204, 205, 205, 205, - 206, 206, 208, 207, 209, 209, 210, 211, 211, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, - 213, 213, 214, 214, 215, 215, 216, 216, 216, 218, - 217, 219, 219, 221, 220, 222, 223, 224, 224, 225, - 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, - 229, 230, 231, 230, 232, 233, 234, 234, 235, 236, - 236, 237, 238, 238, 239, 240, 240, 240, 240, 240, - 240, 240, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 242, 242, 243, 243, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 244, 245, 245, 245, 246, 247 + 0, 133, 134, 135, 135, 136, 136, 137, 137, 137, + 137, 137, 137, 137, 137, 138, 138, 139, 139, 140, + 140, 140, 140, 140, 140, 140, 141, 141, 142, 142, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 144, 144, 144, 144, 144, 144, + 144, 144, 145, 145, 146, 147, 148, 148, 149, 149, + 150, 150, 151, 152, 152, 154, 153, 155, 155, 155, + 156, 156, 157, 157, 158, 159, 161, 160, 163, 162, + 164, 164, 165, 165, 166, 166, 166, 166, 167, 167, + 168, 169, 171, 170, 173, 172, 175, 174, 176, 176, + 177, 177, 177, 179, 178, 180, 180, 181, 182, 183, + 183, 183, 184, 184, 186, 185, 187, 185, 188, 188, + 189, 189, 190, 190, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 192, 192, 193, 193, 194, 194, + 196, 195, 198, 197, 199, 199, 200, 200, 201, 201, + 201, 201, 201, 202, 202, 203, 203, 204, 204, 204, + 205, 205, 207, 206, 208, 208, 209, 210, 210, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 213, 213, 214, 214, 215, 215, 215, 217, + 216, 218, 218, 220, 219, 221, 222, 223, 223, 224, + 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, + 228, 229, 230, 229, 231, 232, 233, 233, 234, 235, + 235, 236, 237, 238, 238, 239, 239, 240, 240, 241, + 241, 242, 242, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 244, + 245, 246, 246, 246, 247, 248 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2685,15 +2519,15 @@ static const yytype_uint8 yyr2[] = 12, 1, 0, 0, 10, 1, 3, 1, 1, 1, 3, 1, 1, 1, 2, 0, 0, 3, 0, 1, 1, 1, 2, 2, 0, 4, 4, 4, 2, 1, - 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, - 2, 1, 3, 2, 4, 3, 0, 1, 3, 5, + 2, 1, 1, 1, 3, 1, 3, 0, 1, 1, + 1, 3, 5, 1, 1, 1, 1, 1, 1, 1, + 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, - 5, 3, 5, 3, 1, 2, 4, 4, 2, 3 + 4, 2, 1, 3, 2, 4, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 2, + 2, 2, 2, 3, 2, 4, 5, 3, 5, 3, + 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2701,153 +2535,151 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 120, 304, 133, 237, 231, 234, 235, 232, 233, 236, - 0, 0, 78, 0, 0, 126, 124, 125, 0, 132, - 0, 131, 192, 238, 271, 127, 0, 0, 0, 241, - 128, 130, 129, 0, 0, 240, 239, 0, 0, 276, - 0, 0, 14, 0, 0, 0, 0, 208, 120, 0, - 0, 2, 120, 5, 54, 12, 0, 36, 67, 31, - 32, 33, 34, 35, 38, 120, 37, 7, 30, 0, - 121, 122, 9, 8, 11, 10, 225, 228, 230, 229, - 224, 39, 222, 226, 227, 41, 40, 0, 0, 72, - 76, 120, 92, 109, 111, 110, 116, 113, 0, 0, - 304, 214, 191, 0, 270, 0, 0, 118, 0, 103, - 208, 0, 218, 65, 0, 221, 0, 277, 296, 295, - 273, 253, 252, 0, 0, 209, 210, 211, 82, 0, - 106, 219, 0, 80, 44, 43, 120, 45, 29, 0, - 46, 47, 48, 50, 0, 49, 298, 1, 6, 120, - 304, 0, 68, 0, 0, 69, 53, 108, 0, 188, - 0, 161, 0, 160, 162, 308, 123, 0, 0, 0, + 120, 300, 133, 172, 240, 169, 170, 171, 0, 0, + 78, 0, 0, 126, 124, 125, 0, 132, 0, 131, + 192, 176, 177, 272, 127, 0, 0, 0, 175, 128, + 130, 129, 0, 0, 174, 173, 0, 0, 227, 0, + 0, 14, 0, 0, 0, 0, 208, 120, 0, 0, + 2, 120, 5, 54, 12, 0, 36, 67, 31, 32, + 33, 34, 35, 38, 120, 37, 7, 30, 0, 121, + 122, 9, 8, 11, 239, 10, 233, 235, 237, 236, + 39, 225, 234, 238, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 300, + 214, 191, 0, 271, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 229, 230, 0, 0, 228, 292, 291, + 274, 254, 253, 0, 223, 0, 209, 210, 211, 221, + 82, 0, 106, 219, 0, 80, 44, 43, 120, 45, + 29, 0, 46, 47, 48, 50, 0, 49, 294, 1, + 6, 120, 300, 0, 68, 0, 0, 69, 53, 108, + 0, 188, 0, 161, 0, 160, 162, 304, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 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 + 0, 0, 0, 290, 289, 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, 305, 206, 178, 0, + 222, 0, 0, 27, 0, 293, 0, 242, 0, 0, + 0, 273, 241, 212, 213, 83, 205, 59, 60, 105, + 220, 58, 81, 42, 28, 120, 0, 205, 0, 0, + 52, 301, 187, 186, 0, 134, 136, 0, 226, 268, + 269, 266, 267, 247, 248, 250, 249, 245, 246, 282, + 281, 277, 276, 284, 285, 286, 283, 279, 278, 280, + 251, 252, 297, 260, 259, 258, 287, 0, 257, 256, + 255, 243, 244, 264, 263, 261, 265, 262, 0, 0, + 299, 0, 0, 0, 0, 0, 25, 0, 120, 17, + 23, 0, 20, 19, 22, 21, 120, 112, 0, 208, + 215, 167, 0, 0, 179, 183, 107, 119, 196, 270, + 0, 26, 217, 0, 231, 0, 224, 0, 57, 0, + 120, 13, 57, 0, 0, 0, 0, 0, 138, 0, + 0, 205, 163, 164, 0, 216, 275, 0, 0, 295, + 120, 0, 0, 117, 18, 120, 0, 0, 0, 0, + 185, 180, 205, 0, 0, 120, 0, 203, 202, 201, + 204, 0, 62, 61, 51, 0, 120, 302, 303, 178, + 135, 0, 0, 199, 137, 142, 57, 0, 288, 296, + 298, 77, 0, 84, 0, 115, 207, 168, 167, 0, + 0, 182, 0, 0, 98, 102, 100, 104, 63, 232, + 56, 0, 75, 0, 139, 140, 0, 120, 166, 165, + 79, 0, 0, 0, 85, 88, 86, 24, 184, 193, + 181, 96, 0, 99, 101, 120, 66, 120, 205, 120, + 200, 0, 157, 0, 0, 120, 155, 0, 27, 93, + 89, 87, 27, 27, 205, 64, 74, 0, 148, 152, + 0, 0, 0, 120, 146, 150, 151, 158, 188, 143, + 156, 27, 91, 0, 0, 0, 189, 120, 141, 147, + 0, 90, 194, 97, 94, 27, 0, 0, 0, 0, + 149, 178, 27, 190, 0, 0, 205, 95, 159 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 311, 312, 313, 334, 335, - 137, 138, 157, 314, 139, 385, 140, 246, 243, 458, - 57, 232, 153, 154, 58, 59, 60, 61, 213, 62, - 91, 141, 142, 445, 446, 447, 448, 63, 215, 426, - 510, 427, 475, 428, 429, 64, 229, 143, 65, 66, - 219, 220, 67, 320, 216, 68, 144, 70, 71, 351, - 353, 395, 316, 461, 317, 439, 484, 485, 486, 466, - 467, 468, 164, 318, 262, 355, 356, 373, 419, 327, - 328, 329, 259, 319, 507, 103, 76, 474, 221, 222, - 382, 397, 383, 341, 324, 124, 125, 126, 224, 77, - 78, 79, 145, 127, 80, 81, 82, 83, 116, 117, - 84, 165, 85, 86 + -1, 49, 50, 51, 52, 317, 318, 319, 340, 341, + 139, 140, 159, 320, 141, 392, 142, 251, 248, 456, + 56, 236, 155, 156, 57, 58, 59, 60, 216, 61, + 90, 143, 144, 443, 444, 445, 446, 62, 218, 424, + 508, 425, 473, 426, 427, 63, 233, 145, 64, 65, + 222, 223, 66, 326, 219, 67, 146, 69, 70, 358, + 360, 402, 322, 459, 323, 437, 482, 483, 484, 464, + 465, 466, 166, 324, 267, 362, 363, 380, 74, 333, + 334, 335, 264, 325, 505, 102, 76, 472, 224, 225, + 389, 404, 390, 348, 330, 125, 126, 127, 227, 77, + 78, 79, 147, 128, 229, 230, 80, 115, 116, 117, + 81, 82, 83, 167, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -403 +#define YYPACT_NINF -400 static const yytype_int16 yypact[] = { - 1674, -70, -403, -403, -403, -403, -403, -403, -403, -403, - -15, -72, -403, -52, 19, -403, -403, -403, 80, -403, - 2094, -403, 99, -403, 2164, -403, -16, 42, -5, -403, - -403, -403, -403, -1, 5, -403, -403, 2094, 13, 2094, - 2094, 2094, -403, 2094, 2094, 2094, 2094, 2094, 634, 123, - 128, -403, 504, -403, -403, -403, 8, -403, 2024, -403, - -403, -403, -403, -403, -403, 1926, -403, -403, -403, 240, - 361, -403, -403, -403, -403, -403, -403, -403, -403, -403, - 38, -403, 2569, -403, -403, -403, -403, 137, 20, -403, - -403, 1926, -403, -403, -403, -403, -403, -403, -87, 42, - -403, -67, -403, 21, -48, 2094, 79, -403, 2094, -403, - 2094, 138, -48, -403, 43, 2569, 76, 107, -48, -48, - 604, -48, -48, -29, 84, 110, 2094, -403, 210, 211, - 2094, 2094, 211, 212, -403, -403, 764, -403, -403, 85, - -403, -403, -403, -403, 209, -403, -403, -403, -403, 1024, - 158, 232, -403, 139, 171, -403, 141, -403, 238, 12, - 239, -403, 247, -403, -403, -403, -403, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - -403, -403, 249, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, 2094, - 11, -403, -403, 2094, 229, 2094, 1154, -403, 42, 133, - 135, -403, -403, -403, 142, 15, -10, 90, 2189, 1800, - 130, -403, 2094, 2094, -403, 2094, -403, -403, -403, -403, - -403, 161, 169, -403, 38, 38, 169, -403, -403, -403, - 1926, 149, 161, 2094, 2094, -403, 168, -403, -403, 280, - 231, 233, 286, 2569, 1016, 496, 496, 496, 322, 322, - 322, 322, 1016, 1016, 2569, 2569, 2569, 2569, 2569, 2569, - 2569, 2569, 2569, 2569, 2630, 2691, -403, 368, 368, 368, - 2569, 2386, 2752, 2813, 2874, 1016, 1016, 604, 604, -48, - -48, -48, 157, 2447, 202, 2094, 291, 14, 173, 2260, - -403, 165, 1284, -403, -403, 172, -403, -403, -403, -403, - 1154, -403, 42, 2094, -403, -43, 296, 167, 201, -403, - -403, -403, 175, -403, 174, 1800, -403, 44, -403, 200, - 63, 207, 211, 894, -403, -27, -11, 46, 113, 189, - 42, 298, 42, 190, 161, 217, -403, 2094, -403, -403, - 315, 2323, -403, 1926, 2094, 193, -403, -403, 1154, 192, - 194, 75, 63, -403, -403, 161, 26, 96, 1926, 2094, - -403, -403, -403, -403, 2094, -403, -403, -403, 2094, 1926, - -403, -403, 15, -403, 42, 199, -403, 230, -403, 207, - 286, 2569, -403, -403, -403, 103, 24, 197, -403, -403, - -403, -403, -403, -403, -403, -403, -403, -403, -403, -403, - 234, 205, 296, -403, 206, 213, -403, -403, 96, -403, - 268, -403, -403, 204, -403, 215, 230, -403, 42, 208, - -403, -403, -403, 2094, 236, 214, 24, -403, -403, -403, - -403, -403, -403, -403, 335, -403, -403, 1926, -403, 1926, - 161, 1414, -403, 339, -403, 316, 219, 227, -403, 2508, - 1800, -403, -403, -403, 1800, 1800, 161, -403, -403, 223, - -403, -403, 226, 250, 221, 1544, -403, -403, -403, -403, - 12, -403, -403, 1800, -403, 222, 224, 225, -403, 1414, - -403, -403, 354, -403, -403, -403, -403, 1800, 228, 241, - 235, 243, -403, 15, 1800, -403, 244, 246, 161, -403, - -403 + 1663, -67, -400, -400, -400, -400, -400, -400, -10, -17, + -400, -16, 21, -400, -400, -400, 92, -400, 2106, -400, + 62, -400, -400, 2161, -400, 5, 125, 13, -400, -400, + -400, -400, -3, -60, -400, -400, 2106, 22, 90, 2106, + 2106, -400, 2106, 2106, 2106, 2106, 2106, 631, 122, 137, + -400, 502, -400, -400, -400, 19, -400, 2036, -400, -400, + -400, -400, -400, -400, 1913, -400, -400, -400, 186, 40, + -400, -400, -400, -400, -400, -400, -400, -400, -400, -400, + 38, 2615, -400, -400, -400, -400, 142, 26, -400, -400, + 1913, -400, -400, -400, -400, -400, -400, -84, 125, -400, + -2, -400, 27, -45, 2106, 23, -400, 2106, -400, 2106, + 147, -45, -400, -400, -400, 51, 76, 104, -45, -45, + 356, -45, -45, -57, 2615, 82, 108, 2106, -400, 2615, + 207, 210, 2106, 2106, 210, 211, -400, -400, 760, -400, + -400, 93, -400, -400, -400, -400, 199, -400, -400, -400, + -400, 1018, 155, 221, -400, 134, 167, 38, 138, -400, + 235, 33, 236, -400, 239, -400, -400, -400, -400, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, -400, -400, 240, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, 2106, + 2106, 2106, 2106, 14, -400, -400, 2106, 232, 2106, 1147, + -400, 125, 130, 131, -400, -400, -400, 127, 16, 126, + 154, 95, 2219, 1788, 132, -400, 2106, -400, 2106, 90, + 2106, -400, -400, -400, -400, -400, 156, 159, -400, -400, + -400, 159, -400, -400, -400, 1913, 135, 156, 2106, 2106, + -400, 160, -400, -400, 260, 219, 220, 266, 2615, 494, + 330, 330, 330, 2981, 2981, 2981, 2981, 494, 494, 2615, + 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, 2615, + 2676, 2737, -400, 269, 269, 269, 2615, 2432, 2798, 2859, + 2920, 494, 494, 356, 356, -45, -45, -45, 143, 2493, + 185, 2106, 277, 149, 161, 2290, -400, 152, 1276, -400, + -400, 163, -400, -400, -400, -400, 1147, -400, 125, 2106, + -400, 28, 281, 157, 191, -400, -400, -400, 166, -400, + 162, 1788, -400, 164, -400, 182, 2615, 67, 193, 210, + 889, -400, -30, 198, 168, 128, 178, 125, 288, 125, + 176, 156, 212, -400, 2106, -400, -400, 304, 2361, -400, + 1913, 2106, 190, -400, -400, 1147, 180, 189, 2106, 67, + -400, -400, 156, 17, 31, 1913, 2106, -400, -400, -400, + -400, 2106, -400, -400, -400, 2106, 1913, -400, -400, 16, + -400, 125, 192, -400, 222, -400, 193, 266, 2615, -400, + -400, -400, 203, 7, 194, -400, -400, 2615, 234, 213, + 281, -400, 214, 224, -400, -400, 31, -400, 278, -400, + 2615, -52, -400, 209, 222, -400, 125, 231, -400, -400, + -400, 2106, 242, 217, 7, -400, -400, -400, -400, -400, + -400, -400, 321, -400, -400, 1913, -400, 1913, 156, 1405, + -400, 340, -400, 324, 223, 286, -400, 2554, 1788, -400, + -400, -400, 1788, 1788, 156, -400, -400, 225, -400, -400, + 227, 216, 226, 1534, -400, -400, -400, -400, 33, -400, + -400, 1788, -400, 233, 237, 238, -400, 1405, -400, -400, + 350, -400, -400, -400, -400, 1788, 248, 245, 230, 255, + -400, 16, 1788, -400, 256, 258, 156, -400, -400 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -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 + -400, -400, 205, -400, 312, -290, -400, 53, -399, -29, + 1, -56, -83, 49, 2, -39, 334, 262, 45, -400, + -400, -400, -400, -400, -400, -400, -400, -400, -400, -400, + -400, -400, -400, -400, -400, -44, -42, -400, -400, -23, + -400, -20, -400, -400, -400, -400, -400, -400, -400, -400, + 9, 77, -400, -400, -400, -400, 0, -400, 318, -400, + -400, -400, 50, -400, 56, -400, -90, -400, -75, -400, + -400, -55, -400, 3, -400, -400, 6, -9, -400, -384, + -400, -304, -77, 4, -400, -400, -400, -400, -400, 386, + -92, 15, 35, -246, -400, -93, -400, -400, -400, -400, + -400, -400, -400, -115, -119, 370, -48, -400, 179, -400, + -13, -400, -400, -400, -400, -400 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2857,612 +2689,632 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 69, 54, 56, 74, 75, 114, 214, 101, 223, 155, - 156, 104, 230, 345, 304, 374, 435, 136, 325, 87, - 97, 369, 93, 94, 112, 192, 115, 118, 119, 325, - 120, 121, 122, 97, 115, 88, 156, 123, 95, 217, - 218, -70, 190, 191, 192, 93, 94, 257, 55, 72, - 90, 73, 69, 54, 56, 74, 75, 209, 443, 371, - 210, 95, 372, 258, 98, 423, 93, 94, 494, 407, - 92, 167, 495, 496, 208, 384, 209, 106, 410, 210, - 411, 249, 95, 412, 413, 414, 444, 415, 388, 167, - 167, 503, 239, 93, 94, 228, 226, 115, 99, 380, - 55, 72, 102, 73, 236, 511, 105, 89, 326, 95, - 302, 452, 517, 115, 167, 399, 390, 108, 391, 422, - 416, 244, 245, 330, 424, 109, 146, 110, 147, 425, - 417, 418, 111, 305, 149, 113, 421, 516, 167, 306, - 211, 231, 212, 225, 167, 96, 167, 363, 233, 69, - 54, 56, 74, 75, 263, 264, 265, 266, 267, 268, - 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, + 68, 53, 55, 73, 75, 100, 226, 217, 158, 157, + 103, 352, 244, 249, 250, 433, 234, 310, 138, 331, + 331, 96, 86, 111, 92, 93, 118, 119, 381, 120, + 121, 122, 124, 129, 158, 96, 376, -70, 94, 87, + 441, 220, 221, 240, 2, 193, 194, 195, 169, 54, + 71, 68, 53, 55, 73, 75, 72, 422, 13, 14, + 15, 109, 17, 423, 19, 101, 110, 262, 442, 492, + 92, 93, 391, 493, 494, 241, 211, 24, 212, 421, + 457, 213, 254, 263, 94, 414, 29, 30, 31, 97, + 195, 124, 501, 113, 232, 114, 129, 313, 92, 93, + 54, 71, 387, 105, 89, 91, 509, 72, 98, 332, + 420, 88, 94, 515, 129, 406, 450, 343, 308, 124, + 124, 212, 108, 344, 213, 148, 104, 514, 92, 93, + 378, 397, 379, 398, 107, 311, 419, 149, 169, 353, + 354, 312, 94, 112, 151, 214, 95, 215, 228, 231, + 235, 68, 53, 55, 73, 75, 268, 269, 270, 271, + 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, + 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, + 238, 388, 237, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 129, 309, + 54, 71, 160, 124, 239, 315, 242, 72, 243, 337, + 245, 161, 477, 246, 252, 160, 162, 163, 255, 68, + 53, 321, -71, 124, 257, 129, 350, 346, 495, 164, + 327, 165, 160, 258, 259, 2, 377, 260, 261, 265, + 338, 161, 266, 292, 314, 124, 124, 163, 329, 13, + 14, 15, 412, 17, 240, 19, -113, 328, 336, 349, + 347, 165, 355, 356, 342, 400, 351, 403, 24, 361, + 518, 429, 357, 359, 367, 365, 461, 29, 30, 31, + 369, 370, 371, 373, 331, 254, 386, 411, 375, 382, + 2, 383, -112, 384, 254, 391, 385, 395, 368, 399, + 396, 405, 428, 401, 13, 14, 15, 409, 17, 403, + 19, 415, 407, 432, 158, 413, 129, 435, 68, 53, + 321, 416, 436, 24, 474, 447, 68, 53, 321, 158, + 462, 461, 29, 30, 31, 440, 378, 338, 449, 451, + 158, 458, 455, 487, 460, 452, 468, 431, 469, 488, + 496, 408, 497, 507, 489, 512, 256, 498, 124, 193, + 194, 195, -153, 150, 502, 417, 511, 438, 503, 170, + 504, 374, 475, 129, 476, 68, 53, 321, 430, 510, + 206, 207, 208, 209, 210, 462, 513, 168, 516, 517, + 211, 154, 212, 247, 393, 213, -155, -155, -155, 158, + 470, 158, 471, 453, 178, 179, 454, 506, 499, 448, + 490, 500, 106, 439, 418, 123, 434, -154, 345, 0, + 193, 194, 195, 0, 196, 197, 198, 0, 467, 0, + 0, 0, 0, 0, 0, 0, 0, 463, 204, 205, + 0, 206, 207, 208, 209, 210, 193, 194, 195, 0, + 0, 211, 0, 212, 0, 0, 213, 0, 0, 481, + 479, 480, 485, 486, 0, 463, 0, 0, 0, 208, + 209, 210, 0, 0, 0, 0, 0, 211, 0, 212, + 0, 0, 213, 481, 479, 480, 485, 486, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 481, 479, 480, + 485, 486, -4, 0, 0, 1, 2, 3, 4, 0, + 5, 6, 7, 8, 9, 10, 11, 0, 0, 12, + 13, 14, 15, 16, 17, 18, 19, 0, 0, 21, + 22, 0, 0, -155, 0, 0, 0, 23, 0, 24, + 25, 0, 26, 0, 27, 0, 28, 0, 29, 30, + 31, 0, 0, 32, 33, 0, 34, 35, 0, 0, + 0, 0, 0, 0, 36, 37, 0, 0, -155, -155, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 193, 194, 195, 0, 196, 197, + 198, 0, 39, 40, 0, 0, 0, 0, 0, 0, + 0, 41, -155, -155, 0, 206, 207, 208, 209, 210, + 0, 0, 0, 42, 0, 211, 0, 212, 43, 44, + 213, 0, 0, 45, 0, 46, 0, 47, 0, 48, + 0, 0, 0, -4, 1, 2, 3, 4, 0, 5, + 6, 7, 8, 9, 10, 11, 0, 0, 0, 13, + 14, 15, 16, 17, 18, 19, 20, 0, 21, 22, + 130, 0, 131, 0, 0, 0, 23, 132, 24, 25, + 0, 26, 133, 27, 0, 28, 134, 29, 30, 31, + 0, 0, 32, 33, 0, 34, 35, 0, 0, 0, + 0, 0, 0, 36, 37, 0, 135, 0, 0, 0, + 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, + 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, + 0, 0, 45, 0, 46, 0, 47, 0, 48, 0, + 0, 0, 137, 1, 2, 3, 4, 0, 5, 6, + 7, 8, 9, 10, 11, 0, 0, 0, 13, 14, + 15, 16, 17, 18, 19, 20, 0, 21, 22, 130, + 0, 131, 0, 0, 0, 23, 132, 24, 25, 0, + 26, 133, 27, 0, 28, 134, 29, 30, 31, 0, + 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, + 0, 0, 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 203, 204, 205, 206, 207, 483, 481, 482, 487, 488, - 208, 0, 209, 0, 0, 210, 0, 0, 0, 483, - 481, 482, 487, 488, -4, 0, 0, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 168, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, -155, -155, -155, 0, 37, 38, 0, - 0, 176, 177, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 190, 191, 192, 0, - 193, 194, 195, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 201, 202, 0, 203, 204, - 205, 206, 207, 0, 0, 0, 43, 0, 208, 0, - 209, 44, 45, 210, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -4, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 190, 191, 192, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 205, 206, - 207, 0, 0, 0, 40, 41, 208, 0, 209, 0, - 0, 210, 0, 134, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, 135, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 134, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, 248, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 22, 0, 23, 128, 0, 129, 0, 0, 0, - 24, 130, 25, 26, 0, 27, 131, 28, 0, 29, - 132, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 133, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 39, 40, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 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, 42, 0, 0, 0, 0, 43, 44, 0, 0, + 0, 45, 0, 46, 0, 47, 0, 48, 0, 0, + 0, 253, 1, 2, 3, 4, 0, 5, 6, 7, + 8, 9, 10, 11, 0, 0, 0, 13, 14, 15, + 16, 17, 18, 19, 20, 0, 21, 22, 130, 0, + 131, 0, 0, 0, 23, 132, 24, 25, 0, 26, + 133, 27, 0, 28, 134, 29, 30, 31, 0, 0, + 32, 33, 0, 34, 35, 0, 0, 0, 0, 0, + 0, 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 39, + 40, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, - 0, 0, 0, 310, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, - 48, 0, 49, 0, 0, 0, -16, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 0, 0, 0, 15, 16, 17, 18, 19, 20, - 21, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 24, 0, 25, 26, 0, 27, 0, 28, 0, 29, - 0, 30, 31, 32, 0, 0, 33, 34, 0, 35, - 36, 0, 0, 0, 0, 0, 0, 37, 38, 0, - 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 45, 0, 46, 0, 47, 0, 48, 0, 0, 0, + 394, 1, 2, 3, 4, 0, 5, 6, 7, 8, + 9, 10, 11, 0, 0, 12, 13, 14, 15, 16, + 17, 18, 19, 0, 0, 21, 22, 0, 0, 0, + 0, 0, 0, 23, 0, 24, 25, 0, 26, 0, + 27, 0, 28, 0, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, + 0, 46, 0, 47, 0, 48, 0, 0, 0, -3, + 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, + 10, 11, 0, 0, 0, 13, 14, 15, 16, 17, + 18, 19, 0, 0, 21, 22, 0, 0, 0, 0, + 0, 0, 23, 0, 24, 25, 0, 26, 0, 27, + 0, 28, 0, 29, 30, 31, 0, 0, 32, 33, + 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, + 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 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, 39, 40, 0, + 0, 0, 0, 0, 0, 0, 316, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, + 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, + 46, 0, 47, 0, 48, 0, 0, 0, -15, 1, + 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, + 11, 0, 0, 0, 13, 14, 15, 16, 17, 18, + 19, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 0, 23, 0, 24, 25, 0, 26, 0, 27, 0, + 28, 0, 29, 30, 31, 0, 0, 32, 33, 0, + 34, 35, 0, 0, 0, 0, 0, 0, 36, 37, + 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 316, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, + 0, 47, 0, 48, 0, 0, 0, -16, 1, 2, + 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, + 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, + 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, + 23, 0, 24, 25, 0, 26, 0, 27, 0, 28, + 0, 29, 30, 31, 0, 0, 32, 33, 0, 34, + 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, + 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 41, 0, 0, 0, 0, 0, 0, 0, 134, + 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, + 0, 0, 0, 0, 478, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, + 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, + 47, 0, 48, 0, 0, 0, -144, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 0, + 0, 0, 13, 14, 15, 16, 17, 18, 19, 0, + 0, 21, 22, 0, 0, 0, 0, 0, 0, 23, + 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, + 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, + 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, + 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 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, 128, 0, 129, 0, - 0, 0, 24, 130, 25, 26, 0, 27, 131, 28, - 0, 29, 132, 30, 31, 32, 0, 0, 33, 34, - 0, 35, 36, 0, 0, 0, 0, 0, 0, 37, - 38, 0, 133, 0, 0, 0, 39, 0, 0, 0, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, + 0, 0, 0, 478, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, + 43, 44, 0, 0, 0, 45, 0, 46, 0, 47, + 0, 48, 0, -3, 0, -145, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 0, 0, + 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, + 21, 22, 0, 0, 0, 0, 0, 0, 23, 0, + 24, 25, 0, 26, 0, 27, 0, 28, 0, 29, + 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, + 0, 0, 0, 0, 0, 36, 37, 0, 0, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, + 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, + 44, 0, 0, 0, 45, 0, 46, 0, 47, 0, + 48, 1, 2, 3, 4, 0, 5, 6, 7, 8, + 9, 10, 11, 0, -120, 0, 13, 14, 15, 16, + 17, 18, 19, 20, 0, 21, 22, 130, 0, 131, + 0, 0, 0, 23, 132, 24, 25, 0, 26, 133, + 27, 0, 28, 134, 29, 30, 31, 0, 0, 32, + 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, + 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, + 0, 46, 0, 47, 0, 48, 1, 2, 3, 4, + 0, 5, 6, 7, 8, 9, 10, 11, 0, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 0, + 21, 22, 130, 0, 131, 0, 0, 0, 23, 132, + 24, 25, 0, 26, 133, 27, 0, 28, 134, 29, + 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, + 0, 0, 0, 0, 0, 36, 37, 0, 135, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 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, 39, 40, 0, 0, 0, 0, 0, + 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, + 44, 0, 0, 0, 45, 0, 46, 0, 47, 152, + 48, 3, 4, 0, 5, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, + 0, 20, 0, 21, 22, 0, 0, 131, 0, 0, + 0, 23, 0, 0, 0, 0, 0, 0, 27, 0, + 28, 153, 0, 0, 0, 0, 0, 0, 33, 0, + 34, 35, 0, 0, 0, 0, 0, 0, 36, 0, + 0, 0, 0, 0, 0, 38, 0, 0, 0, 99, + 0, 3, 4, 0, 5, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 18, + 0, 20, 0, 21, 22, 0, 0, 0, 0, 0, + 0, 23, 0, 0, 0, 0, 0, 42, 27, 0, + 28, 0, 43, 44, 0, 0, 0, 45, 33, 46, + 34, 35, 0, 48, 99, 0, 3, 4, 36, 5, + 6, 7, 0, 0, 0, 38, 0, 0, 0, 0, + 0, 0, 0, 0, 18, 0, 20, 0, 21, 22, + 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, + 0, 0, 0, 33, 0, 34, 35, 42, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, + 38, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, + 0, 39, 40, 0, 0, 0, 0, 0, 170, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 45, 0, 46, 171, 172, 173, 48, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 0, 190, 191, 192, 0, - 193, 194, 195, 0, 0, 0, 0, 168, 196, 0, - 197, 357, 198, 199, 200, 201, 202, 0, 203, 204, - 205, 206, 207, 0, 0, 0, 0, 0, 208, 0, - 209, 0, 0, 210, 169, 170, 171, 0, 172, 173, + 185, 186, 187, 188, 189, 190, 191, 192, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 0, + 0, 199, 200, 0, 201, 202, 203, 204, 205, 170, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 0, 0, 0, 0, + 0, 339, 0, 0, 0, 0, 171, 172, 173, 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 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, 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, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 0, + 193, 194, 195, 0, 196, 197, 198, 0, 0, 0, + 0, 0, 199, 200, 0, 201, 202, 203, 204, 205, + 170, 206, 207, 208, 209, 210, 0, 0, 0, 0, + 0, 211, 0, 212, 0, 0, 213, 0, 0, 0, + 0, 0, 372, 0, 0, 0, 0, 171, 172, 173, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 199, 200, 0, 201, 202, 203, 204, + 205, 170, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213, 0, 0, + 0, 0, 0, 410, 0, 0, 0, 0, 171, 172, + 173, 0, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 0, 193, 194, 195, 0, 196, 197, 198, 0, + 0, 0, 170, 0, 199, 200, 364, 201, 202, 203, + 204, 205, 0, 206, 207, 208, 209, 210, 0, 0, + 0, 0, 0, 211, 0, 212, 0, 0, 213, 171, + 172, 173, 0, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 0, 193, 194, 195, 0, 196, 197, 198, + 0, 0, 0, 170, 0, 199, 200, 0, 201, 202, + 203, 204, 205, 0, 206, 207, 208, 209, 210, 0, + 0, 0, 0, 0, 211, 0, 212, 366, 0, 213, + 171, 172, 173, 0, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 0, 193, 194, 195, 0, 196, 197, + 198, 0, 0, 0, 170, 0, 199, 200, 491, 201, + 202, 203, 204, 205, 0, 206, 207, 208, 209, 210, + 0, 0, 0, 0, 0, 211, 0, 212, 0, 0, + 213, 171, 172, 173, 0, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 0, 193, 194, 195, 0, 196, + 197, 198, 0, 0, 0, 170, 0, 199, 200, 0, + 201, 202, 203, 204, 205, 0, 206, 207, 208, 209, + 210, 0, 0, 0, 0, 0, 211, 0, 212, 0, + 0, 213, 171, 172, 173, 0, 174, 175, 176, 177, + 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 192, 0, 193, 194, 195, 0, + 196, 197, 198, 0, 0, 0, 170, 0, 0, 0, + 0, 201, 202, 203, 204, 205, 0, 206, 207, 208, + 209, 210, 0, 0, 0, 0, 0, 211, 0, 212, + 0, 0, 213, 171, 172, 173, 0, 174, 175, 176, + 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 194, 195, + 0, 196, 197, 198, 0, 0, 0, 170, 0, 0, + 0, 0, 201, 202, 203, 204, 205, 0, 206, 207, + 208, 209, 210, 0, 0, 0, 0, 0, 211, 0, + 212, 0, 0, 213, 171, 172, 173, 0, 174, 175, + 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 193, 194, + 195, 0, 196, 197, 198, 0, 0, 0, 170, 0, + 0, 0, 0, 0, 202, 203, 204, 205, 0, 206, + 207, 208, 209, 210, 0, 0, 0, 0, 0, 211, + 0, 212, 0, 0, 213, 171, 172, 173, 0, 174, + 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 170, + 0, 0, 0, 0, 0, 0, 203, 204, 205, 0, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 171, 172, 173, 0, + 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 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, + 193, 194, 195, 0, 196, 197, 198, 0, 0, 0, + 170, 0, 0, 0, 0, 0, 0, -155, 204, 205, + 0, 206, 207, 208, 209, 210, 0, 0, 0, 0, + 0, 211, 0, 212, 0, 0, 213, 171, 172, 173, + 0, -155, -155, -155, -155, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 190, 191, 192, 0, 193, 194, 195, - 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, - 0, 200, 201, 202, 0, 203, 204, 205, 206, 207, - 0, 0, 0, 0, 0, 208, 0, 209, 0, 0, - 210, 169, 170, 171, 0, 172, 173, 174, 175, 176, - 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 190, 191, 192, 0, 193, 194, - 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -155, 201, 202, 0, 203, 204, 205, 206, - 207, 0, 0, 0, 0, 0, 208, 0, 209, 0, - 0, 210 + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, + 205, 0, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 39, 91, 20, 99, 58, - 65, 24, 110, 252, 3, 326, 392, 48, 3, 89, - 14, 320, 3, 4, 37, 92, 39, 40, 41, 3, - 43, 44, 45, 27, 47, 50, 91, 46, 19, 126, - 127, 68, 90, 91, 92, 3, 4, 35, 0, 0, - 122, 0, 52, 52, 52, 52, 52, 124, 34, 102, - 127, 19, 105, 51, 14, 376, 3, 4, 470, 368, - 122, 100, 474, 475, 122, 102, 124, 27, 3, 127, - 5, 136, 19, 8, 9, 10, 62, 12, 99, 100, - 100, 493, 126, 3, 4, 108, 105, 110, 18, 36, - 52, 52, 3, 52, 133, 507, 122, 122, 93, 19, - 208, 422, 514, 126, 100, 354, 3, 122, 5, 93, - 45, 130, 131, 133, 28, 126, 3, 122, 0, 33, - 55, 56, 127, 122, 126, 122, 375, 513, 100, 128, - 3, 3, 122, 122, 100, 126, 100, 133, 105, 149, - 149, 149, 149, 149, 167, 168, 169, 170, 171, 172, + 0, 0, 0, 0, 0, 18, 98, 90, 64, 57, + 23, 257, 127, 132, 133, 399, 109, 3, 47, 3, + 3, 12, 89, 36, 3, 4, 39, 40, 332, 42, + 43, 44, 45, 46, 90, 26, 326, 67, 17, 49, + 33, 125, 126, 100, 4, 90, 91, 92, 100, 0, + 0, 51, 51, 51, 51, 51, 0, 26, 18, 19, + 20, 121, 22, 32, 24, 3, 126, 34, 61, 468, + 3, 4, 102, 472, 473, 132, 121, 37, 123, 383, + 132, 126, 138, 50, 17, 375, 46, 47, 48, 12, + 92, 104, 491, 3, 107, 5, 109, 216, 3, 4, + 51, 51, 35, 26, 121, 121, 505, 51, 16, 93, + 93, 121, 17, 512, 127, 361, 420, 236, 211, 132, + 133, 123, 125, 238, 126, 3, 121, 511, 3, 4, + 102, 3, 104, 5, 121, 121, 382, 0, 100, 258, + 259, 127, 17, 121, 125, 3, 125, 121, 121, 126, + 3, 151, 151, 151, 151, 151, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 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, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 104, 114, 131, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 151, 151, 16, 216, 100, 218, 124, 151, 100, 114, + 3, 25, 458, 3, 3, 16, 30, 31, 125, 219, + 219, 219, 67, 236, 3, 238, 255, 240, 474, 43, + 221, 45, 16, 99, 67, 4, 329, 99, 3, 3, + 231, 25, 3, 3, 12, 258, 259, 31, 121, 18, + 19, 20, 371, 22, 100, 24, 126, 126, 132, 100, + 104, 45, 102, 3, 132, 357, 131, 359, 37, 3, + 516, 386, 53, 53, 89, 132, 45, 46, 47, 48, + 3, 132, 121, 131, 3, 341, 104, 370, 125, 132, + 4, 100, 126, 131, 350, 102, 132, 99, 311, 121, + 132, 125, 385, 15, 18, 19, 20, 3, 22, 401, + 24, 131, 100, 396, 370, 125, 329, 125, 318, 318, + 318, 132, 100, 37, 3, 131, 326, 326, 326, 385, + 99, 45, 46, 47, 48, 132, 102, 328, 125, 125, + 396, 132, 64, 3, 436, 121, 104, 395, 131, 25, + 125, 364, 125, 3, 131, 125, 151, 131, 371, 90, + 91, 92, 131, 51, 131, 378, 121, 406, 131, 39, + 132, 318, 455, 386, 457, 375, 375, 375, 391, 131, + 111, 112, 113, 114, 115, 99, 131, 69, 132, 131, + 121, 57, 123, 131, 349, 126, 66, 67, 68, 455, + 444, 457, 444, 426, 74, 75, 426, 497, 483, 418, + 465, 488, 26, 407, 379, 45, 401, 131, 239, -1, + 90, 91, 92, -1, 94, 95, 96, -1, 441, -1, + -1, -1, -1, -1, -1, -1, -1, 437, 108, 109, + -1, 111, 112, 113, 114, 115, 90, 91, 92, -1, + -1, 121, -1, 123, -1, -1, 126, -1, -1, 459, + 459, 459, 459, 459, -1, 465, -1, -1, -1, 113, + 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, + -1, -1, 126, 483, 483, 483, 483, 483, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 497, 497, 497, + 497, 497, 0, -1, -1, 3, 4, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, -1, -1, 17, + 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, + 28, -1, -1, 39, -1, -1, -1, 35, -1, 37, + 38, -1, 40, -1, 42, -1, 44, -1, 46, 47, + 48, -1, -1, 51, 52, -1, 54, 55, -1, -1, + -1, -1, -1, -1, 62, 63, -1, -1, 74, 75, + -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, + 96, -1, 90, 91, -1, -1, -1, -1, -1, -1, + -1, 99, 108, 109, -1, 111, 112, 113, 114, 115, + -1, -1, -1, 111, -1, 121, -1, 123, 116, 117, + 126, -1, -1, 121, -1, 123, -1, 125, -1, 127, + -1, -1, -1, 131, 3, 4, 5, 6, -1, 8, + 9, 10, 11, 12, 13, 14, -1, -1, -1, 18, + 19, 20, 21, 22, 23, 24, 25, -1, 27, 28, + 29, -1, 31, -1, -1, -1, 35, 36, 37, 38, + -1, 40, 41, 42, -1, 44, 45, 46, 47, 48, + -1, -1, 51, 52, -1, 54, 55, -1, -1, -1, + -1, -1, -1, 62, 63, -1, 65, -1, -1, -1, + 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 112, 113, 114, 115, 116, 485, 485, 485, 485, 485, - 122, -1, 124, -1, -1, 127, -1, -1, -1, 499, - 499, 499, 499, 499, 0, -1, -1, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, 40, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, 67, 68, 69, -1, 63, 64, -1, - -1, 75, 76, -1, 70, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, 112, -1, 122, -1, - 124, 117, 118, 127, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, - 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, - 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, 90, 91, 92, 63, 64, -1, - 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 114, 115, - 116, -1, -1, -1, 90, 91, 122, -1, 124, -1, - -1, 127, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, 27, -1, 29, 30, -1, 32, -1, -1, -1, - 36, 37, 38, 39, -1, 41, 42, 43, -1, 45, - 46, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - 66, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, 90, 91, -1, -1, -1, -1, -1, -1, -1, + 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, + -1, -1, 121, -1, 123, -1, 125, -1, 127, -1, + -1, -1, 131, 3, 4, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, -1, -1, -1, 18, 19, + 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, + -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, + 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, + -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, + -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 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, - -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, + 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, + -1, 121, -1, 123, -1, 125, -1, 127, -1, -1, + -1, 131, 3, 4, 5, 6, -1, 8, 9, 10, + 11, 12, 13, 14, -1, -1, -1, 18, 19, 20, + 21, 22, 23, 24, 25, -1, 27, 28, 29, -1, + 31, -1, -1, -1, 35, 36, 37, 38, -1, 40, + 41, 42, -1, 44, 45, 46, 47, 48, -1, -1, + 51, 52, -1, 54, 55, -1, -1, -1, -1, -1, + -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, - -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - -1, 117, 118, -1, -1, -1, 122, -1, 124, -1, - 126, -1, 128, -1, -1, -1, 132, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, - 26, -1, -1, 29, -1, -1, -1, -1, -1, -1, - 36, -1, 38, 39, -1, 41, -1, 43, -1, 45, - -1, 47, 48, 49, -1, -1, 52, 53, -1, 55, - 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, - -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -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, + 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, + 121, -1, 123, -1, 125, -1, 127, -1, -1, -1, + 131, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, -1, 17, 18, 19, 20, 21, + 22, 23, 24, -1, -1, 27, 28, -1, -1, -1, + -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, + 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 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, 90, 91, + -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, + -1, 123, -1, 125, -1, 127, -1, -1, -1, 131, + 3, 4, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, -1, -1, -1, 18, 19, 20, 21, 22, + 23, 24, -1, -1, 27, 28, -1, -1, -1, -1, + -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, + -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, + -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, + 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, + -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, + -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, + 123, -1, 125, -1, 127, -1, -1, -1, 131, 3, + 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, -1, -1, -1, 18, 19, 20, 21, 22, 23, + 24, -1, -1, 27, 28, -1, -1, -1, -1, -1, + -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, + 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, + 54, 55, -1, -1, -1, -1, -1, -1, 62, 63, + -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, + -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, + -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, + -1, 125, -1, 127, -1, -1, -1, 131, 3, 4, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + -1, -1, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, -1, -1, -1, -1, -1, -1, + 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, + -1, 46, 47, 48, -1, -1, 51, 52, -1, 54, + 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, + -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, + -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, + 125, -1, 127, -1, -1, -1, 131, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, -1, + -1, -1, 18, 19, 20, 21, 22, 23, 24, -1, + -1, 27, 28, -1, -1, -1, -1, -1, -1, 35, + -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, + 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, + -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, + -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -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, 111, -1, -1, -1, -1, + 116, 117, -1, -1, -1, 121, -1, 123, -1, 125, + -1, 127, -1, 0, -1, 131, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, + 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, + 27, 28, -1, -1, -1, -1, -1, -1, 35, -1, + 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, -1, -1, + -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 90, 91, -1, -1, -1, -1, -1, -1, -1, 99, + -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, + 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, + 127, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, 16, -1, 18, 19, 20, 21, + 22, 23, 24, 25, -1, 27, 28, 29, -1, 31, + -1, -1, -1, 35, 36, 37, 38, -1, 40, 41, + 42, -1, 44, 45, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 112, -1, -1, -1, -1, 117, 118, -1, - -1, -1, 122, -1, 124, -1, 126, -1, 128, 3, - 4, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, -1, -1, -1, 20, 21, 22, 23, - 24, 25, 26, 27, -1, 29, 30, -1, 32, -1, - -1, -1, 36, 37, 38, 39, -1, 41, 42, 43, - -1, 45, 46, 47, 48, 49, -1, -1, 52, 53, - -1, 55, 56, -1, -1, -1, -1, -1, -1, 63, - 64, -1, 66, -1, -1, -1, 70, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + -1, -1, -1, -1, -1, -1, -1, 99, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, + -1, 123, -1, 125, -1, 127, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, + -1, 18, 19, 20, 21, 22, 23, 24, 25, -1, + 27, 28, 29, -1, 31, -1, -1, -1, 35, 36, + 37, 38, -1, 40, 41, 42, -1, 44, 45, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, 65, -1, + -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, + 117, -1, -1, -1, 121, -1, 123, -1, 125, 3, + 127, 5, 6, -1, 8, 9, 10, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, + -1, 25, -1, 27, 28, -1, -1, 31, -1, -1, + -1, 35, -1, -1, -1, -1, -1, -1, 42, -1, + 44, 45, -1, -1, -1, -1, -1, -1, 52, -1, + 54, 55, -1, -1, -1, -1, -1, -1, 62, -1, + -1, -1, -1, -1, -1, 69, -1, -1, -1, 3, + -1, 5, 6, -1, 8, 9, 10, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, -1, 23, + -1, 25, -1, 27, 28, -1, -1, -1, -1, -1, + -1, 35, -1, -1, -1, -1, -1, 111, 42, -1, + 44, -1, 116, 117, -1, -1, -1, 121, 52, 123, + 54, 55, -1, 127, 3, -1, 5, 6, 62, 8, + 9, 10, -1, -1, -1, 69, -1, -1, -1, -1, + -1, -1, -1, -1, 23, -1, 25, -1, 27, 28, -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, - -1, -1, -1, -1, -1, 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, 44, -1, -1, -1, -1, + -1, -1, -1, 52, -1, 54, 55, 111, -1, -1, + -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, + 69, -1, -1, 127, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 67, 68, 69, -1, + -1, 90, 91, -1, -1, -1, -1, -1, 39, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 121, -1, 123, 66, 67, 68, 127, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, - 91, 92, -1, 94, 95, 96, 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, + 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, + -1, 102, 103, -1, 105, 106, 107, 108, 109, 39, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, -1, -1, -1, -1, + -1, 132, -1, -1, -1, -1, 66, 67, 68, -1, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, -1, 102, 40, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, -1, -1, - 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, + -1, -1, 102, 103, -1, 105, 106, 107, 108, 109, + 39, 111, 112, 113, 114, 115, -1, -1, -1, -1, + -1, 121, -1, 123, -1, -1, 126, -1, -1, -1, + -1, -1, 132, -1, -1, -1, -1, 66, 67, 68, + -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, -1, 102, 103, -1, 105, 106, 107, 108, + 109, 39, 111, 112, 113, 114, 115, -1, -1, -1, + -1, -1, 121, -1, 123, -1, -1, 126, -1, -1, + -1, -1, -1, 132, -1, -1, -1, -1, 66, 67, + 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, 39, -1, 102, 103, 104, 105, 106, 107, + 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, + -1, -1, -1, 121, -1, 123, -1, -1, 126, 66, + 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, -1, 102, 40, 104, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 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, + -1, -1, -1, 39, -1, 102, 103, -1, 105, 106, + 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, + -1, -1, -1, -1, 121, -1, 123, 124, -1, 126, + 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, 39, -1, 102, 103, 104, 105, + 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, + -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, + 126, 66, 67, 68, -1, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, + 95, 96, -1, -1, -1, 39, -1, 102, 103, -1, + 105, 106, 107, 108, 109, -1, 111, 112, 113, 114, + 115, -1, -1, -1, -1, -1, 121, -1, 123, -1, + -1, 126, 66, 67, 68, -1, 70, 71, 72, 73, + 74, 75, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 88, -1, 90, 91, 92, -1, + 94, 95, 96, -1, -1, -1, 39, -1, -1, -1, + -1, 105, 106, 107, 108, 109, -1, 111, 112, 113, + 114, 115, -1, -1, -1, -1, -1, 121, -1, 123, + -1, -1, 126, 66, 67, 68, -1, 70, 71, 72, + 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, 39, -1, -1, + -1, -1, 105, 106, 107, 108, 109, -1, 111, 112, + 113, 114, 115, -1, -1, -1, -1, -1, 121, -1, + 123, -1, -1, 126, 66, 67, 68, -1, 70, 71, + 72, 73, 74, 75, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, 39, -1, + -1, -1, -1, -1, 106, 107, 108, 109, -1, 111, + 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, + -1, 123, -1, -1, 126, 66, 67, 68, -1, 70, + 71, 72, 73, 74, 75, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 91, 92, -1, 94, 95, 96, -1, -1, -1, 39, + -1, -1, -1, -1, -1, -1, 107, 108, 109, -1, + 111, 112, 113, 114, 115, -1, -1, -1, -1, -1, + 121, -1, 123, -1, -1, 126, 66, 67, 68, -1, + 70, 71, 72, 73, 74, 75, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, -1, -1, -1, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + 39, -1, -1, -1, -1, -1, -1, 107, 108, 109, + -1, 111, 112, 113, 114, 115, -1, -1, -1, -1, + -1, 121, -1, 123, -1, -1, 126, 66, 67, 68, + -1, 70, 71, 72, 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, - -1, -1, 40, -1, -1, -1, -1, 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 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 108, + 109, -1, 111, 112, 113, 114, 115, -1, -1, -1, + -1, -1, 121, -1, 123, -1, -1, 126 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3470,58 +3322,57 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 29, 36, 38, 39, 41, 43, 45, - 47, 48, 49, 52, 53, 55, 56, 63, 64, 70, - 90, 91, 99, 112, 117, 118, 122, 124, 126, 128, - 135, 136, 137, 138, 144, 147, 148, 154, 158, 159, - 160, 161, 163, 171, 179, 182, 183, 186, 189, 190, - 191, 192, 196, 198, 207, 217, 220, 233, 234, 235, - 238, 239, 240, 241, 244, 246, 247, 89, 50, 122, - 122, 164, 122, 3, 4, 19, 126, 184, 185, 18, - 3, 240, 3, 219, 240, 122, 185, 223, 122, 126, - 122, 127, 240, 122, 237, 240, 242, 243, 240, 240, - 240, 240, 240, 238, 229, 230, 231, 237, 30, 32, - 37, 42, 46, 66, 99, 132, 143, 144, 145, 148, - 150, 165, 166, 181, 190, 236, 3, 0, 138, 126, - 3, 46, 150, 156, 157, 239, 145, 146, 18, 27, - 31, 32, 44, 46, 206, 245, 192, 100, 40, 67, - 68, 69, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 90, 91, 92, 94, 95, 96, 102, 104, 106, 107, - 108, 109, 110, 112, 113, 114, 115, 116, 122, 124, - 127, 3, 122, 162, 146, 172, 188, 126, 127, 184, - 185, 222, 223, 224, 232, 122, 238, 127, 240, 180, - 229, 3, 155, 105, 132, 100, 133, 125, 100, 237, - 3, 3, 151, 152, 238, 238, 151, 3, 132, 145, - 126, 136, 3, 99, 68, 99, 3, 35, 51, 216, - 3, 3, 208, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 3, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 229, 240, 3, 122, 128, 238, 14, 240, - 99, 139, 140, 141, 147, 148, 196, 198, 207, 217, - 187, 184, 127, 122, 228, 3, 93, 213, 214, 215, - 133, 115, 184, 133, 142, 143, 133, 238, 237, 237, - 105, 227, 100, 143, 132, 227, 238, 238, 102, 3, - 54, 193, 54, 194, 3, 209, 210, 105, 133, 125, - 89, 240, 3, 133, 122, 133, 132, 141, 126, 139, - 229, 102, 105, 211, 215, 133, 100, 132, 133, 105, - 36, 115, 224, 226, 102, 149, 152, 132, 99, 133, - 3, 5, 122, 224, 17, 195, 224, 225, 126, 227, - 100, 240, 3, 133, 146, 238, 126, 139, 132, 133, - 3, 5, 8, 9, 10, 12, 45, 55, 56, 212, - 226, 227, 93, 215, 28, 33, 173, 175, 177, 178, - 146, 237, 237, 239, 146, 213, 225, 126, 100, 199, - 149, 210, 133, 34, 62, 167, 168, 169, 170, 132, - 211, 126, 215, 126, 122, 173, 175, 65, 153, 133, - 133, 197, 224, 46, 99, 190, 203, 204, 205, 240, - 105, 132, 169, 170, 221, 176, 3, 146, 146, 227, - 99, 144, 148, 190, 200, 201, 202, 207, 217, 3, - 27, 132, 205, 105, 142, 142, 142, 227, 126, 126, - 132, 202, 216, 142, 132, 132, 133, 218, 200, 3, - 174, 142, 132, 122, 126, 132, 213, 142, 133, 132, - 227 + 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 27, 28, 35, 37, 38, 40, 42, 44, 46, + 47, 48, 51, 52, 54, 55, 62, 63, 69, 90, + 91, 99, 111, 116, 117, 121, 123, 125, 127, 134, + 135, 136, 137, 143, 146, 147, 153, 157, 158, 159, + 160, 162, 170, 178, 181, 182, 185, 188, 189, 190, + 191, 195, 197, 206, 211, 216, 219, 232, 233, 234, + 239, 243, 244, 245, 247, 248, 89, 49, 121, 121, + 163, 121, 3, 4, 17, 125, 183, 184, 16, 3, + 243, 3, 218, 243, 121, 184, 222, 121, 125, 121, + 126, 243, 121, 3, 5, 240, 241, 242, 243, 243, + 243, 243, 243, 238, 243, 228, 229, 230, 236, 243, + 29, 31, 36, 41, 45, 65, 99, 131, 142, 143, + 144, 147, 149, 164, 165, 180, 189, 235, 3, 0, + 137, 125, 3, 45, 149, 155, 156, 239, 144, 145, + 16, 25, 30, 31, 43, 45, 205, 246, 191, 100, + 39, 66, 67, 68, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 90, 91, 92, 94, 95, 96, 102, + 103, 105, 106, 107, 108, 109, 111, 112, 113, 114, + 115, 121, 123, 126, 3, 121, 161, 145, 171, 187, + 125, 126, 183, 184, 221, 222, 223, 231, 121, 237, + 238, 126, 243, 179, 228, 3, 154, 131, 104, 100, + 100, 132, 124, 100, 236, 3, 3, 150, 151, 237, + 237, 150, 3, 131, 144, 125, 135, 3, 99, 67, + 99, 3, 34, 50, 215, 3, 3, 207, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 3, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 228, 243, + 3, 121, 127, 237, 12, 243, 99, 138, 139, 140, + 146, 147, 195, 197, 206, 216, 186, 183, 126, 121, + 227, 3, 93, 212, 213, 214, 132, 114, 183, 132, + 141, 142, 132, 237, 236, 241, 243, 104, 226, 100, + 142, 131, 226, 237, 237, 102, 3, 53, 192, 53, + 193, 3, 208, 209, 104, 132, 124, 89, 243, 3, + 132, 121, 132, 131, 140, 125, 138, 228, 102, 104, + 210, 214, 132, 100, 131, 132, 104, 35, 114, 223, + 225, 102, 148, 151, 131, 99, 132, 3, 5, 121, + 223, 15, 194, 223, 224, 125, 226, 100, 243, 3, + 132, 145, 237, 125, 138, 131, 132, 243, 225, 226, + 93, 214, 26, 32, 172, 174, 176, 177, 145, 236, + 243, 239, 145, 212, 224, 125, 100, 198, 148, 209, + 132, 33, 61, 166, 167, 168, 169, 131, 210, 125, + 214, 125, 121, 172, 174, 64, 152, 132, 132, 196, + 223, 45, 99, 189, 202, 203, 204, 243, 104, 131, + 168, 169, 220, 175, 3, 145, 145, 226, 99, 143, + 147, 189, 199, 200, 201, 206, 216, 3, 25, 131, + 204, 104, 141, 141, 141, 226, 125, 125, 131, 201, + 215, 141, 131, 131, 132, 217, 199, 3, 173, 141, + 131, 121, 125, 131, 212, 141, 132, 131, 226 }; #define yyerrok (yyerrstatus = 0) @@ -4333,11 +4184,33 @@ yyreduce: switch (yyn) { + case 13: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1861 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + + case 24: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1873 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + case 26: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2108 "parser.y" +#line 1876 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4348,7 +4221,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2109 "parser.y" +#line 1877 "parser.y" {(yyval.code)=code_new();} } break; @@ -4359,8 +4232,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2111 "parser.y" - {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} +#line 1879 "parser.y" + { + (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code)); +} } break; @@ -4370,7 +4245,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2112 "parser.y" +#line 1882 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4381,7 +4256,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2127 "parser.y" +#line 1897 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4392,7 +4267,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2128 "parser.y" +#line 1898 "parser.y" {(yyval.code)=0;} } break; @@ -4403,7 +4278,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" +#line 1901 "parser.y" {(yyval.code)=0;} } break; @@ -4414,8 +4289,16 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2138 "parser.y" - {(yyval.code)=(yyvsp[(3) - (4)].code);} +#line 1908 "parser.y" + { + PASS_ALWAYS + if(as3_pass) { + (yyval.code) = (yyvsp[(3) - (4)].code); + } else { + (yyval.code) = 0; + } + as3_pass=(yyvsp[(1) - (4)].number_int); +} } break; @@ -4425,7 +4308,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2142 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4436,7 +4319,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2143 "parser.y" +#line 1921 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4447,7 +4330,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2147 "parser.y" +#line 1925 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4457,12 +4340,31 @@ yyreduce: + case 55: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 1932 "parser.y" + { + PASS12 + (yyval.number_int)=as3_pass; + char*key = concat3((yyvsp[(1) - (3)].id),"::",(yyvsp[(3) - (3)].id)); + if(!definitions || !dict_contains(definitions, key)) { + as3_pass=0; + } + free(key); +} + } + break; + + + case 56: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2158 "parser.y" - {(yyval.value)=(yyvsp[(2) - (2)].value);} +#line 1951 "parser.y" + {(yyval.node)=(yyvsp[(2) - (2)].node);} } break; @@ -4472,10 +4374,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2159 "parser.y" - {(yyval.value).c=abc_pushundefined(0); - (yyval.value).t=TYPE_ANY; - } +#line 1952 "parser.y" + {(yyval.node)=mkdummynode();} } break; @@ -4485,7 +4385,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2163 "parser.y" +#line 1954 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4496,7 +4396,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2164 "parser.y" +#line 1955 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4507,7 +4407,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2166 "parser.y" +#line 1957 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4518,7 +4418,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2167 "parser.y" +#line 1958 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4529,7 +4429,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2170 "parser.y" +#line 1961 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4538,11 +4438,6 @@ PASS1 new_variable((yyvsp[(1) - (3)].id), 0, 1, 0); PASS2 - if(!is_subtype_of((yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo))) { - syntaxerror("Can't convert %s to %s", (yyvsp[(3) - (3)].value).t->name, - (yyvsp[(2) - (3)].classinfo)->name); - } - char slot = 0; int index = 0; if(state->method->uses_slots) { @@ -4561,21 +4456,25 @@ PASS2 (yyval.code) = slot?abc_getscopeobject(0, 1):0; + typedcode_t v = node_read((yyvsp[(3) - (3)].node)); + if(!is_subtype_of(v.t, (yyvsp[(2) - (3)].classinfo))) { + syntaxerror("Can't convert %s to %s", v.t->name, (yyvsp[(2) - (3)].classinfo)->name); + } if((yyvsp[(2) - (3)].classinfo)) { - if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); - (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); + if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) { + (yyval.code) = code_append((yyval.code), v.c); + (yyval.code) = converttype((yyval.code), v.t, (yyvsp[(2) - (3)].classinfo)); } else { - code_free((yyvsp[(3) - (3)].value).c); + code_free(v.c); (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo)); } } else { - if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) { - (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c); + if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) { + (yyval.code) = code_append((yyval.code), v.c); (yyval.code) = abc_coerce_a((yyval.code)); } else { // don't do anything - code_free((yyvsp[(3) - (3)].value).c); + code_free(v.c); code_free((yyval.code)); (yyval.code) = 0; break; @@ -4596,7 +4495,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2230 "parser.y" +#line 2020 "parser.y" {(yyval.code) = code_new();} } break; @@ -4607,7 +4506,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2231 "parser.y" +#line 2021 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4618,7 +4517,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2234 "parser.y" +#line 2024 "parser.y" {PASS12 new_state();} } break; @@ -4629,7 +4528,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2234 "parser.y" +#line 2024 "parser.y" { (yyval.code) = code_new(); @@ -4657,7 +4556,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2253 "parser.y" +#line 2043 "parser.y" {(yyval.code)=code_new();} } break; @@ -4668,7 +4567,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2260 "parser.y" +#line 2050 "parser.y" { PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0); PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0); @@ -4682,7 +4581,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2054 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4696,7 +4595,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2269 "parser.y" +#line 2059 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4707,7 +4606,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2270 "parser.y" +#line 2060 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4718,7 +4617,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2272 "parser.y" +#line 2062 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4747,7 +4646,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2292 "parser.y" +#line 2082 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4804,7 +4703,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2340 "parser.y" +#line 2130 "parser.y" {PASS12 new_state();} } break; @@ -4815,7 +4714,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2340 "parser.y" +#line 2130 "parser.y" { (yyval.code) = code_new(); @@ -4843,7 +4742,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2359 "parser.y" +#line 2149 "parser.y" {PASS12 new_state();} } break; @@ -4854,7 +4753,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2359 "parser.y" +#line 2149 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4878,7 +4777,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2374 "parser.y" +#line 2164 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4891,7 +4790,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2377 "parser.y" +#line 2167 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4904,7 +4803,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2380 "parser.y" +#line 2170 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4917,7 +4816,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2383 "parser.y" +#line 2173 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4930,7 +4829,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2387 "parser.y" +#line 2177 "parser.y" {(yyval.code)=0;} } break; @@ -4941,7 +4840,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2388 "parser.y" +#line 2178 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4952,7 +4851,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2179 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4963,7 +4862,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2390 "parser.y" +#line 2180 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4974,7 +4873,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2181 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4985,7 +4884,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2182 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4996,10 +4895,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2184 "parser.y" { (yyval.code) = abc_getlocal(0, state->switch_var); - (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); + (yyval.code) = code_append((yyval.code), node_read((yyvsp[(2) - (4)].node)).c); code_t*j = (yyval.code) = abc_ifne((yyval.code), 0); (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code)); if((yyval.code)->opcode != OPCODE___BREAK__) { @@ -5017,7 +4916,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2405 "parser.y" +#line 2195 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -5030,7 +4929,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2408 "parser.y" +#line 2198 "parser.y" {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -5041,9 +4940,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2408 "parser.y" +#line 2198 "parser.y" { - (yyval.code)=(yyvsp[(4) - (8)].value).c; + (yyval.code) = node_read((yyvsp[(4) - (8)].node)).c; (yyval.code) = abc_setlocal((yyval.code), state->switch_var); (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -5079,7 +4978,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2439 "parser.y" +#line 2229 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -5094,7 +4993,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2444 "parser.y" +#line 2234 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5124,7 +5023,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" +#line 2254 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5135,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2464 "parser.y" +#line 2254 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5160,7 +5059,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2480 "parser.y" +#line 2270 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -5171,7 +5070,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2481 "parser.y" +#line 2271 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -5182,7 +5081,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2482 "parser.y" +#line 2272 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5193,7 +5092,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2483 "parser.y" +#line 2273 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5211,7 +5110,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2491 "parser.y" +#line 2281 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5229,7 +5128,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2500 "parser.y" +#line 2290 "parser.y" {PASS12 new_state(); state->method->has_exceptions=1; state->method->late_binding=1;//for invariant scope_code @@ -5243,7 +5142,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2503 "parser.y" +#line 2293 "parser.y" { code_t*out = abc_nop(0); @@ -5296,7 +5195,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2549 "parser.y" +#line 2339 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5310,7 +5209,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2553 "parser.y" +#line 2343 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5328,7 +5227,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2564 "parser.y" +#line 2354 "parser.y" { new_state(); if(state->method->has_exceptions) { @@ -5348,7 +5247,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2574 "parser.y" +#line 2364 "parser.y" { /* remove getlocal;pushwith from scope code again */ state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code)); @@ -5372,7 +5271,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2592 "parser.y" +#line 2382 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5383,7 +5282,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2593 "parser.y" +#line 2383 "parser.y" {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5394,7 +5293,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2595 "parser.y" +#line 2385 "parser.y" {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;} } break; @@ -5405,7 +5304,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2596 "parser.y" +#line 2386 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5416,7 +5315,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2598 "parser.y" +#line 2388 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5427,7 +5326,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "parser.y" +#line 2389 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5438,7 +5337,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "parser.y" +#line 2390 "parser.y" {PASS12 startpackage("");} } break; @@ -5449,7 +5348,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2601 "parser.y" +#line 2391 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5460,15 +5359,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2603 "parser.y" +#line 2413 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } - - PASS2 classinfo_t*c = (yyvsp[(2) - (2)].classinfo); if(!c) syntaxerror("Couldn't import class\n"); @@ -5486,14 +5383,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2619 "parser.y" +#line 2427 "parser.y" { PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { as3_schedule_package((yyvsp[(2) - (4)].id)); } - PASS2 NEW(import_t,i); i->package = (yyvsp[(2) - (4)].id); state_has_imports(); @@ -5510,7 +5406,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2636 "parser.y" +#line 2443 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5521,7 +5417,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2637 "parser.y" +#line 2444 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5532,7 +5428,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2638 "parser.y" +#line 2445 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5543,7 +5439,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2639 "parser.y" +#line 2446 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5560,7 +5456,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2646 "parser.y" +#line 2453 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5571,7 +5467,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2647 "parser.y" +#line 2454 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5582,7 +5478,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2648 "parser.y" +#line 2455 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5593,7 +5489,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2649 "parser.y" +#line 2456 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5604,7 +5500,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2650 "parser.y" +#line 2457 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5615,7 +5511,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2651 "parser.y" +#line 2458 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5626,7 +5522,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2652 "parser.y" +#line 2459 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5637,7 +5533,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2653 "parser.y" +#line 2460 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5648,7 +5544,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2654 "parser.y" +#line 2461 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5659,7 +5555,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2655 "parser.y" +#line 2462 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5672,7 +5568,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2659 "parser.y" +#line 2466 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -5683,7 +5579,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2467 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5694,7 +5590,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2469 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5705,7 +5601,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2663 "parser.y" +#line 2470 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5716,7 +5612,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2665 "parser.y" +#line 2472 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5727,7 +5623,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2666 "parser.y" +#line 2473 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5738,7 +5634,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2670 "parser.y" +#line 2477 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5749,7 +5645,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2672 "parser.y" +#line 2479 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5760,7 +5656,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2483 "parser.y" {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE; startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} } @@ -5772,18 +5668,29 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2679 "parser.y" +#line 2486 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; + case 149: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 2495 "parser.y" + {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} + } + break; + + + case 152: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2499 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5798,7 +5705,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2703 "parser.y" +#line 2510 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5811,7 +5718,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2706 "parser.y" +#line 2513 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5831,8 +5738,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2721 "parser.y" - {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} +#line 2547 "parser.y" + {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; @@ -5842,8 +5749,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2721 "parser.y" - {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} +#line 2547 "parser.y" + {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; @@ -5853,8 +5760,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" - {(yyval.code) = (yyvsp[(1) - (1)].code);} +#line 2549 "parser.y" + {PASS12 (yyval.code)=0;} } break; @@ -5864,8 +5771,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2724 "parser.y" - {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} +#line 2550 "parser.y" + {PASS12 (yyval.code)=0;} } break; @@ -5875,74 +5782,93 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2727 "parser.y" +#line 2553 "parser.y" { +PASS12 int flags = slotstate_flags->flags; namespace_t ns = modifiers2access(slotstate_flags); - varinfo_t* info = 0; - if(state->cls) { - memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); - if(i) { - check_override(i, flags); - } - info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); - } else { - slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); - if(i) { - syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); - } - if(ns.name && ns.name[0]) { - syntaxerror("namespaces not allowed on package-level variables"); - } - info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); - } + if(as3_pass == 1) { - info->type = (yyvsp[(2) - (3)].classinfo); - info->flags = flags; + varinfo_t* info = 0; + if(state->cls) { + memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1); + if(i) { + check_override(i, flags); + } + info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id)); + } else { + slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id)); + if(i) { + syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id)); + } + if(ns.name && ns.name[0]) { + syntaxerror("namespaces not allowed on package-level variables"); + } + info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id)); + } - /* slot name */ - multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; - - trait_list_t**traits; - code_t**code; - if(!state->cls) { - // global variable - ns.name = state->package; - traits = &global->init->traits; - code = &global->init->method->body->code; - } else if(flags&FLAG_STATIC) { - // static variable - traits = &state->cls->abc->static_traits; - code = &state->cls->static_init->header; - } else { - // instance variable - traits = &state->cls->abc->traits; - code = &state->cls->init->header; - } - - trait_t*t=0; - if((yyvsp[(2) - (3)].classinfo)) { - MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); - t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); - } else { - t = trait_new_member(traits, 0, multiname_clone(&mname), 0); - } - info->slot = t->slot_id; - - /* initalization code (if needed) */ - code_t*c = 0; - if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) { - c = abc_getlocal_0(c); - c = code_append(c, (yyvsp[(3) - (3)].value).c); - c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo)); - c = abc_setslot(c, t->slot_id); + info->type = (yyvsp[(2) - (3)].classinfo); + info->flags = flags; + + dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info); } - *code = code_append(*code, c); + if(as3_pass == 2) { + varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount); + + /* slot name */ + multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)}; + + trait_list_t**traits; + code_t**code; + if(!state->cls) { + // global variable + ns.name = state->package; + traits = &global->init->traits; + code = &global->init->method->body->code; + } else if(flags&FLAG_STATIC) { + // static variable + traits = &state->cls->abc->static_traits; + code = &state->cls->static_init->header; + } else { + // instance variable + traits = &state->cls->abc->traits; + code = &state->cls->init->header; + } + + trait_t*t=0; + if((yyvsp[(2) - (3)].classinfo)) { + MULTINAME(m, (yyvsp[(2) - (3)].classinfo)); + t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0); + } else { + t = trait_new_member(traits, 0, multiname_clone(&mname), 0); + } + info->slot = t->slot_id; + + constant_t cval = (yyvsp[(3) - (3)].node)->type->eval((yyvsp[(3) - (3)].node)); + if(cval.type!=CONSTANT_UNKNOWN) { + /* compile time constant */ + t->value = malloc(sizeof(constant_t)); + memcpy(t->value, &cval, sizeof(constant_t)); + info->value = constant_clone(t->value); + } else { + typedcode_t v = node_read((yyvsp[(3) - (3)].node)); + /* initalization code (if needed) */ + code_t*c = 0; + if(v.c && !is_pushundefined(v.c)) { + c = abc_getlocal_0(c); + c = code_append(c, v.c); + c = converttype(c, v.t, (yyvsp[(2) - (3)].classinfo)); + c = abc_setslot(c, t->slot_id); + } + *code = code_append(*code, c); + } - if(slotstate_varconst==KW_CONST) { - t->kind= TRAIT_CONST; + if(slotstate_varconst==KW_CONST) { + t->kind= TRAIT_CONST; + info->flags |= FLAG_CONST; + } } (yyval.code)=0; @@ -5956,7 +5882,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2801 "parser.y" +#line 2646 "parser.y" {(yyval.constant)=0;} } break; @@ -5967,8 +5893,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2802 "parser.y" - {(yyval.constant)=(yyvsp[(2) - (2)].constant);} +#line 2647 "parser.y" + { + (yyval.constant) = malloc(sizeof(constant_t)); + *(yyval.constant) = node_eval((yyvsp[(2) - (2)].node)); + if((yyval.constant)->type == CONSTANT_UNKNOWN) + syntaxerror("can't evaluate default parameter value (needs to be a compile-time constant)"); +} } break; @@ -5978,8 +5909,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2804 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} +#line 2655 "parser.y" + {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5989,8 +5920,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2805 "parser.y" - {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} +#line 2656 "parser.y" + { + (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); +} } break; @@ -6000,8 +5933,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2806 "parser.y" - {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} +#line 2659 "parser.y" + {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -6011,8 +5944,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2807 "parser.y" - {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} +#line 2660 "parser.y" + {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; @@ -6022,8 +5955,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2808 "parser.y" - {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} +#line 2661 "parser.y" + {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -6033,8 +5966,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2810 "parser.y" - {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} +#line 2662 "parser.y" + {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -6044,8 +5977,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2811 "parser.y" - {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} +#line 2663 "parser.y" + {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -6055,8 +5988,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2812 "parser.y" - {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} +#line 2664 "parser.y" + {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; @@ -6066,15 +5999,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2813 "parser.y" - { - if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { - (yyval.constant) = constant_new_float(__builtin_nan("")); - } else { - as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); - } -} +#line 2665 "parser.y" + {(yyval.constant) = constant_new_float(__builtin_nan(""));} } break; @@ -6084,7 +6010,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2825 "parser.y" +#line 2680 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6098,7 +6024,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2829 "parser.y" +#line 2684 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -6112,7 +6038,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2835 "parser.y" +#line 2690 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6128,7 +6054,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2841 "parser.y" +#line 2696 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6144,7 +6070,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2849 "parser.y" +#line 2704 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6159,7 +6085,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2854 "parser.y" +#line 2709 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6174,7 +6100,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2860 "parser.y" +#line 2715 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6192,7 +6118,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 2723 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6210,7 +6136,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2878 "parser.y" +#line 2733 "parser.y" {PASS12 (yyval.token)=0;} } break; @@ -6221,7 +6147,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2881 "parser.y" +#line 2736 "parser.y" {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; @@ -6232,7 +6158,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2882 "parser.y" +#line 2737 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -6256,7 +6182,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2898 "parser.y" +#line 2753 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -6267,7 +6193,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2900 "parser.y" +#line 2755 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -6278,7 +6204,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2901 "parser.y" +#line 2756 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6306,7 +6232,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2923 "parser.y" +#line 2778 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6334,7 +6260,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2942 "parser.y" +#line 2797 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6357,7 +6283,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2959 "parser.y" +#line 2814 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -6368,7 +6294,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2960 "parser.y" +#line 2815 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; @@ -6379,7 +6305,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2962 "parser.y" +#line 2817 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -6390,8 +6316,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2963 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2818 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; @@ -6401,8 +6327,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2964 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2819 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; @@ -6412,7 +6338,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "parser.y" +#line 2828 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -6423,7 +6349,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2974 "parser.y" +#line 2829 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -6434,7 +6360,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2978 "parser.y" +#line 2833 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6445,7 +6371,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 2834 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6456,7 +6382,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2981 "parser.y" +#line 2836 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6467,7 +6393,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2985 "parser.y" +#line 2840 "parser.y" {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6480,7 +6406,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2989 "parser.y" +#line 2844 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6491,7 +6417,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2990 "parser.y" +#line 2845 "parser.y" { (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); @@ -6505,9 +6431,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2996 "parser.y" +#line 2851 "parser.y" { - (yyval.value).c = (yyvsp[(2) - (4)].value).c; + typedcode_t v = node_read((yyvsp[(2) - (4)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); code_t*paramcode = (yyvsp[(4) - (4)].value_list).cc; @@ -6530,8 +6457,8 @@ PASS2 } (yyval.value).t = TYPE_ANY; - if(TYPE_IS_CLASS((yyvsp[(2) - (4)].value).t) && (yyvsp[(2) - (4)].value).t->data) { - (yyval.value).t = (yyvsp[(2) - (4)].value).t->data; + if(TYPE_IS_CLASS(v.t) && v.t->data) { + (yyval.value).t = v.t->data; } else { (yyval.value).c = abc_coerce_a((yyval.value).c); (yyval.value).t = TYPE_ANY; @@ -6546,10 +6473,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3032 "parser.y" +#line 2888 "parser.y" { - - (yyval.value).c = (yyvsp[(1) - (4)].value).c; + + typedcode_t v = node_read((yyvsp[(1) - (4)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { (yyval.value).c = code_cutlast((yyval.value).c); } @@ -6585,8 +6513,11 @@ PASS2 (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number); } - if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) { - (yyval.value).t = ((methodinfo_t*)((yyvsp[(1) - (4)].value).t->data))->return_type; + if(TYPE_IS_FUNCTION(v.t) && v.t->data) { + (yyval.value).t = ((methodinfo_t*)(v.t->data))->return_type; + } else if(TYPE_IS_CLASS(v.t) && v.t->data) { + // calling a class is like a typecast + (yyval.value).t = (classinfo_t*)v.t->data; } else { (yyval.value).c = abc_coerce_a((yyval.value).c); (yyval.value).t = TYPE_ANY; @@ -6601,7 +6532,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3078 "parser.y" +#line 2938 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6631,9 +6562,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3099 "parser.y" +#line 2959 "parser.y" { - (yyval.value).c = (yyvsp[(2) - (2)].value).c; + typedcode_t v = node_read((yyvsp[(2) - (2)].node)); + (yyval.value).c = v.c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { (yyval.value).c = code_cutlast((yyval.value).c); } @@ -6647,7 +6579,7 @@ PASS2 (yyval.value).c = abc_deleteproperty2((yyval.value).c, name); } else { (yyval.value).c = abc_getlocal_0((yyval.value).c); - MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, ""); + MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, ""); (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m); } (yyval.value).t = TYPE_BOOLEAN; @@ -6661,7 +6593,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3120 "parser.y" +#line 2981 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6674,7 +6606,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3123 "parser.y" +#line 2984 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6688,8 +6620,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3130 "parser.y" - {(yyval.value)=(yyvsp[(1) - (1)].value);} +#line 2991 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; @@ -6699,8 +6633,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3131 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 2994 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; @@ -6710,12 +6646,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3132 "parser.y" +#line 2997 "parser.y" { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).t = (yyvsp[(3) - (3)].value).t; + (yyval.node) = mkmultinode(&node_comma, (yyvsp[(1) - (1)].node)); } } break; @@ -6726,9 +6659,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3138 "parser.y" +#line 3000 "parser.y" { - (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); + (yyval.node) = multinode_extend((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } } break; @@ -6739,8 +6672,24 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3144 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3003 "parser.y" + { + (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); +} + } + break; + + + + case 226: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3006 "parser.y" + { + (yyval.code) = (yyvsp[(1) - (3)].code); + (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); +} } break; @@ -6750,8 +6699,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3148 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3011 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6761,8 +6710,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3150 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3012 "parser.y" + {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; @@ -6772,8 +6721,19 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3152 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3014 "parser.y" + {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));} + } + break; + + + + case 230: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3015 "parser.y" + {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));} } break; @@ -6783,22 +6743,12 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3156 "parser.y" +#line 3017 "parser.y" { - (yyval.value).c = 0; - namespace_t ns = {ACCESS_PACKAGE, ""}; - multiname_t m = {QNAME, &ns, 0, "RegExp"}; - if(!(yyvsp[(1) - (1)].regexp).options) { - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern); - (yyval.value).c = abc_construct((yyval.value).c, 1); - } else { - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern); - (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).options); - (yyval.value).c = abc_construct((yyval.value).c, 2); - } - (yyval.value).t = TYPE_REGEXP; + (yyval.value_list).cc = 0; + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].code)); + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); + (yyval.value_list).number = 2; } } break; @@ -6809,12 +6759,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3173 "parser.y" - {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); - //MULTINAME(m, registry_getintclass()); - //$$.c = abc_coerce2($$.c, &m); // FIXME - (yyval.value).t = TYPE_INT; - } +#line 3023 "parser.y" + { + (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; + (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].code)); + (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); +} } break; @@ -6824,10 +6775,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3178 "parser.y" - {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_INT; - } +#line 3032 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6837,10 +6786,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3181 "parser.y" - {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); - (yyval.value).t = TYPE_INT; - } +#line 3033 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6850,10 +6797,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3184 "parser.y" - {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); - (yyval.value).t = TYPE_UINT; - } +#line 3034 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6863,10 +6808,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3187 "parser.y" - {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); - (yyval.value).t = TYPE_FLOAT; - } +#line 3035 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6876,10 +6819,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3190 "parser.y" - {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); - (yyval.value).t = TYPE_STRING; - } +#line 3036 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6889,10 +6830,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" - {(yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3037 "parser.y" + {(yyval.node) = (yyvsp[(1) - (1)].node);} } break; @@ -6902,10 +6841,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3196 "parser.y" - {(yyval.value).c = abc_pushtrue(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3039 "parser.y" + { + (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant)); +} } break; @@ -6915,10 +6854,25 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3199 "parser.y" - {(yyval.value).c = abc_pushfalse(0); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3044 "parser.y" + { + typedcode_t v; + v.c = 0; + namespace_t ns = {ACCESS_PACKAGE, ""}; + multiname_t m = {QNAME, &ns, 0, "RegExp"}; + if(!(yyvsp[(1) - (1)].regexp).options) { + v.c = abc_getlex2(v.c, &m); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern); + v.c = abc_construct(v.c, 1); + } else { + v.c = abc_getlex2(v.c, &m); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern); + v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).options); + v.c = abc_construct(v.c, 2); + } + v.t = TYPE_REGEXP; + (yyval.node) = mkcodenode(v); +} } break; @@ -6928,10 +6882,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3202 "parser.y" - {(yyval.value).c = abc_pushnull(0); - (yyval.value).t = TYPE_NULL; - } +#line 3064 "parser.y" + { + typedcode_t v; + v.c = code_new(); + v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc); + v.c = abc_newarray(v.c, (yyvsp[(2) - (3)].value_list).number); + v.t = registry_getarrayclass(); + (yyval.node) = mkcodenode(v); +} } break; @@ -6941,10 +6900,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3206 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3074 "parser.y" + { + typedcode_t v; + v.c = code_new(); + v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc); + v.c = abc_newobject(v.c, (yyvsp[(2) - (3)].value_list).number/2); + v.t = registry_getobjectclass(); + (yyval.node) = mkcodenode(v); +} } break; @@ -6954,10 +6918,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3209 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3083 "parser.y" + {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6967,10 +6929,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3212 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3084 "parser.y" + {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6980,10 +6940,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3215 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3085 "parser.y" + {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -6993,10 +6951,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3218 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3086 "parser.y" + {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7006,10 +6962,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3221 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3087 "parser.y" + {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7019,10 +6973,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3224 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3088 "parser.y" + {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7032,10 +6984,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3227 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3089 "parser.y" + {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7045,18 +6995,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3231 "parser.y" - {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O'); - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); - (yyval.value).c = abc_dup((yyval.value).c); - code_t*jmp = (yyval.value).c = abc_iftrue((yyval.value).c, 0); - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t); - code_t*label = (yyval.value).c = abc_label((yyval.value).c); - jmp->branch = label; - } +#line 3090 "parser.y" + {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7066,24 +7006,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3242 "parser.y" - { - (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); - /*printf("%08x:\n",$1.t); - code_dump($1.c, 0, 0, "", stdout); - printf("%08x:\n",$3.t); - code_dump($3.c, 0, 0, "", stdout); - printf("joining %08x and %08x to %08x\n", $1.t, $3.t, $$.t);*/ - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); - (yyval.value).c = abc_dup((yyval.value).c); - code_t*jmp = (yyval.value).c = abc_iffalse((yyval.value).c, 0); - (yyval.value).c = cut_last_push((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t); - code_t*label = (yyval.value).c = abc_label((yyval.value).c); - jmp->branch = label; - } +#line 3091 "parser.y" + {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7093,11 +7017,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3260 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3092 "parser.y" + {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7107,11 +7028,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3265 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_bitnot((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3093 "parser.y" + {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));} } break; @@ -7121,11 +7039,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3270 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_bitand((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3094 "parser.y" + {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));} } break; @@ -7135,11 +7050,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3275 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_bitxor((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3095 "parser.y" + {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7149,11 +7061,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3280 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_bitor((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3096 "parser.y" + {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7163,11 +7072,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3285 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_rshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3097 "parser.y" + {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7177,11 +7083,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3289 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_urshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3098 "parser.y" + {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7191,11 +7094,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3293 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_lshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3099 "parser.y" + {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7205,11 +7105,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3298 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_divide((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } +#line 3100 "parser.y" + {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7219,11 +7116,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3302 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_modulo((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } +#line 3101 "parser.y" + {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7233,16 +7127,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3306 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_add_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_add((yyval.value).c); - (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t,'+'); - } - } +#line 3102 "parser.y" + {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7252,16 +7138,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3315 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_subtract_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_subtract((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3103 "parser.y" + {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7271,16 +7149,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3324 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_multiply_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_multiply((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3104 "parser.y" + {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7290,11 +7160,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3334 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_in((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3105 "parser.y" + {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7304,18 +7171,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3339 "parser.y" - {char use_astype=0; // flash player's astype works differently than astypelate - if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) { - MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data)); - (yyval.value).c = abc_astype2((yyvsp[(1) - (3)].value).c, &m); - (yyval.value).t = (yyvsp[(3) - (3)].value).t->data; - } else { - (yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_astypelate((yyval.value).c); - (yyval.value).t = TYPE_ANY; - } - } +#line 3106 "parser.y" + {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7325,11 +7182,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3352 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_instanceof((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3107 "parser.y" + {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7339,11 +7193,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3357 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_istypelate((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3108 "parser.y" + {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7353,12 +7204,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3362 "parser.y" - { - (yyval.value).c = (yyvsp[(3) - (4)].value).c; - (yyval.value).c = abc_typeof((yyval.value).c); - (yyval.value).t = TYPE_STRING; - } +#line 3109 "parser.y" + {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7368,12 +7215,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3368 "parser.y" - { - (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); - (yyval.value).c = abc_pushundefined((yyval.value).c); - (yyval.value).t = TYPE_ANY; - } +#line 3110 "parser.y" + {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));} } break; @@ -7383,10 +7226,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3374 "parser.y" - { (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3111 "parser.y" + {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));} } break; @@ -7396,8 +7237,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3378 "parser.y" - {(yyval.value)=(yyvsp[(2) - (3)].value);} +#line 3112 "parser.y" + { (yyval.node) = mkconstnode(constant_new_undefined());} } break; @@ -7407,17 +7248,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3380 "parser.y" - { - (yyval.value)=(yyvsp[(2) - (2)].value); - if(IS_INT((yyvsp[(2) - (2)].value).t)) { - (yyval.value).c=abc_negate_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c=abc_negate((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } -} +#line 3113 "parser.y" + { (yyval.node)=(yyvsp[(2) - (3)].node);} } break; @@ -7427,15 +7259,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3391 "parser.y" - { - (yyval.value).c = (yyvsp[(1) - (4)].value).c; - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); - - MULTINAME_LATE(m, (yyvsp[(1) - (4)].value).t?(yyvsp[(1) - (4)].value).t->access:ACCESS_PACKAGE, ""); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).t = 0; // array elements have unknown type -} +#line 3114 "parser.y" + {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));} } break; @@ -7445,13 +7270,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3400 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number); - (yyval.value).t = registry_getarrayclass(); -} +#line 3115 "parser.y" + {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));} } break; @@ -7461,8 +7281,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3407 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).number=0;} +#line 3116 "parser.y" + {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7472,8 +7292,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3408 "parser.y" - {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} +#line 3117 "parser.y" + {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7483,13 +7303,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3410 "parser.y" - { - (yyval.value_list).cc = 0; - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).number = 2; -} +#line 3118 "parser.y" + {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7499,13 +7314,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3416 "parser.y" - { - (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; - (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2; - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c); - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c); -} +#line 3119 "parser.y" + {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7515,13 +7325,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3425 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2); - (yyval.value).t = registry_getobjectclass(); -} +#line 3120 "parser.y" + {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7531,18 +7336,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3432 "parser.y" - { - code_t*c = (yyvsp[(3) - (3)].value).c; - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - c=abc_multiply_i(c); - } else { - c=abc_multiply(c); - } - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '*'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3121 "parser.y" + { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7552,13 +7347,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3444 "parser.y" - { - code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3122 "parser.y" + { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7568,13 +7358,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3450 "parser.y" - { - code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3123 "parser.y" + { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7584,13 +7369,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3456 "parser.y" - { - code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3124 "parser.y" + { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7600,13 +7380,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3462 "parser.y" - { - code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3125 "parser.y" + { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7616,13 +7391,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3468 "parser.y" - { - code_t*c = abc_divide((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3126 "parser.y" + { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7632,13 +7402,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3474 "parser.y" - { - code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); - c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3127 "parser.y" + { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7648,13 +7413,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3480 "parser.y" - { - code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); - c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3128 "parser.y" + { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));} } break; @@ -7664,20 +7424,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3486 "parser.y" - { - code_t*c = (yyvsp[(3) - (3)].value).c; - - if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { - c=abc_add_i(c); - } else { - c=abc_add(c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '+'), (yyvsp[(1) - (3)].value).t); - } - - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3130 "parser.y" + { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));} } break; @@ -7687,18 +7435,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3499 "parser.y" - { code_t*c = (yyvsp[(3) - (3)].value).c; - if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { - c=abc_subtract_i(c); - } else { - c=abc_subtract(c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '-'), (yyvsp[(1) - (3)].value).t); - } - - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3131 "parser.y" + { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));} } break; @@ -7708,13 +7446,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3510 "parser.y" - { code_t*c = 0; - c = code_append(c, (yyvsp[(3) - (3)].value).c); - c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3132 "parser.y" + {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); } } break; @@ -7724,19 +7457,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3517 "parser.y" - { - (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?'); - (yyval.value).c = (yyvsp[(1) - (5)].value).c; - code_t*j1 = (yyval.value).c = abc_iffalse((yyval.value).c, 0); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t); - code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0); - (yyval.value).c = j1->branch = abc_label((yyval.value).c); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); - (yyval.value).c = j2->branch = abc_label((yyval.value).c); - } +#line 3133 "parser.y" + {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); } } break; @@ -7746,138 +7468,33 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3530 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { - int nr = getlocalnr((yyvsp[(1) - (2)].value).c); - code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0; - if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) { - (yyval.value).c = abc_getlocal(0, nr); - (yyval.value).c = abc_inclocal_i((yyval.value).c, nr); - } else if(TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { - (yyval.value).c = abc_getlocal(0, nr); - (yyval.value).c = abc_inclocal((yyval.value).c, nr); - } else syntaxerror("internal error"); - } else { - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_increment_i(c); - type = TYPE_INT; - } else { - c=abc_increment(c); - type = TYPE_NUMBER; - } - c=converttype(c, type, (yyvsp[(1) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1); - (yyval.value).t = (yyvsp[(1) - (2)].value).t; - } - } - } - break; - - - - case 294: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3557 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_decrement_i(c); - type = TYPE_INT; - } else { - c=abc_decrement(c); - type = TYPE_NUMBER; - } - c=converttype(c, type, (yyvsp[(1) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1); - (yyval.value).t = (yyvsp[(1) - (2)].value).t; - } - } - break; - - - - case 295: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3571 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_increment_i(c); - type = TYPE_INT; - } else { - c=abc_increment(c); - type = TYPE_NUMBER; - } - c=converttype(c, type, (yyvsp[(2) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(2) - (2)].value).t; - } - } - break; - - - - case 296: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3585 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - c=abc_decrement_i(c); - type = TYPE_INT; - } else { - c=abc_decrement(c); - type = TYPE_NUMBER; - } - c=converttype(c, type, (yyvsp[(2) - (2)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0); - (yyval.value).t = (yyvsp[(2) - (2)].value).t; - } - } - break; - - - - case 297: - if(as3_pass==2) { - -/* Line 1464 of skeleton.m4 */ -#line 3600 "parser.y" +#line 3136 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; - memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1); - MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); - (yyval.value).c = 0; - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getsuper2((yyval.value).c, &m); - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + typedcode_t v; + v.c = 0; + v.c = abc_getlocal_0(v.c); + v.c = abc_getsuper2(v.c, &m); + v.t = slotinfo_gettype((slotinfo_t*)f); + (yyval.node) = mkcodenode(v); } } break; - case 298: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3614 "parser.y" +#line 3150 "parser.y" { // attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored @ operator"); } } @@ -7885,15 +7502,14 @@ PASS2 - case 299: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3621 "parser.y" +#line 3156 "parser.y" { // child attribute TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .@ operator"); } } @@ -7901,15 +7517,14 @@ PASS2 - case 300: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3628 "parser.y" +#line 3162 "parser.y" { // namespace declaration TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored :: operator"); } } @@ -7917,15 +7532,14 @@ PASS2 - case 301: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3635 "parser.y" +#line 3168 "parser.y" { // descendants TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .. operator"); } } @@ -7933,15 +7547,14 @@ PASS2 - case 302: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3642 "parser.y" +#line 3174 "parser.y" { // filter TODO - (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = 0; + (yyval.node) = mkdummynode(); as3_warning("ignored .() operator"); } } @@ -7949,14 +7562,15 @@ PASS2 - case 303: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3653 "parser.y" +#line 3187 "parser.y" { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; + typedcode_t v1 = node_read((yyvsp[(1) - (3)].node)); + (yyval.value).c = v1.c; + classinfo_t*t = v1.t; char is_static = 0; if(TYPE_IS_CLASS(t) && t->data) { t = t->data; @@ -7973,6 +7587,9 @@ PASS2 if(f && f->slot && !noslot) { (yyval.value).c = abc_getslot((yyval.value).c, f->slot); } else { + if(!f) { + as3_softwarning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); + } MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = abc_getproperty2((yyval.value).c, &m); } @@ -7980,27 +7597,31 @@ PASS2 (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); if(!(yyval.value).t) (yyval.value).c = abc_coerce_a((yyval.value).c); - } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { - string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; + + } else if(v1.c && v1.c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = v1.c->data[0]; char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); - if(dict_contains(state->import_toplevel_packages, package2)) { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; + + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(a) { + (yyval.value) = push_class(a); + } else if(dict_contains(state->import_toplevel_packages, package2) || + registry_ispackage(package2)) { + (yyval.value).c = v1.c; (yyval.value).c->data[0] = string_new4(package2); (yyval.value).t = 0; } else { - slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); - if(!a) - syntaxerror("couldn't resolve %s", package2); - (yyval.value) = push_class(a); + syntaxerror("couldn't resolve %s", package2); } } else { /* when resolving a property on an unknown type, we do know the name of the property (and don't seem to need the package), but we need to make avm2 try out all access modes */ + as3_warning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id)); multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; (yyval.value).c = abc_getproperty2((yyval.value).c, &m); (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); + (yyval.value).t = TYPE_ANY; } } } @@ -8008,11 +7629,11 @@ PASS2 - case 304: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3703 "parser.y" +#line 3245 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -8026,13 +7647,16 @@ PASS2 unknown_variable((yyvsp[(1) - (1)].id)); } - /* let the compiler know that it might check the current directory/package + /* let the compiler know that it might want to check the current directory/package for this identifier- maybe there's a file $1.as defining $1. */ as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 - (yyval.value).t = 0; - (yyval.value).c = 0; + typedcode_t o; + o.t = 0; + o.c = 0; + (yyval.node) = 0; + slotinfo_t*a = 0; memberinfo_t*f = 0; @@ -8040,65 +7664,88 @@ PASS2 /* look at variables */ if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) { // $1 is a local variable - (yyval.value).c = abc_getlocal((yyval.value).c, v->index); - (yyval.value).t = v->type; + o.c = abc_getlocal(o.c, v->index); + o.t = v->type; + (yyval.node) = mkcodenode(o); break; } if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) { - (yyval.value).c = abc_getscopeobject((yyval.value).c, 1); - (yyval.value).c = abc_getslot((yyval.value).c, v->index); - (yyval.value).t = v->type; + o.c = abc_getscopeobject(o.c, 1); + o.c = abc_getslot(o.c, v->index); + o.t = v->type; + (yyval.node) = mkcodenode(o); break; } int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC; /* look at current class' members */ - if(state->cls && (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && - (f->flags&FLAG_STATIC) >= i_am_static) { - // $1 is a function in this class + if(!state->method->inner && + state->cls && + (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1))) + { + // $1 is a member or attribute in this class int var_is_static = (f->flags&FLAG_STATIC); - if(f->kind == INFOTYPE_METHOD) { - (yyval.value).t = TYPE_FUNCTION(f); - } else { - (yyval.value).t = f->type; + if(f->kind == INFOTYPE_VAR && (f->flags&FLAG_CONST)) { + /* if the variable is a constant (and we know what is evaluates to), we + can just use the value itself */ + varinfo_t*v = (varinfo_t*)f; + if(v->value) { + (yyval.node) = mkconstnode(v->value); + break; + } } - if(var_is_static && !i_am_static) { - /* access to a static member from a non-static location. - do this via findpropstrict: - there doesn't seem to be any non-lookup way to access - static properties of a class */ - state->method->late_binding = 1; - (yyval.value).t = f->type; - namespace_t ns = {f->access, ""}; - multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - break; - } else if(f->slot>0) { - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - break; - } else { - namespace_t ns = {f->access, ""}; - multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - break; + + if(var_is_static >= i_am_static) { + if(f->kind == INFOTYPE_METHOD) { + o.t = TYPE_FUNCTION(f); + } else { + o.t = f->type; + } + + if(var_is_static && !i_am_static) { + /* access to a static member from a non-static location. + do this via findpropstrict: + there doesn't seem to be any non-lookup way to access + static properties of a class */ + state->method->late_binding = 1; + o.t = f->type; + namespace_t ns = {f->access, f->package}; + multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; + o.c = abc_findpropstrict2(o.c, &m); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; + } else if(f->slot>0) { + o.c = abc_getlocal_0(o.c); + o.c = abc_getslot(o.c, f->slot); + (yyval.node) = mkcodenode(o); + break; + } else { + namespace_t ns = {f->access, f->package}; + multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; + o.c = abc_getlocal_0(o.c); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; + } } } /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - (yyval.value) = push_class(a); + o = push_class(a); + (yyval.node) = mkcodenode(o); break; } /* look through package prefixes */ - if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) { - (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); - (yyval.value).t = 0; + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id)) || + registry_ispackage((yyvsp[(1) - (1)].id))) { + o.c = abc___pushpackage__(o.c, (yyvsp[(1) - (1)].id)); + o.t = 0; + (yyval.node) = mkcodenode(o); //? break; } @@ -8110,9 +7757,11 @@ PASS2 multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; - (yyval.value).t = 0; - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + o.t = 0; + o.c = abc_findpropstrict2(o.c, &m); + o.c = abc_getproperty2(o.c, &m); + (yyval.node) = mkcodenode(o); + break; } } } @@ -8120,11 +7769,11 @@ PASS2 - case 305: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3808 "parser.y" +#line 3378 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8137,11 +7786,11 @@ PASS2 - case 306: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3815 "parser.y" +#line 3385 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8154,11 +7803,11 @@ PASS2 - case 307: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3822 "parser.y" +#line 3392 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8171,11 +7820,11 @@ PASS2 - case 308: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3829 "parser.y" +#line 3399 "parser.y" { PASS12 trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); @@ -8195,15 +7844,30 @@ PASS2 - case 309: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3844 "parser.y" +#line 3423 "parser.y" { PASS12 - char*url = 0; - trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, url); + const char*url = (yyvsp[(3) - (3)].classinfo)->name; + + varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo); + if(s->kind == INFOTYPE_UNRESOLVED) { + s = (varinfo_t*)registry_resolve((slotinfo_t*)s); + if(!s) + syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); + } + + if(!s || s->kind != INFOTYPE_VAR) + syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1); + if(!s->value || !NS_TYPE(s->value->type)) + syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name); + url = s->value->ns->name; + + trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url); + add_active_url(url); (yyval.code)=0; } } @@ -8213,7 +7877,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 8217 "parser.tab.c" +#line 7881 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);