Well, I at least matched the things... Nothing to do about the macros…

… though.
zeroc-ice · Dec 17, 2024 · 7378332 · 7378332
1 parent 6127717
commit 7378332
Show file tree

Hide file tree

Showing 9 changed files with 453 additions and 449 deletions.
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
diff --git 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 <list>
 #include <string>
 
@@ -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
@@ -8,8 +8,6 @@
 
 %code requires{
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -808,3 +806,7 @@ keyword
 {
 }
 ;
+
+%%
+
+// NOLINTEND
diff --git 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,146 +1162,146 @@ 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();
 }
 #line 1198 "src/IceStorm/Grammar.cpp"
     break;
 
   case 7: /* command: ICESTORM_EXIT ';'  */
-#line 126 "src/IceStorm/Grammar.y"
+#line 124 "src/IceStorm/Grammar.y"
 {
     return 0;
 }
 #line 1206 "src/IceStorm/Grammar.cpp"
     break;
 
   case 8: /* command: ICESTORM_CREATE strings ';'  */
-#line 130 "src/IceStorm/Grammar.y"
+#line 128 "src/IceStorm/Grammar.y"
 {
     parser->create(yyvsp[-1]);
 }
 #line 1214 "src/IceStorm/Grammar.cpp"
     break;
 
   case 9: /* command: ICESTORM_CURRENT strings ';'  */
-#line 134 "src/IceStorm/Grammar.y"
+#line 132 "src/IceStorm/Grammar.y"
 {
     parser->current(yyvsp[-1]);
 }
 #line 1222 "src/IceStorm/Grammar.cpp"
     break;
 
   case 10: /* command: ICESTORM_DESTROY strings ';'  */
-#line 138 "src/IceStorm/Grammar.y"
+#line 136 "src/IceStorm/Grammar.y"
 {
     parser->destroy(yyvsp[-1]);
 }
 #line 1230 "src/IceStorm/Grammar.cpp"
     break;
 
   case 11: /* command: ICESTORM_LINK strings ';'  */
-#line 142 "src/IceStorm/Grammar.y"
+#line 140 "src/IceStorm/Grammar.y"
 {
     parser->link(yyvsp[-1]);
 }
 #line 1238 "src/IceStorm/Grammar.cpp"
     break;
 
   case 12: /* command: ICESTORM_UNLINK strings ';'  */
-#line 146 "src/IceStorm/Grammar.y"
+#line 144 "src/IceStorm/Grammar.y"
 {
     parser->unlink(yyvsp[-1]);
 }
 #line 1246 "src/IceStorm/Grammar.cpp"
     break;
 
   case 13: /* command: ICESTORM_LINKS strings ';'  */
-#line 150 "src/IceStorm/Grammar.y"
+#line 148 "src/IceStorm/Grammar.y"
 {
     parser->links(yyvsp[-1]);
 }
 #line 1254 "src/IceStorm/Grammar.cpp"
     break;
 
   case 14: /* command: ICESTORM_TOPICS strings ';'  */
-#line 154 "src/IceStorm/Grammar.y"
+#line 152 "src/IceStorm/Grammar.y"
 {
     parser->topics(yyvsp[-1]);
 }
 #line 1262 "src/IceStorm/Grammar.cpp"
     break;
 
   case 15: /* command: ICESTORM_REPLICA strings ';'  */
-#line 158 "src/IceStorm/Grammar.y"
+#line 156 "src/IceStorm/Grammar.y"
 {
     parser->replica(yyvsp[-1]);
 }
 #line 1270 "src/IceStorm/Grammar.cpp"
     break;
 
   case 16: /* command: ICESTORM_SUBSCRIBERS strings ';'  */
-#line 162 "src/IceStorm/Grammar.y"
+#line 160 "src/IceStorm/Grammar.y"
 {
     parser->subscribers(yyvsp[-1]);
 }
 #line 1278 "src/IceStorm/Grammar.cpp"
     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)");
 }
 #line 1286 "src/IceStorm/Grammar.cpp"
     break;
 
   case 18: /* command: error ';'  */
-#line 170 "src/IceStorm/Grammar.y"
+#line 168 "src/IceStorm/Grammar.y"
 {
     yyerrok;
 }
 #line 1294 "src/IceStorm/Grammar.cpp"
     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,71 +1319,71 @@ 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();
 }
 #line 1327 "src/IceStorm/Grammar.cpp"
     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
@@ -48,8 +48,6 @@ extern int yydebug;
 #line 9 "src/IceStorm/Grammar.y"
 
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -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
@@ -8,8 +8,6 @@
 
 %code requires{
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -226,3 +224,5 @@ keyword
 }
 
 %%
+
+// NOLINTEND