X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/886b69d1973c695205bb176e90d9f8e848edf535..6175ffe3211dad578ce6585584c4eb85cf891830:/src/parse-gram.c diff --git a/src/parse-gram.c b/src/parse-gram.c index ab24546e..c69b294c 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.75b. */ +/* A Bison parser, made by GNU Bison 1.875b. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 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 @@ -99,14 +99,13 @@ TYPE = 291, EQUAL = 292, SEMICOLON = 293, - COLON = 294, - COMMA = 295, - PIPE = 296, - ID = 297, - PERCENT_PERCENT = 298, - PROLOGUE = 299, - EPILOGUE = 300, - BRACED_CODE = 301 + PIPE = 294, + ID = 295, + ID_COLON = 296, + PERCENT_PERCENT = 297, + PROLOGUE = 298, + EPILOGUE = 299, + BRACED_CODE = 300 }; #endif #define GRAM_EOF 0 @@ -146,73 +145,57 @@ #define TYPE 291 #define EQUAL 292 #define SEMICOLON 293 -#define COLON 294 -#define COMMA 295 -#define PIPE 296 -#define ID 297 -#define PERCENT_PERCENT 298 -#define PROLOGUE 299 -#define EPILOGUE 300 -#define BRACED_CODE 301 +#define PIPE 294 +#define ID 295 +#define ID_COLON 296 +#define PERCENT_PERCENT 297 +#define PROLOGUE 298 +#define EPILOGUE 299 +#define BRACED_CODE 300 /* Copy the first part of user declarations. */ -#line 31 "parse-gram.y" +#line 32 "parse-gram.y" #include "system.h" + #include "complain.h" -#include "muscle_tab.h" +#include "conflicts.h" #include "files.h" #include "getargs.h" -#include "output.h" -#include "symlist.h" #include "gram.h" +#include "muscle_tab.h" +#include "output.h" #include "reader.h" -#include "conflicts.h" +#include "symlist.h" -/* Produce verbose parse errors. */ +/* Produce verbose syntax errors. */ #define YYERROR_VERBOSE 1 -#define YYLLOC_DEFAULT(Current, Rhs, N) \ -do { \ - if (N) \ - { \ - Current.first_column = Rhs[1].first_column; \ - Current.first_line = Rhs[1].first_line; \ - Current.last_column = Rhs[N].last_column; \ - Current.last_line = Rhs[N].last_line; \ - } \ - else \ - { \ - Current = Rhs[0]; \ - } \ -} while (0) -/* Pass the control structure to YYPARSE and YYLEX. */ -#define YYPARSE_PARAM gram_control -#define YYLEX_PARAM gram_control -/* YYPARSE receives GRAM_CONTROL as a void *. Provide a - correctly typed access to it. */ -#define yycontrol ((gram_control_t *) gram_control) +#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) +static YYLTYPE lloc_default (YYLTYPE const *, int); -/* Request detailed parse error messages, and pass them to GRAM_ERROR. - FIXME: depends on the undocumented availability of YYLLOC.t */ +/* Request detailed syntax error messages, and pass them to GRAM_ERROR. + FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror #define yyerror(Msg) \ gram_error (&yylloc, Msg) +static void gram_error (location const *, char const *); #define YYPRINT(File, Type, Value) \ - yyprint (File, Type, &Value) -static void yyprint (FILE *file, int type, const yystype *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; -struniq_t current_type = 0; -symbol_t *current_lhs; -location_t current_lhs_location; -assoc_t current_assoc; +uniqstr current_type = 0; +symbol *current_lhs; +location current_lhs_location; +assoc current_assoc; int current_prec = 0; -braced_code_t current_braced_code = action_braced_code; /* Enabling traces. */ @@ -228,39 +211,42 @@ braced_code_t current_braced_code = action_braced_code; # define YYERROR_VERBOSE 0 #endif -#ifndef YYSTYPE -#line 89 "parse-gram.y" -typedef union { - symbol_t *symbol; - symbol_list_t *list; +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#line 75 "parse-gram.y" +typedef union YYSTYPE { + symbol *symbol; + symbol_list *list; int integer; - char *string; - assoc_t assoc; - struniq_t struniq; -} yystype; -/* Line 195 of /usr/local/share/bison/yacc.c. */ -#line 242 "parse-gram.c" -# define YYSTYPE yystype + char *chars; + assoc assoc; + uniqstr uniqstr; +} YYSTYPE; +/* Line 191 of yacc.c. */ +#line 226 "parse-gram.c" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -#ifndef YYLTYPE -typedef struct yyltype +#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) +typedef struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} yyltype; -# define YYLTYPE yyltype +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif + /* Copy the second part of user declarations. */ -/* Line 215 of /usr/local/share/bison/yacc.c. */ -#line 263 "parse-gram.c" +/* Line 214 of yacc.c. */ +#line 250 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -307,13 +293,13 @@ union yyalloc }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) + + 2 * YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ @@ -327,7 +313,7 @@ union yyalloc { \ register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ + (To)[yyi] = (From)[yyi]; \ } \ while (0) # endif @@ -344,7 +330,7 @@ union yyalloc YYSIZE_T yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ while (0) @@ -360,24 +346,23 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 125 +#define YYLAST 157 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 47 +#define YYNTOKENS 46 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 28 +#define YYNNTS 25 /* YYNRULES -- Number of rules. */ -#define YYNRULES 76 +#define YYNRULES 74 /* YYNRULES -- Number of states. */ -#define YYNSTATES 115 +#define YYNSTATES 101 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 301 +#define YYMAXUTOK 300 #define YYTRANSLATE(YYX) \ - ((YYX <= 0) ? YYEOF : \ - (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ static const unsigned char yytranslate[] = @@ -412,7 +397,7 @@ static const unsigned char yytranslate[] = 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, 41, 42, 43, 44, - 45, 46 + 45 }; #if YYDEBUG @@ -420,53 +405,51 @@ static const unsigned char yytranslate[] = YYRHS. */ static const unsigned char yyprhs[] = { - 0, 0, 3, 8, 9, 13, 15, 17, 19, 23, - 25, 27, 30, 34, 36, 41, 43, 47, 49, 53, - 58, 60, 63, 65, 67, 69, 71, 73, 76, 79, - 80, 85, 86, 91, 92, 96, 97, 101, 105, 109, - 111, 113, 115, 116, 118, 120, 123, 125, 127, 130, - 133, 137, 139, 142, 144, 147, 149, 152, 155, 156, - 162, 164, 168, 169, 172, 175, 179, 183, 187, 189, - 191, 193, 195, 197, 198, 201, 202 + 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, + 24, 26, 29, 33, 35, 37, 39, 43, 45, 49, + 51, 53, 56, 58, 60, 62, 64, 66, 68, 71, + 73, 76, 79, 80, 84, 85, 89, 93, 97, 99, + 101, 103, 104, 106, 108, 111, 113, 115, 118, 121, + 125, 127, 130, 132, 135, 137, 139, 142, 144, 145, + 149, 151, 155, 156, 159, 162, 166, 170, 174, 176, + 178, 180, 182, 184, 185 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 48, 0, -1, 49, 43, 63, 73, -1, -1, 49, - 50, 74, -1, 51, -1, 44, -1, 17, -1, 18, - 72, 72, -1, 19, -1, 20, -1, 21, 4, -1, - 22, 37, 72, -1, 23, -1, 24, 72, 40, 72, - -1, 25, -1, 26, 37, 72, -1, 27, -1, 28, - 37, 72, -1, 29, 72, 40, 72, -1, 30, -1, - 31, 72, -1, 33, -1, 34, -1, 35, -1, 57, - -1, 54, -1, 32, 69, -1, 10, 46, -1, -1, - 8, 52, 46, 60, -1, -1, 9, 53, 46, 60, - -1, -1, 6, 55, 62, -1, -1, 5, 56, 62, - -1, 7, 36, 60, -1, 58, 59, 60, -1, 11, - -1, 12, -1, 13, -1, -1, 36, -1, 69, -1, - 60, 69, -1, 36, -1, 42, -1, 42, 4, -1, - 42, 71, -1, 42, 4, 71, -1, 61, -1, 62, - 61, -1, 64, -1, 63, 64, -1, 65, -1, 51, - 38, -1, 1, 38, -1, -1, 42, 39, 66, 67, - 38, -1, 68, -1, 67, 41, 68, -1, -1, 68, - 69, -1, 68, 70, -1, 68, 14, 69, -1, 68, - 15, 4, -1, 68, 16, 36, -1, 42, -1, 71, - -1, 46, -1, 3, -1, 3, -1, -1, 43, 45, - -1, -1, 38, -1 + 47, 0, -1, 48, 42, 60, 70, -1, -1, 48, + 49, -1, 50, -1, 43, -1, 17, -1, 18, 69, + 69, -1, 19, -1, 20, -1, 21, 4, -1, 22, + 37, 69, -1, 23, -1, 24, -1, 25, -1, 26, + 37, 69, -1, 27, -1, 28, 37, 69, -1, 29, + -1, 30, -1, 31, 69, -1, 33, -1, 34, -1, + 35, -1, 38, -1, 54, -1, 51, -1, 32, 66, + -1, 10, -1, 8, 57, -1, 9, 57, -1, -1, + 6, 52, 59, -1, -1, 5, 53, 59, -1, 7, + 36, 57, -1, 55, 56, 57, -1, 11, -1, 12, + -1, 13, -1, -1, 36, -1, 66, -1, 57, 66, + -1, 36, -1, 40, -1, 40, 4, -1, 40, 68, + -1, 40, 4, 68, -1, 58, -1, 59, 58, -1, + 61, -1, 60, 61, -1, 62, -1, 50, -1, 1, + 38, -1, 38, -1, -1, 41, 63, 64, -1, 65, + -1, 64, 39, 65, -1, -1, 65, 66, -1, 65, + 67, -1, 65, 14, 66, -1, 65, 15, 4, -1, + 65, 16, 36, -1, 40, -1, 68, -1, 45, -1, + 3, -1, 3, -1, -1, 42, 44, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short yyrline[] = { - 0, 170, 170, 182, 184, 187, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 199, 200, 201, 202, 203, - 205, 206, 207, 208, 209, 212, 214, 215, 219, 226, - 225, 236, 235, 248, 247, 253, 253, 258, 267, 282, - 284, 285, 288, 290, 295, 297, 301, 306, 311, 317, - 323, 333, 336, 345, 347, 353, 355, 360, 367, 366, - 371, 373, 376, 379, 381, 383, 385, 387, 391, 393, - 396, 402, 411, 419, 421, 428, 430 + 0, 161, 161, 169, 171, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 199, 200, 201, 205, + 211, 218, 228, 228, 233, 233, 238, 248, 263, 264, + 265, 269, 270, 276, 277, 282, 286, 291, 297, 303, + 314, 315, 324, 325, 331, 332, 337, 341, 345, 345, + 349, 350, 355, 356, 358, 360, 362, 364, 369, 370, + 374, 380, 389, 396, 398 }; #endif @@ -476,22 +459,22 @@ static const unsigned short yyrline[] = static const char *const yytname[] = { "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", - "\"%printer\"", "\"%union\"", "\"%left\"", "\"%right\"", + "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"", + "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", - "\"%file-prefix\"", "\"%glr-parser\"", "\"%lex-param\"", + "\"%file-prefix\"", "\"%glr-parser\"", "\"%lex-param {...}\"", "\"%locations\"", "\"%name-prefix\"", "\"%no-lines\"", "\"%output\"", - "\"%parse-param\"", "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", - "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", - "\";\"", "\":\"", "\",\"", "\"|\"", "\"identifier\"", "\"%%\"", - "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", "$accept", "input", - "declarations", "declaration", "grammar_declaration", "@1", "@2", - "symbol_declaration", "@3", "@4", "precedence_declaration", - "precedence_declarator", "type.opt", "symbols.1", "symbol_def", - "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", - "@5", "rhses.1", "rhs", "symbol", "action", "string_as_id", - "string_content", "epilogue.opt", "semi_colon.opt", 0 + "\"%parse-param {...}\"", "\"%pure-parser\"", "\"%skeleton\"", + "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", + "\"type\"", "\"=\"", "\";\"", "\"|\"", "\"identifier\"", + "\"identifier:\"", "\"%%\"", "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", + "$accept", "input", "declarations", "declaration", + "grammar_declaration", "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", + "symbol", "action", "string_as_id", "string_content", "epilogue.opt", 0 }; #endif @@ -504,34 +487,34 @@ static const unsigned short yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301 + 295, 296, 297, 298, 299, 300 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 47, 48, 49, 49, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 51, 51, 51, 51, 52, - 51, 53, 51, 55, 54, 56, 54, 54, 57, 58, - 58, 58, 59, 59, 60, 60, 61, 61, 61, 61, - 61, 62, 62, 63, 63, 64, 64, 64, 66, 65, - 67, 67, 68, 68, 68, 68, 68, 68, 69, 69, - 70, 71, 72, 73, 73, 74, 74 + 0, 46, 47, 48, 48, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, + 50, 50, 52, 51, 53, 51, 51, 54, 55, 55, + 55, 56, 56, 57, 57, 58, 58, 58, 58, 58, + 59, 59, 60, 60, 61, 61, 61, 61, 63, 62, + 64, 64, 65, 65, 65, 65, 65, 65, 66, 66, + 67, 68, 69, 70, 70 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { - 0, 2, 4, 0, 3, 1, 1, 1, 3, 1, - 1, 2, 3, 1, 4, 1, 3, 1, 3, 4, - 1, 2, 1, 1, 1, 1, 1, 2, 2, 0, - 4, 0, 4, 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, 5, + 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, + 1, 2, 3, 1, 1, 1, 3, 1, 3, 1, + 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, + 2, 2, 0, 3, 0, 3, 3, 3, 1, 1, + 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, + 1, 2, 1, 2, 1, 1, 2, 1, 0, 3, 1, 3, 0, 2, 2, 3, 3, 3, 1, 1, - 1, 1, 1, 0, 2, 0, 1 + 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -539,110 +522,113 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 35, 33, 0, 29, 31, 0, - 39, 40, 41, 7, 0, 9, 10, 0, 0, 13, - 0, 15, 0, 17, 0, 0, 20, 0, 0, 22, - 23, 24, 0, 6, 75, 5, 26, 25, 42, 0, - 0, 0, 0, 0, 28, 72, 0, 11, 0, 0, - 0, 0, 0, 21, 71, 68, 27, 69, 0, 0, - 0, 0, 53, 55, 76, 4, 43, 0, 46, 47, - 51, 36, 34, 37, 44, 0, 0, 8, 12, 0, - 16, 18, 0, 57, 58, 56, 0, 54, 2, 38, - 48, 49, 52, 45, 30, 32, 14, 19, 62, 74, - 50, 0, 60, 59, 62, 0, 0, 0, 70, 63, - 64, 61, 65, 66, 67 + 3, 0, 0, 1, 34, 32, 0, 0, 0, 29, + 38, 39, 40, 7, 0, 9, 10, 0, 0, 13, + 14, 15, 0, 17, 0, 19, 20, 0, 0, 22, + 23, 24, 25, 0, 6, 4, 5, 27, 26, 41, + 0, 0, 0, 71, 68, 30, 43, 69, 31, 72, + 0, 11, 0, 0, 0, 21, 28, 0, 57, 58, + 55, 0, 52, 54, 42, 0, 45, 46, 50, 35, + 33, 36, 44, 8, 12, 16, 18, 56, 62, 0, + 53, 2, 37, 47, 48, 51, 59, 60, 74, 49, + 62, 0, 0, 0, 70, 63, 64, 61, 65, 66, + 67 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 1, 2, 34, 60, 42, 43, 36, 40, 39, - 37, 38, 67, 73, 70, 71, 61, 62, 63, 98, - 101, 102, 74, 110, 57, 46, 88, 65 + -1, 1, 2, 35, 60, 37, 41, 40, 38, 39, + 65, 45, 68, 69, 61, 62, 63, 78, 86, 87, + 46, 96, 47, 50, 81 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -67 +#define YYPACT_NINF -65 static const yysigned_char yypact[] = { - -67, 7, 81, -67, -67, -67, -13, -67, -67, -16, - -67, -67, -67, -67, 32, -67, -67, 36, 20, -67, - 32, -67, 21, -67, 22, 32, -67, 32, -1, -67, - -67, -67, 43, -67, 24, -67, -67, -67, 28, -14, - -14, -1, 25, 26, -67, -67, 32, -67, 32, 30, - 32, 32, 33, -67, -67, -67, -67, -67, 38, 29, - 40, 4, -67, -67, -67, -67, -67, -1, -67, 16, - -67, -14, -14, -1, -67, -1, -1, -67, -67, 32, - -67, -67, 32, -67, -67, -67, 34, -67, -67, -1, - 77, -67, -67, -67, -1, -1, -67, -67, -67, -67, - -67, -20, 23, -67, -67, -1, 78, 45, -67, -67, - -67, 23, -67, -67, -67 + -65, 5, 114, -65, -65, -65, -24, 1, 1, -65, + -65, -65, -65, -65, 10, -65, -65, 11, -23, -65, + -65, -65, -21, -65, -15, -65, -65, 10, 1, -65, + -65, -65, -65, 77, -65, -65, -65, -65, -65, -13, + -34, -34, 1, -65, -65, 1, -65, -65, 1, -65, + 10, -65, 10, 10, 10, -65, -65, -17, -65, -65, + -65, 39, -65, -65, -65, 1, -65, 4, -65, -34, + -34, 1, -65, -65, -65, -65, -65, -65, -65, -20, + -65, -65, 1, 22, -65, -65, -12, 15, -65, -65, + -65, 1, 24, -10, -65, -65, -65, 15, -65, -65, + -65 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -67, -67, -67, -67, 82, -67, -67, -67, -67, -67, - -67, -67, -67, -42, -29, 55, -67, 35, -67, -67, - -67, -7, -28, -67, -66, -19, -67, -67 + -65, -65, -65, -65, 30, -65, -65, -65, -65, -65, + -65, -7, -60, -8, -65, -19, -65, -65, -65, -37, + -28, -65, -64, -16, -65 }; /* 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, parse error. */ + If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -74 static const yysigned_char yytable[] = { - 56, 49, 54, 91, -73, 58, 52, 3, 53, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 103, 54, - 90, 104, 68, 41, 100, 89, 54, 77, 69, 78, - 44, 80, 81, 94, 95, 45, 28, 105, 106, 107, - 47, 55, 92, 92, 58, 93, 59, 86, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 48, 50, 51, - 96, 93, 64, 97, 66, 55, 93, 93, 84, 108, - 79, 75, 76, 82, 109, 28, 83, 112, 85, 99, - 54, 114, 113, 109, 35, 59, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 72, 87, 111, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 0, 0, 0, - 0, 0, 0, 0, 32, 33 + 56, 48, 66, 84, 43, 3, 67, 43, 83, 85, + 85, 55, 42, 49, 52, 51, 53, 72, 43, 89, + 72, 77, 54, 64, 88, 43, 100, 90, 99, 91, + 92, 93, 36, 70, 73, 71, 74, 75, 76, -73, + 57, 44, 80, 72, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 97, 72, 44, 0, 0, 82, 95, + 94, 0, 0, 98, 0, 0, 0, 0, 0, 95, + 0, 28, 0, 0, 0, 0, 0, 58, 57, 0, + 59, 79, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, + 0, 0, 0, 0, 0, 58, 0, 0, 59, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 0, 0, 32, 0, 0, 0, 33, 34 }; static const yysigned_char yycheck[] = { - 28, 20, 3, 69, 0, 1, 25, 0, 27, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 38, 3, - 4, 41, 36, 36, 90, 67, 3, 46, 42, 48, - 46, 50, 51, 75, 76, 3, 32, 14, 15, 16, - 4, 42, 71, 72, 1, 73, 42, 43, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 37, 37, 37, - 79, 89, 38, 82, 36, 42, 94, 95, 39, 46, - 40, 46, 46, 40, 102, 32, 38, 105, 38, 45, - 3, 36, 4, 111, 2, 42, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 40, 61, 104, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, - -1, -1, -1, -1, 43, 44 + 28, 8, 36, 67, 3, 0, 40, 3, 4, 69, + 70, 27, 36, 3, 37, 4, 37, 45, 3, 83, + 48, 38, 37, 36, 44, 3, 36, 39, 4, 14, + 15, 16, 2, 41, 50, 42, 52, 53, 54, 0, + 1, 40, 61, 71, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 90, 82, 40, -1, -1, 65, 87, + 45, -1, -1, 91, -1, -1, -1, -1, -1, 97, + -1, 32, -1, -1, -1, -1, -1, 38, 1, -1, + 41, 42, 5, 6, 7, 8, 9, 10, 11, 12, + 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 32, + -1, -1, -1, -1, -1, 38, -1, -1, 41, 5, + 6, 7, 8, 9, 10, 11, 12, 13, -1, -1, + -1, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + -1, -1, 38, -1, -1, -1, 42, 43 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 48, 49, 0, 5, 6, 7, 8, 9, 10, + 0, 47, 48, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 43, 44, 50, 51, 54, 57, 58, 56, - 55, 36, 52, 53, 46, 3, 72, 4, 37, 72, - 37, 37, 72, 72, 3, 42, 69, 71, 1, 42, - 51, 63, 64, 65, 38, 74, 36, 59, 36, 42, - 61, 62, 62, 60, 69, 46, 46, 72, 72, 40, - 72, 72, 40, 38, 39, 38, 43, 64, 73, 60, - 4, 71, 61, 69, 60, 60, 72, 72, 66, 45, - 71, 67, 68, 38, 41, 14, 15, 16, 46, 69, - 70, 68, 69, 4, 36 + 34, 35, 38, 42, 43, 49, 50, 51, 54, 55, + 53, 52, 36, 3, 40, 57, 66, 68, 57, 3, + 69, 4, 37, 37, 37, 69, 66, 1, 38, 41, + 50, 60, 61, 62, 36, 56, 36, 40, 58, 59, + 59, 57, 66, 69, 69, 69, 69, 38, 63, 42, + 61, 70, 57, 4, 68, 58, 64, 65, 44, 68, + 39, 14, 15, 16, 45, 66, 67, 65, 66, 4, + 36 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -662,13 +648,20 @@ static const unsigned char yystos[] = #endif #define yyerrok (yyerrstatus = 0) -#define yyclearin (yytoken = YYEMPTY) -#define YYEMPTY -2 +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) #define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYERROR do \ + { \ + yylerrsp = yylsp; \ + *++yylerrsp = yyloc; \ + goto yyerrlab1; \ + } \ + while (0) + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. @@ -680,7 +673,7 @@ static const unsigned char yystos[] = #define YYBACKUP(Token, Value) \ do \ - if (yytoken == YYEMPTY && yylen == 1) \ + if (yychar == YYEMPTY && yylen == 1) \ { \ yychar = (Token); \ yylval = (Value); \ @@ -690,7 +683,7 @@ do \ } \ else \ { \ - yyerror ("syntax error: cannot back up"); \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ while (0) @@ -702,7 +695,7 @@ while (0) are run). */ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ +# 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; \ @@ -730,19 +723,93 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) + # define YYDSYMPRINT(Args) \ do { \ if (yydebug) \ yysymprint Args; \ } while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value, Location); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (cinluded). | +`------------------------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_stack_print (short *bottom, short *top) +#else +static void +yy_stack_print (bottom, top) + short *bottom; + short *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_reduce_print (int yyrule) +#else +static void +yy_reduce_print (yyrule) + int yyrule; +#endif +{ + int yyi; + unsigned int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + 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]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) # define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -821,17 +888,17 @@ yystpcpy (yydest, yysrc) #if YYDEBUG -/*-----------------------------. -| Print this symbol on YYOUT. | -`-----------------------------*/ +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ #if defined (__STDC__) || defined (__cplusplus) static void -yysymprint (FILE *yyout, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else static void -yysymprint (yyout, yytype, yyvaluep, yylocationp) - FILE *yyout; +yysymprint (yyoutput, yytype, yyvaluep, yylocationp) + FILE *yyoutput; int yytype; YYSTYPE *yyvaluep; YYLTYPE *yylocationp; @@ -843,23 +910,23 @@ yysymprint (yyout, yytype, yyvaluep, yylocationp) if (yytype < YYNTOKENS) { - YYFPRINTF (yyout, "token %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); # ifdef YYPRINT - YYPRINT (yyout, yytoknum[yytype], *yyvaluep); + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); # endif } else - YYFPRINTF (yyout, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); switch (yytype) { default: break; } - YYFPRINTF (yyout, ")"); + YYFPRINTF (yyoutput, ")"); } -#endif /* YYDEBUG. */ +#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -902,7 +969,7 @@ int yyparse (void); #else int yyparse (); #endif -#endif +#endif /* ! YYPARSE_PARAM */ @@ -937,7 +1004,7 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of parse errors so far. */ +/* Number of syntax errors so far. */ int yynerrs; /* Location data for the lookahead symbol. */ YYLTYPE yylloc; @@ -972,6 +1039,7 @@ YYLTYPE yylloc; YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; + YYLTYPE *yylerrsp; #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) @@ -991,7 +1059,7 @@ YYLTYPE yylloc; yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = yytoken = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack @@ -1101,25 +1169,22 @@ yybackup: /* Not known => get a lookahead token if don't already have one. */ - /* YYTOKEN is either YYEMPTY or YYEOF or a valid token. */ - if (yytoken == YYEMPTY) + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; - yytoken = YYTRANSLATE (yychar); } - if (yytoken == YYEOF) + if (yychar <= YYEOF) { + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - YYDPRINTF ((stderr, "Next token is ")); - YYDSYMPRINT ((stderr, yytoken, &yylval, &yyloc)); - YYDPRINTF ((stderr, "\n")); + yytoken = YYTRANSLATE (yychar); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1140,12 +1205,11 @@ yybackup: YYACCEPT; /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", - yytoken, yytname[yytoken])); + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ - if (yytoken != YYEOF) - yytoken = YYEMPTY; + if (yychar != YYEOF) + yychar = YYEMPTY; *++yyvsp = yylval; *++yylsp = yylloc; @@ -1188,215 +1252,180 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - int yyi; - - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn - 1, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif + YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: -#line 172 "parse-gram.y" - { - yycontrol->errcode = 0; - } - break; - - case 6: -#line 189 "parse-gram.y" - { prologue_augment (yyvsp[0].string, yylsp[0]); } + case 6: +#line 176 "parse-gram.y" + { prologue_augment (yyvsp[0].chars, yylsp[0]); } break; case 7: -#line 190 "parse-gram.y" +#line 177 "parse-gram.y" { debug_flag = 1; } break; case 8: -#line 191 "parse-gram.y" - { muscle_insert (yyvsp[-1].string, yyvsp[0].string); } +#line 178 "parse-gram.y" + { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } break; case 9: -#line 192 "parse-gram.y" +#line 179 "parse-gram.y" { defines_flag = 1; } break; case 10: -#line 193 "parse-gram.y" +#line 180 "parse-gram.y" { error_verbose = 1; } break; case 11: -#line 194 "parse-gram.y" +#line 181 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 195 "parse-gram.y" - { spec_file_prefix = yyvsp[0].string; } +#line 182 "parse-gram.y" + { spec_file_prefix = yyvsp[0].chars; } break; case 13: -#line 196 "parse-gram.y" +#line 183 "parse-gram.y" { glr_parser = 1; } break; case 14: -#line 198 "parse-gram.y" - { muscle_pair_list_grow ("lex_param", yyvsp[-2].string, yyvsp[0].string); } +#line 184 "parse-gram.y" + { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } break; case 15: -#line 199 "parse-gram.y" +#line 185 "parse-gram.y" { locations_flag = 1; } break; case 16: -#line 200 "parse-gram.y" - { spec_name_prefix = yyvsp[0].string; } +#line 186 "parse-gram.y" + { spec_name_prefix = yyvsp[0].chars; } break; case 17: -#line 201 "parse-gram.y" +#line 187 "parse-gram.y" { no_lines_flag = 1; } break; case 18: -#line 202 "parse-gram.y" - { spec_outfile = yyvsp[0].string; } +#line 188 "parse-gram.y" + { spec_outfile = yyvsp[0].chars; } break; case 19: -#line 204 "parse-gram.y" - { muscle_pair_list_grow ("parse_param", yyvsp[-2].string, yyvsp[0].string); } +#line 189 "parse-gram.y" + { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } break; case 20: -#line 205 "parse-gram.y" +#line 190 "parse-gram.y" { pure_parser = 1; } break; case 21: -#line 206 "parse-gram.y" - { skeleton = yyvsp[0].string; } +#line 191 "parse-gram.y" + { skeleton = yyvsp[0].chars; } break; case 22: -#line 207 "parse-gram.y" +#line 192 "parse-gram.y" { token_table_flag = 1; } break; case 23: -#line 208 "parse-gram.y" - { report_flag = 1; } +#line 193 "parse-gram.y" + { report_flag = report_states; } break; case 24: -#line 209 "parse-gram.y" +#line 194 "parse-gram.y" { yacc_flag = 1; } break; - case 27: -#line 216 "parse-gram.y" + case 28: +#line 202 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 28: -#line 220 "parse-gram.y" + case 29: +#line 206 "parse-gram.y" { typed = 1; - MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line); - muscle_insert ("stype", yyvsp[0].string); + MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); + muscle_insert ("stype", yyvsp[0].chars); } break; - case 29: -#line 226 "parse-gram.y" - { current_braced_code = destructor_braced_code; } - break; - case 30: -#line 228 "parse-gram.y" +#line 212 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]); + symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]); symbol_list_free (yyvsp[0].list); - current_braced_code = action_braced_code; } break; case 31: -#line 236 "parse-gram.y" - { current_braced_code = printer_braced_code; } - break; - - case 32: -#line 238 "parse-gram.y" +#line 219 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_printer_set (list->sym, yyvsp[-1].string, list->location); + symbol_printer_set (list->sym, yyvsp[-1].chars, list->location); symbol_list_free (yyvsp[0].list); - current_braced_code = action_braced_code; } break; - case 33: -#line 248 "parse-gram.y" + case 32: +#line 228 "parse-gram.y" { current_class = nterm_sym; } break; - case 34: -#line 249 "parse-gram.y" + case 33: +#line 229 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 35: -#line 253 "parse-gram.y" + case 34: +#line 233 "parse-gram.y" { current_class = token_sym; } break; - case 36: -#line 254 "parse-gram.y" + case 35: +#line 234 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 37: -#line 259 "parse-gram.y" + case 36: +#line 239 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, yyvsp[-1].struniq, yylsp[-1]); + symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]); symbol_list_free (yyvsp[0].list); } break; - case 38: -#line 269 "parse-gram.y" + case 37: +#line 249 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; ++current_prec; for (list = yyvsp[0].list; list; list = list->next) { @@ -1408,58 +1437,58 @@ yyreduce: } break; - case 39: -#line 283 "parse-gram.y" + case 38: +#line 263 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 40: -#line 284 "parse-gram.y" + case 39: +#line 264 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 41: -#line 285 "parse-gram.y" + case 40: +#line 265 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 42: -#line 289 "parse-gram.y" + case 41: +#line 269 "parse-gram.y" { current_type = NULL; } break; - case 43: -#line 290 "parse-gram.y" - { current_type = yyvsp[0].struniq; } + case 42: +#line 270 "parse-gram.y" + { current_type = yyvsp[0].uniqstr; } break; - case 44: -#line 296 "parse-gram.y" + case 43: +#line 276 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 45: -#line 297 "parse-gram.y" + case 44: +#line 277 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 46: -#line 303 "parse-gram.y" + case 45: +#line 283 "parse-gram.y" { - current_type = yyvsp[0].struniq; + current_type = yyvsp[0].uniqstr; } break; - case 47: -#line 307 "parse-gram.y" + case 46: +#line 287 "parse-gram.y" { symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); } break; - case 48: -#line 312 "parse-gram.y" + case 47: +#line 292 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1467,8 +1496,8 @@ yyreduce: } break; - case 49: -#line 318 "parse-gram.y" + case 48: +#line 298 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1476,8 +1505,8 @@ yyreduce: } break; - case 50: -#line 324 "parse-gram.y" + case 49: +#line 304 "parse-gram.y" { symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); @@ -1486,116 +1515,101 @@ yyreduce: } break; - case 51: -#line 335 "parse-gram.y" - {;} - break; - - case 52: -#line 337 "parse-gram.y" - {;} - break; - - case 56: -#line 356 "parse-gram.y" + case 55: +#line 333 "parse-gram.y" { if (yacc_flag) complain_at (yyloc, _("POSIX forbids declarations in the grammar")); } break; - case 57: -#line 361 "parse-gram.y" + case 56: +#line 338 "parse-gram.y" { yyerrok; } break; case 58: -#line 367 "parse-gram.y" - { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; } - break; - - case 59: -#line 368 "parse-gram.y" - {;} +#line 345 "parse-gram.y" + { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } break; case 60: -#line 372 "parse-gram.y" +#line 349 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; case 61: -#line 373 "parse-gram.y" +#line 350 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; case 62: -#line 378 "parse-gram.y" +#line 355 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; case 63: -#line 380 "parse-gram.y" +#line 357 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; case 64: -#line 382 "parse-gram.y" - { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); } +#line 359 "parse-gram.y" + { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } break; case 65: -#line 384 "parse-gram.y" +#line 361 "parse-gram.y" { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; case 66: -#line 386 "parse-gram.y" +#line 363 "parse-gram.y" { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } break; case 67: -#line 388 "parse-gram.y" - { grammar_current_rule_merge_set (yyvsp[0].struniq, yylsp[0]); } +#line 365 "parse-gram.y" + { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } break; case 68: -#line 392 "parse-gram.y" +#line 369 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; case 69: -#line 393 "parse-gram.y" +#line 370 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; case 70: -#line 398 "parse-gram.y" - { yyval.string = yyvsp[0].string; } +#line 375 "parse-gram.y" + { yyval.chars = yyvsp[0].chars; } break; case 71: -#line 404 "parse-gram.y" +#line 381 "parse-gram.y" { - yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); + yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; case 72: -#line 413 "parse-gram.y" +#line 390 "parse-gram.y" { - yyval.string = yyvsp[0].string + 1; - yyval.string[strlen (yyval.string) - 1] = '\0'; + yyval.chars = yyvsp[0].chars + 1; + yyval.chars[strlen (yyval.chars) - 1] = '\0'; } break; case 74: -#line 422 "parse-gram.y" +#line 399 "parse-gram.y" { - epilogue_augment (yyvsp[0].string, yylsp[0]); + epilogue_augment (yyvsp[0].chars, yylsp[0]); scanner_last_string_free (); } break; @@ -1603,23 +1617,14 @@ yyreduce: } -/* Line 950 of /usr/local/share/bison/yacc.c. */ -#line 1607 "parse-gram.c" +/* Line 999 of yacc.c. */ +#line 1622 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; yylsp -= yylen; -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; *++yylsp = yyloc; @@ -1654,88 +1659,98 @@ yyerrlab: { YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); + const char* yyprefix; char *yymsg; - int yyx, yycount; + int yyx; - yycount = 0; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + 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) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[yytype]); + { + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } + } + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); yyp = yystpcpy (yyp, yytname[yytype]); if (yycount < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yyprefix); yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + yyprefix = " or "; } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - yyerror ("parse error; also virtual memory exhausted"); + yyerror ("syntax error; also virtual memory exhausted"); } else #endif /* YYERROR_VERBOSE */ - yyerror ("parse error"); + yyerror ("syntax error"); } - goto yyerrlab1; + yylerrsp = yylsp; -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ /* Return failure if at end of input. */ - if (yytoken == YYEOF) + if (yychar == YYEOF) { /* Pop the error token. */ YYPOPSTACK; /* Pop the rest of the stack. */ while (yyss < yyssp) { - YYDPRINTF ((stderr, "Error: popping ")); - YYDSYMPRINT ((stderr, - yystos[*yyssp], - yyvsp, yylsp)); - YYDPRINTF ((stderr, "\n")); + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); yydestruct (yystos[*yyssp], yyvsp, yylsp); YYPOPSTACK; } YYABORT; } - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yytoken, yytname[yytoken])); + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); yydestruct (yytoken, &yylval, &yylloc); - yytoken = YYEMPTY; + yychar = YYEMPTY; + *++yylerrsp = yylloc; } /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab1; + +/*----------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action. | +`----------------------------------------------------*/ +yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -1756,26 +1771,12 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDPRINTF ((stderr, "Error: popping ")); - YYDSYMPRINT ((stderr, - yystos[*yyssp], yyvsp, yylsp)); - YYDPRINTF ((stderr, "\n")); - + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); yydestruct (yystos[yystate], yyvsp, yylsp); yyvsp--; yystate = *--yyssp; yylsp--; - -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) @@ -1784,7 +1785,8 @@ yyerrlab1: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; - *++yylsp = yylloc; + YYLLOC_DEFAULT (yyloc, yylsp, (yylerrsp - yylsp)); + *++yylsp = yyloc; yystate = yyn; goto yynewstate; @@ -1823,15 +1825,87 @@ yyreturn: } -#line 432 "parse-gram.y" +#line 405 "parse-gram.y" + -/*------------------------------------------------------------------. -| When debugging the parser, display tokens' locations and values. | -`------------------------------------------------------------------*/ + +/* Return the location of the left-hand side of a rule whose + right-hand side is RHS[1] ... RHS[N]. Ignore empty nonterminals in + the right-hand side, and return an empty location equal to the end + boundary of RHS[0] if the right-hand side is empty. */ + +static YYLTYPE +lloc_default (YYLTYPE const *rhs, int n) +{ + int i; + YYLTYPE loc; + loc.start = 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, + since empty nonterminals have the same end as their predecessors. */ + for (i = 1; i <= n; i++) + if (! equal_boundaries (rhs[i].start, rhs[i].end)) + { + loc.start = rhs[i].start; + break; + } + + return loc; +} + + +/* Add a lex-param or a parse-param (depending on TYPE) with + declaration DECL and location LOC. */ + +static void +add_param (char const *type, char *decl, location loc) +{ + static char const alphanum[] = + "0123456789" + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "_"; + char const *alpha = alphanum + 10; + char const *name_start = NULL; + char *p; + + for (p = decl; *p; p++) + if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) + name_start = p; + + /* Strip the surrounding '{' and '}'. */ + decl++; + p[-1] = '\0'; + + if (! name_start) + complain_at (loc, _("missing identifier in parameter declaration")); + else + { + char *name; + size_t name_len; + + for (name_len = 1; + name_start[name_len] && strchr (alphanum, name_start[name_len]); + name_len++) + continue; + + name = xmalloc (name_len + 1); + memcpy (name, name_start, name_len); + name[name_len] = '\0'; + muscle_pair_list_grow (type, decl, name); + free (name); + } + + scanner_last_string_free (); +} + +/*----------------------------------------------------. +| When debugging the parser, display tokens' values. | +`----------------------------------------------------*/ static void -yyprint (FILE *file, - int type, const yystype *value) +print_token_value (FILE *file, int type, YYSTYPE const *value) { fputc (' ', file); switch (type) @@ -1845,17 +1919,22 @@ yyprint (FILE *file, break; case STRING: - fprintf (file, " = \"%s\"", value->string); + fprintf (file, " = \"%s\"", value->chars); break; case TYPE: - fprintf (file, " = <%s>", value->struniq); + 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->string); + fprintf (file, " = {{ %s }}", value->chars); break; default: @@ -1864,9 +1943,15 @@ yyprint (FILE *file, } } -void -gram_error (location_t *yylloc, const char *msg) +static void +gram_error (location const *loc, char const *msg) +{ + complain_at (*loc, "%s", msg); +} + +char const * +token_name (int type) { - complain_at (*yylloc, "%s", msg); + return yytname[type]; }