X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a76ca263093deb77ff09c422c91723f600a74ebe..21667f64cd57381cdee86a536010b09a55703a51:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index 82d78c26..9b1b0937 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 2.1a. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 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 @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,6 +36,9 @@ /* Identify Bison output. */ #define YYBISON 1 +/* Bison version. */ +#define YYBISON_VERSION "2.1a" + /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -45,8 +48,7 @@ /* Using locations. */ #define YYLSP_NEEDED 1 -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ +/* Substitute the variable and function names. */ #define yyparse gram_parse #define yylex gram_lex #define yyerror gram_error @@ -113,6 +115,7 @@ BRACED_CODE = 305 }; #endif +/* Tokens. */ #define GRAM_EOF 0 #define STRING 258 #define INT 259 @@ -167,10 +170,10 @@ /* Copy the first part of user declarations. */ -#line 1 "parse-gram.y" +#line 1 "../../src/parse-gram.y" /* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -186,8 +189,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA */ #include "system.h" @@ -199,12 +202,16 @@ #include "gram.h" #include "muscle_tab.h" #include "output.h" +#include "quotearg.h" #include "reader.h" #include "symlist.h" #define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) static YYLTYPE lloc_default (YYLTYPE const *, int); +#define YY_LOCATION_PRINT(File, Loc) \ + location_print (File, Loc) + /* Request detailed syntax error messages, and pass them to GRAM_ERROR. FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror @@ -212,18 +219,14 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); -#define YYPRINT(File, Type, Value) \ - print_token_value (File, Type, &Value) -static void print_token_value (FILE *, int, YYSTYPE const *); - static void add_param (char const *, char *, location); -symbol_class current_class = unknown_sym; -uniqstr current_type = 0; +static symbol_class current_class = unknown_sym; +static uniqstr current_type = 0; symbol *current_lhs; location current_lhs_location; assoc current_assoc; -int current_prec = 0; +static int current_prec = 0; /* Enabling traces. */ @@ -239,8 +242,13 @@ int current_prec = 0; # define YYERROR_VERBOSE 1 #endif +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 78 "parse-gram.y" +#line 79 "../../src/parse-gram.y" typedef union YYSTYPE { symbol *symbol; symbol_list *list; @@ -249,8 +257,8 @@ typedef union YYSTYPE { assoc assoc; uniqstr uniqstr; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 254 "parse-gram.c" +/* Line 196 of yacc.c. */ +#line 262 "../../src/parse-gram.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -273,30 +281,60 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 278 "parse-gram.c" +/* Line 219 of yacc.c. */ +#line 286 "../../src/parse-gram.c" -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#ifndef YYSIZE_T +# if defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +# elif defined (size_t) +# define YYSIZE_T size_t +# elif ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) -# ifndef YYFREE -# define YYFREE free +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif # endif -# ifndef YYMALLOC -# define YYMALLOC malloc +# ifndef YY_ +# define YY_(msgid) msgid # endif +#endif + +#if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# elif defined (__BUILTIN_VA_ARG_INCR) +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined (_AIX) +# define YYSTACK_ALLOC __alloca +# elif defined (_MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if (! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif # endif # endif # endif @@ -304,13 +342,39 @@ typedef struct YYLTYPE # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ # endif +# else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# ifdef __cplusplus +extern "C" { +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if (! defined (malloc) && ! defined (_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if (! defined (free) && ! defined (_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ @@ -347,7 +411,7 @@ union yyalloc # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -389,7 +453,7 @@ union yyalloc /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 25 /* YYNRULES -- Number of rules. */ -#define YYNRULES 79 +#define YYNRULES 80 /* YYNRULES -- Number of states. */ #define YYNSTATES 108 @@ -397,7 +461,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 305 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -441,14 +505,15 @@ static const unsigned char yytranslate[] = YYRHS. */ static const unsigned char yyprhs[] = { - 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, - 24, 26, 29, 32, 36, 38, 40, 42, 44, 48, - 50, 52, 56, 58, 60, 63, 65, 67, 69, 71, - 73, 75, 78, 80, 83, 86, 88, 90, 91, 95, - 96, 100, 104, 108, 110, 112, 114, 115, 117, 119, - 122, 124, 126, 129, 132, 136, 138, 141, 143, 146, - 148, 151, 154, 155, 159, 161, 165, 168, 169, 172, - 175, 179, 183, 187, 189, 191, 193, 195, 197, 198 + 0, 0, 3, 8, 9, 12, 14, 16, 18, 21, + 25, 27, 29, 32, 35, 39, 41, 43, 45, 47, + 51, 53, 55, 59, 61, 63, 66, 68, 70, 72, + 74, 76, 78, 81, 83, 86, 89, 91, 93, 94, + 98, 99, 103, 107, 111, 113, 115, 117, 118, 120, + 122, 125, 127, 129, 132, 135, 139, 141, 144, 146, + 149, 151, 154, 157, 158, 162, 164, 168, 171, 172, + 175, 178, 182, 186, 190, 192, 194, 196, 198, 200, + 201 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -456,43 +521,44 @@ static const yysigned_char yyrhs[] = { 52, 0, -1, 53, 47, 65, 75, -1, -1, 53, 54, -1, 55, -1, 48, -1, 17, -1, 19, 74, - 74, -1, 20, -1, 21, -1, 22, 4, -1, 23, - 4, -1, 24, 42, 74, -1, 25, -1, 26, -1, - 27, -1, 28, -1, 29, 42, 74, -1, 31, -1, - 32, -1, 33, 42, 74, -1, 34, -1, 35, -1, - 36, 74, -1, 38, -1, 39, -1, 40, -1, 43, - -1, 59, -1, 56, -1, 37, 71, -1, 10, -1, - 8, 62, -1, 9, 62, -1, 18, -1, 30, -1, - -1, 6, 57, 64, -1, -1, 5, 58, 64, -1, - 7, 41, 62, -1, 60, 61, 62, -1, 11, -1, - 12, -1, 13, -1, -1, 41, -1, 71, -1, 62, - 71, -1, 41, -1, 45, -1, 45, 4, -1, 45, - 73, -1, 45, 4, 73, -1, 63, -1, 64, 63, - -1, 66, -1, 65, 66, -1, 67, -1, 55, 43, - -1, 1, 43, -1, -1, 46, 68, 69, -1, 70, - -1, 69, 44, 70, -1, 69, 43, -1, -1, 70, - 71, -1, 70, 72, -1, 70, 14, 71, -1, 70, - 15, 4, -1, 70, 16, 41, -1, 45, -1, 73, - -1, 50, -1, 3, -1, 3, -1, -1, 47, 49, - -1 + -1, 19, 74, 74, -1, 20, -1, 21, -1, 22, + 4, -1, 23, 4, -1, 24, 42, 74, -1, 25, + -1, 26, -1, 27, -1, 28, -1, 29, 42, 74, + -1, 31, -1, 32, -1, 33, 42, 74, -1, 34, + -1, 35, -1, 36, 74, -1, 38, -1, 39, -1, + 40, -1, 43, -1, 59, -1, 56, -1, 37, 71, + -1, 10, -1, 8, 62, -1, 9, 62, -1, 18, + -1, 30, -1, -1, 6, 57, 64, -1, -1, 5, + 58, 64, -1, 7, 41, 62, -1, 60, 61, 62, + -1, 11, -1, 12, -1, 13, -1, -1, 41, -1, + 71, -1, 62, 71, -1, 41, -1, 45, -1, 45, + 4, -1, 45, 73, -1, 45, 4, 73, -1, 63, + -1, 64, 63, -1, 66, -1, 65, 66, -1, 67, + -1, 55, 43, -1, 1, 43, -1, -1, 46, 68, + 69, -1, 70, -1, 69, 44, 70, -1, 69, 43, + -1, -1, 70, 71, -1, 70, 72, -1, 70, 14, + 71, -1, 70, 15, 4, -1, 70, 16, 41, -1, + 45, -1, 73, -1, 50, -1, 3, -1, 3, -1, + -1, 47, 49, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 171, 171, 179, 181, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 199, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 219, - 220, 221, 225, 231, 238, 245, 249, 256, 256, 261, - 261, 266, 276, 291, 292, 293, 297, 298, 304, 305, - 310, 314, 319, 325, 331, 342, 343, 352, 353, 359, - 360, 365, 372, 372, 376, 377, 378, 383, 384, 386, - 388, 390, 392, 397, 398, 402, 408, 417, 424, 426 + 0, 188, 188, 196, 198, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 217, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 237, 238, 239, 243, 249, 256, 263, 267, 274, 274, + 279, 279, 284, 294, 309, 310, 311, 315, 316, 322, + 323, 328, 332, 337, 343, 349, 360, 361, 370, 371, + 377, 378, 383, 390, 390, 394, 395, 396, 401, 402, + 404, 406, 408, 410, 415, 416, 420, 426, 435, 440, + 442 }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { @@ -536,25 +602,27 @@ static const unsigned char yyr1[] = { 0, 51, 52, 53, 53, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 55, - 55, 55, 55, 55, 55, 55, 55, 57, 56, 58, - 56, 56, 59, 60, 60, 60, 61, 61, 62, 62, - 63, 63, 63, 63, 63, 64, 64, 65, 65, 66, - 66, 66, 68, 67, 69, 69, 69, 70, 70, 70, - 70, 70, 70, 71, 71, 72, 73, 74, 75, 75 + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, + 55, 55, 55, 55, 55, 55, 55, 55, 57, 56, + 58, 56, 56, 59, 60, 60, 60, 61, 61, 62, + 62, 63, 63, 63, 63, 63, 64, 64, 65, 65, + 66, 66, 66, 68, 67, 69, 69, 69, 70, 70, + 70, 70, 70, 70, 71, 71, 72, 73, 74, 75, + 75 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { - 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, - 1, 2, 2, 3, 1, 1, 1, 1, 3, 1, - 1, 3, 1, 1, 2, 1, 1, 1, 1, 1, - 1, 2, 1, 2, 2, 1, 1, 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, 0, 2 + 0, 2, 4, 0, 2, 1, 1, 1, 2, 3, + 1, 1, 2, 2, 3, 1, 1, 1, 1, 3, + 1, 1, 3, 1, 1, 2, 1, 1, 1, 1, + 1, 1, 2, 1, 2, 2, 1, 1, 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, 0, + 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -562,17 +630,17 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 39, 37, 0, 0, 0, 32, - 43, 44, 45, 7, 35, 0, 9, 10, 0, 0, - 0, 14, 15, 16, 17, 0, 36, 19, 20, 0, - 22, 23, 0, 0, 25, 26, 27, 28, 0, 6, - 4, 5, 30, 29, 46, 0, 0, 0, 76, 73, - 33, 48, 74, 34, 77, 0, 11, 12, 0, 0, - 0, 24, 31, 0, 62, 0, 0, 57, 59, 47, - 0, 50, 51, 55, 40, 38, 41, 49, 8, 13, - 18, 21, 61, 67, 60, 0, 58, 2, 42, 52, - 53, 56, 63, 64, 79, 54, 66, 67, 0, 0, - 0, 75, 68, 69, 65, 70, 71, 72 + 3, 0, 0, 1, 40, 38, 0, 0, 0, 33, + 44, 45, 46, 7, 36, 0, 10, 11, 0, 0, + 0, 15, 16, 17, 18, 0, 37, 20, 21, 0, + 23, 24, 0, 0, 26, 27, 28, 29, 0, 6, + 4, 5, 31, 30, 47, 0, 0, 0, 77, 74, + 34, 49, 75, 35, 78, 8, 12, 13, 0, 0, + 0, 25, 32, 0, 63, 0, 0, 58, 60, 48, + 0, 51, 52, 56, 41, 39, 42, 50, 9, 14, + 19, 22, 62, 68, 61, 0, 59, 2, 43, 53, + 54, 57, 64, 65, 80, 55, 67, 68, 0, 0, + 0, 76, 69, 70, 66, 71, 72, 73 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -613,12 +681,12 @@ static const yysigned_char yypgoto[] = 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 -79 +#define YYTABLE_NINF -80 static const yysigned_char yytable[] = { 62, 53, 48, 48, 71, 3, 90, 47, 72, 48, 89, 96, 97, 98, 99, 100, 54, 77, 91, 91, - 77, -78, 63, 95, 56, 58, 4, 5, 6, 7, + 77, -79, 63, 95, 56, 58, 4, 5, 6, 7, 8, 9, 10, 11, 12, 57, 59, 60, 69, 14, 76, 82, 48, 77, 49, 49, 84, 106, 107, 101, 94, 26, 41, 86, 75, 77, 104, 0, 33, 0, @@ -671,22 +739,6 @@ static const unsigned char yystos[] = 16, 50, 71, 72, 70, 71, 4, 41 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -716,26 +768,59 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up");\ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (0) #endif + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -758,19 +843,13 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Token, Value, Location); \ + yysymprint (stderr, \ + Type, Value, Location); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -817,13 +896,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -837,8 +916,7 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -853,13 +931,9 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -881,7 +955,7 @@ yystrlen (yystr) const char *yystr; # endif { - register const char *yys = yystr; + const char *yys = yystr; while (*yys++ != '\0') continue; @@ -906,8 +980,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -917,8 +991,162 @@ yystpcpy (yydest, yysrc) # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + size_t yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn < YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf)) + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ #if YYDEBUG @@ -943,17 +1171,109 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) (void) yylocationp; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YY_LOCATION_PRINT (yyoutput, *yylocationp); + YYFPRINTF (yyoutput, ": "); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { + case 3: /* "\"string\"" */ +#line 165 "../../src/parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1191 "../../src/parse-gram.c" + break; + case 4: /* "\"integer\"" */ +#line 178 "../../src/parse-gram.y" + { fprintf (stderr, "%d", (yyvaluep->integer)); }; +#line 1196 "../../src/parse-gram.c" + break; + case 8: /* "\"%destructor {...}\"" */ +#line 167 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1201 "../../src/parse-gram.c" + break; + case 9: /* "\"%printer {...}\"" */ +#line 171 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1206 "../../src/parse-gram.c" + break; + case 10: /* "\"%union {...}\"" */ +#line 172 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1211 "../../src/parse-gram.c" + break; + case 26: /* "\"%initial-action {...}\"" */ +#line 168 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1216 "../../src/parse-gram.c" + break; + case 27: /* "\"%lex-param {...}\"" */ +#line 169 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1221 "../../src/parse-gram.c" + break; + case 34: /* "\"%parse-param {...}\"" */ +#line 170 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1226 "../../src/parse-gram.c" + break; + case 41: /* "\"type\"" */ +#line 176 "../../src/parse-gram.y" + { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; +#line 1231 "../../src/parse-gram.c" + break; + case 45: /* "\"identifier\"" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1236 "../../src/parse-gram.c" + break; + case 46: /* "\"identifier:\"" */ +#line 182 "../../src/parse-gram.y" + { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; +#line 1241 "../../src/parse-gram.c" + break; + case 48: /* "\"%{...%}\"" */ +#line 174 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1246 "../../src/parse-gram.c" + break; + case 49: /* "\"epilogue\"" */ +#line 174 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1251 "../../src/parse-gram.c" + break; + case 50: /* "\"{...}\"" */ +#line 173 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1256 "../../src/parse-gram.c" + break; + case 71: /* "symbol" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1261 "../../src/parse-gram.c" + break; + case 72: /* "action" */ +#line 173 "../../src/parse-gram.y" + { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; +#line 1266 "../../src/parse-gram.c" + break; + case 73: /* "string_as_id" */ +#line 180 "../../src/parse-gram.y" + { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; +#line 1271 "../../src/parse-gram.c" + break; + case 74: /* "string_content" */ +#line 165 "../../src/parse-gram.y" + { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); }; +#line 1276 "../../src/parse-gram.c" + break; default: break; } @@ -967,10 +1287,11 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else static void -yydestruct (yytype, yyvaluep, yylocationp) +yydestruct (yymsg, yytype, yyvaluep, yylocationp) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; YYLTYPE *yylocationp; @@ -980,6 +1301,10 @@ yydestruct (yytype, yyvaluep, yylocationp) (void) yyvaluep; (void) yylocationp; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -1028,28 +1353,34 @@ yyparse (void) #else int yyparse () - + ; #endif #endif { - /* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ int yynerrs; -/* Location data for the lookahead symbol. */ +/* Location data for the look-ahead symbol. */ YYLTYPE yylloc; - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -1062,18 +1393,19 @@ YYLTYPE yylloc; /* The state stack. */ short int yyssa[YYINITDEPTH]; short int *yyss = yyssa; - register short int *yyssp; + short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; /* The location stack. */ YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; - YYLTYPE *yylerrsp; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) @@ -1103,18 +1435,25 @@ YYLTYPE yylloc; yyssp = yyss; yyvsp = yyvs; yylsp = yyls; +#if YYLTYPE_IS_TRIVIAL + /* Initialize the default location before parsing starts. */ + yylloc.first_line = yylloc.last_line = 1; + yylloc.first_column = yylloc.last_column = 0; +#endif + /* User initialization code. */ - #line 68 "parse-gram.y" +#line 69 "../../src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ - (*yylsp).start.file = (*yylsp).end.file = current_file; - (*yylsp).start.line = (*yylsp).end.line = 1; - (*yylsp).start.column = (*yylsp).end.column = 0; + yylloc.start.file = yylloc.end.file = current_file; + yylloc.start.line = yylloc.end.line = 1; + yylloc.start.column = yylloc.end.column = 0; } -/* Line 818 of yacc.c. */ -#line 1118 "parse-gram.c" +/* Line 1053 of yacc.c. */ +#line 1456 "../../src/parse-gram.c" + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1147,7 +1486,7 @@ YYLTYPE yylloc; data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), @@ -1158,11 +1497,11 @@ YYLTYPE yylloc; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -1172,7 +1511,7 @@ YYLTYPE yylloc; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); YYSTACK_RELOCATE (yyls); @@ -1204,18 +1543,18 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1230,7 +1569,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1250,8 +1589,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1302,403 +1641,406 @@ yyreduce: switch (yyn) { case 6: -#line 186 "parse-gram.y" - { prologue_augment (yyvsp[0].chars, yylsp[0]); } +#line 203 "../../src/parse-gram.y" + { prologue_augment ((yyvsp[0].chars), (yylsp[0])); } break; case 7: -#line 187 "parse-gram.y" +#line 204 "../../src/parse-gram.y" { debug_flag = true; } break; case 8: -#line 188 "parse-gram.y" - { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } +#line 205 "../../src/parse-gram.y" + { muscle_insert ((yyvsp[0].chars), "1"); } break; case 9: -#line 189 "parse-gram.y" - { defines_flag = true; } +#line 206 "../../src/parse-gram.y" + { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); } break; case 10: -#line 190 "parse-gram.y" - { error_verbose = true; } +#line 207 "../../src/parse-gram.y" + { defines_flag = true; } break; case 11: -#line 191 "parse-gram.y" - { expected_sr_conflicts = yyvsp[0].integer; } +#line 208 "../../src/parse-gram.y" + { error_verbose = true; } break; case 12: -#line 192 "parse-gram.y" - { expected_rr_conflicts = yyvsp[0].integer; } +#line 209 "../../src/parse-gram.y" + { expected_sr_conflicts = (yyvsp[0].integer); } break; case 13: -#line 193 "parse-gram.y" - { spec_file_prefix = yyvsp[0].chars; } +#line 210 "../../src/parse-gram.y" + { expected_rr_conflicts = (yyvsp[0].integer); } break; case 14: -#line 195 "parse-gram.y" - { - nondeterministic_parser = true; - glr_parser = true; - } +#line 211 "../../src/parse-gram.y" + { spec_file_prefix = (yyvsp[0].chars); } break; case 15: -#line 200 "parse-gram.y" +#line 213 "../../src/parse-gram.y" { - muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]); + nondeterministic_parser = true; + glr_parser = true; } break; case 16: -#line 203 "parse-gram.y" - { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } +#line 218 "../../src/parse-gram.y" + { + muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0])); + } break; case 17: -#line 204 "parse-gram.y" - { locations_flag = true; } +#line 221 "../../src/parse-gram.y" + { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); } break; case 18: -#line 205 "parse-gram.y" - { spec_name_prefix = yyvsp[0].chars; } +#line 222 "../../src/parse-gram.y" + { locations_flag = true; } break; case 19: -#line 206 "parse-gram.y" - { no_lines_flag = true; } +#line 223 "../../src/parse-gram.y" + { spec_name_prefix = (yyvsp[0].chars); } break; case 20: -#line 207 "parse-gram.y" - { nondeterministic_parser = true; } +#line 224 "../../src/parse-gram.y" + { no_lines_flag = true; } break; case 21: -#line 208 "parse-gram.y" - { spec_outfile = yyvsp[0].chars; } +#line 225 "../../src/parse-gram.y" + { nondeterministic_parser = true; } break; case 22: -#line 209 "parse-gram.y" - { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } +#line 226 "../../src/parse-gram.y" + { spec_outfile = (yyvsp[0].chars); } break; case 23: -#line 210 "parse-gram.y" - { pure_parser = true; } +#line 227 "../../src/parse-gram.y" + { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); } break; case 24: -#line 211 "parse-gram.y" - { skeleton = yyvsp[0].chars; } +#line 228 "../../src/parse-gram.y" + { pure_parser = true; } break; case 25: -#line 212 "parse-gram.y" - { token_table_flag = true; } +#line 229 "../../src/parse-gram.y" + { skeleton = (yyvsp[0].chars); } break; case 26: -#line 213 "parse-gram.y" - { report_flag = report_states; } +#line 230 "../../src/parse-gram.y" + { token_table_flag = true; } break; case 27: -#line 214 "parse-gram.y" +#line 231 "../../src/parse-gram.y" + { report_flag = report_states; } + break; + + case 28: +#line 232 "../../src/parse-gram.y" { yacc_flag = true; } break; - case 31: -#line 222 "parse-gram.y" + case 32: +#line 240 "../../src/parse-gram.y" { - grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); + grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0])); } break; - case 32: -#line 226 "parse-gram.y" + case 33: +#line 244 "../../src/parse-gram.y" { typed = true; - MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); - muscle_insert ("stype", yyvsp[0].chars); + MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line); + muscle_insert ("stype", (yyvsp[0].chars)); } break; - case 33: -#line 232 "parse-gram.y" + case 34: +#line 250 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_destructor_set (list->sym, (yyvsp[-1].chars), (yylsp[-1])); + symbol_list_free ((yyvsp[0].list)); } break; - case 34: -#line 239 "parse-gram.y" + case 35: +#line 257 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_printer_set (list->sym, yyvsp[-1].chars, list->location); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_printer_set (list->sym, (yyvsp[-1].chars), list->location); + symbol_list_free ((yyvsp[0].list)); } break; - case 35: -#line 246 "parse-gram.y" + case 36: +#line 264 "../../src/parse-gram.y" { default_prec = true; } break; - case 36: -#line 250 "parse-gram.y" + case 37: +#line 268 "../../src/parse-gram.y" { default_prec = false; } break; - case 37: -#line 256 "parse-gram.y" + case 38: +#line 274 "../../src/parse-gram.y" { current_class = nterm_sym; } break; - case 38: -#line 257 "parse-gram.y" + case 39: +#line 275 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 39: -#line 261 "parse-gram.y" + case 40: +#line 279 "../../src/parse-gram.y" { current_class = token_sym; } break; - case 40: -#line 262 "parse-gram.y" + case 41: +#line 280 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 41: -#line 267 "parse-gram.y" + case 42: +#line 285 "../../src/parse-gram.y" { symbol_list *list; - for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]); - symbol_list_free (yyvsp[0].list); + for (list = (yyvsp[0].list); list; list = list->next) + symbol_type_set (list->sym, (yyvsp[-1].uniqstr), (yylsp[-1])); + symbol_list_free ((yyvsp[0].list)); } break; - case 42: -#line 277 "parse-gram.y" + case 43: +#line 295 "../../src/parse-gram.y" { symbol_list *list; ++current_prec; - for (list = yyvsp[0].list; list; list = list->next) + for (list = (yyvsp[0].list); list; list = list->next) { - symbol_type_set (list->sym, current_type, yylsp[-1]); - symbol_precedence_set (list->sym, current_prec, yyvsp[-2].assoc, yylsp[-2]); + symbol_type_set (list->sym, current_type, (yylsp[-1])); + symbol_precedence_set (list->sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2])); } - symbol_list_free (yyvsp[0].list); + symbol_list_free ((yyvsp[0].list)); current_type = NULL; } break; - case 43: -#line 291 "parse-gram.y" - { yyval.assoc = left_assoc; } - break; - case 44: -#line 292 "parse-gram.y" - { yyval.assoc = right_assoc; } +#line 309 "../../src/parse-gram.y" + { (yyval.assoc) = left_assoc; } break; case 45: -#line 293 "parse-gram.y" - { yyval.assoc = non_assoc; } +#line 310 "../../src/parse-gram.y" + { (yyval.assoc) = right_assoc; } break; case 46: -#line 297 "parse-gram.y" - { current_type = NULL; } +#line 311 "../../src/parse-gram.y" + { (yyval.assoc) = non_assoc; } break; case 47: -#line 298 "parse-gram.y" - { current_type = yyvsp[0].uniqstr; } +#line 315 "../../src/parse-gram.y" + { current_type = NULL; } break; case 48: -#line 304 "parse-gram.y" - { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } +#line 316 "../../src/parse-gram.y" + { current_type = (yyvsp[0].uniqstr); } break; case 49: -#line 305 "parse-gram.y" - { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } +#line 322 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); } break; case 50: -#line 311 "parse-gram.y" - { - current_type = yyvsp[0].uniqstr; - } +#line 323 "../../src/parse-gram.y" + { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); } break; case 51: -#line 315 "parse-gram.y" +#line 329 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); - symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); + current_type = (yyvsp[0].uniqstr); } break; case 52: -#line 320 "parse-gram.y" +#line 333 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); - symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); - symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer, yylsp[0]); - } + symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0])); + symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0])); + } break; case 53: -#line 326 "parse-gram.y" +#line 338 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); - symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); - symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol, yyloc); + symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); + symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); + symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); } break; case 54: -#line 332 "parse-gram.y" +#line 344 "../../src/parse-gram.y" { - symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); - symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); - symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer, yylsp[-1]); - symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol, yyloc); + symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1])); + symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1])); + symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc)); } break; - case 60: -#line 361 "parse-gram.y" + case 55: +#line 350 "../../src/parse-gram.y" { - if (yacc_flag) - complain_at (yyloc, _("POSIX forbids declarations in the grammar")); + symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2])); + symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2])); + symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1])); + symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc)); } break; case 61: -#line 366 "parse-gram.y" +#line 379 "../../src/parse-gram.y" { - yyerrok; + if (yacc_flag) + complain_at ((yyloc), _("POSIX forbids declarations in the grammar")); } break; case 62: -#line 372 "parse-gram.y" - { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } +#line 384 "../../src/parse-gram.y" + { + yyerrok; + } break; - case 64: -#line 376 "parse-gram.y" - { grammar_rule_end (yylsp[0]); } + case 63: +#line 390 "../../src/parse-gram.y" + { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); } break; case 65: -#line 377 "parse-gram.y" - { grammar_rule_end (yylsp[0]); } +#line 394 "../../src/parse-gram.y" + { grammar_rule_end ((yylsp[0])); } break; - case 67: -#line 383 "parse-gram.y" - { grammar_rule_begin (current_lhs, current_lhs_location); } + case 66: +#line 395 "../../src/parse-gram.y" + { grammar_rule_end ((yylsp[0])); } break; case 68: -#line 385 "parse-gram.y" - { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } +#line 401 "../../src/parse-gram.y" + { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 69: -#line 387 "parse-gram.y" - { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } +#line 403 "../../src/parse-gram.y" + { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); } break; case 70: -#line 389 "parse-gram.y" - { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } +#line 405 "../../src/parse-gram.y" + { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); } break; case 71: -#line 391 "parse-gram.y" - { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } +#line 407 "../../src/parse-gram.y" + { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); } break; case 72: -#line 393 "parse-gram.y" - { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } +#line 409 "../../src/parse-gram.y" + { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); } break; case 73: -#line 397 "parse-gram.y" - { yyval.symbol = yyvsp[0].symbol; } +#line 411 "../../src/parse-gram.y" + { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); } break; case 74: -#line 398 "parse-gram.y" - { yyval.symbol = yyvsp[0].symbol; } +#line 415 "../../src/parse-gram.y" + { (yyval.symbol) = (yyvsp[0].symbol); } break; case 75: -#line 403 "parse-gram.y" - { yyval.chars = yyvsp[0].chars; } +#line 416 "../../src/parse-gram.y" + { (yyval.symbol) = (yyvsp[0].symbol); } break; case 76: -#line 409 "parse-gram.y" - { - yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); - symbol_class_set (yyval.symbol, token_sym, yylsp[0]); - } +#line 421 "../../src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].chars); } break; case 77: -#line 418 "parse-gram.y" +#line 427 "../../src/parse-gram.y" { - yyval.chars = yyvsp[0].chars + 1; - yyval.chars[strlen (yyval.chars) - 1] = '\0'; + (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0])); + symbol_class_set ((yyval.symbol), token_sym, (yylsp[0])); } break; - case 79: -#line 427 "parse-gram.y" + case 78: +#line 436 "../../src/parse-gram.y" + { (yyval.chars) = (yyvsp[0].chars); } + break; + + case 80: +#line 443 "../../src/parse-gram.y" { - muscle_code_grow ("epilogue", yyvsp[0].chars, yylsp[0]); + muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0])); scanner_last_string_free (); } break; + default: break; } -/* Line 1010 of yacc.c. */ -#line 1702 "parse-gram.c" +/* Line 1249 of yacc.c. */ +#line 2044 "../../src/parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1732,99 +2074,64 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (YYPACT_NINF < yyn && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; - int yyx; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; - - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) - { - yysize = 0; - break; - } + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); - - if (yycount < 5) - { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } - } - yyerror (yymsg); - YYSTACK_FREE (yymsg); - } - else - yyerror ("syntax error; also virtual memory exhausted"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } - yylerrsp = yylsp; + yyerror_range[0] = yylloc; if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + /* Return failure if at end of input. */ if (yychar == YYEOF) - for (;;) - { - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp, yylsp); - } + YYABORT; } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval, &yylloc); + yydestruct ("Error: discarding", yytoken, &yylval, &yylloc); yychar = YYEMPTY; - *++yylerrsp = yylloc; } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -1834,19 +2141,17 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ if (0) goto yyerrorlab; -#endif + yyerror_range[0] = yylsp[1-yylen]; + yylsp -= yylen; yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; - yylerrsp = yylsp; - *++yylerrsp = yyloc; - yylsp -= yylen; goto yyerrlab1; @@ -1874,8 +2179,8 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp, yylsp); + yyerror_range[0] = *yylsp; + yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1884,12 +2189,17 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; - YYLLOC_DEFAULT (yyloc, yylsp, yylerrsp - yylsp); + + yyerror_range[1] = yylloc; + /* Using YYLLOC is tempting, but would change the location of + the look-ahead. YYLOC is available though. */ + YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2); *++yylsp = yyloc; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -1909,25 +2219,38 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp, yylsp); + YYPOPSTACK; + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); #endif return yyresult; } -#line 433 "parse-gram.y" +#line 449 "../../src/parse-gram.y" @@ -1941,7 +2264,11 @@ lloc_default (YYLTYPE const *rhs, int n) { int i; YYLTYPE loc; - loc.start = loc.end = rhs[n].end; + + /* SGI MIPSpro 7.4.1m miscompiles "loc.start = loc.end = rhs[n].end;". + The bug is fixed in 7.4.2m, but play it safe for now. */ + loc.start = rhs[n].end; + loc.end = rhs[n].end; /* Ignore empty nonterminals the start of the the right-hand side. Do not bother to ignore them at the end of the right-hand side, @@ -1963,22 +2290,28 @@ lloc_default (YYLTYPE const *rhs, int n) static void add_param (char const *type, char *decl, location loc) { - static char const alphanum[] = - "0123456789" + static char const alphanum[26 + 26 + 1 + 10] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "_"; - char const *alpha = alphanum + 10; + "_" + "0123456789"; char const *name_start = NULL; char *p; - for (p = decl; *p; p++) - if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) + /* Stop on last actual character. */ + for (p = decl; p[1]; p++) + if ((p == decl + || ! memchr (alphanum, p[-1], sizeof alphanum)) + && memchr (alphanum, p[0], sizeof alphanum - 10)) name_start = p; - /* Strip the surrounding '{' and '}'. */ - decl++; - p[-1] = '\0'; + /* Strip the surrounding '{' and '}', and any blanks just inside + the braces. */ + while (*--p == ' ' || *p == '\t') + continue; + p[1] = '\0'; + while (*++decl == ' ' || *decl == '\t') + continue; if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); @@ -1988,7 +2321,7 @@ add_param (char const *type, char *decl, location loc) size_t name_len; for (name_len = 1; - name_start[name_len] && strchr (alphanum, name_start[name_len]); + memchr (alphanum, name_start[name_len], sizeof alphanum); name_len++) continue; @@ -2002,49 +2335,6 @@ add_param (char const *type, char *decl, location loc) scanner_last_string_free (); } -/*----------------------------------------------------. -| When debugging the parser, display tokens' values. | -`----------------------------------------------------*/ - -static void -print_token_value (FILE *file, int type, YYSTYPE const *value) -{ - fputc (' ', file); - switch (type) - { - case ID: - fprintf (file, " = %s", value->symbol->tag); - break; - - case INT: - fprintf (file, " = %d", value->integer); - break; - - case STRING: - fprintf (file, " = \"%s\"", value->chars); - break; - - case TYPE: - fprintf (file, " = <%s>", value->uniqstr); - break; - - case BRACED_CODE: - case PERCENT_DESTRUCTOR: - case PERCENT_LEX_PARAM: - case PERCENT_PARSE_PARAM: - case PERCENT_PRINTER: - case PERCENT_UNION: - case PROLOGUE: - case EPILOGUE: - fprintf (file, " = {{ %s }}", value->chars); - break; - - default: - fprintf (file, "unknown token type"); - break; - } -} - static void gram_error (location const *loc, char const *msg) { @@ -2054,6 +2344,6 @@ gram_error (location const *loc, char const *msg) char const * token_name (int type) { - return yytname[type]; + return yytname[YYTRANSLATE (type)]; }