X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b3d9b5ba1828b78a8a1e6ee3b04030247a892cb4..06e8700a000fb661a3d15db8e1dfeb6bfcccf86d:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 7cac0db3..758c0634 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -69,7 +69,7 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 164 of yacc.c. */ +/* Line 173 of yacc.c. */ #line 1 "parse-gram.y" /* Bison Grammar Parser -*- C -*- @@ -127,10 +127,17 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -static void add_param (char const *, char *, location); +/** Add a lex-param or a parse-param. + * + * \param type \a lex_param or \a parse_param + * \param decl the formal argument + * \param loc the location in the source. + */ +static void add_param (char const *type, char *decl, location loc); + static symbol_class current_class = unknown_sym; -static uniqstr current_type = 0; +static uniqstr current_type = NULL; static symbol *current_lhs; static location current_lhs_location; static int current_prec = 0; @@ -285,9 +292,9 @@ static int current_prec = 0; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -/* Line 195 of yacc.c. */ -#line 90 "parse-gram.y" -{ +{/* Line 207 of yacc.c. */ +#line 97 "parse-gram.y" + symbol *symbol; symbol_list *list; int integer; @@ -296,12 +303,12 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; } -/* Line 195 of yacc.c. */ -#line 301 "parse-gram.c" +/* Line 207 of yacc.c. */ +#line 308 "parse-gram.c" YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED @@ -320,8 +327,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 219 of yacc.c. */ -#line 325 "parse-gram.c" +/* Line 230 of yacc.c. */ +#line 332 "parse-gram.c" #ifdef short # undef short @@ -396,14 +403,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -538,16 +545,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 192 +#define YYLAST 168 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 57 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 27 +#define YYNNTS 29 /* YYNRULES -- Number of rules. */ -#define YYNRULES 89 +#define YYNRULES 94 /* YYNRULES -- Number of states. */ -#define YYNSTATES 128 +#define YYNSTATES 131 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -599,57 +606,60 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint8 yyprhs[] = { 0, 0, 3, 8, 9, 12, 14, 16, 19, 22, - 24, 27, 31, 33, 36, 38, 41, 44, 48, 50, - 53, 56, 58, 62, 64, 66, 70, 73, 75, 78, - 81, 84, 86, 88, 90, 92, 94, 96, 99, 103, - 107, 109, 111, 112, 114, 118, 119, 123, 124, 128, - 132, 136, 138, 140, 142, 143, 145, 147, 150, 152, - 154, 157, 160, 164, 166, 169, 171, 174, 176, 179, - 182, 183, 187, 189, 193, 196, 197, 200, 203, 207, - 211, 215, 217, 219, 221, 223, 225, 227, 229, 230 + 24, 28, 30, 33, 35, 38, 41, 45, 47, 50, + 53, 55, 59, 61, 63, 67, 70, 72, 75, 78, + 81, 83, 85, 87, 89, 91, 93, 96, 99, 103, + 107, 110, 112, 114, 115, 117, 121, 122, 126, 127, + 131, 135, 139, 141, 143, 145, 146, 148, 150, 153, + 155, 157, 160, 163, 167, 169, 172, 174, 177, 179, + 182, 185, 186, 190, 192, 196, 199, 200, 203, 206, + 210, 214, 218, 220, 222, 223, 225, 227, 229, 231, + 233, 235, 237, 239, 240 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 58, 0, -1, 59, 51, 72, 83, -1, -1, 59, - 60, -1, 61, -1, 53, -1, 16, 45, -1, 17, - 45, -1, 18, -1, 20, 82, -1, 20, 82, 82, - -1, 21, -1, 22, 45, -1, 23, -1, 24, 4, - -1, 25, 4, -1, 26, 48, 82, -1, 27, -1, - 28, 45, -1, 29, 45, -1, 30, -1, 31, 48, - 82, -1, 33, -1, 34, -1, 35, 48, 82, -1, - 36, 45, -1, 37, -1, 38, 82, -1, 39, 82, - -1, 41, 45, -1, 42, -1, 43, -1, 44, -1, - 54, -1, 66, -1, 63, -1, 40, 80, -1, 8, - 45, 69, -1, 9, 45, 69, -1, 19, -1, 32, - -1, -1, 49, -1, 56, 62, 45, -1, -1, 6, - 64, 71, -1, -1, 5, 65, 71, -1, 7, 55, - 69, -1, 67, 68, 69, -1, 10, -1, 11, -1, - 12, -1, -1, 55, -1, 80, -1, 69, 80, -1, - 55, -1, 78, -1, 78, 4, -1, 78, 81, -1, - 78, 4, 81, -1, 70, -1, 71, 70, -1, 73, - -1, 72, 73, -1, 74, -1, 61, 54, -1, 1, - 54, -1, -1, 79, 75, 76, -1, 77, -1, 76, - 52, 77, -1, 76, 54, -1, -1, 77, 80, -1, - 77, 45, -1, 77, 13, 80, -1, 77, 14, 4, - -1, 77, 15, 55, -1, 49, -1, 46, -1, 50, - -1, 78, -1, 81, -1, 3, -1, 3, -1, -1, + 58, 0, -1, 59, 51, 72, 85, -1, -1, 59, + 60, -1, 61, -1, 53, -1, 16, 80, -1, 17, + 80, -1, 18, -1, 20, 3, 79, -1, 21, -1, + 22, 80, -1, 23, -1, 24, 4, -1, 25, 4, + -1, 26, 48, 3, -1, 27, -1, 28, 45, -1, + 29, 45, -1, 30, -1, 31, 48, 3, -1, 33, + -1, 34, -1, 35, 48, 3, -1, 36, 45, -1, + 37, -1, 38, 3, -1, 39, 3, -1, 41, 80, + -1, 42, -1, 43, -1, 44, -1, 54, -1, 66, + -1, 63, -1, 40, 83, -1, 8, 45, -1, 8, + 45, 69, -1, 9, 45, 69, -1, 9, 45, -1, + 19, -1, 32, -1, -1, 49, -1, 56, 62, 45, + -1, -1, 6, 64, 71, -1, -1, 5, 65, 71, + -1, 7, 55, 69, -1, 67, 68, 69, -1, 10, + -1, 11, -1, 12, -1, -1, 55, -1, 83, -1, + 69, 83, -1, 55, -1, 81, -1, 81, 4, -1, + 81, 84, -1, 81, 4, 84, -1, 70, -1, 71, + 70, -1, 73, -1, 72, 73, -1, 74, -1, 61, + 54, -1, 1, 54, -1, -1, 82, 75, 76, -1, + 77, -1, 76, 52, 77, -1, 76, 54, -1, -1, + 77, 83, -1, 77, 45, -1, 77, 13, 83, -1, + 77, 14, 4, -1, 77, 15, 55, -1, 3, -1, + 80, -1, -1, 78, -1, 45, -1, 49, -1, 46, + -1, 50, -1, 81, -1, 84, -1, 3, -1, -1, 51, 47, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 195, 195, 203, 205, 209, 210, 214, 220, 226, - 227, 232, 233, 234, 240, 241, 242, 243, 244, 249, - 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 269, 270, 271, 272, 276, 277, 278, 282, 290, - 298, 302, 316, 317, 321, 343, 343, 348, 348, 353, - 363, 378, 379, 380, 384, 385, 390, 391, 396, 400, - 405, 411, 417, 428, 429, 438, 439, 445, 446, 447, - 454, 454, 458, 459, 460, 465, 466, 468, 470, 472, - 474, 487, 489, 498, 503, 504, 509, 518, 523, 525 + 0, 205, 205, 213, 215, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 236, 240, + 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 258, 259, 260, 264, 268, 276, + 284, 288, 292, 306, 307, 311, 339, 339, 344, 344, + 349, 360, 375, 376, 377, 381, 382, 387, 388, 393, + 398, 403, 409, 415, 426, 427, 436, 437, 443, 444, + 445, 452, 452, 456, 457, 458, 463, 464, 466, 468, + 470, 472, 482, 483, 489, 493, 498, 514, 516, 525, + 530, 531, 536, 543, 545 }; #endif @@ -672,12 +682,12 @@ static const char *const yytname[] = "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input", - "declarations", "declaration", "grammar_declaration", "union_name", - "symbol_declaration", "@1", "@2", "precedence_declaration", + "prologue_declarations", "prologue_declaration", "grammar_declaration", + "union_name", "symbol_declaration", "@1", "@2", "precedence_declaration", "precedence_declarator", "type.opt", "symbols.1", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", - "@3", "rhses.1", "rhs", "id", "id_colon", "symbol", "string_as_id", - "string_content", "epilogue.opt", 0 + "@3", "rhses.1", "rhs", "content", "content.opt", "braceless", "id", + "id_colon", "symbol", "string_as_id", "epilogue.opt", 0 }; #endif @@ -701,26 +711,28 @@ static const yytype_uint8 yyr1[] = 0, 57, 58, 59, 59, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 61, 61, 61, 61, 61, - 61, 61, 62, 62, 61, 64, 63, 65, 63, 63, - 66, 67, 67, 67, 68, 68, 69, 69, 70, 70, - 70, 70, 70, 71, 71, 72, 72, 73, 73, 73, - 75, 74, 76, 76, 76, 77, 77, 77, 77, 77, - 77, 78, 78, 79, 80, 80, 81, 82, 83, 83 + 60, 60, 60, 60, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 62, 62, 61, 64, 63, 65, 63, + 63, 66, 67, 67, 67, 68, 68, 69, 69, 70, + 70, 70, 70, 70, 71, 71, 72, 72, 73, 73, + 73, 75, 74, 76, 76, 76, 77, 77, 77, 77, + 77, 77, 78, 78, 79, 79, 80, 81, 81, 82, + 83, 83, 84, 85, 85 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 4, 0, 2, 1, 1, 2, 2, 1, - 2, 3, 1, 2, 1, 2, 2, 3, 1, 2, - 2, 1, 3, 1, 1, 3, 2, 1, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, - 1, 1, 0, 1, 3, 0, 3, 0, 3, 3, - 3, 1, 1, 1, 0, 1, 1, 2, 1, 1, - 2, 2, 3, 1, 2, 1, 2, 1, 2, 2, - 0, 3, 1, 3, 2, 0, 2, 2, 3, 3, - 3, 1, 1, 1, 1, 1, 1, 1, 0, 2 + 3, 1, 2, 1, 2, 2, 3, 1, 2, 2, + 1, 3, 1, 1, 3, 2, 1, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, + 2, 1, 1, 0, 1, 3, 0, 3, 0, 3, + 3, 3, 1, 1, 1, 0, 1, 1, 2, 1, + 1, 2, 2, 3, 1, 2, 1, 2, 1, 2, + 2, 0, 3, 1, 3, 2, 0, 2, 2, 3, + 3, 3, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -728,108 +740,104 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 47, 45, 0, 0, 0, 51, - 52, 53, 0, 0, 9, 40, 0, 12, 0, 14, - 0, 0, 0, 18, 0, 0, 21, 0, 41, 23, - 24, 0, 0, 27, 0, 0, 0, 0, 31, 32, - 33, 0, 6, 34, 42, 4, 5, 36, 35, 54, - 0, 0, 0, 0, 0, 7, 8, 87, 10, 13, - 15, 16, 0, 19, 20, 0, 0, 26, 28, 29, - 86, 82, 81, 84, 37, 85, 30, 0, 83, 0, - 0, 65, 67, 70, 43, 0, 55, 0, 58, 63, - 48, 59, 46, 49, 56, 38, 39, 11, 17, 22, - 25, 69, 68, 0, 66, 2, 75, 44, 50, 64, - 60, 61, 57, 89, 71, 72, 62, 75, 74, 0, - 0, 0, 77, 76, 73, 78, 79, 80 + 3, 0, 0, 1, 48, 46, 0, 0, 0, 52, + 53, 54, 0, 0, 9, 41, 0, 11, 0, 13, + 0, 0, 0, 17, 0, 0, 20, 0, 42, 22, + 23, 0, 0, 26, 0, 0, 0, 0, 30, 31, + 32, 0, 6, 33, 43, 4, 5, 35, 34, 55, + 0, 0, 0, 37, 40, 86, 7, 8, 84, 12, + 14, 15, 0, 18, 19, 0, 0, 25, 27, 28, + 92, 88, 87, 90, 36, 91, 29, 0, 89, 0, + 0, 66, 68, 71, 44, 0, 56, 0, 59, 64, + 49, 60, 47, 50, 57, 38, 39, 82, 85, 10, + 83, 16, 21, 24, 70, 69, 0, 67, 2, 76, + 45, 51, 65, 61, 62, 58, 94, 72, 73, 63, + 76, 75, 0, 0, 0, 78, 77, 74, 79, 80, + 81 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { -1, 1, 2, 45, 79, 85, 47, 51, 50, 48, - 49, 87, 93, 89, 90, 80, 81, 82, 106, 114, - 115, 73, 83, 94, 75, 58, 105 + 49, 87, 93, 89, 90, 80, 81, 82, 109, 117, + 118, 98, 99, 56, 73, 83, 94, 75, 108 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -76 -static const yytype_int16 yypact[] = +#define YYPACT_NINF -91 +static const yytype_int8 yypact[] = { - -76, 6, 136, -76, -76, -76, -40, -12, -9, -76, - -76, -76, -5, 1, -76, -76, 40, -76, 5, -76, - 47, 50, 7, -76, 11, 18, -76, 19, -76, -76, - -76, 20, 25, -76, 40, 40, -2, 26, -76, -76, - -76, 84, -76, -76, 27, -76, -76, -76, -76, 14, - -23, -23, -2, -2, -2, -76, -76, -76, 40, -76, - -76, -76, 40, -76, -76, 40, 40, -76, -76, -76, - -76, -76, -76, -76, -76, -76, -76, 21, -76, 23, - 2, -76, -76, -76, -76, 28, -76, -2, -76, -76, - -23, 24, -23, -2, -76, -2, -2, -76, -76, -76, - -76, -76, -76, 31, -76, -76, -76, -76, -2, -76, - 71, -76, -76, -76, -32, 16, -76, -76, -76, -2, - 76, 29, -76, -76, 16, -76, -76, -76 + -91, 29, 112, -91, -91, -91, -39, -14, -13, -91, + -91, -91, -12, -12, -91, -91, 33, -91, -12, -91, + 35, 36, -11, -91, 5, 6, -91, 1, -91, -91, + -91, 7, 9, -91, 53, 61, 27, -12, -91, -91, + -91, 60, -91, -91, 14, -91, -91, -91, -91, 19, + -31, -31, 27, 27, 27, -91, -91, -91, 3, -91, + -91, -91, 77, -91, -91, 81, 84, -91, -91, -91, + -91, -91, -91, -91, -91, -91, -91, 34, -91, 39, + 2, -91, -91, -91, -91, 44, -91, 27, -91, -91, + -31, 16, -31, 27, -91, 27, 27, -91, -91, -91, + -91, -91, -91, -91, -91, -91, 43, -91, -91, -91, + -91, 27, -91, 91, -91, -91, -91, -27, 32, -91, + -91, -91, 27, 92, 40, -91, -91, 32, -91, -91, + -91 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -76, -76, -76, -76, 79, -76, -76, -76, -76, -76, - -76, -76, -49, -53, 35, -76, 17, -76, -76, -76, - -35, -26, -76, -36, -75, -17, -76 + -91, -91, -91, -91, 95, -91, -91, -91, -91, -91, + -91, -91, -49, -64, 47, -91, 21, -91, -91, -91, + -21, -91, -91, 4, -7, -91, -36, -90, -91 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -89 -static const yytype_int8 yytable[] = +#define YYTABLE_NINF -94 +static const yytype_int16 yytable[] = { - 74, 70, -88, 77, 95, 96, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 52, 111, 68, 69, 70, - 117, 15, 118, 71, 91, 91, 72, 70, 110, 119, - 120, 121, 88, 53, 28, 116, 54, 109, 108, 109, - 55, 97, 36, 57, 71, 98, 56, 72, 99, 100, - 59, 60, 78, 103, 61, 62, 63, 112, 44, 112, - 112, 122, 71, 64, 91, 72, 91, 65, 66, 86, - 67, 76, 112, 107, 70, 101, 84, 102, 113, 123, - 126, 46, 124, 125, 127, 77, 92, 0, 123, 4, - 5, 6, 7, 8, 9, 10, 11, 104, 0, 0, - 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, - 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, - 44, 4, 5, 6, 7, 8, 9, 10, 11, 0, - 0, 0, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 0, 0, 0, 0, 0, 0, 41, 0, 42, - 43, 0, 44 + 74, 114, -93, 77, 95, 96, 97, 4, 5, 6, + 7, 8, 9, 10, 11, 71, 52, 57, 72, 70, + 113, 15, 59, 119, 88, 120, 112, 121, 112, 3, + 70, 53, 54, 55, 28, 70, 58, 62, 111, 60, + 61, 76, 36, 91, 91, 122, 123, 124, 55, 65, + 63, 64, 78, 106, 67, 66, 68, 115, 44, 115, + 115, 77, 100, 84, 69, 4, 5, 6, 7, 8, + 9, 10, 11, 71, 86, 115, 72, 125, 71, 15, + 101, 72, 126, 91, 102, 91, 128, 103, 104, 110, + 116, 126, 28, 105, 70, 130, 129, 46, 92, 127, + 36, 107, 0, 0, 0, 0, 0, 0, 0, 0, + 78, 0, 0, 0, 0, 0, 44, 4, 5, 6, + 7, 8, 9, 10, 11, 0, 0, 0, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 0, 0, 0, + 0, 0, 0, 41, 0, 42, 43, 0, 44 }; static const yytype_int8 yycheck[] = { - 36, 3, 0, 1, 53, 54, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 55, 91, 34, 35, 3, - 52, 19, 54, 46, 50, 51, 49, 3, 4, 13, - 14, 15, 55, 45, 32, 110, 45, 90, 87, 92, - 45, 58, 40, 3, 46, 62, 45, 49, 65, 66, - 45, 4, 50, 51, 4, 48, 45, 93, 56, 95, - 96, 45, 46, 45, 90, 49, 92, 48, 48, 55, - 45, 45, 108, 45, 3, 54, 49, 54, 47, 115, - 4, 2, 117, 119, 55, 1, 51, -1, 124, 5, - 6, 7, 8, 9, 10, 11, 12, 80, -1, -1, - -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 32, -1, -1, -1, - -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, - 56, 5, 6, 7, 8, 9, 10, 11, 12, -1, - -1, -1, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, -1, -1, -1, -1, -1, -1, 51, -1, 53, - 54, -1, 56 + 36, 91, 0, 1, 53, 54, 3, 5, 6, 7, + 8, 9, 10, 11, 12, 46, 55, 13, 49, 3, + 4, 19, 18, 113, 55, 52, 90, 54, 92, 0, + 3, 45, 45, 45, 32, 3, 3, 48, 87, 4, + 4, 37, 40, 50, 51, 13, 14, 15, 45, 48, + 45, 45, 50, 51, 45, 48, 3, 93, 56, 95, + 96, 1, 58, 49, 3, 5, 6, 7, 8, 9, + 10, 11, 12, 46, 55, 111, 49, 45, 46, 19, + 3, 49, 118, 90, 3, 92, 122, 3, 54, 45, + 47, 127, 32, 54, 3, 55, 4, 2, 51, 120, + 40, 80, -1, -1, -1, -1, -1, -1, -1, -1, + 50, -1, -1, -1, -1, -1, 56, 5, 6, 7, + 8, 9, 10, 11, 12, -1, -1, -1, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, -1, -1, -1, + -1, -1, -1, 51, -1, 53, 54, -1, 56 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -841,14 +849,15 @@ static const yytype_uint8 yystos[] = 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 51, 53, 54, 56, 60, 61, 63, 66, 67, - 65, 64, 55, 45, 45, 45, 45, 3, 82, 45, - 4, 4, 48, 45, 45, 48, 48, 45, 82, 82, - 3, 46, 49, 78, 80, 81, 45, 1, 50, 61, - 72, 73, 74, 79, 49, 62, 55, 68, 55, 70, - 71, 78, 71, 69, 80, 69, 69, 82, 82, 82, - 82, 54, 54, 51, 73, 83, 75, 45, 69, 70, - 4, 81, 80, 47, 76, 77, 81, 52, 54, 13, - 14, 15, 45, 80, 77, 80, 4, 55 + 65, 64, 55, 45, 45, 45, 80, 80, 3, 80, + 4, 4, 48, 45, 45, 48, 48, 45, 3, 3, + 3, 46, 49, 81, 83, 84, 80, 1, 50, 61, + 72, 73, 74, 82, 49, 62, 55, 68, 55, 70, + 71, 81, 71, 69, 83, 69, 69, 3, 78, 79, + 80, 3, 3, 3, 54, 54, 51, 73, 85, 75, + 45, 69, 70, 4, 84, 83, 47, 76, 77, 84, + 52, 54, 13, 14, 15, 45, 83, 77, 83, 4, + 55 }; #define yyerrok (yyerrstatus = 0) @@ -997,102 +1006,116 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "\"string\"" */ -/* Line 668 of yacc.c. */ -#line 174 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 183 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 668 of yacc.c. */ -#line 1005 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1014 "parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 668 of yacc.c. */ -#line 184 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 194 "parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 668 of yacc.c. */ -#line 1012 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1021 "parse-gram.c" break; case 45: /* "\"{...}\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 1019 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1028 "parse-gram.c" break; case 46: /* "\"char\"" */ -/* Line 668 of yacc.c. */ -#line 171 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 178 "parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 668 of yacc.c. */ -#line 1026 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1035 "parse-gram.c" break; case 47: /* "\"epilogue\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 1033 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1042 "parse-gram.c" break; case 49: /* "\"identifier\"" */ -/* Line 668 of yacc.c. */ -#line 180 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 190 "parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 668 of yacc.c. */ -#line 1040 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1049 "parse-gram.c" break; case 50: /* "\"identifier:\"" */ -/* Line 668 of yacc.c. */ -#line 181 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 191 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 668 of yacc.c. */ -#line 1047 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1056 "parse-gram.c" break; case 53: /* "\"%{...%}\"" */ -/* Line 668 of yacc.c. */ -#line 176 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 668 of yacc.c. */ -#line 1054 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1063 "parse-gram.c" break; case 55: /* "\"type\"" */ -/* Line 668 of yacc.c. */ -#line 179 "parse-gram.y" +/* Line 679 of yacc.c. */ +#line 189 "parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 668 of yacc.c. */ -#line 1061 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1070 "parse-gram.c" + break; + case 78: /* "content" */ +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 679 of yacc.c. */ +#line 1077 "parse-gram.c" + break; + case 79: /* "content.opt" */ +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 679 of yacc.c. */ +#line 1084 "parse-gram.c" + break; + case 80: /* "braceless" */ +/* Line 679 of yacc.c. */ +#line 185 "parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +/* Line 679 of yacc.c. */ +#line 1091 "parse-gram.c" break; - case 78: /* "id" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 81: /* "id" */ +/* Line 679 of yacc.c. */ +#line 197 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1068 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1098 "parse-gram.c" break; - case 79: /* "id_colon" */ -/* Line 668 of yacc.c. */ -#line 188 "parse-gram.y" + case 82: /* "id_colon" */ +/* Line 679 of yacc.c. */ +#line 198 "parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1075 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1105 "parse-gram.c" break; - case 80: /* "symbol" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 83: /* "symbol" */ +/* Line 679 of yacc.c. */ +#line 197 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1082 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1112 "parse-gram.c" break; - case 81: /* "string_as_id" */ -/* Line 668 of yacc.c. */ -#line 187 "parse-gram.y" + case 84: /* "string_as_id" */ +/* Line 679 of yacc.c. */ +#line 197 "parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 668 of yacc.c. */ -#line 1089 "parse-gram.c" - break; - case 82: /* "string_content" */ -/* Line 668 of yacc.c. */ -#line 174 "parse-gram.y" - { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 668 of yacc.c. */ -#line 1096 "parse-gram.c" +/* Line 679 of yacc.c. */ +#line 1119 "parse-gram.c" break; default: break; @@ -1136,17 +1159,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -1383,7 +1409,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar) yyfmt = yystpcpy (yyformat, yyunexpected); for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + if ((int)yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { @@ -1602,16 +1628,16 @@ YYLTYPE yylloc; /* User initialization code. */ - /* Line 1077 of yacc.c. */ -#line 81 "parse-gram.y" + /* Line 1091 of yacc.c. */ +#line 88 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1077 of yacc.c. */ -#line 1615 "parse-gram.c" +/* Line 1091 of yacc.c. */ +#line 1641 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1693,6 +1719,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1731,7 +1760,7 @@ yybackup: /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + if (yyn < 0 || YYLAST < yyn || (int)yycheck[yyn] != yytoken) goto yydefault; yyn = yytable[yyn]; if (yyn <= 0) @@ -1742,9 +1771,6 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) @@ -1753,9 +1779,8 @@ yybackup: /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -1796,210 +1821,191 @@ yyreduce: switch (yyn) { case 6: -/* Line 1265 of yacc.c. */ -#line 211 "parse-gram.y" - { - prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), typed); - } +/* Line 1278 of yacc.c. */ +#line 220 "parse-gram.y" + { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); } break; case 7: -/* Line 1265 of yacc.c. */ -#line 215 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), true); - } +/* Line 1278 of yacc.c. */ +#line 221 "parse-gram.y" + { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); } break; case 8: -/* Line 1265 of yacc.c. */ -#line 221 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - prologue_augment (translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)]), false); - } +/* Line 1278 of yacc.c. */ +#line 222 "parse-gram.y" + { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); } break; case 9: -/* Line 1265 of yacc.c. */ -#line 226 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 223 "parse-gram.y" { debug_flag = true; } break; case 10: -/* Line 1265 of yacc.c. */ -#line 228 "parse-gram.y" - { - static char one[] = "1"; - muscle_insert ((yyvsp[(2) - (2)].chars), one); - } +/* Line 1278 of yacc.c. */ +#line 224 "parse-gram.y" + { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } break; case 11: -/* Line 1265 of yacc.c. */ -#line 232 "parse-gram.y" - { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } +/* Line 1278 of yacc.c. */ +#line 225 "parse-gram.y" + { defines_flag = true; } break; case 12: -/* Line 1265 of yacc.c. */ -#line 233 "parse-gram.y" - { defines_flag = true; } +/* Line 1278 of yacc.c. */ +#line 226 "parse-gram.y" + { muscle_code_grow ("end_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; case 13: -/* Line 1265 of yacc.c. */ -#line 235 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - muscle_code_grow ("end_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); - } - break; - - case 14: -/* Line 1265 of yacc.c. */ -#line 240 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 227 "parse-gram.y" { error_verbose = true; } break; - case 15: -/* Line 1265 of yacc.c. */ -#line 241 "parse-gram.y" + case 14: +/* Line 1278 of yacc.c. */ +#line 228 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 16: -/* Line 1265 of yacc.c. */ -#line 242 "parse-gram.y" + case 15: +/* Line 1278 of yacc.c. */ +#line 229 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 17: -/* Line 1265 of yacc.c. */ -#line 243 "parse-gram.y" + case 16: +/* Line 1278 of yacc.c. */ +#line 230 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; - case 18: -/* Line 1265 of yacc.c. */ -#line 245 "parse-gram.y" + case 17: +/* Line 1278 of yacc.c. */ +#line 232 "parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 19: -/* Line 1265 of yacc.c. */ -#line 250 "parse-gram.y" + case 18: +/* Line 1278 of yacc.c. */ +#line 237 "parse-gram.y" { muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); } break; - case 20: -/* Line 1265 of yacc.c. */ -#line 253 "parse-gram.y" + case 19: +/* Line 1278 of yacc.c. */ +#line 240 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 21: -/* Line 1265 of yacc.c. */ -#line 254 "parse-gram.y" + case 20: +/* Line 1278 of yacc.c. */ +#line 241 "parse-gram.y" { locations_flag = true; } break; - case 22: -/* Line 1265 of yacc.c. */ -#line 255 "parse-gram.y" + case 21: +/* Line 1278 of yacc.c. */ +#line 242 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; - case 23: -/* Line 1265 of yacc.c. */ -#line 256 "parse-gram.y" + case 22: +/* Line 1278 of yacc.c. */ +#line 243 "parse-gram.y" { no_lines_flag = true; } break; - case 24: -/* Line 1265 of yacc.c. */ -#line 257 "parse-gram.y" + case 23: +/* Line 1278 of yacc.c. */ +#line 244 "parse-gram.y" { nondeterministic_parser = true; } break; - case 25: -/* Line 1265 of yacc.c. */ -#line 258 "parse-gram.y" + case 24: +/* Line 1278 of yacc.c. */ +#line 245 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; - case 26: -/* Line 1265 of yacc.c. */ -#line 259 "parse-gram.y" + case 25: +/* Line 1278 of yacc.c. */ +#line 246 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 27: -/* Line 1265 of yacc.c. */ -#line 260 "parse-gram.y" + case 26: +/* Line 1278 of yacc.c. */ +#line 247 "parse-gram.y" { pure_parser = true; } break; - case 28: -/* Line 1265 of yacc.c. */ -#line 261 "parse-gram.y" + case 27: +/* Line 1278 of yacc.c. */ +#line 248 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; - case 29: -/* Line 1265 of yacc.c. */ -#line 262 "parse-gram.y" + case 28: +/* Line 1278 of yacc.c. */ +#line 249 "parse-gram.y" { skeleton = (yyvsp[(2) - (2)].chars); } break; - case 30: -/* Line 1265 of yacc.c. */ -#line 264 "parse-gram.y" - { - /* Remove the '{', and replace the '}' with '\n'. */ - (yyvsp[(2) - (2)].chars)[strlen ((yyvsp[(2) - (2)].chars)) - 1] = '\n'; - muscle_code_grow ("start_header", translate_code ((yyvsp[(2) - (2)].chars)+1, (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); - } + case 29: +/* Line 1278 of yacc.c. */ +#line 250 "parse-gram.y" + { muscle_code_grow ("start_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 31: -/* Line 1265 of yacc.c. */ -#line 269 "parse-gram.y" + case 30: +/* Line 1278 of yacc.c. */ +#line 251 "parse-gram.y" { token_table_flag = true; } break; - case 32: -/* Line 1265 of yacc.c. */ -#line 270 "parse-gram.y" + case 31: +/* Line 1278 of yacc.c. */ +#line 252 "parse-gram.y" { report_flag = report_states; } break; - case 33: -/* Line 1265 of yacc.c. */ -#line 271 "parse-gram.y" + case 32: +/* Line 1278 of yacc.c. */ +#line 253 "parse-gram.y" { yacc_flag = true; } break; - case 37: -/* Line 1265 of yacc.c. */ -#line 279 "parse-gram.y" + case 36: +/* Line 1278 of yacc.c. */ +#line 261 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; + case 37: +/* Line 1278 of yacc.c. */ +#line 265 "parse-gram.y" + { + default_destructor_set (translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); + } + break; + case 38: -/* Line 1265 of yacc.c. */ -#line 283 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 269 "parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); @@ -2010,8 +2016,8 @@ yyreduce: break; case 39: -/* Line 1265 of yacc.c. */ -#line 291 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 277 "parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); @@ -2022,87 +2028,102 @@ yyreduce: break; case 40: -/* Line 1265 of yacc.c. */ -#line 299 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 285 "parse-gram.y" { - default_prec = true; + default_printer_set (translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); } break; case 41: -/* Line 1265 of yacc.c. */ -#line 303 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 289 "parse-gram.y" { - default_prec = false; + default_prec = true; } break; case 42: -/* Line 1265 of yacc.c. */ -#line 316 "parse-gram.y" - {} +/* Line 1278 of yacc.c. */ +#line 293 "parse-gram.y" + { + default_prec = false; + } break; case 43: -/* Line 1265 of yacc.c. */ -#line 317 "parse-gram.y" - { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } +/* Line 1278 of yacc.c. */ +#line 306 "parse-gram.y" + {} break; case 44: -/* Line 1265 of yacc.c. */ -#line 322 "parse-gram.y" +/* Line 1278 of yacc.c. */ +#line 307 "parse-gram.y" + { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } + break; + + case 45: +/* Line 1278 of yacc.c. */ +#line 312 "parse-gram.y" { char const *body = (yyvsp[(3) - (3)].chars); - if (typed) + /* Concatenate the %union bodies. If this is the first %union, make sure + the synchronization line appears after the opening '{' so as not to + confuse Doxygen. Otherwise, turn the previous %union's trailing '}' + into '\n', and omit the new %union's leading '{'. */ + if (!union_seen) + { + muscle_grow ("stype", "{", ""); + } + else { - /* Concatenate the union bodies, turning the first one's - trailing '}' into '\n', and omitting the second one's '{'. */ char *code = muscle_find ("stype"); code[strlen (code) - 1] = '\n'; - body++; } + body++; - typed = true; + union_seen = true; muscle_code_grow ("stype", body, (yylsp[(3) - (3)])); } break; - case 45: -/* Line 1265 of yacc.c. */ -#line 343 "parse-gram.y" + case 46: +/* Line 1278 of yacc.c. */ +#line 339 "parse-gram.y" { current_class = nterm_sym; } break; - case 46: -/* Line 1265 of yacc.c. */ -#line 344 "parse-gram.y" + case 47: +/* Line 1278 of yacc.c. */ +#line 340 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 47: -/* Line 1265 of yacc.c. */ -#line 348 "parse-gram.y" + case 48: +/* Line 1278 of yacc.c. */ +#line 344 "parse-gram.y" { current_class = token_sym; } break; - case 48: -/* Line 1265 of yacc.c. */ -#line 349 "parse-gram.y" + case 49: +/* Line 1278 of yacc.c. */ +#line 345 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 49: -/* Line 1265 of yacc.c. */ -#line 354 "parse-gram.y" + case 50: +/* Line 1278 of yacc.c. */ +#line 350 "parse-gram.y" { + tag_seen = true; symbol_list *list; for (list = (yyvsp[(3) - (3)].list); list; list = list->next) symbol_type_set (list->sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)])); @@ -2110,9 +2131,9 @@ yyreduce: } break; - case 50: -/* Line 1265 of yacc.c. */ -#line 364 "parse-gram.y" + case 51: +/* Line 1278 of yacc.c. */ +#line 361 "parse-gram.y" { symbol_list *list; ++current_prec; @@ -2126,68 +2147,69 @@ yyreduce: } break; - case 51: -/* Line 1265 of yacc.c. */ -#line 378 "parse-gram.y" + case 52: +/* Line 1278 of yacc.c. */ +#line 375 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 52: -/* Line 1265 of yacc.c. */ -#line 379 "parse-gram.y" + case 53: +/* Line 1278 of yacc.c. */ +#line 376 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 53: -/* Line 1265 of yacc.c. */ -#line 380 "parse-gram.y" + case 54: +/* Line 1278 of yacc.c. */ +#line 377 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 54: -/* Line 1265 of yacc.c. */ -#line 384 "parse-gram.y" + case 55: +/* Line 1278 of yacc.c. */ +#line 381 "parse-gram.y" { current_type = NULL; } break; - case 55: -/* Line 1265 of yacc.c. */ -#line 385 "parse-gram.y" - { current_type = (yyvsp[(1) - (1)].uniqstr); } + case 56: +/* Line 1278 of yacc.c. */ +#line 382 "parse-gram.y" + { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 56: -/* Line 1265 of yacc.c. */ -#line 390 "parse-gram.y" + case 57: +/* Line 1278 of yacc.c. */ +#line 387 "parse-gram.y" { (yyval.list) = symbol_list_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 57: -/* Line 1265 of yacc.c. */ -#line 391 "parse-gram.y" + case 58: +/* Line 1278 of yacc.c. */ +#line 388 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 58: -/* Line 1265 of yacc.c. */ -#line 397 "parse-gram.y" + case 59: +/* Line 1278 of yacc.c. */ +#line 394 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); + tag_seen = true; } break; - case 59: -/* Line 1265 of yacc.c. */ -#line 401 "parse-gram.y" + case 60: +/* Line 1278 of yacc.c. */ +#line 399 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); } break; - case 60: -/* Line 1265 of yacc.c. */ -#line 406 "parse-gram.y" + case 61: +/* Line 1278 of yacc.c. */ +#line 404 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2195,9 +2217,9 @@ yyreduce: } break; - case 61: -/* Line 1265 of yacc.c. */ -#line 412 "parse-gram.y" + case 62: +/* Line 1278 of yacc.c. */ +#line 410 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2205,9 +2227,9 @@ yyreduce: } break; - case 62: -/* Line 1265 of yacc.c. */ -#line 418 "parse-gram.y" + case 63: +/* Line 1278 of yacc.c. */ +#line 416 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2216,77 +2238,95 @@ yyreduce: } break; - case 69: -/* Line 1265 of yacc.c. */ -#line 448 "parse-gram.y" + case 70: +/* Line 1278 of yacc.c. */ +#line 446 "parse-gram.y" { yyerrok; } break; - case 70: -/* Line 1265 of yacc.c. */ -#line 454 "parse-gram.y" + case 71: +/* Line 1278 of yacc.c. */ +#line 452 "parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 72: -/* Line 1265 of yacc.c. */ -#line 458 "parse-gram.y" + case 73: +/* Line 1278 of yacc.c. */ +#line 456 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 73: -/* Line 1265 of yacc.c. */ -#line 459 "parse-gram.y" + case 74: +/* Line 1278 of yacc.c. */ +#line 457 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 75: -/* Line 1265 of yacc.c. */ -#line 465 "parse-gram.y" + case 76: +/* Line 1278 of yacc.c. */ +#line 463 "parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 76: -/* Line 1265 of yacc.c. */ -#line 467 "parse-gram.y" + case 77: +/* Line 1278 of yacc.c. */ +#line 465 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 77: -/* Line 1265 of yacc.c. */ -#line 469 "parse-gram.y" + case 78: +/* Line 1278 of yacc.c. */ +#line 467 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 78: -/* Line 1265 of yacc.c. */ -#line 471 "parse-gram.y" + case 79: +/* Line 1278 of yacc.c. */ +#line 469 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 79: -/* Line 1265 of yacc.c. */ -#line 473 "parse-gram.y" + case 80: +/* Line 1278 of yacc.c. */ +#line 471 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 80: -/* Line 1265 of yacc.c. */ -#line 475 "parse-gram.y" + case 81: +/* Line 1278 of yacc.c. */ +#line 473 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 81: -/* Line 1265 of yacc.c. */ -#line 488 "parse-gram.y" + case 84: +/* Line 1278 of yacc.c. */ +#line 489 "parse-gram.y" + { + static char one[] = "1"; + (yyval.chars) = one; + } + break; + + case 86: +/* Line 1278 of yacc.c. */ +#line 499 "parse-gram.y" + { + (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n'; + (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)])); + } + break; + + case 87: +/* Line 1278 of yacc.c. */ +#line 515 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 82: -/* Line 1265 of yacc.c. */ -#line 490 "parse-gram.y" + case 88: +/* Line 1278 of yacc.c. */ +#line 517 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2294,30 +2334,24 @@ yyreduce: } break; - case 83: -/* Line 1265 of yacc.c. */ -#line 498 "parse-gram.y" + case 89: +/* Line 1278 of yacc.c. */ +#line 525 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 86: -/* Line 1265 of yacc.c. */ -#line 510 "parse-gram.y" + case 92: +/* Line 1278 of yacc.c. */ +#line 537 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); } break; - case 87: -/* Line 1265 of yacc.c. */ -#line 519 "parse-gram.y" - { (yyval.chars) = (yyvsp[(1) - (1)].chars); } - break; - - case 89: -/* Line 1265 of yacc.c. */ -#line 526 "parse-gram.y" + case 94: +/* Line 1278 of yacc.c. */ +#line 546 "parse-gram.y" { muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); gram_scanner_last_string_free (); @@ -2325,8 +2359,8 @@ yyreduce: break; -/* Line 1265 of yacc.c. */ -#line 2330 "parse-gram.c" +/* Line 1278 of yacc.c. */ +#line 2364 "parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2345,7 +2379,8 @@ yyreduce: yyn = yyr1[yyn]; yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + if (0 <= yystate && yystate <= YYLAST + && (int)yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else yystate = yydefgoto[yyn - YYNTOKENS]; @@ -2477,9 +2512,6 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; @@ -2520,7 +2552,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); /* Do not reclaim the symbols of the rule which action triggered @@ -2546,8 +2578,8 @@ yyreturn: } -/* Line 1485 of yacc.c. */ -#line 532 "parse-gram.y" +/* Line 1496 of yacc.c. */ +#line 552 "parse-gram.y" @@ -2632,6 +2664,7 @@ add_param (char const *type, char *decl, location loc) gram_scanner_last_string_free (); } + static void version_check (location const *loc, char const *version) {