From: Joel E. Denny Date: Sun, 13 Sep 2009 17:45:05 +0000 (-0400) Subject: tests: clean up push.at test group titles. X-Git-Tag: v2.4.1a~21 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/dc25ce6bb15f17a0fd937c9aa4eeb186b4eb881a tests: clean up push.at test group titles. * tests/push.at: Remove "Push Parsing: " from test group titles because these are already under the banner "Push Parsing Tests". (cherry picked from commit 00d80a9cedbffda49212c0cdb90e90c27a561bb2) --- diff --git a/ChangeLog b/ChangeLog index 68252c0c..d92a7159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-13 Joel E. Denny + + tests: clean up push.at test group titles. + * tests/push.at: Remove "Push Parsing: " from test group titles + because these are already under the banner "Push Parsing Tests". + 2009-09-03 Akim Demaille * NEWS (2.4.2): Add "Internationalization" item. diff --git a/src/parse-gram.c b/src/parse-gram.c index 52135be7..be1de32a 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.4-738cd. */ +/* A Bison parser, made by GNU Bison 2.4.1.50-3249. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.4-738cd" +#define YYBISON_VERSION "2.4.1.50-3249" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -75,7 +74,7 @@ /* Copy the first part of user declarations. */ -/* Line 189 of yacc.c */ +/* Line 190 of yacc.c */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- @@ -150,8 +149,8 @@ static int current_prec = 0; #define YYTYPE_UINT8 uint_fast8_t -/* Line 189 of yacc.c */ -#line 155 "parse-gram.c" +/* Line 190 of yacc.c */ +#line 154 "parse-gram.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -299,7 +298,7 @@ static int current_prec = 0; typedef union YYSTYPE { -/* Line 222 of yacc.c */ +/* Line 215 of yacc.c */ #line 92 "parse-gram.y" symbol *symbol; @@ -313,8 +312,8 @@ typedef union YYSTYPE -/* Line 222 of yacc.c */ -#line 318 "parse-gram.c" +/* Line 215 of yacc.c */ +#line 317 "parse-gram.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -338,8 +337,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ -#line 343 "parse-gram.c" +/* Line 265 of yacc.c */ +#line 342 "parse-gram.c" #ifdef short # undef short @@ -1029,147 +1028,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) { case 3: /* "\"string\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 180 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 715 of yacc.c */ -#line 1038 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1037 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 191 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 715 of yacc.c */ -#line 1047 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1046 "parse-gram.c" break; case 43: /* "\"{...}\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 182 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; -/* Line 715 of yacc.c */ -#line 1056 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1055 "parse-gram.c" break; case 44: /* "\"char\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 174 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 715 of yacc.c */ -#line 1065 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1064 "parse-gram.c" break; case 45: /* "\"epilogue\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 182 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 715 of yacc.c */ -#line 1074 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1073 "parse-gram.c" break; case 47: /* "\"identifier\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 187 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 715 of yacc.c */ -#line 1083 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1082 "parse-gram.c" break; case 48: /* "\"identifier:\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 188 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 715 of yacc.c */ -#line 1092 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1091 "parse-gram.c" break; case 51: /* "\"%{...%}\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 182 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 715 of yacc.c */ -#line 1101 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1100 "parse-gram.c" break; case 53: /* "\"type\"" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 186 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 715 of yacc.c */ -#line 1110 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1109 "parse-gram.c" break; case 82: /* "variable" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 187 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 715 of yacc.c */ -#line 1119 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1118 "parse-gram.c" break; case 83: /* "content.opt" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 182 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 715 of yacc.c */ -#line 1128 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1127 "parse-gram.c" break; case 84: /* "braceless" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 182 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 715 of yacc.c */ -#line 1137 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1136 "parse-gram.c" break; case 85: /* "id" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 194 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 715 of yacc.c */ -#line 1146 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1145 "parse-gram.c" break; case 86: /* "id_colon" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 195 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 715 of yacc.c */ -#line 1155 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1154 "parse-gram.c" break; case 87: /* "symbol" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 194 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 715 of yacc.c */ -#line 1164 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1163 "parse-gram.c" break; case 88: /* "string_as_id" */ -/* Line 715 of yacc.c */ +/* Line 716 of yacc.c */ #line 194 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 715 of yacc.c */ -#line 1173 "parse-gram.c" +/* Line 716 of yacc.c */ +#line 1172 "parse-gram.c" break; default: break; @@ -1688,7 +1687,7 @@ YYLTYPE yylloc; /* User initialization code. */ -/* Line 1248 of yacc.c */ +/* Line 1243 of yacc.c */ #line 84 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default @@ -1697,8 +1696,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1248 of yacc.c */ -#line 1702 "parse-gram.c" +/* Line 1243 of yacc.c */ +#line 1701 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1885,7 +1884,7 @@ yyreduce: { case 6: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 218 "parse-gram.y" { code_props plain_code; @@ -1900,14 +1899,14 @@ yyreduce: case 7: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 227 "parse-gram.y" { debug_flag = true; } break; case 8: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 229 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars)); @@ -1916,14 +1915,14 @@ yyreduce: case 9: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 232 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 234 "parse-gram.y" { defines_flag = true; @@ -1933,42 +1932,42 @@ yyreduce: case 11: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 238 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 239 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 240 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 241 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 242 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 244 "parse-gram.y" { nondeterministic_parser = true; @@ -1978,7 +1977,7 @@ yyreduce: case 17: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 249 "parse-gram.y" { code_props action; @@ -1992,77 +1991,77 @@ yyreduce: case 18: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 257 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, &(yylsp[(1) - (2)])); } break; case 19: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 258 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 259 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 260 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 261 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 262 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 263 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 264 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 265 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 266 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 268 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use @@ -2080,14 +2079,14 @@ yyreduce: case 29: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 280 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 282 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); @@ -2116,28 +2115,28 @@ yyreduce: case 31: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 305 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 306 "parse-gram.y" { report_flag |= report_states; } break; case 33: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 307 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 315 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); @@ -2146,7 +2145,7 @@ yyreduce: case 38: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 319 "parse-gram.y" { symbol_list *list; @@ -2158,7 +2157,7 @@ yyreduce: case 39: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 326 "parse-gram.y" { symbol_list *list; @@ -2170,7 +2169,7 @@ yyreduce: case 40: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 333 "parse-gram.y" { default_prec = true; @@ -2179,7 +2178,7 @@ yyreduce: case 41: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 337 "parse-gram.y" { default_prec = false; @@ -2188,7 +2187,7 @@ yyreduce: case 42: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 341 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes @@ -2200,7 +2199,7 @@ yyreduce: case 43: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 348 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2210,21 +2209,21 @@ yyreduce: case 44: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 362 "parse-gram.y" {} break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 363 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 368 "parse-gram.y" { union_seen = true; @@ -2235,14 +2234,14 @@ yyreduce: case 47: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 379 "parse-gram.y" { current_class = nterm_sym; } break; case 48: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 380 "parse-gram.y" { current_class = unknown_sym; @@ -2252,14 +2251,14 @@ yyreduce: case 49: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 384 "parse-gram.y" { current_class = token_sym; } break; case 50: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 385 "parse-gram.y" { current_class = unknown_sym; @@ -2269,7 +2268,7 @@ yyreduce: case 51: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 390 "parse-gram.y" { symbol_list *list; @@ -2282,7 +2281,7 @@ yyreduce: case 52: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 401 "parse-gram.y" { symbol_list *list; @@ -2299,126 +2298,126 @@ yyreduce: case 53: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 415 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 416 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 417 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 421 "parse-gram.y" { current_type = NULL; } break; case 57: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 422 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 428 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 430 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 60: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 434 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 435 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 441 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 443 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; case 64: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 447 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 448 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 452 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 453 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 454 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 455 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 461 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); @@ -2428,7 +2427,7 @@ yyreduce: case 71: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 466 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); @@ -2438,7 +2437,7 @@ yyreduce: case 72: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 471 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); @@ -2449,7 +2448,7 @@ yyreduce: case 73: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 477 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); @@ -2460,7 +2459,7 @@ yyreduce: case 74: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 483 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); @@ -2472,7 +2471,7 @@ yyreduce: case 81: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 513 "parse-gram.y" { yyerrok; @@ -2481,77 +2480,77 @@ yyreduce: case 82: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 519 "parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; case 84: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 523 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 524 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 530 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; case 88: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 532 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; case 89: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 534 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 90: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 536 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 538 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 540 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 94: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 550 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 95: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 556 "parse-gram.y" { (yyval.chars) = ""; @@ -2560,7 +2559,7 @@ yyreduce: case 97: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 569 "parse-gram.y" { code_props plain_code; @@ -2574,14 +2573,14 @@ yyreduce: case 98: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 589 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 99: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 591 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); @@ -2592,14 +2591,14 @@ yyreduce: case 100: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 599 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 103: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 611 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); @@ -2609,7 +2608,7 @@ yyreduce: case 105: -/* Line 1455 of yacc.c */ +/* Line 1456 of yacc.c */ #line 620 "parse-gram.y" { code_props plain_code; @@ -2623,8 +2622,8 @@ yyreduce: -/* Line 1455 of yacc.c */ -#line 2628 "parse-gram.c" +/* Line 1456 of yacc.c */ +#line 2627 "parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2842,7 +2841,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 1676 of yacc.c */ #line 630 "parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index 938b2017..4344dd5b 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.4-738cd. */ +/* A Bison parser, made by GNU Bison 2.4.1.50-3249. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -160,7 +159,7 @@ typedef union YYSTYPE { -/* Line 1740 of yacc.c */ +/* Line 1677 of yacc.c */ #line 92 "parse-gram.y" symbol *symbol; @@ -174,8 +173,8 @@ typedef union YYSTYPE -/* Line 1740 of yacc.c */ -#line 179 "parse-gram.h" +/* Line 1677 of yacc.c */ +#line 178 "parse-gram.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/tests/push.at b/tests/push.at index 8794d3f1..f93af3b6 100644 --- a/tests/push.at +++ b/tests/push.at @@ -16,11 +16,11 @@ AT_BANNER([[Push Parsing Tests]]) -## ---------------------------------------------- ## -## Push Parsing: Memory Leak for Early Deletion. ## -## ---------------------------------------------- ## +## -------------------------------- ## +## Memory Leak for Early Deletion. ## +## -------------------------------- ## -AT_SETUP([[Push Parsing: Memory Leak for Early Deletion]]) +AT_SETUP([[Memory Leak for Early Deletion]]) # Requires Valgrind. @@ -77,11 +77,11 @@ AT_PARSER_CHECK([[./input]]) AT_CLEANUP -## ----------------------------------------- ## -## Push Parsing: Multiple impure instances. ## -## ----------------------------------------- ## +## --------------------------- ## +## Multiple impure instances. ## +## --------------------------- ## -AT_SETUP([[Push Parsing: Multiple impure instances]]) +AT_SETUP([[Multiple impure instances]]) m4_pushdef([AT_MULTIPLE_IMPURE_INSTANCES_CHECK], [ AT_DATA_GRAMMAR([[input.y]], @@ -148,11 +148,11 @@ m4_popdef([AT_MULTIPLE_IMPURE_INSTANCES_CHECK]) AT_CLEANUP -## ------------------------------------- ## -## Push Parsing: Unsupported Skeletons. ## -## ------------------------------------- ## +## ----------------------- ## +## Unsupported Skeletons. ## +## ----------------------- ## -AT_SETUP([[Push Parsing: Unsupported Skeletons]]) +AT_SETUP([[Unsupported Skeletons]]) AT_DATA([[input.y]], [[%glr-parser