diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-02-08 09:41:55 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-02-08 09:41:55 -0500 |
| commit | af38cbf2ebf9c009fcea81cc316be64176da620e (patch) | |
| tree | 28d6975bf5f1c4b7b89a5c24d2e1d9f1a2ba633c /cpp/src/Slice/Grammar.cpp | |
| parent | Added wide char overloads of Ice::createProperties & Ice::initialize (diff) | |
| download | ice-af38cbf2ebf9c009fcea81cc316be64176da620e.tar.bz2 ice-af38cbf2ebf9c009fcea81cc316be64176da620e.tar.xz ice-af38cbf2ebf9c009fcea81cc316be64176da620e.zip | |
Make Slice enums scoped
Add new cpp:scoped and objc:scoped metadata directives
Diffstat (limited to 'cpp/src/Slice/Grammar.cpp')
| -rw-r--r-- | cpp/src/Slice/Grammar.cpp | 1674 |
1 files changed, 884 insertions, 790 deletions
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp index af37d694387..c81edc0c8b8 100644 --- a/cpp/src/Slice/Grammar.cpp +++ b/cpp/src/Slice/Grammar.cpp @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -68,7 +68,7 @@ /* Copy the first part of user declarations. */ -#line 1 "../Slice/Grammar.y" /* yacc.c:339 */ +#line 1 "src/Slice/Grammar.y" /* yacc.c:339 */ // ********************************************************************** @@ -120,7 +120,7 @@ slice_error(const char* s) } -#line 124 "Grammar.tab.c" /* yacc.c:339 */ +#line 124 "src/Slice/Grammar.cpp" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -139,9 +139,9 @@ slice_error(const char* s) #endif /* In a future release of Bison, this section will be replaced - by #include "Grammar.tab.h". */ -#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED -# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED + by #include "Grammar.hpp". */ +#ifndef YY_SLICE_SRC_SLICE_GRAMMAR_HPP_INCLUDED +# define YY_SLICE_SRC_SLICE_GRAMMAR_HPP_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -212,11 +212,11 @@ typedef int YYSTYPE; int slice_parse (void); -#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED */ +#endif /* !YY_SLICE_SRC_SLICE_GRAMMAR_HPP_INCLUDED */ /* Copy the second part of user declarations. */ -#line 220 "Grammar.tab.c" /* yacc.c:358 */ +#line 220 "src/Slice/Grammar.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -458,16 +458,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 13 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 920 +#define YYLAST 954 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 55 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 72 +#define YYNNTS 73 /* YYNRULES -- Number of rules. */ -#define YYNRULES 205 +#define YYNRULES 206 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 304 +#define YYNSTATES 305 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -522,23 +522,23 @@ static const yytype_uint16 yyrline[] = 165, 164, 169, 174, 181, 185, 189, 193, 197, 201, 205, 209, 213, 217, 221, 225, 229, 239, 238, 272, 276, 287, 298, 297, 324, 333, 341, 350, 353, 358, - 365, 378, 398, 454, 462, 475, 483, 498, 504, 508, - 519, 530, 529, 571, 580, 583, 588, 595, 601, 605, - 616, 641, 706, 718, 732, 731, 771, 806, 814, 819, - 827, 836, 839, 844, 851, 873, 900, 922, 948, 957, - 968, 977, 986, 996, 1010, 1016, 1024, 1036, 1060, 1085, - 1109, 1140, 1139, 1162, 1161, 1184, 1185, 1191, 1195, 1206, - 1221, 1220, 1255, 1290, 1325, 1330, 1340, 1345, 1353, 1362, - 1365, 1370, 1377, 1383, 1390, 1402, 1414, 1425, 1434, 1449, - 1460, 1477, 1481, 1493, 1492, 1516, 1531, 1537, 1545, 1557, - 1580, 1588, 1597, 1601, 1640, 1647, 1658, 1660, 1676, 1692, - 1704, 1716, 1727, 1743, 1748, 1756, 1759, 1765, 1778, 1782, - 1786, 1790, 1794, 1798, 1802, 1806, 1810, 1814, 1818, 1822, - 1826, 1845, 1886, 1892, 1900, 1907, 1919, 1926, 1936, 1949, - 1962, 2008, 2019, 2030, 2046, 2055, 2069, 2072, 2075, 2078, - 2081, 2084, 2087, 2090, 2093, 2096, 2099, 2102, 2105, 2108, - 2111, 2114, 2117, 2120, 2123, 2126, 2129, 2132, 2135, 2138, - 2141, 2144, 2147, 2150, 2153, 2156 + 365, 378, 398, 491, 499, 512, 520, 535, 541, 545, + 556, 567, 566, 608, 617, 620, 625, 632, 638, 642, + 653, 678, 780, 792, 806, 805, 845, 880, 888, 893, + 901, 910, 913, 918, 925, 947, 974, 996, 1022, 1031, + 1042, 1051, 1060, 1070, 1084, 1090, 1098, 1110, 1134, 1159, + 1183, 1214, 1213, 1236, 1235, 1258, 1259, 1265, 1269, 1280, + 1295, 1294, 1329, 1364, 1399, 1404, 1414, 1419, 1427, 1436, + 1439, 1444, 1451, 1457, 1464, 1476, 1488, 1499, 1508, 1523, + 1534, 1551, 1555, 1567, 1566, 1599, 1598, 1617, 1623, 1631, + 1643, 1663, 1671, 1680, 1684, 1723, 1730, 1741, 1743, 1759, + 1775, 1787, 1799, 1810, 1826, 1831, 1839, 1842, 1848, 1861, + 1865, 1869, 1873, 1877, 1881, 1885, 1889, 1893, 1897, 1901, + 1905, 1909, 1928, 1969, 1975, 1983, 1990, 2002, 2009, 2019, + 2032, 2045, 2092, 2103, 2114, 2130, 2139, 2153, 2156, 2159, + 2162, 2165, 2168, 2171, 2174, 2177, 2180, 2183, 2186, 2189, + 2192, 2195, 2198, 2201, 2204, 2207, 2210, 2213, 2216, 2219, + 2222, 2225, 2228, 2231, 2234, 2237, 2240 }; #endif @@ -571,7 +571,7 @@ static const char *const yytname[] = "interface_id", "interface_decl", "interface_def", "@10", "interface_list", "interface_extends", "interface_exports", "interface_export", "exception_list", "exception", "sequence_def", - "dictionary_def", "enum_id", "enum_def", "@11", "enumerator_list", + "dictionary_def", "enum_id", "enum_def", "@11", "@12", "enumerator_list", "enumerator", "enumerator_initializer", "out_qualifier", "parameters", "throws", "scoped_name", "type", "string_literal", "string_list", "local_qualifier", "const_initializer", "const_def", "keyword", YY_NULLPTR @@ -592,12 +592,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -221 +#define YYPACT_NINF -214 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-221))) + (!!((Yystate) == (-214))) -#define YYTABLE_NINF -137 +#define YYTABLE_NINF -138 #define yytable_value_is_error(Yytable_value) \ 0 @@ -606,37 +606,37 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 523, -16, 2, 2, 34, -221, 19, -221, -221, 2, - -221, 24, -15, -221, 115, 43, -221, 40, 39, -221, - -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, - -221, 124, -221, 115, -221, -221, 2, -221, -221, -221, - 221, 65, 601, 669, 701, 733, 60, 61, 488, 3, - 79, 9, 123, 4, -221, -221, -221, 89, -221, -221, - -221, -221, -221, -221, -221, -221, 83, -221, -221, 104, - -221, 6, -10, 115, -221, -221, -221, -221, -221, -221, - -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, - -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, - -221, -221, -221, -221, -221, -1, -221, -221, -221, -221, - -221, -221, -221, 40, 40, -221, 765, -221, 46, -221, - 93, 46, 130, 59, -221, 100, 442, -221, -221, 114, - -221, 99, 66, -221, 101, 10, 221, 221, 102, 103, - 106, -221, 120, 108, 362, 120, 59, -221, -221, -221, - -221, -7, 112, 765, 116, -221, 66, -221, -221, -221, - -221, -221, 120, -221, -221, -221, 117, 118, 54, -221, - 765, 396, 119, 880, 125, -221, 121, 59, 294, 127, - -221, -221, 797, 40, -221, -221, 120, -221, 126, 880, - 131, 362, -221, 35, 128, 221, 134, -221, 829, -221, - 328, -221, 136, 440, 137, -221, -221, -221, 221, 396, - -221, 221, 138, 141, -221, 829, -221, -221, 122, -221, - 29, 66, 139, 133, 362, -221, -221, 144, 440, 143, - 294, -221, 521, 221, 67, 257, -221, 147, -221, -221, - 142, -221, -221, 66, 396, -221, -221, -221, -221, 66, - -221, 328, 221, -221, -221, 148, 564, -221, -221, 69, - -221, -221, -221, 135, -221, 40, 23, 294, 861, -221, - -221, -221, -221, 133, 328, -221, -221, -221, 880, -221, - 185, -221, -221, -221, -221, 184, -221, 829, 184, 40, - 637, -221, -221, -221, 880, -221, 149, 120, -221, -221, - 829, 637, -221, -221 + 454, 23, 44, 44, 83, -214, 19, -214, -214, 44, + -214, -9, 38, -214, 122, 51, -214, 52, 46, -214, + -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, + -214, 129, -214, 122, -214, -214, 44, -214, -214, -214, + 920, 49, 532, 600, 632, 664, 56, 59, 696, 0, + 68, 11, 104, 1, -214, -214, -214, 72, -214, -214, + -214, -214, -214, -214, -214, -214, 66, -214, -214, 87, + -214, 8, 10, 122, -214, -214, -214, -214, -214, -214, + -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, + -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, + -214, -214, -214, -214, -214, -2, -214, -214, -214, -214, + -214, -214, -214, 52, 52, -214, 94, -214, 40, -214, + 96, 40, 131, 43, -214, 98, 443, -214, -214, 116, + -214, 67, 70, -214, 102, 31, 920, 920, 728, 120, + 107, 363, 120, 43, -214, -214, -214, -214, -8, 108, + 728, 110, -214, 70, -214, -214, -214, -214, -214, 120, + -214, -214, -214, 103, 109, 111, 118, 117, -214, 397, + 121, 895, 124, -214, 126, 43, 295, 127, -214, -214, + 760, 52, 54, -214, 728, 123, 895, 134, 363, -214, + 2, 133, 920, 128, -214, 792, -214, 329, -214, 138, + 844, 137, -214, -214, -214, 920, -214, -214, 120, -214, + 397, -214, 920, 136, 142, -214, 792, -214, -214, 130, + -214, 32, 70, 139, 143, 363, -214, -214, 144, 844, + 146, 295, -214, 870, 920, 63, 258, -214, 145, -214, + -214, 147, -214, -214, 70, 397, -214, -214, -214, -214, + 70, -214, 329, 920, -214, -214, 149, 495, -214, -214, + 71, -214, -214, -214, 148, -214, 52, -22, 295, 824, + -214, -214, -214, -214, 143, 329, -214, -214, -214, 895, + -214, 181, -214, -214, -214, -214, 182, -214, 792, 182, + 52, 568, -214, -214, -214, 895, -214, 150, 120, -214, + -214, 792, 568, -214, -214 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -644,63 +644,63 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 0, 0, 6, 167, 2, 10, 163, - 165, 0, 0, 1, 0, 0, 166, 5, 12, 14, + 0, 0, 0, 0, 0, 6, 168, 2, 10, 164, + 166, 0, 0, 1, 0, 0, 167, 5, 12, 14, 19, 20, 21, 22, 15, 16, 17, 18, 23, 24, - 25, 0, 26, 0, 162, 4, 0, 3, 7, 27, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, - 50, 62, 67, 99, 123, 11, 164, 0, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 158, 159, 0, - 145, 160, 0, 0, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 58, 0, 59, 97, 98, 29, - 30, 48, 49, 5, 5, 121, 131, 122, 0, 32, - 0, 0, 69, 0, 100, 0, 0, 157, 146, 0, - 161, 0, 0, 9, 0, 0, 0, 0, 128, 0, - 127, 130, 34, 0, 0, 66, 0, 64, 104, 105, - 106, 103, 0, 131, 0, 147, 0, 172, 173, 171, - 168, 169, 170, 175, 60, 61, 0, 0, 0, 125, - 131, 0, 0, 0, 0, 68, 0, 0, 0, 0, - 28, 174, 0, 5, 132, 129, 133, 126, 0, 0, - 0, 0, 44, 0, 78, 0, 55, 57, 83, 52, - 0, 102, 0, 0, 0, 124, 117, 118, 0, 0, - 46, 0, 74, 38, 47, 77, 33, 54, 0, 43, - 0, 0, 80, 0, 0, 40, 82, 0, 0, 0, - 0, 86, 0, 0, 0, 0, 112, 110, 85, 101, - 0, 37, 45, 0, 0, 76, 41, 42, 79, 0, - 53, 0, 0, 95, 96, 72, 77, 65, 109, 0, - 84, 87, 89, 0, 134, 5, 0, 0, 0, 75, - 36, 81, 71, 84, 0, 88, 90, 93, 0, 91, - 135, 108, 119, 120, 70, 144, 137, 141, 144, 5, - 0, 94, 139, 92, 0, 143, 114, 115, 116, 138, - 142, 0, 140, 113 + 25, 0, 26, 0, 163, 4, 0, 3, 7, 27, + 0, 0, 0, 0, 0, 0, 0, 0, 125, 31, + 50, 62, 67, 99, 123, 11, 165, 0, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 159, 160, 0, + 146, 161, 0, 0, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 58, 0, 59, 97, 98, 29, + 30, 48, 49, 5, 5, 121, 0, 122, 0, 32, + 0, 0, 69, 0, 100, 0, 0, 158, 147, 0, + 162, 0, 0, 9, 0, 0, 0, 0, 132, 34, + 0, 0, 66, 0, 64, 104, 105, 106, 103, 0, + 132, 0, 148, 0, 173, 174, 172, 169, 170, 171, + 176, 60, 61, 0, 0, 129, 0, 128, 131, 0, + 0, 0, 0, 68, 0, 0, 0, 0, 28, 175, + 0, 5, 0, 126, 132, 0, 0, 0, 0, 44, + 0, 78, 0, 55, 57, 83, 52, 0, 102, 0, + 0, 0, 124, 117, 118, 0, 133, 130, 134, 127, + 0, 46, 0, 74, 38, 47, 77, 33, 54, 0, + 43, 0, 0, 80, 0, 0, 40, 82, 0, 0, + 0, 0, 86, 0, 0, 0, 0, 112, 110, 85, + 101, 0, 37, 45, 0, 0, 76, 41, 42, 79, + 0, 53, 0, 0, 95, 96, 72, 77, 65, 109, + 0, 84, 87, 89, 0, 135, 5, 0, 0, 0, + 75, 36, 81, 71, 84, 0, 88, 90, 93, 0, + 91, 136, 108, 119, 120, 70, 145, 138, 142, 145, + 5, 0, 94, 140, 92, 0, 144, 114, 115, 116, + 139, 143, 0, 141, 113 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -221, -221, -221, -17, -12, -221, -221, -221, -221, -221, - -221, -221, -221, -221, -221, -221, -191, -170, -165, -208, - -221, -221, -221, -221, -221, -168, -221, -221, -221, -221, - -221, -221, -221, -221, -220, -29, -221, -30, -221, -25, - -221, -221, -221, -221, -221, -221, -221, -119, -221, -218, - -221, -97, -221, -221, -221, -221, -221, -221, -105, -221, - -221, -72, -221, -79, -104, -27, 11, 207, -221, -145, - -221, -38 + -214, -214, -214, -17, -12, -214, -214, -214, -214, -214, + -214, -214, -214, -214, -214, -214, -187, -162, -163, -211, + -214, -214, -214, -214, -214, -173, -214, -214, -214, -214, + -214, -214, -214, -214, -212, -30, -214, -31, -214, -26, + -214, -214, -214, -214, -214, -214, -214, -119, -214, -213, + -214, -98, -214, -214, -214, -214, -214, -214, -214, -130, + -214, -214, -75, -214, -82, -104, -24, 17, 208, -214, + -150, -214, -38 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 4, 5, 6, 7, 14, 41, 33, 18, 19, - 57, 49, 20, 21, 143, 119, 190, 210, 211, 212, - 213, 50, 22, 23, 120, 174, 196, 51, 52, 24, - 25, 176, 122, 147, 229, 214, 197, 234, 235, 236, - 288, 285, 255, 53, 26, 27, 152, 150, 124, 204, - 237, 295, 296, 28, 29, 54, 30, 125, 139, 140, - 185, 265, 266, 291, 71, 223, 10, 11, 31, 163, - 32, 141 + 57, 49, 20, 21, 140, 119, 187, 211, 212, 213, + 214, 50, 22, 23, 120, 172, 193, 51, 52, 24, + 25, 174, 122, 144, 230, 215, 194, 235, 236, 237, + 289, 286, 256, 53, 26, 27, 149, 147, 124, 201, + 238, 296, 297, 28, 29, 54, 30, 125, 116, 166, + 167, 207, 266, 267, 292, 71, 224, 10, 11, 31, + 160, 32, 168 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -708,196 +708,202 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 40, 135, 38, 194, 106, 108, 110, 112, 195, -63, - 117, 181, 258, 72, 142, 118, 123, 145, 241, 151, - 34, 55, 15, 217, 131, 222, 129, 175, 162, 37, - 8, 272, 69, 70, 13, 134, 36, 9, 233, 129, - 132, 242, 151, 129, 177, 16, 17, 56, 179, 281, - -35, -107, 162, 270, 284, -63, 250, -63, 201, 165, - 130, 133, 129, 252, 186, 187, 35, 233, 69, 70, - 286, 218, 279, 151, 280, 36, 248, 39, 247, 69, - 70, 2, 242, 148, 219, -8, 299, 69, 70, 220, - 184, 149, 69, 70, 157, 158, 136, 137, 269, 69, - 70, 159, 160, 161, 271, 261, 262, 275, 276, 166, - 167, 73, 113, 114, 154, -13, 1, 162, -5, -5, - -5, -5, -5, -5, -5, -5, -51, 173, 42, 43, - 44, 45, 46, 47, 48, 121, 126, 127, 128, 162, - 144, -5, -5, 146, 207, 162, 198, 153, 155, 156, - 164, 169, 168, 129, 189, 171, 2, 170, 3, 178, - 226, 203, 215, -13, 180, 191, 208, 225, 200, 183, - 182, 246, 209, 199, 173, 205, 238, 245, 221, 216, - 224, 240, 230, 228, 277, 239, 297, 244, 243, 249, - 251, 257, 189, 267, 274, 268, 264, 297, 290, 253, - 301, 256, 259, 254, 303, 238, 260, 173, 289, 293, - 12, 0, 0, 203, 0, 0, 0, 0, 245, 0, - 0, 0, 0, 0, 0, 273, 0, 189, 0, 0, - 283, 0, 0, 0, 228, 0, 0, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 0, 278, 292, - 203, 287, 298, 68, 69, 70, 0, 228, 263, 0, - 0, 0, 302, 298, 0, 0, 0, 300, 264, 0, - 0, 0, 294, -135, -135, -135, -135, -135, -135, -135, - -135, -135, -135, 0, 0, 0, 0, 0, -135, -135, - -135, -135, 0, 0, 0, 202, 0, -135, -135, 0, - 0, 0, 0, 0, 0, 0, -136, 0, -136, -5, + 40, 135, 38, 179, 106, 108, 110, 112, 192, 191, + 117, -63, 118, 123, 139, 218, 72, 142, 259, 148, + 177, 55, 15, 242, 173, 129, 34, 280, 159, 281, + 223, 69, 70, 35, 134, 69, 70, 234, 219, 148, + 273, 129, 36, 175, 131, 16, 17, -35, -107, 159, + 243, 220, 251, 56, 209, 282, 198, -63, 271, -63, + 132, 133, 130, 285, 129, 129, 253, 145, 287, 8, + 234, 148, 249, 69, 70, 146, 69, 70, 208, 9, + 162, 248, 37, 13, 300, 39, 221, 69, 70, 36, + 206, 243, -8, 2, 270, 73, 136, 137, 154, 155, + 272, 262, 263, 69, 70, 156, 157, 158, 113, 276, + 277, 114, 163, 164, 151, -51, 121, 153, 159, 126, + 127, 128, -13, 1, 171, -5, -5, -5, -5, -5, + -5, -5, -5, 42, 43, 44, 45, 46, 47, 48, + 159, 138, 204, 141, 143, 150, 159, 195, -5, -5, + 152, 161, 186, 129, 169, 176, 180, 227, 178, 200, + 181, 182, 216, 2, 205, 3, 183, 188, 184, 210, + -13, 171, 196, 197, 225, 202, 239, 226, 246, 247, + 229, 241, 217, 222, 231, 240, 244, 298, 245, 250, + 252, 268, 265, 186, 258, 275, 291, 278, 298, 254, + 269, 302, 260, 255, 304, 257, 290, 294, 171, 239, + 261, 12, 0, 0, 200, 0, 0, 0, 0, 246, + 0, 0, 0, 0, 0, 0, 0, 0, 186, 274, + 0, 284, 0, 0, 0, 229, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 279, + 293, 200, 0, 299, 0, 288, 0, 0, 229, 264, + 0, 0, 0, 303, 299, 0, 0, 0, 0, 265, + 0, 301, 0, 295, -136, -136, -136, -136, -136, -136, + -136, -136, -136, -136, 0, 0, 0, 0, 0, -136, + -136, -136, -136, 0, 0, 0, 199, 0, -136, -136, + 0, 0, 0, 0, 0, 0, 0, -137, 0, -137, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, - 0, 0, 0, 0, -5, -5, -5, -5, -5, 227, - 0, 0, 0, 0, -5, 2, 0, 0, 0, 0, - 0, 0, -111, -5, -5, -5, -5, -5, -5, -5, - -5, -5, -5, -5, 0, 0, 0, 0, -5, -5, - -5, -5, -5, 172, 0, 0, 0, 0, -5, 2, - 0, 0, 0, 0, 0, 0, -73, 0, -5, -5, - -5, -5, -5, -5, -5, -5, -5, -5, 0, 0, - 0, 0, 0, -5, -5, -5, -5, 188, 0, 0, - 0, 0, -5, 2, 0, 0, 0, 0, 0, 0, - -56, 0, -5, -5, -5, -5, -5, -5, -5, -5, - -5, -5, 0, 0, 0, 0, 0, -5, -5, -5, - -5, 0, 0, 0, 0, 0, -5, 2, 0, 0, - 0, 0, 0, 1, -39, -5, -5, -5, -5, -5, - -5, -5, -5, 0, 0, 231, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 0, 0, -5, -5, - 232, 192, 68, 69, 70, 0, 0, 0, 0, 0, - 193, 0, 0, 2, 0, 3, 0, 0, 0, 0, - -13, 74, 75, 76, 77, 78, 79, 80, 81, 82, + -5, 0, 0, 0, 0, -5, -5, -5, -5, -5, + 228, 0, 0, 0, 0, -5, 2, 0, 0, 0, + 0, 0, 0, -111, -5, -5, -5, -5, -5, -5, + -5, -5, -5, -5, -5, 0, 0, 0, 0, -5, + -5, -5, -5, -5, 170, 0, 0, 0, 0, -5, + 2, 0, 0, 0, 0, 0, 0, -73, 0, -5, + -5, -5, -5, -5, -5, -5, -5, -5, -5, 0, + 0, 0, 0, 0, -5, -5, -5, -5, 185, 0, + 0, 0, 0, -5, 2, 0, 0, 0, 0, 0, + 0, -56, 0, -5, -5, -5, -5, -5, -5, -5, + -5, -5, -5, 0, 0, 0, 0, 0, -5, -5, + -5, -5, 0, 0, 0, 0, 0, -5, 2, 0, + 0, 0, 0, 0, 1, -39, -5, -5, -5, -5, + -5, -5, -5, -5, -13, 1, 0, -5, -5, -5, + -5, -5, -5, -5, -5, 0, 0, 0, 0, -5, + -5, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -5, -5, 0, 0, 2, 0, 3, 0, 0, 0, + 0, -13, 0, 0, 0, 2, 0, 3, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 0, 226, + 0, 0, 0, -85, -85, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 0, 104, 0, 0, 0, + 105, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 0, 115, -13, 1, 0, -5, -5, -5, -5, - -5, -5, -5, -5, 0, 116, 231, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 0, 0, -5, - -5, 0, 192, 68, 69, 70, 0, 0, 0, 0, - 0, 193, 0, 0, 2, 0, 3, 74, 75, 76, + 103, 69, 70, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 0, 107, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 0, 109, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 0, 225, 0, - 0, 0, -85, -85, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 0, 104, 0, 0, 0, 105, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 69, 70, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 0, 107, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 0, 109, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 0, 111, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 0, 138, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 0, 206, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 0, 225, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 0, 282, 58, 59, 60, 61, + 97, 98, 99, 100, 101, 102, 103, 0, 111, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 0, + 115, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 0, 165, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 0, 203, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 0, 226, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 0, 283, 232, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 0, 0, 0, 0, 233, 189, 68, 69, 70, 0, + 0, 0, 0, 0, 190, 232, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, + 0, 189, 68, 69, 70, 0, 0, 0, 0, 0, + 190, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 0, 0, 0, 0, 0, 189, 68, 69, 70, + 0, 0, 0, 0, 0, 190, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, - 0, 192, 68, 69, 70, 0, 0, 0, 0, 0, - 193 + 0, 0, 68, 69, 70 }; static const yytype_int16 yycheck[] = { - 17, 105, 14, 173, 42, 43, 44, 45, 173, 0, - 48, 156, 230, 40, 118, 12, 12, 121, 209, 123, - 9, 33, 3, 191, 34, 195, 33, 146, 132, 44, - 46, 251, 33, 34, 0, 36, 51, 35, 203, 33, - 50, 211, 146, 33, 51, 26, 27, 36, 153, 267, - 47, 47, 156, 244, 274, 46, 224, 48, 177, 49, - 54, 73, 33, 228, 168, 170, 42, 232, 33, 34, - 278, 36, 49, 177, 51, 51, 221, 34, 49, 33, - 34, 41, 252, 24, 49, 46, 294, 33, 34, 193, - 36, 32, 33, 34, 28, 29, 113, 114, 243, 33, - 34, 35, 36, 37, 249, 38, 39, 38, 39, 136, - 137, 46, 52, 52, 126, 0, 1, 221, 3, 4, - 5, 6, 7, 8, 9, 10, 47, 144, 4, 5, - 6, 7, 8, 9, 10, 12, 47, 54, 34, 243, - 47, 26, 27, 13, 182, 249, 173, 47, 34, 50, - 49, 48, 50, 33, 171, 47, 41, 51, 43, 47, - 198, 178, 189, 48, 48, 46, 183, 34, 47, 51, - 53, 49, 46, 48, 191, 48, 203, 215, 50, 48, - 46, 208, 46, 200, 49, 48, 290, 46, 50, 50, - 46, 48, 209, 46, 46, 53, 11, 301, 14, 228, - 51, 228, 232, 228, 301, 232, 233, 224, 280, 288, - 3, -1, -1, 230, -1, -1, -1, -1, 256, -1, - -1, -1, -1, -1, -1, 252, -1, 244, -1, -1, - 268, -1, -1, -1, 251, -1, -1, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, -1, 265, 287, - 267, 278, 290, 32, 33, 34, -1, 274, 1, -1, - -1, -1, 300, 301, -1, -1, -1, 294, 11, -1, - -1, -1, 289, 16, 17, 18, 19, 20, 21, 22, + 17, 105, 14, 153, 42, 43, 44, 45, 171, 171, + 48, 0, 12, 12, 118, 188, 40, 121, 231, 123, + 150, 33, 3, 210, 143, 33, 9, 49, 132, 51, + 192, 33, 34, 42, 36, 33, 34, 200, 36, 143, + 252, 33, 51, 51, 34, 26, 27, 47, 47, 153, + 212, 49, 225, 36, 184, 268, 175, 46, 245, 48, + 50, 73, 54, 275, 33, 33, 229, 24, 279, 46, + 233, 175, 222, 33, 34, 32, 33, 34, 182, 35, + 49, 49, 44, 0, 295, 34, 190, 33, 34, 51, + 36, 253, 46, 41, 244, 46, 113, 114, 28, 29, + 250, 38, 39, 33, 34, 35, 36, 37, 52, 38, + 39, 52, 136, 137, 126, 47, 12, 50, 222, 47, + 54, 34, 0, 1, 141, 3, 4, 5, 6, 7, + 8, 9, 10, 4, 5, 6, 7, 8, 9, 10, + 244, 47, 180, 47, 13, 47, 250, 171, 26, 27, + 34, 49, 169, 33, 47, 47, 53, 195, 48, 176, + 51, 50, 186, 41, 181, 43, 48, 46, 51, 46, + 48, 188, 48, 47, 46, 48, 200, 34, 216, 49, + 197, 205, 48, 50, 46, 48, 50, 291, 46, 50, + 46, 46, 11, 210, 48, 46, 14, 49, 302, 229, + 53, 51, 233, 229, 302, 229, 281, 289, 225, 233, + 234, 3, -1, -1, 231, -1, -1, -1, -1, 257, + -1, -1, -1, -1, -1, -1, -1, -1, 245, 253, + -1, 269, -1, -1, -1, 252, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 266, + 288, 268, -1, 291, -1, 279, -1, -1, 275, 1, + -1, -1, -1, 301, 302, -1, -1, -1, -1, 11, + -1, 295, -1, 290, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, -1, -1, -1, -1, -1, 31, + 32, 33, 34, -1, -1, -1, 1, -1, 40, 41, + -1, -1, -1, -1, -1, -1, -1, 49, -1, 51, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, -1, -1, -1, -1, 30, 31, 32, 33, 34, + 1, -1, -1, -1, -1, 40, 41, -1, -1, -1, + -1, -1, -1, 48, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, -1, -1, -1, -1, 30, + 31, 32, 33, 34, 1, -1, -1, -1, -1, 40, + 41, -1, -1, -1, -1, -1, -1, 48, -1, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, + -1, -1, -1, -1, 31, 32, 33, 34, 1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, + -1, 48, -1, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, 31, 32, - 33, 34, -1, -1, -1, 1, -1, 40, 41, -1, - -1, -1, -1, -1, -1, -1, 49, -1, 51, 15, + 33, 34, -1, -1, -1, -1, -1, 40, 41, -1, + -1, -1, -1, -1, 1, 48, 3, 4, 5, 6, + 7, 8, 9, 10, 0, 1, -1, 3, 4, 5, + 6, 7, 8, 9, 10, -1, -1, -1, -1, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 26, 27, -1, -1, 41, -1, 43, -1, -1, -1, + -1, 48, -1, -1, -1, 41, -1, 43, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, -1, 34, + -1, -1, -1, 38, 39, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, -1, 34, -1, -1, -1, + 38, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, -1, 34, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, 30, 31, 32, 33, 34, 1, - -1, -1, -1, -1, 40, 41, -1, -1, -1, -1, - -1, -1, 48, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, -1, -1, -1, -1, 30, 31, - 32, 33, 34, 1, -1, -1, -1, -1, 40, 41, - -1, -1, -1, -1, -1, -1, 48, -1, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, - -1, -1, -1, 31, 32, 33, 34, 1, -1, -1, - -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, - 48, -1, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, -1, -1, -1, -1, -1, 31, 32, 33, - 34, -1, -1, -1, -1, -1, 40, 41, -1, -1, - -1, -1, -1, 1, 48, 3, 4, 5, 6, 7, - 8, 9, 10, -1, -1, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, -1, -1, 26, 27, - 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, - 40, -1, -1, 41, -1, 43, -1, -1, -1, -1, - 48, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 26, 27, 28, 29, 30, 31, 32, -1, 34, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, + 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, -1, 34, 0, 1, -1, 3, 4, 5, 6, - 7, 8, 9, 10, -1, 47, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, -1, -1, 26, - 27, -1, 31, 32, 33, 34, -1, -1, -1, -1, - -1, 40, -1, -1, 41, -1, 43, 3, 4, 5, + 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, -1, 34, -1, - -1, -1, 38, 39, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, -1, 34, -1, -1, -1, 38, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, -1, 34, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, -1, 34, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, -1, 34, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - -1, 34, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, -1, 34, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, -1, 34, 16, 17, 18, 19, + 26, 27, 28, 29, 30, 31, 32, -1, 34, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + -1, -1, -1, -1, 30, 31, 32, 33, 34, -1, + -1, -1, -1, -1, 40, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, 31, 32, 33, 34, -1, -1, -1, -1, -1, - 40 + 40, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, -1, -1, -1, -1, -1, 31, 32, 33, 34, + -1, -1, -1, -1, -1, 40, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, + -1, -1, 32, 33, 34 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -905,36 +911,36 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 1, 41, 43, 56, 57, 58, 59, 46, 35, - 121, 122, 122, 0, 60, 3, 26, 27, 63, 64, + 122, 123, 123, 0, 60, 3, 26, 27, 63, 64, 67, 68, 77, 78, 84, 85, 99, 100, 108, 109, - 111, 123, 125, 62, 121, 42, 51, 44, 59, 34, + 111, 124, 126, 62, 122, 42, 51, 44, 59, 34, 58, 61, 4, 5, 6, 7, 8, 9, 10, 66, - 76, 82, 83, 98, 110, 59, 121, 65, 16, 17, + 76, 82, 83, 98, 110, 59, 122, 65, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, 33, - 34, 119, 120, 46, 3, 4, 5, 6, 7, 8, + 34, 120, 121, 46, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 34, 38, 126, 34, 126, 34, - 126, 34, 126, 52, 52, 34, 47, 126, 12, 70, + 29, 30, 31, 32, 34, 38, 127, 34, 127, 34, + 127, 34, 127, 52, 52, 34, 113, 127, 12, 70, 79, 12, 87, 12, 103, 112, 47, 54, 34, 33, - 54, 34, 50, 59, 36, 119, 58, 58, 34, 113, - 114, 126, 119, 69, 47, 119, 13, 88, 24, 32, - 102, 119, 101, 47, 59, 34, 50, 28, 29, 35, - 36, 37, 119, 124, 49, 49, 120, 120, 50, 48, - 51, 47, 1, 58, 80, 102, 86, 51, 47, 113, - 48, 124, 53, 51, 36, 115, 119, 113, 1, 58, - 71, 46, 31, 40, 72, 73, 81, 91, 120, 48, - 47, 102, 1, 58, 104, 48, 34, 126, 58, 46, - 72, 73, 74, 75, 90, 120, 48, 80, 36, 49, - 119, 50, 72, 120, 46, 34, 126, 1, 58, 89, - 46, 15, 30, 73, 92, 93, 94, 105, 120, 48, - 120, 71, 72, 50, 46, 126, 49, 49, 124, 50, - 80, 46, 73, 90, 94, 97, 120, 48, 104, 92, - 120, 38, 39, 1, 11, 116, 117, 46, 53, 124, - 71, 124, 89, 120, 46, 38, 39, 49, 58, 49, - 51, 104, 34, 126, 89, 96, 74, 120, 95, 116, - 14, 118, 126, 118, 58, 106, 107, 119, 126, 74, - 120, 51, 126, 106 + 54, 34, 50, 59, 36, 120, 58, 58, 47, 120, + 69, 47, 120, 13, 88, 24, 32, 102, 120, 101, + 47, 59, 34, 50, 28, 29, 35, 36, 37, 120, + 125, 49, 49, 121, 121, 34, 114, 115, 127, 47, + 1, 58, 80, 102, 86, 51, 47, 114, 48, 125, + 53, 51, 50, 48, 51, 1, 58, 71, 46, 31, + 40, 72, 73, 81, 91, 121, 48, 47, 102, 1, + 58, 104, 48, 34, 127, 58, 36, 116, 120, 114, + 46, 72, 73, 74, 75, 90, 121, 48, 80, 36, + 49, 120, 50, 72, 121, 46, 34, 127, 1, 58, + 89, 46, 15, 30, 73, 92, 93, 94, 105, 121, + 48, 121, 71, 72, 50, 46, 127, 49, 49, 125, + 50, 80, 46, 73, 90, 94, 97, 121, 48, 104, + 92, 121, 38, 39, 1, 11, 117, 118, 46, 53, + 125, 71, 125, 89, 121, 46, 38, 39, 49, 58, + 49, 51, 104, 34, 127, 89, 96, 74, 121, 95, + 117, 14, 119, 127, 119, 58, 106, 107, 120, 127, + 74, 121, 51, 127, 106 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -952,15 +958,15 @@ static const yytype_uint8 yyr1[] = 93, 95, 94, 96, 94, 97, 97, 98, 98, 99, 101, 100, 102, 102, 102, 102, 103, 103, 104, 104, 104, 104, 105, 106, 106, 107, 107, 108, 108, 109, - 109, 110, 110, 112, 111, 111, 113, 113, 114, 114, - 114, 114, 115, 115, 116, 116, 117, 117, 117, 117, - 117, 117, 117, 118, 118, 119, 119, 119, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, - 124, 124, 124, 124, 125, 125, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126 + 109, 110, 110, 112, 111, 113, 111, 114, 114, 115, + 115, 115, 115, 116, 116, 117, 117, 118, 118, 118, + 118, 118, 118, 118, 119, 119, 120, 120, 120, 121, + 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 122, 122, 123, 123, 124, 124, 125, + 125, 125, 125, 125, 125, 126, 126, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -978,15 +984,15 @@ static const yytype_uint8 yyr2[] = 3, 0, 5, 0, 5, 1, 1, 2, 2, 2, 0, 7, 3, 1, 1, 1, 2, 0, 4, 3, 2, 0, 1, 3, 1, 1, 1, 7, 7, 10, - 10, 2, 2, 0, 6, 5, 3, 1, 1, 3, - 1, 0, 1, 1, 1, 0, 0, 3, 5, 4, - 6, 3, 5, 2, 0, 1, 2, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, - 1, 2, 2, 1, 3, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 6, 5, 1, 1, 1, 1, + 10, 2, 2, 0, 6, 0, 6, 3, 1, 1, + 3, 1, 0, 1, 1, 1, 0, 0, 3, 5, + 4, 6, 3, 5, 2, 0, 1, 2, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 3, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 6, 5, 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 + 1, 1, 1, 1, 1, 1, 1 }; @@ -1667,38 +1673,38 @@ yyreduce: switch (yyn) { case 2: -#line 116 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 116 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 1674 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1680 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 3: -#line 124 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 124 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[-1]); } -#line 1682 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1688 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 4: -#line 133 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 133 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[-1]); } -#line 1690 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1696 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 5: -#line 137 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 137 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = new StringListTok; } -#line 1698 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1704 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 6: -#line 146 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 146 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[0])); if(!metaData->v.empty()) @@ -1706,11 +1712,11 @@ yyreduce: unit->addGlobalMetaData(metaData->v); } } -#line 1710 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1716 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 8: -#line 155 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 155 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1])); ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[0])); @@ -1719,138 +1725,138 @@ yyreduce: contained->setMetaData(metaData->v); } } -#line 1723 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1729 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 10: -#line 165 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 165 "src/Slice/Grammar.y" /* yacc.c:1661 */ { yyerrok; } -#line 1731 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1737 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 12: -#line 170 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 170 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("`;' missing after definition"); } -#line 1739 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1745 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 13: -#line 174 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 174 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 1746 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1752 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 14: -#line 182 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 182 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ModulePtr::dynamicCast((yyvsp[0]))); } -#line 1754 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1760 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 15: -#line 186 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 186 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0]))); } -#line 1762 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1768 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 16: -#line 190 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 190 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0]))); } -#line 1770 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1776 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 17: -#line 194 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 194 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0]))); } -#line 1778 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1784 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 18: -#line 198 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 198 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0]))); } -#line 1786 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1792 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 19: -#line 202 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 202 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0); } -#line 1794 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1800 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 20: -#line 206 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 206 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ExceptionPtr::dynamicCast((yyvsp[0]))); } -#line 1802 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1808 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 21: -#line 210 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 210 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0); } -#line 1810 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1816 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 22: -#line 214 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 214 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0]))); } -#line 1818 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1824 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 23: -#line 218 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 218 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || SequencePtr::dynamicCast((yyvsp[0]))); } -#line 1826 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1832 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 24: -#line 222 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 222 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || DictionaryPtr::dynamicCast((yyvsp[0]))); } -#line 1834 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1840 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 25: -#line 226 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 226 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0]))); } -#line 1842 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1848 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 26: -#line 230 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 230 "src/Slice/Grammar.y" /* yacc.c:1661 */ { assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0]))); } -#line 1850 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1856 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 27: -#line 239 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 239 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->setSeenDefinition(); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -1867,11 +1873,11 @@ yyreduce: (yyval) = 0; } } -#line 1871 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1877 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 28: -#line 256 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 256 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-3])) { @@ -1883,38 +1889,38 @@ yyreduce: (yyval) = 0; } } -#line 1887 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1893 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 29: -#line 273 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 273 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 1895 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1901 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 30: -#line 277 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 277 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as exception name"); (yyval) = (yyvsp[0]); // Dummy } -#line 1905 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1911 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 31: -#line 288 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 288 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("exceptions cannot be forward declared"); (yyval) = 0; } -#line 1914 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1920 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 32: -#line 298 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 298 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1])); @@ -1928,11 +1934,11 @@ yyreduce: } (yyval) = ex; } -#line 1932 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1938 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 33: -#line 312 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 312 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-3])) { @@ -1940,11 +1946,11 @@ yyreduce: } (yyval) = (yyvsp[-3]); } -#line 1944 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1950 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 34: -#line 325 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 325 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); @@ -1952,19 +1958,19 @@ yyreduce: cont->checkIntroduced(scoped->v); (yyval) = contained; } -#line 1956 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1962 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 35: -#line 333 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 333 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = 0; } -#line 1964 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1970 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 36: -#line 342 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 342 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); @@ -1973,33 +1979,33 @@ yyreduce: contained->setMetaData(metaData->v); } } -#line 1977 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1983 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 37: -#line 351 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 351 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 1984 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1990 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 38: -#line 354 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 354 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("`;' missing after definition"); } -#line 1992 "Grammar.tab.c" /* yacc.c:1646 */ +#line 1998 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 39: -#line 358 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 358 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 1999 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2005 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 40: -#line 366 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 366 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -2007,11 +2013,11 @@ yyreduce: typestring->v = make_pair(type, ident->v); (yyval) = typestring; } -#line 2011 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2017 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 41: -#line 379 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 379 "src/Slice/Grammar.y" /* yacc.c:1661 */ { IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[-1])); @@ -2031,17 +2037,54 @@ yyreduce: m->v.tag = tag; (yyval) = m; } -#line 2035 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2041 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 42: -#line 399 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 399 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); assert(cont); - ContainedList cl = cont->lookupContained(scoped->v); + ContainedList cl = cont->lookupContained(scoped->v, false); + if(cl.empty()) + { + EnumeratorList enumerators = cont->enumerators(scoped->v); + if(enumerators.size() == 1) + { + // Found + cl.push_back(enumerators.front()); + scoped->v = enumerators.front()->scoped(); + unit->warning(Deprecated, string("referencing enumerator `") + scoped->v + + "' without its enumeration's scope is deprecated"); + } + else if(enumerators.size() > 1) + { + ostringstream os; + os << "enumerator `" << scoped->v << "' could designate"; + bool first = true; + for(EnumeratorList::iterator p = enumerators.begin(); p != enumerators.end(); ++p) + { + if(first) + { + first = false; + } + else + { + os << " or"; + } + + os << " `" << (*p)->scoped() << "'"; + } + unit->error(os.str()); + } + else + { + unit->error(string("`") + scoped->v + "' is not defined"); + } + } + if(cl.empty()) { YYERROR; // Can't continue, jump to next yyerrok @@ -2091,11 +2134,11 @@ yyreduce: m->v.tag = tag; (yyval) = m; } -#line 2095 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2138 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 43: -#line 455 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 492 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("missing tag for optional"); OptionalDefTokPtr m = new OptionalDefTok; // Dummy @@ -2103,11 +2146,11 @@ yyreduce: m->v.tag = -1; (yyval) = m; } -#line 2107 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2150 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 44: -#line 463 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 500 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("missing tag for optional"); OptionalDefTokPtr m = new OptionalDefTok; // Dummy @@ -2115,11 +2158,11 @@ yyreduce: m->v.tag = -1; (yyval) = m; } -#line 2119 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2162 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 45: -#line 476 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 513 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); @@ -2127,11 +2170,11 @@ yyreduce: m->v.name = ts->v.second; (yyval) = m; } -#line 2131 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2174 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 46: -#line 484 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 521 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); OptionalDefTokPtr m = new OptionalDefTok; @@ -2141,38 +2184,38 @@ yyreduce: m->v.tag = -1; (yyval) = m; } -#line 2145 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2188 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 48: -#line 505 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 542 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 2153 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2196 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 49: -#line 509 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 546 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as struct name"); (yyval) = (yyvsp[0]); // Dummy } -#line 2163 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2206 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 50: -#line 520 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 557 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("structs cannot be forward declared"); (yyval) = 0; // Dummy } -#line 2172 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2215 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 51: -#line 530 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 567 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -2191,11 +2234,11 @@ yyreduce: } (yyval) = st; } -#line 2195 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2238 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 52: -#line 549 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 586 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-3])) { @@ -2213,11 +2256,11 @@ yyreduce: unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy } } -#line 2217 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2260 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 53: -#line 572 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 609 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); @@ -2226,51 +2269,51 @@ yyreduce: contained->setMetaData(metaData->v); } } -#line 2230 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2273 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 54: -#line 581 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 618 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 2237 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2280 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 55: -#line 584 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 621 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("`;' missing after definition"); } -#line 2245 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2288 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 56: -#line 588 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 625 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 2252 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2295 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 58: -#line 602 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 639 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 2260 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2303 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 59: -#line 606 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 643 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as class name"); (yyval) = (yyvsp[0]); // Dummy } -#line 2270 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2313 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 60: -#line 617 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 654 "src/Slice/Grammar.y" /* yacc.c:1661 */ { IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[-1]))->v; if(id < 0) @@ -2295,17 +2338,54 @@ yyreduce: classId->t = static_cast<int>(id); (yyval) = classId; } -#line 2299 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2342 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 61: -#line 642 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 679 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); assert(cont); - ContainedList cl = cont->lookupContained(scoped->v); + ContainedList cl = cont->lookupContained(scoped->v, false); + if(cl.empty()) + { + EnumeratorList enumerators = cont->enumerators(scoped->v); + if(enumerators.size() == 1) + { + // Found + cl.push_back(enumerators.front()); + scoped->v = enumerators.front()->scoped(); + unit->warning(Deprecated, string("referencing enumerator `") + scoped->v + + "' without its enumeration's scope is deprecated"); + } + else if(enumerators.size() > 1) + { + ostringstream os; + os << "enumerator `" << scoped->v << "' could designate"; + bool first = true; + for(EnumeratorList::iterator p = enumerators.begin(); p != enumerators.end(); ++p) + { + if(first) + { + first = false; + } + else + { + os << " or"; + } + + os << " `" << (*p)->scoped() << "'"; + } + unit->error(os.str()); + } + else + { + unit->error(string("`") + scoped->v + "' is not defined"); + } + } + if(cl.empty()) { YYERROR; // Can't continue, jump to next yyerrok @@ -2364,22 +2444,22 @@ yyreduce: (yyval) = classId; } -#line 2368 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2448 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 62: -#line 707 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 781 "src/Slice/Grammar.y" /* yacc.c:1661 */ { ClassIdTokPtr classId = new ClassIdTok(); classId->v = StringTokPtr::dynamicCast((yyvsp[0]))->v; classId->t = -1; (yyval) = classId; } -#line 2379 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2459 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 63: -#line 719 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 793 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -2387,11 +2467,11 @@ yyreduce: ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v); (yyval) = cl; } -#line 2391 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2471 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 64: -#line 732 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 806 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-3])); ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[-2])); @@ -2414,11 +2494,11 @@ yyreduce: (yyval) = 0; } } -#line 2418 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2498 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 65: -#line 755 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 829 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-3])) { @@ -2430,11 +2510,11 @@ yyreduce: (yyval) = 0; } } -#line 2434 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2514 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 66: -#line 772 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 846 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); @@ -2468,35 +2548,35 @@ yyreduce: } } } -#line 2472 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2552 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 67: -#line 806 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 880 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = 0; } -#line 2480 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2560 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 68: -#line 815 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 889 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 2488 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2568 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 69: -#line 819 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 893 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = new ClassListTok; } -#line 2496 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2576 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 70: -#line 828 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 902 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); @@ -2505,33 +2585,33 @@ yyreduce: contained->setMetaData(metaData->v); } } -#line 2509 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2589 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 71: -#line 837 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 911 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 2516 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2596 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 72: -#line 840 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 914 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("`;' missing after definition"); } -#line 2524 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2604 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 73: -#line 844 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 918 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 2531 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2611 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 74: -#line 852 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 926 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); @@ -2553,11 +2633,11 @@ yyreduce: unit->currentContainer()->checkIntroduced(def->v.name, dm); (yyval) = dm; } -#line 2557 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2637 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 75: -#line 874 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 948 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[-2])); ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); @@ -2584,11 +2664,11 @@ yyreduce: unit->currentContainer()->checkIntroduced(def->v.name, dm); (yyval) = dm; } -#line 2588 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2668 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 76: -#line 901 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 975 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2610,11 +2690,11 @@ yyreduce: assert((yyval)); unit->error("keyword `" + name + "' cannot be used as data member name"); } -#line 2614 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2694 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 77: -#line 923 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 997 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[0])); ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); @@ -2635,11 +2715,11 @@ yyreduce: assert((yyval)); unit->error("missing data member name"); } -#line 2639 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2719 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 78: -#line 949 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1023 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); @@ -2648,11 +2728,11 @@ yyreduce: unit->currentContainer()->checkIntroduced(ts->v.second, dm); (yyval) = dm; } -#line 2652 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2732 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 79: -#line 958 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1032 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2])); ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0])); @@ -2663,11 +2743,11 @@ yyreduce: unit->currentContainer()->checkIntroduced(ts->v.second, dm); (yyval) = dm; } -#line 2667 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2747 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 80: -#line 969 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1043 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); @@ -2676,11 +2756,11 @@ yyreduce: assert((yyval)); unit->error("optional data members not supported in struct"); } -#line 2680 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2760 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 81: -#line 978 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1052 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); @@ -2689,11 +2769,11 @@ yyreduce: assert((yyval)); unit->error("optional data members not supported in struct"); } -#line 2693 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2773 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 82: -#line 987 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1061 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2703,11 +2783,11 @@ yyreduce: assert((yyval)); unit->error("keyword `" + name + "' cannot be used as data member name"); } -#line 2707 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2787 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 83: -#line 997 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1071 "src/Slice/Grammar.y" /* yacc.c:1661 */ { TypePtr type = TypePtr::dynamicCast((yyvsp[0])); StructPtr st = StructPtr::dynamicCast(unit->currentContainer()); @@ -2716,21 +2796,21 @@ yyreduce: assert((yyval)); unit->error("missing data member name"); } -#line 2720 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2800 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 84: -#line 1011 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1085 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); m->v.type = TypePtr::dynamicCast((yyvsp[0])); (yyval) = m; } -#line 2730 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2810 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 85: -#line 1017 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1091 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr m = new OptionalDefTok(); m->v.type = TypePtr::dynamicCast((yyvsp[0])); @@ -2738,22 +2818,22 @@ yyreduce: m->v.tag = -1; (yyval) = m; } -#line 2742 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2822 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 86: -#line 1025 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1099 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr m = new OptionalDefTok; m->v.optional = false; m->v.tag = -1; (yyval) = m; } -#line 2753 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2833 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 87: -#line 1037 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1111 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2777,11 +2857,11 @@ yyreduce: (yyval) = 0; } } -#line 2781 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2861 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 88: -#line 1061 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1135 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2806,11 +2886,11 @@ yyreduce: (yyval) = 0; } } -#line 2810 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2890 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 89: -#line 1086 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1160 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2834,11 +2914,11 @@ yyreduce: (yyval) = 0; } } -#line 2838 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2918 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 90: -#line 1110 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1184 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1])); string name = StringTokPtr::dynamicCast((yyvsp[0]))->v; @@ -2863,11 +2943,11 @@ yyreduce: (yyval) = 0; } } -#line 2867 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2947 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 91: -#line 1140 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1214 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-2])) { @@ -2879,11 +2959,11 @@ yyreduce: (yyval) = 0; } } -#line 2883 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2963 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 92: -#line 1152 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1226 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1])); ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0])); @@ -2893,11 +2973,11 @@ yyreduce: op->setExceptionList(el->v); } } -#line 2897 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2977 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 93: -#line 1162 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1236 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-2])) { @@ -2905,11 +2985,11 @@ yyreduce: } yyerrok; } -#line 2909 "Grammar.tab.c" /* yacc.c:1646 */ +#line 2989 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 94: -#line 1170 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1244 "src/Slice/Grammar.y" /* yacc.c:1661 */ { OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1])); ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0])); @@ -2919,29 +2999,29 @@ yyreduce: op->setExceptionList(el->v); // Dummy } } -#line 2923 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3003 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 97: -#line 1192 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1266 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 2931 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3011 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 98: -#line 1196 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1270 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as interface name"); (yyval) = (yyvsp[0]); // Dummy } -#line 2941 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3021 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 99: -#line 1207 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1281 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -2950,11 +3030,11 @@ yyreduce: cont->checkIntroduced(ident->v, cl); (yyval) = cl; } -#line 2954 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3034 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 100: -#line 1221 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1295 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1])); @@ -2972,11 +3052,11 @@ yyreduce: (yyval) = 0; } } -#line 2976 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3056 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 101: -#line 1239 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1313 "src/Slice/Grammar.y" /* yacc.c:1661 */ { if((yyvsp[-3])) { @@ -2988,11 +3068,11 @@ yyreduce: (yyval) = 0; } } -#line 2992 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3072 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 102: -#line 1256 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1330 "src/Slice/Grammar.y" /* yacc.c:1661 */ { ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[0])); StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2])); @@ -3027,11 +3107,11 @@ yyreduce: } (yyval) = intfs; } -#line 3031 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3111 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 103: -#line 1291 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1365 "src/Slice/Grammar.y" /* yacc.c:1661 */ { ClassListTokPtr intfs = new ClassListTok; StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3066,45 +3146,45 @@ yyreduce: } (yyval) = intfs; } -#line 3070 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3150 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 104: -#line 1326 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1400 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("illegal inheritance from type Object"); (yyval) = new ClassListTok; // Dummy } -#line 3079 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3159 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 105: -#line 1331 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1405 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("illegal inheritance from type Value"); (yyval) = new ClassListTok; // Dummy } -#line 3088 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3168 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 106: -#line 1341 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1415 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 3096 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3176 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 107: -#line 1345 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1419 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = new ClassListTok; } -#line 3104 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3184 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 108: -#line 1354 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1428 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2])); @@ -3113,55 +3193,55 @@ yyreduce: contained->setMetaData(metaData->v); } } -#line 3117 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3197 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 109: -#line 1363 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1437 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3124 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3204 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 110: -#line 1366 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1440 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("`;' missing after definition"); } -#line 3132 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3212 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 111: -#line 1370 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1444 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3139 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3219 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 113: -#line 1384 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1458 "src/Slice/Grammar.y" /* yacc.c:1661 */ { ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[-2])); ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[0])); exceptionList->v.push_front(exception); (yyval) = exceptionList; } -#line 3150 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3230 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 114: -#line 1391 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1465 "src/Slice/Grammar.y" /* yacc.c:1661 */ { ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[0])); ExceptionListTokPtr exceptionList = new ExceptionListTok; exceptionList->v.push_front(exception); (yyval) = exceptionList; } -#line 3161 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3241 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 115: -#line 1403 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1477 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); @@ -3173,21 +3253,21 @@ yyreduce: cont->checkIntroduced(scoped->v, exception); (yyval) = exception; } -#line 3177 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3257 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 116: -#line 1415 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1489 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as exception name"); (yyval) = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy } -#line 3187 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3267 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 117: -#line 1426 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1500 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3196,11 +3276,11 @@ yyreduce: ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); } -#line 3200 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3280 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 118: -#line 1435 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1509 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3210,11 +3290,11 @@ yyreduce: (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy unit->error("keyword `" + ident->v + "' cannot be used as sequence name"); } -#line 3214 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3294 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 119: -#line 1450 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1524 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3225,11 +3305,11 @@ yyreduce: ContainerPtr cont = unit->currentContainer(); (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); } -#line 3229 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3309 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 120: -#line 1461 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1535 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3241,91 +3321,107 @@ yyreduce: (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy unit->error("keyword `" + ident->v + "' cannot be used as dictionary name"); } -#line 3245 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3325 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 121: -#line 1478 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1552 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 3253 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3333 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 122: -#line 1482 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1556 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as enumeration name"); (yyval) = (yyvsp[0]); // Dummy } -#line 3263 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3343 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 123: -#line 1493 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1567 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); EnumPtr en = cont->createEnum(ident->v, local->v); - cont->checkIntroduced(ident->v, en); + if(en) + { + cont->checkIntroduced(ident->v, en); + } + else + { + en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); + } + unit->pushContainer(en); (yyval) = en; } -#line 3276 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3364 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 124: -#line 1502 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1584 "src/Slice/Grammar.y" /* yacc.c:1661 */ { EnumPtr en = EnumPtr::dynamicCast((yyvsp[-3])); if(en) { - EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1])); - if(enumerators->v.empty()) - { - unit->error("enum `" + en->name() + "' must have at least one enumerator"); - } - en->setEnumerators(enumerators->v); // Dummy + EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1])); + if(enumerators->v.empty()) + { + unit->error("enum `" + en->name() + "' must have at least one enumerator"); + } + unit->popContainer(); } (yyval) = (yyvsp[-3]); } -#line 3294 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3382 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 125: -#line 1517 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1599 "src/Slice/Grammar.y" /* yacc.c:1661 */ { unit->error("missing enumeration name"); - BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-4])); + BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); - EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy - EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1])); - en->setEnumerators(enumerators->v); // Dummy + EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); + unit->pushContainer(en); (yyval) = en; } -#line 3308 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3395 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 126: -#line 1532 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 1608 "src/Slice/Grammar.y" /* yacc.c:1661 */ + { + unit->popContainer(); + (yyval) = (yyvsp[-4]); +} +#line 3404 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ + break; + + case 127: +#line 1618 "src/Slice/Grammar.y" /* yacc.c:1661 */ { EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[-2])); ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[0]))->v); (yyval) = ens; } -#line 3318 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3414 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 127: -#line 1538 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 128: +#line 1624 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3325 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3421 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 128: -#line 1546 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 129: +#line 1632 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); EnumeratorListTokPtr ens = new EnumeratorListTok; @@ -3333,15 +3429,15 @@ yyreduce: EnumeratorPtr en = cont->createEnumerator(ident->v); if(en) { - ens->v.push_front(en); + ens->v.push_front(en); } (yyval) = ens; } -#line 3341 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3437 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 129: -#line 1558 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 130: +#line 1644 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2])); EnumeratorListTokPtr ens = new EnumeratorListTok; @@ -3356,47 +3452,44 @@ yyreduce: else { EnumeratorPtr en = cont->createEnumerator(ident->v, static_cast<int>(intVal->v)); - if(en) - { - ens->v.push_front(en); - } + ens->v.push_front(en); } } (yyval) = ens; } -#line 3368 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3461 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 130: -#line 1581 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 131: +#line 1664 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); unit->error("keyword `" + ident->v + "' cannot be used as enumerator"); EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy (yyval) = ens; } -#line 3379 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3472 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 131: -#line 1588 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 132: +#line 1671 "src/Slice/Grammar.y" /* yacc.c:1661 */ { EnumeratorListTokPtr ens = new EnumeratorListTok; (yyval) = ens; // Dummy } -#line 3388 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3481 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 132: -#line 1598 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 133: +#line 1681 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 3396 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3489 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 133: -#line 1602 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 134: +#line 1685 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainedList cl = unit->currentContainer()->lookupContained(scoped->v); @@ -3430,38 +3523,38 @@ yyreduce: (yyval) = tok; } -#line 3434 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3527 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 134: -#line 1641 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 135: +#line 1724 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr out = new BoolTok; out->v = true; (yyval) = out; } -#line 3444 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3537 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 135: -#line 1647 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 136: +#line 1730 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr out = new BoolTok; out->v = false; (yyval) = out; } -#line 3454 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3547 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 136: -#line 1658 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 137: +#line 1741 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3461 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3554 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 137: -#line 1661 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 138: +#line 1744 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0])); @@ -3477,11 +3570,11 @@ yyreduce: } } } -#line 3481 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3574 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 138: -#line 1677 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 139: +#line 1760 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0])); @@ -3497,11 +3590,11 @@ yyreduce: } } } -#line 3501 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3594 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 139: -#line 1693 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 140: +#line 1776 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3])); TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); @@ -3513,11 +3606,11 @@ yyreduce: unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } -#line 3517 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3610 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 140: -#line 1705 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 141: +#line 1788 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3])); TypePtr type = TypePtr::dynamicCast((yyvsp[-1])); @@ -3529,11 +3622,11 @@ yyreduce: unit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } -#line 3533 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3626 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 141: -#line 1717 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 142: +#line 1800 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); TypePtr type = TypePtr::dynamicCast((yyvsp[0])); @@ -3544,11 +3637,11 @@ yyreduce: unit->error("missing parameter name"); } } -#line 3548 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3641 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 142: -#line 1728 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 143: +#line 1811 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2])); TypePtr type = TypePtr::dynamicCast((yyvsp[0])); @@ -3559,44 +3652,44 @@ yyreduce: unit->error("missing parameter name"); } } -#line 3563 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3656 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 143: -#line 1744 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 144: +#line 1827 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = (yyvsp[0]); } -#line 3571 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3664 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 144: -#line 1748 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 145: +#line 1831 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = new ExceptionListTok; } -#line 3579 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3672 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 145: -#line 1757 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 146: +#line 1840 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3586 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3679 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 146: -#line 1760 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 147: +#line 1843 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); ident->v = "::" + ident->v; (yyval) = ident; } -#line 3596 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3689 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 147: -#line 1766 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 148: +#line 1849 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2])); StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3604,107 +3697,107 @@ yyreduce: scoped->v += ident->v; (yyval) = scoped; } -#line 3608 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3701 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 148: -#line 1779 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 149: +#line 1862 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindByte); } -#line 3616 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3709 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 149: -#line 1783 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 150: +#line 1866 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindBool); } -#line 3624 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3717 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 150: -#line 1787 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 151: +#line 1870 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindShort); } -#line 3632 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3725 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 151: -#line 1791 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 152: +#line 1874 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindInt); } -#line 3640 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3733 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 152: -#line 1795 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 153: +#line 1878 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindLong); } -#line 3648 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3741 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 153: -#line 1799 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 154: +#line 1882 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindFloat); } -#line 3656 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3749 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 154: -#line 1803 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 155: +#line 1886 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindDouble); } -#line 3664 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3757 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 155: -#line 1807 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 156: +#line 1890 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindString); } -#line 3672 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3765 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 156: -#line 1811 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 157: +#line 1894 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindObject); } -#line 3680 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3773 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 157: -#line 1815 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 158: +#line 1898 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindObjectProxy); } -#line 3688 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3781 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 158: -#line 1819 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 159: +#line 1902 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindLocalObject); } -#line 3696 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3789 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 159: -#line 1823 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 160: +#line 1906 "src/Slice/Grammar.y" /* yacc.c:1661 */ { (yyval) = unit->builtin(Builtin::KindValue); } -#line 3704 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3797 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 160: -#line 1827 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 161: +#line 1910 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ContainerPtr cont = unit->currentContainer(); @@ -3723,11 +3816,11 @@ yyreduce: (yyval) = 0; } } -#line 3727 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3820 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 161: -#line 1846 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 162: +#line 1929 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1])); ContainerPtr cont = unit->currentContainer(); @@ -3763,70 +3856,70 @@ yyreduce: (yyval) = 0; } } -#line 3767 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3860 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 162: -#line 1887 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 163: +#line 1970 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[-1])); StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[0])); str1->v += str2->v; } -#line 3777 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3870 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 163: -#line 1893 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 164: +#line 1976 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3784 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3877 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 164: -#line 1901 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 165: +#line 1984 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0])); StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[-2])); stringList->v.push_back(str->v); (yyval) = stringList; } -#line 3795 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3888 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 165: -#line 1908 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 166: +#line 1991 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0])); StringListTokPtr stringList = new StringListTok; stringList->v.push_back(str->v); (yyval) = stringList; } -#line 3806 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3899 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 166: -#line 1920 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 167: +#line 2003 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = new BoolTok; local->v = true; (yyval) = local; } -#line 3816 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3909 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 167: -#line 1926 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 168: +#line 2009 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BoolTokPtr local = new BoolTok; local->v = false; (yyval) = local; } -#line 3826 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3919 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 168: -#line 1937 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 169: +#line 2020 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BuiltinPtr type = unit->builtin(Builtin::KindLong); IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0])); @@ -3839,11 +3932,11 @@ yyreduce: def->v.valueAsLiteral = intVal->literal; (yyval) = def; } -#line 3843 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3936 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 169: -#line 1950 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 170: +#line 2033 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BuiltinPtr type = unit->builtin(Builtin::KindDouble); FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0])); @@ -3856,17 +3949,18 @@ yyreduce: def->v.valueAsLiteral = floatVal->literal; (yyval) = def; } -#line 3860 "Grammar.tab.c" /* yacc.c:1646 */ +#line 3953 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 170: -#line 1963 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 171: +#line 2046 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0])); ConstDefTokPtr def = new ConstDefTok; - ContainedList cl = unit->currentContainer()->lookupContained(scoped->v); + ContainedList cl = unit->currentContainer()->lookupContained(scoped->v, false); if(cl.empty()) { + // Could be an enumerator def->v.type = TypePtr(0); def->v.value = SyntaxTreeBasePtr(0); def->v.valueAsString = scoped->v; @@ -3906,11 +4000,11 @@ yyreduce: } (yyval) = def; } -#line 3910 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4004 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 171: -#line 2009 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 172: +#line 2093 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BuiltinPtr type = unit->builtin(Builtin::KindString); StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3921,11 +4015,11 @@ yyreduce: def->v.valueAsLiteral = literal->literal; (yyval) = def; } -#line 3925 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4019 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 172: -#line 2020 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 173: +#line 2104 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BuiltinPtr type = unit->builtin(Builtin::KindBool); StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3936,11 +4030,11 @@ yyreduce: def->v.valueAsLiteral = "false"; (yyval) = def; } -#line 3940 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4034 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 173: -#line 2031 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 174: +#line 2115 "src/Slice/Grammar.y" /* yacc.c:1661 */ { BuiltinPtr type = unit->builtin(Builtin::KindBool); StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0])); @@ -3951,11 +4045,11 @@ yyreduce: def->v.valueAsLiteral = "true"; (yyval) = def; } -#line 3955 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4049 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 174: -#line 2047 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 175: +#line 2131 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-4])); TypePtr const_type = TypePtr::dynamicCast((yyvsp[-3])); @@ -3964,11 +4058,11 @@ yyreduce: (yyval) = unit->currentContainer()->createConst(ident->v, const_type, metaData->v, value->v.value, value->v.valueAsString, value->v.valueAsLiteral); } -#line 3968 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4062 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; - case 175: -#line 2056 "../Slice/Grammar.y" /* yacc.c:1646 */ + case 176: +#line 2140 "src/Slice/Grammar.y" /* yacc.c:1661 */ { StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3])); TypePtr const_type = TypePtr::dynamicCast((yyvsp[-2])); @@ -3977,221 +4071,221 @@ yyreduce: (yyval) = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.value, value->v.valueAsString, value->v.valueAsLiteral, Dummy); // Dummy } -#line 3981 "Grammar.tab.c" /* yacc.c:1646 */ - break; - - case 176: -#line 2070 "../Slice/Grammar.y" /* yacc.c:1646 */ - { -} -#line 3988 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4075 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 177: -#line 2073 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2154 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 3995 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4082 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 178: -#line 2076 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2157 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4002 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4089 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 179: -#line 2079 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2160 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4009 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4096 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 180: -#line 2082 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2163 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4016 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4103 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 181: -#line 2085 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2166 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4023 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4110 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 182: -#line 2088 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2169 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4030 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4117 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 183: -#line 2091 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2172 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4037 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4124 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 184: -#line 2094 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2175 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4044 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4131 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 185: -#line 2097 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2178 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4051 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4138 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 186: -#line 2100 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2181 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4058 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4145 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 187: -#line 2103 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2184 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4065 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4152 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 188: -#line 2106 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2187 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4072 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4159 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 189: -#line 2109 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2190 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4079 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4166 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 190: -#line 2112 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2193 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4086 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4173 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 191: -#line 2115 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2196 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4093 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4180 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 192: -#line 2118 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2199 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4100 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4187 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 193: -#line 2121 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2202 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4107 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4194 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 194: -#line 2124 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2205 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4114 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4201 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 195: -#line 2127 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2208 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4121 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4208 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 196: -#line 2130 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2211 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4128 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4215 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 197: -#line 2133 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2214 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4135 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4222 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 198: -#line 2136 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2217 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4142 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4229 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 199: -#line 2139 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2220 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4149 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4236 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 200: -#line 2142 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2223 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4156 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4243 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 201: -#line 2145 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2226 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4163 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4250 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 202: -#line 2148 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2229 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4170 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4257 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 203: -#line 2151 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2232 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4177 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4264 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 204: -#line 2154 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2235 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4184 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4271 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; case 205: -#line 2157 "../Slice/Grammar.y" /* yacc.c:1646 */ +#line 2238 "src/Slice/Grammar.y" /* yacc.c:1661 */ + { +} +#line 4278 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ + break; + + case 206: +#line 2241 "src/Slice/Grammar.y" /* yacc.c:1661 */ { } -#line 4191 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4285 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ break; -#line 4195 "Grammar.tab.c" /* yacc.c:1646 */ +#line 4289 "src/Slice/Grammar.cpp" /* yacc.c:1661 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4419,5 +4513,5 @@ yyreturn: #endif return yyresult; } -#line 2161 "../Slice/Grammar.y" /* yacc.c:1906 */ +#line 2245 "src/Slice/Grammar.y" /* yacc.c:1906 */ |