X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=2631457f567f5700b954f64cc6fea8831ee7e108;hb=cf2ede9f5b6da1f0d143c3fb825b88a3bb183811;hp=9b0f2b56b629d2cbebb59c95b2bff767696489d9;hpb=98274d31d2a91c0f8a577e6779219e11aaf293bb;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 9b0f2b5..2631457 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -265,6 +265,7 @@ tokenunion abc_exception_t *exception; regexp_t regexp; modifiers_t flags; + namespace_decl_t* namespace_decl; struct { abc_exception_list_t *l; code_t*finally; @@ -273,7 +274,7 @@ tokenunion /* Line 223 of skeleton.m4 */ -#line 277 "parser.tab.c" +#line 278 "parser.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -284,7 +285,7 @@ tokenunion /* Copy the second part of user declarations. */ /* Line 273 of skeleton.m4 */ -#line 263 "parser.y" +#line 265 "parser.y" static int a3_error(char*s) @@ -372,8 +373,10 @@ typedef struct _state { char*package; import_list_t*wildcard_imports; - namespace_list_t*active_namespaces; + dict_t*import_toplevel_packages; dict_t*imports; + namespace_list_t*active_namespaces; + namespace_decl_list_t*new_namespaces; char has_own_imports; char new_vars; // e.g. transition between two functions @@ -451,9 +454,13 @@ static void new_state() if(!s->imports) { s->imports = dict_new(); } + if(!s->import_toplevel_packages) { + s->import_toplevel_packages = dict_new(); + } state = s; state->level++; state->has_own_imports = 0; + state->new_namespaces = 0; state->vars = dict_new(); state->old = oldstate; state->new_vars = 0; @@ -464,6 +471,18 @@ static void state_has_imports() state->imports = dict_clone(state->imports); state->has_own_imports = 1; } +static void import_toplevel(const char*package) +{ + char* s = strdup(package); + while(1) { + dict_put(state->import_toplevel_packages, s, 0); + char*x = strrchr(s, '.'); + if(!x) + break; + *x = 0; + } + free(s); +} static void state_destroy(state_t*state) { @@ -496,6 +515,12 @@ static void old_state() state_t*leaving = state; state = state->old; + + namespace_decl_list_t*nl=leaving->new_namespaces; + while(nl) { + tokenizer_unregister_namespace(nl->namespace_decl->name); + nl = nl->next; + } if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) { free(leaving->method); @@ -840,6 +865,7 @@ static namespace_t modifiers2access(modifiers_t*mod) } return ns; } +static slotinfo_t* find_class(const char*name); static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0) { @@ -860,7 +886,18 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char that those variable indices are reserved. It's up to the optimizer to later shuffle the variables down to lower indices */ - m->variable_count = m->uses_slots; + m->variable_count = m->uses_slots; + DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) { + if(v->type) { + if(v->type->package) + v->type = (classinfo_t*)registry_find(v->type->package, v->type->name); + else + v->type = (classinfo_t*)find_class(v->type->name); + if(!v->type || v->type->kind != INFOTYPE_CLASS) { + syntaxerror("Couldn't find class %s", v->type->name); + } + } + } } if(params) { @@ -888,6 +925,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if(state->cls) { syntaxerror("inner classes now allowed"); } + new_state(); token_list_t*t=0; classinfo_list_t*mlist=0; @@ -897,6 +935,11 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) syntaxerror("public and internal not supported at the same time."); + + if(!(mod->flags&FLAG_INTERFACE) && !extends) { + // all classes extend object + extends = registry_getobjectclass(); + } /* create the class name, together with the proper attributes */ int access=0; @@ -948,7 +991,7 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl syntaxerror("Can't extend final class '%s'", extends->name); /* fill out interfaces and extends (we couldn't resolve those during the first pass) */ - state->cls->info->superclass = extends?extends:TYPE_OBJECT; + state->cls->info->superclass = extends; int pos = 0; classinfo_list_t*l = implements; for(l=implements;l;l=l->next) { @@ -1095,6 +1138,10 @@ void check_code_for_break(code_t*c) char*name = string_cstr(c->data[0]); syntaxerror("Unresolved \"continue %s\"", name); } + if(c->opcode == OPCODE___PUSHPACKAGE__) { + char*name = string_cstr(c->data[0]); + syntaxerror("Can't reference a package (%s) as such", name); + } c=c->prev; } } @@ -1130,12 +1177,15 @@ static void check_override(memberinfo_t*m, int flags) return; if(m->flags & FLAG_FINAL) syntaxerror("can't override final member %s", m->name); + + /* allow this. it's no issue. if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC)) - syntaxerror("can't override static member %s", m->name); + syntaxerror("can't override static member %s", m->name);*/ + if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC)) syntaxerror("can't override non-static member %s with static declaration", m->name); - if(!(flags&FLAG_OVERRIDE)) { + if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) { if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) { if(m->kind == INFOTYPE_METHOD) syntaxerror("can't override without explicit 'override' declaration"); @@ -1244,7 +1294,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type) list_append(parent_method->innerfunctions, state->method); dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method); - + function_initvars(state->method, params, 0, 1); } @@ -1316,7 +1366,9 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* function_initvars(state->method, 0, 0, 0); methodstate_list_t*ml = state->method->innerfunctions; + dict_t*xvars = dict_new(); + while(ml) { methodstate_t*m = ml->methodstate; parserassert(m->inner); @@ -1327,7 +1379,8 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* dictentry_t*l = d->slots[t]; while(l) { /* check parent method's variables */ - if(find_variable(state, l->key)) { + variable_t*v; + if((v=find_variable(state, l->key))) { m->uses_parent_function = 1; state->method->uses_slots = 1; dict_put(xvars, l->key, 0); @@ -1342,6 +1395,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* } ml = ml->next; } + if(state->method->uses_slots) { state->method->slots = dict_new(); int i = 1; @@ -1359,8 +1413,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* state->method->uses_slots = i; dict_destroy(state->vars);state->vars = 0; } - dict_destroy(xvars); - old_state(); return 0; } @@ -1433,8 +1485,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char* check_code_for_break(body); if(state->method->exceptions && - (state->method->late_binding || state->method->uses_slots)) - syntaxerror("try/catch and activation or late binding not supported yet within the same method"); + (state->method->late_binding || state->method->uses_slots)) { + //syntaxerror("try/catch and activation or late binding not supported yet within the same method"); + as3_warning("try/catch and activation or late binding not supported yet within the same method"); + } if(f->body) { f->body->code = body; @@ -1582,7 +1636,7 @@ char is_pushundefined(code_t*c) return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); } -static slotinfo_t* find_class(char*name) +static slotinfo_t* find_class(const char*name) { slotinfo_t*c=0; @@ -1619,6 +1673,43 @@ static slotinfo_t* find_class(char*name) return 0; } +typedcode_t push_class(slotinfo_t*a) +{ + typedcode_t x; + x.c = 0; + x.t = 0; + if(a->access == ACCESS_PACKAGEINTERNAL && + strcmp(a->package, state->package) && + strcmp(a->package, internal_filename_package) + ) { + syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", + infotypename(a), a->name, a->package, state->package); + } + + if(a->kind != INFOTYPE_CLASS) { + MULTINAME(m, a); + x.c = abc_findpropstrict2(x.c, &m); + x.c = abc_getproperty2(x.c, &m); + if(a->kind == INFOTYPE_METHOD) { + methodinfo_t*f = (methodinfo_t*)a; + x.t = TYPE_FUNCTION(f); + } else { + varinfo_t*v = (varinfo_t*)a; + x.t = v->type; + } + } else { + classinfo_t*c = (classinfo_t*)a; + if(c->slot) { + x.c = abc_getglobalscope(x.c); + x.c = abc_getslot(x.c, c->slot); + } else { + MULTINAME(m, c); + x.c = abc_getlex2(x.c, &m); + } + x.t = TYPE_CLASS(c); + } + return x; +} static char is_getlocal(code_t*c) { @@ -1666,7 +1757,7 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r } else { prefix = 0; } - + char use_temp_var = readbefore; /* generate the write instruction, and maybe append a dup to the prefix code */ @@ -1715,6 +1806,10 @@ static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char r write->opcode = OPCODE_SETLOCAL_2; } else if(r->opcode == OPCODE_GETLOCAL_3) { write->opcode = OPCODE_SETLOCAL_3; + } else if(r->opcode == OPCODE_GETSUPER) { + write->opcode = OPCODE_SETSUPER; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); } else { code_dump(r); syntaxerror("illegal lvalue: can't assign a value to this expression"); @@ -1926,7 +2021,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1930 "parser.tab.c" +#line 2025 "parser.tab.c" #ifdef short # undef short @@ -2141,7 +2236,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 145 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3015 +#define YYLAST 2999 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 134 @@ -2236,7 +2331,7 @@ static const yytype_uint16 yyprhs[] = 767, 771, 774, 779, 783, 784, 786, 790, 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, 902, 907, 912 + 884, 890, 894, 896, 899, 904, 909, 912 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -2331,45 +2426,45 @@ static const yytype_int16 yyrhs[] = 239, -1, 53, 127, 3, -1, 128, 3, -1, 239, 127, 128, 3, -1, 239, 127, 3, 89, 3, -1, 239, 92, 3, -1, 239, 127, 122, 239, 133, -1, - 239, 127, 3, -1, 3, -1, 18, 3, -1, 189, - 244, -1, 189, 244, 102, 3, -1, 189, 244, 102, - 5, -1, 23, 18, 223, -1 + 239, 127, 3, -1, 3, -1, 18, 3, -1, 18, + 3, 102, 3, -1, 18, 3, 102, 5, -1, 189, + 244, -1, 23, 18, 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1907, 1907, 1909, 1909, 1910, 1911, 1913, 1914, 1915, - 1916, 1917, 1918, 1919, 1920, 1922, 1922, 1923, 1924, 1926, - 1927, 1928, 1929, 1930, 1931, 1932, 1934, 1935, 1937, 1938, - 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, - 1951, 1952, 1953, 1954, 1957, 1958, 1959, 1960, 1961, 1962, - 1963, 1964, 1968, 1969, 1973, 1980, 1984, 1985, 1989, 1990, - 1992, 1993, 1995, 2056, 2057, 2060, 2060, 2079, 2080, 2081, - 2086, 2090, 2095, 2096, 2098, 2118, 2162, 2162, 2181, 2181, - 2196, 2199, 2202, 2205, 2209, 2210, 2211, 2212, 2213, 2214, - 2216, 2227, 2230, 2230, 2259, 2259, 2283, 2283, 2299, 2300, - 2301, 2302, 2310, 2319, 2319, 2364, 2368, 2379, 2388, 2389, - 2391, 2392, 2394, 2394, 2396, 2396, 2399, 2414, 2430, 2431, - 2432, 2433, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, - 2449, 2450, 2454, 2455, 2457, 2458, 2460, 2461, 2465, 2463, - 2471, 2469, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, - 2487, 2493, 2494, 2495, 2496, 2497, 2498, 2501, 2514, 2514, - 2516, 2516, 2518, 2519, 2521, 2596, 2597, 2599, 2600, 2601, - 2602, 2603, 2605, 2606, 2607, 2608, 2617, 2621, 2627, 2633, - 2641, 2646, 2652, 2660, 2668, 2669, 2670, 2673, 2672, 2689, - 2690, 2692, 2691, 2715, 2726, 2739, 2740, 2742, 2743, 2745, - 2746, 2747, 2756, 2757, 2761, 2762, 2764, 2765, 2766, 2768, - 2772, 2773, 2778, 2779, 2815, 2861, 2882, 2903, 2906, 2913, - 2914, 2915, 2921, 2927, 2929, 2931, 2933, 2935, 2937, 2939, - 2956, 2961, 2964, 2967, 2970, 2973, 2976, 2979, 2982, 2985, - 2989, 2992, 2995, 2998, 3001, 3004, 3007, 3010, 3014, 3025, - 3043, 3048, 3053, 3058, 3063, 3068, 3072, 3076, 3081, 3085, - 3089, 3098, 3107, 3117, 3122, 3134, 3140, 3145, 3151, 3157, - 3161, 3163, 3174, 3183, 3190, 3191, 3193, 3199, 3208, 3215, - 3227, 3233, 3239, 3245, 3251, 3257, 3263, 3269, 3282, 3293, - 3300, 3313, 3340, 3354, 3368, 3382, 3397, 3404, 3411, 3418, - 3425, 3436, 3470, 3591, 3597, 3600, 3603, 3606 + 0, 2003, 2003, 2005, 2005, 2006, 2007, 2009, 2010, 2011, + 2012, 2013, 2014, 2015, 2016, 2018, 2018, 2019, 2020, 2022, + 2023, 2024, 2025, 2026, 2027, 2028, 2030, 2031, 2033, 2034, + 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, + 2047, 2048, 2049, 2050, 2053, 2054, 2055, 2056, 2057, 2058, + 2059, 2060, 2064, 2065, 2069, 2076, 2080, 2081, 2085, 2086, + 2088, 2089, 2091, 2152, 2153, 2156, 2156, 2175, 2176, 2177, + 2182, 2186, 2191, 2192, 2194, 2214, 2262, 2262, 2281, 2281, + 2296, 2299, 2302, 2305, 2309, 2310, 2311, 2312, 2313, 2314, + 2316, 2327, 2330, 2330, 2359, 2359, 2383, 2383, 2399, 2400, + 2401, 2402, 2410, 2419, 2419, 2464, 2468, 2479, 2488, 2489, + 2491, 2492, 2494, 2494, 2496, 2496, 2499, 2515, 2532, 2533, + 2534, 2535, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, + 2551, 2552, 2556, 2557, 2559, 2560, 2562, 2563, 2567, 2565, + 2573, 2571, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, + 2589, 2595, 2596, 2597, 2598, 2599, 2600, 2603, 2616, 2616, + 2618, 2618, 2620, 2621, 2623, 2698, 2699, 2701, 2702, 2703, + 2704, 2705, 2707, 2708, 2709, 2710, 2722, 2726, 2732, 2738, + 2746, 2751, 2757, 2765, 2773, 2774, 2775, 2778, 2777, 2794, + 2795, 2797, 2796, 2820, 2836, 2851, 2852, 2854, 2855, 2857, + 2858, 2859, 2868, 2869, 2873, 2874, 2876, 2877, 2878, 2880, + 2884, 2885, 2890, 2891, 2927, 2973, 2994, 3015, 3018, 3025, + 3026, 3027, 3033, 3039, 3041, 3043, 3045, 3047, 3049, 3051, + 3068, 3073, 3076, 3079, 3082, 3085, 3088, 3091, 3094, 3097, + 3101, 3104, 3107, 3110, 3113, 3116, 3119, 3122, 3126, 3137, + 3155, 3160, 3165, 3170, 3175, 3180, 3184, 3188, 3193, 3197, + 3201, 3210, 3219, 3229, 3234, 3246, 3252, 3257, 3263, 3269, + 3273, 3275, 3286, 3295, 3302, 3303, 3305, 3311, 3320, 3327, + 3339, 3345, 3351, 3357, 3363, 3369, 3375, 3381, 3394, 3405, + 3412, 3425, 3452, 3466, 3480, 3494, 3509, 3516, 3523, 3530, + 3537, 3548, 3598, 3703, 3710, 3717, 3724, 3731 }; #endif @@ -2484,7 +2579,7 @@ static const yytype_uint8 yyr1[] = 239, 239, 239, 239, 241, 241, 242, 242, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 243, 244, 245, 245, 245, 246 + 239, 239, 243, 244, 244, 244, 245, 246 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2520,7 +2615,7 @@ static const yytype_uint8 yyr2[] = 3, 2, 4, 3, 0, 1, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 2, 2, 2, 2, 3, 2, 4, 5, 3, - 5, 3, 1, 2, 2, 4, 4, 3 + 5, 3, 1, 2, 4, 4, 2, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2544,7 +2639,7 @@ static const yytype_uint16 yydefact[] = 0, 80, 44, 43, 118, 45, 29, 0, 46, 47, 48, 50, 0, 49, 296, 1, 6, 118, 302, 0, 68, 0, 0, 69, 0, 186, 0, 159, 0, 158, - 160, 304, 121, 0, 0, 0, 0, 0, 0, 0, + 160, 306, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 292, 291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2553,20 +2648,20 @@ static const yytype_uint16 yydefact[] = 307, 204, 176, 0, 0, 0, 27, 0, 295, 0, 0, 278, 0, 270, 273, 210, 211, 83, 203, 59, 60, 105, 218, 58, 81, 42, 28, 118, 0, 203, - 0, 0, 303, 185, 184, 0, 132, 134, 0, 0, - 221, 265, 266, 263, 264, 244, 245, 247, 246, 242, - 243, 285, 284, 280, 279, 287, 288, 286, 282, 281, - 283, 248, 249, 299, 257, 256, 255, 289, 0, 254, - 253, 252, 240, 241, 261, 260, 258, 262, 259, 0, - 0, 301, 0, 0, 0, 52, 0, 0, 25, 0, - 118, 17, 23, 0, 20, 19, 22, 21, 118, 110, - 0, 206, 213, 165, 0, 0, 177, 181, 118, 194, - 117, 267, 0, 26, 215, 0, 276, 0, 0, 57, - 0, 118, 13, 57, 0, 0, 0, 0, 136, 0, - 0, 203, 161, 162, 305, 306, 0, 214, 272, 0, - 0, 297, 118, 0, 0, 115, 18, 118, 0, 0, - 0, 0, 183, 178, 203, 0, 107, 0, 118, 0, - 201, 200, 199, 202, 0, 62, 61, 51, 0, 118, + 0, 0, 303, 185, 184, 0, 132, 134, 0, 221, + 265, 266, 263, 264, 244, 245, 247, 246, 242, 243, + 285, 284, 280, 279, 287, 288, 286, 282, 281, 283, + 248, 249, 299, 257, 256, 255, 289, 0, 254, 253, + 252, 240, 241, 261, 260, 258, 262, 259, 0, 0, + 301, 0, 0, 0, 52, 0, 0, 25, 0, 118, + 17, 23, 0, 20, 19, 22, 21, 118, 110, 0, + 206, 213, 165, 0, 0, 177, 181, 118, 194, 117, + 267, 0, 26, 215, 0, 276, 0, 0, 57, 0, + 118, 13, 57, 0, 0, 0, 0, 0, 136, 0, + 0, 203, 161, 162, 0, 214, 272, 0, 0, 297, + 118, 0, 0, 115, 18, 118, 0, 0, 0, 0, + 183, 178, 203, 0, 107, 0, 118, 0, 201, 200, + 199, 202, 0, 62, 61, 51, 0, 118, 304, 305, 176, 133, 0, 0, 197, 135, 140, 57, 0, 290, 298, 300, 77, 0, 84, 0, 113, 205, 175, 171, 168, 169, 167, 170, 174, 173, 172, 166, 165, 0, @@ -2585,94 +2680,94 @@ static const yytype_uint16 yydefact[] = /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 50, 51, 52, 53, 309, 310, 311, 332, 333, - 135, 136, 211, 312, 137, 385, 138, 243, 240, 456, + -1, 50, 51, 52, 53, 308, 309, 310, 331, 332, + 135, 136, 211, 311, 137, 383, 138, 243, 240, 456, 57, 229, 151, 152, 58, 59, 60, 61, 209, 62, 90, 139, 140, 443, 444, 445, 446, 63, 212, 424, 508, 425, 473, 426, 427, 64, 226, 141, 65, 95, - 217, 66, 318, 213, 67, 142, 69, 70, 348, 350, - 393, 314, 459, 315, 437, 482, 483, 484, 464, 465, - 466, 160, 316, 258, 352, 353, 372, 417, 325, 326, - 327, 255, 317, 505, 101, 75, 472, 218, 219, 382, - 395, 383, 339, 322, 122, 123, 124, 221, 76, 77, + 217, 66, 317, 213, 67, 142, 69, 70, 348, 350, + 393, 313, 459, 314, 437, 482, 483, 484, 464, 465, + 466, 160, 315, 258, 352, 353, 370, 417, 324, 325, + 326, 255, 316, 505, 101, 75, 472, 218, 219, 380, + 395, 381, 338, 321, 122, 123, 124, 221, 76, 77, 78, 143, 125, 79, 80, 81, 82, 114, 115, 83, 161, 84, 85 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -426 +#define YYPACT_NINF -386 static const yytype_int16 yypact[] = { - 1672, 12, -426, -426, -426, -426, -426, -426, -426, -426, - -16, -19, -426, -18, 11, -426, -426, -426, 107, -426, - 2092, -426, 132, -426, 350, -426, 58, 25, 79, -426, - -426, -426, -426, 84, -20, -426, -426, 2092, 83, 2092, - 2092, 2092, -426, 2092, 2092, 2092, 2092, 2092, 632, 209, - 216, -426, 502, -426, -426, -426, 93, -426, 2022, -426, - -426, -426, -426, -426, -426, -426, -426, -426, 356, 248, - -426, -426, -426, -426, -426, -426, -426, -426, -426, 118, - -426, 2522, -426, -426, -426, -426, 218, 105, -426, -426, - 1924, -426, -426, -426, -426, -426, -106, 86, -426, -46, - -426, 106, 139, 2092, 108, -426, 2092, -426, 2092, 229, - 139, -426, 129, 2522, 104, 138, 139, 139, 294, 139, - 139, -75, 115, 141, 2092, -426, 239, 243, 2092, 2092, - 243, 244, -426, -426, 762, -426, -426, 123, -426, -426, - -426, -426, 232, -426, -426, -426, -426, 1022, 183, 255, - -426, 165, 197, -426, 264, 92, 270, -426, 273, -426, - -426, 176, -426, 2092, 2092, 2092, 2092, 2092, 2092, 2092, + 1672, -68, -386, -386, -386, -386, -386, -386, -386, -386, + -31, -80, -386, -72, 15, -386, -386, -386, 59, -386, + 2092, -386, 86, -386, 2162, -386, 6, 45, 11, -386, + -386, -386, -386, -12, -43, -386, -386, 2092, 13, 2092, + 2092, 2092, -386, 2092, 2092, 2092, 2092, 2092, 632, 136, + 143, -386, 502, -386, -386, -386, 26, -386, 2022, -386, + -386, -386, -386, -386, -386, -386, -386, -386, 312, 405, + -386, -386, -386, -386, -386, -386, -386, -386, -386, 80, + -386, 2567, -386, -386, -386, -386, 198, 84, -386, -386, + 1924, -386, -386, -386, -386, -386, -2, 83, -386, -62, + -386, 95, -46, 2092, 89, -386, 2092, -386, 2092, 216, + -46, -386, 115, 2567, 101, 130, -46, -46, 237, -46, + -46, -74, 106, 138, 2092, -386, 233, 234, 2092, 2092, + 234, 236, -386, -386, 762, -386, -386, 117, -386, -386, + -386, -386, 223, -386, -386, -386, -386, 1022, 178, 245, + -386, 155, 188, -386, 254, 94, 260, -386, 262, -386, + -386, -386, -386, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, -426, -426, 280, 2092, + 2092, 2092, 2092, 2092, 2092, 2092, -386, -386, 263, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, 2092, - 2092, 2092, 2092, 2092, 2092, 2092, 14, -426, -426, 2092, - 185, 271, 2092, 1152, -426, 25, 160, 161, -426, -426, - -426, 167, 20, -12, 19, 2150, 1798, 157, -426, 2092, - 2092, -426, 2092, -426, -426, -426, -426, -426, 186, 192, - -426, 118, 118, 192, -426, -426, -426, 1924, 166, 186, - 2092, 2092, -426, -426, -426, 296, 246, 252, 304, 149, - 2522, 1014, 494, 494, 494, 2888, 2888, 2888, 2888, 1014, - 1014, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, 2522, - 2522, 2583, 2644, -426, 211, 211, 211, 2522, 2339, 2705, - 2766, 2827, 1014, 1014, 294, 294, 139, 139, 139, 175, - 2400, 220, 2092, 311, -9, -426, 194, 2213, -426, 189, - 1282, -426, -426, 191, -426, -426, -426, -426, 1152, -426, - 125, 2092, -426, 97, 312, 195, 222, -426, 1924, 160, - -426, -426, 198, 1798, -426, -1, -426, 224, 38, 235, - 243, 892, -426, -26, -35, 8, 212, 86, 314, 86, - 213, 186, 240, -426, -426, -426, 2092, -426, -426, 338, - 2276, -426, 1924, 2092, 217, -426, -426, 1152, 210, 221, - 74, 38, -426, -426, 186, 24, -426, 98, 1924, 2092, - -426, -426, -426, -426, 2092, -426, -426, -426, 2092, 1924, - 20, -426, 86, 219, -426, 250, -426, 235, 304, 2522, - -426, -426, -426, 45, 56, 214, -426, -426, -426, -426, - -426, -426, -426, -426, -426, -426, -426, -426, 242, 225, - 312, -426, 237, 251, -426, -426, 98, -426, 299, -426, - -426, 245, -426, 247, 250, -426, 86, 47, -426, -426, - -426, 2092, 261, 249, 56, -426, -426, -426, -426, -426, - -426, -426, 379, -426, -426, 1924, -426, 1924, 186, 1412, - -426, 386, -426, 363, 259, 233, -426, 2461, 1798, -426, - -426, -426, 1798, 1798, 186, -426, -426, 266, -426, -426, - 267, 193, 262, 1542, -426, -426, -426, -426, 92, -426, - -426, 1798, -426, 265, 269, 263, -426, 1412, -426, -426, - 395, -426, -426, -426, -426, 1798, 272, 277, 281, 279, - -426, 20, 1798, -426, 282, 285, 186, -426, -426 + 2092, 2092, 2092, 2092, 2092, 2092, 8, -386, -386, 2092, + 168, 255, 2092, 1152, -386, 45, 141, 144, -386, -386, + -386, 148, 22, -28, 19, 2187, 1798, 139, -386, 2092, + 2092, -386, 2092, -386, -386, -386, -386, -386, 169, 173, + -386, 80, 80, 173, -386, -386, -386, 1924, 145, 169, + 2092, 2092, 179, -386, -386, 283, 240, 241, 284, 2567, + 1014, 494, 494, 494, 2872, 2872, 2872, 2872, 1014, 1014, + 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, 2567, + 308, 2628, -386, 137, 137, 137, 2567, 2384, 2689, 2750, + 2811, 1014, 1014, 237, 237, -46, -46, -46, 164, 2445, + 209, 2092, 296, 7, -386, 186, 2258, -386, 181, 1282, + -386, -386, 174, -386, -386, -386, -386, 1152, -386, 134, + 2092, -386, -1, 298, 182, 214, -386, 1924, 141, -386, + -386, 184, 1798, -386, 21, -386, 215, 63, 219, 234, + 892, -386, -45, 111, 99, 38, 200, 83, 306, 83, + 205, 169, 224, -386, 2092, -386, -386, 323, 2321, -386, + 1924, 2092, 206, -386, -386, 1152, 201, 204, 280, 63, + -386, -386, 169, 25, -386, 98, 1924, 2092, -386, -386, + -386, -386, 2092, -386, -386, -386, 2092, 1924, -386, -386, + 22, -386, 83, 212, -386, 242, -386, 219, 284, 2567, + -386, -386, -386, 102, 46, 208, -386, -386, -386, -386, + -386, -386, -386, -386, -386, -386, -386, -386, 239, 228, + 298, -386, 247, 227, -386, -386, 98, -386, 295, -386, + -386, 229, -386, 230, 242, -386, 83, 47, -386, -386, + -386, 2092, 266, 246, 46, -386, -386, -386, -386, -386, + -386, -386, 365, -386, -386, 1924, -386, 1924, 169, 1412, + -386, 382, -386, 359, 256, 258, -386, 2506, 1798, -386, + -386, -386, 1798, 1798, 169, -386, -386, 261, -386, -386, + 265, 194, 257, 1542, -386, -386, -386, -386, 94, -386, + -386, 1798, -386, 269, 273, 259, -386, 1412, -386, -386, + 390, -386, -386, -386, -386, 1798, 274, 272, 271, 275, + -386, 22, 1798, -386, 277, 276, 169, -386, -386 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -426, -426, 275, -426, 360, -292, -426, 103, -425, -39, - 1, -85, -317, 59, 2, 17, 361, 297, 85, -426, - -426, -426, -426, -426, -426, -426, -426, -426, -426, -426, - -426, -426, -426, -426, -426, -21, -17, -426, -426, 5, - -426, 6, -426, -426, -426, -426, -426, -426, -426, -200, - 36, -426, -426, -426, -426, 0, -426, 357, -426, -426, - -426, 60, -426, 62, -426, -69, -426, -54, -426, -426, - -31, -426, 3, -426, -426, 32, 18, -426, -372, -426, - -305, -53, 4, -426, -426, -426, -426, -426, 411, -87, - 50, 68, -241, -426, -95, -426, -426, -426, -426, -426, - -426, -426, -32, -6, -52, -8, -426, -426, -426, -426, - -426, -426, -426 + -386, -386, 248, -386, 360, -290, -386, 104, -385, -38, + 1, -85, -313, 58, 2, 14, 361, 301, 97, -386, + -386, -386, -386, -386, -386, -386, -386, -386, -386, -386, + -386, -386, -386, -386, -386, -10, -5, -386, -386, 12, + -386, 16, -386, -386, -386, -386, -386, -386, -386, -200, + 76, -386, -386, -386, -386, 0, -386, 371, -386, -386, + -386, 60, -386, 61, -386, -56, -386, -39, -386, -386, + -20, -386, 3, -386, -386, 48, 29, -386, -373, -386, + -303, -40, 4, -386, -386, -386, -386, -386, 422, -89, + 64, 81, -240, -386, -95, -386, -386, -386, -386, -386, + -386, -386, -32, -6, -52, -8, -386, -386, -386, -386, + -386, -386, -386 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2682,54 +2777,54 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -153 static const yytype_int16 yytable[] = { - 68, 54, 56, 73, 74, 210, 153, 112, 343, 134, - 220, 376, 99, 227, 92, 319, 102, 301, 433, 373, - 214, 215, 329, 323, 319, 163, 368, 323, 92, 110, - 93, 113, 116, 117, 87, 118, 119, 120, 93, 113, - 121, 216, -70, 492, 93, 402, 188, 493, 494, 246, - 96, 2, 68, 54, 56, 73, 74, 93, 233, 55, - 71, 428, 72, 104, 388, 163, 501, 15, 16, 17, - 421, 19, 432, 21, 380, 405, 384, 408, 205, 409, - 509, 206, 410, 411, 412, 25, 413, 515, 163, 216, - 441, 163, 236, 461, 30, 31, 32, 223, 225, 163, - 113, 86, 108, 89, 91, 93, 88, 109, 163, 299, - 397, 55, 71, 324, 72, 450, 113, 420, 442, 414, - 319, 328, 241, 242, 362, 97, 422, 253, 329, 415, - 416, 423, 378, 419, 330, 100, 302, 94, 475, 514, - 476, 389, 303, 254, 93, 163, 462, 68, 54, 56, - 73, 74, 354, 381, 355, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 440, -151, - 103, 284, 285, 286, 287, 288, 289, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 113, 300, 336, 370, - 337, 106, 371, 304, 307, 111, 55, 71, 341, 72, - 107, 154, 144, 68, 54, 313, 145, 477, 163, 147, - 155, 207, 113, 335, 113, 157, 369, 208, 222, 186, - 187, 188, 228, 495, 230, 224, 231, 2, 232, 159, - 234, 235, 237, 210, 344, 345, 238, 244, 246, 247, - 154, -71, 2, 15, 16, 17, 246, 19, 249, 21, - 391, 204, 394, 205, 250, 251, 206, 252, 15, 16, - 17, 25, 19, 256, 21, 518, 257, 210, 259, 461, - 30, 31, 32, 283, 305, 306, 25, -108, 320, 321, - 334, 338, 340, 210, 360, 30, 31, 32, 342, 346, - 347, 186, 187, 188, 210, 394, 349, 351, 357, 359, - 68, 54, 313, 113, 361, 323, 363, 367, 68, 54, - 313, 365, 375, 199, 200, 201, 202, 203, 374, 379, - 377, 392, 462, 204, 390, 205, 431, 384, 206, 396, - 398, 400, 406, 404, 370, 435, 447, 429, 399, 460, - 436, 449, 430, 98, 407, 3, 4, 403, 5, 6, - 7, 8, 9, 451, 455, -152, 468, 68, 54, 313, - 210, 113, 210, 452, 154, 20, 113, 22, 457, 23, - 458, 469, 474, 155, 186, 187, 188, 156, 157, 487, - 488, 489, 496, 497, 498, 29, 504, 502, 507, 511, - 158, 503, 159, 34, 510, 35, 36, 512, 201, 202, - 203, 513, 146, 366, 438, 516, 204, 517, 205, 150, - 39, 206, 248, 470, 239, 386, 162, 471, 506, 499, - 439, 453, 454, 467, 490, 500, 448, 463, 105, 418, - 40, 41, 434, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 481, + 68, 54, 56, 73, 74, 210, 153, 112, 220, 342, + 134, 300, 99, 227, 374, 318, 102, 433, 92, 87, + 371, 86, 328, -70, 318, 322, 163, 366, 322, 110, + 188, 113, 116, 117, 93, 118, 119, 120, 93, 113, + 121, 388, 89, 389, 186, 187, 188, 402, 92, 246, + 91, 2, 68, 54, 56, 73, 74, 382, 55, 233, + 71, 72, 205, 428, 93, 206, 216, 15, 16, 17, + 421, 19, 163, 21, 432, 405, 204, 97, 205, 108, + 441, 206, 93, 492, 109, 25, 216, 493, 494, 100, + 96, 88, 236, 461, 30, 31, 32, 223, 225, 378, + 113, 368, 93, 104, 369, 327, 501, 163, 442, 298, + 55, 397, 71, 72, 107, 323, 113, 450, 420, 318, + 509, 163, 241, 242, 214, 215, 422, 515, 103, 253, + 301, 423, 419, 106, 329, 111, 302, 328, 514, 144, + 360, 94, 475, 145, 476, 254, 462, 68, 54, 56, + 73, 74, 147, 93, 376, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 379, -151, + 163, 283, 284, 285, 286, 287, 288, 289, 290, 291, + 292, 293, 294, 295, 296, 297, 113, 299, 335, 163, + 336, 207, 163, 303, 306, 55, 208, 71, 72, 340, + 386, 163, 154, 68, 54, 312, 224, 222, 477, 228, + 230, 155, 113, 334, 113, 367, 157, 186, 187, 188, + 232, 234, 387, 231, 495, 440, 237, 238, 235, 244, + 159, 154, 210, 247, 343, 344, -71, 246, 249, 199, + 200, 201, 202, 203, 250, 246, 251, 252, 391, 204, + 394, 205, 2, 256, 206, 257, 282, 304, -108, 305, + 320, 319, 333, 339, 337, 210, 518, 341, 15, 16, + 17, 345, 19, 408, 21, 409, 346, 351, 410, 411, + 412, 210, 413, 358, 347, 349, 25, 355, 357, 359, + 365, 322, 210, 394, 461, 30, 31, 32, 361, 68, + 54, 312, 113, 363, 373, 372, 375, 68, 54, 312, + 377, 382, 390, 392, 398, 414, 400, 186, 187, 188, + 154, 396, 404, 406, 431, 415, 416, 407, 435, 155, + 447, 368, 436, 156, 157, 429, 399, 460, 164, 452, + 430, 201, 202, 203, 449, 403, 158, 462, 159, 204, + 455, 205, 457, 458, 206, 68, 54, 312, 474, 113, + 210, 468, 210, 451, 113, 165, 166, 167, 469, 168, + 169, 170, 171, 172, 173, 487, 488, 496, 489, 498, + -152, 497, 504, 507, 511, 248, 185, 512, 186, 187, + 188, 502, 189, 190, 191, 503, 510, 513, 517, 2, + 516, 438, 146, 364, 194, 195, 196, 197, 198, 150, + 199, 200, 201, 202, 203, 15, 16, 17, 239, 19, + 204, 21, 205, 467, 470, 206, 384, 463, 453, 471, + 162, 506, 454, 25, 499, 490, 439, 448, 500, 105, + 418, 0, 30, 31, 32, 0, 434, 0, 0, 481, 479, 480, 485, 486, 0, 463, 0, 0, 0, 0, - 0, 0, 46, 0, 47, 0, 0, 0, 49, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, @@ -2784,7 +2879,7 @@ static const yytype_int16 yytable[] = 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, - 49, 0, 0, 0, 387, 1, 2, 3, 4, 0, + 49, 0, 0, 0, 385, 1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 14, 15, 16, 17, 18, 19, 20, 21, 0, 0, 23, 0, 0, -153, 0, 0, 0, 24, 0, @@ -2807,7 +2902,7 @@ static const yytype_int16 yytable[] = 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 308, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -15, 1, 2, 3, 4, 0, @@ -2820,7 +2915,7 @@ static const yytype_int16 yytable[] = 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 0, 308, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, 45, 0, 0, 0, 46, 0, 47, 0, 48, 0, 49, 0, 0, 0, -16, 1, 2, 3, 4, 0, @@ -2898,144 +2993,142 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 43, 28, 0, 29, 0, 44, 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, 49, 0, 0, 0, 0, 37, 0, 0, 0, 0, + 0, 0, 39, 0, 0, 98, 0, 3, 4, 0, + 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 40, 41, 0, 0, 0, 20, 0, 22, + 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 43, 0, 0, 29, 0, 44, + 45, 0, 0, 0, 46, 34, 47, 35, 36, 0, + 49, 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 40, 41, 0, 0, 0, 0, 0, 0, - 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 44, - 45, 0, 0, 0, 46, 0, 47, 165, 166, 167, - 49, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, - 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, - 0, 0, 192, 164, 193, 0, 194, 195, 196, 197, - 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, - 0, 0, 204, 0, 205, 0, 0, 206, 0, 0, - 165, 166, 167, 331, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 0, 186, 187, 188, 0, 189, 190, 191, - 0, 0, 0, 0, 0, 192, 164, 193, 0, 194, - 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, - 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, - 206, 0, 0, 165, 166, 167, 364, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, - 189, 190, 191, 0, 0, 0, 0, 0, 192, 164, - 193, 0, 194, 195, 196, 197, 198, 0, 199, 200, - 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, - 205, 0, 0, 206, 0, 0, 165, 166, 167, 401, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 0, 186, - 187, 188, 0, 189, 190, 191, 0, 0, 0, 0, - 164, 192, 0, 193, 356, 194, 195, 196, 197, 198, - 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, - 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, - 0, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, - 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, - 0, 164, 192, 0, 193, 0, 194, 195, 196, 197, - 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, - 0, 0, 204, 0, 205, 358, 0, 206, 165, 166, - 167, 0, 168, 169, 170, 171, 172, 173, 174, 175, + 0, 0, 40, 41, 165, 166, 167, 0, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 0, 186, 187, 188, + 0, 189, 190, 191, 46, 0, 47, 0, 0, 192, + 49, 193, 0, 194, 195, 196, 197, 198, 164, 199, + 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, + 0, 205, 0, 0, 206, 0, 0, 0, 0, 0, + 330, 0, 0, 0, 0, 165, 166, 167, 0, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 0, 186, 187, + 188, 0, 189, 190, 191, 0, 0, 0, 0, 0, + 192, 164, 193, 0, 194, 195, 196, 197, 198, 0, + 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, + 204, 0, 205, 0, 0, 206, 0, 0, 165, 166, + 167, 362, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, - 0, 0, 164, 192, 0, 193, 491, 194, 195, 196, + 0, 0, 0, 192, 164, 193, 0, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, - 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, - 166, 167, 0, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 0, 186, 187, 188, 0, 189, 190, 191, 0, - 0, 0, 0, 164, 192, 0, 193, 0, 194, 195, - 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, - 0, 0, 0, 0, 204, 0, 205, 0, 0, 206, - 165, 166, 167, 0, 168, 169, 170, 171, 172, 173, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 185, 0, 186, 187, 188, 0, 189, 190, 191, - 0, 0, 0, 0, 164, 0, 0, 0, 0, 194, - 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, - 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, - 206, 165, 166, 167, 0, 168, 169, 170, 171, 172, - 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 186, 187, 188, 0, 189, 190, - 191, 0, 0, 0, 0, 164, 0, 0, 0, 0, + 0, 0, 0, 204, 0, 205, 0, 0, 206, 0, + 0, 165, 166, 167, 401, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 0, 186, 187, 188, 0, 189, 190, + 191, 0, 0, 0, 0, 164, 192, 0, 193, 354, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, 0, 168, 169, 170, 171, - 172, 173, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 186, 187, 188, 0, 189, - 190, 191, 0, 0, 0, 0, 164, 0, 0, 0, - 0, 0, 195, 196, 197, 198, 0, 199, 200, 201, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 0, 186, 187, 188, 0, 189, + 190, 191, 0, 0, 0, 0, 164, 192, 0, 193, + 0, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, - 0, 0, 206, 165, 166, 167, 0, 168, 169, 170, - 171, 172, 173, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 186, 187, 188, 0, - 189, 190, 191, 0, 0, 0, 0, 164, 0, 0, - 0, 0, 0, 0, 196, 197, 198, 0, 199, 200, + 356, 0, 206, 165, 166, 167, 0, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 0, 186, 187, 188, 0, + 189, 190, 191, 0, 0, 0, 0, 164, 192, 0, + 193, 491, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, 0, 168, 169, - 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 186, 187, 188, - 0, 189, 190, 191, 0, 0, 0, 0, 164, 0, - 0, 0, 0, 0, 0, -153, 197, 198, 0, 199, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 0, 186, 187, 188, + 0, 189, 190, 191, 0, 0, 0, 0, 164, 192, + 0, 193, 0, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, 204, - 0, 205, 0, 0, 206, 165, 166, 167, 0, -153, - -153, -153, -153, 172, 173, 0, 0, 0, 0, 0, + 0, 205, 0, 0, 206, 165, 166, 167, 0, 168, + 169, 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 186, 187, - 188, 0, 189, 190, 191, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 197, 198, 0, + 188, 0, 189, 190, 191, 0, 0, 0, 0, 164, + 0, 0, 0, 0, 194, 195, 196, 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, 0, - 204, 0, 205, 0, 0, 206 + 204, 0, 205, 0, 0, 206, 165, 166, 167, 0, + 168, 169, 170, 171, 172, 173, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 186, + 187, 188, 0, 189, 190, 191, 0, 0, 0, 0, + 164, 0, 0, 0, 0, 0, 195, 196, 197, 198, + 0, 199, 200, 201, 202, 203, 0, 0, 0, 0, + 0, 204, 0, 205, 0, 0, 206, 165, 166, 167, + 0, 168, 169, 170, 171, 172, 173, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 186, 187, 188, 0, 189, 190, 191, 0, 0, 0, + 0, 164, 0, 0, 0, 0, 0, 0, 196, 197, + 198, 0, 199, 200, 201, 202, 203, 0, 0, 0, + 0, 0, 204, 0, 205, 0, 0, 206, 165, 166, + 167, 0, 168, 169, 170, 171, 172, 173, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 186, 187, 188, 0, 189, 190, 191, 0, 0, + 0, 0, 164, 0, 0, 0, 0, 0, 0, -153, + 197, 198, 0, 199, 200, 201, 202, 203, 0, 0, + 0, 0, 0, 204, 0, 205, 0, 0, 206, 165, + 166, 167, 0, -153, -153, -153, -153, 172, 173, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 186, 187, 188, 0, 189, 190, 191, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 197, 198, 0, 199, 200, 201, 202, 203, 0, + 0, 0, 0, 0, 204, 0, 205, 0, 0, 206 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 0, 0, 90, 58, 39, 249, 48, - 97, 328, 20, 108, 3, 215, 24, 3, 390, 324, - 126, 127, 3, 3, 224, 100, 318, 3, 3, 37, - 19, 39, 40, 41, 50, 43, 44, 45, 19, 47, - 46, 3, 68, 468, 19, 362, 92, 472, 473, 134, - 14, 4, 52, 52, 52, 52, 52, 19, 133, 0, - 0, 378, 0, 27, 99, 100, 491, 20, 21, 22, - 375, 24, 389, 26, 36, 367, 102, 3, 124, 5, - 505, 127, 8, 9, 10, 38, 12, 512, 100, 3, - 34, 100, 124, 46, 47, 48, 49, 103, 106, 100, - 108, 89, 122, 122, 122, 19, 122, 127, 100, 204, - 351, 52, 52, 93, 52, 420, 124, 93, 62, 45, - 320, 133, 128, 129, 133, 18, 28, 35, 3, 55, - 56, 33, 133, 374, 115, 3, 122, 126, 455, 511, - 457, 133, 128, 51, 19, 100, 99, 147, 147, 147, - 147, 147, 3, 115, 5, 163, 164, 165, 166, 167, + 0, 0, 0, 0, 0, 90, 58, 39, 97, 249, + 48, 3, 20, 108, 327, 215, 24, 390, 3, 50, + 323, 89, 3, 68, 224, 3, 100, 317, 3, 37, + 92, 39, 40, 41, 19, 43, 44, 45, 19, 47, + 46, 3, 122, 5, 90, 91, 92, 360, 3, 134, + 122, 4, 52, 52, 52, 52, 52, 102, 0, 133, + 0, 0, 124, 376, 19, 127, 3, 20, 21, 22, + 373, 24, 100, 26, 387, 365, 122, 18, 124, 122, + 34, 127, 19, 468, 127, 38, 3, 472, 473, 3, + 14, 122, 124, 46, 47, 48, 49, 103, 106, 36, + 108, 102, 19, 27, 105, 133, 491, 100, 62, 204, + 52, 351, 52, 52, 126, 93, 124, 420, 93, 319, + 505, 100, 128, 129, 126, 127, 28, 512, 122, 35, + 122, 33, 372, 122, 115, 122, 128, 3, 511, 3, + 133, 126, 455, 0, 457, 51, 99, 147, 147, 147, + 147, 147, 126, 19, 133, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 133, 132, - 122, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 230, 102, - 232, 122, 105, 209, 212, 122, 147, 147, 247, 147, - 126, 18, 3, 213, 213, 213, 0, 458, 100, 126, - 27, 3, 230, 229, 232, 32, 321, 122, 122, 90, - 91, 92, 3, 474, 105, 127, 132, 4, 100, 46, - 125, 100, 3, 328, 250, 251, 3, 3, 333, 126, - 18, 68, 4, 20, 21, 22, 341, 24, 3, 26, - 347, 122, 349, 124, 99, 68, 127, 3, 20, 21, - 22, 38, 24, 3, 26, 516, 3, 362, 102, 46, - 47, 48, 49, 3, 99, 14, 38, 127, 127, 122, - 133, 105, 100, 378, 302, 47, 48, 49, 132, 3, - 54, 90, 91, 92, 389, 392, 54, 3, 133, 89, - 310, 310, 310, 321, 3, 3, 122, 126, 318, 318, - 318, 132, 100, 112, 113, 114, 115, 116, 133, 105, - 132, 17, 99, 122, 122, 124, 388, 102, 127, 126, - 100, 3, 132, 126, 102, 126, 132, 379, 356, 436, - 100, 126, 384, 3, 133, 5, 6, 363, 8, 9, - 10, 11, 12, 126, 65, 132, 105, 367, 367, 367, - 455, 379, 457, 122, 18, 25, 384, 27, 133, 29, - 133, 132, 3, 27, 90, 91, 92, 31, 32, 3, - 27, 132, 126, 126, 132, 45, 133, 132, 3, 122, - 44, 132, 46, 53, 132, 55, 56, 126, 114, 115, - 116, 132, 52, 310, 397, 133, 122, 132, 124, 58, - 70, 127, 147, 444, 127, 340, 69, 444, 497, 483, - 398, 426, 426, 441, 465, 488, 418, 437, 27, 371, - 90, 91, 392, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 459, + 178, 179, 180, 181, 182, 183, 184, 185, 115, 132, + 100, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 230, 100, + 232, 3, 100, 209, 212, 147, 122, 147, 147, 247, + 99, 100, 18, 213, 213, 213, 127, 122, 458, 3, + 105, 27, 230, 229, 232, 320, 32, 90, 91, 92, + 100, 125, 133, 132, 474, 133, 3, 3, 100, 3, + 46, 18, 327, 126, 250, 251, 68, 332, 3, 112, + 113, 114, 115, 116, 99, 340, 68, 3, 347, 122, + 349, 124, 4, 3, 127, 3, 3, 99, 127, 14, + 122, 127, 133, 100, 105, 360, 516, 132, 20, 21, + 22, 102, 24, 3, 26, 5, 3, 3, 8, 9, + 10, 376, 12, 301, 54, 54, 38, 133, 89, 3, + 126, 3, 387, 392, 46, 47, 48, 49, 122, 309, + 309, 309, 320, 132, 100, 133, 132, 317, 317, 317, + 105, 102, 122, 17, 100, 45, 3, 90, 91, 92, + 18, 126, 126, 132, 386, 55, 56, 133, 126, 27, + 132, 102, 100, 31, 32, 377, 354, 436, 40, 122, + 382, 114, 115, 116, 126, 361, 44, 99, 46, 122, + 65, 124, 133, 133, 127, 365, 365, 365, 3, 377, + 455, 105, 457, 126, 382, 67, 68, 69, 132, 71, + 72, 73, 74, 75, 76, 3, 27, 126, 132, 132, + 132, 126, 133, 3, 122, 147, 88, 126, 90, 91, + 92, 132, 94, 95, 96, 132, 132, 132, 132, 4, + 133, 397, 52, 309, 106, 107, 108, 109, 110, 58, + 112, 113, 114, 115, 116, 20, 21, 22, 127, 24, + 122, 26, 124, 441, 444, 127, 339, 437, 426, 444, + 69, 497, 426, 38, 483, 465, 398, 418, 488, 27, + 369, -1, 47, 48, 49, -1, 392, -1, -1, 459, 459, 459, 459, 459, -1, 465, -1, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, -1, 128, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, @@ -3204,92 +3297,90 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, 112, 43, -1, 45, -1, 117, 118, -1, -1, -1, 122, 53, 124, 55, 56, -1, 128, -1, -1, -1, -1, 63, -1, -1, -1, -1, + -1, -1, 70, -1, -1, 3, -1, 5, 6, -1, + 8, 9, 10, 11, 12, -1, -1, -1, -1, -1, + -1, -1, 90, 91, -1, -1, -1, 25, -1, 27, + -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 112, -1, -1, 45, -1, 117, + 118, -1, -1, -1, 122, 53, 124, 55, 56, -1, + 128, -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 90, 91, -1, -1, -1, -1, -1, -1, - 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 112, -1, -1, -1, -1, 117, - 118, -1, -1, -1, 122, -1, 124, 67, 68, 69, - 128, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, -1, 102, 40, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, -1, -1, 127, -1, -1, - 67, 68, 69, 133, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, -1, 102, 40, 104, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, -1, -1, 67, 68, 69, 133, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, -1, 102, 40, - 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, - 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, - 124, -1, -1, 127, -1, -1, 67, 68, 69, 133, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, - 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, - 40, 102, -1, 104, 105, 106, 107, 108, 109, 110, - -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, - -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, - -1, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, - 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, - -1, 40, 102, -1, 104, -1, 106, 107, 108, 109, - 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, - -1, -1, 122, -1, 124, 125, -1, 127, 67, 68, - 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, + -1, -1, 90, 91, 67, 68, 69, -1, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, 122, -1, 124, -1, -1, 102, + 128, 104, -1, 106, 107, 108, 109, 110, 40, 112, + 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, + -1, 124, -1, -1, 127, -1, -1, -1, -1, -1, + 133, -1, -1, -1, -1, 67, 68, 69, -1, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, + 92, -1, 94, 95, 96, -1, -1, -1, -1, -1, + 102, 40, 104, -1, 106, 107, 108, 109, 110, -1, + 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, + 122, -1, 124, -1, -1, 127, -1, -1, 67, 68, + 69, 133, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, - -1, -1, 40, 102, -1, 104, 105, 106, 107, 108, + -1, -1, -1, 102, 40, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, - -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, - 68, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, -1, 90, 91, 92, -1, 94, 95, 96, -1, - -1, -1, -1, 40, 102, -1, 104, -1, 106, 107, - 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, - -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, - 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 88, -1, 90, 91, 92, -1, 94, 95, 96, - -1, -1, -1, -1, 40, -1, -1, -1, -1, 106, - 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, - -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, - 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, - 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 90, 91, 92, -1, 94, 95, - 96, -1, -1, -1, -1, 40, -1, -1, -1, -1, + -1, -1, -1, 122, -1, 124, -1, -1, 127, -1, + -1, 67, 68, 69, 133, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, -1, 90, 91, 92, -1, 94, 95, + 96, -1, -1, -1, -1, 40, 102, -1, 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, - 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 90, 91, 92, -1, 94, - 95, 96, -1, -1, -1, -1, 40, -1, -1, -1, - -1, -1, 107, 108, 109, 110, -1, 112, 113, 114, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, -1, 90, 91, 92, -1, 94, + 95, 96, -1, -1, -1, -1, 40, 102, -1, 104, + -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, - -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, - 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 90, 91, 92, -1, - 94, 95, 96, -1, -1, -1, -1, 40, -1, -1, - -1, -1, -1, -1, 108, 109, 110, -1, 112, 113, + 125, -1, 127, 67, 68, 69, -1, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, -1, 90, 91, 92, -1, + 94, 95, 96, -1, -1, -1, -1, 40, 102, -1, + 104, 105, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, - 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 90, 91, 92, - -1, 94, 95, 96, -1, -1, -1, -1, 40, -1, - -1, -1, -1, -1, -1, 108, 109, 110, -1, 112, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, -1, 90, 91, 92, + -1, 94, 95, 96, -1, -1, -1, -1, 40, 102, + -1, 104, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, - 92, -1, 94, 95, 96, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 109, 110, -1, + 92, -1, 94, 95, 96, -1, -1, -1, -1, 40, + -1, -1, -1, -1, 106, 107, 108, 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, -1, - 122, -1, 124, -1, -1, 127 + 122, -1, 124, -1, -1, 127, 67, 68, 69, -1, + 71, 72, 73, 74, 75, 76, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 91, 92, -1, 94, 95, 96, -1, -1, -1, -1, + 40, -1, -1, -1, -1, -1, 107, 108, 109, 110, + -1, 112, 113, 114, 115, 116, -1, -1, -1, -1, + -1, 122, -1, 124, -1, -1, 127, 67, 68, 69, + -1, 71, 72, 73, 74, 75, 76, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 90, 91, 92, -1, 94, 95, 96, -1, -1, -1, + -1, 40, -1, -1, -1, -1, -1, -1, 108, 109, + 110, -1, 112, 113, 114, 115, 116, -1, -1, -1, + -1, -1, 122, -1, 124, -1, -1, 127, 67, 68, + 69, -1, 71, 72, 73, 74, 75, 76, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 90, 91, 92, -1, 94, 95, 96, -1, -1, + -1, -1, 40, -1, -1, -1, -1, -1, -1, 108, + 109, 110, -1, 112, 113, 114, 115, 116, -1, -1, + -1, -1, -1, 122, -1, 124, -1, -1, 127, 67, + 68, 69, -1, 71, 72, 73, 74, 75, 76, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, -1, 94, 95, 96, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 109, 110, -1, 112, 113, 114, 115, 116, -1, + -1, -1, -1, -1, 122, -1, 124, -1, -1, 127 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3321,20 +3412,20 @@ static const yytype_uint8 yystos[] = 223, 231, 122, 237, 127, 239, 180, 228, 3, 155, 105, 132, 100, 133, 125, 100, 236, 3, 3, 151, 152, 237, 237, 151, 3, 132, 145, 126, 136, 3, - 99, 68, 3, 35, 51, 215, 3, 3, 207, 102, + 99, 68, 3, 35, 51, 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, 239, 3, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 228, - 239, 3, 122, 128, 237, 99, 14, 239, 99, 139, - 140, 141, 147, 148, 195, 197, 206, 216, 186, 183, - 127, 122, 227, 3, 93, 212, 213, 214, 133, 3, - 115, 133, 142, 143, 133, 237, 236, 236, 105, 226, - 100, 143, 132, 226, 237, 237, 3, 54, 192, 54, - 193, 3, 208, 209, 3, 5, 105, 133, 125, 89, - 239, 3, 133, 122, 133, 132, 141, 126, 139, 228, - 102, 105, 210, 214, 133, 100, 146, 132, 133, 105, - 36, 115, 223, 225, 102, 149, 152, 132, 99, 133, + 239, 239, 3, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 228, 239, + 3, 122, 128, 237, 99, 14, 239, 99, 139, 140, + 141, 147, 148, 195, 197, 206, 216, 186, 183, 127, + 122, 227, 3, 93, 212, 213, 214, 133, 3, 115, + 133, 142, 143, 133, 237, 236, 236, 105, 226, 100, + 143, 132, 226, 237, 237, 102, 3, 54, 192, 54, + 193, 3, 208, 209, 105, 133, 125, 89, 239, 3, + 133, 122, 133, 132, 141, 126, 139, 228, 102, 105, + 210, 214, 133, 100, 146, 132, 133, 105, 36, 115, + 223, 225, 102, 149, 152, 132, 99, 133, 3, 5, 122, 223, 17, 194, 223, 224, 126, 226, 100, 239, 3, 133, 146, 237, 126, 139, 132, 133, 3, 5, 8, 9, 10, 12, 45, 55, 56, 211, 225, 226, @@ -4163,7 +4254,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1934 "parser.y" +#line 2030 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4174,7 +4265,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1935 "parser.y" +#line 2031 "parser.y" {(yyval.code)=code_new();} } break; @@ -4185,7 +4276,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1937 "parser.y" +#line 2033 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4196,7 +4287,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1938 "parser.y" +#line 2034 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4207,7 +4298,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1953 "parser.y" +#line 2049 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4218,7 +4309,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1954 "parser.y" +#line 2050 "parser.y" {(yyval.code)=0;} } break; @@ -4229,7 +4320,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1957 "parser.y" +#line 2053 "parser.y" {(yyval.code)=0;} } break; @@ -4240,7 +4331,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1964 "parser.y" +#line 2060 "parser.y" {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4251,7 +4342,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1968 "parser.y" +#line 2064 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4262,7 +4353,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1969 "parser.y" +#line 2065 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4273,7 +4364,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1973 "parser.y" +#line 2069 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4287,7 +4378,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1984 "parser.y" +#line 2080 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4298,7 +4389,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1985 "parser.y" +#line 2081 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4311,7 +4402,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1989 "parser.y" +#line 2085 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4322,7 +4413,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1990 "parser.y" +#line 2086 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4333,7 +4424,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1992 "parser.y" +#line 2088 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4344,7 +4435,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1993 "parser.y" +#line 2089 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4355,7 +4446,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1996 "parser.y" +#line 2092 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4422,7 +4513,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2056 "parser.y" +#line 2152 "parser.y" {(yyval.code) = code_new();} } break; @@ -4433,7 +4524,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2057 "parser.y" +#line 2153 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4444,7 +4535,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2060 "parser.y" +#line 2156 "parser.y" {PASS12 new_state();} } break; @@ -4455,7 +4546,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2060 "parser.y" +#line 2156 "parser.y" { (yyval.code) = code_new(); @@ -4483,7 +4574,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2079 "parser.y" +#line 2175 "parser.y" {(yyval.code)=code_new();} } break; @@ -4494,7 +4585,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2086 "parser.y" +#line 2182 "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); @@ -4508,7 +4599,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2090 "parser.y" +#line 2186 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4522,7 +4613,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2095 "parser.y" +#line 2191 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4533,7 +4624,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2096 "parser.y" +#line 2192 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4544,7 +4635,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2098 "parser.y" +#line 2194 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4573,9 +4664,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2118 "parser.y" +#line 2214 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); + if(!var) { + syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id)); + } + char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); int it = new_variable(tmp1name, TYPE_INT, 0, 0); char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__"); @@ -4626,7 +4721,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2262 "parser.y" {PASS12 new_state();} } break; @@ -4637,7 +4732,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2262 "parser.y" { (yyval.code) = code_new(); @@ -4665,7 +4760,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2181 "parser.y" +#line 2281 "parser.y" {PASS12 new_state();} } break; @@ -4676,7 +4771,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2181 "parser.y" +#line 2281 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4700,7 +4795,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2196 "parser.y" +#line 2296 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4713,7 +4808,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2199 "parser.y" +#line 2299 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4726,7 +4821,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2202 "parser.y" +#line 2302 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4739,7 +4834,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2205 "parser.y" +#line 2305 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4752,7 +4847,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2209 "parser.y" +#line 2309 "parser.y" {(yyval.code)=0;} } break; @@ -4763,7 +4858,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2210 "parser.y" +#line 2310 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4774,7 +4869,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2211 "parser.y" +#line 2311 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4785,7 +4880,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2212 "parser.y" +#line 2312 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4796,7 +4891,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2213 "parser.y" +#line 2313 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4807,7 +4902,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2214 "parser.y" +#line 2314 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4818,7 +4913,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2216 "parser.y" +#line 2316 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4839,7 +4934,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2227 "parser.y" +#line 2327 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4852,7 +4947,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2230 "parser.y" +#line 2330 "parser.y" {PASS12 new_state();} } break; @@ -4863,7 +4958,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2230 "parser.y" +#line 2330 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4899,7 +4994,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2259 "parser.y" +#line 2359 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -4914,7 +5009,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2364 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4943,7 +5038,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2283 "parser.y" +#line 2383 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -4954,7 +5049,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2283 "parser.y" +#line 2383 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4979,7 +5074,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2299 "parser.y" +#line 2399 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4990,7 +5085,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2300 "parser.y" +#line 2400 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -5001,7 +5096,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2301 "parser.y" +#line 2401 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -5012,7 +5107,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2302 "parser.y" +#line 2402 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -5030,7 +5125,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2310 "parser.y" +#line 2410 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5048,7 +5143,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2319 "parser.y" +#line 2419 "parser.y" {PASS12 new_state();} } break; @@ -5059,7 +5154,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2319 "parser.y" +#line 2419 "parser.y" { code_t*out = abc_nop(0); @@ -5111,7 +5206,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2364 "parser.y" +#line 2464 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5125,7 +5220,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2368 "parser.y" +#line 2468 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5143,7 +5238,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2379 "parser.y" +#line 2479 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushwith((yyval.code)); @@ -5159,7 +5254,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2389 "parser.y" +#line 2489 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5170,7 +5265,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2391 "parser.y" +#line 2491 "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; @@ -5181,7 +5276,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2392 "parser.y" +#line 2492 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5192,7 +5287,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2494 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5203,7 +5298,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2495 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5214,7 +5309,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2496 "parser.y" {PASS12 startpackage("");} } break; @@ -5225,7 +5320,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2397 "parser.y" +#line 2497 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5236,11 +5331,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2499 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); - if(!s) {// || !(s->flags&FLAG_BUILTIN)) { + if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) { as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); } @@ -5250,6 +5345,7 @@ PASS2 syntaxerror("Couldn't import class\n"); state_has_imports(); dict_put(state->imports, c->name, c); + import_toplevel(c->package); (yyval.code)=0; } } @@ -5261,10 +5357,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2414 "parser.y" +#line 2515 "parser.y" { PASS12 - if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { + if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) { as3_schedule_package((yyvsp[(2) - (4)].id)); } @@ -5273,6 +5369,7 @@ PASS2 i->package = (yyvsp[(2) - (4)].id); state_has_imports(); list_append(state->wildcard_imports, i); + import_toplevel(i->package); (yyval.code)=0; } } @@ -5284,7 +5381,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2430 "parser.y" +#line 2532 "parser.y" {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;} } break; @@ -5295,7 +5392,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2431 "parser.y" +#line 2533 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5306,7 +5403,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2432 "parser.y" +#line 2534 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5317,7 +5414,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2433 "parser.y" +#line 2535 "parser.y" { PASS12 (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags; @@ -5334,7 +5431,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2543 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;} } break; @@ -5345,7 +5442,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2442 "parser.y" +#line 2544 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;} } break; @@ -5356,7 +5453,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2443 "parser.y" +#line 2545 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;} } break; @@ -5367,7 +5464,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2444 "parser.y" +#line 2546 "parser.y" {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;} } break; @@ -5378,7 +5475,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2445 "parser.y" +#line 2547 "parser.y" {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;} } break; @@ -5389,7 +5486,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2446 "parser.y" +#line 2548 "parser.y" {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;} } break; @@ -5400,7 +5497,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2447 "parser.y" +#line 2549 "parser.y" {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;} } break; @@ -5411,7 +5508,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2448 "parser.y" +#line 2550 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;} } break; @@ -5422,7 +5519,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2449 "parser.y" +#line 2551 "parser.y" {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;} } break; @@ -5433,7 +5530,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2450 "parser.y" +#line 2552 "parser.y" {PASS12 (yyval.flags).flags=FLAG_NAMESPACE; (yyval.flags).ns=(yyvsp[(1) - (1)].id); } @@ -5446,8 +5543,8 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2454 "parser.y" - {(yyval.classinfo)=registry_getobjectclass();} +#line 2556 "parser.y" + {(yyval.classinfo)=0;} } break; @@ -5457,7 +5554,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2455 "parser.y" +#line 2557 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5468,7 +5565,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2457 "parser.y" +#line 2559 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5479,7 +5576,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2458 "parser.y" +#line 2560 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5490,7 +5587,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2460 "parser.y" +#line 2562 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5501,7 +5598,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2461 "parser.y" +#line 2563 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5512,7 +5609,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2465 "parser.y" +#line 2567 "parser.y" {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5523,7 +5620,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2467 "parser.y" +#line 2569 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5534,7 +5631,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2471 "parser.y" +#line 2573 "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));} } @@ -5546,7 +5643,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2474 "parser.y" +#line 2576 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5557,7 +5654,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2487 "parser.y" +#line 2589 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5572,7 +5669,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2498 "parser.y" +#line 2600 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5585,7 +5682,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2501 "parser.y" +#line 2603 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC; @@ -5605,7 +5702,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2516 "parser.y" +#line 2618 "parser.y" {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));} } break; @@ -5616,7 +5713,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2516 "parser.y" +#line 2618 "parser.y" {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);} } break; @@ -5627,7 +5724,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2518 "parser.y" +#line 2620 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -5638,7 +5735,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2519 "parser.y" +#line 2621 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -5649,7 +5746,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2522 "parser.y" +#line 2624 "parser.y" { int flags = slotstate_flags->flags; namespace_t ns = modifiers2access(slotstate_flags); @@ -5730,7 +5827,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2596 "parser.y" +#line 2698 "parser.y" {(yyval.constant)=0;} } break; @@ -5741,7 +5838,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2597 "parser.y" +#line 2699 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5752,7 +5849,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "parser.y" +#line 2701 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; @@ -5763,7 +5860,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2600 "parser.y" +#line 2702 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5774,7 +5871,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2601 "parser.y" +#line 2703 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; @@ -5785,7 +5882,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2602 "parser.y" +#line 2704 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -5796,7 +5893,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2603 "parser.y" +#line 2705 "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; @@ -5807,7 +5904,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2605 "parser.y" +#line 2707 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -5818,7 +5915,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2606 "parser.y" +#line 2708 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -5829,7 +5926,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2607 "parser.y" +#line 2709 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -5840,11 +5937,14 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2608 "parser.y" +#line 2710 "parser.y" { - // TODO - as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); - (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) { + (yyval.constant) = constant_new_float(__builtin_nan("")); + } else { + as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id)); + (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id)); + } } } break; @@ -5855,7 +5955,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2617 "parser.y" +#line 2722 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5869,7 +5969,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2726 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5883,7 +5983,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2627 "parser.y" +#line 2732 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5899,7 +5999,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2633 "parser.y" +#line 2738 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5915,7 +6015,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2641 "parser.y" +#line 2746 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5930,7 +6030,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2646 "parser.y" +#line 2751 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5945,7 +6045,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2652 "parser.y" +#line 2757 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5963,7 +6063,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2660 "parser.y" +#line 2765 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5981,7 +6081,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2670 "parser.y" +#line 2775 "parser.y" {PASS12 (yyval.token)=0;} } break; @@ -5992,7 +6092,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2673 "parser.y" +#line 2778 "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; @@ -6003,7 +6103,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2674 "parser.y" +#line 2779 "parser.y" { PASS1 endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -6027,7 +6127,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2795 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -6038,7 +6138,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2692 "parser.y" +#line 2797 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -6049,7 +6149,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2693 "parser.y" +#line 2798 "parser.y" { PASS1 endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6077,12 +6177,17 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2715 "parser.y" +#line 2820 "parser.y" { - PASS1 static slotinfo_t c; + PASS1 static classinfo_t c; memset(&c, 0, sizeof(c)); + c.kind = INFOTYPE_CLASS; + c.subtype = 255; c.name = (yyvsp[(1) - (1)].id); - (yyval.classinfo) = (classinfo_t*)&c; + (yyval.classinfo) = &c; + + /* let the compiler know that we might be looking for this soon */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 slotinfo_t*s = find_class((yyvsp[(1) - (1)].id)); if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package); @@ -6097,13 +6202,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2726 "parser.y" +#line 2836 "parser.y" { - PASS1 static slotinfo_t c; + PASS1 static classinfo_t c; memset(&c, 0, sizeof(c)); + c.kind = INFOTYPE_CLASS; + c.subtype = 255; c.package = (yyvsp[(1) - (3)].id); c.name = (yyvsp[(3) - (3)].id); - (yyval.classinfo)=(classinfo_t*)&c; + (yyval.classinfo) = &c; PASS2 slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id)); @@ -6119,7 +6226,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2742 "parser.y" +#line 2854 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -6130,7 +6237,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2743 "parser.y" +#line 2855 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; @@ -6141,7 +6248,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2745 "parser.y" +#line 2857 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -6152,7 +6259,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2746 "parser.y" +#line 2858 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; @@ -6163,7 +6270,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2747 "parser.y" +#line 2859 "parser.y" {PASS12 (yyval.classinfo)=registry_getanytype();} } break; @@ -6174,7 +6281,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2756 "parser.y" +#line 2868 "parser.y" {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -6185,7 +6292,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2757 "parser.y" +#line 2869 "parser.y" {PASS12 (yyval.classinfo)=0;} } break; @@ -6196,7 +6303,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2761 "parser.y" +#line 2873 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -6207,7 +6314,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2762 "parser.y" +#line 2874 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6218,7 +6325,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2764 "parser.y" +#line 2876 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -6229,7 +6336,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2768 "parser.y" +#line 2880 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6242,7 +6349,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2772 "parser.y" +#line 2884 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6253,7 +6360,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2773 "parser.y" +#line 2885 "parser.y" { (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1; (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c); @@ -6267,7 +6374,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2779 "parser.y" +#line 2891 "parser.y" { (yyval.value).c = (yyvsp[(2) - (4)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c); @@ -6308,7 +6415,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2815 "parser.y" +#line 2927 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6363,7 +6470,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2861 "parser.y" +#line 2973 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6393,7 +6500,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2882 "parser.y" +#line 2994 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6423,7 +6530,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2903 "parser.y" +#line 3015 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6436,7 +6543,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2906 "parser.y" +#line 3018 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6450,7 +6557,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2913 "parser.y" +#line 3025 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; @@ -6461,7 +6568,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 3026 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6472,7 +6579,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2915 "parser.y" +#line 3027 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6488,7 +6595,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2921 "parser.y" +#line 3033 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6501,7 +6608,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2927 "parser.y" +#line 3039 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6512,7 +6619,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2931 "parser.y" +#line 3043 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6523,7 +6630,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2933 "parser.y" +#line 3045 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6534,7 +6641,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2935 "parser.y" +#line 3047 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6545,7 +6652,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2939 "parser.y" +#line 3051 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6571,7 +6678,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2956 "parser.y" +#line 3068 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6586,7 +6693,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2961 "parser.y" +#line 3073 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6599,7 +6706,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2964 "parser.y" +#line 3076 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6612,7 +6719,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2967 "parser.y" +#line 3079 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6625,7 +6732,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2970 "parser.y" +#line 3082 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6638,7 +6745,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2973 "parser.y" +#line 3085 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6651,7 +6758,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2976 "parser.y" +#line 3088 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6664,7 +6771,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2979 "parser.y" +#line 3091 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6677,7 +6784,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2982 "parser.y" +#line 3094 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6690,7 +6797,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2985 "parser.y" +#line 3097 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6703,7 +6810,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2989 "parser.y" +#line 3101 "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; } @@ -6716,7 +6823,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "parser.y" +#line 3104 "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; } @@ -6729,7 +6836,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2995 "parser.y" +#line 3107 "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; } @@ -6742,7 +6849,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2998 "parser.y" +#line 3110 "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; } @@ -6755,7 +6862,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3001 "parser.y" +#line 3113 "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; } @@ -6768,7 +6875,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3004 "parser.y" +#line 3116 "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; } @@ -6781,7 +6888,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3007 "parser.y" +#line 3119 "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; } @@ -6794,7 +6901,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3010 "parser.y" +#line 3122 "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; } @@ -6807,7 +6914,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3014 "parser.y" +#line 3126 "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); @@ -6828,7 +6935,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3025 "parser.y" +#line 3137 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6855,7 +6962,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3043 "parser.y" +#line 3155 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6869,7 +6976,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3048 "parser.y" +#line 3160 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6883,7 +6990,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3053 "parser.y" +#line 3165 "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; @@ -6897,7 +7004,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3058 "parser.y" +#line 3170 "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; @@ -6911,7 +7018,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3063 "parser.y" +#line 3175 "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; @@ -6925,7 +7032,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3068 "parser.y" +#line 3180 "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; @@ -6939,7 +7046,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3072 "parser.y" +#line 3184 "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; @@ -6953,7 +7060,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3076 "parser.y" +#line 3188 "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; @@ -6967,7 +7074,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3081 "parser.y" +#line 3193 "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; @@ -6981,7 +7088,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3085 "parser.y" +#line 3197 "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; @@ -6995,7 +7102,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 3201 "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); @@ -7014,7 +7121,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3098 "parser.y" +#line 3210 "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); @@ -7033,7 +7140,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "parser.y" +#line 3219 "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); @@ -7052,7 +7159,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3117 "parser.y" +#line 3229 "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; @@ -7066,7 +7173,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3122 "parser.y" +#line 3234 "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)); @@ -7087,7 +7194,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3135 "parser.y" +#line 3247 "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; @@ -7101,7 +7208,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3140 "parser.y" +#line 3252 "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; @@ -7115,7 +7222,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3145 "parser.y" +#line 3257 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7130,7 +7237,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3151 "parser.y" +#line 3263 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7145,7 +7252,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3157 "parser.y" +#line 3269 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7158,7 +7265,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3161 "parser.y" +#line 3273 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; @@ -7169,7 +7276,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3163 "parser.y" +#line 3275 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -7189,7 +7296,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3174 "parser.y" +#line 3286 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7207,7 +7314,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3183 "parser.y" +#line 3295 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7223,7 +7330,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3190 "parser.y" +#line 3302 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -7234,7 +7341,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3191 "parser.y" +#line 3303 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; @@ -7245,7 +7352,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3193 "parser.y" +#line 3305 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7261,7 +7368,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3199 "parser.y" +#line 3311 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -7277,7 +7384,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3208 "parser.y" +#line 3320 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7293,7 +7400,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3215 "parser.y" +#line 3327 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7314,7 +7421,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3227 "parser.y" +#line 3339 "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); @@ -7330,7 +7437,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3233 "parser.y" +#line 3345 "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); @@ -7346,7 +7453,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3239 "parser.y" +#line 3351 "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); @@ -7362,7 +7469,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3245 "parser.y" +#line 3357 "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); @@ -7378,7 +7485,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3251 "parser.y" +#line 3363 "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); @@ -7394,7 +7501,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "parser.y" +#line 3369 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7410,7 +7517,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3263 "parser.y" +#line 3375 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7426,7 +7533,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3269 "parser.y" +#line 3381 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7449,7 +7556,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3282 "parser.y" +#line 3394 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7470,7 +7577,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3293 "parser.y" +#line 3405 "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); @@ -7486,7 +7593,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3300 "parser.y" +#line 3412 "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; @@ -7508,10 +7615,10 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3313 "parser.y" +#line 3425 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; - if((is_getlocal((yyvsp[(1) - (2)].value).c) && TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) { + if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) { int nr = getlocalnr((yyvsp[(1) - (2)].value).c); code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0; if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) { @@ -7543,7 +7650,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3340 "parser.y" +#line 3452 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7566,7 +7673,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3354 "parser.y" +#line 3466 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7589,7 +7696,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3368 "parser.y" +#line 3480 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7612,7 +7719,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3383 "parser.y" +#line 3495 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; @@ -7635,7 +7742,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3397 "parser.y" +#line 3509 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7651,7 +7758,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3404 "parser.y" +#line 3516 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7667,7 +7774,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3411 "parser.y" +#line 3523 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7683,7 +7790,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3418 "parser.y" +#line 3530 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7699,7 +7806,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3425 "parser.y" +#line 3537 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7715,39 +7822,56 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3437 "parser.y" - {(yyval.value).c = (yyvsp[(1) - (3)].value).c; - classinfo_t*t = (yyvsp[(1) - (3)].value).t; - char is_static = 0; - if(TYPE_IS_CLASS(t) && t->data) { - t = t->data; - is_static = 1; - } - if(t) { - memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); - char noslot = 0; - if(f && !is_static != !(f->flags&FLAG_STATIC)) - noslot=1; - if(f && f->slot && !noslot) { - (yyval.value).c = abc_getslot((yyval.value).c, f->slot); - } else { - MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - } - /* determine type */ - (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); - if(!(yyval.value).t) - (yyval.value).c = abc_coerce_a((yyval.value).c); - } else { - /* when resolving a property on an unknown type, we do know the - name of the property (and don't seem to need the package), but - we need to make avm2 try out all access modes */ - multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - (yyval.value).c = abc_coerce_a((yyval.value).c); - (yyval.value).t = registry_getanytype(); - } - } +#line 3548 "parser.y" + { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + classinfo_t*t = (yyvsp[(1) - (3)].value).t; + char is_static = 0; + if(TYPE_IS_CLASS(t) && t->data) { + t = t->data; + is_static = 1; + } + if(t) { + if(t->subtype==0xff) { + syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name); + } + memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1); + char noslot = 0; + if(f && !is_static != !(f->flags&FLAG_STATIC)) + noslot=1; + if(f && f->slot && !noslot) { + (yyval.value).c = abc_getslot((yyval.value).c, f->slot); + } else { + MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + } + /* determine type */ + (yyval.value).t = slotinfo_gettype((slotinfo_t*)f); + if(!(yyval.value).t) + (yyval.value).c = abc_coerce_a((yyval.value).c); + } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) { + string_t*package = (yyvsp[(1) - (3)].value).c->data[0]; + char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id)); + if(dict_contains(state->import_toplevel_packages, package2)) { + (yyval.value).c = (yyvsp[(1) - (3)].value).c; + (yyval.value).c->data[0] = string_new4(package2); + (yyval.value).t = 0; + } else { + slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id)); + if(!a) + syntaxerror("couldn't resolve %s", package2); + (yyval.value) = push_class(a); + } + } else { + /* when resolving a property on an unknown type, we do know the + name of the property (and don't seem to need the package), but + we need to make avm2 try out all access modes */ + multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)}; + (yyval.value).c = abc_getproperty2((yyval.value).c, &m); + (yyval.value).c = abc_coerce_a((yyval.value).c); + (yyval.value).t = registry_getanytype(); + } +} } break; @@ -7757,19 +7881,23 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3470 "parser.y" +#line 3598 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent function's variables. We consider everything which is not a local variable "unresolved". This encompasses class names, members of the surrounding class - etc. which *correct* because local variables of the parent function + etc. which is *correct* because local variables of the parent function would shadow those. */ if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) { unknown_variable((yyvsp[(1) - (1)].id)); } + + /* let the compiler know that it might check the current directory/package + for this identifier- maybe there's a file $1.as defining $1. */ + as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id)); PASS2 (yyval.value).t = 0; @@ -7832,41 +7960,21 @@ PASS2 /* look at actual classes, in the current package and imported */ if((a = find_class((yyvsp[(1) - (1)].id)))) { - if(a->access == ACCESS_PACKAGEINTERNAL && - strcmp(a->package, state->package) && - strcmp(a->package, internal_filename_package) - ) - syntaxerror("Can't access internal %s %s in package '%s' from package '%s'", - infotypename(a),(yyvsp[(1) - (1)].id), a->package, state->package); - - if(a->kind != INFOTYPE_CLASS) { - MULTINAME(m, a); - (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m); - (yyval.value).c = abc_getproperty2((yyval.value).c, &m); - if(a->kind == INFOTYPE_METHOD) { - methodinfo_t*f = (methodinfo_t*)a; - (yyval.value).t = TYPE_FUNCTION(f); - } else { - varinfo_t*v = (varinfo_t*)a; - (yyval.value).t = v->type; - } - } else { - classinfo_t*c = (classinfo_t*)a; - if(c->slot) { - (yyval.value).c = abc_getglobalscope((yyval.value).c); - (yyval.value).c = abc_getslot((yyval.value).c, c->slot); - } else { - MULTINAME(m, c); - (yyval.value).c = abc_getlex2((yyval.value).c, &m); - } - (yyval.value).t = TYPE_CLASS(c); - } + (yyval.value) = push_class(a); + break; + } + + /* look through package prefixes */ + if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) { + (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id)); + (yyval.value).t = 0; break; } /* unknown object, let the avm2 resolve it */ if(1) { - as3_softwarning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); + //as3_softwarning("Couldn't resolve '%s', doing late binding", $1); + as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id)); state->method->late_binding = 1; multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)}; @@ -7885,11 +7993,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3591 "parser.y" +#line 3703 "parser.y" { PASS12 - tokenizer_register_namespace((yyvsp[(2) - (2)].id)); - (yyval.id)=(yyvsp[(2) - (2)].id); + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (2)].id); + n->url = 0; + (yyval.namespace_decl)=n; } } break; @@ -7900,9 +8010,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3597 "parser.y" +#line 3710 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].id); + (yyval.namespace_decl)=n; } } break; @@ -7913,9 +8027,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3600 "parser.y" +#line 3717 "parser.y" { - (yyval.code)=0; + PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(2) - (4)].id); + n->url = (yyvsp[(4) - (4)].str).str; + (yyval.namespace_decl)=n; } } break; @@ -7926,8 +8044,11 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3603 "parser.y" +#line 3724 "parser.y" { + PASS12 + list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl)); + tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name); (yyval.code)=0; } } @@ -7939,9 +8060,15 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3606 "parser.y" +#line 3731 "parser.y" { PASS12 + NEW(namespace_decl_t,n); + n->name = (yyvsp[(3) - (3)].classinfo)->name; + n->url = 0; + /* FIXME: for pass2, we should now try to figure out what the URL of + this thing is */ + list_append(state->new_namespaces, n); tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name); (yyval.code)=0; } @@ -7952,7 +8079,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 7956 "parser.tab.c" +#line 8083 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);