X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=7069fc367d80c48b3d8a98d8fc0485047f10c5e6;hp=cfbdb48a18cdd89a144e9039518deb8f31a4d0bd;hb=b8aa0577aae67db4da5221459102202febc5c103;hpb=62a83d162b254d91da418cee25f5b87b067a3f92 diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index cfbdb48..7069fc3 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -90,14 +90,15 @@ #include "code.h" #include "opcodes.h" #include "compiler.h" -#include "ast.h" +#include "expr.h" +#include "initcode.h" extern int a3_lex(); /* Line 198 of skeleton.m4 */ -#line 101 "parser.tab.c" +#line 102 "parser.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -201,25 +202,26 @@ extern int a3_lex(); T_DIVBY = 332, T_MODBY = 333, T_MULBY = 334, - T_PLUSBY = 335, - T_MINUSBY = 336, - T_XORBY = 337, - T_SHRBY = 338, - T_SHLBY = 339, - T_USHRBY = 340, - T_OROR = 341, - T_ANDAND = 342, - T_COLONCOLON = 343, - T_MINUSMINUS = 344, - T_PLUSPLUS = 345, - T_DOTDOT = 346, - T_DOTDOTDOT = 347, - T_SHL = 348, - T_USHR = 349, - T_SHR = 350, - prec_none = 351, - below_semicolon = 352, - below_assignment = 353, + T_ANDBY = 335, + T_PLUSBY = 336, + T_MINUSBY = 337, + T_XORBY = 338, + T_SHRBY = 339, + T_SHLBY = 340, + T_USHRBY = 341, + T_OROR = 342, + T_ANDAND = 343, + T_COLONCOLON = 344, + T_MINUSMINUS = 345, + T_PLUSPLUS = 346, + T_DOTDOT = 347, + T_DOTDOTDOT = 348, + T_SHL = 349, + T_USHR = 350, + T_SHR = 351, + prec_none = 352, + below_semicolon = 353, + below_assignment = 354, below_minus = 355, minusminus_prefix = 356, plusplus_prefix = 357, @@ -236,12 +238,12 @@ extern int a3_lex(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union /* Line 223 of skeleton.m4 */ -#line 46 "parser.y" +#line 47 "parser.y" tokenunion { /* Line 223 of skeleton.m4 */ -#line 46 "parser.y" +#line 47 "parser.y" enum yytokentype token; @@ -267,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; @@ -275,7 +278,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 279 "parser.tab.c" +#line 282 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -286,7 +289,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 266 "parser.y" +#line 273 "parser.y" static int a3_error(char*s) @@ -400,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; @@ -414,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;\ @@ -460,7 +463,7 @@ static namespace_list_t nl1 = {&ns1,&nl2}; static namespace_set_t nopackage_namespace_set = {&nl1}; static dict_t*definitions=0; -void as3_set_definition(const char*c) +void as3_set_define(const char*c) { if(!definitions) definitions = dict_new(); @@ -503,16 +506,15 @@ 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; @@ -558,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 @@ -573,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); } } @@ -583,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; @@ -608,6 +616,9 @@ void* finish_parser() { dict_free_all(global->file2token2info, 1, (void*)dict_destroy); global->token2info=0; + + initcode_add_classlist(global->classinit, global->classes); + return global->file; } @@ -621,6 +632,7 @@ typedef struct _variable { 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); @@ -628,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) { @@ -689,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; } @@ -700,12 +714,16 @@ 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; } static code_t* var_block(code_t*body) @@ -916,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); } @@ -1009,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 */ @@ -1026,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; @@ -1054,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) { @@ -1075,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); @@ -1247,7 +1217,7 @@ 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); @@ -1255,7 +1225,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c 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; @@ -1272,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); @@ -1293,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; } @@ -1319,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)); @@ -1358,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; @@ -1393,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); } } @@ -1453,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; @@ -1572,49 +1546,8 @@ void continuejumpsto(code_t*c, char*name, code_t*jump) } } -/* TODO: move this to ast.c */ -#define IS_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a))) #define IS_NUMBER_OR_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)) || TYPE_IS_NUMBER((a))) -#define BOTH_INT(a,b) (IS_INT(a) && IS_INT(b)) -static 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(); -} -static char is_getlocal(code_t*c) -{ - if(!c || c->prev || c->next) - return 0; - return(c->opcode == OPCODE_GETLOCAL - || c->opcode == OPCODE_GETLOCAL_0 - || c->opcode == OPCODE_GETLOCAL_1 - || c->opcode == OPCODE_GETLOCAL_2 - || c->opcode == OPCODE_GETLOCAL_3); -} -static int getlocalnr(code_t*c) -{ - if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];} - else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;} - else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;} - else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;} - else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;} - else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode); - return 0; -} code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { if(from==to) @@ -1790,168 +1723,6 @@ typedcode_t push_class(slotinfo_t*a) } -code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore, char pushvalue) -{ - /* 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(pushvalue && readbefore) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, middlepart); - if(pushvalue && !readbefore) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, write); - if(pushvalue) { - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); - } - } else { - /* if we're allowed to execute the read code twice *and* - the middlepart doesn't modify the code, things are easier. - */ - //c = code_append(c, prefix); - parserassert(!prefix); - code_t* r2 = 0; - if(pushvalue) { - r2 = code_dup(r); - } - c = code_append(c, r); - c = code_append(c, middlepart); - c = code_append(c, write); - if(pushvalue) { - 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); - if(pushvalue) { - 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); - if(pushvalue) { - c = abc_dup(c); - c = abc_setlocal(c, temp); - } - c = code_append(c, write); - if(pushvalue) { - c = abc_getlocal(c, temp); - c = abc_kill(c, temp); - } - } - } - return c; -} - char is_break_or_jump(code_t*c) { if(!c) @@ -2092,11 +1863,11 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 2096 "parser.tab.c" +#line 1867 "parser.tab.c" /* Unqualified %code blocks. */ /* Line 274 of skeleton.m4 */ -#line 2159 "parser.y" +#line 1944 "parser.y" char is_subtype_of(classinfo_t*type, classinfo_t*supertype) { @@ -2105,7 +1876,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 274 of skeleton.m4 */ -#line 2611 "parser.y" +#line 2393 "parser.y" static void state_has_imports() { @@ -2128,7 +1899,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 274 of skeleton.m4 */ -#line 2744 "parser.y" +#line 2526 "parser.y" static int slotstate_varconst = 0; static modifiers_t*slotstate_flags = 0; @@ -2149,7 +1920,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 274 of skeleton.m4 */ -#line 3885 "parser.y" +#line 3414 "parser.y" void add_active_url(const char*url) { @@ -2161,7 +1932,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 274 of skeleton.m4 */ -#line 2165 "parser.tab.c" +#line 1936 "parser.tab.c" #ifdef short # undef short @@ -2374,18 +2145,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 146 +#define YYFINAL 149 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3050 +#define YYLAST 3107 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 113 +#define YYNNTS 116 /* YYNRULES -- Number of rules. */ -#define YYNRULES 299 +#define YYNRULES 305 /* YYNRULES -- Number of states. */ -#define YYNSTATES 511 +#define YYNSTATES 519 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -2401,9 +2172,9 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 117, 2, 2, 2, 115, 107, 2, - 121, 132, 114, 112, 99, 111, 126, 113, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 104, 98, - 108, 101, 109, 103, 127, 2, 2, 2, 2, 2, + 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, 123, 2, 124, 106, 2, 2, 2, 2, 2, @@ -2432,7 +2203,7 @@ 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, 100, 102, 110, 118, 119, 120, 122, + 95, 96, 97, 98, 101, 110, 118, 119, 120, 122, 128, 129, 130 }; @@ -2463,14 +2234,15 @@ 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, 639, 643, 647, 651, 655, 659, 663, - 667, 671, 675, 678, 681, 685, 689, 693, 697, 701, - 705, 709, 713, 717, 721, 725, 729, 733, 737, 741, - 746, 749, 751, 755, 758, 763, 767, 768, 770, 774, - 780, 784, 788, 792, 796, 800, 804, 808, 812, 816, - 820, 824, 828, 834, 837, 840, 843, 846, 850, 853, - 858, 864, 868, 874, 878, 880, 883, 888, 893, 896 + 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. */ @@ -2479,28 +2251,28 @@ static const yytype_int16 yyrhs[] = 134, 0, -1, 135, -1, -1, 136, -1, 137, -1, 136, 137, -1, 185, -1, 197, -1, 195, -1, 216, -1, 206, -1, 146, -1, 147, 125, 135, 131, -1, - 98, -1, -1, 139, -1, 140, -1, 139, 140, -1, + 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, 98, -1, 142, -1, -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, 238, -1, 245, -1, 244, -1, 125, - 142, 131, -1, 125, 131, -1, 98, -1, 143, -1, + -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, 98, -1, 144, -1, - 143, -1, 3, 88, 3, -1, 101, 236, -1, -1, - 45, 150, -1, 31, 150, -1, 151, -1, 150, 99, + 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, 238, -1, 45, 3, 226, -1, 3, -1, - 11, 121, -1, 11, 49, 121, -1, 157, 155, 98, - 237, 98, 238, 132, 145, -1, 157, 156, 67, 237, + 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, 239, 104, 141, -1, 61, 104, - 141, -1, -1, 14, 121, 171, 239, 132, 125, 166, + 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, @@ -2516,91 +2288,94 @@ static const yytype_int16 yyrhs[] = -1, 53, 224, -1, -1, 15, 224, -1, -1, 189, 30, 3, 192, 194, 125, 196, 199, 131, -1, -1, 189, 43, 3, 193, 125, 198, 202, 131, -1, -1, - 200, -1, 201, -1, 200, 201, -1, 98, -1, 147, + 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, 98, -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, 99, 209, -1, 3, 226, - 148, -1, -1, 101, 211, -1, 8, -1, 9, -1, + 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, 92, 214, -1, - 213, 99, 92, 214, -1, 213, 99, 214, -1, 214, + 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, 99, 223, -1, 223, + -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, 99, -1, 230, 236, -1, -1, 23, 239, - 231, 227, -1, 239, 121, 228, 132, -1, 52, 121, - 228, 132, -1, 62, 239, -1, 41, -1, 41, 237, - -1, 239, -1, 239, -1, 237, 99, 239, -1, 237, - -1, 219, -1, 242, -1, 232, -1, 234, -1, 233, - -1, 211, -1, 6, -1, 239, 108, 239, -1, 239, - 109, 239, -1, 239, 74, 239, -1, 239, 75, 239, - -1, 239, 70, 239, -1, 239, 71, 239, -1, 239, - 73, 239, -1, 239, 72, 239, -1, 239, 86, 239, - -1, 239, 87, 239, -1, 117, 239, -1, 116, 239, - -1, 239, 107, 239, -1, 239, 106, 239, -1, 239, - 105, 239, -1, 239, 95, 239, -1, 239, 94, 239, - -1, 239, 93, 239, -1, 239, 113, 239, -1, 239, - 115, 239, -1, 239, 112, 239, -1, 239, 111, 239, - -1, 239, 114, 239, -1, 239, 67, 239, -1, 239, - 68, 239, -1, 239, 39, 239, -1, 239, 66, 239, - -1, 42, 121, 239, 132, -1, 35, 239, -1, 35, - -1, 121, 237, 132, -1, 111, 239, -1, 239, 123, - 239, 124, -1, 123, 228, 124, -1, -1, 241, -1, - 236, 104, 236, -1, 241, 99, 236, 104, 236, -1, - 69, 240, 131, -1, 239, 79, 239, -1, 239, 78, - 239, -1, 239, 84, 239, -1, 239, 83, 239, -1, - 239, 85, 239, -1, 239, 77, 239, -1, 239, 76, - 239, -1, 239, 82, 239, -1, 239, 80, 239, -1, - 239, 81, 239, -1, 239, 101, 239, -1, 239, 103, - 239, 104, 239, -1, 239, 90, -1, 239, 89, -1, - 90, 239, -1, 89, 239, -1, 52, 126, 3, -1, - 127, 3, -1, 239, 126, 127, 3, -1, 239, 126, - 3, 88, 3, -1, 239, 91, 3, -1, 239, 126, - 121, 239, 132, -1, 239, 126, 3, -1, 3, -1, - 16, 3, -1, 16, 3, 101, 3, -1, 16, 3, - 101, 5, -1, 189, 243, -1, 21, 16, 223, -1 + -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, 2074, 2074, 2076, 2076, 2077, 2078, 2080, 2081, 2082, - 2083, 2084, 2085, 2086, 2087, 2089, 2089, 2090, 2091, 2093, - 2094, 2095, 2096, 2097, 2098, 2099, 2101, 2102, 2104, 2105, - 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, - 2118, 2119, 2120, 2121, 2124, 2125, 2126, 2127, 2128, 2129, - 2130, 2131, 2135, 2136, 2140, 2147, 2166, 2167, 2171, 2172, - 2174, 2175, 2177, 2238, 2239, 2242, 2242, 2261, 2262, 2263, - 2268, 2272, 2277, 2278, 2280, 2300, 2348, 2348, 2367, 2367, - 2382, 2385, 2388, 2391, 2395, 2396, 2397, 2398, 2399, 2400, - 2402, 2413, 2416, 2416, 2447, 2447, 2472, 2472, 2488, 2489, - 2490, 2491, 2499, 2508, 2508, 2557, 2561, 2572, 2582, 2599, - 2600, 2601, 2603, 2604, 2606, 2606, 2608, 2608, 2631, 2645, - 2661, 2662, 2663, 2664, 2671, 2672, 2673, 2674, 2675, 2676, - 2677, 2678, 2679, 2680, 2684, 2685, 2687, 2688, 2690, 2691, - 2695, 2693, 2701, 2699, 2708, 2709, 2710, 2711, 2712, 2713, - 2714, 2715, 2717, 2723, 2724, 2725, 2726, 2727, 2728, 2731, - 2763, 2763, 2765, 2765, 2767, 2768, 2770, 2855, 2856, 2859, - 2860, 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2884, 2888, - 2894, 2900, 2908, 2913, 2919, 2927, 2935, 2936, 2937, 2940, - 2939, 2956, 2957, 2959, 2958, 2982, 3001, 3015, 3016, 3018, - 3019, 3021, 3022, 3023, 3032, 3033, 3037, 3038, 3040, 3041, - 3042, 3044, 3048, 3049, 3054, 3055, 3091, 3137, 3158, 3179, - 3182, 3189, 3190, 3191, 3197, 3203, 3204, 3205, 3206, 3208, - 3210, 3215, 3232, 3235, 3238, 3241, 3244, 3247, 3250, 3253, - 3257, 3268, 3286, 3291, 3296, 3301, 3306, 3311, 3315, 3319, - 3324, 3328, 3332, 3341, 3350, 3360, 3365, 3377, 3383, 3388, - 3394, 3400, 3404, 3406, 3417, 3426, 3433, 3434, 3436, 3442, - 3451, 3458, 3470, 3476, 3482, 3488, 3494, 3500, 3506, 3512, - 3525, 3536, 3543, 3556, 3583, 3597, 3611, 3625, 3640, 3647, - 3654, 3661, 3668, 3683, 3740, 3849, 3856, 3863, 3870, 3894 + 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 @@ -2624,39 +2399,40 @@ 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", "MAYBECONSTANT", "CONSTANT", "MAYBE_PARAM_LIST", - "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13", - "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS", - "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE", - "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST", - "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE", - "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E", - "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ", "NAMESPACE_ID", - "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0 + "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"", "\"+=\"", + "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", + "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", + "\">>\"", "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 @@ -2674,8 +2450,8 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 352, 59, 44, - 353, 61, 354, 63, 58, 124, 94, 38, 60, 62, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 59, + 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 @@ -2707,14 +2483,15 @@ static const yytype_uint8 yyr1[] = 216, 218, 218, 220, 219, 221, 222, 223, 223, 224, 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, 228, 229, 230, 229, 231, 232, 233, 233, 234, 235, - 235, 236, 237, 237, 238, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 240, 240, 241, 241, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 242, 243, 243, 243, 244, 245 + 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. */ @@ -2742,14 +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, 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 @@ -2757,151 +2535,151 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 120, 294, 133, 172, 231, 169, 170, 171, 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, 261, 127, 0, 0, 0, 175, 128, - 130, 129, 0, 0, 174, 173, 0, 0, 266, 0, + 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, 230, 10, 225, 227, 229, 228, - 224, 39, 222, 226, 41, 40, 0, 0, 72, 76, - 120, 92, 109, 111, 110, 116, 113, 0, 0, 294, - 214, 191, 0, 260, 0, 0, 118, 0, 103, 208, - 0, 218, 65, 0, 221, 0, 267, 286, 285, 263, - 243, 242, 0, 0, 209, 210, 211, 82, 0, 106, - 219, 0, 80, 44, 43, 120, 45, 29, 0, 46, - 47, 48, 50, 0, 49, 288, 1, 6, 120, 294, - 0, 68, 0, 0, 69, 53, 108, 0, 188, 0, - 161, 0, 160, 162, 298, 123, 0, 0, 0, 0, + 122, 9, 8, 11, 239, 10, 233, 235, 237, 236, + 39, 225, 234, 238, 41, 40, 0, 0, 72, 76, + 120, 92, 109, 111, 110, 116, 113, 0, 0, 300, + 214, 191, 0, 271, 0, 0, 118, 0, 103, 208, + 0, 218, 65, 229, 230, 0, 0, 228, 292, 291, + 274, 254, 253, 0, 223, 0, 209, 210, 211, 221, + 82, 0, 106, 219, 0, 80, 44, 43, 120, 45, + 29, 0, 46, 47, 48, 50, 0, 49, 294, 1, + 6, 120, 300, 0, 68, 0, 0, 69, 53, 108, + 0, 188, 0, 161, 0, 160, 162, 304, 123, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 284, - 283, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 208, 0, 0, - 55, 73, 0, 0, 0, 120, 114, 0, 195, 0, - 198, 197, 299, 206, 178, 0, 0, 0, 27, 0, - 287, 0, 0, 270, 0, 262, 265, 212, 213, 83, - 205, 59, 60, 105, 220, 58, 81, 42, 28, 120, - 0, 205, 0, 0, 52, 295, 187, 186, 0, 134, - 136, 0, 223, 257, 258, 255, 256, 236, 237, 239, - 238, 234, 235, 277, 276, 272, 271, 279, 280, 278, - 274, 273, 275, 240, 241, 291, 249, 248, 247, 281, - 0, 246, 245, 244, 232, 233, 253, 252, 250, 254, - 251, 0, 0, 293, 0, 0, 0, 0, 0, 25, - 0, 120, 17, 23, 0, 20, 19, 22, 21, 120, - 112, 0, 208, 215, 167, 0, 0, 179, 183, 107, - 119, 196, 259, 0, 26, 217, 0, 268, 0, 0, - 57, 0, 120, 13, 57, 0, 0, 0, 0, 0, - 138, 0, 0, 205, 163, 164, 0, 216, 264, 0, - 0, 289, 120, 0, 0, 117, 18, 120, 0, 0, - 0, 0, 185, 180, 205, 0, 0, 120, 0, 203, - 202, 201, 204, 0, 62, 61, 51, 0, 120, 296, - 297, 178, 135, 0, 0, 199, 137, 142, 57, 0, - 282, 290, 292, 77, 0, 84, 0, 115, 207, 168, - 167, 0, 0, 182, 0, 0, 98, 102, 100, 104, - 63, 269, 56, 0, 75, 0, 139, 140, 0, 120, - 166, 165, 79, 0, 0, 0, 85, 88, 86, 24, - 184, 193, 181, 96, 0, 99, 101, 120, 66, 120, - 205, 120, 200, 0, 157, 0, 0, 120, 155, 0, - 27, 93, 89, 87, 27, 27, 205, 64, 74, 0, - 148, 152, 0, 0, 0, 120, 146, 150, 151, 158, - 188, 143, 156, 27, 91, 0, 0, 0, 189, 120, - 141, 147, 0, 90, 194, 97, 94, 27, 0, 0, - 0, 0, 149, 178, 27, 190, 0, 0, 205, 95, - 159 + 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, 49, 50, 51, 52, 310, 311, 312, 333, 334, - 136, 137, 156, 313, 138, 384, 139, 245, 242, 448, - 56, 231, 152, 153, 57, 58, 59, 60, 212, 61, - 90, 140, 141, 435, 436, 437, 438, 62, 214, 416, - 500, 417, 465, 418, 419, 63, 228, 142, 64, 65, - 218, 219, 66, 319, 215, 67, 143, 69, 70, 350, - 352, 394, 315, 451, 316, 429, 474, 475, 476, 456, - 457, 458, 163, 317, 261, 354, 355, 372, 74, 326, - 327, 328, 258, 318, 497, 102, 76, 464, 220, 221, - 381, 396, 382, 340, 323, 123, 124, 125, 223, 77, - 78, 79, 144, 126, 80, 81, 82, 115, 116, 83, - 164, 84, 85 + -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 -423 +#define YYPACT_NINF -400 static const yytype_int16 yypact[] = { - 1655, -41, -423, -423, -423, -423, -423, -423, -30, -61, - -423, -52, 17, -423, -423, -423, 61, -423, 2098, -423, - 87, -423, -423, 2153, -423, -19, 42, 11, -423, -423, - -423, -423, -1, -3, -423, -423, 2098, 19, 2098, 2098, - 2098, -423, 2098, 2098, 2098, 2098, 2098, 623, 95, 136, - -423, 494, -423, -423, -423, 13, -423, 2028, -423, -423, - -423, -423, -423, -423, 1905, -423, -423, -423, 211, 394, - -423, -423, -423, -423, -423, -423, -423, -423, -423, -423, - 44, -423, 2558, -423, -423, -423, 174, 83, -423, -423, - 1905, -423, -423, -423, -423, -423, -423, 20, 42, -423, - -34, -423, 85, 18, 2098, 79, -423, 2098, -423, 2098, - 204, 18, -423, 105, 2558, 80, 113, 18, 18, -50, - 18, 18, -29, 89, 119, 2098, -423, 217, 226, 2098, - 2098, 226, 230, -423, -423, 752, -423, -423, 109, -423, - -423, -423, -423, 214, -423, -423, -423, -423, 1010, 168, - 234, -423, 140, 172, -423, 142, -423, 245, 16, 247, - -423, 249, -423, -423, -423, -423, 2098, 2098, 2098, 2098, - 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, - 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, -423, - -423, 250, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, - 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 2098, 10, - -423, -423, 2098, 243, 2098, 1139, -423, 42, 131, 133, - -423, -423, -423, 141, 12, -27, 64, 2178, 1780, 129, - -423, 2098, 2098, -423, 2098, -423, -423, -423, -423, -423, - 159, 166, -423, 44, 44, 166, -423, -423, -423, 1905, - 135, 159, 2098, 2098, -423, 169, -423, -423, 264, 216, - 218, 273, 2558, 486, 313, 313, 313, 2924, 2924, 2924, - 2924, 486, 486, 2558, 2558, 2558, 2558, 2558, 2558, 2558, - 2558, 2558, 2558, 2619, 2680, -423, 359, 359, 359, 2558, - 2375, 2741, 2802, 2863, 486, 486, -50, -50, 18, 18, - 18, 145, 2436, 190, 2098, 277, -16, 160, 2249, -423, - 151, 1268, -423, -423, 158, -423, -423, -423, -423, 1139, - -423, 42, 2098, -423, 21, 281, 153, 187, -423, -423, - -423, 163, -423, 161, 1780, -423, -15, -423, 186, 84, - 192, 226, 881, -423, -23, 29, -2, 130, 173, 42, - 282, 42, 171, 159, 202, -423, 2098, -423, -423, 301, - 2312, -423, 1905, 2098, 180, -423, -423, 1139, 175, 176, - 290, 84, -423, -423, 159, 14, 30, 1905, 2098, -423, - -423, -423, -423, 2098, -423, -423, -423, 2098, 1905, -423, - -423, 12, -423, 42, 185, -423, 224, -423, 192, 273, - 2558, -423, -423, -423, 15, 25, 184, -423, -423, -423, - 215, 199, 281, -423, 201, 207, -423, -423, 30, -423, - 265, -423, -423, 198, -423, 200, 224, -423, 42, 227, - -423, -423, -423, 2098, 231, 205, 25, -423, -423, -423, - -423, -423, -423, -423, 328, -423, -423, 1905, -423, 1905, - 159, 1397, -423, 336, -423, 315, 219, 337, -423, 2497, - 1780, -423, -423, -423, 1780, 1780, 159, -423, -423, 222, - -423, -423, 223, 183, 229, 1526, -423, -423, -423, -423, - 16, -423, -423, 1780, -423, 232, 233, 210, -423, 1397, - -423, -423, 346, -423, -423, -423, -423, 1780, 235, 241, - 228, 240, -423, 12, 1780, -423, 244, 246, 159, -423, - -423 + 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[] = { - -423, -423, 238, -423, 321, -282, -423, 67, -422, -25, - 1, -55, -74, 28, 2, -8, 332, 263, 52, -423, - -423, -423, -423, -423, -423, -423, -423, -423, -423, -423, - -423, -423, -423, -423, -423, -40, -39, -423, -423, -18, - -423, -17, -423, -423, -423, -423, -423, -423, -423, -423, - 6, 103, -423, -423, -423, -423, 0, -423, 326, -423, - -423, -423, 48, -423, 49, -423, -90, -423, -70, -423, - -423, -48, -423, 3, -423, -423, 24, 5, 40, -377, - -423, -301, -69, 4, -423, -423, -423, -423, -423, 391, - -91, 26, 59, -240, -423, -97, -423, -423, -423, -423, - -423, -423, -423, -32, -9, -49, -13, -423, -423, -423, - -423, -423, -423 + -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 @@ -2911,146 +2689,121 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -155 static const yytype_int16 yytable[] = { - 68, 53, 55, 73, 75, 100, 113, 222, 154, 155, - 103, 344, 229, 303, 425, 324, 213, 324, 96, 87, - 92, 93, 135, 111, 373, 114, 117, 118, 54, 119, - 120, 121, 96, 114, 94, 155, 122, 368, 484, 189, - 190, 191, 485, 486, -70, 92, 93, 86, 71, 72, - 256, 68, 53, 55, 73, 75, 414, 191, 433, 94, - 89, 493, 415, 204, 205, 206, 257, 92, 93, 91, - 166, 207, 166, 208, 413, 501, 209, 98, 383, 54, - 248, 94, 507, 166, 166, 406, 434, 92, 93, 208, - 101, 88, 209, 238, 227, 225, 114, 166, 145, 71, - 72, 94, 104, 235, 325, 329, 412, 189, 190, 191, - 301, 442, 114, 398, 166, 97, 362, 377, 109, 379, - 243, 244, 370, 110, 108, 371, 506, 387, 166, 105, - 388, 304, 107, 389, 411, 390, 146, 305, 148, 207, - 112, 208, 95, 166, 209, 216, 217, 432, 68, 53, - 55, 73, 75, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 284, 54, 210, 330, 286, - 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 114, 302, 71, 72, 380, 157, - 337, 308, 338, 306, 211, 226, 224, 230, 158, 232, - 469, 233, 234, 236, 160, 68, 53, 314, 237, 114, - 239, 114, 336, 320, 342, 369, 487, 157, 162, 240, - 157, 2, 331, 246, 249, -71, 158, 251, 252, 253, - 254, 159, 160, 345, 346, 13, 14, 15, 255, 17, - 259, 19, 260, 285, 161, 307, 162, -113, 392, 321, - 395, 335, 322, 339, 24, 341, 343, 348, 510, 349, - 347, 351, 453, 29, 30, 31, 353, 357, 359, 248, - 361, 363, 365, 367, 324, 374, 375, 248, 403, -112, - 378, 360, 376, 383, 391, 3, 397, 393, 5, 6, - 7, 399, 395, 420, 401, 405, 407, 155, 408, 114, - 427, 68, 53, 314, 424, 439, 370, 21, 22, 68, - 53, 314, 155, 428, 441, 454, 443, 331, 444, 447, - 449, 466, 450, 155, 28, 460, 461, 452, 423, 479, - 480, 2, 496, 400, 34, 35, 421, 488, 489, 499, - 481, 422, 167, 504, 404, 13, 14, 15, -153, 17, - 490, 19, 503, 494, 495, 114, 502, 68, 53, 314, - 114, 505, 147, 467, 24, 468, 508, 509, 366, -155, - -155, -155, 453, 29, 30, 31, 250, 175, 176, 151, - 430, 241, 155, 385, 155, 165, 462, 463, 2, 498, - 445, 446, 189, 190, 191, 491, 192, 193, 194, 482, - 409, 492, 13, 14, 15, 440, 17, 106, 19, 426, - 459, 200, 201, 431, 202, 203, 204, 205, 206, 455, - 410, 24, 0, 0, 207, 454, 208, 0, 0, 209, - 29, 30, 31, 0, 0, 0, 0, 0, 189, 190, - 191, 473, 471, 472, 477, 478, 0, 455, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -154, 0, - 202, 203, 204, 205, 206, 473, 471, 472, 477, 478, - 207, 0, 208, 0, 0, 209, 0, 0, 0, 473, - 471, 472, 477, 478, -4, 0, 0, 1, 2, 3, - 4, 0, 5, 6, 7, 8, 9, 10, 11, 0, - 0, 12, 13, 14, 15, 16, 17, 18, 19, 0, - 0, 21, 22, 0, 0, -155, 0, 0, 0, 23, - 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, - 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, - 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, - -155, -155, 0, 38, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 189, 190, 191, 0, 192, - 193, 194, 0, 39, 40, 0, 0, 0, 0, 0, - 0, 0, 41, 0, -155, -155, 0, 202, 203, 204, - 205, 206, 0, 0, 0, 42, 0, 207, 0, 208, - 43, 44, 209, 0, 0, 45, 0, 46, 0, 47, - 0, 48, 0, 0, 0, -4, 1, 2, 3, 4, - 0, 5, 6, 7, 8, 9, 10, 11, 0, 0, - 0, 13, 14, 15, 16, 17, 18, 19, 20, 0, - 21, 22, 127, 0, 128, 0, 0, 0, 23, 129, - 24, 25, 0, 26, 130, 27, 0, 28, 131, 29, - 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, - 0, 0, 0, 0, 0, 36, 37, 0, 132, 0, - 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, - 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, - 44, 0, 0, 0, 45, 0, 46, 0, 47, 0, - 48, 0, 0, 0, 134, 1, 2, 3, 4, 0, - 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, - 13, 14, 15, 16, 17, 18, 19, 20, 0, 21, - 22, 127, 0, 128, 0, 0, 0, 23, 129, 24, - 25, 0, 26, 130, 27, 0, 28, 131, 29, 30, + 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, 132, 0, 0, + 0, 0, 0, 0, 36, 37, 0, 0, -155, -155, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 39, 40, 0, 0, 0, 0, 0, 0, 0, - 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 42, 0, 0, 0, 0, 43, 44, - 0, 0, 0, 45, 0, 46, 0, 47, 0, 48, - 0, 0, 0, 247, 1, 2, 3, 4, 0, 5, + 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, - 127, 0, 128, 0, 0, 0, 23, 129, 24, 25, - 0, 26, 130, 27, 0, 28, 131, 29, 30, 31, + 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, 132, 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, - 39, 40, 0, 0, 0, 0, 0, 0, 0, 133, - 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, 386, 1, 2, 3, 4, 0, 5, 6, - 7, 8, 9, 10, 11, 0, 0, 12, 13, 14, - 15, 16, 17, 18, 19, 0, 0, 21, 22, 0, - 0, 0, 0, 0, 0, 23, 0, 24, 25, 0, - 26, 0, 27, 0, 28, 0, 29, 30, 31, 0, + 0, 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, 0, 0, 0, 0, 38, + 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, 39, - 40, 0, 0, 0, 0, 0, 0, 0, 41, 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, -3, 1, 2, 3, 4, 0, 5, 6, 7, + 0, 253, 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, + 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, 0, 0, 0, 0, 38, 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, 39, 40, - 0, 0, 0, 0, 0, 0, 0, 309, 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, - -15, 1, 2, 3, 4, 0, 5, 6, 7, 8, - 9, 10, 11, 0, 0, 0, 13, 14, 15, 16, + 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, 0, 0, 0, 39, 40, 0, - 0, 0, 0, 0, 0, 0, 309, 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, -16, + 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, @@ -3059,11 +2812,11 @@ static const yytype_int16 yytable[] = 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, 39, 40, 0, 0, - 0, 0, 0, 0, 0, 470, 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, -144, 1, + 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, @@ -3072,243 +2825,248 @@ static const yytype_int16 yytable[] = 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, 39, 40, 0, 0, 0, - 0, 0, 0, 0, 470, 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, -3, 0, -145, 1, 2, + 0, 47, 0, 48, 0, 0, 0, -16, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, - 0, 0, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, 23, 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, - 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, + 0, 0, 0, 0, 478, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, - 47, 0, 48, 1, 2, 3, 4, 0, 5, 6, - 7, 8, 9, 10, 11, 0, -120, 0, 13, 14, - 15, 16, 17, 18, 19, 20, 0, 21, 22, 127, - 0, 128, 0, 0, 0, 23, 129, 24, 25, 0, - 26, 130, 27, 0, 28, 131, 29, 30, 31, 0, - 0, 32, 33, 0, 34, 35, 0, 0, 0, 0, - 0, 0, 36, 37, 0, 132, 0, 0, 0, 38, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, - 40, 0, 0, 0, 0, 0, 0, 0, 133, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 42, 0, 0, 0, 0, 43, 44, 0, 0, - 0, 45, 0, 46, 0, 47, 0, 48, 1, 2, - 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, - 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, - 20, 0, 21, 22, 127, 0, 128, 0, 0, 0, - 23, 129, 24, 25, 0, 26, 130, 27, 0, 28, - 131, 29, 30, 31, 0, 0, 32, 33, 0, 34, - 35, 0, 0, 0, 0, 0, 0, 36, 37, 0, - 132, 0, 0, 0, 38, 0, 0, 0, 0, 0, + 47, 0, 48, 0, 0, 0, -144, 1, 2, 3, + 4, 0, 5, 6, 7, 8, 9, 10, 11, 0, + 0, 0, 13, 14, 15, 16, 17, 18, 19, 0, + 0, 21, 22, 0, 0, 0, 0, 0, 0, 23, + 0, 24, 25, 0, 26, 0, 27, 0, 28, 0, + 29, 30, 31, 0, 0, 32, 33, 0, 34, 35, + 0, 0, 0, 0, 0, 0, 36, 37, 0, 0, + 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, - 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, - 0, 43, 44, 0, 0, 0, 45, 0, 46, 0, - 47, 149, 48, 3, 4, 0, 5, 6, 7, 0, + 0, 0, 0, 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, 18, 0, 20, 0, 21, 22, 0, 0, 128, - 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 27, 0, 28, 150, 0, 0, 0, 0, 0, 0, + 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, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 0, 99, 0, 3, 4, 0, 5, 6, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, - 0, 18, 0, 20, 0, 21, 22, 0, 0, 0, - 0, 0, 0, 23, 0, 0, 0, 0, 0, 42, - 27, 0, 28, 0, 43, 44, 0, 0, 0, 45, - 33, 46, 34, 35, 0, 48, 99, 0, 3, 4, - 36, 5, 6, 7, 0, 0, 0, 38, 0, 0, - 0, 0, 0, 0, 0, 0, 18, 0, 20, 0, - 21, 22, 0, 0, 0, 0, 0, 39, 40, 0, - 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, - 0, 0, 0, 0, 0, 33, 0, 34, 35, 42, - 0, 0, 0, 0, 43, 44, 0, 167, 0, 45, - 0, 46, 38, 0, 0, 48, 0, 0, 0, 0, + 36, 37, 0, 135, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 39, 40, 168, 169, 170, 0, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, - 0, 192, 193, 194, 45, 0, 46, 0, 0, 195, - 48, 196, 0, 197, 198, 199, 200, 201, 167, 202, - 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, - 0, 208, 0, 0, 209, 0, 0, 0, 0, 0, - 332, 0, 0, 0, 0, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 0, 189, 190, - 191, 0, 192, 193, 194, 0, 0, 0, 0, 0, - 195, 167, 196, 0, 197, 198, 199, 200, 201, 0, - 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, - 207, 0, 208, 0, 0, 209, 0, 0, 168, 169, - 170, 364, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, - 0, 0, 0, 195, 167, 196, 0, 197, 198, 199, - 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, - 0, 0, 0, 207, 0, 208, 0, 0, 209, 0, - 0, 168, 169, 170, 402, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 186, 187, 188, 0, 189, 190, 191, 0, 192, 193, - 194, 0, 0, 0, 0, 167, 195, 0, 196, 356, - 197, 198, 199, 200, 201, 0, 202, 203, 204, 205, - 206, 0, 0, 0, 0, 0, 207, 0, 208, 0, - 0, 209, 168, 169, 170, 0, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 0, 189, 190, 191, 0, 192, - 193, 194, 0, 0, 0, 0, 167, 195, 0, 196, - 0, 197, 198, 199, 200, 201, 0, 202, 203, 204, - 205, 206, 0, 0, 0, 0, 0, 207, 0, 208, - 358, 0, 209, 168, 169, 170, 0, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 0, 189, 190, 191, 0, - 192, 193, 194, 0, 0, 0, 0, 167, 195, 0, - 196, 483, 197, 198, 199, 200, 201, 0, 202, 203, - 204, 205, 206, 0, 0, 0, 0, 0, 207, 0, - 208, 0, 0, 209, 168, 169, 170, 0, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 0, 189, 190, 191, - 0, 192, 193, 194, 0, 0, 0, 0, 167, 195, - 0, 196, 0, 197, 198, 199, 200, 201, 0, 202, - 203, 204, 205, 206, 0, 0, 0, 0, 0, 207, - 0, 208, 0, 0, 209, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 188, 0, 189, 190, - 191, 0, 192, 193, 194, 0, 0, 0, 0, 167, - 0, 0, 0, 0, 197, 198, 199, 200, 201, 0, - 202, 203, 204, 205, 206, 0, 0, 0, 0, 0, - 207, 0, 208, 0, 0, 209, 168, 169, 170, 0, - 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, - 190, 191, 0, 192, 193, 194, 0, 0, 0, 0, - 167, 0, 0, 0, 0, 197, 198, 199, 200, 201, - 0, 202, 203, 204, 205, 206, 0, 0, 0, 0, - 0, 207, 0, 208, 0, 0, 209, 168, 169, 170, - 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, - 189, 190, 191, 0, 192, 193, 194, 0, 0, 0, - 0, 167, 0, 0, 0, 0, 0, 198, 199, 200, - 201, 0, 202, 203, 204, 205, 206, 0, 0, 0, - 0, 0, 207, 0, 208, 0, 0, 209, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 189, 190, 191, 0, 192, 193, 194, 0, 0, - 0, 0, 167, 0, 0, 0, 0, 0, 0, 199, - 200, 201, 0, 202, 203, 204, 205, 206, 0, 0, - 0, 0, 0, 207, 0, 208, 0, 0, 209, 168, - 169, 170, 0, 171, 172, 173, 174, 175, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 189, 190, 191, 0, 192, 193, 194, 0, - 0, 0, 0, 167, 0, 0, 0, 0, 0, 0, - -155, 200, 201, 0, 202, 203, 204, 205, 206, 0, - 0, 0, 0, 0, 207, 0, 208, 0, 0, 209, - 168, 169, 170, 0, -155, -155, -155, -155, 175, 176, + 0, 0, 45, 0, 46, 171, 172, 173, 48, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 0, + 0, 199, 200, 0, 201, 202, 203, 204, 205, 170, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 0, 0, 0, 0, + 0, 339, 0, 0, 0, 0, 171, 172, 173, 0, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 0, + 193, 194, 195, 0, 196, 197, 198, 0, 0, 0, + 0, 0, 199, 200, 0, 201, 202, 203, 204, 205, + 170, 206, 207, 208, 209, 210, 0, 0, 0, 0, + 0, 211, 0, 212, 0, 0, 213, 0, 0, 0, + 0, 0, 372, 0, 0, 0, 0, 171, 172, 173, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 199, 200, 0, 201, 202, 203, 204, + 205, 170, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213, 0, 0, + 0, 0, 0, 410, 0, 0, 0, 0, 171, 172, + 173, 0, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 0, 193, 194, 195, 0, 196, 197, 198, 0, + 0, 0, 170, 0, 199, 200, 364, 201, 202, 203, + 204, 205, 0, 206, 207, 208, 209, 210, 0, 0, + 0, 0, 0, 211, 0, 212, 0, 0, 213, 171, + 172, 173, 0, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 0, 193, 194, 195, 0, 196, 197, 198, + 0, 0, 0, 170, 0, 199, 200, 0, 201, 202, + 203, 204, 205, 0, 206, 207, 208, 209, 210, 0, + 0, 0, 0, 0, 211, 0, 212, 366, 0, 213, + 171, 172, 173, 0, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 0, 193, 194, 195, 0, 196, 197, + 198, 0, 0, 0, 170, 0, 199, 200, 491, 201, + 202, 203, 204, 205, 0, 206, 207, 208, 209, 210, + 0, 0, 0, 0, 0, 211, 0, 212, 0, 0, + 213, 171, 172, 173, 0, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 0, 193, 194, 195, 0, 196, + 197, 198, 0, 0, 0, 170, 0, 199, 200, 0, + 201, 202, 203, 204, 205, 0, 206, 207, 208, 209, + 210, 0, 0, 0, 0, 0, 211, 0, 212, 0, + 0, 213, 171, 172, 173, 0, 174, 175, 176, 177, + 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 192, 0, 193, 194, 195, 0, + 196, 197, 198, 0, 0, 0, 170, 0, 0, 0, + 0, 201, 202, 203, 204, 205, 0, 206, 207, 208, + 209, 210, 0, 0, 0, 0, 0, 211, 0, 212, + 0, 0, 213, 171, 172, 173, 0, 174, 175, 176, + 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 193, 194, 195, + 0, 196, 197, 198, 0, 0, 0, 170, 0, 0, + 0, 0, 201, 202, 203, 204, 205, 0, 206, 207, + 208, 209, 210, 0, 0, 0, 0, 0, 211, 0, + 212, 0, 0, 213, 171, 172, 173, 0, 174, 175, + 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 193, 194, + 195, 0, 196, 197, 198, 0, 0, 0, 170, 0, + 0, 0, 0, 0, 202, 203, 204, 205, 0, 206, + 207, 208, 209, 210, 0, 0, 0, 0, 0, 211, + 0, 212, 0, 0, 213, 171, 172, 173, 0, 174, + 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, + 194, 195, 0, 196, 197, 198, 0, 0, 0, 170, + 0, 0, 0, 0, 0, 0, 203, 204, 205, 0, + 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, + 211, 0, 212, 0, 0, 213, 171, 172, 173, 0, + 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 189, 190, 191, 0, 192, 193, 194, + 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, 200, 201, 0, 202, 203, 204, 205, 206, - 0, 0, 0, 0, 0, 207, 0, 208, 0, 0, - 209 + 0, 193, 194, 195, 0, 196, 197, 198, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, + 205, 0, 206, 207, 208, 209, 210, 0, 0, 0, + 0, 0, 211, 0, 212, 0, 0, 213 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 18, 38, 98, 57, 64, - 23, 251, 109, 3, 391, 3, 90, 3, 12, 49, - 3, 4, 47, 36, 325, 38, 39, 40, 0, 42, - 43, 44, 26, 46, 17, 90, 45, 319, 460, 89, - 90, 91, 464, 465, 67, 3, 4, 88, 0, 0, - 34, 51, 51, 51, 51, 51, 26, 91, 33, 17, - 121, 483, 32, 113, 114, 115, 50, 3, 4, 121, - 99, 121, 99, 123, 375, 497, 126, 16, 101, 51, - 135, 17, 504, 99, 99, 367, 61, 3, 4, 123, - 3, 121, 126, 125, 107, 104, 109, 99, 3, 51, - 51, 17, 121, 132, 92, 132, 92, 89, 90, 91, - 207, 412, 125, 353, 99, 12, 132, 132, 121, 35, - 129, 130, 101, 126, 125, 104, 503, 98, 99, 26, - 132, 121, 121, 3, 374, 5, 0, 127, 125, 121, - 121, 123, 125, 99, 126, 125, 126, 132, 148, 148, - 148, 148, 148, 166, 167, 168, 169, 170, 171, 172, + 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, 148, 3, 114, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 148, 148, 114, 16, - 232, 214, 234, 212, 121, 126, 121, 3, 25, 104, - 450, 131, 99, 124, 31, 215, 215, 215, 99, 232, - 3, 234, 231, 217, 249, 322, 466, 16, 45, 3, - 16, 4, 226, 3, 125, 67, 25, 3, 98, 67, - 98, 30, 31, 252, 253, 18, 19, 20, 3, 22, - 3, 24, 3, 3, 43, 12, 45, 126, 349, 126, - 351, 132, 121, 104, 37, 99, 131, 3, 508, 53, - 101, 53, 45, 46, 47, 48, 3, 132, 88, 334, - 3, 121, 131, 125, 3, 132, 99, 342, 362, 126, - 104, 304, 131, 101, 121, 5, 125, 15, 8, 9, - 10, 99, 393, 377, 3, 125, 131, 362, 132, 322, - 125, 311, 311, 311, 388, 131, 101, 27, 28, 319, - 319, 319, 377, 99, 125, 98, 125, 321, 121, 64, - 132, 3, 132, 388, 44, 104, 131, 428, 387, 3, - 25, 4, 132, 356, 54, 55, 378, 125, 125, 3, - 131, 383, 39, 125, 363, 18, 19, 20, 131, 22, - 131, 24, 121, 131, 131, 378, 131, 367, 367, 367, - 383, 131, 51, 447, 37, 449, 132, 131, 311, 66, - 67, 68, 45, 46, 47, 48, 148, 74, 75, 57, - 398, 128, 447, 341, 449, 69, 436, 436, 4, 489, - 418, 418, 89, 90, 91, 475, 93, 94, 95, 457, - 370, 480, 18, 19, 20, 410, 22, 26, 24, 393, - 433, 108, 109, 399, 111, 112, 113, 114, 115, 429, - 371, 37, -1, -1, 121, 98, 123, -1, -1, 126, - 46, 47, 48, -1, -1, -1, -1, -1, 89, 90, - 91, 451, 451, 451, 451, 451, -1, 457, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 131, -1, - 111, 112, 113, 114, 115, 475, 475, 475, 475, 475, - 121, -1, 123, -1, -1, 126, -1, -1, -1, 489, - 489, 489, 489, 489, 0, -1, -1, 3, 4, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, -1, - -1, 17, 18, 19, 20, 21, 22, 23, 24, -1, - -1, 27, 28, -1, -1, 39, -1, -1, -1, 35, - -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, - 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, - -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, - 74, 75, -1, 69, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 89, 90, 91, -1, 93, - 94, 95, -1, 89, 90, -1, -1, -1, -1, -1, - -1, -1, 98, -1, 108, 109, -1, 111, 112, 113, - 114, 115, -1, -1, -1, 111, -1, 121, -1, 123, - 116, 117, 126, -1, -1, 121, -1, 123, -1, 125, - -1, 127, -1, -1, -1, 131, 3, 4, 5, 6, - -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, - -1, 18, 19, 20, 21, 22, 23, 24, 25, -1, - 27, 28, 29, -1, 31, -1, -1, -1, 35, 36, - 37, 38, -1, 40, 41, 42, -1, 44, 45, 46, - 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, - -1, -1, -1, -1, -1, 62, 63, -1, 65, -1, - -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 89, 90, -1, -1, -1, -1, -1, -1, - -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, - 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, - 127, -1, -1, -1, 131, 3, 4, 5, 6, -1, - 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, - 18, 19, 20, 21, 22, 23, 24, 25, -1, 27, - 28, 29, -1, 31, -1, -1, -1, 35, 36, 37, - 38, -1, 40, 41, 42, -1, 44, 45, 46, 47, + 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, 65, -1, -1, + -1, -1, -1, -1, 62, 63, -1, -1, 74, 75, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 89, 90, -1, -1, -1, -1, -1, -1, -1, - 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 111, -1, -1, -1, -1, 116, 117, - -1, -1, -1, 121, -1, 123, -1, 125, -1, 127, + -1, -1, -1, -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, @@ -3318,46 +3076,46 @@ static const yytype_int16 yycheck[] = -1, -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 89, 90, -1, -1, -1, -1, -1, -1, -1, 98, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 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, 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, + 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, -1, -1, -1, -1, 69, + -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, - 90, -1, -1, -1, -1, -1, -1, -1, 98, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 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, + 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, -1, -1, -1, -1, 69, -1, + -1, 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 89, 90, - -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, + 12, 13, 14, -1, -1, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, -1, -1, -1, -1, -1, -1, 35, -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 89, 90, -1, - -1, -1, -1, -1, -1, -1, 98, -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, @@ -3369,8 +3127,8 @@ static const yytype_int16 yycheck[] = -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, 89, 90, -1, -1, - -1, -1, -1, -1, -1, 98, -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, @@ -3382,151 +3140,181 @@ static const yytype_int16 yycheck[] = 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, 89, 90, -1, -1, -1, - -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, + -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, - -1, 125, -1, 127, -1, 0, -1, 131, 3, 4, + -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, -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, 89, 90, -1, -1, -1, -1, - -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, - 125, -1, 127, 3, 4, 5, 6, -1, 8, 9, - 10, 11, 12, 13, 14, -1, 16, -1, 18, 19, - 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, - -1, 31, -1, -1, -1, 35, 36, 37, 38, -1, - 40, 41, 42, -1, 44, 45, 46, 47, 48, -1, - -1, 51, 52, -1, 54, 55, -1, -1, -1, -1, - -1, -1, 62, 63, -1, 65, -1, -1, -1, 69, + 125, -1, 127, -1, -1, -1, 131, 3, 4, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, -1, + -1, -1, 18, 19, 20, 21, 22, 23, 24, -1, + -1, 27, 28, -1, -1, -1, -1, -1, -1, 35, + -1, 37, 38, -1, 40, -1, 42, -1, 44, -1, + 46, 47, 48, -1, -1, 51, 52, -1, 54, 55, + -1, -1, -1, -1, -1, -1, 62, 63, -1, -1, + -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, - 90, -1, -1, -1, -1, -1, -1, -1, 98, -1, + -1, -1, -1, -1, 90, 91, -1, -1, -1, -1, + -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 111, -1, -1, -1, -1, + 116, 117, -1, -1, -1, 121, -1, 123, -1, 125, + -1, 127, -1, 0, -1, 131, 3, 4, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, + 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, + 27, 28, -1, -1, -1, -1, -1, -1, 35, -1, + 37, 38, -1, 40, -1, 42, -1, 44, -1, 46, + 47, 48, -1, -1, 51, 52, -1, 54, 55, -1, + -1, -1, -1, -1, -1, 62, 63, -1, -1, -1, + -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 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, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, + 117, -1, -1, -1, 121, -1, 123, -1, 125, -1, + 127, 3, 4, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, -1, 16, -1, 18, 19, 20, 21, + 22, 23, 24, 25, -1, 27, 28, 29, -1, 31, + -1, -1, -1, 35, 36, 37, 38, -1, 40, 41, + 42, -1, 44, 45, 46, 47, 48, -1, -1, 51, + 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, + 62, 63, -1, 65, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 89, 90, -1, -1, -1, -1, - -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 111, -1, -1, -1, - -1, 116, 117, -1, -1, -1, 121, -1, 123, -1, - 125, 3, 127, 5, 6, -1, 8, 9, 10, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 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, 23, -1, 25, -1, 27, 28, -1, -1, 31, - -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, - 42, -1, 44, 45, -1, -1, -1, -1, -1, -1, - 52, -1, 54, 55, -1, -1, -1, -1, -1, -1, - 62, -1, -1, -1, -1, -1, -1, 69, -1, -1, - -1, 3, -1, 5, 6, -1, 8, 9, 10, -1, - -1, -1, -1, -1, -1, -1, -1, 89, 90, -1, - -1, 23, -1, 25, -1, 27, 28, -1, -1, -1, - -1, -1, -1, 35, -1, -1, -1, -1, -1, 111, - 42, -1, 44, -1, 116, 117, -1, -1, -1, 121, - 52, 123, 54, 55, -1, 127, 3, -1, 5, 6, - 62, 8, 9, 10, -1, -1, -1, 69, -1, -1, - -1, -1, -1, -1, -1, -1, 23, -1, 25, -1, - 27, 28, -1, -1, -1, -1, -1, 89, 90, -1, - -1, -1, -1, -1, -1, -1, -1, 44, -1, -1, - -1, -1, -1, -1, -1, 52, -1, 54, 55, 111, - -1, -1, -1, -1, 116, 117, -1, 39, -1, 121, - -1, 123, 69, -1, -1, 127, -1, -1, -1, -1, + -1, -1, -1, 90, 91, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 111, -1, -1, -1, -1, 116, + 117, -1, -1, -1, 121, -1, 123, -1, 125, 3, + 127, 5, 6, -1, 8, 9, 10, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, + -1, 25, -1, 27, 28, -1, -1, 31, -1, -1, + -1, 35, -1, -1, -1, -1, -1, -1, 42, -1, + 44, 45, -1, -1, -1, -1, -1, -1, 52, -1, + 54, 55, -1, -1, -1, -1, -1, -1, 62, -1, + -1, -1, -1, -1, -1, 69, -1, -1, -1, 3, + -1, 5, 6, -1, 8, 9, 10, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 90, 91, -1, 23, + -1, 25, -1, 27, 28, -1, -1, -1, -1, -1, + -1, 35, -1, -1, -1, -1, -1, 111, 42, -1, + 44, -1, 116, 117, -1, -1, -1, 121, 52, 123, + 54, 55, -1, 127, 3, -1, 5, 6, 62, 8, + 9, 10, -1, -1, -1, 69, -1, -1, -1, -1, + -1, -1, -1, -1, 23, -1, 25, -1, 27, 28, + -1, -1, -1, -1, -1, -1, 90, 91, -1, -1, + -1, -1, -1, -1, -1, 44, -1, -1, -1, -1, + -1, -1, -1, 52, -1, 54, 55, 111, -1, -1, + -1, -1, 116, 117, -1, -1, -1, 121, -1, 123, + 69, -1, -1, 127, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 89, 90, 66, 67, 68, -1, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, -1, 89, 90, 91, - -1, 93, 94, 95, 121, -1, 123, -1, -1, 101, - 127, 103, -1, 105, 106, 107, 108, 109, 39, 111, - 112, 113, 114, 115, -1, -1, -1, -1, -1, 121, - -1, 123, -1, -1, 126, -1, -1, -1, -1, -1, - 132, -1, -1, -1, -1, 66, 67, 68, -1, 70, + -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, -1, 89, 90, - 91, -1, 93, 94, 95, -1, -1, -1, -1, -1, - 101, 39, 103, -1, 105, 106, 107, 108, 109, -1, + 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, 66, 67, - 68, 132, 70, 71, 72, 73, 74, 75, 76, 77, + 121, -1, 123, -1, -1, 126, -1, -1, -1, -1, + -1, 132, -1, -1, -1, -1, 66, 67, 68, -1, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, + 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, + -1, -1, 102, 103, -1, 105, 106, 107, 108, 109, + 39, 111, 112, 113, 114, 115, -1, -1, -1, -1, + -1, 121, -1, 123, -1, -1, 126, -1, -1, -1, + -1, -1, 132, -1, -1, -1, -1, 66, 67, 68, + -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, -1, 102, 103, -1, 105, 106, 107, 108, + 109, 39, 111, 112, 113, 114, 115, -1, -1, -1, + -1, -1, 121, -1, 123, -1, -1, 126, -1, -1, + -1, -1, -1, 132, -1, -1, -1, -1, 66, 67, + 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - -1, 89, 90, 91, -1, 93, 94, 95, -1, -1, - -1, -1, -1, 101, 39, 103, -1, 105, 106, 107, + 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, -1, - -1, 66, 67, 68, 132, 70, 71, 72, 73, 74, + -1, -1, -1, 121, -1, 123, -1, -1, 126, 66, + 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, + -1, -1, -1, 39, -1, 102, 103, -1, 105, 106, + 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, + -1, -1, -1, -1, 121, -1, 123, 124, -1, 126, + 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, 39, -1, 102, 103, 104, 105, + 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, + -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, + 126, 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, -1, 89, 90, 91, -1, 93, 94, - 95, -1, -1, -1, -1, 39, 101, -1, 103, 104, + 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, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, -1, 89, 90, 91, -1, 93, - 94, 95, -1, -1, -1, -1, 39, 101, -1, 103, + 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, - 124, -1, 126, 66, 67, 68, -1, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, -1, 89, 90, 91, -1, - 93, 94, 95, -1, -1, -1, -1, 39, 101, -1, - 103, 104, 105, 106, 107, 108, 109, -1, 111, 112, + -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, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, -1, 89, 90, 91, - -1, 93, 94, 95, -1, -1, -1, -1, 39, 101, - -1, 103, -1, 105, 106, 107, 108, 109, -1, 111, + 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, 87, -1, 89, 90, - 91, -1, 93, 94, 95, -1, -1, -1, -1, 39, - -1, -1, -1, -1, 105, 106, 107, 108, 109, -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, 89, - 90, 91, -1, 93, 94, 95, -1, -1, -1, -1, - 39, -1, -1, -1, -1, 105, 106, 107, 108, 109, + -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, - 89, 90, 91, -1, 93, 94, 95, -1, -1, -1, - -1, 39, -1, -1, -1, -1, -1, 106, 107, 108, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, -1, - -1, -1, 121, -1, 123, -1, -1, 126, 66, 67, - 68, -1, 70, 71, 72, 73, 74, 75, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 89, 90, 91, -1, 93, 94, 95, -1, -1, - -1, -1, 39, -1, -1, -1, -1, -1, -1, 107, - 108, 109, -1, 111, 112, 113, 114, 115, -1, -1, - -1, -1, -1, 121, -1, 123, -1, -1, 126, 66, - 67, 68, -1, 70, 71, 72, 73, 74, 75, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 89, 90, 91, -1, 93, 94, 95, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, - 107, 108, 109, -1, 111, 112, 113, 114, 115, -1, - -1, -1, -1, -1, 121, -1, 123, -1, -1, 126, - 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 89, 90, 91, -1, 93, 94, 95, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 108, 109, -1, 111, 112, 113, 114, 115, - -1, -1, -1, -1, -1, 121, -1, 123, -1, -1, - 126 + -1, -1, 121, -1, 123, -1, -1, 126 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3536,55 +3324,55 @@ static const yytype_uint8 yystos[] = 0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 28, 35, 37, 38, 40, 42, 44, 46, - 47, 48, 51, 52, 54, 55, 62, 63, 69, 89, - 90, 98, 111, 116, 117, 121, 123, 125, 127, 134, + 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, - 237, 238, 239, 242, 244, 245, 88, 49, 121, 121, + 239, 243, 244, 245, 247, 248, 89, 49, 121, 121, 163, 121, 3, 4, 17, 125, 183, 184, 16, 3, - 239, 3, 218, 239, 121, 184, 222, 121, 125, 121, - 126, 239, 121, 236, 239, 240, 241, 239, 239, 239, - 239, 239, 237, 228, 229, 230, 236, 29, 31, 36, - 41, 45, 65, 98, 131, 142, 143, 144, 147, 149, - 164, 165, 180, 189, 235, 3, 0, 137, 125, 3, - 45, 149, 155, 156, 238, 144, 145, 16, 25, 30, - 31, 43, 45, 205, 243, 191, 99, 39, 66, 67, - 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 89, - 90, 91, 93, 94, 95, 101, 103, 105, 106, 107, - 108, 109, 111, 112, 113, 114, 115, 121, 123, 126, - 3, 121, 161, 145, 171, 187, 125, 126, 183, 184, - 221, 222, 223, 231, 121, 237, 126, 239, 179, 228, - 3, 154, 104, 131, 99, 132, 124, 99, 236, 3, - 3, 150, 151, 237, 237, 150, 3, 131, 144, 125, - 135, 3, 98, 67, 98, 3, 34, 50, 215, 3, - 3, 207, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 3, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 228, 239, 3, 121, 127, 237, 12, 239, 98, - 138, 139, 140, 146, 147, 195, 197, 206, 216, 186, - 183, 126, 121, 227, 3, 92, 212, 213, 214, 132, - 114, 183, 132, 141, 142, 132, 237, 236, 236, 104, - 226, 99, 142, 131, 226, 237, 237, 101, 3, 53, - 192, 53, 193, 3, 208, 209, 104, 132, 124, 88, - 239, 3, 132, 121, 132, 131, 140, 125, 138, 228, - 101, 104, 210, 214, 132, 99, 131, 132, 104, 35, - 114, 223, 225, 101, 148, 151, 131, 98, 132, 3, - 5, 121, 223, 15, 194, 223, 224, 125, 226, 99, - 239, 3, 132, 145, 237, 125, 138, 131, 132, 211, - 225, 226, 92, 214, 26, 32, 172, 174, 176, 177, - 145, 236, 236, 238, 145, 212, 224, 125, 99, 198, - 148, 209, 132, 33, 61, 166, 167, 168, 169, 131, - 210, 125, 214, 125, 121, 172, 174, 64, 152, 132, - 132, 196, 223, 45, 98, 189, 202, 203, 204, 239, - 104, 131, 168, 169, 220, 175, 3, 145, 145, 226, - 98, 143, 147, 189, 199, 200, 201, 206, 216, 3, - 25, 131, 204, 104, 141, 141, 141, 226, 125, 125, - 131, 201, 215, 141, 131, 131, 132, 217, 199, 3, - 173, 141, 131, 121, 125, 131, 212, 141, 132, 131, - 226 + 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) @@ -4400,7 +4188,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2086 "parser.y" +#line 1861 "parser.y" {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4411,7 +4199,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2098 "parser.y" +#line 1873 "parser.y" {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -4422,7 +4210,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2101 "parser.y" +#line 1876 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4433,7 +4221,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2102 "parser.y" +#line 1877 "parser.y" {(yyval.code)=code_new();} } break; @@ -4444,8 +4232,10 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2104 "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; @@ -4455,7 +4245,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2105 "parser.y" +#line 1882 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4466,7 +4256,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2120 "parser.y" +#line 1897 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4477,7 +4267,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2121 "parser.y" +#line 1898 "parser.y" {(yyval.code)=0;} } break; @@ -4488,7 +4278,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2124 "parser.y" +#line 1901 "parser.y" {(yyval.code)=0;} } break; @@ -4499,8 +4289,16 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2131 "parser.y" - {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} +#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; @@ -4510,7 +4308,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2135 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4521,7 +4319,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2136 "parser.y" +#line 1921 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4532,7 +4330,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2140 "parser.y" +#line 1925 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4546,7 +4344,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2147 "parser.y" +#line 1932 "parser.y" { PASS12 (yyval.number_int)=as3_pass; @@ -4565,8 +4363,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2166 "parser.y" - {(yyval.value)=(yyvsp[(2) - (2)].value);} +#line 1951 "parser.y" + {(yyval.node)=(yyvsp[(2) - (2)].node);} } break; @@ -4576,10 +4374,8 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2167 "parser.y" - {(yyval.value).c=abc_pushundefined(0); - (yyval.value).t=TYPE_ANY; - } +#line 1952 "parser.y" + {(yyval.node)=mkdummynode();} } break; @@ -4589,7 +4385,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2171 "parser.y" +#line 1954 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4600,7 +4396,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2172 "parser.y" +#line 1955 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4611,7 +4407,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2174 "parser.y" +#line 1957 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4622,7 +4418,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2175 "parser.y" +#line 1958 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4633,7 +4429,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2178 "parser.y" +#line 1961 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4642,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) { @@ -4665,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; @@ -4700,7 +4495,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2238 "parser.y" +#line 2020 "parser.y" {(yyval.code) = code_new();} } break; @@ -4711,7 +4506,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2239 "parser.y" +#line 2021 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4722,7 +4517,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2024 "parser.y" {PASS12 new_state();} } break; @@ -4733,7 +4528,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2242 "parser.y" +#line 2024 "parser.y" { (yyval.code) = code_new(); @@ -4761,7 +4556,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2261 "parser.y" +#line 2043 "parser.y" {(yyval.code)=code_new();} } break; @@ -4772,7 +4567,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2268 "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); @@ -4786,7 +4581,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2272 "parser.y" +#line 2054 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4800,7 +4595,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2277 "parser.y" +#line 2059 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4811,7 +4606,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2278 "parser.y" +#line 2060 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4822,7 +4617,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2280 "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(); @@ -4851,7 +4646,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2300 "parser.y" +#line 2082 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); if(!var) { @@ -4908,7 +4703,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2348 "parser.y" +#line 2130 "parser.y" {PASS12 new_state();} } break; @@ -4919,7 +4714,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2348 "parser.y" +#line 2130 "parser.y" { (yyval.code) = code_new(); @@ -4947,7 +4742,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2367 "parser.y" +#line 2149 "parser.y" {PASS12 new_state();} } break; @@ -4958,7 +4753,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2367 "parser.y" +#line 2149 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4982,7 +4777,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2382 "parser.y" +#line 2164 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4995,7 +4790,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2385 "parser.y" +#line 2167 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -5008,7 +4803,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2388 "parser.y" +#line 2170 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -5021,7 +4816,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2173 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -5034,7 +4829,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2177 "parser.y" {(yyval.code)=0;} } break; @@ -5045,7 +4840,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2178 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -5056,7 +4851,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2397 "parser.y" +#line 2179 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -5067,7 +4862,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2180 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -5078,7 +4873,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2181 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -5089,7 +4884,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2182 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -5100,10 +4895,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "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__) { @@ -5121,7 +4916,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2413 "parser.y" +#line 2195 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -5134,7 +4929,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2198 "parser.y" {PASS12 new_state();state->switch_var=alloc_local();} } break; @@ -5145,9 +4940,9 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "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)); @@ -5183,7 +4978,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "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); @@ -5198,7 +4993,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2452 "parser.y" +#line 2234 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -5228,7 +5023,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2472 "parser.y" +#line 2254 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -5239,7 +5034,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2472 "parser.y" +#line 2254 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -5264,7 +5059,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2488 "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; @@ -5275,7 +5070,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2489 "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; @@ -5286,7 +5081,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2490 "parser.y" +#line 2272 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5297,7 +5092,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2491 "parser.y" +#line 2273 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5315,7 +5110,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2499 "parser.y" +#line 2281 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5333,7 +5128,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2508 "parser.y" +#line 2290 "parser.y" {PASS12 new_state(); state->method->has_exceptions=1; state->method->late_binding=1;//for invariant scope_code @@ -5347,7 +5142,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2511 "parser.y" +#line 2293 "parser.y" { code_t*out = abc_nop(0); @@ -5400,7 +5195,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2557 "parser.y" +#line 2339 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5414,7 +5209,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2561 "parser.y" +#line 2343 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5432,7 +5227,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2572 "parser.y" +#line 2354 "parser.y" { new_state(); if(state->method->has_exceptions) { @@ -5452,7 +5247,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2582 "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)); @@ -5476,7 +5271,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "parser.y" +#line 2382 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5487,7 +5282,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2601 "parser.y" +#line 2383 "parser.y" {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);} } break; @@ -5498,7 +5293,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2603 "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; @@ -5509,7 +5304,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2604 "parser.y" +#line 2386 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5520,7 +5315,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2606 "parser.y" +#line 2388 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5531,7 +5326,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2607 "parser.y" +#line 2389 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5542,7 +5337,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" +#line 2390 "parser.y" {PASS12 startpackage("");} } break; @@ -5553,7 +5348,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2609 "parser.y" +#line 2391 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5564,7 +5359,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2631 "parser.y" +#line 2413 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); @@ -5588,7 +5383,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2645 "parser.y" +#line 2427 "parser.y" { PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { @@ -5611,7 +5406,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2661 "parser.y" +#line 2443 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5622,7 +5417,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2444 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5633,7 +5428,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2663 "parser.y" +#line 2445 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5644,7 +5439,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2664 "parser.y" +#line 2446 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5661,7 +5456,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2671 "parser.y" +#line 2453 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5672,7 +5467,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2672 "parser.y" +#line 2454 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5683,7 +5478,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2673 "parser.y" +#line 2455 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5694,7 +5489,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "parser.y" +#line 2456 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5705,7 +5500,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2675 "parser.y" +#line 2457 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5716,7 +5511,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2676 "parser.y" +#line 2458 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5727,7 +5522,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2677 "parser.y" +#line 2459 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5738,7 +5533,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2678 "parser.y" +#line 2460 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5749,7 +5544,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2679 "parser.y" +#line 2461 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5760,7 +5555,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2680 "parser.y" +#line 2462 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5773,7 +5568,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2684 "parser.y" +#line 2466 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -5784,7 +5579,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2685 "parser.y" +#line 2467 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5795,7 +5590,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2687 "parser.y" +#line 2469 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5806,7 +5601,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2688 "parser.y" +#line 2470 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5817,7 +5612,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2472 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5828,7 +5623,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2691 "parser.y" +#line 2473 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5839,7 +5634,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2695 "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; @@ -5850,7 +5645,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2697 "parser.y" +#line 2479 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5861,7 +5656,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2701 "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));} } @@ -5873,7 +5668,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2704 "parser.y" +#line 2486 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5884,7 +5679,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2713 "parser.y" +#line 2495 "parser.y" {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);} } break; @@ -5895,7 +5690,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 2499 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5910,7 +5705,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2728 "parser.y" +#line 2510 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5923,7 +5718,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2731 "parser.y" +#line 2513 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5943,7 +5738,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 2547 "parser.y" {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; @@ -5954,7 +5749,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2765 "parser.y" +#line 2547 "parser.y" {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; @@ -5965,7 +5760,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2767 "parser.y" +#line 2549 "parser.y" {PASS12 (yyval.code)=0;} } break; @@ -5976,7 +5771,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" +#line 2550 "parser.y" {PASS12 (yyval.code)=0;} } break; @@ -5987,7 +5782,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2771 "parser.y" +#line 2553 "parser.y" { PASS12 int flags = slotstate_flags->flags; @@ -6050,20 +5845,29 @@ PASS12 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); + + 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); } - *code = code_append(*code, c); - if(slotstate_varconst==KW_CONST) { t->kind= TRAIT_CONST; + info->flags |= FLAG_CONST; } } @@ -6078,7 +5882,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2855 "parser.y" +#line 2646 "parser.y" {(yyval.constant)=0;} } break; @@ -6089,8 +5893,13 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2856 "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; @@ -6100,7 +5909,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2859 "parser.y" +#line 2655 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -6111,7 +5920,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2860 "parser.y" +#line 2656 "parser.y" { (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint)); } @@ -6124,7 +5933,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2863 "parser.y" +#line 2659 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -6135,7 +5944,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2864 "parser.y" +#line 2660 "parser.y" {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);} } break; @@ -6146,7 +5955,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "parser.y" +#line 2661 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -6157,7 +5966,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2866 "parser.y" +#line 2662 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -6168,7 +5977,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2867 "parser.y" +#line 2663 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -6179,7 +5988,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2868 "parser.y" +#line 2664 "parser.y" {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));} } break; @@ -6190,7 +5999,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2869 "parser.y" +#line 2665 "parser.y" {(yyval.constant) = constant_new_float(__builtin_nan(""));} } break; @@ -6201,7 +6010,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2884 "parser.y" +#line 2680 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6215,7 +6024,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2888 "parser.y" +#line 2684 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -6229,7 +6038,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2894 "parser.y" +#line 2690 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6245,7 +6054,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2900 "parser.y" +#line 2696 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -6261,7 +6070,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2908 "parser.y" +#line 2704 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -6276,7 +6085,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2913 "parser.y" +#line 2709 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -6291,7 +6100,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2919 "parser.y" +#line 2715 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6309,7 +6118,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2927 "parser.y" +#line 2723 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -6327,7 +6136,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2937 "parser.y" +#line 2733 "parser.y" {PASS12 (yyval.token)=0;} } break; @@ -6338,7 +6147,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2940 "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; @@ -6349,7 +6158,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2941 "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); @@ -6373,7 +6182,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2957 "parser.y" +#line 2753 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -6384,7 +6193,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2959 "parser.y" +#line 2755 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -6395,7 +6204,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2960 "parser.y" +#line 2756 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6423,7 +6232,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" +#line 2778 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6451,7 +6260,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3001 "parser.y" +#line 2797 "parser.y" { PASS1 NEW(unresolvedinfo_t,c); memset(c, 0, sizeof(*c)); @@ -6474,7 +6283,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3018 "parser.y" +#line 2814 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -6485,7 +6294,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3019 "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; @@ -6496,7 +6305,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3021 "parser.y" +#line 2817 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -6507,8 +6316,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3022 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2818 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; @@ -6518,8 +6327,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3023 "parser.y" - {PASS12 (yyval.classinfo)=registry_getanytype();} +#line 2819 "parser.y" + {PASS12 (yyval.classinfo)=TYPE_ANY;} } break; @@ -6529,7 +6338,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3032 "parser.y" +#line 2828 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -6540,7 +6349,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3033 "parser.y" +#line 2829 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -6551,7 +6360,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3037 "parser.y" +#line 2833 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6562,7 +6371,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3038 "parser.y" +#line 2834 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6573,7 +6382,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3040 "parser.y" +#line 2836 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6584,7 +6393,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3044 "parser.y" +#line 2840 "parser.y" {(yyval.value_list).number=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6597,7 +6406,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "parser.y" +#line 2844 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6608,7 +6417,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3049 "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); @@ -6622,9 +6431,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3055 "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; @@ -6647,8 +6457,8 @@ PASS12 } (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; @@ -6663,10 +6473,11 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3091 "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); } @@ -6702,8 +6513,11 @@ PASS12 (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; @@ -6718,7 +6532,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3137 "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"); @@ -6748,9 +6562,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3158 "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); } @@ -6764,7 +6579,7 @@ PASS12 (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; @@ -6778,7 +6593,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3179 "parser.y" +#line 2981 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6791,7 +6606,7 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3182 "parser.y" +#line 2984 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6805,8 +6620,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3189 "parser.y" - {(yyval.value)=(yyvsp[(1) - (1)].value);} +#line 2991 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; @@ -6816,8 +6633,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3190 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 2994 "parser.y" + { + (yyval.value) = node_read((yyvsp[(1) - (1)].node)); +} } break; @@ -6827,12 +6646,9 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3191 "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; @@ -6843,9 +6659,9 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3197 "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; @@ -6856,8 +6672,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3203 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3003 "parser.y" + { + (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); +} } break; @@ -6867,8 +6685,11 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3204 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3006 "parser.y" + { + (yyval.code) = (yyvsp[(1) - (3)].code); + (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); +} } break; @@ -6878,8 +6699,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3205 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3011 "parser.y" + {(yyval.value_list).cc=0;(yyval.value_list).number=0;} } break; @@ -6889,8 +6710,19 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3206 "parser.y" - {(yyval.value) = (yyvsp[(1) - (1)].value);} +#line 3012 "parser.y" + {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} + } + break; + + + + case 229: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3014 "parser.y" + {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));} } break; @@ -6900,11 +6732,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3210 "parser.y" - { - node_t*n = mkconstnode((yyvsp[(1) - (1)].constant)); - (yyval.value) = node_read(n); -} +#line 3015 "parser.y" + {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));} } break; @@ -6914,22 +6743,12 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3215 "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; @@ -6940,10 +6759,13 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3232 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#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; @@ -6953,10 +6775,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3235 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3032 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6966,10 +6786,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3238 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3033 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6979,10 +6797,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3241 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3034 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -6992,10 +6808,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3244 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3035 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -7005,10 +6819,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3247 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3036 "parser.y" + {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));} } break; @@ -7018,10 +6830,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3250 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3037 "parser.y" + {(yyval.node) = (yyvsp[(1) - (1)].node);} } break; @@ -7031,10 +6841,10 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3253 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3039 "parser.y" + { + (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant)); +} } break; @@ -7044,18 +6854,25 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "parser.y" - {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O'); - (yyval.value).c = (yyvsp[(1) - (3)].value).c; - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t); - (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 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; @@ -7065,24 +6882,15 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3268 "parser.y" +#line 3064 "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; - } + 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; @@ -7092,11 +6900,15 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3286 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_not((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#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; @@ -7106,11 +6918,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3291 "parser.y" - {(yyval.value).c=(yyvsp[(2) - (2)].value).c; - (yyval.value).c = abc_bitnot((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3083 "parser.y" + {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7120,11 +6929,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3296 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_bitand((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3084 "parser.y" + {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7134,11 +6940,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3301 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_bitxor((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3085 "parser.y" + {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7148,11 +6951,8 @@ PASS12 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); - (yyval.value).c = abc_bitor((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3086 "parser.y" + {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7162,11 +6962,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3311 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_rshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3087 "parser.y" + {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7176,11 +6973,8 @@ PASS12 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); - (yyval.value).c = abc_urshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3088 "parser.y" + {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7190,11 +6984,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3319 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_lshift((yyval.value).c); - (yyval.value).t = TYPE_INT; - } +#line 3089 "parser.y" + {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7204,11 +6995,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3324 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_divide((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } +#line 3090 "parser.y" + {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7218,11 +7006,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3328 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_modulo((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } +#line 3091 "parser.y" + {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7232,16 +7017,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3332 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_add_i((yyval.value).c); - (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 3092 "parser.y" + {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));} } break; @@ -7251,16 +7028,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3341 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_subtract_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_subtract((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3093 "parser.y" + {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));} } break; @@ -7270,16 +7039,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3350 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - (yyval.value).c = abc_multiply_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c = abc_multiply((yyval.value).c); - (yyval.value).t = TYPE_NUMBER; - } - } +#line 3094 "parser.y" + {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));} } break; @@ -7289,11 +7050,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3360 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_in((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3095 "parser.y" + {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7303,18 +7061,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3365 "parser.y" - {char use_astype=0; // flash player's astype works differently than astypelate - if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) { - MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data)); - (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 3096 "parser.y" + {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7324,11 +7072,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3378 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_instanceof((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3097 "parser.y" + {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7338,11 +7083,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3383 "parser.y" - {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c); - (yyval.value).c = abc_istypelate((yyval.value).c); - (yyval.value).t = TYPE_BOOLEAN; - } +#line 3098 "parser.y" + {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7352,12 +7094,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3388 "parser.y" - { - (yyval.value).c = (yyvsp[(3) - (4)].value).c; - (yyval.value).c = abc_typeof((yyval.value).c); - (yyval.value).t = TYPE_STRING; - } +#line 3099 "parser.y" + {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7367,12 +7105,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3394 "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 3100 "parser.y" + {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7382,10 +7116,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3400 "parser.y" - { (yyval.value).c = abc_pushundefined(0); - (yyval.value).t = TYPE_ANY; - } +#line 3101 "parser.y" + {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7395,8 +7127,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3404 "parser.y" - {(yyval.value)=(yyvsp[(2) - (3)].value);} +#line 3102 "parser.y" + {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7406,17 +7138,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3406 "parser.y" - { - (yyval.value).c = (yyvsp[(2) - (2)].value).c; - if(IS_INT((yyvsp[(2) - (2)].value).t)) { - (yyval.value).c=abc_negate_i((yyval.value).c); - (yyval.value).t = TYPE_INT; - } else { - (yyval.value).c=abc_negate((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; @@ -7426,15 +7149,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3417 "parser.y" - { - (yyval.value).c = (yyvsp[(1) - (4)].value).c; - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); - - 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 3104 "parser.y" + {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7444,13 +7160,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3426 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number); - (yyval.value).t = registry_getarrayclass(); -} +#line 3105 "parser.y" + {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7460,8 +7171,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3433 "parser.y" - {(yyval.value_list).cc=0;(yyval.value_list).number=0;} +#line 3106 "parser.y" + {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7471,8 +7182,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3434 "parser.y" - {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} +#line 3107 "parser.y" + {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7482,13 +7193,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3436 "parser.y" - { - (yyval.value_list).cc = 0; - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); - (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c); - (yyval.value_list).number = 2; -} +#line 3108 "parser.y" + {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7498,13 +7204,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3442 "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 3109 "parser.y" + {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7514,13 +7215,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3451 "parser.y" - { - (yyval.value).c = code_new(); - (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); - (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2); - (yyval.value).t = registry_getobjectclass(); -} +#line 3110 "parser.y" + {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));} } break; @@ -7530,18 +7226,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3458 "parser.y" - { - code_t*c = (yyvsp[(3) - (3)].value).c; - if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { - 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, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3111 "parser.y" + {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));} } break; @@ -7551,13 +7237,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3470 "parser.y" - { - code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3112 "parser.y" + { (yyval.node) = mkconstnode(constant_new_undefined());} } break; @@ -7567,13 +7248,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3476 "parser.y" - { - code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3113 "parser.y" + { (yyval.node)=(yyvsp[(2) - (3)].node);} } break; @@ -7583,13 +7259,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3482 "parser.y" - { - code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3114 "parser.y" + {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));} } break; @@ -7599,13 +7270,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3488 "parser.y" - { - code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3115 "parser.y" + {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));} } break; @@ -7615,13 +7281,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3494 "parser.y" - { - code_t*c = abc_divide((yyvsp[(3) - (3)].value).c); - c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3116 "parser.y" + {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7631,13 +7292,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3500 "parser.y" - { - code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); - c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3117 "parser.y" + {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7647,13 +7303,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3506 "parser.y" - { - code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); - c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3118 "parser.y" + {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7663,20 +7314,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3512 "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, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3119 "parser.y" + {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7686,18 +7325,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3525 "parser.y" - { code_t*c = (yyvsp[(3) - (3)].value).c; - if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { - c=abc_subtract_i(c); - } 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, 1); - (yyval.value).t = (yyvsp[(1) - (3)].value).t; - } +#line 3120 "parser.y" + {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7707,13 +7336,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3536 "parser.y" - { code_t*c = 0; - c = code_append(c, (yyvsp[(3) - (3)].value).c); - c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t); - (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0, 1); - (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; @@ -7723,19 +7347,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3543 "parser.y" - { - (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?'); - (yyval.value).c = (yyvsp[(1) - (5)].value).c; - 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 3122 "parser.y" + { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7745,32 +7358,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3556 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { - 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, 1); - (yyval.value).t = (yyvsp[(1) - (2)].value).t; - } - } +#line 3123 "parser.y" + { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7780,20 +7369,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3583 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - 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, 1); - (yyval.value).t = (yyvsp[(1) - (2)].value).t; - } +#line 3124 "parser.y" + { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7803,20 +7380,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3597 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - 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, 1); - (yyval.value).t = (yyvsp[(2) - (2)].value).t; - } +#line 3125 "parser.y" + { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7826,20 +7391,8 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3611 "parser.y" - { code_t*c = 0; - classinfo_t*type = (yyvsp[(2) - (2)].value).t; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { - 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, 1); - (yyval.value).t = (yyvsp[(2) - (2)].value).t; - } +#line 3126 "parser.y" + { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} } break; @@ -7849,34 +7402,99 @@ PASS12 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3626 "parser.y" +#line 3127 "parser.y" + { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));} + } + break; + + + + case 288: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3128 "parser.y" + { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));} + } + break; + + + + case 289: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3130 "parser.y" + { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));} + } + break; + + + + case 290: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3131 "parser.y" + { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));} + } + break; + + + + case 291: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3132 "parser.y" + {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); } + } + break; + + + + case 292: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#line 3133 "parser.y" + {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); } + } + break; + + + + case 293: + if(as3_pass==2) { + +/* Line 1464 of skeleton.m4 */ +#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 288: + case 294: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3640 "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"); } } @@ -7884,15 +7502,14 @@ PASS12 - case 289: + case 295: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3647 "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"); } } @@ -7900,15 +7517,14 @@ PASS12 - case 290: + case 296: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3654 "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"); } } @@ -7916,15 +7532,14 @@ PASS12 - case 291: + case 297: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3661 "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"); } } @@ -7932,15 +7547,14 @@ PASS12 - case 292: + case 298: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3668 "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"); } } @@ -7948,14 +7562,15 @@ PASS12 - case 293: + case 299: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3683 "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,9 +7588,8 @@ PASS12 (yyval.value).c = abc_getslot((yyval.value).c, f->slot); } else { if(!f) { - as3_warning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name); + 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); } @@ -7983,8 +7597,9 @@ PASS12 (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)); slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); @@ -7992,7 +7607,7 @@ PASS12 (yyval.value) = push_class(a); } else if(dict_contains(state->import_toplevel_packages, package2) || registry_ispackage(package2)) { - (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c = v1.c; (yyval.value).c->data[0] = string_new4(package2); (yyval.value).t = 0; } else { @@ -8006,7 +7621,7 @@ PASS12 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; } } } @@ -8014,11 +7629,11 @@ PASS12 - case 294: + case 300: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3740 "parser.y" +#line 3245 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -8037,8 +7652,11 @@ PASS12 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; @@ -8046,14 +7664,16 @@ PASS12 /* 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; } @@ -8062,53 +7682,70 @@ PASS12 /* look at current class' members */ if(!state->method->inner && state->cls && - (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1)) && - (f->flags&FLAG_STATIC) >= i_am_static) + (f = findmember_nsset(state->cls->info, (yyvsp[(1) - (1)].id), 1))) { - // $1 is a function in this class + // $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, f->package}; - multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - 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, f->package}; - multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)}; - (yyval.value).c = abc_getlocal_0((yyval.value).c); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - 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)) || registry_ispackage((yyvsp[(1) - (1)].id))) { - (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); - (yyval.value).t = 0; + o.c = abc___pushpackage__(o.c, (yyvsp[(1) - (1)].id)); + o.t = 0; + (yyval.node) = mkcodenode(o); //? break; } @@ -8120,9 +7757,11 @@ PASS12 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; } } } @@ -8130,11 +7769,11 @@ PASS12 - case 295: + case 301: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3849 "parser.y" +#line 3378 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8147,11 +7786,11 @@ PASS12 - case 296: + case 302: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3856 "parser.y" +#line 3385 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8164,11 +7803,11 @@ PASS12 - case 297: + case 303: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3863 "parser.y" +#line 3392 "parser.y" { PASS12 NEW(namespace_decl_t,n); @@ -8181,11 +7820,11 @@ PASS12 - case 298: + case 304: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3870 "parser.y" +#line 3399 "parser.y" { PASS12 trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url); @@ -8205,11 +7844,11 @@ PASS12 - case 299: + case 305: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3894 "parser.y" +#line 3423 "parser.y" { PASS12 const char*url = (yyvsp[(3) - (3)].classinfo)->name; @@ -8221,7 +7860,7 @@ PASS12 syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name); } - if(!s || s->kind != INFOTYPE_SLOT) + 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); @@ -8238,7 +7877,7 @@ PASS12 /* Line 1464 of skeleton.m4 */ -#line 8242 "parser.tab.c" +#line 7881 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);