X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=07d76a217a1a6d55d83f6ece9ae312eced7f1029;hb=c873335ba84fe69cb4a1183326c9cfef160509e2;hp=36cc3fcea9b294f3dcbdf169272fbf6e5aa2b7dc;hpb=780e53f414a281c516c153a578638c4f7414434c;p=swftools.git diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c index 36cc3fc..07d76a2 100644 --- a/lib/as3/parser.tab.c +++ b/lib/as3/parser.tab.c @@ -355,6 +355,7 @@ struct _methodstate { abc_method_t*abc; int var_index; // for inner methods + int slot_index; // for inner methods char is_a_slot; // for inner methods code_t*header; @@ -403,8 +404,10 @@ DECLARE_LIST(state); multiname_t m;\ namespace_t m##_ns;\ if(f) { \ - m##_ns.access = ((slotinfo_t*)(f))->access; \ - m##_ns.name = ""; \ + if((m##_ns.access = ((slotinfo_t*)(f))->access)==ACCESS_NAMESPACE) \ + m##_ns.name = ((slotinfo_t*)(f))->package; \ + else \ + m##_ns.name = ""; \ m.type = QNAME; \ m.ns = &m##_ns; \ m.namespace_set = 0; \ @@ -749,7 +752,7 @@ static code_t* method_header(methodstate_t*m) c = abc_newfunction(c, l->methodstate->abc); c = abc_dup(c); c = abc_setlocal(c, l->methodstate->var_index); - c = abc_setslot(c, l->methodstate->var_index); + c = abc_setslot(c, l->methodstate->slot_index); } else { c = abc_newfunction(c, l->methodstate->abc); c = abc_setlocal(c, l->methodstate->var_index); @@ -844,7 +847,9 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char } if(m->uses_slots) { /* as variables and slots share the same number, make sure - that those variable indices are reserved */ + 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; } @@ -860,6 +865,7 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char methodstate_t*m = l->methodstate; variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1); m->var_index = v->index; + m->slot_index = v->index; v->is_inner_method = m; l = l->next; } @@ -1890,7 +1896,7 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar) /* Line 273 of skeleton.m4 */ -#line 1894 "parser.tab.c" +#line 1900 "parser.tab.c" #ifdef short # undef short @@ -2302,37 +2308,37 @@ static const yytype_int16 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1869, 1869, 1871, 1871, 1872, 1873, 1875, 1876, 1877, - 1878, 1879, 1880, 1881, 1882, 1884, 1884, 1885, 1886, 1888, - 1889, 1890, 1891, 1892, 1893, 1894, 1896, 1897, 1899, 1900, - 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, - 1913, 1914, 1915, 1918, 1919, 1920, 1921, 1922, 1923, 1924, - 1925, 1927, 1931, 1932, 1936, 1943, 1947, 1948, 1952, 1953, - 1955, 1956, 1958, 2019, 2020, 2023, 2023, 2042, 2043, 2044, - 2049, 2053, 2058, 2059, 2061, 2081, 2125, 2125, 2144, 2144, - 2159, 2162, 2165, 2168, 2172, 2173, 2174, 2175, 2176, 2177, - 2179, 2190, 2193, 2193, 2222, 2222, 2246, 2246, 2262, 2263, - 2264, 2265, 2273, 2282, 2282, 2327, 2331, 2342, 2351, 2352, - 2354, 2355, 2357, 2357, 2359, 2359, 2362, 2377, 2393, 2394, - 2395, 2396, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, - 2406, 2407, 2409, 2410, 2412, 2413, 2415, 2416, 2420, 2418, - 2426, 2424, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, - 2441, 2447, 2448, 2449, 2450, 2451, 2452, 2455, 2468, 2468, - 2470, 2470, 2543, 2544, 2546, 2547, 2548, 2549, 2550, 2552, - 2553, 2554, 2555, 2564, 2568, 2574, 2580, 2588, 2593, 2599, - 2607, 2615, 2616, 2617, 2620, 2619, 2636, 2637, 2639, 2638, - 2662, 2670, 2683, 2684, 2686, 2687, 2689, 2690, 2691, 2700, - 2701, 2705, 2706, 2708, 2709, 2710, 2712, 2716, 2717, 2722, - 2723, 2759, 2805, 2826, 2847, 2850, 2857, 2858, 2859, 2865, - 2871, 2873, 2875, 2877, 2879, 2881, 2883, 2900, 2905, 2908, - 2911, 2914, 2917, 2920, 2923, 2926, 2929, 2933, 2936, 2939, - 2942, 2945, 2948, 2951, 2954, 2958, 2969, 2987, 2992, 2997, - 3002, 3007, 3012, 3016, 3020, 3025, 3029, 3033, 3042, 3051, - 3061, 3066, 3078, 3084, 3089, 3095, 3101, 3105, 3107, 3118, - 3127, 3134, 3135, 3137, 3143, 3152, 3159, 3171, 3177, 3183, - 3189, 3195, 3201, 3207, 3213, 3226, 3237, 3244, 3257, 3284, - 3298, 3312, 3326, 3341, 3348, 3355, 3362, 3369, 3380, 3414, - 3535, 3536, 3537, 3539 + 0, 1875, 1875, 1877, 1877, 1878, 1879, 1881, 1882, 1883, + 1884, 1885, 1886, 1887, 1888, 1890, 1890, 1891, 1892, 1894, + 1895, 1896, 1897, 1898, 1899, 1900, 1902, 1903, 1905, 1906, + 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916, 1917, 1918, + 1919, 1920, 1921, 1924, 1925, 1926, 1927, 1928, 1929, 1930, + 1931, 1933, 1937, 1938, 1942, 1949, 1953, 1954, 1958, 1959, + 1961, 1962, 1964, 2025, 2026, 2029, 2029, 2048, 2049, 2050, + 2055, 2059, 2064, 2065, 2067, 2087, 2131, 2131, 2150, 2150, + 2165, 2168, 2171, 2174, 2178, 2179, 2180, 2181, 2182, 2183, + 2185, 2196, 2199, 2199, 2228, 2228, 2252, 2252, 2268, 2269, + 2270, 2271, 2279, 2288, 2288, 2333, 2337, 2348, 2357, 2358, + 2360, 2361, 2363, 2363, 2365, 2365, 2368, 2383, 2399, 2400, + 2401, 2402, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2411, + 2412, 2413, 2415, 2416, 2418, 2419, 2421, 2422, 2426, 2424, + 2432, 2430, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, + 2447, 2453, 2454, 2455, 2456, 2457, 2458, 2461, 2474, 2474, + 2476, 2476, 2549, 2550, 2552, 2553, 2554, 2555, 2556, 2558, + 2559, 2560, 2561, 2570, 2574, 2580, 2586, 2594, 2599, 2605, + 2613, 2621, 2622, 2623, 2626, 2625, 2642, 2643, 2645, 2644, + 2668, 2676, 2689, 2690, 2692, 2693, 2695, 2696, 2697, 2706, + 2707, 2711, 2712, 2714, 2715, 2716, 2718, 2722, 2723, 2728, + 2729, 2765, 2811, 2832, 2853, 2856, 2863, 2864, 2865, 2871, + 2877, 2879, 2881, 2883, 2885, 2887, 2889, 2906, 2911, 2914, + 2917, 2920, 2923, 2926, 2929, 2932, 2935, 2939, 2942, 2945, + 2948, 2951, 2954, 2957, 2960, 2964, 2975, 2993, 2998, 3003, + 3008, 3013, 3018, 3022, 3026, 3031, 3035, 3039, 3048, 3057, + 3067, 3072, 3084, 3090, 3095, 3101, 3107, 3111, 3113, 3124, + 3133, 3140, 3141, 3143, 3149, 3158, 3165, 3177, 3183, 3189, + 3195, 3201, 3207, 3213, 3219, 3232, 3243, 3250, 3263, 3290, + 3304, 3318, 3332, 3346, 3353, 3360, 3367, 3374, 3385, 3419, + 3540, 3541, 3542, 3544 }; #endif @@ -4120,7 +4126,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1896 "parser.y" +#line 1902 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4131,7 +4137,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1897 "parser.y" +#line 1903 "parser.y" {(yyval.code)=code_new();} } break; @@ -4142,7 +4148,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1899 "parser.y" +#line 1905 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4153,7 +4159,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1900 "parser.y" +#line 1906 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4164,7 +4170,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1914 "parser.y" +#line 1920 "parser.y" {(yyval.code)=(yyvsp[(2) - (3)].code);} } break; @@ -4175,7 +4181,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1915 "parser.y" +#line 1921 "parser.y" {(yyval.code)=0;} } break; @@ -4186,7 +4192,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1918 "parser.y" +#line 1924 "parser.y" {(yyval.code)=0;} } break; @@ -4197,7 +4203,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1925 "parser.y" +#line 1931 "parser.y" {(yyval.code)=(yyvsp[(3) - (4)].code);} } break; @@ -4208,7 +4214,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1927 "parser.y" +#line 1933 "parser.y" {/*TODO*/(yyval.code)=0;} } break; @@ -4219,7 +4225,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1931 "parser.y" +#line 1937 "parser.y" {(yyval.code)=(yyvsp[(1) - (2)].code);} } break; @@ -4230,7 +4236,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1932 "parser.y" +#line 1938 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4241,7 +4247,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1936 "parser.y" +#line 1942 "parser.y" { code_t**cc = &global->init->method->body->code; *cc = code_append(*cc, (yyvsp[(1) - (1)].code)); @@ -4255,7 +4261,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1947 "parser.y" +#line 1953 "parser.y" {(yyval.value)=(yyvsp[(2) - (2)].value);} } break; @@ -4266,7 +4272,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1948 "parser.y" +#line 1954 "parser.y" {(yyval.value).c=abc_pushundefined(0); (yyval.value).t=TYPE_ANY; } @@ -4279,7 +4285,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1952 "parser.y" +#line 1958 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4290,7 +4296,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1953 "parser.y" +#line 1959 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4301,7 +4307,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1955 "parser.y" +#line 1961 "parser.y" {(yyval.code) = (yyvsp[(1) - (1)].code);} } break; @@ -4312,7 +4318,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1956 "parser.y" +#line 1962 "parser.y" {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));} } break; @@ -4323,7 +4329,7 @@ yyreduce: if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 1959 "parser.y" +#line 1965 "parser.y" { PASS12 if(variable_exists((yyvsp[(1) - (3)].id))) @@ -4390,7 +4396,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2019 "parser.y" +#line 2025 "parser.y" {(yyval.code) = code_new();} } break; @@ -4401,7 +4407,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2020 "parser.y" +#line 2026 "parser.y" {(yyval.code)=(yyvsp[(2) - (2)].code);} } break; @@ -4412,7 +4418,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2023 "parser.y" +#line 2029 "parser.y" {PASS12 new_state();} } break; @@ -4423,7 +4429,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2023 "parser.y" +#line 2029 "parser.y" { (yyval.code) = code_new(); @@ -4451,7 +4457,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2042 "parser.y" +#line 2048 "parser.y" {(yyval.code)=code_new();} } break; @@ -4462,7 +4468,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2049 "parser.y" +#line 2055 "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); @@ -4476,7 +4482,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2053 "parser.y" +#line 2059 "parser.y" { PASS12 (yyval.id)=(yyvsp[(1) - (1)].id); @@ -4490,7 +4496,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2058 "parser.y" +#line 2064 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;} } break; @@ -4501,7 +4507,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2059 "parser.y" +#line 2065 "parser.y" {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;} } break; @@ -4512,7 +4518,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2061 "parser.y" +#line 2067 "parser.y" { if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement"); (yyval.code) = code_new(); @@ -4541,7 +4547,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2081 "parser.y" +#line 2087 "parser.y" { variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id)); char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__"); @@ -4594,7 +4600,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2125 "parser.y" +#line 2131 "parser.y" {PASS12 new_state();} } break; @@ -4605,7 +4611,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2125 "parser.y" +#line 2131 "parser.y" { (yyval.code) = code_new(); @@ -4633,7 +4639,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2144 "parser.y" +#line 2150 "parser.y" {PASS12 new_state();} } break; @@ -4644,7 +4650,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2144 "parser.y" +#line 2150 "parser.y" { (yyval.code) = code_new(); code_t*loopstart = (yyval.code) = abc_label((yyval.code)); @@ -4668,7 +4674,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2159 "parser.y" +#line 2165 "parser.y" { (yyval.code) = abc___break__(0, ""); } @@ -4681,7 +4687,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2162 "parser.y" +#line 2168 "parser.y" { (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id)); } @@ -4694,7 +4700,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2165 "parser.y" +#line 2171 "parser.y" { (yyval.code) = abc___continue__(0, ""); } @@ -4707,7 +4713,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2168 "parser.y" +#line 2174 "parser.y" { (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id)); } @@ -4720,7 +4726,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2172 "parser.y" +#line 2178 "parser.y" {(yyval.code)=0;} } break; @@ -4731,7 +4737,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2173 "parser.y" +#line 2179 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4742,7 +4748,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2174 "parser.y" +#line 2180 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4753,7 +4759,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2175 "parser.y" +#line 2181 "parser.y" {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));} } break; @@ -4764,7 +4770,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2176 "parser.y" +#line 2182 "parser.y" {(yyval.code)=(yyvsp[(1) - (1)].code);} } break; @@ -4775,7 +4781,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2177 "parser.y" +#line 2183 "parser.y" {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));} } break; @@ -4786,7 +4792,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2179 "parser.y" +#line 2185 "parser.y" { (yyval.code) = abc_dup(0); (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c); @@ -4807,7 +4813,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2190 "parser.y" +#line 2196 "parser.y" { (yyval.code) = (yyvsp[(3) - (3)].code); } @@ -4820,7 +4826,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2193 "parser.y" +#line 2199 "parser.y" {PASS12 new_state();} } break; @@ -4831,7 +4837,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2193 "parser.y" +#line 2199 "parser.y" { (yyval.code)=(yyvsp[(4) - (8)].value).c; (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code)); @@ -4867,7 +4873,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2222 "parser.y" +#line 2228 "parser.y" {PASS12 new_state(); state->exception_name=(yyvsp[(3) - (5)].id); PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0); @@ -4882,7 +4888,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2227 "parser.y" +#line 2233 "parser.y" { namespace_t name_ns = {ACCESS_PACKAGE, ""}; multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)}; @@ -4911,7 +4917,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" +#line 2252 "parser.y" {PASS12 new_state();state->exception_name=0;} } break; @@ -4922,7 +4928,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2246 "parser.y" +#line 2252 "parser.y" { (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code)); if(!(yyvsp[(4) - (5)].code)) { @@ -4947,7 +4953,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2262 "parser.y" +#line 2268 "parser.y" {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));} } break; @@ -4958,7 +4964,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2263 "parser.y" +#line 2269 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));} } break; @@ -4969,7 +4975,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2264 "parser.y" +#line 2270 "parser.y" {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);} } break; @@ -4980,7 +4986,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2265 "parser.y" +#line 2271 "parser.y" { (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list); (yyval.catch_list).finally = 0; @@ -4998,7 +5004,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2273 "parser.y" +#line 2279 "parser.y" { (yyval.catch_list).l=list_new(); (yyval.catch_list).finally = 0; @@ -5016,7 +5022,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2282 "parser.y" +#line 2288 "parser.y" {PASS12 new_state();} } break; @@ -5027,7 +5033,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2282 "parser.y" +#line 2288 "parser.y" { code_t*out = abc_nop(0); @@ -5079,7 +5085,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2327 "parser.y" +#line 2333 "parser.y" { (yyval.code)=(yyvsp[(2) - (2)].value).c; (yyval.code)=abc_throw((yyval.code)); @@ -5093,7 +5099,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2331 "parser.y" +#line 2337 "parser.y" { if(!state->exception_name) syntaxerror("re-throw only possible within a catch block"); @@ -5111,7 +5117,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2342 "parser.y" +#line 2348 "parser.y" { (yyval.code) = (yyvsp[(3) - (5)].value).c; (yyval.code) = abc_pushscope((yyval.code)); @@ -5127,7 +5133,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2352 "parser.y" +#line 2358 "parser.y" {PASS12 (yyval.id)="package";} } break; @@ -5138,7 +5144,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2354 "parser.y" +#line 2360 "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; @@ -5149,7 +5155,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2355 "parser.y" +#line 2361 "parser.y" {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));} } break; @@ -5160,7 +5166,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2357 "parser.y" +#line 2363 "parser.y" {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;} } break; @@ -5171,7 +5177,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2358 "parser.y" +#line 2364 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5182,7 +5188,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2359 "parser.y" +#line 2365 "parser.y" {PASS12 startpackage("");} } break; @@ -5193,7 +5199,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2360 "parser.y" +#line 2366 "parser.y" {PASS12 endpackage();(yyval.code)=0;} } break; @@ -5204,7 +5210,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2362 "parser.y" +#line 2368 "parser.y" { PASS12 slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name); @@ -5229,7 +5235,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2377 "parser.y" +#line 2383 "parser.y" { PASS12 if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) { @@ -5252,7 +5258,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2393 "parser.y" +#line 2399 "parser.y" {PASS12 (yyval.flags)=0;} } break; @@ -5263,7 +5269,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2394 "parser.y" +#line 2400 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);} } break; @@ -5274,7 +5280,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2395 "parser.y" +#line 2401 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);} } break; @@ -5285,7 +5291,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2396 "parser.y" +#line 2402 "parser.y" {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);} } break; @@ -5296,7 +5302,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2398 "parser.y" +#line 2404 "parser.y" {PASS12 (yyval.token)=FLAG_PUBLIC;} } break; @@ -5307,7 +5313,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2399 "parser.y" +#line 2405 "parser.y" {PASS12 (yyval.token)=FLAG_PRIVATE;} } break; @@ -5318,7 +5324,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2400 "parser.y" +#line 2406 "parser.y" {PASS12 (yyval.token)=FLAG_PROTECTED;} } break; @@ -5329,7 +5335,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2401 "parser.y" +#line 2407 "parser.y" {PASS12 (yyval.token)=FLAG_STATIC;} } break; @@ -5340,7 +5346,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2402 "parser.y" +#line 2408 "parser.y" {PASS12 (yyval.token)=FLAG_DYNAMIC;} } break; @@ -5351,7 +5357,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2403 "parser.y" +#line 2409 "parser.y" {PASS12 (yyval.token)=FLAG_FINAL;} } break; @@ -5362,7 +5368,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2404 "parser.y" +#line 2410 "parser.y" {PASS12 (yyval.token)=FLAG_OVERRIDE;} } break; @@ -5373,7 +5379,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2405 "parser.y" +#line 2411 "parser.y" {PASS12 (yyval.token)=FLAG_NATIVE;} } break; @@ -5384,7 +5390,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2406 "parser.y" +#line 2412 "parser.y" {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;} } break; @@ -5395,7 +5401,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2407 "parser.y" +#line 2413 "parser.y" {PASS12 (yyval.token)=FLAG_NAMESPACE;} } break; @@ -5406,7 +5412,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2409 "parser.y" +#line 2415 "parser.y" {(yyval.classinfo)=registry_getobjectclass();} } break; @@ -5417,7 +5423,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2410 "parser.y" +#line 2416 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -5428,7 +5434,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2412 "parser.y" +#line 2418 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5439,7 +5445,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2413 "parser.y" +#line 2419 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5450,7 +5456,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2415 "parser.y" +#line 2421 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();} } break; @@ -5461,7 +5467,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2416 "parser.y" +#line 2422 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);} } break; @@ -5472,7 +5478,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2420 "parser.y" +#line 2426 "parser.y" {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));} } break; @@ -5483,7 +5489,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2422 "parser.y" +#line 2428 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5494,7 +5500,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2426 "parser.y" +#line 2432 "parser.y" {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));} } break; @@ -5505,7 +5511,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2428 "parser.y" +#line 2434 "parser.y" {PASS12 endclass();(yyval.code)=0;} } break; @@ -5516,7 +5522,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2441 "parser.y" +#line 2447 "parser.y" { code_t*c = state->cls->static_init->header; c = code_append(c, (yyvsp[(1) - (1)].code)); @@ -5531,7 +5537,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2452 "parser.y" +#line 2458 "parser.y" { syntaxerror("variable declarations not allowed in interfaces"); } @@ -5544,7 +5550,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2455 "parser.y" +#line 2461 "parser.y" { PASS12 (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC; @@ -5564,7 +5570,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2470 "parser.y" +#line 2476 "parser.y" {setstaticfunction((yyvsp[(1) - (3)].flags));} } break; @@ -5575,7 +5581,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2470 "parser.y" +#line 2476 "parser.y" { int flags = (yyvsp[(1) - (6)].flags); U8 access = flags2access((yyvsp[(1) - (6)].flags)); @@ -5655,7 +5661,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2543 "parser.y" +#line 2549 "parser.y" {(yyval.constant)=0;} } break; @@ -5666,7 +5672,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2544 "parser.y" +#line 2550 "parser.y" {(yyval.constant)=(yyvsp[(2) - (2)].constant);} } break; @@ -5677,7 +5683,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2546 "parser.y" +#line 2552 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));} } break; @@ -5688,7 +5694,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2547 "parser.y" +#line 2553 "parser.y" {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));} } break; @@ -5699,7 +5705,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2548 "parser.y" +#line 2554 "parser.y" {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));} } break; @@ -5710,7 +5716,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2549 "parser.y" +#line 2555 "parser.y" {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));} } break; @@ -5721,7 +5727,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2550 "parser.y" +#line 2556 "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; @@ -5732,7 +5738,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2552 "parser.y" +#line 2558 "parser.y" {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));} } break; @@ -5743,7 +5749,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2553 "parser.y" +#line 2559 "parser.y" {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));} } break; @@ -5754,7 +5760,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2554 "parser.y" +#line 2560 "parser.y" {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));} } break; @@ -5765,7 +5771,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2555 "parser.y" +#line 2561 "parser.y" { // TODO as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id)); @@ -5780,7 +5786,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2564 "parser.y" +#line 2570 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5794,7 +5800,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2568 "parser.y" +#line 2574 "parser.y" { PASS12 (yyval.params)=(yyvsp[(1) - (1)].params); @@ -5808,7 +5814,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2574 "parser.y" +#line 2580 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5824,7 +5830,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2580 "parser.y" +#line 2586 "parser.y" { PASS12 (yyval.params) =(yyvsp[(1) - (4)].params); @@ -5840,7 +5846,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2588 "parser.y" +#line 2594 "parser.y" { PASS12 (yyval.params) = (yyvsp[(1) - (3)].params); @@ -5855,7 +5861,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2593 "parser.y" +#line 2599 "parser.y" { PASS12 memset(&(yyval.params),0,sizeof((yyval.params))); @@ -5870,7 +5876,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2599 "parser.y" +#line 2605 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5888,7 +5894,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2607 "parser.y" +#line 2613 "parser.y" { PASS12 (yyval.param) = rfx_calloc(sizeof(param_t)); @@ -5906,7 +5912,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2617 "parser.y" +#line 2623 "parser.y" {PASS12 (yyval.token)=0;} } break; @@ -5917,7 +5923,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2620 "parser.y" +#line 2626 "parser.y" {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));} } break; @@ -5928,7 +5934,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2621 "parser.y" +#line 2627 "parser.y" { PASS1 endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0); @@ -5952,7 +5958,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2637 "parser.y" +#line 2643 "parser.y" {PASS12 (yyval.id)=0;} } break; @@ -5963,7 +5969,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2639 "parser.y" +#line 2645 "parser.y" {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));} } break; @@ -5974,7 +5980,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2640 "parser.y" +#line 2646 "parser.y" { PASS1 endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0); @@ -6002,7 +6008,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2662 "parser.y" +#line 2668 "parser.y" { PASS1 (yyval.classinfo)=0; PASS2 @@ -6019,7 +6025,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2670 "parser.y" +#line 2676 "parser.y" { PASS1 static classinfo_t c; memset(&c, 0, sizeof(c)); @@ -6041,7 +6047,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2686 "parser.y" +#line 2692 "parser.y" {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));} } break; @@ -6052,7 +6058,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2687 "parser.y" +#line 2693 "parser.y" {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));} } break; @@ -6063,7 +6069,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2689 "parser.y" +#line 2695 "parser.y" {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);} } break; @@ -6074,7 +6080,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2690 "parser.y" +#line 2696 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; @@ -6085,7 +6091,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2691 "parser.y" +#line 2697 "parser.y" {(yyval.classinfo)=registry_getanytype();} } break; @@ -6096,7 +6102,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2700 "parser.y" +#line 2706 "parser.y" {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);} } break; @@ -6107,7 +6113,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2701 "parser.y" +#line 2707 "parser.y" {(yyval.classinfo)=0;} } break; @@ -6118,7 +6124,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2705 "parser.y" +#line 2711 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -6129,7 +6135,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2706 "parser.y" +#line 2712 "parser.y" {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);} } break; @@ -6140,7 +6146,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2708 "parser.y" +#line 2714 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -6151,7 +6157,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2712 "parser.y" +#line 2718 "parser.y" {(yyval.value_list).len=1; (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c; } @@ -6164,7 +6170,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2716 "parser.y" +#line 2722 "parser.y" {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);} } break; @@ -6175,7 +6181,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2717 "parser.y" +#line 2723 "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); @@ -6189,7 +6195,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2723 "parser.y" +#line 2729 "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); @@ -6230,7 +6236,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2759 "parser.y" +#line 2765 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; @@ -6285,7 +6291,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2805 "parser.y" +#line 2811 "parser.y" { if(!state->cls) syntaxerror("super() not allowed outside of a class"); if(!state->method) syntaxerror("super() not allowed outside of a function"); @@ -6315,7 +6321,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2826 "parser.y" +#line 2832 "parser.y" { (yyval.value).c = (yyvsp[(2) - (2)].value).c; if((yyval.value).c->opcode == OPCODE_COERCE_A) { @@ -6345,7 +6351,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2847 "parser.y" +#line 2853 "parser.y" { (yyval.code) = abc_returnvoid(0); } @@ -6358,7 +6364,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2850 "parser.y" +#line 2856 "parser.y" { (yyval.code) = (yyvsp[(2) - (2)].value).c; (yyval.code) = abc_returnvalue((yyval.code)); @@ -6372,7 +6378,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2857 "parser.y" +#line 2863 "parser.y" {(yyval.value)=(yyvsp[(1) - (1)].value);} } break; @@ -6383,7 +6389,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2858 "parser.y" +#line 2864 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6394,7 +6400,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2859 "parser.y" +#line 2865 "parser.y" { (yyval.value).c = (yyvsp[(1) - (3)].value).c; (yyval.value).c = cut_last_push((yyval.value).c); @@ -6410,7 +6416,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2865 "parser.y" +#line 2871 "parser.y" { (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c); } @@ -6423,7 +6429,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2871 "parser.y" +#line 2877 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6434,7 +6440,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2875 "parser.y" +#line 2881 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6445,7 +6451,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2877 "parser.y" +#line 2883 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6456,7 +6462,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2879 "parser.y" +#line 2885 "parser.y" {(yyval.value) = (yyvsp[(1) - (1)].value);} } break; @@ -6467,7 +6473,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2883 "parser.y" +#line 2889 "parser.y" { (yyval.value).c = 0; namespace_t ns = {ACCESS_PACKAGE, ""}; @@ -6493,7 +6499,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2900 "parser.y" +#line 2906 "parser.y" {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint)); //MULTINAME(m, registry_getintclass()); //$$.c = abc_coerce2($$.c, &m); // FIXME @@ -6508,7 +6514,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2905 "parser.y" +#line 2911 "parser.y" {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_INT; } @@ -6521,7 +6527,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2908 "parser.y" +#line 2914 "parser.y" {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int)); (yyval.value).t = TYPE_INT; } @@ -6534,7 +6540,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2911 "parser.y" +#line 2917 "parser.y" {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint)); (yyval.value).t = TYPE_UINT; } @@ -6547,7 +6553,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2914 "parser.y" +#line 2920 "parser.y" {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float)); (yyval.value).t = TYPE_FLOAT; } @@ -6560,7 +6566,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2917 "parser.y" +#line 2923 "parser.y" {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str); (yyval.value).t = TYPE_STRING; } @@ -6573,7 +6579,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2920 "parser.y" +#line 2926 "parser.y" {(yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -6586,7 +6592,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2923 "parser.y" +#line 2929 "parser.y" {(yyval.value).c = abc_pushtrue(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6599,7 +6605,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2926 "parser.y" +#line 2932 "parser.y" {(yyval.value).c = abc_pushfalse(0); (yyval.value).t = TYPE_BOOLEAN; } @@ -6612,7 +6618,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2929 "parser.y" +#line 2935 "parser.y" {(yyval.value).c = abc_pushnull(0); (yyval.value).t = TYPE_NULL; } @@ -6625,7 +6631,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2933 "parser.y" +#line 2939 "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; } @@ -6638,7 +6644,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2936 "parser.y" +#line 2942 "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; } @@ -6651,7 +6657,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2939 "parser.y" +#line 2945 "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; } @@ -6664,7 +6670,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2942 "parser.y" +#line 2948 "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; } @@ -6677,7 +6683,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2945 "parser.y" +#line 2951 "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; } @@ -6690,7 +6696,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2948 "parser.y" +#line 2954 "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; } @@ -6703,7 +6709,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2951 "parser.y" +#line 2957 "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; } @@ -6716,7 +6722,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2954 "parser.y" +#line 2960 "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; } @@ -6729,7 +6735,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2958 "parser.y" +#line 2964 "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); @@ -6750,7 +6756,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2969 "parser.y" +#line 2975 "parser.y" { (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A'); /*printf("%08x:\n",$1.t); @@ -6777,7 +6783,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2987 "parser.y" +#line 2993 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_not((yyval.value).c); (yyval.value).t = TYPE_BOOLEAN; @@ -6791,7 +6797,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2992 "parser.y" +#line 2998 "parser.y" {(yyval.value).c=(yyvsp[(2) - (2)].value).c; (yyval.value).c = abc_bitnot((yyval.value).c); (yyval.value).t = TYPE_INT; @@ -6805,7 +6811,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 2997 "parser.y" +#line 3003 "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; @@ -6819,7 +6825,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3002 "parser.y" +#line 3008 "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; @@ -6833,7 +6839,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3007 "parser.y" +#line 3013 "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; @@ -6847,7 +6853,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3012 "parser.y" +#line 3018 "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; @@ -6861,7 +6867,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3016 "parser.y" +#line 3022 "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; @@ -6875,7 +6881,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3020 "parser.y" +#line 3026 "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; @@ -6889,7 +6895,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3025 "parser.y" +#line 3031 "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; @@ -6903,7 +6909,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3029 "parser.y" +#line 3035 "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; @@ -6917,7 +6923,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3033 "parser.y" +#line 3039 "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); @@ -6936,7 +6942,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3042 "parser.y" +#line 3048 "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); @@ -6955,7 +6961,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3051 "parser.y" +#line 3057 "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); @@ -6974,7 +6980,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3061 "parser.y" +#line 3067 "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; @@ -6988,7 +6994,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3066 "parser.y" +#line 3072 "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)); @@ -7009,7 +7015,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3079 "parser.y" +#line 3085 "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; @@ -7023,7 +7029,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3084 "parser.y" +#line 3090 "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; @@ -7037,7 +7043,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3089 "parser.y" +#line 3095 "parser.y" { (yyval.value).c = (yyvsp[(3) - (4)].value).c; (yyval.value).c = abc_typeof((yyval.value).c); @@ -7052,7 +7058,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3095 "parser.y" +#line 3101 "parser.y" { (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c); (yyval.value).c = abc_pushundefined((yyval.value).c); @@ -7067,7 +7073,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3101 "parser.y" +#line 3107 "parser.y" { (yyval.value).c = abc_pushundefined(0); (yyval.value).t = TYPE_ANY; } @@ -7080,7 +7086,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3105 "parser.y" +#line 3111 "parser.y" {(yyval.value)=(yyvsp[(2) - (3)].value);} } break; @@ -7091,7 +7097,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3107 "parser.y" +#line 3113 "parser.y" { (yyval.value)=(yyvsp[(2) - (2)].value); if(IS_INT((yyvsp[(2) - (2)].value).t)) { @@ -7111,7 +7117,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3118 "parser.y" +#line 3124 "parser.y" { (yyval.value).c = (yyvsp[(1) - (4)].value).c; (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c); @@ -7129,7 +7135,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3127 "parser.y" +#line 3133 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7145,7 +7151,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3134 "parser.y" +#line 3140 "parser.y" {(yyval.value_list).cc=0;(yyval.value_list).len=0;} } break; @@ -7156,7 +7162,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3135 "parser.y" +#line 3141 "parser.y" {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);} } break; @@ -7167,7 +7173,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3137 "parser.y" +#line 3143 "parser.y" { (yyval.value_list).cc = 0; (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c); @@ -7183,7 +7189,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3143 "parser.y" +#line 3149 "parser.y" { (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc; (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2; @@ -7199,7 +7205,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3152 "parser.y" +#line 3158 "parser.y" { (yyval.value).c = code_new(); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc); @@ -7215,7 +7221,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3159 "parser.y" +#line 3165 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) { @@ -7236,7 +7242,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3171 "parser.y" +#line 3177 "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); @@ -7252,7 +7258,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3177 "parser.y" +#line 3183 "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); @@ -7268,7 +7274,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3183 "parser.y" +#line 3189 "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); @@ -7284,7 +7290,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3189 "parser.y" +#line 3195 "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); @@ -7300,7 +7306,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3195 "parser.y" +#line 3201 "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); @@ -7316,7 +7322,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3201 "parser.y" +#line 3207 "parser.y" { code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7332,7 +7338,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3207 "parser.y" +#line 3213 "parser.y" { code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c); c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t); @@ -7348,7 +7354,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3213 "parser.y" +#line 3219 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; @@ -7371,7 +7377,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3226 "parser.y" +#line 3232 "parser.y" { code_t*c = (yyvsp[(3) - (3)].value).c; if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) { c=abc_subtract_i(c); @@ -7392,7 +7398,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3237 "parser.y" +#line 3243 "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); @@ -7408,7 +7414,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3244 "parser.y" +#line 3250 "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; @@ -7418,7 +7424,7 @@ PASS2 code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0); (yyval.value).c = j1->branch = abc_label((yyval.value).c); (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c); - (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t); + (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t); (yyval.value).c = j2->branch = abc_label((yyval.value).c); } } @@ -7430,7 +7436,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3257 "parser.y" +#line 3263 "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)) { @@ -7465,7 +7471,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3284 "parser.y" +#line 3290 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(1) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7488,7 +7494,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3298 "parser.y" +#line 3304 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7511,7 +7517,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3312 "parser.y" +#line 3318 "parser.y" { code_t*c = 0; classinfo_t*type = (yyvsp[(2) - (2)].value).t; if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { @@ -7534,14 +7540,13 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3327 "parser.y" +#line 3333 "parser.y" { if(!state->cls->info) syntaxerror("super keyword not allowed outside a class"); classinfo_t*t = state->cls->info->superclass; if(!t) t = TYPE_OBJECT; memberinfo_t*f = registry_findmember(t, (yyvsp[(3) - (3)].id), 1); - namespace_t ns = {f->access, ""}; MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id)); (yyval.value).c = 0; (yyval.value).c = abc_getlocal_0((yyval.value).c); @@ -7557,7 +7562,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3341 "parser.y" +#line 3346 "parser.y" { // attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7573,7 +7578,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3348 "parser.y" +#line 3353 "parser.y" { // child attribute TODO (yyval.value).c = abc_pushundefined(0); @@ -7589,7 +7594,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3355 "parser.y" +#line 3360 "parser.y" { // namespace declaration TODO (yyval.value).c = abc_pushundefined(0); @@ -7605,7 +7610,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3362 "parser.y" +#line 3367 "parser.y" { // descendants TODO (yyval.value).c = abc_pushundefined(0); @@ -7621,7 +7626,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3369 "parser.y" +#line 3374 "parser.y" { // filter TODO (yyval.value).c = abc_pushundefined(0); @@ -7637,7 +7642,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3381 "parser.y" +#line 3386 "parser.y" {(yyval.value).c = (yyvsp[(1) - (3)].value).c; classinfo_t*t = (yyvsp[(1) - (3)].value).t; char is_static = 0; @@ -7679,7 +7684,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3414 "parser.y" +#line 3419 "parser.y" { PASS1 /* Queue unresolved identifiers for checking against the parent @@ -7807,7 +7812,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3535 "parser.y" +#line 3540 "parser.y" {(yyval.code)=0;} } break; @@ -7818,7 +7823,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3536 "parser.y" +#line 3541 "parser.y" {(yyval.code)=0;} } break; @@ -7829,7 +7834,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3537 "parser.y" +#line 3542 "parser.y" {(yyval.code)=0;} } break; @@ -7840,7 +7845,7 @@ PASS2 if(as3_pass==2) { /* Line 1464 of skeleton.m4 */ -#line 3539 "parser.y" +#line 3544 "parser.y" { PASS12 tokenizer_register_namespace((yyvsp[(3) - (3)].id)); @@ -7853,7 +7858,7 @@ PASS2 /* Line 1464 of skeleton.m4 */ -#line 7857 "parser.tab.c" +#line 7862 "parser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);