From 66488a50cb11cefbd40ce5e69b388828f7e0b22f Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Tue, 17 Dec 2024 13:56:25 -0500 Subject: [PATCH 1/4] Testing if you really need an end tag... --- cpp/src/IceGrid/Grammar.cpp | 376 ++++++++-------- cpp/src/IceGrid/Grammar.h | 4 +- cpp/src/IceGrid/Grammar.y | 8 +- cpp/src/IceStorm/Grammar.cpp | 80 ++-- cpp/src/IceStorm/Grammar.h | 4 +- cpp/src/IceStorm/Grammar.y | 8 +- cpp/src/Slice/Grammar.cpp | 808 ++++++++++++++++++----------------- cpp/src/Slice/Grammar.h | 6 +- cpp/src/Slice/Grammar.y | 4 + 9 files changed, 657 insertions(+), 641 deletions(-) diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp index a535bc60e02..f1e03e3688d 100644 --- a/cpp/src/IceGrid/Grammar.cpp +++ b/cpp/src/IceGrid/Grammar.cpp @@ -67,9 +67,9 @@ #line 1 "src/IceGrid/Grammar.y" -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + +// NOLINTBEGIN #line 76 "src/IceGrid/Grammar.cpp" @@ -77,7 +77,7 @@ /* First part of user prologue. */ -#line 35 "src/IceGrid/Grammar.y" +#line 37 "src/IceGrid/Grammar.y" #include "Ice/Ice.h" @@ -203,7 +203,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 27 "src/IceGrid/Grammar.y" +#line 29 "src/IceGrid/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -596,23 +596,23 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 130, 130, 133, 141, 144, 152, 161, 165, 169, - 173, 177, 181, 185, 189, 193, 197, 201, 205, 209, - 213, 217, 221, 225, 229, 233, 237, 241, 245, 249, - 253, 257, 261, 265, 269, 273, 277, 281, 285, 289, - 293, 297, 301, 305, 309, 313, 317, 321, 325, 329, - 333, 337, 341, 345, 349, 353, 357, 361, 365, 369, - 373, 377, 381, 385, 389, 393, 397, 401, 405, 409, - 413, 417, 421, 425, 429, 433, 437, 441, 445, 449, - 453, 457, 461, 465, 469, 473, 477, 481, 485, 489, - 493, 497, 501, 505, 509, 513, 517, 521, 525, 529, - 533, 537, 541, 545, 549, 553, 557, 561, 565, 569, - 573, 577, 581, 585, 589, 600, 604, 615, 626, 630, - 634, 638, 644, 649, 654, 658, 666, 671, 676, 682, - 688, 697, 700, 703, 706, 709, 712, 715, 718, 721, - 724, 727, 730, 733, 736, 739, 742, 745, 748, 751, - 754, 757, 760, 763, 766, 769, 772, 775, 778, 781, - 784, 787, 790, 793, 796, 799, 802, 805 + 0, 132, 132, 135, 143, 146, 154, 163, 167, 171, + 175, 179, 183, 187, 191, 195, 199, 203, 207, 211, + 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, + 255, 259, 263, 267, 271, 275, 279, 283, 287, 291, + 295, 299, 303, 307, 311, 315, 319, 323, 327, 331, + 335, 339, 343, 347, 351, 355, 359, 363, 367, 371, + 375, 379, 383, 387, 391, 395, 399, 403, 407, 411, + 415, 419, 423, 427, 431, 435, 439, 443, 447, 451, + 455, 459, 463, 467, 471, 475, 479, 483, 487, 491, + 495, 499, 503, 507, 511, 515, 519, 523, 527, 531, + 535, 539, 543, 547, 551, 555, 559, 563, 567, 571, + 575, 579, 583, 587, 591, 602, 606, 617, 628, 632, + 636, 640, 646, 651, 656, 660, 668, 673, 678, 684, + 690, 699, 702, 705, 708, 711, 714, 717, 720, 723, + 726, 729, 732, 735, 738, 741, 744, 747, 750, 753, + 756, 759, 762, 765, 768, 771, 774, 777, 780, 783, + 786, 789, 792, 795, 798, 801, 804, 807 }; #endif @@ -1815,35 +1815,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); switch (yyn) { case 2: /* start: commands */ -#line 131 "src/IceGrid/Grammar.y" +#line 133 "src/IceGrid/Grammar.y" { } #line 1822 "src/IceGrid/Grammar.cpp" break; case 3: /* start: %empty */ -#line 134 "src/IceGrid/Grammar.y" +#line 136 "src/IceGrid/Grammar.y" { } #line 1829 "src/IceGrid/Grammar.cpp" break; case 4: /* commands: commands checkInterrupted command */ -#line 142 "src/IceGrid/Grammar.y" +#line 144 "src/IceGrid/Grammar.y" { } #line 1836 "src/IceGrid/Grammar.cpp" break; case 5: /* commands: checkInterrupted command */ -#line 145 "src/IceGrid/Grammar.y" +#line 147 "src/IceGrid/Grammar.y" { } #line 1843 "src/IceGrid/Grammar.cpp" break; case 6: /* checkInterrupted: %empty */ -#line 153 "src/IceGrid/Grammar.y" +#line 155 "src/IceGrid/Grammar.y" { parser->checkInterrupted(); } @@ -1851,7 +1851,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 7: /* command: ICEGRID_HELP ';' */ -#line 162 "src/IceGrid/Grammar.y" +#line 164 "src/IceGrid/Grammar.y" { parser->usage(); } @@ -1859,7 +1859,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 8: /* command: ICEGRID_EXIT ';' */ -#line 166 "src/IceGrid/Grammar.y" +#line 168 "src/IceGrid/Grammar.y" { return 0; } @@ -1867,7 +1867,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 9: /* command: ICEGRID_APPLICATION ICEGRID_ADD strings ';' */ -#line 170 "src/IceGrid/Grammar.y" +#line 172 "src/IceGrid/Grammar.y" { parser->addApplication(yyvsp[-1]); } @@ -1875,7 +1875,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 10: /* command: ICEGRID_APPLICATION ICEGRID_ADD ICEGRID_HELP ';' */ -#line 174 "src/IceGrid/Grammar.y" +#line 176 "src/IceGrid/Grammar.y" { parser->usage("application", "add"); } @@ -1883,7 +1883,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 11: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE strings ';' */ -#line 178 "src/IceGrid/Grammar.y" +#line 180 "src/IceGrid/Grammar.y" { parser->removeApplication(yyvsp[-1]); } @@ -1891,7 +1891,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 12: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 182 "src/IceGrid/Grammar.y" +#line 184 "src/IceGrid/Grammar.y" { parser->usage("application", "remove"); } @@ -1899,7 +1899,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 13: /* command: ICEGRID_APPLICATION ICEGRID_DIFF strings ';' */ -#line 186 "src/IceGrid/Grammar.y" +#line 188 "src/IceGrid/Grammar.y" { parser->diffApplication(yyvsp[-1]); } @@ -1907,7 +1907,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 14: /* command: ICEGRID_APPLICATION ICEGRID_DIFF ICEGRID_HELP ';' */ -#line 190 "src/IceGrid/Grammar.y" +#line 192 "src/IceGrid/Grammar.y" { parser->usage("application", "diff"); } @@ -1915,7 +1915,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 15: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE strings ';' */ -#line 194 "src/IceGrid/Grammar.y" +#line 196 "src/IceGrid/Grammar.y" { parser->updateApplication(yyvsp[-1]); } @@ -1923,7 +1923,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 16: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE ICEGRID_HELP ';' */ -#line 198 "src/IceGrid/Grammar.y" +#line 200 "src/IceGrid/Grammar.y" { parser->usage("application", "update"); } @@ -1931,7 +1931,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 17: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE strings ';' */ -#line 202 "src/IceGrid/Grammar.y" +#line 204 "src/IceGrid/Grammar.y" { parser->describeApplication(yyvsp[-1]); } @@ -1939,7 +1939,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 18: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 206 "src/IceGrid/Grammar.y" +#line 208 "src/IceGrid/Grammar.y" { parser->usage("application", "describe"); } @@ -1947,7 +1947,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 19: /* command: ICEGRID_APPLICATION ICEGRID_LIST strings ';' */ -#line 210 "src/IceGrid/Grammar.y" +#line 212 "src/IceGrid/Grammar.y" { parser->listAllApplications(yyvsp[-1]); } @@ -1955,7 +1955,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 20: /* command: ICEGRID_APPLICATION ICEGRID_LIST ICEGRID_HELP ';' */ -#line 214 "src/IceGrid/Grammar.y" +#line 216 "src/IceGrid/Grammar.y" { parser->usage("application", "list"); } @@ -1963,7 +1963,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 21: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';' */ -#line 218 "src/IceGrid/Grammar.y" +#line 220 "src/IceGrid/Grammar.y" { parser->describeServerTemplate(yyvsp[-1]); } @@ -1971,7 +1971,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 22: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 222 "src/IceGrid/Grammar.y" +#line 224 "src/IceGrid/Grammar.y" { parser->usage("server template", "describe"); } @@ -1979,7 +1979,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 23: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE strings ';' */ -#line 226 "src/IceGrid/Grammar.y" +#line 228 "src/IceGrid/Grammar.y" { parser->instantiateServerTemplate(yyvsp[-1]); } @@ -1987,7 +1987,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 24: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE ICEGRID_HELP ';' */ -#line 230 "src/IceGrid/Grammar.y" +#line 232 "src/IceGrid/Grammar.y" { parser->usage("server template", "instantiate"); } @@ -1995,7 +1995,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 25: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_HELP ';' */ -#line 234 "src/IceGrid/Grammar.y" +#line 236 "src/IceGrid/Grammar.y" { parser->usage("server template"); } @@ -2003,7 +2003,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 26: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';' */ -#line 238 "src/IceGrid/Grammar.y" +#line 240 "src/IceGrid/Grammar.y" { parser->describeServiceTemplate(yyvsp[-1]); } @@ -2011,7 +2011,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 27: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 242 "src/IceGrid/Grammar.y" +#line 244 "src/IceGrid/Grammar.y" { parser->usage("service template", "describe"); } @@ -2019,7 +2019,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 28: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_HELP ';' */ -#line 246 "src/IceGrid/Grammar.y" +#line 248 "src/IceGrid/Grammar.y" { parser->usage("service template"); } @@ -2027,7 +2027,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 29: /* command: ICEGRID_NODE ICEGRID_DESCRIBE strings ';' */ -#line 250 "src/IceGrid/Grammar.y" +#line 252 "src/IceGrid/Grammar.y" { parser->describeNode(yyvsp[-1]); } @@ -2035,7 +2035,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 30: /* command: ICEGRID_NODE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 254 "src/IceGrid/Grammar.y" +#line 256 "src/IceGrid/Grammar.y" { parser->usage("node", "describe"); } @@ -2043,7 +2043,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 31: /* command: ICEGRID_NODE ICEGRID_PING strings ';' */ -#line 258 "src/IceGrid/Grammar.y" +#line 260 "src/IceGrid/Grammar.y" { parser->pingNode(yyvsp[-1]); } @@ -2051,7 +2051,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 32: /* command: ICEGRID_NODE ICEGRID_PING ICEGRID_HELP ';' */ -#line 262 "src/IceGrid/Grammar.y" +#line 264 "src/IceGrid/Grammar.y" { parser->usage("node", "ping"); } @@ -2059,7 +2059,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 33: /* command: ICEGRID_NODE ICEGRID_LOAD strings ';' */ -#line 266 "src/IceGrid/Grammar.y" +#line 268 "src/IceGrid/Grammar.y" { parser->printLoadNode(yyvsp[-1]); } @@ -2067,7 +2067,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 34: /* command: ICEGRID_NODE ICEGRID_LOAD ICEGRID_HELP ';' */ -#line 270 "src/IceGrid/Grammar.y" +#line 272 "src/IceGrid/Grammar.y" { parser->usage("node", "load"); } @@ -2075,7 +2075,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 35: /* command: ICEGRID_NODE ICEGRID_SOCKETS strings ';' */ -#line 274 "src/IceGrid/Grammar.y" +#line 276 "src/IceGrid/Grammar.y" { parser->printNodeProcessorSockets(yyvsp[-1]); } @@ -2083,7 +2083,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 36: /* command: ICEGRID_NODE ICEGRID_SOCKETS ICEGRID_HELP ';' */ -#line 278 "src/IceGrid/Grammar.y" +#line 280 "src/IceGrid/Grammar.y" { parser->usage("node", "sockets"); } @@ -2091,7 +2091,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 37: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN strings ';' */ -#line 282 "src/IceGrid/Grammar.y" +#line 284 "src/IceGrid/Grammar.y" { parser->shutdownNode(yyvsp[-1]); } @@ -2099,7 +2099,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 38: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN ICEGRID_HELP ';' */ -#line 286 "src/IceGrid/Grammar.y" +#line 288 "src/IceGrid/Grammar.y" { parser->usage("node", "shutdown"); } @@ -2107,7 +2107,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 39: /* command: ICEGRID_NODE ICEGRID_LIST strings ';' */ -#line 290 "src/IceGrid/Grammar.y" +#line 292 "src/IceGrid/Grammar.y" { parser->listAllNodes(yyvsp[-1]); } @@ -2115,7 +2115,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 40: /* command: ICEGRID_NODE ICEGRID_LIST ICEGRID_HELP ';' */ -#line 294 "src/IceGrid/Grammar.y" +#line 296 "src/IceGrid/Grammar.y" { parser->usage("node", "list"); } @@ -2123,7 +2123,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 41: /* command: ICEGRID_NODE ICEGRID_SHOW strings ';' */ -#line 298 "src/IceGrid/Grammar.y" +#line 300 "src/IceGrid/Grammar.y" { parser->show("node", yyvsp[-1]); } @@ -2131,7 +2131,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 42: /* command: ICEGRID_NODE ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 302 "src/IceGrid/Grammar.y" +#line 304 "src/IceGrid/Grammar.y" { parser->usage("node", "show"); } @@ -2139,7 +2139,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 43: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE strings ';' */ -#line 306 "src/IceGrid/Grammar.y" +#line 308 "src/IceGrid/Grammar.y" { parser->describeRegistry(yyvsp[-1]); } @@ -2147,7 +2147,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 44: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 310 "src/IceGrid/Grammar.y" +#line 312 "src/IceGrid/Grammar.y" { parser->usage("registry", "describe"); } @@ -2155,7 +2155,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 45: /* command: ICEGRID_REGISTRY ICEGRID_PING strings ';' */ -#line 314 "src/IceGrid/Grammar.y" +#line 316 "src/IceGrid/Grammar.y" { parser->pingRegistry(yyvsp[-1]); } @@ -2163,7 +2163,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 46: /* command: ICEGRID_REGISTRY ICEGRID_PING ICEGRID_HELP ';' */ -#line 318 "src/IceGrid/Grammar.y" +#line 320 "src/IceGrid/Grammar.y" { parser->usage("registry", "ping"); } @@ -2171,7 +2171,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 47: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN strings ';' */ -#line 322 "src/IceGrid/Grammar.y" +#line 324 "src/IceGrid/Grammar.y" { parser->shutdownRegistry(yyvsp[-1]); } @@ -2179,7 +2179,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 48: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN ICEGRID_HELP ';' */ -#line 326 "src/IceGrid/Grammar.y" +#line 328 "src/IceGrid/Grammar.y" { parser->usage("registry", "shutdown"); } @@ -2187,7 +2187,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 49: /* command: ICEGRID_REGISTRY ICEGRID_LIST strings ';' */ -#line 330 "src/IceGrid/Grammar.y" +#line 332 "src/IceGrid/Grammar.y" { parser->listAllRegistries(yyvsp[-1]); } @@ -2195,7 +2195,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 50: /* command: ICEGRID_REGISTRY ICEGRID_LIST ICEGRID_HELP ';' */ -#line 334 "src/IceGrid/Grammar.y" +#line 336 "src/IceGrid/Grammar.y" { parser->usage("registry", "list"); } @@ -2203,7 +2203,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 51: /* command: ICEGRID_REGISTRY ICEGRID_SHOW strings ';' */ -#line 338 "src/IceGrid/Grammar.y" +#line 340 "src/IceGrid/Grammar.y" { parser->show("registry", yyvsp[-1]); } @@ -2211,7 +2211,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 52: /* command: ICEGRID_REGISTRY ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 342 "src/IceGrid/Grammar.y" +#line 344 "src/IceGrid/Grammar.y" { parser->usage("registry", "show"); } @@ -2219,7 +2219,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 53: /* command: ICEGRID_SERVER ICEGRID_REMOVE strings ';' */ -#line 346 "src/IceGrid/Grammar.y" +#line 348 "src/IceGrid/Grammar.y" { parser->removeServer(yyvsp[-1]); } @@ -2227,7 +2227,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 54: /* command: ICEGRID_SERVER ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 350 "src/IceGrid/Grammar.y" +#line 352 "src/IceGrid/Grammar.y" { parser->usage("server", "remove"); } @@ -2235,7 +2235,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 55: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE strings ';' */ -#line 354 "src/IceGrid/Grammar.y" +#line 356 "src/IceGrid/Grammar.y" { parser->describeServer(yyvsp[-1]); } @@ -2243,7 +2243,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 56: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 358 "src/IceGrid/Grammar.y" +#line 360 "src/IceGrid/Grammar.y" { parser->usage("server", "describe"); } @@ -2251,7 +2251,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 57: /* command: ICEGRID_SERVER ICEGRID_START strings ';' */ -#line 362 "src/IceGrid/Grammar.y" +#line 364 "src/IceGrid/Grammar.y" { parser->startServer(yyvsp[-1]); } @@ -2259,7 +2259,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 58: /* command: ICEGRID_SERVER ICEGRID_START ICEGRID_HELP ';' */ -#line 366 "src/IceGrid/Grammar.y" +#line 368 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); } @@ -2267,7 +2267,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 59: /* command: ICEGRID_SERVER ICEGRID_STOP strings ';' */ -#line 370 "src/IceGrid/Grammar.y" +#line 372 "src/IceGrid/Grammar.y" { parser->stopServer(yyvsp[-1]); } @@ -2275,7 +2275,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 60: /* command: ICEGRID_SERVER ICEGRID_STOP ICEGRID_HELP ';' */ -#line 374 "src/IceGrid/Grammar.y" +#line 376 "src/IceGrid/Grammar.y" { parser->usage("server", "stop"); } @@ -2283,7 +2283,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 61: /* command: ICEGRID_SERVER ICEGRID_SIGNAL strings ';' */ -#line 378 "src/IceGrid/Grammar.y" +#line 380 "src/IceGrid/Grammar.y" { parser->signalServer(yyvsp[-1]); } @@ -2291,7 +2291,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 62: /* command: ICEGRID_SERVER ICEGRID_SIGNAL ICEGRID_HELP ';' */ -#line 382 "src/IceGrid/Grammar.y" +#line 384 "src/IceGrid/Grammar.y" { parser->usage("server", "signal"); } @@ -2299,7 +2299,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 63: /* command: ICEGRID_SERVER ICEGRID_STDOUT strings ';' */ -#line 386 "src/IceGrid/Grammar.y" +#line 388 "src/IceGrid/Grammar.y" { parser->writeMessage(yyvsp[-1], 1); } @@ -2307,7 +2307,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 64: /* command: ICEGRID_SERVER ICEGRID_STDOUT ICEGRID_HELP ';' */ -#line 390 "src/IceGrid/Grammar.y" +#line 392 "src/IceGrid/Grammar.y" { parser->usage("server", "stdout"); } @@ -2315,7 +2315,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 65: /* command: ICEGRID_SERVER ICEGRID_STDERR strings ';' */ -#line 394 "src/IceGrid/Grammar.y" +#line 396 "src/IceGrid/Grammar.y" { parser->writeMessage(yyvsp[-1], 2); } @@ -2323,7 +2323,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 66: /* command: ICEGRID_SERVER ICEGRID_STDERR ICEGRID_HELP ';' */ -#line 398 "src/IceGrid/Grammar.y" +#line 400 "src/IceGrid/Grammar.y" { parser->usage("server", "stderr"); } @@ -2331,7 +2331,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 67: /* command: ICEGRID_SERVER ICEGRID_STATE strings ';' */ -#line 402 "src/IceGrid/Grammar.y" +#line 404 "src/IceGrid/Grammar.y" { parser->stateServer(yyvsp[-1]); } @@ -2339,7 +2339,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 68: /* command: ICEGRID_SERVER ICEGRID_STATE ICEGRID_HELP ';' */ -#line 406 "src/IceGrid/Grammar.y" +#line 408 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); } @@ -2347,7 +2347,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 69: /* command: ICEGRID_SERVER ICEGRID_PID strings ';' */ -#line 410 "src/IceGrid/Grammar.y" +#line 412 "src/IceGrid/Grammar.y" { parser->pidServer(yyvsp[-1]); } @@ -2355,7 +2355,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 70: /* command: ICEGRID_SERVER ICEGRID_PID ICEGRID_HELP ';' */ -#line 414 "src/IceGrid/Grammar.y" +#line 416 "src/IceGrid/Grammar.y" { parser->usage("server", "pid"); } @@ -2363,7 +2363,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 71: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES strings ';' */ -#line 418 "src/IceGrid/Grammar.y" +#line 420 "src/IceGrid/Grammar.y" { parser->propertiesServer(yyvsp[-1], false); } @@ -2371,7 +2371,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 72: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES ICEGRID_HELP ';' */ -#line 422 "src/IceGrid/Grammar.y" +#line 424 "src/IceGrid/Grammar.y" { parser->usage("server", "properties"); } @@ -2379,7 +2379,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 73: /* command: ICEGRID_SERVER ICEGRID_PROPERTY strings ';' */ -#line 426 "src/IceGrid/Grammar.y" +#line 428 "src/IceGrid/Grammar.y" { parser->propertiesServer(yyvsp[-1], true); } @@ -2387,7 +2387,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 74: /* command: ICEGRID_SERVER ICEGRID_PROPERTY ICEGRID_HELP ';' */ -#line 430 "src/IceGrid/Grammar.y" +#line 432 "src/IceGrid/Grammar.y" { parser->usage("server", "property"); } @@ -2395,7 +2395,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 75: /* command: ICEGRID_SERVER ICEGRID_ENABLE strings ';' */ -#line 434 "src/IceGrid/Grammar.y" +#line 436 "src/IceGrid/Grammar.y" { parser->enableServer(yyvsp[-1], true); } @@ -2403,7 +2403,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 76: /* command: ICEGRID_SERVER ICEGRID_ENABLE ICEGRID_HELP ';' */ -#line 438 "src/IceGrid/Grammar.y" +#line 440 "src/IceGrid/Grammar.y" { parser->usage("server", "enable"); } @@ -2411,7 +2411,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 77: /* command: ICEGRID_SERVER ICEGRID_DISABLE strings ';' */ -#line 442 "src/IceGrid/Grammar.y" +#line 444 "src/IceGrid/Grammar.y" { parser->enableServer(yyvsp[-1], false); } @@ -2419,7 +2419,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 78: /* command: ICEGRID_SERVER ICEGRID_DISABLE ICEGRID_HELP ';' */ -#line 446 "src/IceGrid/Grammar.y" +#line 448 "src/IceGrid/Grammar.y" { parser->usage("server", "disable"); } @@ -2427,7 +2427,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 79: /* command: ICEGRID_SERVER ICEGRID_LIST strings ';' */ -#line 450 "src/IceGrid/Grammar.y" +#line 452 "src/IceGrid/Grammar.y" { parser->listAllServers(yyvsp[-1]); } @@ -2435,7 +2435,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 80: /* command: ICEGRID_SERVER ICEGRID_LIST ICEGRID_HELP ';' */ -#line 454 "src/IceGrid/Grammar.y" +#line 456 "src/IceGrid/Grammar.y" { parser->usage("server", "list"); } @@ -2443,7 +2443,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 81: /* command: ICEGRID_SERVER ICEGRID_SHOW strings ';' */ -#line 458 "src/IceGrid/Grammar.y" +#line 460 "src/IceGrid/Grammar.y" { parser->show("server", yyvsp[-1]); } @@ -2451,7 +2451,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 82: /* command: ICEGRID_SERVER ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 462 "src/IceGrid/Grammar.y" +#line 464 "src/IceGrid/Grammar.y" { parser->usage("server", "show"); } @@ -2459,7 +2459,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 83: /* command: ICEGRID_SERVICE ICEGRID_START strings ';' */ -#line 466 "src/IceGrid/Grammar.y" +#line 468 "src/IceGrid/Grammar.y" { parser->startService(yyvsp[-1]); } @@ -2467,7 +2467,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 84: /* command: ICEGRID_SERVICE ICEGRID_START ICEGRID_HELP ';' */ -#line 470 "src/IceGrid/Grammar.y" +#line 472 "src/IceGrid/Grammar.y" { parser->usage("service", "start"); } @@ -2475,7 +2475,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 85: /* command: ICEGRID_SERVICE ICEGRID_STOP strings ';' */ -#line 474 "src/IceGrid/Grammar.y" +#line 476 "src/IceGrid/Grammar.y" { parser->stopService(yyvsp[-1]); } @@ -2483,7 +2483,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 86: /* command: ICEGRID_SERVICE ICEGRID_STOP ICEGRID_HELP ';' */ -#line 478 "src/IceGrid/Grammar.y" +#line 480 "src/IceGrid/Grammar.y" { parser->usage("service", "stop"); } @@ -2491,7 +2491,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 87: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE strings ';' */ -#line 482 "src/IceGrid/Grammar.y" +#line 484 "src/IceGrid/Grammar.y" { parser->describeService(yyvsp[-1]); } @@ -2499,7 +2499,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 88: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 486 "src/IceGrid/Grammar.y" +#line 488 "src/IceGrid/Grammar.y" { parser->usage("service", "describe"); } @@ -2507,7 +2507,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 89: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES strings ';' */ -#line 490 "src/IceGrid/Grammar.y" +#line 492 "src/IceGrid/Grammar.y" { parser->propertiesService(yyvsp[-1], false); } @@ -2515,7 +2515,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 90: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES ICEGRID_HELP ';' */ -#line 494 "src/IceGrid/Grammar.y" +#line 496 "src/IceGrid/Grammar.y" { parser->usage("service", "properties"); } @@ -2523,7 +2523,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 91: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY strings ';' */ -#line 498 "src/IceGrid/Grammar.y" +#line 500 "src/IceGrid/Grammar.y" { parser->propertiesService(yyvsp[-1], true); } @@ -2531,7 +2531,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 92: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY ICEGRID_HELP ';' */ -#line 502 "src/IceGrid/Grammar.y" +#line 504 "src/IceGrid/Grammar.y" { parser->usage("service", "property"); } @@ -2539,7 +2539,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 93: /* command: ICEGRID_SERVICE ICEGRID_LIST strings ';' */ -#line 506 "src/IceGrid/Grammar.y" +#line 508 "src/IceGrid/Grammar.y" { parser->listServices(yyvsp[-1]); } @@ -2547,7 +2547,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 94: /* command: ICEGRID_SERVICE ICEGRID_LIST ICEGRID_HELP ';' */ -#line 510 "src/IceGrid/Grammar.y" +#line 512 "src/IceGrid/Grammar.y" { parser->usage("service", "list"); } @@ -2555,7 +2555,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 95: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS strings ';' */ -#line 514 "src/IceGrid/Grammar.y" +#line 516 "src/IceGrid/Grammar.y" { parser->endpointsAdapter(yyvsp[-1]); } @@ -2563,7 +2563,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 96: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS ICEGRID_HELP ';' */ -#line 518 "src/IceGrid/Grammar.y" +#line 520 "src/IceGrid/Grammar.y" { parser->usage("adapter", "endpoints"); } @@ -2571,7 +2571,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 97: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE strings ';' */ -#line 522 "src/IceGrid/Grammar.y" +#line 524 "src/IceGrid/Grammar.y" { parser->removeAdapter(yyvsp[-1]); } @@ -2579,7 +2579,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 98: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 526 "src/IceGrid/Grammar.y" +#line 528 "src/IceGrid/Grammar.y" { parser->usage("adapter", "remove"); } @@ -2587,7 +2587,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 99: /* command: ICEGRID_ADAPTER ICEGRID_LIST strings ';' */ -#line 530 "src/IceGrid/Grammar.y" +#line 532 "src/IceGrid/Grammar.y" { parser->listAllAdapters(yyvsp[-1]); } @@ -2595,7 +2595,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 100: /* command: ICEGRID_ADAPTER ICEGRID_LIST ICEGRID_HELP ';' */ -#line 534 "src/IceGrid/Grammar.y" +#line 536 "src/IceGrid/Grammar.y" { parser->usage("adapter", "list"); } @@ -2603,7 +2603,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 101: /* command: ICEGRID_OBJECT ICEGRID_ADD strings ';' */ -#line 538 "src/IceGrid/Grammar.y" +#line 540 "src/IceGrid/Grammar.y" { parser->addObject(yyvsp[-1]); } @@ -2611,7 +2611,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 102: /* command: ICEGRID_OBJECT ICEGRID_ADD ICEGRID_HELP ';' */ -#line 542 "src/IceGrid/Grammar.y" +#line 544 "src/IceGrid/Grammar.y" { parser->usage("object", "add"); } @@ -2619,7 +2619,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 103: /* command: ICEGRID_OBJECT ICEGRID_REMOVE strings ';' */ -#line 546 "src/IceGrid/Grammar.y" +#line 548 "src/IceGrid/Grammar.y" { parser->removeObject(yyvsp[-1]); } @@ -2627,7 +2627,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 104: /* command: ICEGRID_OBJECT ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 550 "src/IceGrid/Grammar.y" +#line 552 "src/IceGrid/Grammar.y" { parser->usage("object", "remove"); } @@ -2635,7 +2635,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 105: /* command: ICEGRID_OBJECT ICEGRID_FIND strings ';' */ -#line 554 "src/IceGrid/Grammar.y" +#line 556 "src/IceGrid/Grammar.y" { parser->findObject(yyvsp[-1]); } @@ -2643,7 +2643,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 106: /* command: ICEGRID_OBJECT ICEGRID_FIND ICEGRID_HELP ';' */ -#line 558 "src/IceGrid/Grammar.y" +#line 560 "src/IceGrid/Grammar.y" { parser->usage("object", "find"); } @@ -2651,7 +2651,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 107: /* command: ICEGRID_OBJECT ICEGRID_LIST strings ';' */ -#line 562 "src/IceGrid/Grammar.y" +#line 564 "src/IceGrid/Grammar.y" { parser->listObject(yyvsp[-1]); } @@ -2659,7 +2659,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 108: /* command: ICEGRID_OBJECT ICEGRID_LIST ICEGRID_HELP ';' */ -#line 566 "src/IceGrid/Grammar.y" +#line 568 "src/IceGrid/Grammar.y" { parser->usage("object", "list"); } @@ -2667,7 +2667,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 109: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE strings ';' */ -#line 570 "src/IceGrid/Grammar.y" +#line 572 "src/IceGrid/Grammar.y" { parser->describeObject(yyvsp[-1]); } @@ -2675,7 +2675,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 110: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 574 "src/IceGrid/Grammar.y" +#line 576 "src/IceGrid/Grammar.y" { parser->usage("object", "describe"); } @@ -2683,7 +2683,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 111: /* command: ICEGRID_SHOW ICEGRID_COPYING ';' */ -#line 578 "src/IceGrid/Grammar.y" +#line 580 "src/IceGrid/Grammar.y" { parser->showCopying(); } @@ -2691,7 +2691,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 112: /* command: ICEGRID_SHOW ICEGRID_WARRANTY ';' */ -#line 582 "src/IceGrid/Grammar.y" +#line 584 "src/IceGrid/Grammar.y" { parser->showWarranty(); } @@ -2699,7 +2699,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 113: /* command: ICEGRID_HELP keyword ';' */ -#line 586 "src/IceGrid/Grammar.y" +#line 588 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-1].front()); } @@ -2707,7 +2707,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 114: /* command: ICEGRID_HELP keyword keyword ';' */ -#line 590 "src/IceGrid/Grammar.y" +#line 592 "src/IceGrid/Grammar.y" { if ((yyvsp[-2].front() == "server" || yyvsp[-2].front() == "service") && yyvsp[-1].front() == "template") { @@ -2722,7 +2722,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 115: /* command: ICEGRID_HELP keyword ICEGRID_STRING strings ';' */ -#line 601 "src/IceGrid/Grammar.y" +#line 603 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-3].front(), yyvsp[-2].front()); } @@ -2730,7 +2730,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 116: /* command: ICEGRID_HELP keyword keyword keyword ';' */ -#line 605 "src/IceGrid/Grammar.y" +#line 607 "src/IceGrid/Grammar.y" { if ((yyvsp[-3].front() == "server" || yyvsp[-3].front() == "service") && yyvsp[-2].front() == "template") { @@ -2745,7 +2745,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 117: /* command: ICEGRID_HELP keyword keyword ICEGRID_STRING strings ';' */ -#line 616 "src/IceGrid/Grammar.y" +#line 618 "src/IceGrid/Grammar.y" { if ((yyvsp[-4].front() == "server" || yyvsp[-4].front() == "service") && yyvsp[-3].front() == "template") { @@ -2760,7 +2760,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 118: /* command: ICEGRID_HELP ICEGRID_STRING strings ';' */ -#line 627 "src/IceGrid/Grammar.y" +#line 629 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-2].front()); } @@ -2768,7 +2768,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 119: /* command: ICEGRID_HELP error ';' */ -#line 631 "src/IceGrid/Grammar.y" +#line 633 "src/IceGrid/Grammar.y" { parser->usage(); } @@ -2776,7 +2776,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 120: /* command: keyword ICEGRID_HELP ';' */ -#line 635 "src/IceGrid/Grammar.y" +#line 637 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-2].front()); } @@ -2784,7 +2784,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 121: /* command: keyword ICEGRID_STRING error ';' */ -#line 639 "src/IceGrid/Grammar.y" +#line 641 "src/IceGrid/Grammar.y" { yyvsp[-3].push_back(yyvsp[-2].front()); parser->invalidCommand(yyvsp[-3]); @@ -2794,7 +2794,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 122: /* command: keyword error ';' */ -#line 645 "src/IceGrid/Grammar.y" +#line 647 "src/IceGrid/Grammar.y" { parser->invalidCommand(yyvsp[-2]); yyerrok; @@ -2803,7 +2803,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 123: /* command: ICEGRID_STRING error ';' */ -#line 650 "src/IceGrid/Grammar.y" +#line 652 "src/IceGrid/Grammar.y" { parser->invalidCommand(yyvsp[-2]); yyerrok; @@ -2812,7 +2812,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 124: /* command: error ';' */ -#line 655 "src/IceGrid/Grammar.y" +#line 657 "src/IceGrid/Grammar.y" { yyerrok; } @@ -2820,14 +2820,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 125: /* command: ';' */ -#line 659 "src/IceGrid/Grammar.y" +#line 661 "src/IceGrid/Grammar.y" { } #line 2827 "src/IceGrid/Grammar.cpp" break; case 126: /* strings: ICEGRID_STRING strings */ -#line 667 "src/IceGrid/Grammar.y" +#line 669 "src/IceGrid/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -2836,7 +2836,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 127: /* strings: keyword strings */ -#line 672 "src/IceGrid/Grammar.y" +#line 674 "src/IceGrid/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -2845,7 +2845,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 128: /* strings: ICEGRID_STRING ICEGRID_HELP strings */ -#line 677 "src/IceGrid/Grammar.y" +#line 679 "src/IceGrid/Grammar.y" { yyval = yyvsp[-1]; yyval.push_front("help"); @@ -2855,7 +2855,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 129: /* strings: keyword ICEGRID_HELP strings */ -#line 683 "src/IceGrid/Grammar.y" +#line 685 "src/IceGrid/Grammar.y" { yyval = yyvsp[-1]; yyval.push_front("help"); @@ -2865,7 +2865,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 130: /* strings: %empty */ -#line 689 "src/IceGrid/Grammar.y" +#line 691 "src/IceGrid/Grammar.y" { yyval = YYSTYPE(); } @@ -2873,259 +2873,259 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 131: /* keyword: ICEGRID_EXIT */ -#line 698 "src/IceGrid/Grammar.y" +#line 700 "src/IceGrid/Grammar.y" { } #line 2880 "src/IceGrid/Grammar.cpp" break; case 132: /* keyword: ICEGRID_APPLICATION */ -#line 701 "src/IceGrid/Grammar.y" +#line 703 "src/IceGrid/Grammar.y" { } #line 2887 "src/IceGrid/Grammar.cpp" break; case 133: /* keyword: ICEGRID_NODE */ -#line 704 "src/IceGrid/Grammar.y" +#line 706 "src/IceGrid/Grammar.y" { } #line 2894 "src/IceGrid/Grammar.cpp" break; case 134: /* keyword: ICEGRID_REGISTRY */ -#line 707 "src/IceGrid/Grammar.y" +#line 709 "src/IceGrid/Grammar.y" { } #line 2901 "src/IceGrid/Grammar.cpp" break; case 135: /* keyword: ICEGRID_SERVER */ -#line 710 "src/IceGrid/Grammar.y" +#line 712 "src/IceGrid/Grammar.y" { } #line 2908 "src/IceGrid/Grammar.cpp" break; case 136: /* keyword: ICEGRID_ADAPTER */ -#line 713 "src/IceGrid/Grammar.y" +#line 715 "src/IceGrid/Grammar.y" { } #line 2915 "src/IceGrid/Grammar.cpp" break; case 137: /* keyword: ICEGRID_PING */ -#line 716 "src/IceGrid/Grammar.y" +#line 718 "src/IceGrid/Grammar.y" { } #line 2922 "src/IceGrid/Grammar.cpp" break; case 138: /* keyword: ICEGRID_LOAD */ -#line 719 "src/IceGrid/Grammar.y" +#line 721 "src/IceGrid/Grammar.y" { } #line 2929 "src/IceGrid/Grammar.cpp" break; case 139: /* keyword: ICEGRID_SOCKETS */ -#line 722 "src/IceGrid/Grammar.y" +#line 724 "src/IceGrid/Grammar.y" { } #line 2936 "src/IceGrid/Grammar.cpp" break; case 140: /* keyword: ICEGRID_ADD */ -#line 725 "src/IceGrid/Grammar.y" +#line 727 "src/IceGrid/Grammar.y" { } #line 2943 "src/IceGrid/Grammar.cpp" break; case 141: /* keyword: ICEGRID_REMOVE */ -#line 728 "src/IceGrid/Grammar.y" +#line 730 "src/IceGrid/Grammar.y" { } #line 2950 "src/IceGrid/Grammar.cpp" break; case 142: /* keyword: ICEGRID_LIST */ -#line 731 "src/IceGrid/Grammar.y" +#line 733 "src/IceGrid/Grammar.y" { } #line 2957 "src/IceGrid/Grammar.cpp" break; case 143: /* keyword: ICEGRID_SHUTDOWN */ -#line 734 "src/IceGrid/Grammar.y" +#line 736 "src/IceGrid/Grammar.y" { } #line 2964 "src/IceGrid/Grammar.cpp" break; case 144: /* keyword: ICEGRID_START */ -#line 737 "src/IceGrid/Grammar.y" +#line 739 "src/IceGrid/Grammar.y" { } #line 2971 "src/IceGrid/Grammar.cpp" break; case 145: /* keyword: ICEGRID_STOP */ -#line 740 "src/IceGrid/Grammar.y" +#line 742 "src/IceGrid/Grammar.y" { } #line 2978 "src/IceGrid/Grammar.cpp" break; case 146: /* keyword: ICEGRID_SIGNAL */ -#line 743 "src/IceGrid/Grammar.y" +#line 745 "src/IceGrid/Grammar.y" { } #line 2985 "src/IceGrid/Grammar.cpp" break; case 147: /* keyword: ICEGRID_DESCRIBE */ -#line 746 "src/IceGrid/Grammar.y" +#line 748 "src/IceGrid/Grammar.y" { } #line 2992 "src/IceGrid/Grammar.cpp" break; case 148: /* keyword: ICEGRID_STATE */ -#line 749 "src/IceGrid/Grammar.y" +#line 751 "src/IceGrid/Grammar.y" { } #line 2999 "src/IceGrid/Grammar.cpp" break; case 149: /* keyword: ICEGRID_PID */ -#line 752 "src/IceGrid/Grammar.y" +#line 754 "src/IceGrid/Grammar.y" { } #line 3006 "src/IceGrid/Grammar.cpp" break; case 150: /* keyword: ICEGRID_PROPERTIES */ -#line 755 "src/IceGrid/Grammar.y" +#line 757 "src/IceGrid/Grammar.y" { } #line 3013 "src/IceGrid/Grammar.cpp" break; case 151: /* keyword: ICEGRID_PROPERTY */ -#line 758 "src/IceGrid/Grammar.y" +#line 760 "src/IceGrid/Grammar.y" { } #line 3020 "src/IceGrid/Grammar.cpp" break; case 152: /* keyword: ICEGRID_ENDPOINTS */ -#line 761 "src/IceGrid/Grammar.y" +#line 763 "src/IceGrid/Grammar.y" { } #line 3027 "src/IceGrid/Grammar.cpp" break; case 153: /* keyword: ICEGRID_ACTIVATION */ -#line 764 "src/IceGrid/Grammar.y" +#line 766 "src/IceGrid/Grammar.y" { } #line 3034 "src/IceGrid/Grammar.cpp" break; case 154: /* keyword: ICEGRID_OBJECT */ -#line 767 "src/IceGrid/Grammar.y" +#line 769 "src/IceGrid/Grammar.y" { } #line 3041 "src/IceGrid/Grammar.cpp" break; case 155: /* keyword: ICEGRID_FIND */ -#line 770 "src/IceGrid/Grammar.y" +#line 772 "src/IceGrid/Grammar.y" { } #line 3048 "src/IceGrid/Grammar.cpp" break; case 156: /* keyword: ICEGRID_SHOW */ -#line 773 "src/IceGrid/Grammar.y" +#line 775 "src/IceGrid/Grammar.y" { } #line 3055 "src/IceGrid/Grammar.cpp" break; case 157: /* keyword: ICEGRID_COPYING */ -#line 776 "src/IceGrid/Grammar.y" +#line 778 "src/IceGrid/Grammar.y" { } #line 3062 "src/IceGrid/Grammar.cpp" break; case 158: /* keyword: ICEGRID_WARRANTY */ -#line 779 "src/IceGrid/Grammar.y" +#line 781 "src/IceGrid/Grammar.y" { } #line 3069 "src/IceGrid/Grammar.cpp" break; case 159: /* keyword: ICEGRID_DIFF */ -#line 782 "src/IceGrid/Grammar.y" +#line 784 "src/IceGrid/Grammar.y" { } #line 3076 "src/IceGrid/Grammar.cpp" break; case 160: /* keyword: ICEGRID_UPDATE */ -#line 785 "src/IceGrid/Grammar.y" +#line 787 "src/IceGrid/Grammar.y" { } #line 3083 "src/IceGrid/Grammar.cpp" break; case 161: /* keyword: ICEGRID_INSTANTIATE */ -#line 788 "src/IceGrid/Grammar.y" +#line 790 "src/IceGrid/Grammar.y" { } #line 3090 "src/IceGrid/Grammar.cpp" break; case 162: /* keyword: ICEGRID_TEMPLATE */ -#line 791 "src/IceGrid/Grammar.y" +#line 793 "src/IceGrid/Grammar.y" { } #line 3097 "src/IceGrid/Grammar.cpp" break; case 163: /* keyword: ICEGRID_SERVICE */ -#line 794 "src/IceGrid/Grammar.y" +#line 796 "src/IceGrid/Grammar.y" { } #line 3104 "src/IceGrid/Grammar.cpp" break; case 164: /* keyword: ICEGRID_ENABLE */ -#line 797 "src/IceGrid/Grammar.y" +#line 799 "src/IceGrid/Grammar.y" { } #line 3111 "src/IceGrid/Grammar.cpp" break; case 165: /* keyword: ICEGRID_DISABLE */ -#line 800 "src/IceGrid/Grammar.y" +#line 802 "src/IceGrid/Grammar.y" { } #line 3118 "src/IceGrid/Grammar.cpp" break; case 166: /* keyword: ICEGRID_STDERR */ -#line 803 "src/IceGrid/Grammar.y" +#line 805 "src/IceGrid/Grammar.y" { } #line 3125 "src/IceGrid/Grammar.cpp" break; case 167: /* keyword: ICEGRID_STDOUT */ -#line 806 "src/IceGrid/Grammar.y" +#line 808 "src/IceGrid/Grammar.y" { } #line 3132 "src/IceGrid/Grammar.cpp" diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h index 2b25d2ee4b6..6dc5ff9af8e 100644 --- a/cpp/src/IceGrid/Grammar.h +++ b/cpp/src/IceGrid/Grammar.h @@ -48,6 +48,8 @@ extern int yydebug; #line 9 "src/IceGrid/Grammar.y" +// NOLINTBEGIN + #include #include @@ -63,7 +65,7 @@ extern int yydebug; #define yyoverflow(a, b, c, d, e, f) yyerror(a) -#line 67 "src/IceGrid/Grammar.h" +#line 69 "src/IceGrid/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y index bd8829ccaba..47912be949a 100644 --- a/cpp/src/IceGrid/Grammar.y +++ b/cpp/src/IceGrid/Grammar.y @@ -1,13 +1,15 @@ %code top{ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + +// NOLINTBEGIN } %code requires{ +// NOLINTBEGIN + #include #include diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp index 28d7cee3281..9ff13e83e32 100644 --- a/cpp/src/IceStorm/Grammar.cpp +++ b/cpp/src/IceStorm/Grammar.cpp @@ -67,9 +67,9 @@ #line 1 "src/IceStorm/Grammar.y" -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + +// NOLINTBEGIN #line 76 "src/IceStorm/Grammar.cpp" @@ -77,7 +77,7 @@ /* First part of user prologue. */ -#line 35 "src/IceStorm/Grammar.y" +#line 37 "src/IceStorm/Grammar.y" #include "Ice/Ice.h" @@ -169,7 +169,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 27 "src/IceStorm/Grammar.y" +#line 29 "src/IceStorm/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -559,10 +559,10 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 97, 97, 100, 108, 111, 119, 123, 127, 131, - 135, 139, 143, 147, 151, 155, 159, 163, 167, 171, - 179, 184, 189, 198, 201, 204, 207, 210, 213, 216, - 219, 222 + 0, 99, 99, 102, 110, 113, 121, 125, 129, 133, + 137, 141, 145, 149, 153, 157, 161, 165, 169, 173, + 181, 186, 191, 200, 203, 206, 209, 212, 215, 218, + 221, 224 }; #endif @@ -1162,35 +1162,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); switch (yyn) { case 2: /* start: commands */ -#line 98 "src/IceStorm/Grammar.y" +#line 100 "src/IceStorm/Grammar.y" { } #line 1169 "src/IceStorm/Grammar.cpp" break; case 3: /* start: %empty */ -#line 101 "src/IceStorm/Grammar.y" +#line 103 "src/IceStorm/Grammar.y" { } #line 1176 "src/IceStorm/Grammar.cpp" break; case 4: /* commands: commands command */ -#line 109 "src/IceStorm/Grammar.y" +#line 111 "src/IceStorm/Grammar.y" { } #line 1183 "src/IceStorm/Grammar.cpp" break; case 5: /* commands: command */ -#line 112 "src/IceStorm/Grammar.y" +#line 114 "src/IceStorm/Grammar.y" { } #line 1190 "src/IceStorm/Grammar.cpp" break; case 6: /* command: ICESTORM_HELP ';' */ -#line 120 "src/IceStorm/Grammar.y" +#line 122 "src/IceStorm/Grammar.y" { parser->usage(); } @@ -1198,7 +1198,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 7: /* command: ICESTORM_EXIT ';' */ -#line 124 "src/IceStorm/Grammar.y" +#line 126 "src/IceStorm/Grammar.y" { return 0; } @@ -1206,7 +1206,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 8: /* command: ICESTORM_CREATE strings ';' */ -#line 128 "src/IceStorm/Grammar.y" +#line 130 "src/IceStorm/Grammar.y" { parser->create(yyvsp[-1]); } @@ -1214,7 +1214,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 9: /* command: ICESTORM_CURRENT strings ';' */ -#line 132 "src/IceStorm/Grammar.y" +#line 134 "src/IceStorm/Grammar.y" { parser->current(yyvsp[-1]); } @@ -1222,7 +1222,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 10: /* command: ICESTORM_DESTROY strings ';' */ -#line 136 "src/IceStorm/Grammar.y" +#line 138 "src/IceStorm/Grammar.y" { parser->destroy(yyvsp[-1]); } @@ -1230,7 +1230,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 11: /* command: ICESTORM_LINK strings ';' */ -#line 140 "src/IceStorm/Grammar.y" +#line 142 "src/IceStorm/Grammar.y" { parser->link(yyvsp[-1]); } @@ -1238,7 +1238,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 12: /* command: ICESTORM_UNLINK strings ';' */ -#line 144 "src/IceStorm/Grammar.y" +#line 146 "src/IceStorm/Grammar.y" { parser->unlink(yyvsp[-1]); } @@ -1246,7 +1246,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 13: /* command: ICESTORM_LINKS strings ';' */ -#line 148 "src/IceStorm/Grammar.y" +#line 150 "src/IceStorm/Grammar.y" { parser->links(yyvsp[-1]); } @@ -1254,7 +1254,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 14: /* command: ICESTORM_TOPICS strings ';' */ -#line 152 "src/IceStorm/Grammar.y" +#line 154 "src/IceStorm/Grammar.y" { parser->topics(yyvsp[-1]); } @@ -1262,7 +1262,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 15: /* command: ICESTORM_REPLICA strings ';' */ -#line 156 "src/IceStorm/Grammar.y" +#line 158 "src/IceStorm/Grammar.y" { parser->replica(yyvsp[-1]); } @@ -1270,7 +1270,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 16: /* command: ICESTORM_SUBSCRIBERS strings ';' */ -#line 160 "src/IceStorm/Grammar.y" +#line 162 "src/IceStorm/Grammar.y" { parser->subscribers(yyvsp[-1]); } @@ -1278,7 +1278,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 17: /* command: ICESTORM_STRING error ';' */ -#line 164 "src/IceStorm/Grammar.y" +#line 166 "src/IceStorm/Grammar.y" { parser->invalidCommand("unknown command `" + yyvsp[-2].front() + "' (type `help' for more info)"); } @@ -1286,7 +1286,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 18: /* command: error ';' */ -#line 168 "src/IceStorm/Grammar.y" +#line 170 "src/IceStorm/Grammar.y" { yyerrok; } @@ -1294,14 +1294,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 19: /* command: ';' */ -#line 172 "src/IceStorm/Grammar.y" +#line 174 "src/IceStorm/Grammar.y" { } #line 1301 "src/IceStorm/Grammar.cpp" break; case 20: /* strings: ICESTORM_STRING strings */ -#line 180 "src/IceStorm/Grammar.y" +#line 182 "src/IceStorm/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -1310,7 +1310,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 21: /* strings: keyword strings */ -#line 185 "src/IceStorm/Grammar.y" +#line 187 "src/IceStorm/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -1319,7 +1319,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 22: /* strings: %empty */ -#line 190 "src/IceStorm/Grammar.y" +#line 192 "src/IceStorm/Grammar.y" { yyval = YYSTYPE(); } @@ -1327,63 +1327,63 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 23: /* keyword: ICESTORM_HELP */ -#line 199 "src/IceStorm/Grammar.y" +#line 201 "src/IceStorm/Grammar.y" { } #line 1334 "src/IceStorm/Grammar.cpp" break; case 24: /* keyword: ICESTORM_EXIT */ -#line 202 "src/IceStorm/Grammar.y" +#line 204 "src/IceStorm/Grammar.y" { } #line 1341 "src/IceStorm/Grammar.cpp" break; case 25: /* keyword: ICESTORM_CURRENT */ -#line 205 "src/IceStorm/Grammar.y" +#line 207 "src/IceStorm/Grammar.y" { } #line 1348 "src/IceStorm/Grammar.cpp" break; case 26: /* keyword: ICESTORM_CREATE */ -#line 208 "src/IceStorm/Grammar.y" +#line 210 "src/IceStorm/Grammar.y" { } #line 1355 "src/IceStorm/Grammar.cpp" break; case 27: /* keyword: ICESTORM_DESTROY */ -#line 211 "src/IceStorm/Grammar.y" +#line 213 "src/IceStorm/Grammar.y" { } #line 1362 "src/IceStorm/Grammar.cpp" break; case 28: /* keyword: ICESTORM_LINK */ -#line 214 "src/IceStorm/Grammar.y" +#line 216 "src/IceStorm/Grammar.y" { } #line 1369 "src/IceStorm/Grammar.cpp" break; case 29: /* keyword: ICESTORM_UNLINK */ -#line 217 "src/IceStorm/Grammar.y" +#line 219 "src/IceStorm/Grammar.y" { } #line 1376 "src/IceStorm/Grammar.cpp" break; case 30: /* keyword: ICESTORM_LINKS */ -#line 220 "src/IceStorm/Grammar.y" +#line 222 "src/IceStorm/Grammar.y" { } #line 1383 "src/IceStorm/Grammar.cpp" break; case 31: /* keyword: ICESTORM_TOPICS */ -#line 223 "src/IceStorm/Grammar.y" +#line 225 "src/IceStorm/Grammar.y" { } #line 1390 "src/IceStorm/Grammar.cpp" @@ -1583,5 +1583,5 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); return yyresult; } -#line 226 "src/IceStorm/Grammar.y" +#line 228 "src/IceStorm/Grammar.y" diff --git a/cpp/src/IceStorm/Grammar.h b/cpp/src/IceStorm/Grammar.h index 1e15679de6f..288fd97f76b 100644 --- a/cpp/src/IceStorm/Grammar.h +++ b/cpp/src/IceStorm/Grammar.h @@ -48,6 +48,8 @@ extern int yydebug; #line 9 "src/IceStorm/Grammar.y" +// NOLINTBEGIN + #include #include @@ -63,7 +65,7 @@ extern int yydebug; #define yyoverflow(a, b, c, d, e, f) yyerror(a) -#line 67 "src/IceStorm/Grammar.h" +#line 69 "src/IceStorm/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y index 8659a3f9001..ff6c6c48a38 100644 --- a/cpp/src/IceStorm/Grammar.y +++ b/cpp/src/IceStorm/Grammar.y @@ -1,13 +1,15 @@ %code top{ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. + +// NOLINTBEGIN } %code requires{ +// NOLINTBEGIN + #include #include diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp index 67c9260ff8f..da8657b40f3 100644 --- a/cpp/src/Slice/Grammar.cpp +++ b/cpp/src/Slice/Grammar.cpp @@ -69,7 +69,9 @@ // Copyright (c) ZeroC, Inc. -#line 25 "src/Slice/Grammar.y" +// NOLINTBEGIN + +#line 29 "src/Slice/Grammar.y" // Defines the rule bison uses to reduce token locations. Bison asks that the macro should @@ -100,7 +102,7 @@ do \ while(0) -#line 104 "src/Slice/Grammar.cpp" +#line 106 "src/Slice/Grammar.cpp" /* Substitute the variable and function names. */ #define yyparse slice_parse @@ -110,7 +112,7 @@ while(0) #define yynerrs slice_nerrs /* First part of user prologue. */ -#line 64 "src/Slice/Grammar.y" +#line 68 "src/Slice/Grammar.y" #include "Ice/UUID.h" @@ -165,7 +167,7 @@ slice_error(const char* s) } -#line 169 "src/Slice/Grammar.cpp" +#line 171 "src/Slice/Grammar.cpp" # ifndef YY_CAST # ifdef __cplusplus @@ -330,7 +332,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 56 "src/Slice/Grammar.y" +#line 60 "src/Slice/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -338,7 +340,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; int slice_lex(YYSTYPE* lvalp, YYLTYPE* llocp); -#line 342 "src/Slice/Grammar.cpp" +#line 344 "src/Slice/Grammar.cpp" #ifdef short # undef short @@ -726,27 +728,27 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 182, 182, 190, 193, 201, 210, 214, 223, 231, - 240, 249, 248, 254, 253, 258, 263, 262, 268, 267, - 272, 277, 276, 282, 281, 286, 291, 290, 296, 295, - 300, 305, 304, 310, 309, 314, 319, 318, 323, 328, - 327, 333, 332, 337, 341, 351, 350, 381, 380, 464, - 468, 479, 490, 489, 515, 523, 532, 543, 561, 636, - 642, 653, 670, 683, 687, 698, 709, 708, 747, 751, - 762, 787, 874, 886, 899, 898, 932, 966, 975, 978, - 986, 995, 998, 1002, 1010, 1040, 1071, 1093, 1119, 1134, - 1140, 1150, 1174, 1204, 1228, 1263, 1262, 1285, 1284, 1307, - 1311, 1322, 1336, 1335, 1369, 1404, 1439, 1444, 1454, 1458, - 1467, 1476, 1479, 1483, 1491, 1498, 1510, 1522, 1533, 1541, - 1555, 1565, 1581, 1585, 1597, 1596, 1628, 1627, 1645, 1657, - 1669, 1678, 1684, 1702, 1714, 1718, 1759, 1765, 1776, 1779, - 1795, 1811, 1823, 1835, 1846, 1862, 1866, 1875, 1878, 1886, - 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1900, - 1904, 1909, 1934, 1964, 1970, 1978, 1988, 2003, 2012, 2021, - 2056, 2063, 2070, 2082, 2091, 2105, 2106, 2107, 2108, 2109, - 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, - 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, - 2130, 2131 + 0, 186, 186, 194, 197, 205, 214, 218, 227, 235, + 244, 253, 252, 258, 257, 262, 267, 266, 272, 271, + 276, 281, 280, 286, 285, 290, 295, 294, 300, 299, + 304, 309, 308, 314, 313, 318, 323, 322, 327, 332, + 331, 337, 336, 341, 345, 355, 354, 385, 384, 468, + 472, 483, 494, 493, 519, 527, 536, 547, 565, 640, + 646, 657, 674, 687, 691, 702, 713, 712, 751, 755, + 766, 791, 878, 890, 903, 902, 936, 970, 979, 982, + 990, 999, 1002, 1006, 1014, 1044, 1075, 1097, 1123, 1138, + 1144, 1154, 1178, 1208, 1232, 1267, 1266, 1289, 1288, 1311, + 1315, 1326, 1340, 1339, 1373, 1408, 1443, 1448, 1458, 1462, + 1471, 1480, 1483, 1487, 1495, 1502, 1514, 1526, 1537, 1545, + 1559, 1569, 1585, 1589, 1601, 1600, 1632, 1631, 1649, 1661, + 1673, 1682, 1688, 1706, 1718, 1722, 1763, 1769, 1780, 1783, + 1799, 1815, 1827, 1839, 1850, 1866, 1870, 1879, 1882, 1890, + 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1904, + 1908, 1913, 1938, 1968, 1974, 1982, 1992, 2007, 2016, 2025, + 2060, 2067, 2074, 2086, 2095, 2109, 2110, 2111, 2112, 2113, + 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, + 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, + 2134, 2135 }; #endif @@ -1728,52 +1730,52 @@ YYLTYPE yylloc = yyloc_default; switch (yyn) { case 2: /* start: definitions */ -#line 183 "src/Slice/Grammar.y" +#line 187 "src/Slice/Grammar.y" { } -#line 1735 "src/Slice/Grammar.cpp" +#line 1737 "src/Slice/Grammar.cpp" break; case 3: /* opt_semicolon: ';' */ -#line 191 "src/Slice/Grammar.y" +#line 195 "src/Slice/Grammar.y" { } -#line 1742 "src/Slice/Grammar.cpp" +#line 1744 "src/Slice/Grammar.cpp" break; case 4: /* opt_semicolon: %empty */ -#line 194 "src/Slice/Grammar.y" +#line 198 "src/Slice/Grammar.y" { } -#line 1749 "src/Slice/Grammar.cpp" +#line 1751 "src/Slice/Grammar.cpp" break; case 5: /* file_metadata: ICE_FILE_METADATA_OPEN metadata_list ICE_FILE_METADATA_CLOSE */ -#line 202 "src/Slice/Grammar.y" +#line 206 "src/Slice/Grammar.y" { yyval = yyvsp[-1]; } -#line 1757 "src/Slice/Grammar.cpp" +#line 1759 "src/Slice/Grammar.cpp" break; case 6: /* metadata: ICE_METADATA_OPEN metadata_list ICE_METADATA_CLOSE */ -#line 211 "src/Slice/Grammar.y" +#line 215 "src/Slice/Grammar.y" { yyval = yyvsp[-1]; } -#line 1765 "src/Slice/Grammar.cpp" +#line 1767 "src/Slice/Grammar.cpp" break; case 7: /* metadata: %empty */ -#line 215 "src/Slice/Grammar.y" +#line 219 "src/Slice/Grammar.y" { yyval = make_shared(); } -#line 1773 "src/Slice/Grammar.cpp" +#line 1775 "src/Slice/Grammar.cpp" break; case 8: /* definitions: definitions file_metadata */ -#line 224 "src/Slice/Grammar.y" +#line 228 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[0]); if (!metadata->v.empty()) @@ -1781,11 +1783,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->addFileMetadata(std::move(metadata->v)); } } -#line 1785 "src/Slice/Grammar.cpp" +#line 1787 "src/Slice/Grammar.cpp" break; case 9: /* definitions: definitions metadata definition */ -#line 232 "src/Slice/Grammar.y" +#line 236 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-1]); auto contained = dynamic_pointer_cast(yyvsp[0]); @@ -1794,186 +1796,186 @@ YYLTYPE yylloc = yyloc_default; contained->appendMetadata(std::move(metadata->v)); } } -#line 1798 "src/Slice/Grammar.cpp" +#line 1800 "src/Slice/Grammar.cpp" break; case 10: /* definitions: %empty */ -#line 241 "src/Slice/Grammar.y" +#line 245 "src/Slice/Grammar.y" { } -#line 1805 "src/Slice/Grammar.cpp" +#line 1807 "src/Slice/Grammar.cpp" break; case 11: /* $@1: %empty */ -#line 249 "src/Slice/Grammar.y" +#line 253 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1813 "src/Slice/Grammar.cpp" +#line 1815 "src/Slice/Grammar.cpp" break; case 13: /* $@2: %empty */ -#line 254 "src/Slice/Grammar.y" +#line 258 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1821 "src/Slice/Grammar.cpp" +#line 1823 "src/Slice/Grammar.cpp" break; case 15: /* definition: class_decl */ -#line 259 "src/Slice/Grammar.y" +#line 263 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after class forward declaration"); } -#line 1829 "src/Slice/Grammar.cpp" +#line 1831 "src/Slice/Grammar.cpp" break; case 16: /* $@3: %empty */ -#line 263 "src/Slice/Grammar.y" +#line 267 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1837 "src/Slice/Grammar.cpp" +#line 1839 "src/Slice/Grammar.cpp" break; case 18: /* $@4: %empty */ -#line 268 "src/Slice/Grammar.y" +#line 272 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1845 "src/Slice/Grammar.cpp" +#line 1847 "src/Slice/Grammar.cpp" break; case 20: /* definition: interface_decl */ -#line 273 "src/Slice/Grammar.y" +#line 277 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after interface forward declaration"); } -#line 1853 "src/Slice/Grammar.cpp" +#line 1855 "src/Slice/Grammar.cpp" break; case 21: /* $@5: %empty */ -#line 277 "src/Slice/Grammar.y" +#line 281 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1861 "src/Slice/Grammar.cpp" +#line 1863 "src/Slice/Grammar.cpp" break; case 23: /* $@6: %empty */ -#line 282 "src/Slice/Grammar.y" +#line 286 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr); } -#line 1869 "src/Slice/Grammar.cpp" +#line 1871 "src/Slice/Grammar.cpp" break; case 25: /* definition: exception_decl */ -#line 287 "src/Slice/Grammar.y" +#line 291 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after exception forward declaration"); } -#line 1877 "src/Slice/Grammar.cpp" +#line 1879 "src/Slice/Grammar.cpp" break; case 26: /* $@7: %empty */ -#line 291 "src/Slice/Grammar.y" +#line 295 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1885 "src/Slice/Grammar.cpp" +#line 1887 "src/Slice/Grammar.cpp" break; case 28: /* $@8: %empty */ -#line 296 "src/Slice/Grammar.y" +#line 300 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr); } -#line 1893 "src/Slice/Grammar.cpp" +#line 1895 "src/Slice/Grammar.cpp" break; case 30: /* definition: struct_decl */ -#line 301 "src/Slice/Grammar.y" +#line 305 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after struct forward declaration"); } -#line 1901 "src/Slice/Grammar.cpp" +#line 1903 "src/Slice/Grammar.cpp" break; case 31: /* $@9: %empty */ -#line 305 "src/Slice/Grammar.y" +#line 309 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1909 "src/Slice/Grammar.cpp" +#line 1911 "src/Slice/Grammar.cpp" break; case 33: /* $@10: %empty */ -#line 310 "src/Slice/Grammar.y" +#line 314 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1917 "src/Slice/Grammar.cpp" +#line 1919 "src/Slice/Grammar.cpp" break; case 35: /* definition: sequence_def */ -#line 315 "src/Slice/Grammar.y" +#line 319 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after sequence definition"); } -#line 1925 "src/Slice/Grammar.cpp" +#line 1927 "src/Slice/Grammar.cpp" break; case 36: /* $@11: %empty */ -#line 319 "src/Slice/Grammar.y" +#line 323 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1933 "src/Slice/Grammar.cpp" +#line 1935 "src/Slice/Grammar.cpp" break; case 38: /* definition: dictionary_def */ -#line 324 "src/Slice/Grammar.y" +#line 328 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after dictionary definition"); } -#line 1941 "src/Slice/Grammar.cpp" +#line 1943 "src/Slice/Grammar.cpp" break; case 39: /* $@12: %empty */ -#line 328 "src/Slice/Grammar.y" +#line 332 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1949 "src/Slice/Grammar.cpp" +#line 1951 "src/Slice/Grammar.cpp" break; case 41: /* $@13: %empty */ -#line 333 "src/Slice/Grammar.y" +#line 337 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } -#line 1957 "src/Slice/Grammar.cpp" +#line 1959 "src/Slice/Grammar.cpp" break; case 43: /* definition: const_def */ -#line 338 "src/Slice/Grammar.y" +#line 342 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after const definition"); } -#line 1965 "src/Slice/Grammar.cpp" +#line 1967 "src/Slice/Grammar.cpp" break; case 44: /* definition: error ';' */ -#line 342 "src/Slice/Grammar.y" +#line 346 "src/Slice/Grammar.y" { yyerrok; } -#line 1973 "src/Slice/Grammar.cpp" +#line 1975 "src/Slice/Grammar.cpp" break; case 45: /* @14: %empty */ -#line 351 "src/Slice/Grammar.y" +#line 355 "src/Slice/Grammar.y" { currentUnit->setSeenDefinition(); @@ -1991,11 +1993,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 1995 "src/Slice/Grammar.cpp" +#line 1997 "src/Slice/Grammar.cpp" break; case 46: /* module_def: ICE_MODULE ICE_IDENTIFIER @14 '{' definitions '}' */ -#line 369 "src/Slice/Grammar.y" +#line 373 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2007,11 +2009,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2011 "src/Slice/Grammar.cpp" +#line 2013 "src/Slice/Grammar.cpp" break; case 47: /* @15: %empty */ -#line 381 "src/Slice/Grammar.y" +#line 385 "src/Slice/Grammar.y" { currentUnit->setSeenDefinition(); @@ -2066,11 +2068,11 @@ YYLTYPE yylloc = yyloc_default; } } } -#line 2070 "src/Slice/Grammar.cpp" +#line 2072 "src/Slice/Grammar.cpp" break; case 48: /* module_def: ICE_MODULE ICE_SCOPED_IDENTIFIER @15 '{' definitions '}' */ -#line 436 "src/Slice/Grammar.y" +#line 440 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2094,38 +2096,38 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2098 "src/Slice/Grammar.cpp" +#line 2100 "src/Slice/Grammar.cpp" break; case 49: /* exception_id: ICE_EXCEPTION ICE_IDENTIFIER */ -#line 465 "src/Slice/Grammar.y" +#line 469 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 2106 "src/Slice/Grammar.cpp" +#line 2108 "src/Slice/Grammar.cpp" break; case 50: /* exception_id: ICE_EXCEPTION keyword */ -#line 469 "src/Slice/Grammar.y" +#line 473 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name"); yyval = yyvsp[0]; // Dummy } -#line 2116 "src/Slice/Grammar.cpp" +#line 2118 "src/Slice/Grammar.cpp" break; case 51: /* exception_decl: exception_id */ -#line 480 "src/Slice/Grammar.y" +#line 484 "src/Slice/Grammar.y" { currentUnit->error("exceptions cannot be forward declared"); yyval = nullptr; } -#line 2125 "src/Slice/Grammar.cpp" +#line 2127 "src/Slice/Grammar.cpp" break; case 52: /* @16: %empty */ -#line 490 "src/Slice/Grammar.y" +#line 494 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); auto base = dynamic_pointer_cast(yyvsp[0]); @@ -2138,11 +2140,11 @@ YYLTYPE yylloc = yyloc_default; } yyval = ex; } -#line 2142 "src/Slice/Grammar.cpp" +#line 2144 "src/Slice/Grammar.cpp" break; case 53: /* exception_def: exception_id exception_extends @16 '{' data_members '}' */ -#line 503 "src/Slice/Grammar.y" +#line 507 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2150,11 +2152,11 @@ YYLTYPE yylloc = yyloc_default; } yyval = yyvsp[-3]; } -#line 2154 "src/Slice/Grammar.cpp" +#line 2156 "src/Slice/Grammar.cpp" break; case 54: /* exception_extends: extends scoped_name */ -#line 516 "src/Slice/Grammar.y" +#line 520 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2162,29 +2164,29 @@ YYLTYPE yylloc = yyloc_default; cont->checkIntroduced(scoped->v); yyval = contained; } -#line 2166 "src/Slice/Grammar.cpp" +#line 2168 "src/Slice/Grammar.cpp" break; case 55: /* exception_extends: %empty */ -#line 524 "src/Slice/Grammar.y" +#line 528 "src/Slice/Grammar.y" { yyval = nullptr; } -#line 2174 "src/Slice/Grammar.cpp" +#line 2176 "src/Slice/Grammar.cpp" break; case 56: /* type_id: type ICE_IDENTIFIER */ -#line 533 "src/Slice/Grammar.y" +#line 537 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[-1]); auto ident = dynamic_pointer_cast(yyvsp[0]); yyval = make_shared(type, ident->v); } -#line 2184 "src/Slice/Grammar.cpp" +#line 2186 "src/Slice/Grammar.cpp" break; case 57: /* optional: ICE_OPTIONAL_OPEN ICE_INTEGER_LITERAL ')' */ -#line 544 "src/Slice/Grammar.y" +#line 548 "src/Slice/Grammar.y" { auto i = dynamic_pointer_cast(yyvsp[-1]); @@ -2202,11 +2204,11 @@ YYLTYPE yylloc = yyloc_default; auto m = make_shared(tag); yyval = m; } -#line 2206 "src/Slice/Grammar.cpp" +#line 2208 "src/Slice/Grammar.cpp" break; case 58: /* optional: ICE_OPTIONAL_OPEN scoped_name ')' */ -#line 562 "src/Slice/Grammar.y" +#line 566 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2281,31 +2283,31 @@ YYLTYPE yylloc = yyloc_default; auto m = make_shared(tag); yyval = m; } -#line 2285 "src/Slice/Grammar.cpp" +#line 2287 "src/Slice/Grammar.cpp" break; case 59: /* optional: ICE_OPTIONAL_OPEN ')' */ -#line 637 "src/Slice/Grammar.y" +#line 641 "src/Slice/Grammar.y" { currentUnit->error("missing tag"); auto m = make_shared(-1); // Dummy yyval = m; } -#line 2295 "src/Slice/Grammar.cpp" +#line 2297 "src/Slice/Grammar.cpp" break; case 60: /* optional: ICE_OPTIONAL */ -#line 643 "src/Slice/Grammar.y" +#line 647 "src/Slice/Grammar.y" { currentUnit->error("missing tag"); auto m = make_shared(-1); // Dummy yyval = m; } -#line 2305 "src/Slice/Grammar.cpp" +#line 2307 "src/Slice/Grammar.cpp" break; case 61: /* optional_type_id: optional type_id */ -#line 654 "src/Slice/Grammar.y" +#line 658 "src/Slice/Grammar.y" { auto m = dynamic_pointer_cast(yyvsp[-1]); auto ts = dynamic_pointer_cast(yyvsp[0]); @@ -2322,11 +2324,11 @@ YYLTYPE yylloc = yyloc_default; yyval = m; } -#line 2326 "src/Slice/Grammar.cpp" +#line 2328 "src/Slice/Grammar.cpp" break; case 62: /* optional_type_id: type_id */ -#line 671 "src/Slice/Grammar.y" +#line 675 "src/Slice/Grammar.y" { auto ts = dynamic_pointer_cast(yyvsp[0]); auto m = make_shared(-1); @@ -2334,38 +2336,38 @@ YYLTYPE yylloc = yyloc_default; m->name = ts->name; yyval = m; } -#line 2338 "src/Slice/Grammar.cpp" +#line 2340 "src/Slice/Grammar.cpp" break; case 63: /* struct_id: ICE_STRUCT ICE_IDENTIFIER */ -#line 684 "src/Slice/Grammar.y" +#line 688 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 2346 "src/Slice/Grammar.cpp" +#line 2348 "src/Slice/Grammar.cpp" break; case 64: /* struct_id: ICE_STRUCT keyword */ -#line 688 "src/Slice/Grammar.y" +#line 692 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as struct name"); yyval = yyvsp[0]; // Dummy } -#line 2356 "src/Slice/Grammar.cpp" +#line 2358 "src/Slice/Grammar.cpp" break; case 65: /* struct_decl: struct_id */ -#line 699 "src/Slice/Grammar.y" +#line 703 "src/Slice/Grammar.y" { currentUnit->error("structs cannot be forward declared"); yyval = nullptr; // Dummy } -#line 2365 "src/Slice/Grammar.cpp" +#line 2367 "src/Slice/Grammar.cpp" break; case 66: /* @17: %empty */ -#line 709 "src/Slice/Grammar.y" +#line 713 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2383,11 +2385,11 @@ YYLTYPE yylloc = yyloc_default; } yyval = st; } -#line 2387 "src/Slice/Grammar.cpp" +#line 2389 "src/Slice/Grammar.cpp" break; case 67: /* struct_def: struct_id @17 '{' data_members '}' */ -#line 727 "src/Slice/Grammar.y" +#line 731 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2403,29 +2405,29 @@ YYLTYPE yylloc = yyloc_default; currentUnit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy } } -#line 2407 "src/Slice/Grammar.cpp" +#line 2409 "src/Slice/Grammar.cpp" break; case 68: /* class_name: ICE_CLASS ICE_IDENTIFIER */ -#line 748 "src/Slice/Grammar.y" +#line 752 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 2415 "src/Slice/Grammar.cpp" +#line 2417 "src/Slice/Grammar.cpp" break; case 69: /* class_name: ICE_CLASS keyword */ -#line 752 "src/Slice/Grammar.y" +#line 756 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as class name"); yyval = yyvsp[0]; // Dummy } -#line 2425 "src/Slice/Grammar.cpp" +#line 2427 "src/Slice/Grammar.cpp" break; case 70: /* class_id: ICE_CLASS ICE_IDENT_OPEN ICE_INTEGER_LITERAL ')' */ -#line 763 "src/Slice/Grammar.y" +#line 767 "src/Slice/Grammar.y" { int64_t id = dynamic_pointer_cast(yyvsp[-1])->v; if (id < 0) @@ -2450,11 +2452,11 @@ YYLTYPE yylloc = yyloc_default; classId->t = static_cast(id); yyval = classId; } -#line 2454 "src/Slice/Grammar.cpp" +#line 2456 "src/Slice/Grammar.cpp" break; case 71: /* class_id: ICE_CLASS ICE_IDENT_OPEN scoped_name ')' */ -#line 788 "src/Slice/Grammar.y" +#line 792 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); @@ -2541,33 +2543,33 @@ YYLTYPE yylloc = yyloc_default; yyval = classId; } -#line 2545 "src/Slice/Grammar.cpp" +#line 2547 "src/Slice/Grammar.cpp" break; case 72: /* class_id: class_name */ -#line 875 "src/Slice/Grammar.y" +#line 879 "src/Slice/Grammar.y" { auto classId = make_shared(); classId->v = dynamic_pointer_cast(yyvsp[0])->v; classId->t = -1; yyval = classId; } -#line 2556 "src/Slice/Grammar.cpp" +#line 2558 "src/Slice/Grammar.cpp" break; case 73: /* class_decl: class_name */ -#line 887 "src/Slice/Grammar.y" +#line 891 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); ClassDeclPtr cl = cont->createClassDecl(ident->v); yyval = cl; } -#line 2567 "src/Slice/Grammar.cpp" +#line 2569 "src/Slice/Grammar.cpp" break; case 74: /* @18: %empty */ -#line 899 "src/Slice/Grammar.y" +#line 903 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2584,11 +2586,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2588 "src/Slice/Grammar.cpp" +#line 2590 "src/Slice/Grammar.cpp" break; case 75: /* class_def: class_id class_extends @18 '{' data_members '}' */ -#line 916 "src/Slice/Grammar.y" +#line 920 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2600,11 +2602,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2604 "src/Slice/Grammar.cpp" +#line 2606 "src/Slice/Grammar.cpp" break; case 76: /* class_extends: extends scoped_name */ -#line 933 "src/Slice/Grammar.y" +#line 937 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2638,33 +2640,33 @@ YYLTYPE yylloc = yyloc_default; } } } -#line 2642 "src/Slice/Grammar.cpp" +#line 2644 "src/Slice/Grammar.cpp" break; case 77: /* class_extends: %empty */ -#line 967 "src/Slice/Grammar.y" +#line 971 "src/Slice/Grammar.y" { yyval = nullptr; } -#line 2650 "src/Slice/Grammar.cpp" +#line 2652 "src/Slice/Grammar.cpp" break; case 78: /* extends: ICE_EXTENDS */ -#line 976 "src/Slice/Grammar.y" +#line 980 "src/Slice/Grammar.y" { } -#line 2657 "src/Slice/Grammar.cpp" +#line 2659 "src/Slice/Grammar.cpp" break; case 79: /* extends: ':' */ -#line 979 "src/Slice/Grammar.y" +#line 983 "src/Slice/Grammar.y" { } -#line 2664 "src/Slice/Grammar.cpp" +#line 2666 "src/Slice/Grammar.cpp" break; case 80: /* data_members: metadata data_member ';' data_members */ -#line 987 "src/Slice/Grammar.y" +#line 991 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto contained = dynamic_pointer_cast(yyvsp[-2]); @@ -2673,33 +2675,33 @@ YYLTYPE yylloc = yyloc_default; contained->appendMetadata(std::move(metadata->v)); } } -#line 2677 "src/Slice/Grammar.cpp" +#line 2679 "src/Slice/Grammar.cpp" break; case 81: /* data_members: error ';' data_members */ -#line 996 "src/Slice/Grammar.y" +#line 1000 "src/Slice/Grammar.y" { } -#line 2684 "src/Slice/Grammar.cpp" +#line 2686 "src/Slice/Grammar.cpp" break; case 82: /* data_members: metadata data_member */ -#line 999 "src/Slice/Grammar.y" +#line 1003 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after definition"); } -#line 2692 "src/Slice/Grammar.cpp" +#line 2694 "src/Slice/Grammar.cpp" break; case 83: /* data_members: %empty */ -#line 1003 "src/Slice/Grammar.y" +#line 1007 "src/Slice/Grammar.y" { } -#line 2699 "src/Slice/Grammar.cpp" +#line 2701 "src/Slice/Grammar.cpp" break; case 84: /* data_member: optional_type_id */ -#line 1011 "src/Slice/Grammar.y" +#line 1015 "src/Slice/Grammar.y" { auto def = dynamic_pointer_cast(yyvsp[0]); auto cl = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -2729,11 +2731,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->currentContainer()->checkIntroduced(def->name, dm); yyval = dm; } -#line 2733 "src/Slice/Grammar.cpp" +#line 2735 "src/Slice/Grammar.cpp" break; case 85: /* data_member: optional_type_id '=' const_initializer */ -#line 1041 "src/Slice/Grammar.y" +#line 1045 "src/Slice/Grammar.y" { auto def = dynamic_pointer_cast(yyvsp[-2]); auto value = dynamic_pointer_cast(yyvsp[0]); @@ -2764,11 +2766,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->currentContainer()->checkIntroduced(def->name, dm); yyval = dm; } -#line 2768 "src/Slice/Grammar.cpp" +#line 2770 "src/Slice/Grammar.cpp" break; case 86: /* data_member: type keyword */ -#line 1072 "src/Slice/Grammar.y" +#line 1076 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2790,11 +2792,11 @@ YYLTYPE yylloc = yyloc_default; assert(yyval); currentUnit->error("keyword `" + name + "' cannot be used as data member name"); } -#line 2794 "src/Slice/Grammar.cpp" +#line 2796 "src/Slice/Grammar.cpp" break; case 87: /* data_member: type */ -#line 1094 "src/Slice/Grammar.y" +#line 1098 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[0]); auto cl = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -2815,11 +2817,11 @@ YYLTYPE yylloc = yyloc_default; assert(yyval); currentUnit->error("missing data member name"); } -#line 2819 "src/Slice/Grammar.cpp" +#line 2821 "src/Slice/Grammar.cpp" break; case 88: /* return_type: optional type */ -#line 1120 "src/Slice/Grammar.y" +#line 1124 "src/Slice/Grammar.y" { auto m = dynamic_pointer_cast(yyvsp[-1]); m->type = dynamic_pointer_cast(yyvsp[0]); @@ -2834,30 +2836,30 @@ YYLTYPE yylloc = yyloc_default; yyval = m; } -#line 2838 "src/Slice/Grammar.cpp" +#line 2840 "src/Slice/Grammar.cpp" break; case 89: /* return_type: type */ -#line 1135 "src/Slice/Grammar.y" +#line 1139 "src/Slice/Grammar.y" { auto m = make_shared(-1); m->type = dynamic_pointer_cast(yyvsp[0]); yyval = m; } -#line 2848 "src/Slice/Grammar.cpp" +#line 2850 "src/Slice/Grammar.cpp" break; case 90: /* return_type: ICE_VOID */ -#line 1141 "src/Slice/Grammar.y" +#line 1145 "src/Slice/Grammar.y" { auto m = make_shared(-1); yyval = m; } -#line 2857 "src/Slice/Grammar.cpp" +#line 2859 "src/Slice/Grammar.cpp" break; case 91: /* operation_preamble: return_type ICE_IDENT_OPEN */ -#line 1151 "src/Slice/Grammar.y" +#line 1155 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2881,11 +2883,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2885 "src/Slice/Grammar.cpp" +#line 2887 "src/Slice/Grammar.cpp" break; case 92: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_IDENT_OPEN */ -#line 1175 "src/Slice/Grammar.y" +#line 1179 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2915,11 +2917,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2919 "src/Slice/Grammar.cpp" +#line 2921 "src/Slice/Grammar.cpp" break; case 93: /* operation_preamble: return_type ICE_KEYWORD_OPEN */ -#line 1205 "src/Slice/Grammar.y" +#line 1209 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2943,11 +2945,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2947 "src/Slice/Grammar.cpp" +#line 2949 "src/Slice/Grammar.cpp" break; case 94: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_KEYWORD_OPEN */ -#line 1229 "src/Slice/Grammar.y" +#line 1233 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2976,11 +2978,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2980 "src/Slice/Grammar.cpp" +#line 2982 "src/Slice/Grammar.cpp" break; case 95: /* @19: %empty */ -#line 1263 "src/Slice/Grammar.y" +#line 1267 "src/Slice/Grammar.y" { if (yyvsp[-2]) { @@ -2992,11 +2994,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 2996 "src/Slice/Grammar.cpp" +#line 2998 "src/Slice/Grammar.cpp" break; case 96: /* operation: operation_preamble parameters ')' @19 throws */ -#line 1275 "src/Slice/Grammar.y" +#line 1279 "src/Slice/Grammar.y" { auto op = dynamic_pointer_cast(yyvsp[-1]); auto el = dynamic_pointer_cast(yyvsp[0]); @@ -3006,11 +3008,11 @@ YYLTYPE yylloc = yyloc_default; op->setExceptionList(el->v); } } -#line 3010 "src/Slice/Grammar.cpp" +#line 3012 "src/Slice/Grammar.cpp" break; case 97: /* @20: %empty */ -#line 1285 "src/Slice/Grammar.y" +#line 1289 "src/Slice/Grammar.y" { if (yyvsp[-2]) { @@ -3018,11 +3020,11 @@ YYLTYPE yylloc = yyloc_default; } yyerrok; } -#line 3022 "src/Slice/Grammar.cpp" +#line 3024 "src/Slice/Grammar.cpp" break; case 98: /* operation: operation_preamble error ')' @20 throws */ -#line 1293 "src/Slice/Grammar.y" +#line 1297 "src/Slice/Grammar.y" { auto op = dynamic_pointer_cast(yyvsp[-1]); auto el = dynamic_pointer_cast(yyvsp[0]); @@ -3032,29 +3034,29 @@ YYLTYPE yylloc = yyloc_default; op->setExceptionList(el->v); // Dummy } } -#line 3036 "src/Slice/Grammar.cpp" +#line 3038 "src/Slice/Grammar.cpp" break; case 99: /* interface_id: ICE_INTERFACE ICE_IDENTIFIER */ -#line 1308 "src/Slice/Grammar.y" +#line 1312 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 3044 "src/Slice/Grammar.cpp" +#line 3046 "src/Slice/Grammar.cpp" break; case 100: /* interface_id: ICE_INTERFACE keyword */ -#line 1312 "src/Slice/Grammar.y" +#line 1316 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as interface name"); yyval = yyvsp[0]; // Dummy } -#line 3054 "src/Slice/Grammar.cpp" +#line 3056 "src/Slice/Grammar.cpp" break; case 101: /* interface_decl: interface_id */ -#line 1323 "src/Slice/Grammar.y" +#line 1327 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto cont = currentUnit->currentContainer(); @@ -3062,11 +3064,11 @@ YYLTYPE yylloc = yyloc_default; cont->checkIntroduced(ident->v, cl); yyval = cl; } -#line 3066 "src/Slice/Grammar.cpp" +#line 3068 "src/Slice/Grammar.cpp" break; case 102: /* @21: %empty */ -#line 1336 "src/Slice/Grammar.y" +#line 1340 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3083,11 +3085,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 3087 "src/Slice/Grammar.cpp" +#line 3089 "src/Slice/Grammar.cpp" break; case 103: /* interface_def: interface_id interface_extends @21 '{' operations '}' */ -#line 1353 "src/Slice/Grammar.y" +#line 1357 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -3099,11 +3101,11 @@ YYLTYPE yylloc = yyloc_default; yyval = nullptr; } } -#line 3103 "src/Slice/Grammar.cpp" +#line 3105 "src/Slice/Grammar.cpp" break; case 104: /* interface_list: scoped_name ',' interface_list */ -#line 1370 "src/Slice/Grammar.y" +#line 1374 "src/Slice/Grammar.y" { auto intfs = dynamic_pointer_cast(yyvsp[0]); auto scoped = dynamic_pointer_cast(yyvsp[-2]); @@ -3138,11 +3140,11 @@ YYLTYPE yylloc = yyloc_default; } yyval = intfs; } -#line 3142 "src/Slice/Grammar.cpp" +#line 3144 "src/Slice/Grammar.cpp" break; case 105: /* interface_list: scoped_name */ -#line 1405 "src/Slice/Grammar.y" +#line 1409 "src/Slice/Grammar.y" { auto intfs = make_shared(); auto scoped = dynamic_pointer_cast(yyvsp[0]); @@ -3177,45 +3179,45 @@ YYLTYPE yylloc = yyloc_default; } yyval = intfs; } -#line 3181 "src/Slice/Grammar.cpp" +#line 3183 "src/Slice/Grammar.cpp" break; case 106: /* interface_list: ICE_OBJECT */ -#line 1440 "src/Slice/Grammar.y" +#line 1444 "src/Slice/Grammar.y" { currentUnit->error("illegal inheritance from type Object"); yyval = make_shared(); // Dummy } -#line 3190 "src/Slice/Grammar.cpp" +#line 3192 "src/Slice/Grammar.cpp" break; case 107: /* interface_list: ICE_VALUE */ -#line 1445 "src/Slice/Grammar.y" +#line 1449 "src/Slice/Grammar.y" { currentUnit->error("illegal inheritance from type Value"); yyval = make_shared(); // Dummy } -#line 3199 "src/Slice/Grammar.cpp" +#line 3201 "src/Slice/Grammar.cpp" break; case 108: /* interface_extends: extends interface_list */ -#line 1455 "src/Slice/Grammar.y" +#line 1459 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 3207 "src/Slice/Grammar.cpp" +#line 3209 "src/Slice/Grammar.cpp" break; case 109: /* interface_extends: %empty */ -#line 1459 "src/Slice/Grammar.y" +#line 1463 "src/Slice/Grammar.y" { yyval = make_shared(); } -#line 3215 "src/Slice/Grammar.cpp" +#line 3217 "src/Slice/Grammar.cpp" break; case 110: /* operations: metadata operation ';' operations */ -#line 1468 "src/Slice/Grammar.y" +#line 1472 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto contained = dynamic_pointer_cast(yyvsp[-2]); @@ -3224,55 +3226,55 @@ YYLTYPE yylloc = yyloc_default; contained->appendMetadata(std::move(metadata->v)); } } -#line 3228 "src/Slice/Grammar.cpp" +#line 3230 "src/Slice/Grammar.cpp" break; case 111: /* operations: error ';' operations */ -#line 1477 "src/Slice/Grammar.y" +#line 1481 "src/Slice/Grammar.y" { } -#line 3235 "src/Slice/Grammar.cpp" +#line 3237 "src/Slice/Grammar.cpp" break; case 112: /* operations: metadata operation */ -#line 1480 "src/Slice/Grammar.y" +#line 1484 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after definition"); } -#line 3243 "src/Slice/Grammar.cpp" +#line 3245 "src/Slice/Grammar.cpp" break; case 113: /* operations: %empty */ -#line 1484 "src/Slice/Grammar.y" +#line 1488 "src/Slice/Grammar.y" { } -#line 3250 "src/Slice/Grammar.cpp" +#line 3252 "src/Slice/Grammar.cpp" break; case 114: /* exception_list: exception ',' exception_list */ -#line 1492 "src/Slice/Grammar.y" +#line 1496 "src/Slice/Grammar.y" { auto exception = dynamic_pointer_cast(yyvsp[-2]); auto exceptionList = dynamic_pointer_cast(yyvsp[0]); exceptionList->v.push_front(exception); yyval = exceptionList; } -#line 3261 "src/Slice/Grammar.cpp" +#line 3263 "src/Slice/Grammar.cpp" break; case 115: /* exception_list: exception */ -#line 1499 "src/Slice/Grammar.y" +#line 1503 "src/Slice/Grammar.y" { auto exception = dynamic_pointer_cast(yyvsp[0]); auto exceptionList = make_shared(); exceptionList->v.push_front(exception); yyval = exceptionList; } -#line 3272 "src/Slice/Grammar.cpp" +#line 3274 "src/Slice/Grammar.cpp" break; case 116: /* exception: scoped_name */ -#line 1511 "src/Slice/Grammar.y" +#line 1515 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3284,21 +3286,21 @@ YYLTYPE yylloc = yyloc_default; cont->checkIntroduced(scoped->v, exception); yyval = exception; } -#line 3288 "src/Slice/Grammar.cpp" +#line 3290 "src/Slice/Grammar.cpp" break; case 117: /* exception: keyword */ -#line 1523 "src/Slice/Grammar.y" +#line 1527 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name"); yyval = currentUnit->currentContainer()->createException(Ice::generateUUID(), 0, Dummy); // Dummy } -#line 3298 "src/Slice/Grammar.cpp" +#line 3300 "src/Slice/Grammar.cpp" break; case 118: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' ICE_IDENTIFIER */ -#line 1534 "src/Slice/Grammar.y" +#line 1538 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto metadata = dynamic_pointer_cast(yyvsp[-3]); @@ -3306,11 +3308,11 @@ YYLTYPE yylloc = yyloc_default; ContainerPtr cont = currentUnit->currentContainer(); yyval = cont->createSequence(ident->v, type, std::move(metadata->v)); } -#line 3310 "src/Slice/Grammar.cpp" +#line 3312 "src/Slice/Grammar.cpp" break; case 119: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' keyword */ -#line 1542 "src/Slice/Grammar.y" +#line 1546 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto metadata = dynamic_pointer_cast(yyvsp[-3]); @@ -3319,11 +3321,11 @@ YYLTYPE yylloc = yyloc_default; yyval = cont->createSequence(ident->v, type, std::move(metadata->v)); // Dummy currentUnit->error("keyword `" + ident->v + "' cannot be used as sequence name"); } -#line 3323 "src/Slice/Grammar.cpp" +#line 3325 "src/Slice/Grammar.cpp" break; case 120: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' ICE_IDENTIFIER */ -#line 1556 "src/Slice/Grammar.y" +#line 1560 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto keyMetadata = dynamic_pointer_cast(yyvsp[-6]); @@ -3333,11 +3335,11 @@ YYLTYPE yylloc = yyloc_default; ContainerPtr cont = currentUnit->currentContainer(); yyval = cont->createDictionary(ident->v, keyType, std::move(keyMetadata->v), valueType, std::move(valueMetadata->v)); } -#line 3337 "src/Slice/Grammar.cpp" +#line 3339 "src/Slice/Grammar.cpp" break; case 121: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' keyword */ -#line 1566 "src/Slice/Grammar.y" +#line 1570 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto keyMetadata = dynamic_pointer_cast(yyvsp[-6]); @@ -3348,29 +3350,29 @@ YYLTYPE yylloc = yyloc_default; yyval = cont->createDictionary(ident->v, keyType, std::move(keyMetadata->v), valueType, std::move(valueMetadata->v)); // Dummy currentUnit->error("keyword `" + ident->v + "' cannot be used as dictionary name"); } -#line 3352 "src/Slice/Grammar.cpp" +#line 3354 "src/Slice/Grammar.cpp" break; case 122: /* enum_id: ICE_ENUM ICE_IDENTIFIER */ -#line 1582 "src/Slice/Grammar.y" +#line 1586 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 3360 "src/Slice/Grammar.cpp" +#line 3362 "src/Slice/Grammar.cpp" break; case 123: /* enum_id: ICE_ENUM keyword */ -#line 1586 "src/Slice/Grammar.y" +#line 1590 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as enumeration name"); yyval = yyvsp[0]; // Dummy } -#line 3370 "src/Slice/Grammar.cpp" +#line 3372 "src/Slice/Grammar.cpp" break; case 124: /* @22: %empty */ -#line 1597 "src/Slice/Grammar.y" +#line 1601 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3386,11 +3388,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->pushContainer(en); yyval = en; } -#line 3390 "src/Slice/Grammar.cpp" +#line 3392 "src/Slice/Grammar.cpp" break; case 125: /* enum_def: enum_id @22 '{' enumerator_list '}' */ -#line 1613 "src/Slice/Grammar.y" +#line 1617 "src/Slice/Grammar.y" { auto en = dynamic_pointer_cast(yyvsp[-3]); if (en) @@ -3404,11 +3406,11 @@ YYLTYPE yylloc = yyloc_default; } yyval = yyvsp[-3]; } -#line 3408 "src/Slice/Grammar.cpp" +#line 3410 "src/Slice/Grammar.cpp" break; case 126: /* @23: %empty */ -#line 1628 "src/Slice/Grammar.y" +#line 1632 "src/Slice/Grammar.y" { currentUnit->error("missing enumeration name"); ContainerPtr cont = currentUnit->currentContainer(); @@ -3416,20 +3418,20 @@ YYLTYPE yylloc = yyloc_default; currentUnit->pushContainer(en); yyval = en; } -#line 3420 "src/Slice/Grammar.cpp" +#line 3422 "src/Slice/Grammar.cpp" break; case 127: /* enum_def: ICE_ENUM @23 '{' enumerator_list '}' */ -#line 1636 "src/Slice/Grammar.y" +#line 1640 "src/Slice/Grammar.y" { currentUnit->popContainer(); yyval = yyvsp[-4]; } -#line 3429 "src/Slice/Grammar.cpp" +#line 3431 "src/Slice/Grammar.cpp" break; case 128: /* enumerator_list: metadata enumerator ',' enumerator_list */ -#line 1646 "src/Slice/Grammar.y" +#line 1650 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto enumerator = dynamic_pointer_cast(yyvsp[-2]); @@ -3441,11 +3443,11 @@ YYLTYPE yylloc = yyloc_default; enumeratorList->v.push_front(enumerator); yyval = enumeratorList; } -#line 3445 "src/Slice/Grammar.cpp" +#line 3447 "src/Slice/Grammar.cpp" break; case 129: /* enumerator_list: metadata enumerator */ -#line 1658 "src/Slice/Grammar.y" +#line 1662 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-1]); auto enumerator = dynamic_pointer_cast(yyvsp[0]); @@ -3457,29 +3459,29 @@ YYLTYPE yylloc = yyloc_default; enumeratorList->v.push_front(enumerator); yyval = enumeratorList; } -#line 3461 "src/Slice/Grammar.cpp" +#line 3463 "src/Slice/Grammar.cpp" break; case 130: /* enumerator_list: %empty */ -#line 1670 "src/Slice/Grammar.y" +#line 1674 "src/Slice/Grammar.y" { yyval = make_shared(); // Empty list } -#line 3469 "src/Slice/Grammar.cpp" +#line 3471 "src/Slice/Grammar.cpp" break; case 131: /* enumerator: ICE_IDENTIFIER */ -#line 1679 "src/Slice/Grammar.y" +#line 1683 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); yyval = cont->createEnumerator(ident->v, nullopt); } -#line 3479 "src/Slice/Grammar.cpp" +#line 3481 "src/Slice/Grammar.cpp" break; case 132: /* enumerator: ICE_IDENTIFIER '=' enumerator_initializer */ -#line 1685 "src/Slice/Grammar.y" +#line 1689 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-2]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -3497,30 +3499,30 @@ YYLTYPE yylloc = yyloc_default; yyval = cont->createEnumerator(ident->v, nullopt); // Dummy } } -#line 3501 "src/Slice/Grammar.cpp" +#line 3503 "src/Slice/Grammar.cpp" break; case 133: /* enumerator: keyword */ -#line 1703 "src/Slice/Grammar.y" +#line 1707 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); currentUnit->error("keyword `" + ident->v + "' cannot be used as enumerator"); yyval = cont->createEnumerator(ident->v, nullopt); // Dummy } -#line 3512 "src/Slice/Grammar.cpp" +#line 3514 "src/Slice/Grammar.cpp" break; case 134: /* enumerator_initializer: ICE_INTEGER_LITERAL */ -#line 1715 "src/Slice/Grammar.y" +#line 1719 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 3520 "src/Slice/Grammar.cpp" +#line 3522 "src/Slice/Grammar.cpp" break; case 135: /* enumerator_initializer: scoped_name */ -#line 1719 "src/Slice/Grammar.y" +#line 1723 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainedList cl = currentUnit->currentContainer()->lookupContained(scoped->v, true); @@ -3556,38 +3558,38 @@ YYLTYPE yylloc = yyloc_default; yyval = tok; } -#line 3560 "src/Slice/Grammar.cpp" +#line 3562 "src/Slice/Grammar.cpp" break; case 136: /* out_qualifier: ICE_OUT */ -#line 1760 "src/Slice/Grammar.y" +#line 1764 "src/Slice/Grammar.y" { auto out = make_shared(); out->v = true; yyval = out; } -#line 3570 "src/Slice/Grammar.cpp" +#line 3572 "src/Slice/Grammar.cpp" break; case 137: /* out_qualifier: %empty */ -#line 1766 "src/Slice/Grammar.y" +#line 1770 "src/Slice/Grammar.y" { auto out = make_shared(); out->v = false; yyval = out; } -#line 3580 "src/Slice/Grammar.cpp" +#line 3582 "src/Slice/Grammar.cpp" break; case 138: /* parameters: %empty */ -#line 1777 "src/Slice/Grammar.y" +#line 1781 "src/Slice/Grammar.y" { } -#line 3587 "src/Slice/Grammar.cpp" +#line 3589 "src/Slice/Grammar.cpp" break; case 139: /* parameters: out_qualifier metadata optional_type_id */ -#line 1780 "src/Slice/Grammar.y" +#line 1784 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto tsp = dynamic_pointer_cast(yyvsp[0]); @@ -3603,11 +3605,11 @@ YYLTYPE yylloc = yyloc_default; } } } -#line 3607 "src/Slice/Grammar.cpp" +#line 3609 "src/Slice/Grammar.cpp" break; case 140: /* parameters: parameters ',' out_qualifier metadata optional_type_id */ -#line 1796 "src/Slice/Grammar.y" +#line 1800 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto tsp = dynamic_pointer_cast(yyvsp[0]); @@ -3623,11 +3625,11 @@ YYLTYPE yylloc = yyloc_default; } } } -#line 3627 "src/Slice/Grammar.cpp" +#line 3629 "src/Slice/Grammar.cpp" break; case 141: /* parameters: out_qualifier metadata type keyword */ -#line 1812 "src/Slice/Grammar.y" +#line 1816 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-3]); auto type = dynamic_pointer_cast(yyvsp[-1]); @@ -3639,11 +3641,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } -#line 3643 "src/Slice/Grammar.cpp" +#line 3645 "src/Slice/Grammar.cpp" break; case 142: /* parameters: parameters ',' out_qualifier metadata type keyword */ -#line 1824 "src/Slice/Grammar.y" +#line 1828 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-3]); auto type = dynamic_pointer_cast(yyvsp[-1]); @@ -3655,11 +3657,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->error("keyword `" + ident->v + "' cannot be used as parameter name"); } } -#line 3659 "src/Slice/Grammar.cpp" +#line 3661 "src/Slice/Grammar.cpp" break; case 143: /* parameters: out_qualifier metadata type */ -#line 1836 "src/Slice/Grammar.y" +#line 1840 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto type = dynamic_pointer_cast(yyvsp[0]); @@ -3670,11 +3672,11 @@ YYLTYPE yylloc = yyloc_default; currentUnit->error("missing parameter name"); } } -#line 3674 "src/Slice/Grammar.cpp" +#line 3676 "src/Slice/Grammar.cpp" break; case 144: /* parameters: parameters ',' out_qualifier metadata type */ -#line 1847 "src/Slice/Grammar.y" +#line 1851 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto type = dynamic_pointer_cast(yyvsp[0]); @@ -3685,118 +3687,118 @@ YYLTYPE yylloc = yyloc_default; currentUnit->error("missing parameter name"); } } -#line 3689 "src/Slice/Grammar.cpp" +#line 3691 "src/Slice/Grammar.cpp" break; case 145: /* throws: ICE_THROWS exception_list */ -#line 1863 "src/Slice/Grammar.y" +#line 1867 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } -#line 3697 "src/Slice/Grammar.cpp" +#line 3699 "src/Slice/Grammar.cpp" break; case 146: /* throws: %empty */ -#line 1867 "src/Slice/Grammar.y" +#line 1871 "src/Slice/Grammar.y" { yyval = make_shared(); } -#line 3705 "src/Slice/Grammar.cpp" +#line 3707 "src/Slice/Grammar.cpp" break; case 147: /* scoped_name: ICE_IDENTIFIER */ -#line 1876 "src/Slice/Grammar.y" +#line 1880 "src/Slice/Grammar.y" { } -#line 3712 "src/Slice/Grammar.cpp" +#line 3714 "src/Slice/Grammar.cpp" break; case 148: /* scoped_name: ICE_SCOPED_IDENTIFIER */ -#line 1879 "src/Slice/Grammar.y" +#line 1883 "src/Slice/Grammar.y" { } -#line 3719 "src/Slice/Grammar.cpp" +#line 3721 "src/Slice/Grammar.cpp" break; case 149: /* builtin: ICE_BOOL */ -#line 1886 "src/Slice/Grammar.y" +#line 1890 "src/Slice/Grammar.y" {} -#line 3725 "src/Slice/Grammar.cpp" +#line 3727 "src/Slice/Grammar.cpp" break; case 150: /* builtin: ICE_BYTE */ -#line 1887 "src/Slice/Grammar.y" +#line 1891 "src/Slice/Grammar.y" {} -#line 3731 "src/Slice/Grammar.cpp" +#line 3733 "src/Slice/Grammar.cpp" break; case 151: /* builtin: ICE_SHORT */ -#line 1888 "src/Slice/Grammar.y" +#line 1892 "src/Slice/Grammar.y" {} -#line 3737 "src/Slice/Grammar.cpp" +#line 3739 "src/Slice/Grammar.cpp" break; case 152: /* builtin: ICE_INT */ -#line 1889 "src/Slice/Grammar.y" +#line 1893 "src/Slice/Grammar.y" {} -#line 3743 "src/Slice/Grammar.cpp" +#line 3745 "src/Slice/Grammar.cpp" break; case 153: /* builtin: ICE_LONG */ -#line 1890 "src/Slice/Grammar.y" +#line 1894 "src/Slice/Grammar.y" {} -#line 3749 "src/Slice/Grammar.cpp" +#line 3751 "src/Slice/Grammar.cpp" break; case 154: /* builtin: ICE_FLOAT */ -#line 1891 "src/Slice/Grammar.y" +#line 1895 "src/Slice/Grammar.y" {} -#line 3755 "src/Slice/Grammar.cpp" +#line 3757 "src/Slice/Grammar.cpp" break; case 155: /* builtin: ICE_DOUBLE */ -#line 1892 "src/Slice/Grammar.y" +#line 1896 "src/Slice/Grammar.y" {} -#line 3761 "src/Slice/Grammar.cpp" +#line 3763 "src/Slice/Grammar.cpp" break; case 156: /* builtin: ICE_STRING */ -#line 1893 "src/Slice/Grammar.y" +#line 1897 "src/Slice/Grammar.y" {} -#line 3767 "src/Slice/Grammar.cpp" +#line 3769 "src/Slice/Grammar.cpp" break; case 157: /* builtin: ICE_OBJECT */ -#line 1894 "src/Slice/Grammar.y" +#line 1898 "src/Slice/Grammar.y" {} -#line 3773 "src/Slice/Grammar.cpp" +#line 3775 "src/Slice/Grammar.cpp" break; case 158: /* builtin: ICE_VALUE */ -#line 1895 "src/Slice/Grammar.y" +#line 1899 "src/Slice/Grammar.y" {} -#line 3779 "src/Slice/Grammar.cpp" +#line 3781 "src/Slice/Grammar.cpp" break; case 159: /* type: ICE_OBJECT '*' */ -#line 1901 "src/Slice/Grammar.y" +#line 1905 "src/Slice/Grammar.y" { yyval = currentUnit->createBuiltin(Builtin::KindObjectProxy); } -#line 3787 "src/Slice/Grammar.cpp" +#line 3789 "src/Slice/Grammar.cpp" break; case 160: /* type: builtin */ -#line 1905 "src/Slice/Grammar.y" +#line 1909 "src/Slice/Grammar.y" { auto typeName = dynamic_pointer_cast(yyvsp[0]); yyval = currentUnit->createBuiltin(Builtin::kindFromString(typeName->v).value()); } -#line 3796 "src/Slice/Grammar.cpp" +#line 3798 "src/Slice/Grammar.cpp" break; case 161: /* type: scoped_name */ -#line 1910 "src/Slice/Grammar.y" +#line 1914 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3821,11 +3823,11 @@ YYLTYPE yylloc = yyloc_default; yyval = firstType; } -#line 3825 "src/Slice/Grammar.cpp" +#line 3827 "src/Slice/Grammar.cpp" break; case 162: /* type: scoped_name '*' */ -#line 1935 "src/Slice/Grammar.y" +#line 1939 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3850,28 +3852,28 @@ YYLTYPE yylloc = yyloc_default; yyval = firstType; } -#line 3854 "src/Slice/Grammar.cpp" +#line 3856 "src/Slice/Grammar.cpp" break; case 163: /* string_literal: ICE_STRING_LITERAL string_literal */ -#line 1965 "src/Slice/Grammar.y" +#line 1969 "src/Slice/Grammar.y" { auto str1 = dynamic_pointer_cast(yyvsp[-1]); auto str2 = dynamic_pointer_cast(yyvsp[0]); str1->v += str2->v; } -#line 3864 "src/Slice/Grammar.cpp" +#line 3866 "src/Slice/Grammar.cpp" break; case 164: /* string_literal: ICE_STRING_LITERAL */ -#line 1971 "src/Slice/Grammar.y" +#line 1975 "src/Slice/Grammar.y" { } -#line 3871 "src/Slice/Grammar.cpp" +#line 3873 "src/Slice/Grammar.cpp" break; case 165: /* metadata_list: metadata_list ',' string_literal */ -#line 1979 "src/Slice/Grammar.y" +#line 1983 "src/Slice/Grammar.y" { auto str = dynamic_pointer_cast(yyvsp[0]); auto metadataList = dynamic_pointer_cast(yyvsp[-2]); @@ -3881,11 +3883,11 @@ YYLTYPE yylloc = yyloc_default; yyval = metadataList; } -#line 3885 "src/Slice/Grammar.cpp" +#line 3887 "src/Slice/Grammar.cpp" break; case 166: /* metadata_list: string_literal */ -#line 1989 "src/Slice/Grammar.y" +#line 1993 "src/Slice/Grammar.y" { auto str = dynamic_pointer_cast(yyvsp[0]); auto metadataList = make_shared(); @@ -3895,11 +3897,11 @@ YYLTYPE yylloc = yyloc_default; yyval = metadataList; } -#line 3899 "src/Slice/Grammar.cpp" +#line 3901 "src/Slice/Grammar.cpp" break; case 167: /* const_initializer: ICE_INTEGER_LITERAL */ -#line 2004 "src/Slice/Grammar.y" +#line 2008 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindLong); auto intVal = dynamic_pointer_cast(yyvsp[0]); @@ -3908,11 +3910,11 @@ YYLTYPE yylloc = yyloc_default; auto def = make_shared(type, sstr.str()); yyval = def; } -#line 3912 "src/Slice/Grammar.cpp" +#line 3914 "src/Slice/Grammar.cpp" break; case 168: /* const_initializer: ICE_FLOATING_POINT_LITERAL */ -#line 2013 "src/Slice/Grammar.y" +#line 2017 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindDouble); auto floatVal = dynamic_pointer_cast(yyvsp[0]); @@ -3921,11 +3923,11 @@ YYLTYPE yylloc = yyloc_default; auto def = make_shared(type, sstr.str()); yyval = def; } -#line 3925 "src/Slice/Grammar.cpp" +#line 3927 "src/Slice/Grammar.cpp" break; case 169: /* const_initializer: scoped_name */ -#line 2022 "src/Slice/Grammar.y" +#line 2026 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ConstDefTokPtr def; @@ -3960,44 +3962,44 @@ YYLTYPE yylloc = yyloc_default; } yyval = def; } -#line 3964 "src/Slice/Grammar.cpp" +#line 3966 "src/Slice/Grammar.cpp" break; case 170: /* const_initializer: ICE_STRING_LITERAL */ -#line 2057 "src/Slice/Grammar.y" +#line 2061 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindString); auto literal = dynamic_pointer_cast(yyvsp[0]); auto def = make_shared(type, literal->v); yyval = def; } -#line 3975 "src/Slice/Grammar.cpp" +#line 3977 "src/Slice/Grammar.cpp" break; case 171: /* const_initializer: ICE_FALSE */ -#line 2064 "src/Slice/Grammar.y" +#line 2068 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool); auto literal = dynamic_pointer_cast(yyvsp[0]); auto def = make_shared(type, "false"); yyval = def; } -#line 3986 "src/Slice/Grammar.cpp" +#line 3988 "src/Slice/Grammar.cpp" break; case 172: /* const_initializer: ICE_TRUE */ -#line 2071 "src/Slice/Grammar.y" +#line 2075 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool); auto literal = dynamic_pointer_cast(yyvsp[0]); auto def = make_shared(type, "true"); yyval = def; } -#line 3997 "src/Slice/Grammar.cpp" +#line 3999 "src/Slice/Grammar.cpp" break; case 173: /* const_def: ICE_CONST metadata type ICE_IDENTIFIER '=' const_initializer */ -#line 2083 "src/Slice/Grammar.y" +#line 2087 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-4]); auto const_type = dynamic_pointer_cast(yyvsp[-3]); @@ -4006,11 +4008,11 @@ YYLTYPE yylloc = yyloc_default; yyval = currentUnit->currentContainer()->createConst(ident->v, const_type, std::move(metadata->v), value->v, value->valueAsString); } -#line 4010 "src/Slice/Grammar.cpp" +#line 4012 "src/Slice/Grammar.cpp" break; case 174: /* const_def: ICE_CONST metadata type '=' const_initializer */ -#line 2092 "src/Slice/Grammar.y" +#line 2096 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto const_type = dynamic_pointer_cast(yyvsp[-2]); @@ -4019,173 +4021,173 @@ YYLTYPE yylloc = yyloc_default; yyval = currentUnit->currentContainer()->createConst(Ice::generateUUID(), const_type, std::move(metadata->v), value->v, value->valueAsString, Dummy); // Dummy } -#line 4023 "src/Slice/Grammar.cpp" +#line 4025 "src/Slice/Grammar.cpp" break; case 175: /* keyword: ICE_MODULE */ -#line 2105 "src/Slice/Grammar.y" +#line 2109 "src/Slice/Grammar.y" {} -#line 4029 "src/Slice/Grammar.cpp" +#line 4031 "src/Slice/Grammar.cpp" break; case 176: /* keyword: ICE_CLASS */ -#line 2106 "src/Slice/Grammar.y" +#line 2110 "src/Slice/Grammar.y" {} -#line 4035 "src/Slice/Grammar.cpp" +#line 4037 "src/Slice/Grammar.cpp" break; case 177: /* keyword: ICE_INTERFACE */ -#line 2107 "src/Slice/Grammar.y" +#line 2111 "src/Slice/Grammar.y" {} -#line 4041 "src/Slice/Grammar.cpp" +#line 4043 "src/Slice/Grammar.cpp" break; case 178: /* keyword: ICE_EXCEPTION */ -#line 2108 "src/Slice/Grammar.y" +#line 2112 "src/Slice/Grammar.y" {} -#line 4047 "src/Slice/Grammar.cpp" +#line 4049 "src/Slice/Grammar.cpp" break; case 179: /* keyword: ICE_STRUCT */ -#line 2109 "src/Slice/Grammar.y" +#line 2113 "src/Slice/Grammar.y" {} -#line 4053 "src/Slice/Grammar.cpp" +#line 4055 "src/Slice/Grammar.cpp" break; case 180: /* keyword: ICE_SEQUENCE */ -#line 2110 "src/Slice/Grammar.y" +#line 2114 "src/Slice/Grammar.y" {} -#line 4059 "src/Slice/Grammar.cpp" +#line 4061 "src/Slice/Grammar.cpp" break; case 181: /* keyword: ICE_DICTIONARY */ -#line 2111 "src/Slice/Grammar.y" +#line 2115 "src/Slice/Grammar.y" {} -#line 4065 "src/Slice/Grammar.cpp" +#line 4067 "src/Slice/Grammar.cpp" break; case 182: /* keyword: ICE_ENUM */ -#line 2112 "src/Slice/Grammar.y" +#line 2116 "src/Slice/Grammar.y" {} -#line 4071 "src/Slice/Grammar.cpp" +#line 4073 "src/Slice/Grammar.cpp" break; case 183: /* keyword: ICE_OUT */ -#line 2113 "src/Slice/Grammar.y" +#line 2117 "src/Slice/Grammar.y" {} -#line 4077 "src/Slice/Grammar.cpp" +#line 4079 "src/Slice/Grammar.cpp" break; case 184: /* keyword: ICE_EXTENDS */ -#line 2114 "src/Slice/Grammar.y" +#line 2118 "src/Slice/Grammar.y" {} -#line 4083 "src/Slice/Grammar.cpp" +#line 4085 "src/Slice/Grammar.cpp" break; case 185: /* keyword: ICE_THROWS */ -#line 2115 "src/Slice/Grammar.y" +#line 2119 "src/Slice/Grammar.y" {} -#line 4089 "src/Slice/Grammar.cpp" +#line 4091 "src/Slice/Grammar.cpp" break; case 186: /* keyword: ICE_VOID */ -#line 2116 "src/Slice/Grammar.y" +#line 2120 "src/Slice/Grammar.y" {} -#line 4095 "src/Slice/Grammar.cpp" +#line 4097 "src/Slice/Grammar.cpp" break; case 187: /* keyword: ICE_BOOL */ -#line 2117 "src/Slice/Grammar.y" +#line 2121 "src/Slice/Grammar.y" {} -#line 4101 "src/Slice/Grammar.cpp" +#line 4103 "src/Slice/Grammar.cpp" break; case 188: /* keyword: ICE_BYTE */ -#line 2118 "src/Slice/Grammar.y" +#line 2122 "src/Slice/Grammar.y" {} -#line 4107 "src/Slice/Grammar.cpp" +#line 4109 "src/Slice/Grammar.cpp" break; case 189: /* keyword: ICE_SHORT */ -#line 2119 "src/Slice/Grammar.y" +#line 2123 "src/Slice/Grammar.y" {} -#line 4113 "src/Slice/Grammar.cpp" +#line 4115 "src/Slice/Grammar.cpp" break; case 190: /* keyword: ICE_INT */ -#line 2120 "src/Slice/Grammar.y" +#line 2124 "src/Slice/Grammar.y" {} -#line 4119 "src/Slice/Grammar.cpp" +#line 4121 "src/Slice/Grammar.cpp" break; case 191: /* keyword: ICE_LONG */ -#line 2121 "src/Slice/Grammar.y" +#line 2125 "src/Slice/Grammar.y" {} -#line 4125 "src/Slice/Grammar.cpp" +#line 4127 "src/Slice/Grammar.cpp" break; case 192: /* keyword: ICE_FLOAT */ -#line 2122 "src/Slice/Grammar.y" +#line 2126 "src/Slice/Grammar.y" {} -#line 4131 "src/Slice/Grammar.cpp" +#line 4133 "src/Slice/Grammar.cpp" break; case 193: /* keyword: ICE_DOUBLE */ -#line 2123 "src/Slice/Grammar.y" +#line 2127 "src/Slice/Grammar.y" {} -#line 4137 "src/Slice/Grammar.cpp" +#line 4139 "src/Slice/Grammar.cpp" break; case 194: /* keyword: ICE_STRING */ -#line 2124 "src/Slice/Grammar.y" +#line 2128 "src/Slice/Grammar.y" {} -#line 4143 "src/Slice/Grammar.cpp" +#line 4145 "src/Slice/Grammar.cpp" break; case 195: /* keyword: ICE_OBJECT */ -#line 2125 "src/Slice/Grammar.y" +#line 2129 "src/Slice/Grammar.y" {} -#line 4149 "src/Slice/Grammar.cpp" +#line 4151 "src/Slice/Grammar.cpp" break; case 196: /* keyword: ICE_CONST */ -#line 2126 "src/Slice/Grammar.y" +#line 2130 "src/Slice/Grammar.y" {} -#line 4155 "src/Slice/Grammar.cpp" +#line 4157 "src/Slice/Grammar.cpp" break; case 197: /* keyword: ICE_FALSE */ -#line 2127 "src/Slice/Grammar.y" +#line 2131 "src/Slice/Grammar.y" {} -#line 4161 "src/Slice/Grammar.cpp" +#line 4163 "src/Slice/Grammar.cpp" break; case 198: /* keyword: ICE_TRUE */ -#line 2128 "src/Slice/Grammar.y" +#line 2132 "src/Slice/Grammar.y" {} -#line 4167 "src/Slice/Grammar.cpp" +#line 4169 "src/Slice/Grammar.cpp" break; case 199: /* keyword: ICE_IDEMPOTENT */ -#line 2129 "src/Slice/Grammar.y" +#line 2133 "src/Slice/Grammar.y" {} -#line 4173 "src/Slice/Grammar.cpp" +#line 4175 "src/Slice/Grammar.cpp" break; case 200: /* keyword: ICE_OPTIONAL */ -#line 2130 "src/Slice/Grammar.y" +#line 2134 "src/Slice/Grammar.y" {} -#line 4179 "src/Slice/Grammar.cpp" +#line 4181 "src/Slice/Grammar.cpp" break; case 201: /* keyword: ICE_VALUE */ -#line 2131 "src/Slice/Grammar.y" +#line 2135 "src/Slice/Grammar.y" {} -#line 4185 "src/Slice/Grammar.cpp" +#line 4187 "src/Slice/Grammar.cpp" break; -#line 4189 "src/Slice/Grammar.cpp" +#line 4191 "src/Slice/Grammar.cpp" default: break; } @@ -4383,5 +4385,5 @@ YYLTYPE yylloc = yyloc_default; return yyresult; } -#line 2134 "src/Slice/Grammar.y" +#line 2138 "src/Slice/Grammar.y" diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h index 5bf32d8dc37..33461400a64 100644 --- a/cpp/src/Slice/Grammar.h +++ b/cpp/src/Slice/Grammar.h @@ -45,9 +45,11 @@ extern int slice_debug; #endif /* "%code requires" blocks. */ -#line 7 "src/Slice/Grammar.y" +#line 9 "src/Slice/Grammar.y" +// NOLINTBEGIN + // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does. #include "GrammarUtil.h" @@ -63,7 +65,7 @@ extern int slice_debug; #define yyoverflow(a, b, c, d, e, f, g, h) yyerror(a) -#line 67 "src/Slice/Grammar.h" +#line 69 "src/Slice/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 647950a9da2..16c298e6032 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -2,10 +2,14 @@ // Copyright (c) ZeroC, Inc. +// NOLINTBEGIN + } %code requires{ +// NOLINTBEGIN + // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does. #include "GrammarUtil.h" From 6127717752c79ef64b46aaddbc893f1acb08fd6d Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Tue, 17 Dec 2024 14:42:50 -0500 Subject: [PATCH 2/4] I think I got the scanners to properly ignore stuff... --- cpp/src/IceGrid/Scanner.cpp | 40 +++++----- cpp/src/IceGrid/Scanner.l | 4 + cpp/src/IceStorm/Scanner.cpp | 40 +++++----- cpp/src/IceStorm/Scanner.l | 4 + cpp/src/Slice/Scanner.cpp | 138 ++++++++++++++++++----------------- cpp/src/Slice/Scanner.l | 4 + 6 files changed, 127 insertions(+), 103 deletions(-) diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 7c971eba936..bf150150c75 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -1,4 +1,4 @@ -#line 1 "src/IceGrid/Scanner.cpp" +#line 2 "src/IceGrid/Scanner.cpp" // // Copyright (c) ZeroC, Inc. All rights reserved. // @@ -6,7 +6,9 @@ #include "../Ice/ScannerConfig.h" #include -#line 9 "src/IceGrid/Scanner.cpp" +// NOLINTBEGIN + +#line 12 "src/IceGrid/Scanner.cpp" #define YY_INT_ALIGNED long int @@ -469,7 +471,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "src/IceGrid/Scanner.l" -#line 12 "src/IceGrid/Scanner.l" +#line 14 "src/IceGrid/Scanner.l" #include "Ice/Ice.h" #include "Parser.h" @@ -497,8 +499,8 @@ namespace IceGrid #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) #define YY_FATAL_ERROR(msg) fatalError(msg); -#line 500 "src/IceGrid/Scanner.cpp" -#line 42 "src/IceGrid/Scanner.l" +#line 503 "src/IceGrid/Scanner.cpp" +#line 44 "src/IceGrid/Scanner.l" /* Instructs flex to not suppress any warnings when generating the scanner. */ /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */ @@ -510,7 +512,7 @@ namespace IceGrid /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */ /* We always want the scanner to run in interactive mode. */ /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */ -#line 513 "src/IceGrid/Scanner.cpp" +#line 516 "src/IceGrid/Scanner.cpp" #define INITIAL 0 @@ -711,10 +713,10 @@ YY_DECL } { -#line 73 "src/IceGrid/Scanner.l" +#line 75 "src/IceGrid/Scanner.l" -#line 717 "src/IceGrid/Scanner.cpp" +#line 720 "src/IceGrid/Scanner.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -773,7 +775,7 @@ YY_DECL case 1: YY_RULE_SETUP -#line 75 "src/IceGrid/Scanner.l" +#line 77 "src/IceGrid/Scanner.l" { // C++-style comment int c; @@ -786,7 +788,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 85 "src/IceGrid/Scanner.l" +#line 87 "src/IceGrid/Scanner.l" { // C-style comment while (true) @@ -815,7 +817,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 110 "src/IceGrid/Scanner.l" +#line 112 "src/IceGrid/Scanner.l" { size_t len = strlen(yytext); for (size_t i = 0; i < len; ++i) @@ -830,14 +832,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 121 "src/IceGrid/Scanner.l" +#line 123 "src/IceGrid/Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 125 "src/IceGrid/Scanner.l" +#line 127 "src/IceGrid/Scanner.l" { // "..."-type strings string s = parseDoubleQuotedString(); @@ -848,7 +850,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 133 "src/IceGrid/Scanner.l" +#line 135 "src/IceGrid/Scanner.l" { // '...'-type strings string s; @@ -876,7 +878,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 158 "src/IceGrid/Scanner.l" +#line 160 "src/IceGrid/Scanner.l" { // Simple strings string s; @@ -915,10 +917,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 194 "src/IceGrid/Scanner.l" +#line 196 "src/IceGrid/Scanner.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 921 "src/IceGrid/Scanner.cpp" +#line 924 "src/IceGrid/Scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1763,8 +1765,10 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 194 "src/IceGrid/Scanner.l" +#line 196 "src/IceGrid/Scanner.l" + +// NOLINTEND namespace IceGrid { diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l index 767712a04f2..b7b109133db 100644 --- a/cpp/src/IceGrid/Scanner.l +++ b/cpp/src/IceGrid/Scanner.l @@ -6,6 +6,8 @@ #include "../Ice/ScannerConfig.h" #include +// NOLINTBEGIN + } %{ @@ -192,6 +194,8 @@ keyword [[:alpha:]]* %% +// NOLINTEND + namespace IceGrid { // This function is always called once, right before scanning begins. diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp index 0ff67e05c93..b8a68e693e6 100644 --- a/cpp/src/IceStorm/Scanner.cpp +++ b/cpp/src/IceStorm/Scanner.cpp @@ -1,4 +1,4 @@ -#line 1 "src/IceStorm/Scanner.cpp" +#line 2 "src/IceStorm/Scanner.cpp" // // Copyright (c) ZeroC, Inc. All rights reserved. // @@ -6,7 +6,9 @@ #include "../Ice/ScannerConfig.h" #include -#line 9 "src/IceStorm/Scanner.cpp" +// NOLINTBEGIN + +#line 12 "src/IceStorm/Scanner.cpp" #define YY_INT_ALIGNED long int @@ -469,7 +471,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "src/IceStorm/Scanner.l" -#line 12 "src/IceStorm/Scanner.l" +#line 14 "src/IceStorm/Scanner.l" #include "Ice/Ice.h" #include "Parser.h" @@ -495,8 +497,8 @@ namespace IceStorm #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) #define YY_FATAL_ERROR(msg) fatalError(msg); -#line 498 "src/IceStorm/Scanner.cpp" -#line 40 "src/IceStorm/Scanner.l" +#line 501 "src/IceStorm/Scanner.cpp" +#line 42 "src/IceStorm/Scanner.l" /* Instructs flex to not suppress any warnings when generating the scanner. */ /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */ @@ -508,7 +510,7 @@ namespace IceStorm /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */ /* We always want the scanner to run in interactive mode. */ /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */ -#line 511 "src/IceStorm/Scanner.cpp" +#line 514 "src/IceStorm/Scanner.cpp" #define INITIAL 0 @@ -709,10 +711,10 @@ YY_DECL } { -#line 71 "src/IceStorm/Scanner.l" +#line 73 "src/IceStorm/Scanner.l" -#line 715 "src/IceStorm/Scanner.cpp" +#line 718 "src/IceStorm/Scanner.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -771,7 +773,7 @@ YY_DECL case 1: YY_RULE_SETUP -#line 73 "src/IceStorm/Scanner.l" +#line 75 "src/IceStorm/Scanner.l" { // C++-style comment int c; @@ -784,7 +786,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 83 "src/IceStorm/Scanner.l" +#line 85 "src/IceStorm/Scanner.l" { // C-style comment while (true) @@ -813,7 +815,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 108 "src/IceStorm/Scanner.l" +#line 110 "src/IceStorm/Scanner.l" { size_t len = strlen(yytext); for (size_t i = 0; i < len; ++i) @@ -828,14 +830,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 119 "src/IceStorm/Scanner.l" +#line 121 "src/IceStorm/Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 123 "src/IceStorm/Scanner.l" +#line 125 "src/IceStorm/Scanner.l" { // "..."-type strings string s; @@ -882,7 +884,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 167 "src/IceStorm/Scanner.l" +#line 169 "src/IceStorm/Scanner.l" { // '...'-type strings string s; @@ -910,7 +912,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 192 "src/IceStorm/Scanner.l" +#line 194 "src/IceStorm/Scanner.l" { // Simple strings string s; @@ -940,10 +942,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 219 "src/IceStorm/Scanner.l" +#line 221 "src/IceStorm/Scanner.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 946 "src/IceStorm/Scanner.cpp" +#line 949 "src/IceStorm/Scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1788,8 +1790,10 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 219 "src/IceStorm/Scanner.l" +#line 221 "src/IceStorm/Scanner.l" + +// NOLINTEND namespace IceStorm { diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index 7aa92e4e9de..344053a063d 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -6,6 +6,8 @@ #include "../Ice/ScannerConfig.h" #include +// NOLINTBEGIN + } %{ @@ -217,6 +219,8 @@ keyword [[:alpha:]]* %% +// NOLINTEND + namespace IceStorm { // This function is always called once, right before scanning begins. diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp index fdff941da05..869cba5b658 100644 --- a/cpp/src/Slice/Scanner.cpp +++ b/cpp/src/Slice/Scanner.cpp @@ -4,7 +4,9 @@ #include "../Ice/ScannerConfig.h" #include -#line 8 "src/Slice/Scanner.cpp" +// NOLINTBEGIN + +#line 10 "src/Slice/Scanner.cpp" #define YY_INT_ALIGNED long int @@ -1130,11 +1132,11 @@ int yy_flex_debug = 1; static const flex_int32_t yy_rule_linenum[50] = { 0, - 121, 135, 136, 143, 144, 145, 152, 171, 184, 194, - 201, 202, 214, 215, 223, 234, 244, 252, 270, 293, - 321, 326, 330, 335, 341, 342, 347, 353, 378, 383, - 389, 390, 405, 410, 418, 423, 429, 439, 444, 448, - 453, 459, 465, 498, 508, 511, 518, 522, 536 + 123, 137, 138, 145, 146, 147, 154, 173, 186, 196, + 203, 204, 216, 217, 225, 236, 246, 254, 272, 295, + 323, 328, 332, 337, 343, 344, 349, 355, 380, 385, + 391, 392, 407, 412, 420, 425, 431, 441, 446, 450, + 455, 461, 467, 500, 510, 513, 520, 524, 538 } ; /* The intent behind this definition is that it'll catch @@ -1149,7 +1151,7 @@ static int yy_more_len = 0; char *yytext; #line 1 "src/Slice/Scanner.l" -#line 10 "src/Slice/Scanner.l" +#line 12 "src/Slice/Scanner.l" #include "GrammarUtil.h" #include "Grammar.h" @@ -1196,8 +1198,8 @@ namespace #define YY_USER_ACTION preAction(); #define YY_FATAL_ERROR(msg) fatalError(msg); -#line 1200 "src/Slice/Scanner.cpp" -#line 59 "src/Slice/Scanner.l" +#line 1202 "src/Slice/Scanner.cpp" +#line 61 "src/Slice/Scanner.l" /* Changes the default prefix of 'yy' to 'slice_' for functions and variables in the generated code. */ /* Instructs flex to not suppress any warnings when generating the scanner. */ /* Instructs flex to generate a scanner that supports verbose outputting (debug mode). */ @@ -1223,7 +1225,7 @@ namespace /* The scanner also has a built in 'INITIAL' start-condition state, which is the state the scanner is initialized in. * We use it solely to check for and consume any BOMs at the start of files. See Bug 3140. */ -#line 1227 "src/Slice/Scanner.cpp" +#line 1229 "src/Slice/Scanner.cpp" #define INITIAL 0 #define C_COMMENT 1 @@ -1509,12 +1511,12 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 117 "src/Slice/Scanner.l" +#line 119 "src/Slice/Scanner.l" /* ========== Literals ========== */ /* Matches the start of a double-quoted string literal. */ -#line 1518 "src/Slice/Scanner.cpp" +#line 1520 "src/Slice/Scanner.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1599,7 +1601,7 @@ YY_DECL case 1: YY_RULE_SETUP -#line 121 "src/Slice/Scanner.l" +#line 123 "src/Slice/Scanner.l" { yy_push_state(STRING_LITERAL); startLocation(yylloc); @@ -1614,10 +1616,10 @@ YY_RULE_SETUP /* Matches Escaped backslashes and any other valid string characters. Invalid characters are * new-lines, non-printable ASCII characters, and double-quotes. */ case 2: -#line 136 "src/Slice/Scanner.l" +#line 138 "src/Slice/Scanner.l" case 3: YY_RULE_SETUP -#line 136 "src/Slice/Scanner.l" +#line 138 "src/Slice/Scanner.l" { StringTokPtr str = dynamic_pointer_cast(*yylval); str->literal += yytext; @@ -1626,12 +1628,12 @@ YY_RULE_SETUP YY_BREAK /* Matches an escaped double-quote, single-quote, or question mark. */ case 4: -#line 144 "src/Slice/Scanner.l" +#line 146 "src/Slice/Scanner.l" case 5: -#line 145 "src/Slice/Scanner.l" +#line 147 "src/Slice/Scanner.l" case 6: YY_RULE_SETUP -#line 145 "src/Slice/Scanner.l" +#line 147 "src/Slice/Scanner.l" { StringTokPtr str = dynamic_pointer_cast(*yylval); str->literal += yytext; @@ -1641,7 +1643,7 @@ YY_RULE_SETUP /* Matches an ANSI-C escape code pattern. */ case 7: YY_RULE_SETUP -#line 152 "src/Slice/Scanner.l" +#line 154 "src/Slice/Scanner.l" { StringTokPtr str = dynamic_pointer_cast(*yylval); char ansiCode; @@ -1663,7 +1665,7 @@ YY_RULE_SETUP /* Matches an escaped octal value. Octal literals are limited to a max of 3 digits. */ case 8: YY_RULE_SETUP -#line 171 "src/Slice/Scanner.l" +#line 173 "src/Slice/Scanner.l" { int64_t value = std::stoll((yytext + 1), nullptr, 8); if (value > 255) @@ -1679,7 +1681,7 @@ YY_RULE_SETUP /* Matches an escaped hexadecimal value. Hexadecimal literals are limited to a max of 2 digits. */ case 9: YY_RULE_SETUP -#line 184 "src/Slice/Scanner.l" +#line 186 "src/Slice/Scanner.l" { int64_t value = std::stoll((yytext + 2), nullptr, 16); assert(value <= 255); @@ -1692,7 +1694,7 @@ YY_RULE_SETUP /* Matches an empty hexadecimal escape value. */ case 10: YY_RULE_SETUP -#line 194 "src/Slice/Scanner.l" +#line 196 "src/Slice/Scanner.l" { currentUnit->error("no hex digit in hex escape sequence"); StringTokPtr str = dynamic_pointer_cast(*yylval); @@ -1701,10 +1703,10 @@ YY_RULE_SETUP YY_BREAK /* Matches a 4-char or 8-char size universal character code. */ case 11: -#line 202 "src/Slice/Scanner.l" +#line 204 "src/Slice/Scanner.l" case 12: YY_RULE_SETUP -#line 202 "src/Slice/Scanner.l" +#line 204 "src/Slice/Scanner.l" { int64_t codePoint = std::stoll((yytext + 2), nullptr, 16); if (codePoint <= 0xdfff && codePoint >= 0xd800) @@ -1718,10 +1720,10 @@ YY_RULE_SETUP YY_BREAK /* Matches a universal character code that isn't the correct size, or uses incorrect characters. */ case 13: -#line 215 "src/Slice/Scanner.l" +#line 217 "src/Slice/Scanner.l" case 14: YY_RULE_SETUP -#line 215 "src/Slice/Scanner.l" +#line 217 "src/Slice/Scanner.l" { currentUnit->error("unknown escape sequence in string literal: `" + string(yytext) + "'"); StringTokPtr str = dynamic_pointer_cast(*yylval); @@ -1733,7 +1735,7 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 223 "src/Slice/Scanner.l" +#line 225 "src/Slice/Scanner.l" { yy_pop_state(); endLocation(yylloc); @@ -1747,7 +1749,7 @@ YY_RULE_SETUP * it only matches 2 characters (the lowest any match), and it's beneath the others. */ case 16: YY_RULE_SETUP -#line 234 "src/Slice/Scanner.l" +#line 236 "src/Slice/Scanner.l" { currentUnit->warning(All, "unknown escape sequence in string literal: '" + string{yytext} + "'"); @@ -1760,7 +1762,7 @@ YY_RULE_SETUP /* Matches a dangling backslash, with nothing to escape. This rule is mostly included for grammar completeness. */ case 17: YY_RULE_SETUP -#line 244 "src/Slice/Scanner.l" +#line 246 "src/Slice/Scanner.l" { currentUnit->warning(All, "dangling backslash in string literal"); StringTokPtr str = dynamic_pointer_cast(*yylval); @@ -1771,7 +1773,7 @@ YY_RULE_SETUP * to match the longest string it can, so quotes preceeded with a literal '\' will match the rules above this one. */ case 18: YY_RULE_SETUP -#line 252 "src/Slice/Scanner.l" +#line 254 "src/Slice/Scanner.l" { yy_pop_state(); endLocation(yylloc); @@ -1783,7 +1785,7 @@ YY_RULE_SETUP YY_BREAK /* Matches EOF, but only while scanning a string literal. */ case YY_STATE_EOF(STRING_LITERAL): -#line 262 "src/Slice/Scanner.l" +#line 264 "src/Slice/Scanner.l" { yy_pop_state(); endLocation(yylloc); @@ -1794,7 +1796,7 @@ case YY_STATE_EOF(STRING_LITERAL): YY_BREAK case 19: YY_RULE_SETUP -#line 270 "src/Slice/Scanner.l" +#line 272 "src/Slice/Scanner.l" { setLocation(yylloc); @@ -1820,7 +1822,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 293 "src/Slice/Scanner.l" +#line 295 "src/Slice/Scanner.l" { setLocation(yylloc); @@ -1850,7 +1852,7 @@ YY_RULE_SETUP /* Matches and records a triple-slash style doc-comment. */ case 21: YY_RULE_SETUP -#line 321 "src/Slice/Scanner.l" +#line 323 "src/Slice/Scanner.l" { currentUnit->addToDocComment(yytext + 3); } @@ -1858,7 +1860,7 @@ YY_RULE_SETUP /* Matches and consumes a C++ style comment. */ case 22: YY_RULE_SETUP -#line 326 "src/Slice/Scanner.l" +#line 328 "src/Slice/Scanner.l" {} YY_BREAK /* Matches the start of a C style doc-comment, and switches the scanner to the C_DOC_COMMENT state. @@ -1870,7 +1872,7 @@ YY_LINENO_REWIND_TO(yy_bp + 3); (yy_c_buf_p) = yy_cp = yy_bp + 3; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 330 "src/Slice/Scanner.l" +#line 332 "src/Slice/Scanner.l" { yy_push_state(C_DOC_COMMENT); } @@ -1878,7 +1880,7 @@ YY_RULE_SETUP /* Matches the start of a C style comment, and switches the scanner to the C_COMMENT state. */ case 24: YY_RULE_SETUP -#line 335 "src/Slice/Scanner.l" +#line 337 "src/Slice/Scanner.l" { yy_push_state(C_COMMENT); } @@ -1886,10 +1888,10 @@ YY_RULE_SETUP /* Matches any character except for newlines and adds them to the comments. '*' are matched one at a time to ensure * Flex scans '* /' correctly. Flex prioritizes longer matches over shorter ones, so '* /' will match before '*'. */ case 25: -#line 342 "src/Slice/Scanner.l" +#line 344 "src/Slice/Scanner.l" case 26: YY_RULE_SETUP -#line 342 "src/Slice/Scanner.l" +#line 344 "src/Slice/Scanner.l" { yymore(); } @@ -1898,7 +1900,7 @@ YY_RULE_SETUP case 27: /* rule 27 can match eol */ YY_RULE_SETUP -#line 347 "src/Slice/Scanner.l" +#line 349 "src/Slice/Scanner.l" { nextLine(yyleng); yymore(); @@ -1907,7 +1909,7 @@ YY_RULE_SETUP /* Matches the end of a C style comment, and reverts the scanner state to what it previously was. */ case 28: YY_RULE_SETUP -#line 353 "src/Slice/Scanner.l" +#line 355 "src/Slice/Scanner.l" { yy_pop_state(); @@ -1922,7 +1924,7 @@ YY_RULE_SETUP /* Handles reaching EOF while scanning a C style comment by issuing a warning but continuing normally. */ case YY_STATE_EOF(C_COMMENT): case YY_STATE_EOF(C_DOC_COMMENT): -#line 365 "src/Slice/Scanner.l" +#line 367 "src/Slice/Scanner.l" { yy_pop_state(); @@ -1937,7 +1939,7 @@ case YY_STATE_EOF(C_DOC_COMMENT): /* Matches the empty preprocessor directive. */ case 29: YY_RULE_SETUP -#line 378 "src/Slice/Scanner.l" +#line 380 "src/Slice/Scanner.l" { yy_push_state(PREPROCESS); } @@ -1945,7 +1947,7 @@ YY_RULE_SETUP /* Matches a line preprocessor directive, but missing a line number. */ case 30: YY_RULE_SETUP -#line 383 "src/Slice/Scanner.l" +#line 385 "src/Slice/Scanner.l" { yy_push_state(PREPROCESS); currentUnit->error("missing line number in line preprocessor directive"); @@ -1953,10 +1955,10 @@ YY_RULE_SETUP YY_BREAK /* Matches a line preprocessor directive (optionally with a file specified afterwards). */ case 31: -#line 390 "src/Slice/Scanner.l" +#line 392 "src/Slice/Scanner.l" case 32: YY_RULE_SETUP -#line 390 "src/Slice/Scanner.l" +#line 392 "src/Slice/Scanner.l" { int includeAction = scanPosition(yytext); if (yylineno == 0 || includeAction == 1) // Push: Indicated the scanner has started scanning a new file. @@ -1974,7 +1976,7 @@ YY_RULE_SETUP * found while scanning a preprocessor directive. */ case 33: YY_RULE_SETUP -#line 405 "src/Slice/Scanner.l" +#line 407 "src/Slice/Scanner.l" { currentUnit->error("encountered unexpected token while scanning preprocessor directive: `" + string(yytext) + "'"); } @@ -1982,10 +1984,10 @@ YY_RULE_SETUP /* Matches a new-line character or EOF. This signals the end of the preprocessor statement. */ case 34: /* rule 34 can match eol */ -#line 411 "src/Slice/Scanner.l" +#line 413 "src/Slice/Scanner.l" YY_RULE_SETUP case YY_STATE_EOF(PREPROCESS): -#line 411 "src/Slice/Scanner.l" +#line 413 "src/Slice/Scanner.l" { yy_pop_state(); nextLine(); @@ -1994,7 +1996,7 @@ case YY_STATE_EOF(PREPROCESS): /* ========== Metadata ========== */ case 35: YY_RULE_SETUP -#line 418 "src/Slice/Scanner.l" +#line 420 "src/Slice/Scanner.l" { yy_push_state(METADATA); return ICE_METADATA_OPEN; @@ -2002,7 +2004,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 423 "src/Slice/Scanner.l" +#line 425 "src/Slice/Scanner.l" { yy_push_state(METADATA); return ICE_FILE_METADATA_OPEN; @@ -2011,7 +2013,7 @@ YY_RULE_SETUP /* Matches the start of a metadata string, then switches the scanner into STRING_LITERAL mode. */ case 37: YY_RULE_SETUP -#line 429 "src/Slice/Scanner.l" +#line 431 "src/Slice/Scanner.l" { yy_push_state(STRING_LITERAL); startLocation(yylloc); @@ -2024,7 +2026,7 @@ YY_RULE_SETUP /* Matches commas between string literals in quoted metadata and forwards them to the parser. */ case 38: YY_RULE_SETUP -#line 439 "src/Slice/Scanner.l" +#line 441 "src/Slice/Scanner.l" { return yytext[0]; } @@ -2033,14 +2035,14 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 444 "src/Slice/Scanner.l" +#line 446 "src/Slice/Scanner.l" { nextLine(yyleng); } YY_BREAK case 40: YY_RULE_SETUP -#line 448 "src/Slice/Scanner.l" +#line 450 "src/Slice/Scanner.l" { yy_pop_state(); return ICE_METADATA_CLOSE; @@ -2048,7 +2050,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 453 "src/Slice/Scanner.l" +#line 455 "src/Slice/Scanner.l" { yy_pop_state(); return ICE_FILE_METADATA_CLOSE; @@ -2057,7 +2059,7 @@ YY_RULE_SETUP /* Matches any characters not matched by another metadata rule (except whitespace), and reports an error. */ case 42: YY_RULE_SETUP -#line 459 "src/Slice/Scanner.l" +#line 461 "src/Slice/Scanner.l" { currentUnit->error("invalid character between metadata"); } @@ -2066,7 +2068,7 @@ YY_RULE_SETUP case 43: /* rule 43 can match eol */ YY_RULE_SETUP -#line 465 "src/Slice/Scanner.l" +#line 467 "src/Slice/Scanner.l" { StringTokPtr ident = make_shared(); ident->v = *yytext == '\\' ? yytext + 1 : yytext; @@ -2102,7 +2104,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 498 "src/Slice/Scanner.l" +#line 500 "src/Slice/Scanner.l" { StringTokPtr ident = make_shared(); ident->v = *yytext == '\\' ? yytext + 1 : yytext; @@ -2114,14 +2116,14 @@ YY_RULE_SETUP /* Matches and consumes any whitespace, except for newlines. */ case 45: YY_RULE_SETUP -#line 508 "src/Slice/Scanner.l" +#line 510 "src/Slice/Scanner.l" {} YY_BREAK /* Matches and consumes newlines, but only when the scanner isn't in a sub-scanner. */ case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 511 "src/Slice/Scanner.l" +#line 513 "src/Slice/Scanner.l" { nextLine(yyleng); } @@ -2130,7 +2132,7 @@ YY_RULE_SETUP /* Matches and consumes a BOM, but only when the scanner has just started scanning a new file. */ case 47: YY_RULE_SETUP -#line 518 "src/Slice/Scanner.l" +#line 520 "src/Slice/Scanner.l" {} YY_BREAK /* Matches invalid characters, one at a time to make this the 2nd lowest priority rule. All printable ASCII @@ -2138,7 +2140,7 @@ YY_RULE_SETUP case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 522 "src/Slice/Scanner.l" +#line 524 "src/Slice/Scanner.l" { stringstream s; s << "illegal input character: '\\"; @@ -2155,7 +2157,7 @@ YY_RULE_SETUP * This is the lowest priority rule in the scanner, and is only active while not in a sub-scanner. */ case 49: YY_RULE_SETUP -#line 536 "src/Slice/Scanner.l" +#line 538 "src/Slice/Scanner.l" { setLocation(yylloc); return yytext[0]; @@ -2163,10 +2165,10 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 541 "src/Slice/Scanner.l" +#line 543 "src/Slice/Scanner.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2170 "src/Slice/Scanner.cpp" +#line 2172 "src/Slice/Scanner.cpp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SLICE): case YY_STATE_EOF(METADATA): @@ -3169,8 +3171,10 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 541 "src/Slice/Scanner.l" +#line 543 "src/Slice/Scanner.l" + +// NOLINTEND namespace Slice { diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 2b0cd0d4520..de65ff506af 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -4,6 +4,8 @@ #include "../Ice/ScannerConfig.h" #include +// NOLINTBEGIN + } %{ @@ -539,6 +541,8 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?{dec}+{expo %% +// NOLINTEND + namespace Slice { // Check if an identifier looks like a keyword. From 737833273afb00cdf24f6cff738088275093d9ba Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Tue, 17 Dec 2024 14:45:14 -0500 Subject: [PATCH 3/4] Well, I at least matched the things... Nothing to do about the macros though. --- cpp/src/IceGrid/Grammar.cpp | 374 +++++++++++++++--------------- cpp/src/IceGrid/Grammar.h | 4 +- cpp/src/IceGrid/Grammar.y | 6 +- cpp/src/IceStorm/Grammar.cpp | 76 ++++--- cpp/src/IceStorm/Grammar.h | 4 +- cpp/src/IceStorm/Grammar.y | 4 +- cpp/src/Slice/Grammar.cpp | 426 ++++++++++++++++++----------------- cpp/src/Slice/Grammar.h | 4 +- cpp/src/Slice/Grammar.y | 4 +- 9 files changed, 453 insertions(+), 449 deletions(-) diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp index f1e03e3688d..2fd0b6a6863 100644 --- a/cpp/src/IceGrid/Grammar.cpp +++ b/cpp/src/IceGrid/Grammar.cpp @@ -77,7 +77,7 @@ /* First part of user prologue. */ -#line 37 "src/IceGrid/Grammar.y" +#line 35 "src/IceGrid/Grammar.y" #include "Ice/Ice.h" @@ -203,7 +203,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 29 "src/IceGrid/Grammar.y" +#line 27 "src/IceGrid/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -596,23 +596,23 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 132, 132, 135, 143, 146, 154, 163, 167, 171, - 175, 179, 183, 187, 191, 195, 199, 203, 207, 211, - 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, - 255, 259, 263, 267, 271, 275, 279, 283, 287, 291, - 295, 299, 303, 307, 311, 315, 319, 323, 327, 331, - 335, 339, 343, 347, 351, 355, 359, 363, 367, 371, - 375, 379, 383, 387, 391, 395, 399, 403, 407, 411, - 415, 419, 423, 427, 431, 435, 439, 443, 447, 451, - 455, 459, 463, 467, 471, 475, 479, 483, 487, 491, - 495, 499, 503, 507, 511, 515, 519, 523, 527, 531, - 535, 539, 543, 547, 551, 555, 559, 563, 567, 571, - 575, 579, 583, 587, 591, 602, 606, 617, 628, 632, - 636, 640, 646, 651, 656, 660, 668, 673, 678, 684, - 690, 699, 702, 705, 708, 711, 714, 717, 720, 723, - 726, 729, 732, 735, 738, 741, 744, 747, 750, 753, - 756, 759, 762, 765, 768, 771, 774, 777, 780, 783, - 786, 789, 792, 795, 798, 801, 804, 807 + 0, 130, 130, 133, 141, 144, 152, 161, 165, 169, + 173, 177, 181, 185, 189, 193, 197, 201, 205, 209, + 213, 217, 221, 225, 229, 233, 237, 241, 245, 249, + 253, 257, 261, 265, 269, 273, 277, 281, 285, 289, + 293, 297, 301, 305, 309, 313, 317, 321, 325, 329, + 333, 337, 341, 345, 349, 353, 357, 361, 365, 369, + 373, 377, 381, 385, 389, 393, 397, 401, 405, 409, + 413, 417, 421, 425, 429, 433, 437, 441, 445, 449, + 453, 457, 461, 465, 469, 473, 477, 481, 485, 489, + 493, 497, 501, 505, 509, 513, 517, 521, 525, 529, + 533, 537, 541, 545, 549, 553, 557, 561, 565, 569, + 573, 577, 581, 585, 589, 600, 604, 615, 626, 630, + 634, 638, 644, 649, 654, 658, 666, 671, 676, 682, + 688, 697, 700, 703, 706, 709, 712, 715, 718, 721, + 724, 727, 730, 733, 736, 739, 742, 745, 748, 751, + 754, 757, 760, 763, 766, 769, 772, 775, 778, 781, + 784, 787, 790, 793, 796, 799, 802, 805 }; #endif @@ -1815,35 +1815,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); switch (yyn) { case 2: /* start: commands */ -#line 133 "src/IceGrid/Grammar.y" +#line 131 "src/IceGrid/Grammar.y" { } #line 1822 "src/IceGrid/Grammar.cpp" break; case 3: /* start: %empty */ -#line 136 "src/IceGrid/Grammar.y" +#line 134 "src/IceGrid/Grammar.y" { } #line 1829 "src/IceGrid/Grammar.cpp" break; case 4: /* commands: commands checkInterrupted command */ -#line 144 "src/IceGrid/Grammar.y" +#line 142 "src/IceGrid/Grammar.y" { } #line 1836 "src/IceGrid/Grammar.cpp" break; case 5: /* commands: checkInterrupted command */ -#line 147 "src/IceGrid/Grammar.y" +#line 145 "src/IceGrid/Grammar.y" { } #line 1843 "src/IceGrid/Grammar.cpp" break; case 6: /* checkInterrupted: %empty */ -#line 155 "src/IceGrid/Grammar.y" +#line 153 "src/IceGrid/Grammar.y" { parser->checkInterrupted(); } @@ -1851,7 +1851,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 7: /* command: ICEGRID_HELP ';' */ -#line 164 "src/IceGrid/Grammar.y" +#line 162 "src/IceGrid/Grammar.y" { parser->usage(); } @@ -1859,7 +1859,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 8: /* command: ICEGRID_EXIT ';' */ -#line 168 "src/IceGrid/Grammar.y" +#line 166 "src/IceGrid/Grammar.y" { return 0; } @@ -1867,7 +1867,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 9: /* command: ICEGRID_APPLICATION ICEGRID_ADD strings ';' */ -#line 172 "src/IceGrid/Grammar.y" +#line 170 "src/IceGrid/Grammar.y" { parser->addApplication(yyvsp[-1]); } @@ -1875,7 +1875,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 10: /* command: ICEGRID_APPLICATION ICEGRID_ADD ICEGRID_HELP ';' */ -#line 176 "src/IceGrid/Grammar.y" +#line 174 "src/IceGrid/Grammar.y" { parser->usage("application", "add"); } @@ -1883,7 +1883,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 11: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE strings ';' */ -#line 180 "src/IceGrid/Grammar.y" +#line 178 "src/IceGrid/Grammar.y" { parser->removeApplication(yyvsp[-1]); } @@ -1891,7 +1891,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 12: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 184 "src/IceGrid/Grammar.y" +#line 182 "src/IceGrid/Grammar.y" { parser->usage("application", "remove"); } @@ -1899,7 +1899,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 13: /* command: ICEGRID_APPLICATION ICEGRID_DIFF strings ';' */ -#line 188 "src/IceGrid/Grammar.y" +#line 186 "src/IceGrid/Grammar.y" { parser->diffApplication(yyvsp[-1]); } @@ -1907,7 +1907,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 14: /* command: ICEGRID_APPLICATION ICEGRID_DIFF ICEGRID_HELP ';' */ -#line 192 "src/IceGrid/Grammar.y" +#line 190 "src/IceGrid/Grammar.y" { parser->usage("application", "diff"); } @@ -1915,7 +1915,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 15: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE strings ';' */ -#line 196 "src/IceGrid/Grammar.y" +#line 194 "src/IceGrid/Grammar.y" { parser->updateApplication(yyvsp[-1]); } @@ -1923,7 +1923,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 16: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE ICEGRID_HELP ';' */ -#line 200 "src/IceGrid/Grammar.y" +#line 198 "src/IceGrid/Grammar.y" { parser->usage("application", "update"); } @@ -1931,7 +1931,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 17: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE strings ';' */ -#line 204 "src/IceGrid/Grammar.y" +#line 202 "src/IceGrid/Grammar.y" { parser->describeApplication(yyvsp[-1]); } @@ -1939,7 +1939,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 18: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 208 "src/IceGrid/Grammar.y" +#line 206 "src/IceGrid/Grammar.y" { parser->usage("application", "describe"); } @@ -1947,7 +1947,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 19: /* command: ICEGRID_APPLICATION ICEGRID_LIST strings ';' */ -#line 212 "src/IceGrid/Grammar.y" +#line 210 "src/IceGrid/Grammar.y" { parser->listAllApplications(yyvsp[-1]); } @@ -1955,7 +1955,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 20: /* command: ICEGRID_APPLICATION ICEGRID_LIST ICEGRID_HELP ';' */ -#line 216 "src/IceGrid/Grammar.y" +#line 214 "src/IceGrid/Grammar.y" { parser->usage("application", "list"); } @@ -1963,7 +1963,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 21: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';' */ -#line 220 "src/IceGrid/Grammar.y" +#line 218 "src/IceGrid/Grammar.y" { parser->describeServerTemplate(yyvsp[-1]); } @@ -1971,7 +1971,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 22: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 224 "src/IceGrid/Grammar.y" +#line 222 "src/IceGrid/Grammar.y" { parser->usage("server template", "describe"); } @@ -1979,7 +1979,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 23: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE strings ';' */ -#line 228 "src/IceGrid/Grammar.y" +#line 226 "src/IceGrid/Grammar.y" { parser->instantiateServerTemplate(yyvsp[-1]); } @@ -1987,7 +1987,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 24: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE ICEGRID_HELP ';' */ -#line 232 "src/IceGrid/Grammar.y" +#line 230 "src/IceGrid/Grammar.y" { parser->usage("server template", "instantiate"); } @@ -1995,7 +1995,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 25: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_HELP ';' */ -#line 236 "src/IceGrid/Grammar.y" +#line 234 "src/IceGrid/Grammar.y" { parser->usage("server template"); } @@ -2003,7 +2003,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 26: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';' */ -#line 240 "src/IceGrid/Grammar.y" +#line 238 "src/IceGrid/Grammar.y" { parser->describeServiceTemplate(yyvsp[-1]); } @@ -2011,7 +2011,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 27: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 244 "src/IceGrid/Grammar.y" +#line 242 "src/IceGrid/Grammar.y" { parser->usage("service template", "describe"); } @@ -2019,7 +2019,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 28: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_HELP ';' */ -#line 248 "src/IceGrid/Grammar.y" +#line 246 "src/IceGrid/Grammar.y" { parser->usage("service template"); } @@ -2027,7 +2027,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 29: /* command: ICEGRID_NODE ICEGRID_DESCRIBE strings ';' */ -#line 252 "src/IceGrid/Grammar.y" +#line 250 "src/IceGrid/Grammar.y" { parser->describeNode(yyvsp[-1]); } @@ -2035,7 +2035,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 30: /* command: ICEGRID_NODE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 256 "src/IceGrid/Grammar.y" +#line 254 "src/IceGrid/Grammar.y" { parser->usage("node", "describe"); } @@ -2043,7 +2043,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 31: /* command: ICEGRID_NODE ICEGRID_PING strings ';' */ -#line 260 "src/IceGrid/Grammar.y" +#line 258 "src/IceGrid/Grammar.y" { parser->pingNode(yyvsp[-1]); } @@ -2051,7 +2051,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 32: /* command: ICEGRID_NODE ICEGRID_PING ICEGRID_HELP ';' */ -#line 264 "src/IceGrid/Grammar.y" +#line 262 "src/IceGrid/Grammar.y" { parser->usage("node", "ping"); } @@ -2059,7 +2059,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 33: /* command: ICEGRID_NODE ICEGRID_LOAD strings ';' */ -#line 268 "src/IceGrid/Grammar.y" +#line 266 "src/IceGrid/Grammar.y" { parser->printLoadNode(yyvsp[-1]); } @@ -2067,7 +2067,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 34: /* command: ICEGRID_NODE ICEGRID_LOAD ICEGRID_HELP ';' */ -#line 272 "src/IceGrid/Grammar.y" +#line 270 "src/IceGrid/Grammar.y" { parser->usage("node", "load"); } @@ -2075,7 +2075,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 35: /* command: ICEGRID_NODE ICEGRID_SOCKETS strings ';' */ -#line 276 "src/IceGrid/Grammar.y" +#line 274 "src/IceGrid/Grammar.y" { parser->printNodeProcessorSockets(yyvsp[-1]); } @@ -2083,7 +2083,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 36: /* command: ICEGRID_NODE ICEGRID_SOCKETS ICEGRID_HELP ';' */ -#line 280 "src/IceGrid/Grammar.y" +#line 278 "src/IceGrid/Grammar.y" { parser->usage("node", "sockets"); } @@ -2091,7 +2091,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 37: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN strings ';' */ -#line 284 "src/IceGrid/Grammar.y" +#line 282 "src/IceGrid/Grammar.y" { parser->shutdownNode(yyvsp[-1]); } @@ -2099,7 +2099,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 38: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN ICEGRID_HELP ';' */ -#line 288 "src/IceGrid/Grammar.y" +#line 286 "src/IceGrid/Grammar.y" { parser->usage("node", "shutdown"); } @@ -2107,7 +2107,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 39: /* command: ICEGRID_NODE ICEGRID_LIST strings ';' */ -#line 292 "src/IceGrid/Grammar.y" +#line 290 "src/IceGrid/Grammar.y" { parser->listAllNodes(yyvsp[-1]); } @@ -2115,7 +2115,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 40: /* command: ICEGRID_NODE ICEGRID_LIST ICEGRID_HELP ';' */ -#line 296 "src/IceGrid/Grammar.y" +#line 294 "src/IceGrid/Grammar.y" { parser->usage("node", "list"); } @@ -2123,7 +2123,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 41: /* command: ICEGRID_NODE ICEGRID_SHOW strings ';' */ -#line 300 "src/IceGrid/Grammar.y" +#line 298 "src/IceGrid/Grammar.y" { parser->show("node", yyvsp[-1]); } @@ -2131,7 +2131,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 42: /* command: ICEGRID_NODE ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 304 "src/IceGrid/Grammar.y" +#line 302 "src/IceGrid/Grammar.y" { parser->usage("node", "show"); } @@ -2139,7 +2139,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 43: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE strings ';' */ -#line 308 "src/IceGrid/Grammar.y" +#line 306 "src/IceGrid/Grammar.y" { parser->describeRegistry(yyvsp[-1]); } @@ -2147,7 +2147,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 44: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 312 "src/IceGrid/Grammar.y" +#line 310 "src/IceGrid/Grammar.y" { parser->usage("registry", "describe"); } @@ -2155,7 +2155,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 45: /* command: ICEGRID_REGISTRY ICEGRID_PING strings ';' */ -#line 316 "src/IceGrid/Grammar.y" +#line 314 "src/IceGrid/Grammar.y" { parser->pingRegistry(yyvsp[-1]); } @@ -2163,7 +2163,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 46: /* command: ICEGRID_REGISTRY ICEGRID_PING ICEGRID_HELP ';' */ -#line 320 "src/IceGrid/Grammar.y" +#line 318 "src/IceGrid/Grammar.y" { parser->usage("registry", "ping"); } @@ -2171,7 +2171,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 47: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN strings ';' */ -#line 324 "src/IceGrid/Grammar.y" +#line 322 "src/IceGrid/Grammar.y" { parser->shutdownRegistry(yyvsp[-1]); } @@ -2179,7 +2179,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 48: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN ICEGRID_HELP ';' */ -#line 328 "src/IceGrid/Grammar.y" +#line 326 "src/IceGrid/Grammar.y" { parser->usage("registry", "shutdown"); } @@ -2187,7 +2187,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 49: /* command: ICEGRID_REGISTRY ICEGRID_LIST strings ';' */ -#line 332 "src/IceGrid/Grammar.y" +#line 330 "src/IceGrid/Grammar.y" { parser->listAllRegistries(yyvsp[-1]); } @@ -2195,7 +2195,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 50: /* command: ICEGRID_REGISTRY ICEGRID_LIST ICEGRID_HELP ';' */ -#line 336 "src/IceGrid/Grammar.y" +#line 334 "src/IceGrid/Grammar.y" { parser->usage("registry", "list"); } @@ -2203,7 +2203,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 51: /* command: ICEGRID_REGISTRY ICEGRID_SHOW strings ';' */ -#line 340 "src/IceGrid/Grammar.y" +#line 338 "src/IceGrid/Grammar.y" { parser->show("registry", yyvsp[-1]); } @@ -2211,7 +2211,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 52: /* command: ICEGRID_REGISTRY ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 344 "src/IceGrid/Grammar.y" +#line 342 "src/IceGrid/Grammar.y" { parser->usage("registry", "show"); } @@ -2219,7 +2219,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 53: /* command: ICEGRID_SERVER ICEGRID_REMOVE strings ';' */ -#line 348 "src/IceGrid/Grammar.y" +#line 346 "src/IceGrid/Grammar.y" { parser->removeServer(yyvsp[-1]); } @@ -2227,7 +2227,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 54: /* command: ICEGRID_SERVER ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 352 "src/IceGrid/Grammar.y" +#line 350 "src/IceGrid/Grammar.y" { parser->usage("server", "remove"); } @@ -2235,7 +2235,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 55: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE strings ';' */ -#line 356 "src/IceGrid/Grammar.y" +#line 354 "src/IceGrid/Grammar.y" { parser->describeServer(yyvsp[-1]); } @@ -2243,7 +2243,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 56: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 360 "src/IceGrid/Grammar.y" +#line 358 "src/IceGrid/Grammar.y" { parser->usage("server", "describe"); } @@ -2251,7 +2251,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 57: /* command: ICEGRID_SERVER ICEGRID_START strings ';' */ -#line 364 "src/IceGrid/Grammar.y" +#line 362 "src/IceGrid/Grammar.y" { parser->startServer(yyvsp[-1]); } @@ -2259,7 +2259,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 58: /* command: ICEGRID_SERVER ICEGRID_START ICEGRID_HELP ';' */ -#line 368 "src/IceGrid/Grammar.y" +#line 366 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); } @@ -2267,7 +2267,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 59: /* command: ICEGRID_SERVER ICEGRID_STOP strings ';' */ -#line 372 "src/IceGrid/Grammar.y" +#line 370 "src/IceGrid/Grammar.y" { parser->stopServer(yyvsp[-1]); } @@ -2275,7 +2275,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 60: /* command: ICEGRID_SERVER ICEGRID_STOP ICEGRID_HELP ';' */ -#line 376 "src/IceGrid/Grammar.y" +#line 374 "src/IceGrid/Grammar.y" { parser->usage("server", "stop"); } @@ -2283,7 +2283,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 61: /* command: ICEGRID_SERVER ICEGRID_SIGNAL strings ';' */ -#line 380 "src/IceGrid/Grammar.y" +#line 378 "src/IceGrid/Grammar.y" { parser->signalServer(yyvsp[-1]); } @@ -2291,7 +2291,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 62: /* command: ICEGRID_SERVER ICEGRID_SIGNAL ICEGRID_HELP ';' */ -#line 384 "src/IceGrid/Grammar.y" +#line 382 "src/IceGrid/Grammar.y" { parser->usage("server", "signal"); } @@ -2299,7 +2299,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 63: /* command: ICEGRID_SERVER ICEGRID_STDOUT strings ';' */ -#line 388 "src/IceGrid/Grammar.y" +#line 386 "src/IceGrid/Grammar.y" { parser->writeMessage(yyvsp[-1], 1); } @@ -2307,7 +2307,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 64: /* command: ICEGRID_SERVER ICEGRID_STDOUT ICEGRID_HELP ';' */ -#line 392 "src/IceGrid/Grammar.y" +#line 390 "src/IceGrid/Grammar.y" { parser->usage("server", "stdout"); } @@ -2315,7 +2315,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 65: /* command: ICEGRID_SERVER ICEGRID_STDERR strings ';' */ -#line 396 "src/IceGrid/Grammar.y" +#line 394 "src/IceGrid/Grammar.y" { parser->writeMessage(yyvsp[-1], 2); } @@ -2323,7 +2323,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 66: /* command: ICEGRID_SERVER ICEGRID_STDERR ICEGRID_HELP ';' */ -#line 400 "src/IceGrid/Grammar.y" +#line 398 "src/IceGrid/Grammar.y" { parser->usage("server", "stderr"); } @@ -2331,7 +2331,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 67: /* command: ICEGRID_SERVER ICEGRID_STATE strings ';' */ -#line 404 "src/IceGrid/Grammar.y" +#line 402 "src/IceGrid/Grammar.y" { parser->stateServer(yyvsp[-1]); } @@ -2339,7 +2339,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 68: /* command: ICEGRID_SERVER ICEGRID_STATE ICEGRID_HELP ';' */ -#line 408 "src/IceGrid/Grammar.y" +#line 406 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); } @@ -2347,7 +2347,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 69: /* command: ICEGRID_SERVER ICEGRID_PID strings ';' */ -#line 412 "src/IceGrid/Grammar.y" +#line 410 "src/IceGrid/Grammar.y" { parser->pidServer(yyvsp[-1]); } @@ -2355,7 +2355,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 70: /* command: ICEGRID_SERVER ICEGRID_PID ICEGRID_HELP ';' */ -#line 416 "src/IceGrid/Grammar.y" +#line 414 "src/IceGrid/Grammar.y" { parser->usage("server", "pid"); } @@ -2363,7 +2363,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 71: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES strings ';' */ -#line 420 "src/IceGrid/Grammar.y" +#line 418 "src/IceGrid/Grammar.y" { parser->propertiesServer(yyvsp[-1], false); } @@ -2371,7 +2371,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 72: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES ICEGRID_HELP ';' */ -#line 424 "src/IceGrid/Grammar.y" +#line 422 "src/IceGrid/Grammar.y" { parser->usage("server", "properties"); } @@ -2379,7 +2379,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 73: /* command: ICEGRID_SERVER ICEGRID_PROPERTY strings ';' */ -#line 428 "src/IceGrid/Grammar.y" +#line 426 "src/IceGrid/Grammar.y" { parser->propertiesServer(yyvsp[-1], true); } @@ -2387,7 +2387,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 74: /* command: ICEGRID_SERVER ICEGRID_PROPERTY ICEGRID_HELP ';' */ -#line 432 "src/IceGrid/Grammar.y" +#line 430 "src/IceGrid/Grammar.y" { parser->usage("server", "property"); } @@ -2395,7 +2395,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 75: /* command: ICEGRID_SERVER ICEGRID_ENABLE strings ';' */ -#line 436 "src/IceGrid/Grammar.y" +#line 434 "src/IceGrid/Grammar.y" { parser->enableServer(yyvsp[-1], true); } @@ -2403,7 +2403,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 76: /* command: ICEGRID_SERVER ICEGRID_ENABLE ICEGRID_HELP ';' */ -#line 440 "src/IceGrid/Grammar.y" +#line 438 "src/IceGrid/Grammar.y" { parser->usage("server", "enable"); } @@ -2411,7 +2411,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 77: /* command: ICEGRID_SERVER ICEGRID_DISABLE strings ';' */ -#line 444 "src/IceGrid/Grammar.y" +#line 442 "src/IceGrid/Grammar.y" { parser->enableServer(yyvsp[-1], false); } @@ -2419,7 +2419,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 78: /* command: ICEGRID_SERVER ICEGRID_DISABLE ICEGRID_HELP ';' */ -#line 448 "src/IceGrid/Grammar.y" +#line 446 "src/IceGrid/Grammar.y" { parser->usage("server", "disable"); } @@ -2427,7 +2427,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 79: /* command: ICEGRID_SERVER ICEGRID_LIST strings ';' */ -#line 452 "src/IceGrid/Grammar.y" +#line 450 "src/IceGrid/Grammar.y" { parser->listAllServers(yyvsp[-1]); } @@ -2435,7 +2435,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 80: /* command: ICEGRID_SERVER ICEGRID_LIST ICEGRID_HELP ';' */ -#line 456 "src/IceGrid/Grammar.y" +#line 454 "src/IceGrid/Grammar.y" { parser->usage("server", "list"); } @@ -2443,7 +2443,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 81: /* command: ICEGRID_SERVER ICEGRID_SHOW strings ';' */ -#line 460 "src/IceGrid/Grammar.y" +#line 458 "src/IceGrid/Grammar.y" { parser->show("server", yyvsp[-1]); } @@ -2451,7 +2451,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 82: /* command: ICEGRID_SERVER ICEGRID_SHOW ICEGRID_HELP ';' */ -#line 464 "src/IceGrid/Grammar.y" +#line 462 "src/IceGrid/Grammar.y" { parser->usage("server", "show"); } @@ -2459,7 +2459,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 83: /* command: ICEGRID_SERVICE ICEGRID_START strings ';' */ -#line 468 "src/IceGrid/Grammar.y" +#line 466 "src/IceGrid/Grammar.y" { parser->startService(yyvsp[-1]); } @@ -2467,7 +2467,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 84: /* command: ICEGRID_SERVICE ICEGRID_START ICEGRID_HELP ';' */ -#line 472 "src/IceGrid/Grammar.y" +#line 470 "src/IceGrid/Grammar.y" { parser->usage("service", "start"); } @@ -2475,7 +2475,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 85: /* command: ICEGRID_SERVICE ICEGRID_STOP strings ';' */ -#line 476 "src/IceGrid/Grammar.y" +#line 474 "src/IceGrid/Grammar.y" { parser->stopService(yyvsp[-1]); } @@ -2483,7 +2483,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 86: /* command: ICEGRID_SERVICE ICEGRID_STOP ICEGRID_HELP ';' */ -#line 480 "src/IceGrid/Grammar.y" +#line 478 "src/IceGrid/Grammar.y" { parser->usage("service", "stop"); } @@ -2491,7 +2491,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 87: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE strings ';' */ -#line 484 "src/IceGrid/Grammar.y" +#line 482 "src/IceGrid/Grammar.y" { parser->describeService(yyvsp[-1]); } @@ -2499,7 +2499,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 88: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 488 "src/IceGrid/Grammar.y" +#line 486 "src/IceGrid/Grammar.y" { parser->usage("service", "describe"); } @@ -2507,7 +2507,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 89: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES strings ';' */ -#line 492 "src/IceGrid/Grammar.y" +#line 490 "src/IceGrid/Grammar.y" { parser->propertiesService(yyvsp[-1], false); } @@ -2515,7 +2515,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 90: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES ICEGRID_HELP ';' */ -#line 496 "src/IceGrid/Grammar.y" +#line 494 "src/IceGrid/Grammar.y" { parser->usage("service", "properties"); } @@ -2523,7 +2523,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 91: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY strings ';' */ -#line 500 "src/IceGrid/Grammar.y" +#line 498 "src/IceGrid/Grammar.y" { parser->propertiesService(yyvsp[-1], true); } @@ -2531,7 +2531,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 92: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY ICEGRID_HELP ';' */ -#line 504 "src/IceGrid/Grammar.y" +#line 502 "src/IceGrid/Grammar.y" { parser->usage("service", "property"); } @@ -2539,7 +2539,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 93: /* command: ICEGRID_SERVICE ICEGRID_LIST strings ';' */ -#line 508 "src/IceGrid/Grammar.y" +#line 506 "src/IceGrid/Grammar.y" { parser->listServices(yyvsp[-1]); } @@ -2547,7 +2547,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 94: /* command: ICEGRID_SERVICE ICEGRID_LIST ICEGRID_HELP ';' */ -#line 512 "src/IceGrid/Grammar.y" +#line 510 "src/IceGrid/Grammar.y" { parser->usage("service", "list"); } @@ -2555,7 +2555,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 95: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS strings ';' */ -#line 516 "src/IceGrid/Grammar.y" +#line 514 "src/IceGrid/Grammar.y" { parser->endpointsAdapter(yyvsp[-1]); } @@ -2563,7 +2563,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 96: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS ICEGRID_HELP ';' */ -#line 520 "src/IceGrid/Grammar.y" +#line 518 "src/IceGrid/Grammar.y" { parser->usage("adapter", "endpoints"); } @@ -2571,7 +2571,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 97: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE strings ';' */ -#line 524 "src/IceGrid/Grammar.y" +#line 522 "src/IceGrid/Grammar.y" { parser->removeAdapter(yyvsp[-1]); } @@ -2579,7 +2579,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 98: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 528 "src/IceGrid/Grammar.y" +#line 526 "src/IceGrid/Grammar.y" { parser->usage("adapter", "remove"); } @@ -2587,7 +2587,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 99: /* command: ICEGRID_ADAPTER ICEGRID_LIST strings ';' */ -#line 532 "src/IceGrid/Grammar.y" +#line 530 "src/IceGrid/Grammar.y" { parser->listAllAdapters(yyvsp[-1]); } @@ -2595,7 +2595,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 100: /* command: ICEGRID_ADAPTER ICEGRID_LIST ICEGRID_HELP ';' */ -#line 536 "src/IceGrid/Grammar.y" +#line 534 "src/IceGrid/Grammar.y" { parser->usage("adapter", "list"); } @@ -2603,7 +2603,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 101: /* command: ICEGRID_OBJECT ICEGRID_ADD strings ';' */ -#line 540 "src/IceGrid/Grammar.y" +#line 538 "src/IceGrid/Grammar.y" { parser->addObject(yyvsp[-1]); } @@ -2611,7 +2611,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 102: /* command: ICEGRID_OBJECT ICEGRID_ADD ICEGRID_HELP ';' */ -#line 544 "src/IceGrid/Grammar.y" +#line 542 "src/IceGrid/Grammar.y" { parser->usage("object", "add"); } @@ -2619,7 +2619,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 103: /* command: ICEGRID_OBJECT ICEGRID_REMOVE strings ';' */ -#line 548 "src/IceGrid/Grammar.y" +#line 546 "src/IceGrid/Grammar.y" { parser->removeObject(yyvsp[-1]); } @@ -2627,7 +2627,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 104: /* command: ICEGRID_OBJECT ICEGRID_REMOVE ICEGRID_HELP ';' */ -#line 552 "src/IceGrid/Grammar.y" +#line 550 "src/IceGrid/Grammar.y" { parser->usage("object", "remove"); } @@ -2635,7 +2635,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 105: /* command: ICEGRID_OBJECT ICEGRID_FIND strings ';' */ -#line 556 "src/IceGrid/Grammar.y" +#line 554 "src/IceGrid/Grammar.y" { parser->findObject(yyvsp[-1]); } @@ -2643,7 +2643,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 106: /* command: ICEGRID_OBJECT ICEGRID_FIND ICEGRID_HELP ';' */ -#line 560 "src/IceGrid/Grammar.y" +#line 558 "src/IceGrid/Grammar.y" { parser->usage("object", "find"); } @@ -2651,7 +2651,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 107: /* command: ICEGRID_OBJECT ICEGRID_LIST strings ';' */ -#line 564 "src/IceGrid/Grammar.y" +#line 562 "src/IceGrid/Grammar.y" { parser->listObject(yyvsp[-1]); } @@ -2659,7 +2659,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 108: /* command: ICEGRID_OBJECT ICEGRID_LIST ICEGRID_HELP ';' */ -#line 568 "src/IceGrid/Grammar.y" +#line 566 "src/IceGrid/Grammar.y" { parser->usage("object", "list"); } @@ -2667,7 +2667,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 109: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE strings ';' */ -#line 572 "src/IceGrid/Grammar.y" +#line 570 "src/IceGrid/Grammar.y" { parser->describeObject(yyvsp[-1]); } @@ -2675,7 +2675,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 110: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE ICEGRID_HELP ';' */ -#line 576 "src/IceGrid/Grammar.y" +#line 574 "src/IceGrid/Grammar.y" { parser->usage("object", "describe"); } @@ -2683,7 +2683,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 111: /* command: ICEGRID_SHOW ICEGRID_COPYING ';' */ -#line 580 "src/IceGrid/Grammar.y" +#line 578 "src/IceGrid/Grammar.y" { parser->showCopying(); } @@ -2691,7 +2691,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 112: /* command: ICEGRID_SHOW ICEGRID_WARRANTY ';' */ -#line 584 "src/IceGrid/Grammar.y" +#line 582 "src/IceGrid/Grammar.y" { parser->showWarranty(); } @@ -2699,7 +2699,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 113: /* command: ICEGRID_HELP keyword ';' */ -#line 588 "src/IceGrid/Grammar.y" +#line 586 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-1].front()); } @@ -2707,7 +2707,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 114: /* command: ICEGRID_HELP keyword keyword ';' */ -#line 592 "src/IceGrid/Grammar.y" +#line 590 "src/IceGrid/Grammar.y" { if ((yyvsp[-2].front() == "server" || yyvsp[-2].front() == "service") && yyvsp[-1].front() == "template") { @@ -2722,7 +2722,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 115: /* command: ICEGRID_HELP keyword ICEGRID_STRING strings ';' */ -#line 603 "src/IceGrid/Grammar.y" +#line 601 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-3].front(), yyvsp[-2].front()); } @@ -2730,7 +2730,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 116: /* command: ICEGRID_HELP keyword keyword keyword ';' */ -#line 607 "src/IceGrid/Grammar.y" +#line 605 "src/IceGrid/Grammar.y" { if ((yyvsp[-3].front() == "server" || yyvsp[-3].front() == "service") && yyvsp[-2].front() == "template") { @@ -2745,7 +2745,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 117: /* command: ICEGRID_HELP keyword keyword ICEGRID_STRING strings ';' */ -#line 618 "src/IceGrid/Grammar.y" +#line 616 "src/IceGrid/Grammar.y" { if ((yyvsp[-4].front() == "server" || yyvsp[-4].front() == "service") && yyvsp[-3].front() == "template") { @@ -2760,7 +2760,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 118: /* command: ICEGRID_HELP ICEGRID_STRING strings ';' */ -#line 629 "src/IceGrid/Grammar.y" +#line 627 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-2].front()); } @@ -2768,7 +2768,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 119: /* command: ICEGRID_HELP error ';' */ -#line 633 "src/IceGrid/Grammar.y" +#line 631 "src/IceGrid/Grammar.y" { parser->usage(); } @@ -2776,7 +2776,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 120: /* command: keyword ICEGRID_HELP ';' */ -#line 637 "src/IceGrid/Grammar.y" +#line 635 "src/IceGrid/Grammar.y" { parser->usage(yyvsp[-2].front()); } @@ -2784,7 +2784,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 121: /* command: keyword ICEGRID_STRING error ';' */ -#line 641 "src/IceGrid/Grammar.y" +#line 639 "src/IceGrid/Grammar.y" { yyvsp[-3].push_back(yyvsp[-2].front()); parser->invalidCommand(yyvsp[-3]); @@ -2794,7 +2794,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 122: /* command: keyword error ';' */ -#line 647 "src/IceGrid/Grammar.y" +#line 645 "src/IceGrid/Grammar.y" { parser->invalidCommand(yyvsp[-2]); yyerrok; @@ -2803,7 +2803,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 123: /* command: ICEGRID_STRING error ';' */ -#line 652 "src/IceGrid/Grammar.y" +#line 650 "src/IceGrid/Grammar.y" { parser->invalidCommand(yyvsp[-2]); yyerrok; @@ -2812,7 +2812,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 124: /* command: error ';' */ -#line 657 "src/IceGrid/Grammar.y" +#line 655 "src/IceGrid/Grammar.y" { yyerrok; } @@ -2820,14 +2820,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 125: /* command: ';' */ -#line 661 "src/IceGrid/Grammar.y" +#line 659 "src/IceGrid/Grammar.y" { } #line 2827 "src/IceGrid/Grammar.cpp" break; case 126: /* strings: ICEGRID_STRING strings */ -#line 669 "src/IceGrid/Grammar.y" +#line 667 "src/IceGrid/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -2836,7 +2836,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 127: /* strings: keyword strings */ -#line 674 "src/IceGrid/Grammar.y" +#line 672 "src/IceGrid/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -2845,7 +2845,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 128: /* strings: ICEGRID_STRING ICEGRID_HELP strings */ -#line 679 "src/IceGrid/Grammar.y" +#line 677 "src/IceGrid/Grammar.y" { yyval = yyvsp[-1]; yyval.push_front("help"); @@ -2855,7 +2855,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 129: /* strings: keyword ICEGRID_HELP strings */ -#line 685 "src/IceGrid/Grammar.y" +#line 683 "src/IceGrid/Grammar.y" { yyval = yyvsp[-1]; yyval.push_front("help"); @@ -2865,7 +2865,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 130: /* strings: %empty */ -#line 691 "src/IceGrid/Grammar.y" +#line 689 "src/IceGrid/Grammar.y" { yyval = YYSTYPE(); } @@ -2873,259 +2873,259 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 131: /* keyword: ICEGRID_EXIT */ -#line 700 "src/IceGrid/Grammar.y" +#line 698 "src/IceGrid/Grammar.y" { } #line 2880 "src/IceGrid/Grammar.cpp" break; case 132: /* keyword: ICEGRID_APPLICATION */ -#line 703 "src/IceGrid/Grammar.y" +#line 701 "src/IceGrid/Grammar.y" { } #line 2887 "src/IceGrid/Grammar.cpp" break; case 133: /* keyword: ICEGRID_NODE */ -#line 706 "src/IceGrid/Grammar.y" +#line 704 "src/IceGrid/Grammar.y" { } #line 2894 "src/IceGrid/Grammar.cpp" break; case 134: /* keyword: ICEGRID_REGISTRY */ -#line 709 "src/IceGrid/Grammar.y" +#line 707 "src/IceGrid/Grammar.y" { } #line 2901 "src/IceGrid/Grammar.cpp" break; case 135: /* keyword: ICEGRID_SERVER */ -#line 712 "src/IceGrid/Grammar.y" +#line 710 "src/IceGrid/Grammar.y" { } #line 2908 "src/IceGrid/Grammar.cpp" break; case 136: /* keyword: ICEGRID_ADAPTER */ -#line 715 "src/IceGrid/Grammar.y" +#line 713 "src/IceGrid/Grammar.y" { } #line 2915 "src/IceGrid/Grammar.cpp" break; case 137: /* keyword: ICEGRID_PING */ -#line 718 "src/IceGrid/Grammar.y" +#line 716 "src/IceGrid/Grammar.y" { } #line 2922 "src/IceGrid/Grammar.cpp" break; case 138: /* keyword: ICEGRID_LOAD */ -#line 721 "src/IceGrid/Grammar.y" +#line 719 "src/IceGrid/Grammar.y" { } #line 2929 "src/IceGrid/Grammar.cpp" break; case 139: /* keyword: ICEGRID_SOCKETS */ -#line 724 "src/IceGrid/Grammar.y" +#line 722 "src/IceGrid/Grammar.y" { } #line 2936 "src/IceGrid/Grammar.cpp" break; case 140: /* keyword: ICEGRID_ADD */ -#line 727 "src/IceGrid/Grammar.y" +#line 725 "src/IceGrid/Grammar.y" { } #line 2943 "src/IceGrid/Grammar.cpp" break; case 141: /* keyword: ICEGRID_REMOVE */ -#line 730 "src/IceGrid/Grammar.y" +#line 728 "src/IceGrid/Grammar.y" { } #line 2950 "src/IceGrid/Grammar.cpp" break; case 142: /* keyword: ICEGRID_LIST */ -#line 733 "src/IceGrid/Grammar.y" +#line 731 "src/IceGrid/Grammar.y" { } #line 2957 "src/IceGrid/Grammar.cpp" break; case 143: /* keyword: ICEGRID_SHUTDOWN */ -#line 736 "src/IceGrid/Grammar.y" +#line 734 "src/IceGrid/Grammar.y" { } #line 2964 "src/IceGrid/Grammar.cpp" break; case 144: /* keyword: ICEGRID_START */ -#line 739 "src/IceGrid/Grammar.y" +#line 737 "src/IceGrid/Grammar.y" { } #line 2971 "src/IceGrid/Grammar.cpp" break; case 145: /* keyword: ICEGRID_STOP */ -#line 742 "src/IceGrid/Grammar.y" +#line 740 "src/IceGrid/Grammar.y" { } #line 2978 "src/IceGrid/Grammar.cpp" break; case 146: /* keyword: ICEGRID_SIGNAL */ -#line 745 "src/IceGrid/Grammar.y" +#line 743 "src/IceGrid/Grammar.y" { } #line 2985 "src/IceGrid/Grammar.cpp" break; case 147: /* keyword: ICEGRID_DESCRIBE */ -#line 748 "src/IceGrid/Grammar.y" +#line 746 "src/IceGrid/Grammar.y" { } #line 2992 "src/IceGrid/Grammar.cpp" break; case 148: /* keyword: ICEGRID_STATE */ -#line 751 "src/IceGrid/Grammar.y" +#line 749 "src/IceGrid/Grammar.y" { } #line 2999 "src/IceGrid/Grammar.cpp" break; case 149: /* keyword: ICEGRID_PID */ -#line 754 "src/IceGrid/Grammar.y" +#line 752 "src/IceGrid/Grammar.y" { } #line 3006 "src/IceGrid/Grammar.cpp" break; case 150: /* keyword: ICEGRID_PROPERTIES */ -#line 757 "src/IceGrid/Grammar.y" +#line 755 "src/IceGrid/Grammar.y" { } #line 3013 "src/IceGrid/Grammar.cpp" break; case 151: /* keyword: ICEGRID_PROPERTY */ -#line 760 "src/IceGrid/Grammar.y" +#line 758 "src/IceGrid/Grammar.y" { } #line 3020 "src/IceGrid/Grammar.cpp" break; case 152: /* keyword: ICEGRID_ENDPOINTS */ -#line 763 "src/IceGrid/Grammar.y" +#line 761 "src/IceGrid/Grammar.y" { } #line 3027 "src/IceGrid/Grammar.cpp" break; case 153: /* keyword: ICEGRID_ACTIVATION */ -#line 766 "src/IceGrid/Grammar.y" +#line 764 "src/IceGrid/Grammar.y" { } #line 3034 "src/IceGrid/Grammar.cpp" break; case 154: /* keyword: ICEGRID_OBJECT */ -#line 769 "src/IceGrid/Grammar.y" +#line 767 "src/IceGrid/Grammar.y" { } #line 3041 "src/IceGrid/Grammar.cpp" break; case 155: /* keyword: ICEGRID_FIND */ -#line 772 "src/IceGrid/Grammar.y" +#line 770 "src/IceGrid/Grammar.y" { } #line 3048 "src/IceGrid/Grammar.cpp" break; case 156: /* keyword: ICEGRID_SHOW */ -#line 775 "src/IceGrid/Grammar.y" +#line 773 "src/IceGrid/Grammar.y" { } #line 3055 "src/IceGrid/Grammar.cpp" break; case 157: /* keyword: ICEGRID_COPYING */ -#line 778 "src/IceGrid/Grammar.y" +#line 776 "src/IceGrid/Grammar.y" { } #line 3062 "src/IceGrid/Grammar.cpp" break; case 158: /* keyword: ICEGRID_WARRANTY */ -#line 781 "src/IceGrid/Grammar.y" +#line 779 "src/IceGrid/Grammar.y" { } #line 3069 "src/IceGrid/Grammar.cpp" break; case 159: /* keyword: ICEGRID_DIFF */ -#line 784 "src/IceGrid/Grammar.y" +#line 782 "src/IceGrid/Grammar.y" { } #line 3076 "src/IceGrid/Grammar.cpp" break; case 160: /* keyword: ICEGRID_UPDATE */ -#line 787 "src/IceGrid/Grammar.y" +#line 785 "src/IceGrid/Grammar.y" { } #line 3083 "src/IceGrid/Grammar.cpp" break; case 161: /* keyword: ICEGRID_INSTANTIATE */ -#line 790 "src/IceGrid/Grammar.y" +#line 788 "src/IceGrid/Grammar.y" { } #line 3090 "src/IceGrid/Grammar.cpp" break; case 162: /* keyword: ICEGRID_TEMPLATE */ -#line 793 "src/IceGrid/Grammar.y" +#line 791 "src/IceGrid/Grammar.y" { } #line 3097 "src/IceGrid/Grammar.cpp" break; case 163: /* keyword: ICEGRID_SERVICE */ -#line 796 "src/IceGrid/Grammar.y" +#line 794 "src/IceGrid/Grammar.y" { } #line 3104 "src/IceGrid/Grammar.cpp" break; case 164: /* keyword: ICEGRID_ENABLE */ -#line 799 "src/IceGrid/Grammar.y" +#line 797 "src/IceGrid/Grammar.y" { } #line 3111 "src/IceGrid/Grammar.cpp" break; case 165: /* keyword: ICEGRID_DISABLE */ -#line 802 "src/IceGrid/Grammar.y" +#line 800 "src/IceGrid/Grammar.y" { } #line 3118 "src/IceGrid/Grammar.cpp" break; case 166: /* keyword: ICEGRID_STDERR */ -#line 805 "src/IceGrid/Grammar.y" +#line 803 "src/IceGrid/Grammar.y" { } #line 3125 "src/IceGrid/Grammar.cpp" break; case 167: /* keyword: ICEGRID_STDOUT */ -#line 808 "src/IceGrid/Grammar.y" +#line 806 "src/IceGrid/Grammar.y" { } #line 3132 "src/IceGrid/Grammar.cpp" @@ -3325,3 +3325,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); return yyresult; } +#line 810 "src/IceGrid/Grammar.y" + + +// NOLINTEND diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h index 6dc5ff9af8e..2b25d2ee4b6 100644 --- a/cpp/src/IceGrid/Grammar.h +++ b/cpp/src/IceGrid/Grammar.h @@ -48,8 +48,6 @@ extern int yydebug; #line 9 "src/IceGrid/Grammar.y" -// NOLINTBEGIN - #include #include @@ -65,7 +63,7 @@ extern int yydebug; #define yyoverflow(a, b, c, d, e, f) yyerror(a) -#line 69 "src/IceGrid/Grammar.h" +#line 67 "src/IceGrid/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y index 47912be949a..c63942b5ab0 100644 --- a/cpp/src/IceGrid/Grammar.y +++ b/cpp/src/IceGrid/Grammar.y @@ -8,8 +8,6 @@ %code requires{ -// NOLINTBEGIN - #include #include @@ -808,3 +806,7 @@ keyword { } ; + +%% + +// NOLINTEND diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp index 9ff13e83e32..9366289b9c6 100644 --- a/cpp/src/IceStorm/Grammar.cpp +++ b/cpp/src/IceStorm/Grammar.cpp @@ -77,7 +77,7 @@ /* First part of user prologue. */ -#line 37 "src/IceStorm/Grammar.y" +#line 35 "src/IceStorm/Grammar.y" #include "Ice/Ice.h" @@ -169,7 +169,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 29 "src/IceStorm/Grammar.y" +#line 27 "src/IceStorm/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -559,10 +559,10 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 99, 99, 102, 110, 113, 121, 125, 129, 133, - 137, 141, 145, 149, 153, 157, 161, 165, 169, 173, - 181, 186, 191, 200, 203, 206, 209, 212, 215, 218, - 221, 224 + 0, 97, 97, 100, 108, 111, 119, 123, 127, 131, + 135, 139, 143, 147, 151, 155, 159, 163, 167, 171, + 179, 184, 189, 198, 201, 204, 207, 210, 213, 216, + 219, 222 }; #endif @@ -1162,35 +1162,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); switch (yyn) { case 2: /* start: commands */ -#line 100 "src/IceStorm/Grammar.y" +#line 98 "src/IceStorm/Grammar.y" { } #line 1169 "src/IceStorm/Grammar.cpp" break; case 3: /* start: %empty */ -#line 103 "src/IceStorm/Grammar.y" +#line 101 "src/IceStorm/Grammar.y" { } #line 1176 "src/IceStorm/Grammar.cpp" break; case 4: /* commands: commands command */ -#line 111 "src/IceStorm/Grammar.y" +#line 109 "src/IceStorm/Grammar.y" { } #line 1183 "src/IceStorm/Grammar.cpp" break; case 5: /* commands: command */ -#line 114 "src/IceStorm/Grammar.y" +#line 112 "src/IceStorm/Grammar.y" { } #line 1190 "src/IceStorm/Grammar.cpp" break; case 6: /* command: ICESTORM_HELP ';' */ -#line 122 "src/IceStorm/Grammar.y" +#line 120 "src/IceStorm/Grammar.y" { parser->usage(); } @@ -1198,7 +1198,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 7: /* command: ICESTORM_EXIT ';' */ -#line 126 "src/IceStorm/Grammar.y" +#line 124 "src/IceStorm/Grammar.y" { return 0; } @@ -1206,7 +1206,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 8: /* command: ICESTORM_CREATE strings ';' */ -#line 130 "src/IceStorm/Grammar.y" +#line 128 "src/IceStorm/Grammar.y" { parser->create(yyvsp[-1]); } @@ -1214,7 +1214,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 9: /* command: ICESTORM_CURRENT strings ';' */ -#line 134 "src/IceStorm/Grammar.y" +#line 132 "src/IceStorm/Grammar.y" { parser->current(yyvsp[-1]); } @@ -1222,7 +1222,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 10: /* command: ICESTORM_DESTROY strings ';' */ -#line 138 "src/IceStorm/Grammar.y" +#line 136 "src/IceStorm/Grammar.y" { parser->destroy(yyvsp[-1]); } @@ -1230,7 +1230,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 11: /* command: ICESTORM_LINK strings ';' */ -#line 142 "src/IceStorm/Grammar.y" +#line 140 "src/IceStorm/Grammar.y" { parser->link(yyvsp[-1]); } @@ -1238,7 +1238,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 12: /* command: ICESTORM_UNLINK strings ';' */ -#line 146 "src/IceStorm/Grammar.y" +#line 144 "src/IceStorm/Grammar.y" { parser->unlink(yyvsp[-1]); } @@ -1246,7 +1246,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 13: /* command: ICESTORM_LINKS strings ';' */ -#line 150 "src/IceStorm/Grammar.y" +#line 148 "src/IceStorm/Grammar.y" { parser->links(yyvsp[-1]); } @@ -1254,7 +1254,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 14: /* command: ICESTORM_TOPICS strings ';' */ -#line 154 "src/IceStorm/Grammar.y" +#line 152 "src/IceStorm/Grammar.y" { parser->topics(yyvsp[-1]); } @@ -1262,7 +1262,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 15: /* command: ICESTORM_REPLICA strings ';' */ -#line 158 "src/IceStorm/Grammar.y" +#line 156 "src/IceStorm/Grammar.y" { parser->replica(yyvsp[-1]); } @@ -1270,7 +1270,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 16: /* command: ICESTORM_SUBSCRIBERS strings ';' */ -#line 162 "src/IceStorm/Grammar.y" +#line 160 "src/IceStorm/Grammar.y" { parser->subscribers(yyvsp[-1]); } @@ -1278,7 +1278,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 17: /* command: ICESTORM_STRING error ';' */ -#line 166 "src/IceStorm/Grammar.y" +#line 164 "src/IceStorm/Grammar.y" { parser->invalidCommand("unknown command `" + yyvsp[-2].front() + "' (type `help' for more info)"); } @@ -1286,7 +1286,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 18: /* command: error ';' */ -#line 170 "src/IceStorm/Grammar.y" +#line 168 "src/IceStorm/Grammar.y" { yyerrok; } @@ -1294,14 +1294,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 19: /* command: ';' */ -#line 174 "src/IceStorm/Grammar.y" +#line 172 "src/IceStorm/Grammar.y" { } #line 1301 "src/IceStorm/Grammar.cpp" break; case 20: /* strings: ICESTORM_STRING strings */ -#line 182 "src/IceStorm/Grammar.y" +#line 180 "src/IceStorm/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -1310,7 +1310,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 21: /* strings: keyword strings */ -#line 187 "src/IceStorm/Grammar.y" +#line 185 "src/IceStorm/Grammar.y" { yyval = yyvsp[0]; yyval.push_front(yyvsp[-1].front()); @@ -1319,7 +1319,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 22: /* strings: %empty */ -#line 192 "src/IceStorm/Grammar.y" +#line 190 "src/IceStorm/Grammar.y" { yyval = YYSTYPE(); } @@ -1327,63 +1327,63 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); break; case 23: /* keyword: ICESTORM_HELP */ -#line 201 "src/IceStorm/Grammar.y" +#line 199 "src/IceStorm/Grammar.y" { } #line 1334 "src/IceStorm/Grammar.cpp" break; case 24: /* keyword: ICESTORM_EXIT */ -#line 204 "src/IceStorm/Grammar.y" +#line 202 "src/IceStorm/Grammar.y" { } #line 1341 "src/IceStorm/Grammar.cpp" break; case 25: /* keyword: ICESTORM_CURRENT */ -#line 207 "src/IceStorm/Grammar.y" +#line 205 "src/IceStorm/Grammar.y" { } #line 1348 "src/IceStorm/Grammar.cpp" break; case 26: /* keyword: ICESTORM_CREATE */ -#line 210 "src/IceStorm/Grammar.y" +#line 208 "src/IceStorm/Grammar.y" { } #line 1355 "src/IceStorm/Grammar.cpp" break; case 27: /* keyword: ICESTORM_DESTROY */ -#line 213 "src/IceStorm/Grammar.y" +#line 211 "src/IceStorm/Grammar.y" { } #line 1362 "src/IceStorm/Grammar.cpp" break; case 28: /* keyword: ICESTORM_LINK */ -#line 216 "src/IceStorm/Grammar.y" +#line 214 "src/IceStorm/Grammar.y" { } #line 1369 "src/IceStorm/Grammar.cpp" break; case 29: /* keyword: ICESTORM_UNLINK */ -#line 219 "src/IceStorm/Grammar.y" +#line 217 "src/IceStorm/Grammar.y" { } #line 1376 "src/IceStorm/Grammar.cpp" break; case 30: /* keyword: ICESTORM_LINKS */ -#line 222 "src/IceStorm/Grammar.y" +#line 220 "src/IceStorm/Grammar.y" { } #line 1383 "src/IceStorm/Grammar.cpp" break; case 31: /* keyword: ICESTORM_TOPICS */ -#line 225 "src/IceStorm/Grammar.y" +#line 223 "src/IceStorm/Grammar.y" { } #line 1390 "src/IceStorm/Grammar.cpp" @@ -1583,5 +1583,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); return yyresult; } -#line 228 "src/IceStorm/Grammar.y" +#line 226 "src/IceStorm/Grammar.y" + +// NOLINTEND diff --git a/cpp/src/IceStorm/Grammar.h b/cpp/src/IceStorm/Grammar.h index 288fd97f76b..1e15679de6f 100644 --- a/cpp/src/IceStorm/Grammar.h +++ b/cpp/src/IceStorm/Grammar.h @@ -48,8 +48,6 @@ extern int yydebug; #line 9 "src/IceStorm/Grammar.y" -// NOLINTBEGIN - #include #include @@ -65,7 +63,7 @@ extern int yydebug; #define yyoverflow(a, b, c, d, e, f) yyerror(a) -#line 69 "src/IceStorm/Grammar.h" +#line 67 "src/IceStorm/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y index ff6c6c48a38..45159f4cb80 100644 --- a/cpp/src/IceStorm/Grammar.y +++ b/cpp/src/IceStorm/Grammar.y @@ -8,8 +8,6 @@ %code requires{ -// NOLINTBEGIN - #include #include @@ -226,3 +224,5 @@ keyword } %% + +// NOLINTEND diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp index da8657b40f3..bc78b9d8d92 100644 --- a/cpp/src/Slice/Grammar.cpp +++ b/cpp/src/Slice/Grammar.cpp @@ -71,7 +71,7 @@ // NOLINTBEGIN -#line 29 "src/Slice/Grammar.y" +#line 27 "src/Slice/Grammar.y" // Defines the rule bison uses to reduce token locations. Bison asks that the macro should @@ -112,7 +112,7 @@ while(0) #define yynerrs slice_nerrs /* First part of user prologue. */ -#line 68 "src/Slice/Grammar.y" +#line 66 "src/Slice/Grammar.y" #include "Ice/UUID.h" @@ -332,7 +332,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; /* Unqualified %code blocks. */ -#line 60 "src/Slice/Grammar.y" +#line 58 "src/Slice/Grammar.y" // Forward declaration of the lexing function generated by flex, so bison knows about it. @@ -728,27 +728,27 @@ static const yytype_int8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 186, 186, 194, 197, 205, 214, 218, 227, 235, - 244, 253, 252, 258, 257, 262, 267, 266, 272, 271, - 276, 281, 280, 286, 285, 290, 295, 294, 300, 299, - 304, 309, 308, 314, 313, 318, 323, 322, 327, 332, - 331, 337, 336, 341, 345, 355, 354, 385, 384, 468, - 472, 483, 494, 493, 519, 527, 536, 547, 565, 640, - 646, 657, 674, 687, 691, 702, 713, 712, 751, 755, - 766, 791, 878, 890, 903, 902, 936, 970, 979, 982, - 990, 999, 1002, 1006, 1014, 1044, 1075, 1097, 1123, 1138, - 1144, 1154, 1178, 1208, 1232, 1267, 1266, 1289, 1288, 1311, - 1315, 1326, 1340, 1339, 1373, 1408, 1443, 1448, 1458, 1462, - 1471, 1480, 1483, 1487, 1495, 1502, 1514, 1526, 1537, 1545, - 1559, 1569, 1585, 1589, 1601, 1600, 1632, 1631, 1649, 1661, - 1673, 1682, 1688, 1706, 1718, 1722, 1763, 1769, 1780, 1783, - 1799, 1815, 1827, 1839, 1850, 1866, 1870, 1879, 1882, 1890, - 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1904, - 1908, 1913, 1938, 1968, 1974, 1982, 1992, 2007, 2016, 2025, - 2060, 2067, 2074, 2086, 2095, 2109, 2110, 2111, 2112, 2113, - 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, - 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, - 2134, 2135 + 0, 184, 184, 192, 195, 203, 212, 216, 225, 233, + 242, 251, 250, 256, 255, 260, 265, 264, 270, 269, + 274, 279, 278, 284, 283, 288, 293, 292, 298, 297, + 302, 307, 306, 312, 311, 316, 321, 320, 325, 330, + 329, 335, 334, 339, 343, 353, 352, 383, 382, 466, + 470, 481, 492, 491, 517, 525, 534, 545, 563, 638, + 644, 655, 672, 685, 689, 700, 711, 710, 749, 753, + 764, 789, 876, 888, 901, 900, 934, 968, 977, 980, + 988, 997, 1000, 1004, 1012, 1042, 1073, 1095, 1121, 1136, + 1142, 1152, 1176, 1206, 1230, 1265, 1264, 1287, 1286, 1309, + 1313, 1324, 1338, 1337, 1371, 1406, 1441, 1446, 1456, 1460, + 1469, 1478, 1481, 1485, 1493, 1500, 1512, 1524, 1535, 1543, + 1557, 1567, 1583, 1587, 1599, 1598, 1630, 1629, 1647, 1659, + 1671, 1680, 1686, 1704, 1716, 1720, 1761, 1767, 1778, 1781, + 1797, 1813, 1825, 1837, 1848, 1864, 1868, 1877, 1880, 1888, + 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1902, + 1906, 1911, 1936, 1966, 1972, 1980, 1990, 2005, 2014, 2023, + 2058, 2065, 2072, 2084, 2093, 2107, 2108, 2109, 2110, 2111, + 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, + 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, + 2132, 2133 }; #endif @@ -1730,28 +1730,28 @@ YYLTYPE yylloc = yyloc_default; switch (yyn) { case 2: /* start: definitions */ -#line 187 "src/Slice/Grammar.y" +#line 185 "src/Slice/Grammar.y" { } #line 1737 "src/Slice/Grammar.cpp" break; case 3: /* opt_semicolon: ';' */ -#line 195 "src/Slice/Grammar.y" +#line 193 "src/Slice/Grammar.y" { } #line 1744 "src/Slice/Grammar.cpp" break; case 4: /* opt_semicolon: %empty */ -#line 198 "src/Slice/Grammar.y" +#line 196 "src/Slice/Grammar.y" { } #line 1751 "src/Slice/Grammar.cpp" break; case 5: /* file_metadata: ICE_FILE_METADATA_OPEN metadata_list ICE_FILE_METADATA_CLOSE */ -#line 206 "src/Slice/Grammar.y" +#line 204 "src/Slice/Grammar.y" { yyval = yyvsp[-1]; } @@ -1759,7 +1759,7 @@ YYLTYPE yylloc = yyloc_default; break; case 6: /* metadata: ICE_METADATA_OPEN metadata_list ICE_METADATA_CLOSE */ -#line 215 "src/Slice/Grammar.y" +#line 213 "src/Slice/Grammar.y" { yyval = yyvsp[-1]; } @@ -1767,7 +1767,7 @@ YYLTYPE yylloc = yyloc_default; break; case 7: /* metadata: %empty */ -#line 219 "src/Slice/Grammar.y" +#line 217 "src/Slice/Grammar.y" { yyval = make_shared(); } @@ -1775,7 +1775,7 @@ YYLTYPE yylloc = yyloc_default; break; case 8: /* definitions: definitions file_metadata */ -#line 228 "src/Slice/Grammar.y" +#line 226 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[0]); if (!metadata->v.empty()) @@ -1787,7 +1787,7 @@ YYLTYPE yylloc = yyloc_default; break; case 9: /* definitions: definitions metadata definition */ -#line 236 "src/Slice/Grammar.y" +#line 234 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-1]); auto contained = dynamic_pointer_cast(yyvsp[0]); @@ -1800,14 +1800,14 @@ YYLTYPE yylloc = yyloc_default; break; case 10: /* definitions: %empty */ -#line 245 "src/Slice/Grammar.y" +#line 243 "src/Slice/Grammar.y" { } #line 1807 "src/Slice/Grammar.cpp" break; case 11: /* $@1: %empty */ -#line 253 "src/Slice/Grammar.y" +#line 251 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1815,7 +1815,7 @@ YYLTYPE yylloc = yyloc_default; break; case 13: /* $@2: %empty */ -#line 258 "src/Slice/Grammar.y" +#line 256 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1823,7 +1823,7 @@ YYLTYPE yylloc = yyloc_default; break; case 15: /* definition: class_decl */ -#line 263 "src/Slice/Grammar.y" +#line 261 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after class forward declaration"); } @@ -1831,7 +1831,7 @@ YYLTYPE yylloc = yyloc_default; break; case 16: /* $@3: %empty */ -#line 267 "src/Slice/Grammar.y" +#line 265 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1839,7 +1839,7 @@ YYLTYPE yylloc = yyloc_default; break; case 18: /* $@4: %empty */ -#line 272 "src/Slice/Grammar.y" +#line 270 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1847,7 +1847,7 @@ YYLTYPE yylloc = yyloc_default; break; case 20: /* definition: interface_decl */ -#line 277 "src/Slice/Grammar.y" +#line 275 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after interface forward declaration"); } @@ -1855,7 +1855,7 @@ YYLTYPE yylloc = yyloc_default; break; case 21: /* $@5: %empty */ -#line 281 "src/Slice/Grammar.y" +#line 279 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1863,7 +1863,7 @@ YYLTYPE yylloc = yyloc_default; break; case 23: /* $@6: %empty */ -#line 286 "src/Slice/Grammar.y" +#line 284 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr); } @@ -1871,7 +1871,7 @@ YYLTYPE yylloc = yyloc_default; break; case 25: /* definition: exception_decl */ -#line 291 "src/Slice/Grammar.y" +#line 289 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after exception forward declaration"); } @@ -1879,7 +1879,7 @@ YYLTYPE yylloc = yyloc_default; break; case 26: /* $@7: %empty */ -#line 295 "src/Slice/Grammar.y" +#line 293 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1887,7 +1887,7 @@ YYLTYPE yylloc = yyloc_default; break; case 28: /* $@8: %empty */ -#line 300 "src/Slice/Grammar.y" +#line 298 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr); } @@ -1895,7 +1895,7 @@ YYLTYPE yylloc = yyloc_default; break; case 30: /* definition: struct_decl */ -#line 305 "src/Slice/Grammar.y" +#line 303 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after struct forward declaration"); } @@ -1903,7 +1903,7 @@ YYLTYPE yylloc = yyloc_default; break; case 31: /* $@9: %empty */ -#line 309 "src/Slice/Grammar.y" +#line 307 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1911,7 +1911,7 @@ YYLTYPE yylloc = yyloc_default; break; case 33: /* $@10: %empty */ -#line 314 "src/Slice/Grammar.y" +#line 312 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1919,7 +1919,7 @@ YYLTYPE yylloc = yyloc_default; break; case 35: /* definition: sequence_def */ -#line 319 "src/Slice/Grammar.y" +#line 317 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after sequence definition"); } @@ -1927,7 +1927,7 @@ YYLTYPE yylloc = yyloc_default; break; case 36: /* $@11: %empty */ -#line 323 "src/Slice/Grammar.y" +#line 321 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1935,7 +1935,7 @@ YYLTYPE yylloc = yyloc_default; break; case 38: /* definition: dictionary_def */ -#line 328 "src/Slice/Grammar.y" +#line 326 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after dictionary definition"); } @@ -1943,7 +1943,7 @@ YYLTYPE yylloc = yyloc_default; break; case 39: /* $@12: %empty */ -#line 332 "src/Slice/Grammar.y" +#line 330 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1951,7 +1951,7 @@ YYLTYPE yylloc = yyloc_default; break; case 41: /* $@13: %empty */ -#line 337 "src/Slice/Grammar.y" +#line 335 "src/Slice/Grammar.y" { assert(yyvsp[0] == nullptr || dynamic_pointer_cast(yyvsp[0])); } @@ -1959,7 +1959,7 @@ YYLTYPE yylloc = yyloc_default; break; case 43: /* definition: const_def */ -#line 342 "src/Slice/Grammar.y" +#line 340 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after const definition"); } @@ -1967,7 +1967,7 @@ YYLTYPE yylloc = yyloc_default; break; case 44: /* definition: error ';' */ -#line 346 "src/Slice/Grammar.y" +#line 344 "src/Slice/Grammar.y" { yyerrok; } @@ -1975,7 +1975,7 @@ YYLTYPE yylloc = yyloc_default; break; case 45: /* @14: %empty */ -#line 355 "src/Slice/Grammar.y" +#line 353 "src/Slice/Grammar.y" { currentUnit->setSeenDefinition(); @@ -1997,7 +1997,7 @@ YYLTYPE yylloc = yyloc_default; break; case 46: /* module_def: ICE_MODULE ICE_IDENTIFIER @14 '{' definitions '}' */ -#line 373 "src/Slice/Grammar.y" +#line 371 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2013,7 +2013,7 @@ YYLTYPE yylloc = yyloc_default; break; case 47: /* @15: %empty */ -#line 385 "src/Slice/Grammar.y" +#line 383 "src/Slice/Grammar.y" { currentUnit->setSeenDefinition(); @@ -2072,7 +2072,7 @@ YYLTYPE yylloc = yyloc_default; break; case 48: /* module_def: ICE_MODULE ICE_SCOPED_IDENTIFIER @15 '{' definitions '}' */ -#line 440 "src/Slice/Grammar.y" +#line 438 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2100,7 +2100,7 @@ YYLTYPE yylloc = yyloc_default; break; case 49: /* exception_id: ICE_EXCEPTION ICE_IDENTIFIER */ -#line 469 "src/Slice/Grammar.y" +#line 467 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -2108,7 +2108,7 @@ YYLTYPE yylloc = yyloc_default; break; case 50: /* exception_id: ICE_EXCEPTION keyword */ -#line 473 "src/Slice/Grammar.y" +#line 471 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name"); @@ -2118,7 +2118,7 @@ YYLTYPE yylloc = yyloc_default; break; case 51: /* exception_decl: exception_id */ -#line 484 "src/Slice/Grammar.y" +#line 482 "src/Slice/Grammar.y" { currentUnit->error("exceptions cannot be forward declared"); yyval = nullptr; @@ -2127,7 +2127,7 @@ YYLTYPE yylloc = yyloc_default; break; case 52: /* @16: %empty */ -#line 494 "src/Slice/Grammar.y" +#line 492 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); auto base = dynamic_pointer_cast(yyvsp[0]); @@ -2144,7 +2144,7 @@ YYLTYPE yylloc = yyloc_default; break; case 53: /* exception_def: exception_id exception_extends @16 '{' data_members '}' */ -#line 507 "src/Slice/Grammar.y" +#line 505 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2156,7 +2156,7 @@ YYLTYPE yylloc = yyloc_default; break; case 54: /* exception_extends: extends scoped_name */ -#line 520 "src/Slice/Grammar.y" +#line 518 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2168,7 +2168,7 @@ YYLTYPE yylloc = yyloc_default; break; case 55: /* exception_extends: %empty */ -#line 528 "src/Slice/Grammar.y" +#line 526 "src/Slice/Grammar.y" { yyval = nullptr; } @@ -2176,7 +2176,7 @@ YYLTYPE yylloc = yyloc_default; break; case 56: /* type_id: type ICE_IDENTIFIER */ -#line 537 "src/Slice/Grammar.y" +#line 535 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[-1]); auto ident = dynamic_pointer_cast(yyvsp[0]); @@ -2186,7 +2186,7 @@ YYLTYPE yylloc = yyloc_default; break; case 57: /* optional: ICE_OPTIONAL_OPEN ICE_INTEGER_LITERAL ')' */ -#line 548 "src/Slice/Grammar.y" +#line 546 "src/Slice/Grammar.y" { auto i = dynamic_pointer_cast(yyvsp[-1]); @@ -2208,7 +2208,7 @@ YYLTYPE yylloc = yyloc_default; break; case 58: /* optional: ICE_OPTIONAL_OPEN scoped_name ')' */ -#line 566 "src/Slice/Grammar.y" +#line 564 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2287,7 +2287,7 @@ YYLTYPE yylloc = yyloc_default; break; case 59: /* optional: ICE_OPTIONAL_OPEN ')' */ -#line 641 "src/Slice/Grammar.y" +#line 639 "src/Slice/Grammar.y" { currentUnit->error("missing tag"); auto m = make_shared(-1); // Dummy @@ -2297,7 +2297,7 @@ YYLTYPE yylloc = yyloc_default; break; case 60: /* optional: ICE_OPTIONAL */ -#line 647 "src/Slice/Grammar.y" +#line 645 "src/Slice/Grammar.y" { currentUnit->error("missing tag"); auto m = make_shared(-1); // Dummy @@ -2307,7 +2307,7 @@ YYLTYPE yylloc = yyloc_default; break; case 61: /* optional_type_id: optional type_id */ -#line 658 "src/Slice/Grammar.y" +#line 656 "src/Slice/Grammar.y" { auto m = dynamic_pointer_cast(yyvsp[-1]); auto ts = dynamic_pointer_cast(yyvsp[0]); @@ -2328,7 +2328,7 @@ YYLTYPE yylloc = yyloc_default; break; case 62: /* optional_type_id: type_id */ -#line 675 "src/Slice/Grammar.y" +#line 673 "src/Slice/Grammar.y" { auto ts = dynamic_pointer_cast(yyvsp[0]); auto m = make_shared(-1); @@ -2340,7 +2340,7 @@ YYLTYPE yylloc = yyloc_default; break; case 63: /* struct_id: ICE_STRUCT ICE_IDENTIFIER */ -#line 688 "src/Slice/Grammar.y" +#line 686 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -2348,7 +2348,7 @@ YYLTYPE yylloc = yyloc_default; break; case 64: /* struct_id: ICE_STRUCT keyword */ -#line 692 "src/Slice/Grammar.y" +#line 690 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as struct name"); @@ -2358,7 +2358,7 @@ YYLTYPE yylloc = yyloc_default; break; case 65: /* struct_decl: struct_id */ -#line 703 "src/Slice/Grammar.y" +#line 701 "src/Slice/Grammar.y" { currentUnit->error("structs cannot be forward declared"); yyval = nullptr; // Dummy @@ -2367,7 +2367,7 @@ YYLTYPE yylloc = yyloc_default; break; case 66: /* @17: %empty */ -#line 713 "src/Slice/Grammar.y" +#line 711 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2389,7 +2389,7 @@ YYLTYPE yylloc = yyloc_default; break; case 67: /* struct_def: struct_id @17 '{' data_members '}' */ -#line 731 "src/Slice/Grammar.y" +#line 729 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2409,7 +2409,7 @@ YYLTYPE yylloc = yyloc_default; break; case 68: /* class_name: ICE_CLASS ICE_IDENTIFIER */ -#line 752 "src/Slice/Grammar.y" +#line 750 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -2417,7 +2417,7 @@ YYLTYPE yylloc = yyloc_default; break; case 69: /* class_name: ICE_CLASS keyword */ -#line 756 "src/Slice/Grammar.y" +#line 754 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as class name"); @@ -2427,7 +2427,7 @@ YYLTYPE yylloc = yyloc_default; break; case 70: /* class_id: ICE_CLASS ICE_IDENT_OPEN ICE_INTEGER_LITERAL ')' */ -#line 767 "src/Slice/Grammar.y" +#line 765 "src/Slice/Grammar.y" { int64_t id = dynamic_pointer_cast(yyvsp[-1])->v; if (id < 0) @@ -2456,7 +2456,7 @@ YYLTYPE yylloc = yyloc_default; break; case 71: /* class_id: ICE_CLASS ICE_IDENT_OPEN scoped_name ')' */ -#line 792 "src/Slice/Grammar.y" +#line 790 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); @@ -2547,7 +2547,7 @@ YYLTYPE yylloc = yyloc_default; break; case 72: /* class_id: class_name */ -#line 879 "src/Slice/Grammar.y" +#line 877 "src/Slice/Grammar.y" { auto classId = make_shared(); classId->v = dynamic_pointer_cast(yyvsp[0])->v; @@ -2558,7 +2558,7 @@ YYLTYPE yylloc = yyloc_default; break; case 73: /* class_decl: class_name */ -#line 891 "src/Slice/Grammar.y" +#line 889 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2569,7 +2569,7 @@ YYLTYPE yylloc = yyloc_default; break; case 74: /* @18: %empty */ -#line 903 "src/Slice/Grammar.y" +#line 901 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2590,7 +2590,7 @@ YYLTYPE yylloc = yyloc_default; break; case 75: /* class_def: class_id class_extends @18 '{' data_members '}' */ -#line 920 "src/Slice/Grammar.y" +#line 918 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -2606,7 +2606,7 @@ YYLTYPE yylloc = yyloc_default; break; case 76: /* class_extends: extends scoped_name */ -#line 937 "src/Slice/Grammar.y" +#line 935 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -2644,7 +2644,7 @@ YYLTYPE yylloc = yyloc_default; break; case 77: /* class_extends: %empty */ -#line 971 "src/Slice/Grammar.y" +#line 969 "src/Slice/Grammar.y" { yyval = nullptr; } @@ -2652,21 +2652,21 @@ YYLTYPE yylloc = yyloc_default; break; case 78: /* extends: ICE_EXTENDS */ -#line 980 "src/Slice/Grammar.y" +#line 978 "src/Slice/Grammar.y" { } #line 2659 "src/Slice/Grammar.cpp" break; case 79: /* extends: ':' */ -#line 983 "src/Slice/Grammar.y" +#line 981 "src/Slice/Grammar.y" { } #line 2666 "src/Slice/Grammar.cpp" break; case 80: /* data_members: metadata data_member ';' data_members */ -#line 991 "src/Slice/Grammar.y" +#line 989 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto contained = dynamic_pointer_cast(yyvsp[-2]); @@ -2679,14 +2679,14 @@ YYLTYPE yylloc = yyloc_default; break; case 81: /* data_members: error ';' data_members */ -#line 1000 "src/Slice/Grammar.y" +#line 998 "src/Slice/Grammar.y" { } #line 2686 "src/Slice/Grammar.cpp" break; case 82: /* data_members: metadata data_member */ -#line 1003 "src/Slice/Grammar.y" +#line 1001 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after definition"); } @@ -2694,14 +2694,14 @@ YYLTYPE yylloc = yyloc_default; break; case 83: /* data_members: %empty */ -#line 1007 "src/Slice/Grammar.y" +#line 1005 "src/Slice/Grammar.y" { } #line 2701 "src/Slice/Grammar.cpp" break; case 84: /* data_member: optional_type_id */ -#line 1015 "src/Slice/Grammar.y" +#line 1013 "src/Slice/Grammar.y" { auto def = dynamic_pointer_cast(yyvsp[0]); auto cl = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -2735,7 +2735,7 @@ YYLTYPE yylloc = yyloc_default; break; case 85: /* data_member: optional_type_id '=' const_initializer */ -#line 1045 "src/Slice/Grammar.y" +#line 1043 "src/Slice/Grammar.y" { auto def = dynamic_pointer_cast(yyvsp[-2]); auto value = dynamic_pointer_cast(yyvsp[0]); @@ -2770,7 +2770,7 @@ YYLTYPE yylloc = yyloc_default; break; case 86: /* data_member: type keyword */ -#line 1076 "src/Slice/Grammar.y" +#line 1074 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2796,7 +2796,7 @@ YYLTYPE yylloc = yyloc_default; break; case 87: /* data_member: type */ -#line 1098 "src/Slice/Grammar.y" +#line 1096 "src/Slice/Grammar.y" { auto type = dynamic_pointer_cast(yyvsp[0]); auto cl = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -2821,7 +2821,7 @@ YYLTYPE yylloc = yyloc_default; break; case 88: /* return_type: optional type */ -#line 1124 "src/Slice/Grammar.y" +#line 1122 "src/Slice/Grammar.y" { auto m = dynamic_pointer_cast(yyvsp[-1]); m->type = dynamic_pointer_cast(yyvsp[0]); @@ -2840,7 +2840,7 @@ YYLTYPE yylloc = yyloc_default; break; case 89: /* return_type: type */ -#line 1139 "src/Slice/Grammar.y" +#line 1137 "src/Slice/Grammar.y" { auto m = make_shared(-1); m->type = dynamic_pointer_cast(yyvsp[0]); @@ -2850,7 +2850,7 @@ YYLTYPE yylloc = yyloc_default; break; case 90: /* return_type: ICE_VOID */ -#line 1145 "src/Slice/Grammar.y" +#line 1143 "src/Slice/Grammar.y" { auto m = make_shared(-1); yyval = m; @@ -2859,7 +2859,7 @@ YYLTYPE yylloc = yyloc_default; break; case 91: /* operation_preamble: return_type ICE_IDENT_OPEN */ -#line 1155 "src/Slice/Grammar.y" +#line 1153 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2887,7 +2887,7 @@ YYLTYPE yylloc = yyloc_default; break; case 92: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_IDENT_OPEN */ -#line 1179 "src/Slice/Grammar.y" +#line 1177 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2921,7 +2921,7 @@ YYLTYPE yylloc = yyloc_default; break; case 93: /* operation_preamble: return_type ICE_KEYWORD_OPEN */ -#line 1209 "src/Slice/Grammar.y" +#line 1207 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2949,7 +2949,7 @@ YYLTYPE yylloc = yyloc_default; break; case 94: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_KEYWORD_OPEN */ -#line 1233 "src/Slice/Grammar.y" +#line 1231 "src/Slice/Grammar.y" { auto returnType = dynamic_pointer_cast(yyvsp[-1]); string name = dynamic_pointer_cast(yyvsp[0])->v; @@ -2982,7 +2982,7 @@ YYLTYPE yylloc = yyloc_default; break; case 95: /* @19: %empty */ -#line 1267 "src/Slice/Grammar.y" +#line 1265 "src/Slice/Grammar.y" { if (yyvsp[-2]) { @@ -2998,7 +2998,7 @@ YYLTYPE yylloc = yyloc_default; break; case 96: /* operation: operation_preamble parameters ')' @19 throws */ -#line 1279 "src/Slice/Grammar.y" +#line 1277 "src/Slice/Grammar.y" { auto op = dynamic_pointer_cast(yyvsp[-1]); auto el = dynamic_pointer_cast(yyvsp[0]); @@ -3012,7 +3012,7 @@ YYLTYPE yylloc = yyloc_default; break; case 97: /* @20: %empty */ -#line 1289 "src/Slice/Grammar.y" +#line 1287 "src/Slice/Grammar.y" { if (yyvsp[-2]) { @@ -3024,7 +3024,7 @@ YYLTYPE yylloc = yyloc_default; break; case 98: /* operation: operation_preamble error ')' @20 throws */ -#line 1297 "src/Slice/Grammar.y" +#line 1295 "src/Slice/Grammar.y" { auto op = dynamic_pointer_cast(yyvsp[-1]); auto el = dynamic_pointer_cast(yyvsp[0]); @@ -3038,7 +3038,7 @@ YYLTYPE yylloc = yyloc_default; break; case 99: /* interface_id: ICE_INTERFACE ICE_IDENTIFIER */ -#line 1312 "src/Slice/Grammar.y" +#line 1310 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -3046,7 +3046,7 @@ YYLTYPE yylloc = yyloc_default; break; case 100: /* interface_id: ICE_INTERFACE keyword */ -#line 1316 "src/Slice/Grammar.y" +#line 1314 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as interface name"); @@ -3056,7 +3056,7 @@ YYLTYPE yylloc = yyloc_default; break; case 101: /* interface_decl: interface_id */ -#line 1327 "src/Slice/Grammar.y" +#line 1325 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto cont = currentUnit->currentContainer(); @@ -3068,7 +3068,7 @@ YYLTYPE yylloc = yyloc_default; break; case 102: /* @21: %empty */ -#line 1340 "src/Slice/Grammar.y" +#line 1338 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3089,7 +3089,7 @@ YYLTYPE yylloc = yyloc_default; break; case 103: /* interface_def: interface_id interface_extends @21 '{' operations '}' */ -#line 1357 "src/Slice/Grammar.y" +#line 1355 "src/Slice/Grammar.y" { if (yyvsp[-3]) { @@ -3105,7 +3105,7 @@ YYLTYPE yylloc = yyloc_default; break; case 104: /* interface_list: scoped_name ',' interface_list */ -#line 1374 "src/Slice/Grammar.y" +#line 1372 "src/Slice/Grammar.y" { auto intfs = dynamic_pointer_cast(yyvsp[0]); auto scoped = dynamic_pointer_cast(yyvsp[-2]); @@ -3144,7 +3144,7 @@ YYLTYPE yylloc = yyloc_default; break; case 105: /* interface_list: scoped_name */ -#line 1409 "src/Slice/Grammar.y" +#line 1407 "src/Slice/Grammar.y" { auto intfs = make_shared(); auto scoped = dynamic_pointer_cast(yyvsp[0]); @@ -3183,7 +3183,7 @@ YYLTYPE yylloc = yyloc_default; break; case 106: /* interface_list: ICE_OBJECT */ -#line 1444 "src/Slice/Grammar.y" +#line 1442 "src/Slice/Grammar.y" { currentUnit->error("illegal inheritance from type Object"); yyval = make_shared(); // Dummy @@ -3192,7 +3192,7 @@ YYLTYPE yylloc = yyloc_default; break; case 107: /* interface_list: ICE_VALUE */ -#line 1449 "src/Slice/Grammar.y" +#line 1447 "src/Slice/Grammar.y" { currentUnit->error("illegal inheritance from type Value"); yyval = make_shared(); // Dummy @@ -3201,7 +3201,7 @@ YYLTYPE yylloc = yyloc_default; break; case 108: /* interface_extends: extends interface_list */ -#line 1459 "src/Slice/Grammar.y" +#line 1457 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -3209,7 +3209,7 @@ YYLTYPE yylloc = yyloc_default; break; case 109: /* interface_extends: %empty */ -#line 1463 "src/Slice/Grammar.y" +#line 1461 "src/Slice/Grammar.y" { yyval = make_shared(); } @@ -3217,7 +3217,7 @@ YYLTYPE yylloc = yyloc_default; break; case 110: /* operations: metadata operation ';' operations */ -#line 1472 "src/Slice/Grammar.y" +#line 1470 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto contained = dynamic_pointer_cast(yyvsp[-2]); @@ -3230,14 +3230,14 @@ YYLTYPE yylloc = yyloc_default; break; case 111: /* operations: error ';' operations */ -#line 1481 "src/Slice/Grammar.y" +#line 1479 "src/Slice/Grammar.y" { } #line 3237 "src/Slice/Grammar.cpp" break; case 112: /* operations: metadata operation */ -#line 1484 "src/Slice/Grammar.y" +#line 1482 "src/Slice/Grammar.y" { currentUnit->error("`;' missing after definition"); } @@ -3245,14 +3245,14 @@ YYLTYPE yylloc = yyloc_default; break; case 113: /* operations: %empty */ -#line 1488 "src/Slice/Grammar.y" +#line 1486 "src/Slice/Grammar.y" { } #line 3252 "src/Slice/Grammar.cpp" break; case 114: /* exception_list: exception ',' exception_list */ -#line 1496 "src/Slice/Grammar.y" +#line 1494 "src/Slice/Grammar.y" { auto exception = dynamic_pointer_cast(yyvsp[-2]); auto exceptionList = dynamic_pointer_cast(yyvsp[0]); @@ -3263,7 +3263,7 @@ YYLTYPE yylloc = yyloc_default; break; case 115: /* exception_list: exception */ -#line 1503 "src/Slice/Grammar.y" +#line 1501 "src/Slice/Grammar.y" { auto exception = dynamic_pointer_cast(yyvsp[0]); auto exceptionList = make_shared(); @@ -3274,7 +3274,7 @@ YYLTYPE yylloc = yyloc_default; break; case 116: /* exception: scoped_name */ -#line 1515 "src/Slice/Grammar.y" +#line 1513 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3290,7 +3290,7 @@ YYLTYPE yylloc = yyloc_default; break; case 117: /* exception: keyword */ -#line 1527 "src/Slice/Grammar.y" +#line 1525 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name"); @@ -3300,7 +3300,7 @@ YYLTYPE yylloc = yyloc_default; break; case 118: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' ICE_IDENTIFIER */ -#line 1538 "src/Slice/Grammar.y" +#line 1536 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto metadata = dynamic_pointer_cast(yyvsp[-3]); @@ -3312,7 +3312,7 @@ YYLTYPE yylloc = yyloc_default; break; case 119: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' keyword */ -#line 1546 "src/Slice/Grammar.y" +#line 1544 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto metadata = dynamic_pointer_cast(yyvsp[-3]); @@ -3325,7 +3325,7 @@ YYLTYPE yylloc = yyloc_default; break; case 120: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' ICE_IDENTIFIER */ -#line 1560 "src/Slice/Grammar.y" +#line 1558 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto keyMetadata = dynamic_pointer_cast(yyvsp[-6]); @@ -3339,7 +3339,7 @@ YYLTYPE yylloc = yyloc_default; break; case 121: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' keyword */ -#line 1570 "src/Slice/Grammar.y" +#line 1568 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); auto keyMetadata = dynamic_pointer_cast(yyvsp[-6]); @@ -3354,7 +3354,7 @@ YYLTYPE yylloc = yyloc_default; break; case 122: /* enum_id: ICE_ENUM ICE_IDENTIFIER */ -#line 1586 "src/Slice/Grammar.y" +#line 1584 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -3362,7 +3362,7 @@ YYLTYPE yylloc = yyloc_default; break; case 123: /* enum_id: ICE_ENUM keyword */ -#line 1590 "src/Slice/Grammar.y" +#line 1588 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); currentUnit->error("keyword `" + ident->v + "' cannot be used as enumeration name"); @@ -3372,7 +3372,7 @@ YYLTYPE yylloc = yyloc_default; break; case 124: /* @22: %empty */ -#line 1601 "src/Slice/Grammar.y" +#line 1599 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3392,7 +3392,7 @@ YYLTYPE yylloc = yyloc_default; break; case 125: /* enum_def: enum_id @22 '{' enumerator_list '}' */ -#line 1617 "src/Slice/Grammar.y" +#line 1615 "src/Slice/Grammar.y" { auto en = dynamic_pointer_cast(yyvsp[-3]); if (en) @@ -3410,7 +3410,7 @@ YYLTYPE yylloc = yyloc_default; break; case 126: /* @23: %empty */ -#line 1632 "src/Slice/Grammar.y" +#line 1630 "src/Slice/Grammar.y" { currentUnit->error("missing enumeration name"); ContainerPtr cont = currentUnit->currentContainer(); @@ -3422,7 +3422,7 @@ YYLTYPE yylloc = yyloc_default; break; case 127: /* enum_def: ICE_ENUM @23 '{' enumerator_list '}' */ -#line 1640 "src/Slice/Grammar.y" +#line 1638 "src/Slice/Grammar.y" { currentUnit->popContainer(); yyval = yyvsp[-4]; @@ -3431,7 +3431,7 @@ YYLTYPE yylloc = yyloc_default; break; case 128: /* enumerator_list: metadata enumerator ',' enumerator_list */ -#line 1650 "src/Slice/Grammar.y" +#line 1648 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto enumerator = dynamic_pointer_cast(yyvsp[-2]); @@ -3447,7 +3447,7 @@ YYLTYPE yylloc = yyloc_default; break; case 129: /* enumerator_list: metadata enumerator */ -#line 1662 "src/Slice/Grammar.y" +#line 1660 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-1]); auto enumerator = dynamic_pointer_cast(yyvsp[0]); @@ -3463,7 +3463,7 @@ YYLTYPE yylloc = yyloc_default; break; case 130: /* enumerator_list: %empty */ -#line 1674 "src/Slice/Grammar.y" +#line 1672 "src/Slice/Grammar.y" { yyval = make_shared(); // Empty list } @@ -3471,7 +3471,7 @@ YYLTYPE yylloc = yyloc_default; break; case 131: /* enumerator: ICE_IDENTIFIER */ -#line 1683 "src/Slice/Grammar.y" +#line 1681 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -3481,7 +3481,7 @@ YYLTYPE yylloc = yyloc_default; break; case 132: /* enumerator: ICE_IDENTIFIER '=' enumerator_initializer */ -#line 1689 "src/Slice/Grammar.y" +#line 1687 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[-2]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -3503,7 +3503,7 @@ YYLTYPE yylloc = yyloc_default; break; case 133: /* enumerator: keyword */ -#line 1707 "src/Slice/Grammar.y" +#line 1705 "src/Slice/Grammar.y" { auto ident = dynamic_pointer_cast(yyvsp[0]); EnumPtr cont = dynamic_pointer_cast(currentUnit->currentContainer()); @@ -3514,7 +3514,7 @@ YYLTYPE yylloc = yyloc_default; break; case 134: /* enumerator_initializer: ICE_INTEGER_LITERAL */ -#line 1719 "src/Slice/Grammar.y" +#line 1717 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -3522,7 +3522,7 @@ YYLTYPE yylloc = yyloc_default; break; case 135: /* enumerator_initializer: scoped_name */ -#line 1723 "src/Slice/Grammar.y" +#line 1721 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainedList cl = currentUnit->currentContainer()->lookupContained(scoped->v, true); @@ -3562,7 +3562,7 @@ YYLTYPE yylloc = yyloc_default; break; case 136: /* out_qualifier: ICE_OUT */ -#line 1764 "src/Slice/Grammar.y" +#line 1762 "src/Slice/Grammar.y" { auto out = make_shared(); out->v = true; @@ -3572,7 +3572,7 @@ YYLTYPE yylloc = yyloc_default; break; case 137: /* out_qualifier: %empty */ -#line 1770 "src/Slice/Grammar.y" +#line 1768 "src/Slice/Grammar.y" { auto out = make_shared(); out->v = false; @@ -3582,14 +3582,14 @@ YYLTYPE yylloc = yyloc_default; break; case 138: /* parameters: %empty */ -#line 1781 "src/Slice/Grammar.y" +#line 1779 "src/Slice/Grammar.y" { } #line 3589 "src/Slice/Grammar.cpp" break; case 139: /* parameters: out_qualifier metadata optional_type_id */ -#line 1784 "src/Slice/Grammar.y" +#line 1782 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto tsp = dynamic_pointer_cast(yyvsp[0]); @@ -3609,7 +3609,7 @@ YYLTYPE yylloc = yyloc_default; break; case 140: /* parameters: parameters ',' out_qualifier metadata optional_type_id */ -#line 1800 "src/Slice/Grammar.y" +#line 1798 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto tsp = dynamic_pointer_cast(yyvsp[0]); @@ -3629,7 +3629,7 @@ YYLTYPE yylloc = yyloc_default; break; case 141: /* parameters: out_qualifier metadata type keyword */ -#line 1816 "src/Slice/Grammar.y" +#line 1814 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-3]); auto type = dynamic_pointer_cast(yyvsp[-1]); @@ -3645,7 +3645,7 @@ YYLTYPE yylloc = yyloc_default; break; case 142: /* parameters: parameters ',' out_qualifier metadata type keyword */ -#line 1828 "src/Slice/Grammar.y" +#line 1826 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-3]); auto type = dynamic_pointer_cast(yyvsp[-1]); @@ -3661,7 +3661,7 @@ YYLTYPE yylloc = yyloc_default; break; case 143: /* parameters: out_qualifier metadata type */ -#line 1840 "src/Slice/Grammar.y" +#line 1838 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto type = dynamic_pointer_cast(yyvsp[0]); @@ -3676,7 +3676,7 @@ YYLTYPE yylloc = yyloc_default; break; case 144: /* parameters: parameters ',' out_qualifier metadata type */ -#line 1851 "src/Slice/Grammar.y" +#line 1849 "src/Slice/Grammar.y" { auto isOutParam = dynamic_pointer_cast(yyvsp[-2]); auto type = dynamic_pointer_cast(yyvsp[0]); @@ -3691,7 +3691,7 @@ YYLTYPE yylloc = yyloc_default; break; case 145: /* throws: ICE_THROWS exception_list */ -#line 1867 "src/Slice/Grammar.y" +#line 1865 "src/Slice/Grammar.y" { yyval = yyvsp[0]; } @@ -3699,7 +3699,7 @@ YYLTYPE yylloc = yyloc_default; break; case 146: /* throws: %empty */ -#line 1871 "src/Slice/Grammar.y" +#line 1869 "src/Slice/Grammar.y" { yyval = make_shared(); } @@ -3707,81 +3707,81 @@ YYLTYPE yylloc = yyloc_default; break; case 147: /* scoped_name: ICE_IDENTIFIER */ -#line 1880 "src/Slice/Grammar.y" +#line 1878 "src/Slice/Grammar.y" { } #line 3714 "src/Slice/Grammar.cpp" break; case 148: /* scoped_name: ICE_SCOPED_IDENTIFIER */ -#line 1883 "src/Slice/Grammar.y" +#line 1881 "src/Slice/Grammar.y" { } #line 3721 "src/Slice/Grammar.cpp" break; case 149: /* builtin: ICE_BOOL */ -#line 1890 "src/Slice/Grammar.y" +#line 1888 "src/Slice/Grammar.y" {} #line 3727 "src/Slice/Grammar.cpp" break; case 150: /* builtin: ICE_BYTE */ -#line 1891 "src/Slice/Grammar.y" +#line 1889 "src/Slice/Grammar.y" {} #line 3733 "src/Slice/Grammar.cpp" break; case 151: /* builtin: ICE_SHORT */ -#line 1892 "src/Slice/Grammar.y" +#line 1890 "src/Slice/Grammar.y" {} #line 3739 "src/Slice/Grammar.cpp" break; case 152: /* builtin: ICE_INT */ -#line 1893 "src/Slice/Grammar.y" +#line 1891 "src/Slice/Grammar.y" {} #line 3745 "src/Slice/Grammar.cpp" break; case 153: /* builtin: ICE_LONG */ -#line 1894 "src/Slice/Grammar.y" +#line 1892 "src/Slice/Grammar.y" {} #line 3751 "src/Slice/Grammar.cpp" break; case 154: /* builtin: ICE_FLOAT */ -#line 1895 "src/Slice/Grammar.y" +#line 1893 "src/Slice/Grammar.y" {} #line 3757 "src/Slice/Grammar.cpp" break; case 155: /* builtin: ICE_DOUBLE */ -#line 1896 "src/Slice/Grammar.y" +#line 1894 "src/Slice/Grammar.y" {} #line 3763 "src/Slice/Grammar.cpp" break; case 156: /* builtin: ICE_STRING */ -#line 1897 "src/Slice/Grammar.y" +#line 1895 "src/Slice/Grammar.y" {} #line 3769 "src/Slice/Grammar.cpp" break; case 157: /* builtin: ICE_OBJECT */ -#line 1898 "src/Slice/Grammar.y" +#line 1896 "src/Slice/Grammar.y" {} #line 3775 "src/Slice/Grammar.cpp" break; case 158: /* builtin: ICE_VALUE */ -#line 1899 "src/Slice/Grammar.y" +#line 1897 "src/Slice/Grammar.y" {} #line 3781 "src/Slice/Grammar.cpp" break; case 159: /* type: ICE_OBJECT '*' */ -#line 1905 "src/Slice/Grammar.y" +#line 1903 "src/Slice/Grammar.y" { yyval = currentUnit->createBuiltin(Builtin::KindObjectProxy); } @@ -3789,7 +3789,7 @@ YYLTYPE yylloc = yyloc_default; break; case 160: /* type: builtin */ -#line 1909 "src/Slice/Grammar.y" +#line 1907 "src/Slice/Grammar.y" { auto typeName = dynamic_pointer_cast(yyvsp[0]); yyval = currentUnit->createBuiltin(Builtin::kindFromString(typeName->v).value()); @@ -3798,7 +3798,7 @@ YYLTYPE yylloc = yyloc_default; break; case 161: /* type: scoped_name */ -#line 1914 "src/Slice/Grammar.y" +#line 1912 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3827,7 +3827,7 @@ YYLTYPE yylloc = yyloc_default; break; case 162: /* type: scoped_name '*' */ -#line 1939 "src/Slice/Grammar.y" +#line 1937 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[-1]); ContainerPtr cont = currentUnit->currentContainer(); @@ -3856,7 +3856,7 @@ YYLTYPE yylloc = yyloc_default; break; case 163: /* string_literal: ICE_STRING_LITERAL string_literal */ -#line 1969 "src/Slice/Grammar.y" +#line 1967 "src/Slice/Grammar.y" { auto str1 = dynamic_pointer_cast(yyvsp[-1]); auto str2 = dynamic_pointer_cast(yyvsp[0]); @@ -3866,14 +3866,14 @@ YYLTYPE yylloc = yyloc_default; break; case 164: /* string_literal: ICE_STRING_LITERAL */ -#line 1975 "src/Slice/Grammar.y" +#line 1973 "src/Slice/Grammar.y" { } #line 3873 "src/Slice/Grammar.cpp" break; case 165: /* metadata_list: metadata_list ',' string_literal */ -#line 1983 "src/Slice/Grammar.y" +#line 1981 "src/Slice/Grammar.y" { auto str = dynamic_pointer_cast(yyvsp[0]); auto metadataList = dynamic_pointer_cast(yyvsp[-2]); @@ -3887,7 +3887,7 @@ YYLTYPE yylloc = yyloc_default; break; case 166: /* metadata_list: string_literal */ -#line 1993 "src/Slice/Grammar.y" +#line 1991 "src/Slice/Grammar.y" { auto str = dynamic_pointer_cast(yyvsp[0]); auto metadataList = make_shared(); @@ -3901,7 +3901,7 @@ YYLTYPE yylloc = yyloc_default; break; case 167: /* const_initializer: ICE_INTEGER_LITERAL */ -#line 2008 "src/Slice/Grammar.y" +#line 2006 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindLong); auto intVal = dynamic_pointer_cast(yyvsp[0]); @@ -3914,7 +3914,7 @@ YYLTYPE yylloc = yyloc_default; break; case 168: /* const_initializer: ICE_FLOATING_POINT_LITERAL */ -#line 2017 "src/Slice/Grammar.y" +#line 2015 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindDouble); auto floatVal = dynamic_pointer_cast(yyvsp[0]); @@ -3927,7 +3927,7 @@ YYLTYPE yylloc = yyloc_default; break; case 169: /* const_initializer: scoped_name */ -#line 2026 "src/Slice/Grammar.y" +#line 2024 "src/Slice/Grammar.y" { auto scoped = dynamic_pointer_cast(yyvsp[0]); ConstDefTokPtr def; @@ -3966,7 +3966,7 @@ YYLTYPE yylloc = yyloc_default; break; case 170: /* const_initializer: ICE_STRING_LITERAL */ -#line 2061 "src/Slice/Grammar.y" +#line 2059 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindString); auto literal = dynamic_pointer_cast(yyvsp[0]); @@ -3977,7 +3977,7 @@ YYLTYPE yylloc = yyloc_default; break; case 171: /* const_initializer: ICE_FALSE */ -#line 2068 "src/Slice/Grammar.y" +#line 2066 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool); auto literal = dynamic_pointer_cast(yyvsp[0]); @@ -3988,7 +3988,7 @@ YYLTYPE yylloc = yyloc_default; break; case 172: /* const_initializer: ICE_TRUE */ -#line 2075 "src/Slice/Grammar.y" +#line 2073 "src/Slice/Grammar.y" { BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool); auto literal = dynamic_pointer_cast(yyvsp[0]); @@ -3999,7 +3999,7 @@ YYLTYPE yylloc = yyloc_default; break; case 173: /* const_def: ICE_CONST metadata type ICE_IDENTIFIER '=' const_initializer */ -#line 2087 "src/Slice/Grammar.y" +#line 2085 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-4]); auto const_type = dynamic_pointer_cast(yyvsp[-3]); @@ -4012,7 +4012,7 @@ YYLTYPE yylloc = yyloc_default; break; case 174: /* const_def: ICE_CONST metadata type '=' const_initializer */ -#line 2096 "src/Slice/Grammar.y" +#line 2094 "src/Slice/Grammar.y" { auto metadata = dynamic_pointer_cast(yyvsp[-3]); auto const_type = dynamic_pointer_cast(yyvsp[-2]); @@ -4025,163 +4025,163 @@ YYLTYPE yylloc = yyloc_default; break; case 175: /* keyword: ICE_MODULE */ -#line 2109 "src/Slice/Grammar.y" +#line 2107 "src/Slice/Grammar.y" {} #line 4031 "src/Slice/Grammar.cpp" break; case 176: /* keyword: ICE_CLASS */ -#line 2110 "src/Slice/Grammar.y" +#line 2108 "src/Slice/Grammar.y" {} #line 4037 "src/Slice/Grammar.cpp" break; case 177: /* keyword: ICE_INTERFACE */ -#line 2111 "src/Slice/Grammar.y" +#line 2109 "src/Slice/Grammar.y" {} #line 4043 "src/Slice/Grammar.cpp" break; case 178: /* keyword: ICE_EXCEPTION */ -#line 2112 "src/Slice/Grammar.y" +#line 2110 "src/Slice/Grammar.y" {} #line 4049 "src/Slice/Grammar.cpp" break; case 179: /* keyword: ICE_STRUCT */ -#line 2113 "src/Slice/Grammar.y" +#line 2111 "src/Slice/Grammar.y" {} #line 4055 "src/Slice/Grammar.cpp" break; case 180: /* keyword: ICE_SEQUENCE */ -#line 2114 "src/Slice/Grammar.y" +#line 2112 "src/Slice/Grammar.y" {} #line 4061 "src/Slice/Grammar.cpp" break; case 181: /* keyword: ICE_DICTIONARY */ -#line 2115 "src/Slice/Grammar.y" +#line 2113 "src/Slice/Grammar.y" {} #line 4067 "src/Slice/Grammar.cpp" break; case 182: /* keyword: ICE_ENUM */ -#line 2116 "src/Slice/Grammar.y" +#line 2114 "src/Slice/Grammar.y" {} #line 4073 "src/Slice/Grammar.cpp" break; case 183: /* keyword: ICE_OUT */ -#line 2117 "src/Slice/Grammar.y" +#line 2115 "src/Slice/Grammar.y" {} #line 4079 "src/Slice/Grammar.cpp" break; case 184: /* keyword: ICE_EXTENDS */ -#line 2118 "src/Slice/Grammar.y" +#line 2116 "src/Slice/Grammar.y" {} #line 4085 "src/Slice/Grammar.cpp" break; case 185: /* keyword: ICE_THROWS */ -#line 2119 "src/Slice/Grammar.y" +#line 2117 "src/Slice/Grammar.y" {} #line 4091 "src/Slice/Grammar.cpp" break; case 186: /* keyword: ICE_VOID */ -#line 2120 "src/Slice/Grammar.y" +#line 2118 "src/Slice/Grammar.y" {} #line 4097 "src/Slice/Grammar.cpp" break; case 187: /* keyword: ICE_BOOL */ -#line 2121 "src/Slice/Grammar.y" +#line 2119 "src/Slice/Grammar.y" {} #line 4103 "src/Slice/Grammar.cpp" break; case 188: /* keyword: ICE_BYTE */ -#line 2122 "src/Slice/Grammar.y" +#line 2120 "src/Slice/Grammar.y" {} #line 4109 "src/Slice/Grammar.cpp" break; case 189: /* keyword: ICE_SHORT */ -#line 2123 "src/Slice/Grammar.y" +#line 2121 "src/Slice/Grammar.y" {} #line 4115 "src/Slice/Grammar.cpp" break; case 190: /* keyword: ICE_INT */ -#line 2124 "src/Slice/Grammar.y" +#line 2122 "src/Slice/Grammar.y" {} #line 4121 "src/Slice/Grammar.cpp" break; case 191: /* keyword: ICE_LONG */ -#line 2125 "src/Slice/Grammar.y" +#line 2123 "src/Slice/Grammar.y" {} #line 4127 "src/Slice/Grammar.cpp" break; case 192: /* keyword: ICE_FLOAT */ -#line 2126 "src/Slice/Grammar.y" +#line 2124 "src/Slice/Grammar.y" {} #line 4133 "src/Slice/Grammar.cpp" break; case 193: /* keyword: ICE_DOUBLE */ -#line 2127 "src/Slice/Grammar.y" +#line 2125 "src/Slice/Grammar.y" {} #line 4139 "src/Slice/Grammar.cpp" break; case 194: /* keyword: ICE_STRING */ -#line 2128 "src/Slice/Grammar.y" +#line 2126 "src/Slice/Grammar.y" {} #line 4145 "src/Slice/Grammar.cpp" break; case 195: /* keyword: ICE_OBJECT */ -#line 2129 "src/Slice/Grammar.y" +#line 2127 "src/Slice/Grammar.y" {} #line 4151 "src/Slice/Grammar.cpp" break; case 196: /* keyword: ICE_CONST */ -#line 2130 "src/Slice/Grammar.y" +#line 2128 "src/Slice/Grammar.y" {} #line 4157 "src/Slice/Grammar.cpp" break; case 197: /* keyword: ICE_FALSE */ -#line 2131 "src/Slice/Grammar.y" +#line 2129 "src/Slice/Grammar.y" {} #line 4163 "src/Slice/Grammar.cpp" break; case 198: /* keyword: ICE_TRUE */ -#line 2132 "src/Slice/Grammar.y" +#line 2130 "src/Slice/Grammar.y" {} #line 4169 "src/Slice/Grammar.cpp" break; case 199: /* keyword: ICE_IDEMPOTENT */ -#line 2133 "src/Slice/Grammar.y" +#line 2131 "src/Slice/Grammar.y" {} #line 4175 "src/Slice/Grammar.cpp" break; case 200: /* keyword: ICE_OPTIONAL */ -#line 2134 "src/Slice/Grammar.y" +#line 2132 "src/Slice/Grammar.y" {} #line 4181 "src/Slice/Grammar.cpp" break; case 201: /* keyword: ICE_VALUE */ -#line 2135 "src/Slice/Grammar.y" +#line 2133 "src/Slice/Grammar.y" {} #line 4187 "src/Slice/Grammar.cpp" break; @@ -4385,5 +4385,7 @@ YYLTYPE yylloc = yyloc_default; return yyresult; } -#line 2138 "src/Slice/Grammar.y" +#line 2136 "src/Slice/Grammar.y" + +// NOLINTEND diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h index 33461400a64..c28168a45e7 100644 --- a/cpp/src/Slice/Grammar.h +++ b/cpp/src/Slice/Grammar.h @@ -48,8 +48,6 @@ extern int slice_debug; #line 9 "src/Slice/Grammar.y" -// NOLINTBEGIN - // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does. #include "GrammarUtil.h" @@ -65,7 +63,7 @@ extern int slice_debug; #define yyoverflow(a, b, c, d, e, f, g, h) yyerror(a) -#line 69 "src/Slice/Grammar.h" +#line 67 "src/Slice/Grammar.h" /* Token kinds. */ #ifndef YYTOKENTYPE diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 16c298e6032..e3371eee3d7 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -8,8 +8,6 @@ %code requires{ -// NOLINTBEGIN - // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does. #include "GrammarUtil.h" @@ -2136,3 +2134,5 @@ keyword ; %% + +// NOLINTEND From a01283cce8f577af41c817e235ba6ba73a2847b9 Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Tue, 17 Dec 2024 15:06:00 -0500 Subject: [PATCH 4/4] I should fix these copyright headers too... --- cpp/src/IceGrid/Scanner.cpp | 38 +++++++++++++++++------------------- cpp/src/IceGrid/Scanner.l | 4 +--- cpp/src/IceStorm/Scanner.cpp | 38 +++++++++++++++++------------------- cpp/src/IceStorm/Scanner.l | 4 +--- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index bf150150c75..250c14597b9 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -1,14 +1,12 @@ #line 2 "src/IceGrid/Scanner.cpp" -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. #include "../Ice/ScannerConfig.h" #include // NOLINTBEGIN -#line 12 "src/IceGrid/Scanner.cpp" +#line 10 "src/IceGrid/Scanner.cpp" #define YY_INT_ALIGNED long int @@ -471,7 +469,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "src/IceGrid/Scanner.l" -#line 14 "src/IceGrid/Scanner.l" +#line 12 "src/IceGrid/Scanner.l" #include "Ice/Ice.h" #include "Parser.h" @@ -499,8 +497,8 @@ namespace IceGrid #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) #define YY_FATAL_ERROR(msg) fatalError(msg); -#line 503 "src/IceGrid/Scanner.cpp" -#line 44 "src/IceGrid/Scanner.l" +#line 501 "src/IceGrid/Scanner.cpp" +#line 42 "src/IceGrid/Scanner.l" /* Instructs flex to not suppress any warnings when generating the scanner. */ /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */ @@ -512,7 +510,7 @@ namespace IceGrid /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */ /* We always want the scanner to run in interactive mode. */ /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */ -#line 516 "src/IceGrid/Scanner.cpp" +#line 514 "src/IceGrid/Scanner.cpp" #define INITIAL 0 @@ -713,10 +711,10 @@ YY_DECL } { -#line 75 "src/IceGrid/Scanner.l" +#line 73 "src/IceGrid/Scanner.l" -#line 720 "src/IceGrid/Scanner.cpp" +#line 718 "src/IceGrid/Scanner.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -775,7 +773,7 @@ YY_DECL case 1: YY_RULE_SETUP -#line 77 "src/IceGrid/Scanner.l" +#line 75 "src/IceGrid/Scanner.l" { // C++-style comment int c; @@ -788,7 +786,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 87 "src/IceGrid/Scanner.l" +#line 85 "src/IceGrid/Scanner.l" { // C-style comment while (true) @@ -817,7 +815,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 112 "src/IceGrid/Scanner.l" +#line 110 "src/IceGrid/Scanner.l" { size_t len = strlen(yytext); for (size_t i = 0; i < len; ++i) @@ -832,14 +830,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 123 "src/IceGrid/Scanner.l" +#line 121 "src/IceGrid/Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 127 "src/IceGrid/Scanner.l" +#line 125 "src/IceGrid/Scanner.l" { // "..."-type strings string s = parseDoubleQuotedString(); @@ -850,7 +848,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 135 "src/IceGrid/Scanner.l" +#line 133 "src/IceGrid/Scanner.l" { // '...'-type strings string s; @@ -878,7 +876,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 160 "src/IceGrid/Scanner.l" +#line 158 "src/IceGrid/Scanner.l" { // Simple strings string s; @@ -917,10 +915,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 196 "src/IceGrid/Scanner.l" +#line 194 "src/IceGrid/Scanner.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 924 "src/IceGrid/Scanner.cpp" +#line 922 "src/IceGrid/Scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1765,7 +1763,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 196 "src/IceGrid/Scanner.l" +#line 194 "src/IceGrid/Scanner.l" // NOLINTEND diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l index b7b109133db..0bed2e24f09 100644 --- a/cpp/src/IceGrid/Scanner.l +++ b/cpp/src/IceGrid/Scanner.l @@ -1,7 +1,5 @@ %top{ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. #include "../Ice/ScannerConfig.h" #include diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp index b8a68e693e6..2746b68a317 100644 --- a/cpp/src/IceStorm/Scanner.cpp +++ b/cpp/src/IceStorm/Scanner.cpp @@ -1,14 +1,12 @@ #line 2 "src/IceStorm/Scanner.cpp" -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. #include "../Ice/ScannerConfig.h" #include // NOLINTBEGIN -#line 12 "src/IceStorm/Scanner.cpp" +#line 10 "src/IceStorm/Scanner.cpp" #define YY_INT_ALIGNED long int @@ -471,7 +469,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "src/IceStorm/Scanner.l" -#line 14 "src/IceStorm/Scanner.l" +#line 12 "src/IceStorm/Scanner.l" #include "Ice/Ice.h" #include "Parser.h" @@ -497,8 +495,8 @@ namespace IceStorm #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) #define YY_FATAL_ERROR(msg) fatalError(msg); -#line 501 "src/IceStorm/Scanner.cpp" -#line 42 "src/IceStorm/Scanner.l" +#line 499 "src/IceStorm/Scanner.cpp" +#line 40 "src/IceStorm/Scanner.l" /* Instructs flex to not suppress any warnings when generating the scanner. */ /* By default flex will 'default match' any text it encounters that doesn't match any specified rules. This * option disables default-matching (it throws 'scanner jammed' instead) to make grammar holes more obvious. */ @@ -510,7 +508,7 @@ namespace IceStorm /* Directs flex to store matched text as 'char *' instead of char arrays, for improved performance. */ /* We always want the scanner to run in interactive mode. */ /* Disables the generation of functions we don't use to reduce clutter, and possibly improve performance. */ -#line 514 "src/IceStorm/Scanner.cpp" +#line 512 "src/IceStorm/Scanner.cpp" #define INITIAL 0 @@ -711,10 +709,10 @@ YY_DECL } { -#line 73 "src/IceStorm/Scanner.l" +#line 71 "src/IceStorm/Scanner.l" -#line 718 "src/IceStorm/Scanner.cpp" +#line 716 "src/IceStorm/Scanner.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -773,7 +771,7 @@ YY_DECL case 1: YY_RULE_SETUP -#line 75 "src/IceStorm/Scanner.l" +#line 73 "src/IceStorm/Scanner.l" { // C++-style comment int c; @@ -786,7 +784,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 85 "src/IceStorm/Scanner.l" +#line 83 "src/IceStorm/Scanner.l" { // C-style comment while (true) @@ -815,7 +813,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 110 "src/IceStorm/Scanner.l" +#line 108 "src/IceStorm/Scanner.l" { size_t len = strlen(yytext); for (size_t i = 0; i < len; ++i) @@ -830,14 +828,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 121 "src/IceStorm/Scanner.l" +#line 119 "src/IceStorm/Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 125 "src/IceStorm/Scanner.l" +#line 123 "src/IceStorm/Scanner.l" { // "..."-type strings string s; @@ -884,7 +882,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 169 "src/IceStorm/Scanner.l" +#line 167 "src/IceStorm/Scanner.l" { // '...'-type strings string s; @@ -912,7 +910,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 194 "src/IceStorm/Scanner.l" +#line 192 "src/IceStorm/Scanner.l" { // Simple strings string s; @@ -942,10 +940,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 221 "src/IceStorm/Scanner.l" +#line 219 "src/IceStorm/Scanner.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 949 "src/IceStorm/Scanner.cpp" +#line 947 "src/IceStorm/Scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1790,7 +1788,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 221 "src/IceStorm/Scanner.l" +#line 219 "src/IceStorm/Scanner.l" // NOLINTEND diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index 344053a063d..237ebee0877 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -1,7 +1,5 @@ %top{ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// +// Copyright (c) ZeroC, Inc. #include "../Ice/ScannerConfig.h" #include