diff --git a/panda/src/egg/parser.cxx.prebuilt b/panda/src/egg/parser.cxx.prebuilt index 7958a7ac80..6140787c7b 100644 --- a/panda/src/egg/parser.cxx.prebuilt +++ b/panda/src/egg/parser.cxx.prebuilt @@ -512,7 +512,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1347 +#define YYLAST 1343 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 93 @@ -521,7 +521,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 260 /* YYNRULES -- Number of states. */ -#define YYNSTATES 729 +#define YYNSTATES 722 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -587,21 +587,21 @@ static const unsigned short int yyprhs[] = 411, 414, 417, 420, 423, 425, 427, 430, 431, 437, 439, 442, 445, 448, 451, 454, 457, 460, 463, 466, 469, 472, 475, 481, 488, 493, 498, 503, 508, 516, - 522, 529, 534, 539, 541, 558, 563, 565, 582, 592, - 594, 601, 606, 618, 631, 632, 639, 640, 647, 648, - 655, 656, 663, 664, 671, 672, 679, 680, 687, 689, - 695, 701, 703, 704, 712, 718, 724, 730, 733, 739, - 745, 751, 758, 760, 766, 772, 778, 781, 787, 793, - 799, 805, 811, 817, 820, 826, 833, 835, 841, 847, - 853, 856, 862, 868, 874, 880, 886, 893, 895, 897, - 899, 903, 912, 921, 926, 936, 946, 948, 957, 960, - 962, 964, 966, 972, 974, 977, 979, 981, 982, 989, - 990, 997, 999, 1002, 1005, 1008, 1011, 1014, 1015, 1022, - 1024, 1031, 1037, 1038, 1045, 1047, 1054, 1060, 1061, 1068, - 1070, 1077, 1080, 1082, 1085, 1087, 1090, 1092, 1094, 1096, - 1098, 1100, 1102, 1104, 1106, 1108, 1110, 1112, 1114, 1116, - 1118, 1120, 1122, 1125, 1127, 1129, 1131, 1133, 1135, 1137, - 1139 + 522, 529, 534, 539, 541, 551, 556, 558, 575, 585, + 587, 594, 599, 611, 624, 625, 632, 633, 640, 641, + 648, 649, 656, 657, 664, 665, 672, 673, 680, 682, + 688, 694, 696, 697, 705, 711, 717, 723, 726, 732, + 738, 744, 751, 753, 759, 765, 771, 774, 780, 786, + 792, 798, 804, 810, 813, 819, 826, 828, 834, 840, + 846, 849, 855, 861, 867, 873, 879, 886, 888, 890, + 892, 896, 905, 914, 919, 929, 939, 941, 950, 953, + 955, 957, 959, 965, 967, 970, 972, 974, 975, 982, + 983, 990, 992, 995, 998, 1001, 1004, 1007, 1008, 1015, + 1017, 1024, 1030, 1031, 1038, 1040, 1047, 1053, 1054, 1061, + 1063, 1070, 1073, 1075, 1078, 1080, 1083, 1085, 1087, 1089, + 1091, 1093, 1095, 1097, 1099, 1101, 1103, 1105, 1107, 1109, + 1111, 1113, 1115, 1118, 1120, 1122, 1124, 1126, 1128, 1130, + 1132 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -662,65 +662,65 @@ static const short int yyrhs[] = 92, -1, 59, 91, 206, 206, 206, 92, -1, 59, 91, 206, 92, -1, 39, 91, 140, 92, -1, 209, -1, 206, 206, 206, 206, 206, 206, 206, 206, 206, - 206, 206, 206, 206, 206, 206, 206, -1, 40, 91, - 142, 92, -1, 209, -1, 206, 206, 206, 206, 206, + -1, 40, 91, 142, 92, -1, 209, -1, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, - 206, -1, 84, 91, 194, 144, 51, 91, 198, 92, - 92, -1, 209, -1, 144, 58, 199, 91, 207, 92, - -1, 63, 91, 146, 92, -1, 24, 91, 206, 206, - 81, 91, 206, 206, 206, 92, 92, -1, 24, 91, - 206, 206, 206, 81, 91, 206, 206, 206, 92, 92, - -1, -1, 50, 200, 148, 91, 162, 92, -1, -1, - 74, 200, 150, 91, 162, 92, -1, -1, 75, 200, - 152, 91, 162, 92, -1, -1, 49, 200, 154, 91, - 162, 92, -1, -1, 36, 200, 156, 91, 162, 92, - -1, -1, 45, 200, 158, 91, 164, 92, -1, -1, - 44, 200, 160, 91, 165, 92, -1, 209, -1, 161, - 43, 91, 169, 92, -1, 161, 52, 91, 170, 92, - -1, 209, -1, -1, 162, 15, 208, 91, 163, 161, - 92, -1, 162, 73, 91, 166, 92, -1, 162, 69, - 91, 167, 92, -1, 162, 42, 91, 168, 92, -1, - 162, 172, -1, 162, 43, 91, 169, 92, -1, 162, - 52, 91, 170, 92, -1, 162, 7, 91, 171, 92, - -1, 162, 58, 199, 91, 207, 92, -1, 209, -1, - 164, 73, 91, 166, 92, -1, 164, 69, 91, 167, - 92, -1, 164, 42, 91, 168, 92, -1, 164, 172, - -1, 164, 43, 91, 169, 92, -1, 164, 52, 91, - 170, 92, -1, 164, 7, 91, 171, 92, -1, 164, - 47, 91, 173, 92, -1, 164, 78, 91, 174, 92, - -1, 164, 80, 91, 175, 92, -1, 164, 159, -1, - 164, 76, 91, 176, 92, -1, 164, 58, 199, 91, - 207, 92, -1, 209, -1, 165, 73, 91, 166, 92, - -1, 165, 69, 91, 167, 92, -1, 165, 42, 91, - 168, 92, -1, 165, 172, -1, 165, 43, 91, 169, - 92, -1, 165, 52, 91, 170, 92, -1, 165, 7, - 91, 171, 92, -1, 165, 47, 91, 178, 92, -1, - 165, 33, 91, 179, 92, -1, 165, 58, 199, 91, - 207, 92, -1, 196, -1, 199, -1, 197, -1, 206, - 206, 206, -1, 169, 19, 203, 91, 206, 206, 206, - 92, -1, 169, 19, 91, 203, 206, 206, 206, 92, - -1, 206, 206, 206, 206, -1, 170, 20, 203, 91, - 206, 206, 206, 206, 92, -1, 170, 20, 91, 203, - 206, 206, 206, 206, 92, -1, 208, -1, 84, 91, - 194, 51, 91, 198, 92, 92, -1, 208, 208, -1, - 195, -1, 195, -1, 209, -1, 176, 37, 91, 177, - 92, -1, 209, -1, 177, 159, -1, 208, -1, 195, - -1, -1, 64, 200, 181, 91, 184, 92, -1, -1, - 11, 200, 183, 91, 184, 92, -1, 209, -1, 184, - 180, -1, 184, 182, -1, 184, 185, -1, 184, 188, - -1, 184, 191, -1, -1, 57, 200, 186, 91, 187, - 92, -1, 209, -1, 187, 58, 199, 91, 207, 92, - -1, 187, 65, 91, 195, 92, -1, -1, 85, 200, - 189, 91, 190, 92, -1, 209, -1, 190, 58, 199, - 91, 207, 92, -1, 190, 65, 91, 195, 92, -1, - -1, 86, 200, 192, 91, 193, 92, -1, 209, -1, - 193, 58, 199, 91, 207, 92, -1, 193, 185, -1, - 209, -1, 194, 208, -1, 209, -1, 195, 206, -1, - 199, -1, 199, -1, 199, -1, 209, -1, 203, -1, - 202, -1, 209, -1, 203, -1, 209, -1, 203, -1, - 3, -1, 4, -1, 5, -1, 209, -1, 205, -1, - 203, -1, 205, 203, -1, 3, -1, 4, -1, 3, - -1, 4, -1, 5, -1, 3, -1, 4, -1, -1 + 206, 206, 206, 206, -1, 84, 91, 194, 144, 51, + 91, 198, 92, 92, -1, 209, -1, 144, 58, 199, + 91, 207, 92, -1, 63, 91, 146, 92, -1, 24, + 91, 206, 206, 81, 91, 206, 206, 206, 92, 92, + -1, 24, 91, 206, 206, 206, 81, 91, 206, 206, + 206, 92, 92, -1, -1, 50, 200, 148, 91, 162, + 92, -1, -1, 74, 200, 150, 91, 162, 92, -1, + -1, 75, 200, 152, 91, 162, 92, -1, -1, 49, + 200, 154, 91, 162, 92, -1, -1, 36, 200, 156, + 91, 162, 92, -1, -1, 45, 200, 158, 91, 164, + 92, -1, -1, 44, 200, 160, 91, 165, 92, -1, + 209, -1, 161, 43, 91, 169, 92, -1, 161, 52, + 91, 170, 92, -1, 209, -1, -1, 162, 15, 208, + 91, 163, 161, 92, -1, 162, 73, 91, 166, 92, + -1, 162, 69, 91, 167, 92, -1, 162, 42, 91, + 168, 92, -1, 162, 172, -1, 162, 43, 91, 169, + 92, -1, 162, 52, 91, 170, 92, -1, 162, 7, + 91, 171, 92, -1, 162, 58, 199, 91, 207, 92, + -1, 209, -1, 164, 73, 91, 166, 92, -1, 164, + 69, 91, 167, 92, -1, 164, 42, 91, 168, 92, + -1, 164, 172, -1, 164, 43, 91, 169, 92, -1, + 164, 52, 91, 170, 92, -1, 164, 7, 91, 171, + 92, -1, 164, 47, 91, 173, 92, -1, 164, 78, + 91, 174, 92, -1, 164, 80, 91, 175, 92, -1, + 164, 159, -1, 164, 76, 91, 176, 92, -1, 164, + 58, 199, 91, 207, 92, -1, 209, -1, 165, 73, + 91, 166, 92, -1, 165, 69, 91, 167, 92, -1, + 165, 42, 91, 168, 92, -1, 165, 172, -1, 165, + 43, 91, 169, 92, -1, 165, 52, 91, 170, 92, + -1, 165, 7, 91, 171, 92, -1, 165, 47, 91, + 178, 92, -1, 165, 33, 91, 179, 92, -1, 165, + 58, 199, 91, 207, 92, -1, 196, -1, 199, -1, + 197, -1, 206, 206, 206, -1, 169, 19, 203, 91, + 206, 206, 206, 92, -1, 169, 19, 91, 203, 206, + 206, 206, 92, -1, 206, 206, 206, 206, -1, 170, + 20, 203, 91, 206, 206, 206, 206, 92, -1, 170, + 20, 91, 203, 206, 206, 206, 206, 92, -1, 208, + -1, 84, 91, 194, 51, 91, 198, 92, 92, -1, + 208, 208, -1, 195, -1, 195, -1, 209, -1, 176, + 37, 91, 177, 92, -1, 209, -1, 177, 159, -1, + 208, -1, 195, -1, -1, 64, 200, 181, 91, 184, + 92, -1, -1, 11, 200, 183, 91, 184, 92, -1, + 209, -1, 184, 180, -1, 184, 182, -1, 184, 185, + -1, 184, 188, -1, 184, 191, -1, -1, 57, 200, + 186, 91, 187, 92, -1, 209, -1, 187, 58, 199, + 91, 207, 92, -1, 187, 65, 91, 195, 92, -1, + -1, 85, 200, 189, 91, 190, 92, -1, 209, -1, + 190, 58, 199, 91, 207, 92, -1, 190, 65, 91, + 195, 92, -1, -1, 86, 200, 192, 91, 193, 92, + -1, 209, -1, 193, 58, 199, 91, 207, 92, -1, + 193, 185, -1, 209, -1, 194, 208, -1, 209, -1, + 195, 206, -1, 199, -1, 199, -1, 199, -1, 209, + -1, 203, -1, 202, -1, 209, -1, 203, -1, 209, + -1, 203, -1, 3, -1, 4, -1, 5, -1, 209, + -1, 205, -1, 203, -1, 205, 203, -1, 3, -1, + 4, -1, 3, -1, 4, -1, 5, -1, 3, -1, + 4, -1, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -738,21 +738,21 @@ static const unsigned short int yyrline[] = 1366, 1367, 1368, 1369, 1383, 1413, 1414, 1437, 1436, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1468, 1475, 1482, 1489, 1496, 1503, 1510, 1517, - 1524, 1531, 1538, 1542, 1543, 1556, 1560, 1561, 1583, 1616, - 1620, 1645, 1657, 1662, 1680, 1679, 1699, 1698, 1718, 1717, - 1737, 1736, 1756, 1755, 1775, 1774, 1794, 1793, 1813, 1814, - 1815, 1826, 1828, 1827, 1848, 1849, 1850, 1851, 1852, 1853, - 1854, 1855, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, - 1936, 1937, 1938, 1939, 1945, 1946, 2010, 2011, 2012, 2013, - 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2089, 2106, 2146, - 2163, 2167, 2175, 2193, 2197, 2205, 2223, 2239, 2270, 2288, - 2308, 2328, 2333, 2344, 2350, 2369, 2385, 2407, 2406, 2429, - 2428, 2450, 2451, 2455, 2459, 2463, 2467, 2483, 2482, 2503, - 2504, 2516, 2531, 2530, 2551, 2552, 2569, 2584, 2583, 2604, - 2605, 2620, 2635, 2639, 2653, 2657, 2671, 2692, 2713, 2739, - 2744, 2756, 2768, 2773, 2784, 2788, 2802, 2806, 2810, 2823, - 2827, 2843, 2847, 2861, 2862, 2877, 2883, 2889, 2906, 2914, - 2920 + 1524, 1531, 1538, 1542, 1543, 1555, 1559, 1560, 1582, 1615, + 1619, 1644, 1656, 1661, 1679, 1678, 1698, 1697, 1717, 1716, + 1736, 1735, 1755, 1754, 1774, 1773, 1793, 1792, 1812, 1813, + 1814, 1825, 1827, 1826, 1847, 1848, 1849, 1850, 1851, 1852, + 1853, 1854, 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, + 1935, 1936, 1937, 1938, 1944, 1945, 2009, 2010, 2011, 2012, + 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2088, 2105, 2145, + 2162, 2166, 2174, 2192, 2196, 2204, 2222, 2238, 2269, 2287, + 2307, 2327, 2332, 2343, 2349, 2368, 2384, 2406, 2405, 2428, + 2427, 2449, 2450, 2454, 2458, 2462, 2466, 2482, 2481, 2502, + 2503, 2515, 2530, 2529, 2550, 2551, 2568, 2583, 2582, 2603, + 2604, 2619, 2634, 2638, 2652, 2656, 2670, 2691, 2712, 2738, + 2743, 2755, 2767, 2772, 2783, 2787, 2801, 2805, 2809, 2822, + 2826, 2842, 2846, 2860, 2861, 2876, 2882, 2888, 2905, 2913, + 2919 }; #endif @@ -871,7 +871,7 @@ static const unsigned char yyr2[] = 2, 2, 2, 2, 1, 1, 2, 0, 5, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 6, 4, 4, 4, 4, 7, 5, - 6, 4, 4, 1, 16, 4, 1, 16, 9, 1, + 6, 4, 4, 1, 9, 4, 1, 16, 9, 1, 6, 4, 11, 12, 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, 0, 6, 1, 5, 5, 1, 0, 7, 5, 5, 5, 2, 5, 5, @@ -959,13 +959,13 @@ static const unsigned short int yydefact[] = 0, 132, 0, 0, 0, 0, 221, 0, 226, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 133, 0, 0, 220, 225, 230, 0, 0, 0, 0, - 0, 0, 67, 0, 0, 0, 51, 56, 0, 0, + 0, 0, 67, 0, 0, 0, 51, 56, 124, 0, 55, 54, 0, 0, 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 66, 65, 0, 0, 0, 0, 0, - 0, 0, 0, 69, 68, 59, 62, 0, 60, 0, - 58, 0, 0, 63, 61, 0, 0, 124, 127 + 66, 65, 0, 0, 0, 0, 0, 0, 0, 69, + 68, 59, 62, 0, 60, 0, 58, 0, 63, 61, + 0, 127 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -990,7 +990,7 @@ static const short int yydefgoto[] = #define YYPACT_NINF -402 static const short int yypact[] = { - 187, -402, -402, -402, -402, 13, 999, -402, 1263, -402, + 187, -402, -402, -402, -402, 13, 995, -402, 1259, -402, 115, -402, 255, -402, -402, -402, -402, -402, 286, -84, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, -402, -402, -402, -402, -402, @@ -1015,8 +1015,8 @@ static const short int yypact[] = -402, -402, -402, -402, -402, 325, -402, 213, -402, 328, -402, 306, -402, 60, -402, -402, 329, -402, -402, -402, 75, -402, 213, 80, -402, 213, 331, -402, -402, 327, - -402, -402, -402, 925, 1108, 1181, 373, 109, -402, 211, - -402, 146, -402, 397, 723, 121, -402, -402, 737, 796, + -402, -402, -402, 921, 1104, 1177, 373, 109, -402, 211, + -402, 146, -402, 397, 708, 121, -402, -402, 733, 747, 144, -402, 334, 335, 51, -402, -402, 213, -402, 339, 347, 350, 352, 353, 354, 356, 357, -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, @@ -1056,13 +1056,13 @@ static const short int yypact[] = 213, -402, 499, 213, 213, 500, -402, 504, -402, 505, 213, 213, 286, 507, -402, 286, 508, 213, 47, 213, -402, 213, 213, -402, -402, -402, 509, 510, 213, 213, - 213, 213, -402, 512, 92, 513, -402, 213, 213, 213, + 213, 213, -402, 512, 92, 513, -402, 213, -402, 213, -402, -402, 213, 213, 213, 213, 213, 286, 514, 213, -402, 213, 213, 213, 213, 213, 213, 213, 213, 213, - 213, 213, 213, 516, 518, 213, 213, 213, 213, 213, - 213, 213, 213, -402, -402, 520, 521, 522, 68, 73, - 523, 213, 213, -402, -402, -402, -402, 527, -402, 528, - -402, 213, 213, -402, -402, 213, 213, -402, -402 + 213, 516, 518, 213, 213, 213, 213, 213, 213, 213, + -402, -402, 520, 521, 522, 68, 73, 523, 213, -402, + -402, -402, -402, 527, -402, 528, -402, 213, -402, -402, + 213, -402 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1079,7 +1079,7 @@ static const short int yypgoto[] = -402, -402, -402, -402, -402, -402, -402, -261, -402, -402, -402, -19, -44, -402, -402, -402, -402, -402, -402, -402, -402, 436, -401, -402, -402, 170, 178, 9, -73, -402, - -6, 387, -402, 1, -165, -66, 713 + -6, 387, -402, 1, -165, -66, 709 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1105,7 +1105,7 @@ static const unsigned short int yytable[] = 575, 135, 346, 110, 451, 511, 483, 576, 272, 666, 554, 489, 135, 364, 347, 581, 346, 537, 531, 166, 533, 215, 488, 330, 625, 636, 111, 213, 638, 377, - 716, 555, 191, 516, 577, 718, 305, 317, 378, 598, + 712, 555, 191, 516, 577, 714, 305, 317, 378, 598, 556, 308, 112, 72, 584, 123, 124, 642, 347, 582, 645, 415, 242, 677, 245, 30, 66, 251, 331, 332, 26, 538, 347, 333, 628, 123, 124, 557, 334, 30, @@ -1149,81 +1149,81 @@ static const unsigned short int yytable[] = 596, 597, 601, 186, 189, 603, 606, 611, 605, 613, 617, 186, 189, 619, 621, 0, 631, 608, 610, 632, 612, 650, 653, 614, 615, 616, 654, 655, 659, 661, - 0, 670, 671, 676, 679, 689, 622, 623, 703, 626, - 704, 629, 713, 714, 715, 720, 633, 634, 643, 723, - 724, 646, 0, 640, 641, 0, 0, 644, 0, 0, + 0, 670, 671, 676, 679, 688, 622, 623, 700, 626, + 701, 629, 709, 710, 711, 716, 633, 634, 643, 718, + 719, 646, 0, 640, 641, 0, 0, 644, 0, 0, 647, 649, 0, 0, 651, 652, 658, 0, 0, 660, 0, 656, 657, 0, 0, 0, 0, 0, 662, 0, 667, 0, 668, 669, 0, 0, 0, 0, 678, 672, - 673, 674, 675, 0, 0, 0, 0, 0, 680, 681, - 682, 688, 0, 683, 684, 685, 686, 687, 0, 0, - 690, 0, 691, 692, 693, 694, 695, 696, 697, 698, - 699, 700, 701, 702, 0, 0, 705, 706, 707, 708, - 709, 710, 711, 712, 0, 0, 0, 0, 0, 717, - 719, 0, 721, 722, 7, 9, 11, 13, 0, 0, - 0, 0, 725, 726, 0, 0, 727, 728, 0, 0, - 74, 87, 0, 87, 87, 87, 87, 87, 75, 87, - 87, 87, 87, 87, 74, 87, 87, 0, 0, 0, - 0, 0, 75, 600, 0, 0, 602, 0, 0, 604, - 0, 0, 0, 0, 0, 76, 77, 0, 0, 87, - 0, 0, 0, 0, 0, 78, 0, 87, 0, 76, - 77, 79, 0, 0, 0, 0, 0, 0, 0, 78, - 0, 0, 80, 0, 0, 79, 81, 0, 0, 0, - 0, 136, 0, 74, 0, 0, 80, 82, 0, 0, - 81, 75, 0, 0, 0, 345, 0, 0, 0, 87, - 0, 82, 0, 0, 0, 0, 136, 0, 0, 357, - 0, 0, 0, 172, 0, 0, 0, 0, 76, 77, - 0, 0, 0, 0, 0, 172, 194, 0, 78, 0, - 136, 0, 0, 0, 79, 0, 0, 0, 0, 0, - 0, 136, 0, 0, 0, 80, 0, 0, 0, 81, + 673, 674, 675, 0, 0, 0, 0, 0, 680, 0, + 681, 687, 0, 682, 683, 684, 685, 686, 0, 0, + 689, 0, 690, 691, 692, 693, 694, 695, 696, 697, + 698, 699, 0, 0, 702, 703, 704, 705, 706, 707, + 708, 0, 0, 0, 0, 0, 713, 715, 0, 717, + 7, 9, 11, 13, 0, 74, 0, 0, 720, 0, + 0, 721, 0, 75, 0, 0, 0, 87, 0, 87, + 87, 87, 87, 87, 0, 87, 87, 87, 87, 87, + 74, 87, 87, 0, 0, 0, 0, 0, 75, 0, + 76, 77, 0, 600, 74, 0, 602, 0, 0, 604, + 78, 0, 75, 0, 0, 87, 79, 0, 0, 0, + 0, 0, 0, 87, 0, 76, 77, 80, 0, 0, + 0, 81, 0, 0, 0, 78, 0, 0, 0, 76, + 77, 79, 82, 0, 0, 0, 0, 136, 0, 78, + 345, 0, 80, 0, 0, 79, 81, 0, 0, 0, + 0, 0, 0, 0, 0, 87, 80, 82, 0, 0, + 81, 0, 136, 0, 0, 357, 0, 0, 0, 172, + 0, 82, 0, 0, 0, 0, 0, 0, 0, 358, + 0, 172, 194, 0, 0, 0, 136, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 82, 194, 0, 232, 235, 0, 0, 0, 358, 0, + 0, 0, 0, 0, 0, 0, 0, 194, 0, 232, + 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 9, 9, 13, 258, 260, 262, 13, 13, 266, - 0, 13, 13, 271, 136, 0, 0, 275, 15, 16, - 17, 0, 0, 54, 55, 0, 0, 0, 56, 18, - 0, 19, 0, 57, 0, 0, 0, 0, 58, 0, - 0, 304, 20, 0, 21, 0, 0, 22, 0, 0, - 23, 24, 0, 25, 0, 0, 59, 0, 0, 26, - 27, 60, 0, 0, 28, 29, 0, 0, 0, 0, - 11, 0, 0, 61, 0, 0, 0, 62, 63, 30, - 0, 64, 0, 65, 31, 0, 66, 0, 0, 32, - 33, 0, 15, 16, 17, 0, 0, 0, 34, 67, - 0, 0, 0, 18, 0, 19, 0, 313, 0, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 21, 0, - 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, - 0, 0, 0, 26, 27, 0, 0, 0, 28, 29, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, - 87, 87, 87, 30, 0, 0, 0, 0, 31, 0, - 0, 0, 0, 32, 33, 0, 0, 0, 0, 0, - 419, 422, 34, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 442, 0, 0, 0, 0, 0, 0, 0, - 0, 15, 16, 17, 0, 0, 54, 55, 461, 442, - 442, 56, 18, 0, 19, 0, 57, 0, 0, 0, - 0, 58, 0, 0, 0, 20, 0, 21, 0, 0, - 22, 0, 0, 23, 24, 0, 25, 0, 0, 59, - 0, 0, 26, 27, 60, 0, 0, 28, 29, 0, - 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, - 62, 63, 30, 0, 64, 0, 65, 31, 0, 66, - 0, 0, 32, 33, 15, 16, 17, 0, 0, 54, - 55, 34, 67, 0, 56, 18, 0, 19, 0, 57, - 314, 0, 0, 0, 58, 0, 0, 0, 20, 0, + 0, 0, 0, 0, 0, 0, 9, 9, 9, 13, + 258, 260, 262, 13, 13, 266, 0, 13, 13, 271, + 136, 0, 0, 275, 15, 16, 17, 0, 0, 54, + 55, 0, 0, 0, 56, 18, 0, 19, 0, 57, + 0, 0, 0, 0, 58, 0, 0, 304, 20, 0, 21, 0, 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, 59, 0, 0, 26, 27, 60, 0, 0, - 28, 29, 266, 549, 551, 553, 0, 0, 0, 61, + 28, 29, 0, 0, 0, 0, 11, 0, 0, 61, 0, 0, 0, 62, 63, 30, 0, 64, 0, 65, - 31, 0, 66, 0, 0, 32, 33, 0, 0, 573, - 0, 0, 0, 0, 34, 67, 15, 16, 17, 0, - 87, 54, 55, 315, 0, 0, 56, 18, 0, 19, - 0, 57, 0, 0, 0, 0, 58, 0, 0, 0, - 20, 0, 21, 0, 0, 22, 0, 0, 23, 24, - 0, 25, 0, 0, 59, 0, 0, 26, 27, 60, - 0, 0, 28, 29, 442, 0, 442, 0, 0, 0, - 0, 61, 0, 0, 0, 62, 63, 30, 0, 64, - 0, 65, 31, 0, 66, 0, 0, 32, 33, 0, - 0, 0, 0, 0, 0, 0, 34, 67 + 31, 0, 66, 0, 0, 32, 33, 0, 15, 16, + 17, 0, 0, 0, 34, 67, 0, 0, 0, 18, + 0, 19, 0, 313, 0, 0, 0, 0, 0, 0, + 0, 0, 20, 0, 21, 0, 0, 22, 0, 0, + 23, 24, 0, 25, 0, 0, 0, 0, 0, 26, + 27, 0, 0, 0, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 87, 87, 87, 87, 30, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 32, + 33, 0, 0, 0, 0, 0, 419, 422, 34, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 442, 0, + 0, 0, 0, 0, 0, 0, 0, 15, 16, 17, + 0, 0, 54, 55, 461, 442, 442, 56, 18, 0, + 19, 0, 57, 0, 0, 0, 0, 58, 0, 0, + 0, 20, 0, 21, 0, 0, 22, 0, 0, 23, + 24, 0, 25, 0, 0, 59, 0, 0, 26, 27, + 60, 0, 0, 28, 29, 0, 0, 0, 0, 0, + 0, 0, 61, 0, 0, 0, 62, 63, 30, 0, + 64, 0, 65, 31, 0, 66, 0, 0, 32, 33, + 15, 16, 17, 0, 0, 54, 55, 34, 67, 0, + 56, 18, 0, 19, 0, 57, 314, 0, 0, 0, + 58, 0, 0, 0, 20, 0, 21, 0, 0, 22, + 0, 0, 23, 24, 0, 25, 0, 0, 59, 0, + 0, 26, 27, 60, 0, 0, 28, 29, 266, 549, + 551, 553, 0, 0, 0, 61, 0, 0, 0, 62, + 63, 30, 0, 64, 0, 65, 31, 0, 66, 0, + 0, 32, 33, 0, 0, 573, 0, 0, 0, 0, + 34, 67, 15, 16, 17, 0, 87, 54, 55, 315, + 0, 0, 56, 18, 0, 19, 0, 57, 0, 0, + 0, 0, 58, 0, 0, 0, 20, 0, 21, 0, + 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, + 59, 0, 0, 26, 27, 60, 0, 0, 28, 29, + 442, 0, 442, 0, 0, 0, 0, 61, 0, 0, + 0, 62, 63, 30, 0, 64, 0, 65, 31, 0, + 66, 0, 0, 32, 33, 0, 0, 0, 0, 0, + 0, 0, 34, 67 }; static const short int yycheck[] = @@ -1294,75 +1294,75 @@ static const short int yycheck[] = 629, 630, -1, -1, 633, 634, 642, -1, -1, 645, -1, 640, 641, -1, -1, -1, -1, -1, 647, -1, 649, -1, 651, 652, -1, -1, -1, -1, 664, 658, - 659, 660, 661, -1, -1, -1, -1, -1, 667, 668, + 659, 660, 661, -1, -1, -1, -1, -1, 667, -1, 669, 677, -1, 672, 673, 674, 675, 676, -1, -1, 679, -1, 681, 682, 683, 684, 685, 686, 687, 688, - 689, 690, 691, 692, -1, -1, 695, 696, 697, 698, - 699, 700, 701, 702, -1, -1, -1, -1, -1, 708, - 709, -1, 711, 712, 1, 2, 3, 4, -1, -1, - -1, -1, 721, 722, -1, -1, 725, 726, -1, -1, - 7, 18, -1, 20, 21, 22, 23, 24, 15, 26, - 27, 28, 29, 30, 7, 32, 33, -1, -1, -1, - -1, -1, 15, 575, -1, -1, 578, -1, -1, 581, - -1, -1, -1, -1, -1, 42, 43, -1, -1, 56, - -1, -1, -1, -1, -1, 52, -1, 64, -1, 42, - 43, 58, -1, -1, -1, -1, -1, -1, -1, 52, - -1, -1, 69, -1, -1, 58, 73, -1, -1, -1, - -1, 88, -1, 7, -1, -1, 69, 84, -1, -1, - 73, 15, -1, -1, -1, 92, -1, -1, -1, 106, - -1, 84, -1, -1, -1, -1, 113, -1, -1, 92, - -1, -1, -1, 120, -1, -1, -1, -1, 42, 43, - -1, -1, -1, -1, -1, 132, 133, -1, 52, -1, - 137, -1, -1, -1, 58, -1, -1, -1, -1, -1, - -1, 148, -1, -1, -1, 69, -1, -1, -1, 73, + 689, 690, -1, -1, 693, 694, 695, 696, 697, 698, + 699, -1, -1, -1, -1, -1, 705, 706, -1, 708, + 1, 2, 3, 4, -1, 7, -1, -1, 717, -1, + -1, 720, -1, 15, -1, -1, -1, 18, -1, 20, + 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, + 7, 32, 33, -1, -1, -1, -1, -1, 15, -1, + 42, 43, -1, 575, 7, -1, 578, -1, -1, 581, + 52, -1, 15, -1, -1, 56, 58, -1, -1, -1, + -1, -1, -1, 64, -1, 42, 43, 69, -1, -1, + -1, 73, -1, -1, -1, 52, -1, -1, -1, 42, + 43, 58, 84, -1, -1, -1, -1, 88, -1, 52, + 92, -1, 69, -1, -1, 58, 73, -1, -1, -1, + -1, -1, -1, -1, -1, 106, 69, 84, -1, -1, + 73, -1, 113, -1, -1, 92, -1, -1, -1, 120, + -1, 84, -1, -1, -1, -1, -1, -1, -1, 92, + -1, 132, 133, -1, -1, -1, 137, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 148, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 84, 168, -1, 170, 171, -1, -1, -1, 92, -1, + -1, -1, -1, -1, -1, -1, -1, 168, -1, 170, + 171, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - -1, 208, 209, 210, 211, -1, -1, 214, 3, 4, - 5, -1, -1, 8, 9, -1, -1, -1, 13, 14, - -1, 16, -1, 18, -1, -1, -1, -1, 23, -1, - -1, 238, 27, -1, 29, -1, -1, 32, -1, -1, - 35, 36, -1, 38, -1, -1, 41, -1, -1, 44, - 45, 46, -1, -1, 49, 50, -1, -1, -1, -1, - 267, -1, -1, 58, -1, -1, -1, 62, 63, 64, - -1, 66, -1, 68, 69, -1, 71, -1, -1, 74, - 75, -1, 3, 4, 5, -1, -1, -1, 83, 84, - -1, -1, -1, 14, -1, 16, -1, 92, -1, -1, - -1, -1, -1, -1, -1, -1, 27, -1, 29, -1, - -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, - -1, -1, -1, 44, 45, -1, -1, -1, 49, 50, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 346, - 347, 348, 349, 64, -1, -1, -1, -1, 69, -1, - -1, -1, -1, 74, 75, -1, -1, -1, -1, -1, - 367, 368, 83, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 389, -1, -1, -1, -1, -1, -1, -1, - -1, 3, 4, 5, -1, -1, 8, 9, 405, 406, - 407, 13, 14, -1, 16, -1, 18, -1, -1, -1, - -1, 23, -1, -1, -1, 27, -1, 29, -1, -1, - 32, -1, -1, 35, 36, -1, 38, -1, -1, 41, - -1, -1, 44, 45, 46, -1, -1, 49, 50, -1, - -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, - 62, 63, 64, -1, 66, -1, 68, 69, -1, 71, - -1, -1, 74, 75, 3, 4, 5, -1, -1, 8, - 9, 83, 84, -1, 13, 14, -1, 16, -1, 18, - 92, -1, -1, -1, 23, -1, -1, -1, 27, -1, + -1, -1, -1, -1, -1, -1, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, -1, 208, 209, 210, + 211, -1, -1, 214, 3, 4, 5, -1, -1, 8, + 9, -1, -1, -1, 13, 14, -1, 16, -1, 18, + -1, -1, -1, -1, 23, -1, -1, 238, 27, -1, 29, -1, -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, 41, -1, -1, 44, 45, 46, -1, -1, - 49, 50, 519, 520, 521, 522, -1, -1, -1, 58, + 49, 50, -1, -1, -1, -1, 267, -1, -1, 58, -1, -1, -1, 62, 63, 64, -1, 66, -1, 68, - 69, -1, 71, -1, -1, 74, 75, -1, -1, 546, - -1, -1, -1, -1, 83, 84, 3, 4, 5, -1, - 557, 8, 9, 92, -1, -1, 13, 14, -1, 16, - -1, 18, -1, -1, -1, -1, 23, -1, -1, -1, - 27, -1, 29, -1, -1, 32, -1, -1, 35, 36, - -1, 38, -1, -1, 41, -1, -1, 44, 45, 46, - -1, -1, 49, 50, 601, -1, 603, -1, -1, -1, - -1, 58, -1, -1, -1, 62, 63, 64, -1, 66, - -1, 68, 69, -1, 71, -1, -1, 74, 75, -1, - -1, -1, -1, -1, -1, -1, 83, 84 + 69, -1, 71, -1, -1, 74, 75, -1, 3, 4, + 5, -1, -1, -1, 83, 84, -1, -1, -1, 14, + -1, 16, -1, 92, -1, -1, -1, -1, -1, -1, + -1, -1, 27, -1, 29, -1, -1, 32, -1, -1, + 35, 36, -1, 38, -1, -1, -1, -1, -1, 44, + 45, -1, -1, -1, 49, 50, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 346, 347, 348, 349, 64, + -1, -1, -1, -1, 69, -1, -1, -1, -1, 74, + 75, -1, -1, -1, -1, -1, 367, 368, 83, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 389, -1, + -1, -1, -1, -1, -1, -1, -1, 3, 4, 5, + -1, -1, 8, 9, 405, 406, 407, 13, 14, -1, + 16, -1, 18, -1, -1, -1, -1, 23, -1, -1, + -1, 27, -1, 29, -1, -1, 32, -1, -1, 35, + 36, -1, 38, -1, -1, 41, -1, -1, 44, 45, + 46, -1, -1, 49, 50, -1, -1, -1, -1, -1, + -1, -1, 58, -1, -1, -1, 62, 63, 64, -1, + 66, -1, 68, 69, -1, 71, -1, -1, 74, 75, + 3, 4, 5, -1, -1, 8, 9, 83, 84, -1, + 13, 14, -1, 16, -1, 18, 92, -1, -1, -1, + 23, -1, -1, -1, 27, -1, 29, -1, -1, 32, + -1, -1, 35, 36, -1, 38, -1, -1, 41, -1, + -1, 44, 45, 46, -1, -1, 49, 50, 519, 520, + 521, 522, -1, -1, -1, 58, -1, -1, -1, 62, + 63, 64, -1, 66, -1, 68, 69, -1, 71, -1, + -1, 74, 75, -1, -1, 546, -1, -1, -1, -1, + 83, 84, 3, 4, 5, -1, 557, 8, 9, 92, + -1, -1, 13, 14, -1, 16, -1, 18, -1, -1, + -1, -1, 23, -1, -1, -1, 27, -1, 29, -1, + -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, + 41, -1, -1, 44, 45, 46, -1, -1, 49, 50, + 601, -1, 603, -1, -1, -1, -1, 58, -1, -1, + -1, 62, 63, 64, -1, 66, -1, 68, 69, -1, + 71, -1, -1, 74, 75, -1, -1, -1, -1, -1, + -1, -1, 83, 84 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1437,11 +1437,11 @@ static const unsigned char yystos[] = 92, 206, 206, 92, 92, 92, 206, 206, 203, 91, 203, 91, 206, 10, 21, 67, 92, 206, 206, 206, 92, 92, 206, 206, 206, 206, 91, 91, 203, 91, - 206, 206, 206, 206, 206, 206, 206, 206, 203, 91, + 206, 206, 206, 206, 206, 206, 206, 203, 91, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, - 206, 206, 206, 92, 92, 206, 206, 206, 206, 206, - 206, 206, 206, 92, 92, 92, 92, 206, 92, 206, - 92, 206, 206, 92, 92, 206, 206, 206, 206 + 92, 92, 206, 206, 206, 206, 206, 206, 206, 92, + 92, 92, 92, 206, 92, 206, 92, 206, 92, 92, + 206, 206 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -3293,17 +3293,17 @@ yyreduce: break; case 124: -#line 1547 "parser.yxx" +#line 1546 "parser.yxx" { egg_stack.back()->as_transform()->add_matrix3 - (LMatrix3d((yyvsp[-15]._number), (yyvsp[-14]._number), (yyvsp[-13]._number), - (yyvsp[-12]._number), (yyvsp[-11]._number), (yyvsp[-10]._number), - (yyvsp[-9]._number), (yyvsp[-8]._number), (yyvsp[-7]._number))); + (LMatrix3d((yyvsp[-8]._number), (yyvsp[-7]._number), (yyvsp[-6]._number), + (yyvsp[-5]._number), (yyvsp[-4]._number), (yyvsp[-3]._number), + (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 127: -#line 1565 "parser.yxx" +#line 1564 "parser.yxx" { egg_stack.back()->as_transform()->add_matrix4 (LMatrix4d((yyvsp[-15]._number), (yyvsp[-14]._number), (yyvsp[-13]._number), (yyvsp[-12]._number), @@ -3314,7 +3314,7 @@ yyreduce: break; case 128: -#line 1584 "parser.yxx" +#line 1583 "parser.yxx" { if ((yyvsp[-2]._egg) != (EggVertexPool *)NULL) { EggVertexPool *pool = DCAST(EggVertexPool, (yyvsp[-2]._egg)); @@ -3339,14 +3339,14 @@ yyreduce: break; case 129: -#line 1617 "parser.yxx" +#line 1616 "parser.yxx" { (yyval._number) = 1.0; } break; case 130: -#line 1621 "parser.yxx" +#line 1620 "parser.yxx" { string name = (yyvsp[-3]._string); double value = (yyvsp[-1]._number); @@ -3363,7 +3363,7 @@ yyreduce: break; case 132: -#line 1658 "parser.yxx" +#line 1657 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); group->set_lod(EggSwitchConditionDistance((yyvsp[-8]._number), (yyvsp[-7]._number), LPoint3d((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number)))); @@ -3371,7 +3371,7 @@ yyreduce: break; case 133: -#line 1663 "parser.yxx" +#line 1662 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); group->set_lod(EggSwitchConditionDistance((yyvsp[-9]._number), (yyvsp[-8]._number), LPoint3d((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number)), (yyvsp[-7]._number))); @@ -3379,14 +3379,14 @@ yyreduce: break; case 134: -#line 1680 "parser.yxx" +#line 1679 "parser.yxx" { egg_stack.push_back(new EggPolygon((yyvsp[0]._string))); } break; case 135: -#line 1684 "parser.yxx" +#line 1683 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3394,14 +3394,14 @@ yyreduce: break; case 136: -#line 1699 "parser.yxx" +#line 1698 "parser.yxx" { egg_stack.push_back(new EggTriangleFan((yyvsp[0]._string))); } break; case 137: -#line 1703 "parser.yxx" +#line 1702 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3409,14 +3409,14 @@ yyreduce: break; case 138: -#line 1718 "parser.yxx" +#line 1717 "parser.yxx" { egg_stack.push_back(new EggTriangleStrip((yyvsp[0]._string))); } break; case 139: -#line 1722 "parser.yxx" +#line 1721 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3424,14 +3424,14 @@ yyreduce: break; case 140: -#line 1737 "parser.yxx" +#line 1736 "parser.yxx" { egg_stack.push_back(new EggPoint((yyvsp[0]._string))); } break; case 141: -#line 1741 "parser.yxx" +#line 1740 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3439,14 +3439,14 @@ yyreduce: break; case 142: -#line 1756 "parser.yxx" +#line 1755 "parser.yxx" { egg_stack.push_back(new EggLine((yyvsp[0]._string))); } break; case 143: -#line 1760 "parser.yxx" +#line 1759 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3454,14 +3454,14 @@ yyreduce: break; case 144: -#line 1775 "parser.yxx" +#line 1774 "parser.yxx" { egg_stack.push_back(new EggNurbsSurface((yyvsp[0]._string))); } break; case 145: -#line 1779 "parser.yxx" +#line 1778 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3469,14 +3469,14 @@ yyreduce: break; case 146: -#line 1794 "parser.yxx" +#line 1793 "parser.yxx" { egg_stack.push_back(new EggNurbsCurve((yyvsp[0]._string))); } break; case 147: -#line 1798 "parser.yxx" +#line 1797 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3484,7 +3484,7 @@ yyreduce: break; case 152: -#line 1828 "parser.yxx" +#line 1827 "parser.yxx" { if (!egg_stack.back()->is_of_type(EggCompositePrimitive::get_class_type())) { eggyyerror("Not a composite primitive; components are not allowed here."); @@ -3501,7 +3501,7 @@ yyreduce: break; case 153: -#line 1842 "parser.yxx" +#line 1841 "parser.yxx" { PT(EggPrimitive) prim = DCAST(EggPrimitive, egg_stack.back()); egg_stack.pop_back(); @@ -3511,7 +3511,7 @@ yyreduce: break; case 161: -#line 1856 "parser.yxx" +#line 1855 "parser.yxx" { EggPrimitive *primitive = DCAST(EggPrimitive, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -3577,7 +3577,7 @@ yyreduce: break; case 173: -#line 1940 "parser.yxx" +#line 1939 "parser.yxx" { EggNurbsCurve *curve = DCAST(EggNurbsCurve, (yyvsp[0]._egg)); EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); @@ -3586,7 +3586,7 @@ yyreduce: break; case 175: -#line 1947 "parser.yxx" +#line 1946 "parser.yxx" { EggNurbsSurface *primitive = DCAST(EggNurbsSurface, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -3642,7 +3642,7 @@ yyreduce: break; case 186: -#line 2021 "parser.yxx" +#line 2020 "parser.yxx" { EggNurbsCurve *primitive = DCAST(EggNurbsCurve, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -3704,7 +3704,7 @@ yyreduce: break; case 187: -#line 2090 "parser.yxx" +#line 2089 "parser.yxx" { if ((yyvsp[0]._egg) != (EggTexture *)NULL) { EggTexture *texture = DCAST(EggTexture, (yyvsp[0]._egg)); @@ -3714,7 +3714,7 @@ yyreduce: break; case 188: -#line 2107 "parser.yxx" +#line 2106 "parser.yxx" { EggTexture *texture = NULL; @@ -3747,7 +3747,7 @@ yyreduce: break; case 189: -#line 2147 "parser.yxx" +#line 2146 "parser.yxx" { if ((yyvsp[0]._egg) != (EggMaterial *)NULL) { EggMaterial *material = DCAST(EggMaterial, (yyvsp[0]._egg)); @@ -3757,14 +3757,14 @@ yyreduce: break; case 190: -#line 2164 "parser.yxx" +#line 2163 "parser.yxx" { DCAST(EggPrimitive, egg_stack.back())->set_normal(Normald((yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 191: -#line 2168 "parser.yxx" +#line 2167 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_dnormals. insert(EggMorphNormal((yyvsp[-5]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; @@ -3775,7 +3775,7 @@ yyreduce: break; case 192: -#line 2176 "parser.yxx" +#line 2175 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_dnormals. insert(EggMorphNormal((yyvsp[-4]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; @@ -3786,14 +3786,14 @@ yyreduce: break; case 193: -#line 2194 "parser.yxx" +#line 2193 "parser.yxx" { DCAST(EggPrimitive, egg_stack.back())->set_color(Colorf((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 194: -#line 2198 "parser.yxx" +#line 2197 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_drgbas. insert(EggMorphColor((yyvsp[-6]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; @@ -3804,7 +3804,7 @@ yyreduce: break; case 195: -#line 2206 "parser.yxx" +#line 2205 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_drgbas. insert(EggMorphColor((yyvsp[-5]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; @@ -3815,7 +3815,7 @@ yyreduce: break; case 196: -#line 2224 "parser.yxx" +#line 2223 "parser.yxx" { EggPrimitive *primitive = DCAST(EggPrimitive, egg_stack.back()); int value = (int)(yyvsp[0]._number); @@ -3824,7 +3824,7 @@ yyreduce: break; case 197: -#line 2240 "parser.yxx" +#line 2239 "parser.yxx" { if ((yyvsp[-2]._egg) != (EggVertexPool *)NULL) { EggVertexPool *pool = DCAST(EggVertexPool, (yyvsp[-2]._egg)); @@ -3848,7 +3848,7 @@ yyreduce: break; case 198: -#line 2271 "parser.yxx" +#line 2270 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); int u_order = (int)(yyvsp[-1]._number); @@ -3859,7 +3859,7 @@ yyreduce: break; case 199: -#line 2289 "parser.yxx" +#line 2288 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); PTA_double nums = (yyvsp[0]._number_list); @@ -3872,7 +3872,7 @@ yyreduce: break; case 200: -#line 2309 "parser.yxx" +#line 2308 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); PTA_double nums = (yyvsp[0]._number_list); @@ -3885,7 +3885,7 @@ yyreduce: break; case 201: -#line 2329 "parser.yxx" +#line 2328 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nurbs->_trims.push_back(EggNurbsSurface::Trim()); @@ -3893,7 +3893,7 @@ yyreduce: break; case 203: -#line 2345 "parser.yxx" +#line 2344 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nassertr(!nurbs->_trims.empty(), 0); @@ -3902,7 +3902,7 @@ yyreduce: break; case 204: -#line 2351 "parser.yxx" +#line 2350 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nassertr(!nurbs->_trims.empty(), 0); @@ -3913,7 +3913,7 @@ yyreduce: break; case 205: -#line 2370 "parser.yxx" +#line 2369 "parser.yxx" { EggNurbsCurve *nurbs = DCAST(EggNurbsCurve, egg_stack.back()); int order = (int)(yyvsp[0]._number); @@ -3922,7 +3922,7 @@ yyreduce: break; case 206: -#line 2386 "parser.yxx" +#line 2385 "parser.yxx" { EggNurbsCurve *nurbs = DCAST(EggNurbsCurve, egg_stack.back()); PTA_double nums = (yyvsp[0]._number_list); @@ -3935,7 +3935,7 @@ yyreduce: break; case 207: -#line 2407 "parser.yxx" +#line 2406 "parser.yxx" { EggTable *table = new EggTable((yyvsp[0]._string)); table->set_table_type(EggTable::TT_table); @@ -3944,7 +3944,7 @@ yyreduce: break; case 208: -#line 2413 "parser.yxx" +#line 2412 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3952,7 +3952,7 @@ yyreduce: break; case 209: -#line 2429 "parser.yxx" +#line 2428 "parser.yxx" { EggTable *table = new EggTable((yyvsp[0]._string)); table->set_table_type(EggTable::TT_bundle); @@ -3961,7 +3961,7 @@ yyreduce: break; case 210: -#line 2435 "parser.yxx" +#line 2434 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -3969,42 +3969,42 @@ yyreduce: break; case 212: -#line 2452 "parser.yxx" +#line 2451 "parser.yxx" { DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 213: -#line 2456 "parser.yxx" +#line 2455 "parser.yxx" { DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 214: -#line 2460 "parser.yxx" +#line 2459 "parser.yxx" { DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 215: -#line 2464 "parser.yxx" +#line 2463 "parser.yxx" { DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 216: -#line 2468 "parser.yxx" +#line 2467 "parser.yxx" { DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 217: -#line 2483 "parser.yxx" +#line 2482 "parser.yxx" { EggSAnimData *anim_data = new EggSAnimData((yyvsp[0]._string)); egg_stack.push_back(anim_data); @@ -4012,7 +4012,7 @@ yyreduce: break; case 218: -#line 2488 "parser.yxx" +#line 2487 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -4020,7 +4020,7 @@ yyreduce: break; case 220: -#line 2505 "parser.yxx" +#line 2504 "parser.yxx" { EggSAnimData *anim_data = DCAST(EggSAnimData, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -4035,14 +4035,14 @@ yyreduce: break; case 221: -#line 2517 "parser.yxx" +#line 2516 "parser.yxx" { DCAST(EggSAnimData, egg_stack.back())->set_data((yyvsp[-1]._number_list)); } break; case 222: -#line 2531 "parser.yxx" +#line 2530 "parser.yxx" { EggXfmAnimData *anim_data = new EggXfmAnimData((yyvsp[0]._string)); egg_stack.push_back(anim_data); @@ -4050,7 +4050,7 @@ yyreduce: break; case 223: -#line 2536 "parser.yxx" +#line 2535 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -4058,7 +4058,7 @@ yyreduce: break; case 225: -#line 2553 "parser.yxx" +#line 2552 "parser.yxx" { EggXfmAnimData *anim_data = DCAST(EggXfmAnimData, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -4078,14 +4078,14 @@ yyreduce: break; case 226: -#line 2570 "parser.yxx" +#line 2569 "parser.yxx" { DCAST(EggXfmAnimData, egg_stack.back())->set_data((yyvsp[-1]._number_list)); } break; case 227: -#line 2584 "parser.yxx" +#line 2583 "parser.yxx" { EggXfmSAnim *anim_group = new EggXfmSAnim((yyvsp[0]._string)); egg_stack.push_back(anim_group); @@ -4093,7 +4093,7 @@ yyreduce: break; case 228: -#line 2589 "parser.yxx" +#line 2588 "parser.yxx" { (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); @@ -4101,7 +4101,7 @@ yyreduce: break; case 230: -#line 2606 "parser.yxx" +#line 2605 "parser.yxx" { EggXfmSAnim *anim_group = DCAST(EggXfmSAnim, egg_stack.back()); string name = (yyvsp[-3]._string); @@ -4119,42 +4119,42 @@ yyreduce: break; case 231: -#line 2621 "parser.yxx" +#line 2620 "parser.yxx" { DCAST(EggXfmSAnim, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 232: -#line 2636 "parser.yxx" +#line 2635 "parser.yxx" { (yyval._number_list) = PTA_double::empty_array(0); } break; case 233: -#line 2640 "parser.yxx" +#line 2639 "parser.yxx" { (yyval._number_list).push_back((double)(yyvsp[0]._number)); } break; case 234: -#line 2654 "parser.yxx" +#line 2653 "parser.yxx" { (yyval._number_list) = PTA_double::empty_array(0); } break; case 235: -#line 2658 "parser.yxx" +#line 2657 "parser.yxx" { (yyval._number_list).push_back((yyvsp[0]._number)); } break; case 236: -#line 2672 "parser.yxx" +#line 2671 "parser.yxx" { string name = (yyvsp[0]._string); Textures::iterator vpi = textures.find(name); @@ -4168,7 +4168,7 @@ yyreduce: break; case 237: -#line 2693 "parser.yxx" +#line 2692 "parser.yxx" { string name = (yyvsp[0]._string); Materials::iterator vpi = materials.find(name); @@ -4182,7 +4182,7 @@ yyreduce: break; case 238: -#line 2714 "parser.yxx" +#line 2713 "parser.yxx" { string name = (yyvsp[0]._string); VertexPools::iterator vpi = vertex_pools.find(name); @@ -4200,7 +4200,7 @@ yyreduce: break; case 239: -#line 2740 "parser.yxx" +#line 2739 "parser.yxx" { eggyyerror("Name required."); (yyval._string) = ""; @@ -4208,7 +4208,7 @@ yyreduce: break; case 242: -#line 2769 "parser.yxx" +#line 2768 "parser.yxx" { eggyyerror("String required."); (yyval._string) = ""; @@ -4216,63 +4216,63 @@ yyreduce: break; case 244: -#line 2785 "parser.yxx" +#line 2784 "parser.yxx" { (yyval._string) = ""; } break; case 246: -#line 2803 "parser.yxx" +#line 2802 "parser.yxx" { (yyval._string) = (yyvsp[0]._string); } break; case 247: -#line 2807 "parser.yxx" +#line 2806 "parser.yxx" { (yyval._string) = (yyvsp[0]._string); } break; case 249: -#line 2824 "parser.yxx" +#line 2823 "parser.yxx" { (yyval._string) = ""; } break; case 250: -#line 2828 "parser.yxx" +#line 2827 "parser.yxx" { (yyval._string) = (yyvsp[0]._string); } break; case 251: -#line 2844 "parser.yxx" +#line 2843 "parser.yxx" { (yyval._string) = (yyvsp[0]._string); } break; case 252: -#line 2848 "parser.yxx" +#line 2847 "parser.yxx" { (yyval._string) = (yyvsp[-1]._string) + "\n" + (yyvsp[0]._string); } break; case 254: -#line 2863 "parser.yxx" +#line 2862 "parser.yxx" { (yyval._number) = (yyvsp[0]._ulong); } break; case 255: -#line 2878 "parser.yxx" +#line 2877 "parser.yxx" { (yyval._number) = (yyvsp[0]._number); (yyval._ulong) = (unsigned long)(yyvsp[0]._number); @@ -4281,7 +4281,7 @@ yyreduce: break; case 256: -#line 2884 "parser.yxx" +#line 2883 "parser.yxx" { (yyval._number) = (yyvsp[0]._ulong); (yyval._ulong) = (yyvsp[0]._ulong); @@ -4290,7 +4290,7 @@ yyreduce: break; case 257: -#line 2890 "parser.yxx" +#line 2889 "parser.yxx" { (yyval._number) = 0.0; (yyval._ulong) = 0; @@ -4299,7 +4299,7 @@ yyreduce: break; case 258: -#line 2907 "parser.yxx" +#line 2906 "parser.yxx" { int i = (int)(yyvsp[0]._number); if ((double)i != (yyvsp[0]._number)) { @@ -4310,7 +4310,7 @@ yyreduce: break; case 259: -#line 2915 "parser.yxx" +#line 2914 "parser.yxx" { (yyval._number) = (yyvsp[0]._ulong); } diff --git a/panda/src/egg/parser.yxx b/panda/src/egg/parser.yxx index b836c6c390..db6bb02e6a 100644 --- a/panda/src/egg/parser.yxx +++ b/panda/src/egg/parser.yxx @@ -1540,10 +1540,9 @@ matrix3: matrix3_body: empty - | real real real real - real real real real - real real real real - real real real real + | real real real + real real real + real real real { egg_stack.back()->as_transform()->add_matrix3 (LMatrix3d($1, $2, $3,