From 4cdb01db9b73ce7678584e70f41d6adb3c53fcd7 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 11 Jun 2002 21:45:49 +0000 Subject: [PATCH] * src/scan-gram.l (YY_OBS_FINISH): Don't set yylval. Adjust all callers. (scanner_last_string_free): New. --- ChangeLog | 7 + src/parse-gram.c | 1386 ++++++++++++++++++++-------------------------- src/parse-gram.h | 140 ++--- src/parse-gram.y | 12 +- src/reader.h | 2 + src/scan-gram.c | 266 +++++---- src/scan-gram.l | 37 +- 7 files changed, 849 insertions(+), 1001 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55c0844e..4a4a1542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-06-11 Akim Demaille + + * src/scan-gram.l (YY_OBS_FINISH): Don't set yylval. + Adjust all callers. + (scanner_last_string_free): New. + + 2002-06-11 Akim Demaille * src/scan-gram.l (YY_INIT, YY_GROW, YY_FINISH): Rename as... diff --git a/src/parse-gram.c b/src/parse-gram.c index efb6d0b8..0c046a2c 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,66 +1,56 @@ /* A Bison parser, made from parse-gram.y - by GNU bison 1.49b. */ + by GNU bison 1.35. */ -/* Skeleton output parser for Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - 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. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ +#define YYBISON 1 /* Identify Bison output. */ -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the original so - called ``semantic'' parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Pure parsers. */ -#define YYPURE 1 - -/* Using locations. */ -#define YYLSP_NEEDED 1 - -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ #define yyparse gram_parse -#define yylex gram_lex +#define yylex gram_lex #define yyerror gram_error -#define yylval gram_lval -#define yychar gram_char +#define yylval gram_lval +#define yychar gram_char #define yydebug gram_debug #define yynerrs gram_nerrs -#if YYLSP_NEEDED -# define yylloc gram_lloc -#endif +#define YYLSP_NEEDED 1 +# define GRAM_EOF 0 +# define STRING 257 +# define CHARACTER 258 +# define INT 259 +# define PERCENT_TOKEN 260 +# define PERCENT_NTERM 261 +# define PERCENT_TYPE 262 +# define PERCENT_UNION 263 +# define PERCENT_EXPECT 264 +# define PERCENT_START 265 +# define PERCENT_LEFT 266 +# define PERCENT_RIGHT 267 +# define PERCENT_NONASSOC 268 +# define PERCENT_PREC 269 +# define PERCENT_VERBOSE 270 +# define PERCENT_ERROR_VERBOSE 271 +# define PERCENT_OUTPUT 272 +# define PERCENT_FILE_PREFIX 273 +# define PERCENT_NAME_PREFIX 274 +# define PERCENT_DEFINE 275 +# define PERCENT_PURE_PARSER 276 +# define PERCENT_DEFINES 277 +# define PERCENT_YACC 278 +# define PERCENT_DEBUG 279 +# define PERCENT_LOCATIONS 280 +# define PERCENT_NO_LINES 281 +# define PERCENT_SKELETON 282 +# define PERCENT_TOKEN_TABLE 283 +# define TYPE 284 +# define EQUAL 285 +# define SEMICOLON 286 +# define COLON 287 +# define PIPE 288 +# define ID 289 +# define PERCENT_PERCENT 290 +# define PROLOGUE 291 +# define EPILOGUE 292 +# define BRACED_CODE 293 -/* Copy the first part of user declarations. */ #line 31 "parse-gram.y" #include "system.h" @@ -72,6 +62,8 @@ #include "reader.h" #include "conflicts.h" +#define YYERROR_VERBOSE 1 + /* Pass the control structure to YYPARSE and YYLEX. */ #define YYPARSE_PARAM gram_control #define YYLEX_PARAM gram_control @@ -98,22 +90,8 @@ symbol_t *current_lhs; associativity current_assoc; int current_prec = 0; - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - +#line 72 "parse-gram.y" #ifndef YYSTYPE -#line 70 "parse-gram.y" typedef union { symbol_t *symbol; @@ -130,20 +108,282 @@ typedef struct yyltype { int first_line; int first_column; + int last_line; int last_column; } yyltype; + # define YYLTYPE yyltype # define YYLTYPE_IS_TRIVIAL 1 #endif -/* Copy the second part of user declarations. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif + + + +#define YYFINAL 94 +#define YYFLAG -32768 +#define YYNTBASE 41 + +/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ +#define YYTRANSLATE(x) ((unsigned)(x) <= 293 ? yytranslate[x] : 68) + +/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ +static const char yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40 +}; + +#if YYDEBUG +static const short yyprhs[] = +{ + 0, 0, 1, 7, 8, 11, 13, 15, 17, 21, + 23, 25, 28, 32, 34, 38, 40, 44, 46, 49, + 51, 53, 55, 57, 58, 62, 65, 66, 70, 71, + 76, 80, 81, 86, 88, 90, 92, 93, 95, 97, + 100, 102, 105, 107, 109, 112, 115, 119, 121, 124, + 126, 129, 130, 136, 138, 142, 143, 146, 149, 153, + 155, 157, 159, 161, 163, 165, 166, 169, 170 +}; +static const short yyrhs[] = +{ + -1, 42, 43, 37, 57, 66, 0, 0, 43, 44, + 0, 45, 0, 38, 0, 26, 0, 22, 65, 65, + 0, 24, 0, 18, 0, 11, 6, 0, 20, 32, + 65, 0, 27, 0, 21, 32, 65, 0, 28, 0, + 19, 32, 65, 0, 23, 0, 29, 65, 0, 30, + 0, 17, 0, 25, 0, 49, 0, 0, 8, 46, + 56, 0, 12, 62, 0, 0, 7, 47, 56, 0, + 0, 9, 31, 48, 53, 0, 10, 40, 67, 0, + 0, 51, 52, 50, 54, 0, 13, 0, 14, 0, + 15, 0, 0, 31, 0, 36, 0, 53, 36, 0, + 62, 0, 54, 62, 0, 31, 0, 36, 0, 36, + 6, 0, 36, 64, 0, 36, 6, 64, 0, 55, + 0, 56, 55, 0, 58, 0, 57, 58, 0, 0, + 36, 34, 59, 60, 33, 0, 61, 0, 60, 35, + 61, 0, 0, 61, 62, 0, 61, 63, 0, 61, + 16, 62, 0, 36, 0, 64, 0, 5, 0, 40, + 0, 4, 0, 4, 0, 0, 37, 39, 0, 0, + 33, 0 +}; + +#endif + +#if YYDEBUG +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const short yyrline[] = +{ + 0, 131, 131, 139, 141, 144, 146, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, + 163, 164, 167, 169, 169, 174, 178, 178, 183, 183, + 187, 195, 195, 202, 204, 205, 208, 210, 214, 216, + 220, 226, 235, 240, 245, 251, 257, 267, 270, 274, + 276, 279, 279, 284, 286, 289, 292, 294, 296, 300, + 302, 303, 306, 312, 321, 329, 334, 340, 342 +}; +#endif + + +#if (YYDEBUG) || defined YYERROR_VERBOSE + +/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ +static const char *const yytname[] = +{ + "$", "error", "$undefined.", "\"end of string\"", "STRING", "CHARACTER", + "INT", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%union\"", + "\"%expect\"", "\"%start\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", + "\"%prec\"", "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", + "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", + "\"%pure-parser\"", "\"%defines\"", "\"%yacc\"", "\"%debug\"", + "\"%locations\"", "\"%no-lines\"", "\"%skeleton\"", "\"%token-table\"", + "TYPE", "\"=\"", "\";\"", "\":\"", "\"|\"", "\"identifier\"", "\"%%\"", + "PROLOGUE", "EPILOGUE", "BRACED_CODE", "input", "@1", "directives", + "directive", "grammar_directives", "@2", "@3", "@4", + "precedence_directives", "@5", "precedence_directive", "type.opt", + "nterms_to_type.1", "terms_to_prec.1", "symbol_def", "symbol_defs.1", + "gram", "rules", "@6", "rhses.1", "rhs", "symbol", "action", + "string_as_id", "string_content", "epilogue.opt", "semi_colon_opt", 0 +}; +#endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const short yyr1[] = +{ + 0, 42, 41, 43, 43, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 45, 46, 45, 45, 47, 45, 48, 45, + 45, 50, 49, 51, 51, 51, 52, 52, 53, 53, + 54, 54, 55, 55, 55, 55, 55, 56, 56, 57, + 57, 59, 58, 60, 60, 61, 61, 61, 61, 62, + 62, 62, 63, 64, 65, 66, 66, 67, 67 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const short yyr2[] = +{ + 0, 0, 5, 0, 2, 1, 1, 1, 3, 1, + 1, 2, 3, 1, 3, 1, 3, 1, 2, 1, + 1, 1, 1, 0, 3, 2, 0, 3, 0, 4, + 3, 0, 4, 1, 1, 1, 0, 1, 1, 2, + 1, 2, 1, 1, 2, 2, 3, 1, 2, 1, + 2, 0, 5, 1, 3, 0, 2, 2, 3, 1, + 1, 1, 1, 1, 1, 0, 2, 0, 1 +}; + +/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE + doesn't specify something else to do. Zero means the default is an + error. */ +static const short yydefact[] = +{ + 1, 3, 0, 26, 23, 0, 0, 0, 0, 33, + 34, 35, 20, 10, 0, 0, 0, 0, 17, 9, + 21, 7, 13, 15, 0, 19, 0, 6, 4, 5, + 22, 36, 0, 0, 28, 67, 11, 63, 61, 59, + 25, 60, 0, 0, 0, 64, 0, 18, 0, 65, + 49, 37, 31, 42, 43, 47, 27, 24, 0, 68, + 30, 16, 12, 14, 8, 51, 0, 50, 2, 0, + 44, 45, 48, 38, 29, 55, 66, 32, 40, 46, + 39, 0, 53, 41, 52, 55, 0, 62, 56, 57, + 54, 58, 0, 0, 0 +}; + +static const short yydefgoto[] = +{ + 92, 1, 2, 28, 29, 33, 32, 58, 30, 69, + 31, 52, 74, 77, 55, 56, 49, 50, 75, 81, + 82, 88, 89, 41, 46, 68, 60 +}; + +static const short yypact[] = +{ + -32768,-32768, 72,-32768,-32768, -22, -29, 8, -1,-32768, + -32768,-32768,-32768,-32768, -16, -14, -11, 22,-32768,-32768, + -32768,-32768,-32768,-32768, 22,-32768, -6,-32768,-32768,-32768, + -32768, 0, -24, -24,-32768, 1,-32768,-32768,-32768,-32768, + -32768,-32768, 22, 22, 22,-32768, 22,-32768, -2, -17, + -32768,-32768,-32768,-32768, 4,-32768, -24, -24, 2,-32768, + -32768,-32768,-32768,-32768,-32768,-32768, 3,-32768,-32768, -1, + 32,-32768,-32768,-32768, 5,-32768,-32768, -1,-32768,-32768, + -32768, -18, -3,-32768,-32768,-32768, -1,-32768,-32768,-32768, + -3,-32768, 39, 40,-32768 +}; + +static const short yypgoto[] = +{ + -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768, -28, 10,-32768, -5,-32768,-32768, + -40, -8,-32768, -48, -19,-32768,-32768 +}; + + +#define YYLAST 110 -/* Line 215 of /usr/local/share/bison/bison.simple. */ -#line 145 "parse-gram.c" +static const short yytable[] = +{ + 40, 37, 38, 37, 38, 47, 71, 53, 37, 34, + 70, 35, 54, 86, 36, 84, 42, 85, 43, 48, + 66, 44, 79, 61, 62, 63, 45, 64, 72, 72, + 48, 51, 65, 39, 59, 39, 37, 87, 73, 93, + 94, 80, 76, 57, 67, 90, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 78, 0, 0, 0, 0, 0, 0, 0, 83, + 0, 0, 0, 0, 0, 0, 0, 0, 91, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 0, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, + 27 +}; + +static const short yycheck[] = +{ + 8, 4, 5, 4, 5, 24, 54, 31, 4, 31, + 6, 40, 36, 16, 6, 33, 32, 35, 32, 36, + 37, 32, 70, 42, 43, 44, 4, 46, 56, 57, + 36, 31, 34, 36, 33, 36, 4, 40, 36, 0, + 0, 36, 39, 33, 49, 85, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 69, -1, -1, -1, -1, -1, -1, -1, 77, + -1, -1, -1, -1, -1, -1, -1, -1, 86, 7, + 8, 9, 10, 11, 12, 13, 14, 15, -1, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, -1, -1, -1, -1, -1, -1, 37, + 38 +}; +#define YYPURE 1 + +/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ +#line 3 "/usr/share/bison/bison.simple" + +/* Skeleton output parser for bison, + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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. */ + +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +/* This is the parser code that is written into each bison parser when + the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -172,7 +412,7 @@ typedef struct yyltype # define YYSTACK_ALLOC malloc # define YYSTACK_FREE free # endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ +#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ #if (! defined (yyoverflow) \ @@ -216,7 +456,7 @@ union yyalloc { \ register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ + (To)[yyi] = (From)[yyi]; \ } \ while (0) # endif @@ -240,361 +480,6 @@ union yyalloc #endif -/* Tokens. */ -#ifndef YYTOKENTYPE -# if defined (__STDC__) || defined (__cplusplus) - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - GRAM_EOF = 0, - STRING = 258, - CHARACTER = 259, - INT = 260, - PERCENT_TOKEN = 261, - PERCENT_NTERM = 262, - PERCENT_TYPE = 263, - PERCENT_UNION = 264, - PERCENT_EXPECT = 265, - PERCENT_START = 266, - PERCENT_LEFT = 267, - PERCENT_RIGHT = 268, - PERCENT_NONASSOC = 269, - PERCENT_PREC = 270, - PERCENT_VERBOSE = 271, - PERCENT_ERROR_VERBOSE = 272, - PERCENT_OUTPUT = 273, - PERCENT_FILE_PREFIX = 274, - PERCENT_NAME_PREFIX = 275, - PERCENT_DEFINE = 276, - PERCENT_PURE_PARSER = 277, - PERCENT_DEFINES = 278, - PERCENT_YACC = 279, - PERCENT_DEBUG = 280, - PERCENT_LOCATIONS = 281, - PERCENT_NO_LINES = 282, - PERCENT_SKELETON = 283, - PERCENT_TOKEN_TABLE = 284, - TYPE = 285, - EQUAL = 286, - SEMICOLON = 287, - COLON = 288, - PIPE = 289, - ID = 290, - PERCENT_PERCENT = 291, - PROLOGUE = 292, - EPILOGUE = 293, - BRACED_CODE = 294 - }; -# endif - /* POSIX requires `int' for tokens in interfaces. */ -# define YYTOKENTYPE int -#endif /* !YYTOKENTYPE */ -#define GRAM_EOF 0 -#define STRING 258 -#define CHARACTER 259 -#define INT 260 -#define PERCENT_TOKEN 261 -#define PERCENT_NTERM 262 -#define PERCENT_TYPE 263 -#define PERCENT_UNION 264 -#define PERCENT_EXPECT 265 -#define PERCENT_START 266 -#define PERCENT_LEFT 267 -#define PERCENT_RIGHT 268 -#define PERCENT_NONASSOC 269 -#define PERCENT_PREC 270 -#define PERCENT_VERBOSE 271 -#define PERCENT_ERROR_VERBOSE 272 -#define PERCENT_OUTPUT 273 -#define PERCENT_FILE_PREFIX 274 -#define PERCENT_NAME_PREFIX 275 -#define PERCENT_DEFINE 276 -#define PERCENT_PURE_PARSER 277 -#define PERCENT_DEFINES 278 -#define PERCENT_YACC 279 -#define PERCENT_DEBUG 280 -#define PERCENT_LOCATIONS 281 -#define PERCENT_NO_LINES 282 -#define PERCENT_SKELETON 283 -#define PERCENT_TOKEN_TABLE 284 -#define TYPE 285 -#define EQUAL 286 -#define SEMICOLON 287 -#define COLON 288 -#define PIPE 289 -#define ID 290 -#define PERCENT_PERCENT 291 -#define PROLOGUE 292 -#define EPILOGUE 293 -#define BRACED_CODE 294 - - - - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 3 -#define YYFLAG -32768 -#define YYLAST 110 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 40 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 28 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 69 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 94 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 294 - -#define YYTRANSLATE(X) \ - ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const unsigned char yyprhs[] = -{ - 0, 0, 3, 4, 10, 11, 14, 16, 18, 20, - 24, 26, 28, 31, 35, 37, 41, 43, 47, 49, - 52, 54, 56, 58, 60, 61, 65, 68, 69, 73, - 74, 79, 83, 84, 89, 91, 93, 95, 96, 98, - 100, 103, 105, 108, 110, 112, 115, 118, 122, 124, - 127, 129, 132, 133, 139, 141, 145, 146, 149, 152, - 156, 158, 160, 162, 164, 166, 168, 169, 172, 173 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const signed char yyrhs[] = -{ - 41, 0, -1, -1, 42, 43, 36, 57, 66, -1, - -1, 43, 44, -1, 45, -1, 37, -1, 25, -1, - 21, 65, 65, -1, 23, -1, 17, -1, 10, 5, - -1, 19, 31, 65, -1, 26, -1, 20, 31, 65, - -1, 27, -1, 18, 31, 65, -1, 22, -1, 28, - 65, -1, 29, -1, 16, -1, 24, -1, 49, -1, - -1, 7, 46, 56, -1, 11, 62, -1, -1, 6, - 47, 56, -1, -1, 8, 30, 48, 53, -1, 9, - 39, 67, -1, -1, 51, 52, 50, 54, -1, 12, - -1, 13, -1, 14, -1, -1, 30, -1, 35, -1, - 53, 35, -1, 62, -1, 54, 62, -1, 30, -1, - 35, -1, 35, 5, -1, 35, 64, -1, 35, 5, - 64, -1, 55, -1, 56, 55, -1, 58, -1, 57, - 58, -1, -1, 35, 33, 59, 60, 32, -1, 61, - -1, 60, 34, 61, -1, -1, 61, 62, -1, 61, - 63, -1, 61, 15, 62, -1, 35, -1, 64, -1, - 4, -1, 39, -1, 3, -1, 3, -1, -1, 36, - 38, -1, -1, 32, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = -{ - 0, 128, 128, 128, 136, 138, 141, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 161, 163, 163, 168, 172, 172, 177, - 177, 181, 189, 189, 196, 198, 199, 202, 204, 208, - 210, 214, 220, 229, 234, 239, 245, 251, 261, 264, - 268, 270, 273, 273, 278, 280, 283, 286, 288, 290, - 294, 296, 297, 300, 306, 315, 323, 328, 334, 336 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "\"end of string\"", "error", "$undefined.", "STRING", "CHARACTER", "INT", - "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%union\"", "\"%expect\"", - "\"%start\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"", - "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", "\"%file-prefix\"", - "\"%name-prefix\"", "\"%define\"", "\"%pure-parser\"", "\"%defines\"", - "\"%yacc\"", "\"%debug\"", "\"%locations\"", "\"%no-lines\"", - "\"%skeleton\"", "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", - "\"|\"", "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", - "BRACED_CODE", "$axiom", "input", "@1", "directives", "directive", - "grammar_directives", "@2", "@3", "@4", "precedence_directives", "@5", - "precedence_directive", "type.opt", "nterms_to_type.1", - "terms_to_prec.1", "symbol_def", "symbol_defs.1", "gram", "rules", "@6", - "rhses.1", "rhs", "symbol", "action", "string_as_id", "string_content", - "epilogue.opt", "semi_colon_opt", 0 -}; -#endif - -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const short yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 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, - -1 -}; - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const unsigned char yyr1[] = -{ - 0, 40, 42, 41, 43, 43, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 45, 46, 45, 45, 47, 45, 48, - 45, 45, 50, 49, 51, 51, 51, 52, 52, 53, - 53, 54, 54, 55, 55, 55, 55, 55, 56, 56, - 57, 57, 59, 58, 60, 60, 61, 61, 61, 61, - 62, 62, 62, 63, 64, 65, 66, 66, 67, 67 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const unsigned char yyr2[] = -{ - 0, 2, 0, 5, 0, 2, 1, 1, 1, 3, - 1, 1, 2, 3, 1, 3, 1, 3, 1, 2, - 1, 1, 1, 1, 0, 3, 2, 0, 3, 0, - 4, 3, 0, 4, 1, 1, 1, 0, 1, 1, - 2, 1, 2, 1, 1, 2, 2, 3, 1, 2, - 1, 2, 0, 5, 1, 3, 0, 2, 2, 3, - 1, 1, 1, 1, 1, 1, 0, 2, 0, 1 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const short yydefact[] = -{ - 2, 0, 4, 0, 0, 27, 24, 0, 0, 0, - 0, 34, 35, 36, 21, 11, 0, 0, 0, 0, - 18, 10, 22, 8, 14, 16, 0, 20, 0, 7, - 5, 6, 23, 37, 0, 0, 29, 68, 12, 64, - 62, 60, 26, 61, 0, 0, 0, 65, 0, 19, - 0, 66, 50, 38, 32, 43, 44, 48, 28, 25, - 0, 69, 31, 17, 13, 15, 9, 52, 0, 51, - 3, 0, 45, 46, 49, 39, 30, 56, 67, 33, - 41, 47, 40, 0, 54, 42, 53, 56, 0, 63, - 57, 58, 55, 59 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = -{ - -1, 1, 2, 4, 30, 31, 35, 34, 60, 32, - 71, 33, 54, 76, 79, 57, 58, 51, 52, 77, - 83, 84, 90, 91, 43, 48, 70, 62 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const short yypact[] = -{ - -32768, 9,-32768,-32768, 73,-32768,-32768, -19, -24, 12, - 0,-32768,-32768,-32768,-32768,-32768, -5, -3, -1, 26, - -32768,-32768,-32768,-32768,-32768,-32768, 26,-32768, -4,-32768, - -32768,-32768,-32768, 2, -23, -23,-32768, 4,-32768,-32768, - -32768,-32768,-32768,-32768, 26, 26, 26,-32768, 26,-32768, - 1, -17,-32768,-32768,-32768,-32768, 5,-32768, -23, -23, - 3,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 6,-32768, - -32768, 0, 36,-32768,-32768,-32768, 7,-32768,-32768, 0, - -32768,-32768,-32768, -18, -2,-32768,-32768,-32768, 0,-32768, - -32768,-32768, -2,-32768 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = -{ - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768, -38, 8,-32768, -11,-32768, - -32768, -46, -10,-32768, -50, -21,-32768,-32768 -}; - -/* 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. */ -static const short yytable[] = -{ - 42, 39, 40, 39, 40, 49, 73, 55, 39, 3, - 72, 36, 56, 88, 86, 37, 87, 38, 50, 68, - 74, 74, 81, 63, 64, 65, 44, 66, 45, 47, - 46, 50, 53, 41, 67, 41, 61, 89, 75, 39, - 69, 92, 82, 59, 78, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 0, 0, 0, 0, 0, 0, 0, 85, - 0, 0, 0, 0, 0, 0, 0, 0, 93, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 0, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 0, 0, 0, 0, 0, 0, 28, - 29 -}; - -static const short yycheck[] = -{ - 10, 3, 4, 3, 4, 26, 56, 30, 3, 0, - 5, 30, 35, 15, 32, 39, 34, 5, 35, 36, - 58, 59, 72, 44, 45, 46, 31, 48, 31, 3, - 31, 35, 30, 35, 33, 35, 32, 39, 35, 3, - 51, 87, 35, 35, 38, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 71, -1, -1, -1, -1, -1, -1, -1, 79, - -1, -1, -1, -1, -1, -1, -1, -1, 88, 6, - 7, 8, 9, 10, 11, 12, 13, 14, -1, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, -1, -1, -1, -1, -1, -1, 36, - 37 -}; - -#if YYDEBUG -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const unsigned char yystos[] = -{ - 0, 41, 42, 0, 43, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 36, 37, - 44, 45, 49, 51, 47, 46, 30, 39, 5, 3, - 4, 35, 62, 64, 31, 31, 31, 3, 65, 65, - 35, 57, 58, 30, 52, 30, 35, 55, 56, 56, - 48, 32, 67, 65, 65, 65, 65, 33, 36, 58, - 66, 50, 5, 64, 55, 35, 53, 59, 38, 54, - 62, 64, 35, 60, 61, 62, 32, 34, 15, 39, - 62, 63, 61, 62 -}; -#endif #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -616,19 +501,14 @@ static const unsigned char yystos[] = #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 - #define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 - /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ - #define YYFAIL goto yyerrlab - #define YYRECOVERING() (!!yyerrstatus) - #define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ @@ -649,17 +529,21 @@ while (0) #define YYTERROR 1 #define YYERRCODE 256 + /* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ + are run). + + When YYLLOC_DEFAULT is run, CURRENT is set the location of the + first token. By default, to implement support for ranges, extend + its range to the last symbol. */ #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) \ + Current.last_line = Rhs[N].last_line; \ + Current.last_column = Rhs[N].last_column; #endif + /* YYLEX -- calling `yylex' with the right arguments. */ #if YYPURE @@ -680,6 +564,7 @@ while (0) # define YYLEX yylex () #endif /* !YYPURE */ + /* Enable debugging if requested. */ #if YYDEBUG @@ -719,10 +604,8 @@ int yydebug; #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif - - -#if YYERROR_VERBOSE +#ifdef YYERROR_VERBOSE # ifndef yystrlen # if defined (__GLIBC__) && defined (_STRING_H) @@ -772,10 +655,10 @@ yystpcpy (yydest, yysrc) } # endif # endif - -#endif /* !YYERROR_VERBOSE */ - +#endif +#line 315 "/usr/share/bison/bison.simple" + /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -812,7 +695,7 @@ int yyparse (void); /* The lookahead symbol. */ \ int yychar; \ \ -/* The semantic value of the lookahead symbol. */ \ +/* The semantic value of the lookahead symbol. */ \ YYSTYPE yylval; \ \ /* Number of parse errors so far. */ \ @@ -829,7 +712,8 @@ YYLTYPE yylloc; YY_DECL_NON_LSP_VARIABLES #endif -/* If nonreentrant, generate the variables here. */ + +/* If nonreentrant, generate the variables here. */ #if !YYPURE YY_DECL_VARIABLES @@ -839,7 +723,7 @@ int yyparse (YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { - /* If reentrant, generate the variables here. */ + /* If reentrant, generate the variables here. */ #if YYPURE YY_DECL_VARIABLES #endif /* !YYPURE */ @@ -860,7 +744,7 @@ yyparse (YYPARSE_PARAM_ARG) Refer to the stacks thru separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ + /* The state stack. */ short yyssa[YYINITDEPTH]; short *yyss = yyssa; register short *yyssp; @@ -885,6 +769,7 @@ yyparse (YYPARSE_PARAM_ARG) YYSIZE_T yystacksize = YYINITDEPTH; + /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -893,7 +778,7 @@ yyparse (YYPARSE_PARAM_ARG) #endif /* When reducing, the number of symbols on the RHS of the reduced - rule. */ + rule. */ int yylen; YYDPRINTF ((stderr, "Starting parse\n")); @@ -980,10 +865,10 @@ yyparse (YYPARSE_PARAM_ARG) goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED +# if YYLSP_NEEDED YYSTACK_RELOCATE (yyls); -# endif -# undef YYSTACK_RELOCATE +# endif +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -1007,6 +892,7 @@ yyparse (YYPARSE_PARAM_ARG) goto yybackup; + /*-----------. | yybackup. | `-----------*/ @@ -1033,12 +919,12 @@ yybackup: yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with. */ + /* Convert token to internal form (in yychar1) for indexing tables with */ - if (yychar <= 0) /* This means end of input. */ + if (yychar <= 0) /* This means end of input. */ { yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more. */ + yychar = YYEOF; /* Don't call YYLEX any more */ YYDPRINTF ((stderr, "Now at end of input.\n")); } @@ -1139,7 +1025,9 @@ yyreduce: yyval = yyvsp[1-yylen]; #if YYLSP_NEEDED - /* Default location. */ + /* Similarly for the default location. Let the user run additional + commands if for instance locations are ranges. */ + yyloc = yylsp[1-yylen]; YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); #endif @@ -1151,372 +1039,314 @@ yyreduce: int yyi; YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn - 1, yyrline[yyn]); + yyn, yyrline[yyn]); /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++) + for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); } #endif - switch (yyn) - { - case 2: -#line 128 "parse-gram.y" -{ LOCATION_RESET (yylloc); ; } - break; - - case 3: -#line 130 "parse-gram.y" -{ - yycontrol->errcode = 0; - epilogue_set (yyvsp[0].string, yylsp[0].first_line); - ; } - break; - - case 7: -#line 143 "parse-gram.y" -{ prologue_augment (yyvsp[0].string, yylsp[0].first_line); ; } - break; - case 8: -#line 144 "parse-gram.y" -{ debug_flag = 1; ; } - break; + switch (yyn) { - case 9: -#line 145 "parse-gram.y" -{ muscle_insert (yyvsp[-1].string, yyvsp[0].string); ; } +case 1: +#line 131 "parse-gram.y" +{ LOCATION_RESET (yylloc); } break; - - case 10: -#line 146 "parse-gram.y" -{ defines_flag = 1; ; } +case 2: +#line 133 "parse-gram.y" +{ + yycontrol->errcode = 0; + epilogue_set (yyvsp[0].string, yylsp[0].first_line); + } break; - - case 11: +case 6: #line 147 "parse-gram.y" -{ error_verbose = 1; ; } - break; - - case 12: -#line 148 "parse-gram.y" -{ expected_conflicts = yyvsp[0].integer; ; } - break; - - case 13: -#line 149 "parse-gram.y" -{ spec_file_prefix = yyvsp[0].string; ; } +{ + prologue_augment (yyvsp[0].string, yylsp[0].first_line); + } break; - - case 14: +case 7: #line 150 "parse-gram.y" -{ locations_flag = 1; ; } +{ debug_flag = 1; } break; - - case 15: +case 8: #line 151 "parse-gram.y" -{ spec_name_prefix = yyvsp[0].string; ; } +{ muscle_insert (yyvsp[-1].string, yyvsp[0].string); } break; - - case 16: +case 9: #line 152 "parse-gram.y" -{ no_lines_flag = 1; ; } +{ defines_flag = 1; } break; - - case 17: +case 10: #line 153 "parse-gram.y" -{ spec_outfile = yyvsp[0].string; ; } +{ error_verbose = 1; } break; - - case 18: +case 11: #line 154 "parse-gram.y" -{ pure_parser = 1; ; } +{ expected_conflicts = yyvsp[0].integer; } break; - - case 19: +case 12: #line 155 "parse-gram.y" -{ skeleton = yyvsp[0].string; ; } +{ spec_file_prefix = yyvsp[0].string; } break; - - case 20: +case 13: #line 156 "parse-gram.y" -{ token_table_flag = 1; ; } +{ locations_flag = 1; } break; - - case 21: +case 14: #line 157 "parse-gram.y" -{ report_flag = 1; ; } +{ spec_name_prefix = yyvsp[0].string; } break; - - case 22: +case 15: #line 158 "parse-gram.y" -{ yacc_flag = 1; ; } +{ no_lines_flag = 1; } break; - - case 24: +case 16: +#line 159 "parse-gram.y" +{ spec_outfile = yyvsp[0].string; } + break; +case 17: +#line 160 "parse-gram.y" +{ pure_parser = 1; } + break; +case 18: +#line 161 "parse-gram.y" +{ skeleton = yyvsp[0].string; } + break; +case 19: +#line 162 "parse-gram.y" +{ token_table_flag = 1; } + break; +case 20: #line 163 "parse-gram.y" -{ current_class = nterm_sym; ; } +{ report_flag = 1; } break; - - case 25: +case 21: #line 164 "parse-gram.y" -{ +{ yacc_flag = 1; } + break; +case 23: +#line 169 "parse-gram.y" +{ current_class = nterm_sym; } + break; +case 24: +#line 170 "parse-gram.y" +{ current_class = unknown_sym; current_type = NULL; - ; } + } break; - - case 26: -#line 169 "parse-gram.y" -{ +case 25: +#line 175 "parse-gram.y" +{ grammar_start_symbol_set (yyvsp[0].symbol); - ; } + } break; - - case 27: -#line 172 "parse-gram.y" -{ current_class = token_sym; ; } +case 26: +#line 178 "parse-gram.y" +{ current_class = token_sym; } break; - - case 28: -#line 173 "parse-gram.y" -{ +case 27: +#line 179 "parse-gram.y" +{ current_class = unknown_sym; current_type = NULL; - ; } + } break; - - case 29: -#line 177 "parse-gram.y" -{ current_type = yyvsp[0].string; ; } +case 28: +#line 183 "parse-gram.y" +{current_type = yyvsp[0].string; } break; - - case 30: -#line 178 "parse-gram.y" -{ +case 29: +#line 184 "parse-gram.y" +{ current_type = NULL; - ; } + } break; - - case 31: -#line 182 "parse-gram.y" -{ +case 30: +#line 188 "parse-gram.y" +{ typed = 1; MUSCLE_INSERT_INT ("stype_line", yylsp[-1].first_line); muscle_insert ("stype", yyvsp[-1].string); - ; } - break; - - case 32: -#line 191 "parse-gram.y" -{ current_assoc = yyvsp[-1].assoc; ++current_prec; ; } - break; - - case 33: -#line 193 "parse-gram.y" -{ current_assoc = non_assoc; current_type = NULL; ; } + } break; - - case 34: +case 31: #line 197 "parse-gram.y" -{ yyval.assoc = left_assoc; ; } - break; - - case 35: -#line 198 "parse-gram.y" -{ yyval.assoc = right_assoc; ; } +{ current_assoc = yyvsp[-1].assoc; ++current_prec; } break; - - case 36: +case 32: #line 199 "parse-gram.y" -{ yyval.assoc = non_assoc; ; } +{ current_assoc = non_assoc; current_type = NULL; } break; - - case 37: +case 33: #line 203 "parse-gram.y" -{ current_type = NULL;; } +{ yyval.assoc = left_assoc; } break; - - case 38: +case 34: #line 204 "parse-gram.y" -{ current_type = yyvsp[0].string; ; } +{ yyval.assoc = right_assoc; } break; - - case 39: +case 35: +#line 205 "parse-gram.y" +{ yyval.assoc = non_assoc; } + break; +case 36: #line 209 "parse-gram.y" -{ symbol_type_set (yyvsp[0].symbol, current_type); ; } +{ current_type = NULL;} break; - - case 40: +case 37: #line 210 "parse-gram.y" -{ symbol_type_set (yyvsp[0].symbol, current_type); ; } +{ current_type = yyvsp[0].string; } break; - - case 41: +case 38: +#line 215 "parse-gram.y" +{ symbol_type_set (yyvsp[0].symbol, current_type); } + break; +case 39: #line 216 "parse-gram.y" -{ +{ symbol_type_set (yyvsp[0].symbol, current_type); } + break; +case 40: +#line 222 "parse-gram.y" +{ symbol_type_set (yyvsp[0].symbol, current_type); symbol_precedence_set (yyvsp[0].symbol, current_prec, current_assoc); - ; } + } break; - - case 42: -#line 221 "parse-gram.y" -{ +case 41: +#line 227 "parse-gram.y" +{ symbol_type_set (yyvsp[0].symbol, current_type); symbol_precedence_set (yyvsp[0].symbol, current_prec, current_assoc); - ; } + } break; - - case 43: -#line 231 "parse-gram.y" -{ +case 42: +#line 237 "parse-gram.y" +{ current_type = yyvsp[0].string; - ; } + } break; - - case 44: -#line 235 "parse-gram.y" -{ +case 43: +#line 241 "parse-gram.y" +{ symbol_class_set (yyvsp[0].symbol, current_class); symbol_type_set (yyvsp[0].symbol, current_type); - ; } + } break; - - case 45: -#line 240 "parse-gram.y" -{ +case 44: +#line 246 "parse-gram.y" +{ symbol_class_set (yyvsp[-1].symbol, current_class); symbol_type_set (yyvsp[-1].symbol, current_type); symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer); - ; } + } break; - - case 46: -#line 246 "parse-gram.y" -{ +case 45: +#line 252 "parse-gram.y" +{ symbol_class_set (yyvsp[-1].symbol, current_class); symbol_type_set (yyvsp[-1].symbol, current_type); symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol); - ; } + } break; - - case 47: -#line 252 "parse-gram.y" -{ +case 46: +#line 258 "parse-gram.y" +{ symbol_class_set (yyvsp[-2].symbol, current_class); symbol_type_set (yyvsp[-2].symbol, current_type); symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer); symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol); - ; } - break; - - case 48: -#line 263 "parse-gram.y" -{ ;; } - break; - - case 49: -#line 265 "parse-gram.y" -{ ;; } - break; - - case 52: -#line 274 "parse-gram.y" -{ current_lhs = yyvsp[-1].symbol; ; } + } break; - - case 53: -#line 275 "parse-gram.y" -{ ;; } +case 47: +#line 269 "parse-gram.y" +{;} break; - - case 54: -#line 279 "parse-gram.y" -{ grammar_rule_end (); ; } +case 48: +#line 271 "parse-gram.y" +{;} break; - - case 55: +case 51: #line 280 "parse-gram.y" -{ grammar_rule_end (); ; } +{ current_lhs = yyvsp[-1].symbol; } break; - - case 56: -#line 285 "parse-gram.y" -{ grammar_rule_begin (current_lhs); ; } +case 52: +#line 281 "parse-gram.y" +{;} break; - - case 57: -#line 287 "parse-gram.y" -{ grammar_current_rule_symbol_append (yyvsp[0].symbol); ; } +case 53: +#line 285 "parse-gram.y" +{ grammar_rule_end (); } break; - - case 58: -#line 289 "parse-gram.y" -{ grammar_current_rule_action_append (yyvsp[0].string, yylsp[0].first_line); ; } +case 54: +#line 286 "parse-gram.y" +{ grammar_rule_end (); } break; - - case 59: +case 55: #line 291 "parse-gram.y" -{ grammar_current_rule_prec_set (yyvsp[0].symbol); ; } +{ grammar_rule_begin (current_lhs); } break; - - case 60: -#line 295 "parse-gram.y" -{ yyval.symbol = yyvsp[0].symbol; ; } +case 56: +#line 293 "parse-gram.y" +{ grammar_current_rule_symbol_append (yyvsp[0].symbol); } break; - - case 61: -#line 296 "parse-gram.y" -{ yyval.symbol = yyvsp[0].symbol; ; } +case 57: +#line 295 "parse-gram.y" +{ grammar_current_rule_action_append (yyvsp[0].string, yylsp[0].first_line); } break; - - case 62: +case 58: #line 297 "parse-gram.y" -{ yyval.symbol = getsym (yyvsp[0].string); ; } +{ grammar_current_rule_prec_set (yyvsp[0].symbol); } break; - - case 63: +case 59: +#line 301 "parse-gram.y" +{ yyval.symbol = yyvsp[0].symbol; } + break; +case 60: #line 302 "parse-gram.y" -{ yyval.string = yyvsp[0].string; ; } +{ yyval.symbol = yyvsp[0].symbol; } break; - - case 64: +case 61: +#line 303 "parse-gram.y" +{ yyval.symbol = getsym (yyvsp[0].string); } + break; +case 62: #line 308 "parse-gram.y" -{ +{ yyval.string = yyvsp[0].string; } + break; +case 63: +#line 314 "parse-gram.y" +{ yyval.symbol = getsym (yyvsp[0].string); symbol_class_set (yyval.symbol, token_sym); - ; } + } break; - - case 65: -#line 317 "parse-gram.y" -{ +case 64: +#line 323 "parse-gram.y" +{ yyval.string = yyvsp[0].string + 1; yyval.string[strlen (yyval.string) - 1] = '\0'; - ; } + } break; - - case 66: -#line 325 "parse-gram.y" -{ +case 65: +#line 331 "parse-gram.y" +{ yyval.string = xstrdup (""); - ; } + } break; - - case 67: -#line 329 "parse-gram.y" -{ +case 66: +#line 335 "parse-gram.y" +{ yyval.string = yyvsp[0].string; - ; } + } break; +} +#line 705 "/usr/share/bison/bison.simple" - } - -/* Line 1010 of /usr/local/share/bison/bison.simple. */ -#line 1520 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; @@ -1546,11 +1376,11 @@ yyreduce: yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + yystate = yypgoto[yyn - YYNTBASE] + *yyssp; if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTOKENS]; + yystate = yydefgoto[yyn - YYNTBASE]; goto yynewstate; @@ -1564,7 +1394,7 @@ yyerrlab: { ++yynerrs; -#if YYERROR_VERBOSE +#ifdef YYERROR_VERBOSE yyn = yypact[yystate]; if (yyn > YYFLAG && yyn < YYLAST) @@ -1604,27 +1434,27 @@ yyerrlab: } yyerror (yymsg); YYSTACK_FREE (yymsg); - } - else - yyerror ("parse error; also virtual memory exhausted"); - } + } + else + yyerror ("parse error; also virtual memory exhausted"); + } else -#endif /* YYERROR_VERBOSE */ - yyerror ("parse error"); +#endif /* defined (YYERROR_VERBOSE) */ + yyerror ("parse error"); } goto yyerrlab1; -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ +/*--------------------------------------------------. +| 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. */ + /* return failure if at end of input */ if (yychar == YYEOF) YYABORT; YYDPRINTF ((stderr, "Discarding token %d (%s).\n", @@ -1635,63 +1465,73 @@ yyerrlab1: /* Else will try to reuse lookahead token after shifting the error token. */ - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this */ - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYFLAG) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + goto yyerrhandle; - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; -#if YYDEBUG - if (yydebug) - { - if (yystos[yystate] < YYNTOKENS) - { - YYFPRINTF (stderr, "Error: popping token %d (%s", - yytoknum[yystos[yystate]], yytname[yystos[yystate]]); -# ifdef YYPRINT - YYPRINT (stderr, yytoknum[yystos[yystate]], *yyvsp); -# endif - YYFPRINTF (stderr, ")\n"); - } - else - { - YYFPRINTF (stderr, "Error: popping nonterminal (%s)\n", - yytname[yystos[yystate]]); - } - } +/*-------------------------------------------------------------------. +| yyerrdefault -- current state does not do anything special for the | +| error token. | +`-------------------------------------------------------------------*/ +yyerrdefault: +#if 0 + /* This is wrong; only states that explicitly want error tokens + should shift them. */ + + /* If its default is to accept any token, ok. Otherwise pop it. */ + yyn = yydefact[yystate]; + if (yyn) + goto yydefault; #endif - yyvsp--; - yystate = *--yyssp; + +/*---------------------------------------------------------------. +| yyerrpop -- pop the current state because it cannot handle the | +| error token | +`---------------------------------------------------------------*/ +yyerrpop: + if (yyssp == yyss) + YYABORT; + yyvsp--; + yystate = *--yyssp; #if YYLSP_NEEDED - yylsp--; + yylsp--; #endif #if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } + if (yydebug) + { + short *yyssp1 = yyss - 1; + YYFPRINTF (stderr, "Error: state stack now"); + while (yyssp1 != yyssp) + YYFPRINTF (stderr, " %d", *++yyssp1); + YYFPRINTF (stderr, "\n"); + } #endif + +/*--------------. +| yyerrhandle. | +`--------------*/ +yyerrhandle: + yyn = yypact[yystate]; + if (yyn == YYFLAG) + goto yyerrdefault; + + yyn += YYTERROR; + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) + goto yyerrdefault; + + yyn = yytable[yyn]; + if (yyn < 0) + { + if (yyn == YYFLAG) + goto yyerrpop; + yyn = -yyn; + goto yyreduce; } + else if (yyn == 0) + goto yyerrpop; if (yyn == YYFINAL) YYACCEPT; @@ -1736,8 +1576,7 @@ yyreturn: #endif return yyresult; } - -#line 338 "parse-gram.y" +#line 344 "parse-gram.y" /*------------------------------------------------------------------. | When debugging the parser, display tokens' locations and values. | @@ -1787,4 +1626,3 @@ gram_error (gram_control_t *control ATTRIBUTE_UNUSED, LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": %s\n", msg); } - diff --git a/src/parse-gram.h b/src/parse-gram.h index 0e2f0fcf..404d4155 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,124 +1,70 @@ #ifndef BISON_PARSE_GRAM_H # define BISON_PARSE_GRAM_H -/* Tokens. */ -#ifndef YYTOKENTYPE -# if defined (__STDC__) || defined (__cplusplus) - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - GRAM_EOF = 0, - STRING = 258, - CHARACTER = 259, - INT = 260, - PERCENT_TOKEN = 261, - PERCENT_NTERM = 262, - PERCENT_TYPE = 263, - PERCENT_UNION = 264, - PERCENT_EXPECT = 265, - PERCENT_START = 266, - PERCENT_LEFT = 267, - PERCENT_RIGHT = 268, - PERCENT_NONASSOC = 269, - PERCENT_PREC = 270, - PERCENT_VERBOSE = 271, - PERCENT_ERROR_VERBOSE = 272, - PERCENT_OUTPUT = 273, - PERCENT_FILE_PREFIX = 274, - PERCENT_NAME_PREFIX = 275, - PERCENT_DEFINE = 276, - PERCENT_PURE_PARSER = 277, - PERCENT_DEFINES = 278, - PERCENT_YACC = 279, - PERCENT_DEBUG = 280, - PERCENT_LOCATIONS = 281, - PERCENT_NO_LINES = 282, - PERCENT_SKELETON = 283, - PERCENT_TOKEN_TABLE = 284, - TYPE = 285, - EQUAL = 286, - SEMICOLON = 287, - COLON = 288, - PIPE = 289, - ID = 290, - PERCENT_PERCENT = 291, - PROLOGUE = 292, - EPILOGUE = 293, - BRACED_CODE = 294 - }; -# endif - /* POSIX requires `int' for tokens in interfaces. */ -# define YYTOKENTYPE int -#endif /* !YYTOKENTYPE */ -#define GRAM_EOF 0 -#define STRING 258 -#define CHARACTER 259 -#define INT 260 -#define PERCENT_TOKEN 261 -#define PERCENT_NTERM 262 -#define PERCENT_TYPE 263 -#define PERCENT_UNION 264 -#define PERCENT_EXPECT 265 -#define PERCENT_START 266 -#define PERCENT_LEFT 267 -#define PERCENT_RIGHT 268 -#define PERCENT_NONASSOC 269 -#define PERCENT_PREC 270 -#define PERCENT_VERBOSE 271 -#define PERCENT_ERROR_VERBOSE 272 -#define PERCENT_OUTPUT 273 -#define PERCENT_FILE_PREFIX 274 -#define PERCENT_NAME_PREFIX 275 -#define PERCENT_DEFINE 276 -#define PERCENT_PURE_PARSER 277 -#define PERCENT_DEFINES 278 -#define PERCENT_YACC 279 -#define PERCENT_DEBUG 280 -#define PERCENT_LOCATIONS 281 -#define PERCENT_NO_LINES 282 -#define PERCENT_SKELETON 283 -#define PERCENT_TOKEN_TABLE 284 -#define TYPE 285 -#define EQUAL 286 -#define SEMICOLON 287 -#define COLON 288 -#define PIPE 289 -#define ID 290 -#define PERCENT_PERCENT 291 -#define PROLOGUE 292 -#define EPILOGUE 293 -#define BRACED_CODE 294 - - - - #ifndef YYSTYPE -#line 70 "parse-gram.y" typedef union { symbol_t *symbol; int integer; char *string; associativity assoc; -} -yystype; +} yystype; # define YYSTYPE yystype +# define YYSTYPE_IS_TRIVIAL 1 #endif - - #ifndef YYLTYPE typedef struct yyltype { int first_line; int first_column; + int last_line; int last_column; } yyltype; + # define YYLTYPE yyltype +# define YYLTYPE_IS_TRIVIAL 1 #endif +# define GRAM_EOF 0 +# define STRING 257 +# define CHARACTER 258 +# define INT 259 +# define PERCENT_TOKEN 260 +# define PERCENT_NTERM 261 +# define PERCENT_TYPE 262 +# define PERCENT_UNION 263 +# define PERCENT_EXPECT 264 +# define PERCENT_START 265 +# define PERCENT_LEFT 266 +# define PERCENT_RIGHT 267 +# define PERCENT_NONASSOC 268 +# define PERCENT_PREC 269 +# define PERCENT_VERBOSE 270 +# define PERCENT_ERROR_VERBOSE 271 +# define PERCENT_OUTPUT 272 +# define PERCENT_FILE_PREFIX 273 +# define PERCENT_NAME_PREFIX 274 +# define PERCENT_DEFINE 275 +# define PERCENT_PURE_PARSER 276 +# define PERCENT_DEFINES 277 +# define PERCENT_YACC 278 +# define PERCENT_DEBUG 279 +# define PERCENT_LOCATIONS 280 +# define PERCENT_NO_LINES 281 +# define PERCENT_SKELETON 282 +# define PERCENT_TOKEN_TABLE 283 +# define TYPE 284 +# define EQUAL 285 +# define SEMICOLON 286 +# define COLON 287 +# define PIPE 288 +# define ID 289 +# define PERCENT_PERCENT 290 +# define PROLOGUE 291 +# define EPILOGUE 292 +# define BRACED_CODE 293 #endif /* not BISON_PARSE_GRAM_H */ - diff --git a/src/parse-gram.y b/src/parse-gram.y index 3cff05d1..e5b07217 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -24,7 +24,7 @@ %defines %locations %pure-parser -%error-verbose +// %error-verbose %defines %name-prefix="gram_" @@ -38,6 +38,8 @@ #include "reader.h" #include "conflicts.h" +#define YYERROR_VERBOSE 1 + /* Pass the control structure to YYPARSE and YYLEX. */ #define YYPARSE_PARAM gram_control #define YYLEX_PARAM gram_control @@ -120,7 +122,8 @@ int current_prec = 0; %token PROLOGUE EPILOGUE %token BRACED_CODE -%type CHARACTER TYPE BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action STRING string_content +%type CHARACTER TYPE STRING string_content + BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action %type INT %type ID symbol string_as_id %type precedence_directive @@ -140,7 +143,10 @@ directives: directive: grammar_directives -| PROLOGUE { prologue_augment ($1, @1.first_line); } +| PROLOGUE + { + prologue_augment ($1, @1.first_line); + } | "%debug" { debug_flag = 1; } | "%define" string_content string_content { muscle_insert ($2, $3); } | "%defines" { defines_flag = 1; } diff --git a/src/reader.h b/src/reader.h index 6311fe86..29d95b1d 100644 --- a/src/reader.h +++ b/src/reader.h @@ -78,6 +78,8 @@ typedef struct gram_control_s /* From the scanner. */ extern FILE *gram_in; extern int gram__flex_debug; +void scanner_last_string_free PARAMS ((void)); +void scanner_free PARAMS ((void)); # define YY_DECL \ int gram_lex (yystype *yylval, yyltype *yylloc, \ diff --git a/src/scan-gram.c b/src/scan-gram.c index 94e0d9d0..ef5a324a 100644 --- a/src/scan-gram.c +++ b/src/scan-gram.c @@ -689,16 +689,16 @@ int yy_flex_debug = 1; static yyconst short int yy_rule_linenum[92] = { 0, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 143, 144, 145, - 146, 148, 149, 150, 157, 160, 163, 166, 167, 170, - 173, 176, 178, 184, 200, 201, 212, 224, 225, 226, - 243, 251, 253, 272, 286, 288, 307, 319, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 346, 352, 353, - 355, 373, 379, 380, 382, 400, 403, 406, 407, 418, - 428, 430, 431, 433, 434, 437, 456, 462, 463, 464, - 484 + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 149, 150, 151, + 152, 154, 155, 156, 161, 164, 167, 170, 171, 174, + 177, 180, 189, 195, 211, 212, 223, 235, 236, 237, + 254, 263, 265, 285, 299, 301, 321, 333, 337, 338, + 339, 340, 341, 342, 343, 344, 345, 360, 366, 367, + 369, 387, 393, 394, 396, 414, 417, 420, 421, 432, + 443, 445, 446, 448, 449, 452, 472, 479, 480, 481, + 502 } ; @@ -772,7 +772,6 @@ char *last_string; do { \ obstack_1grow (&string_obstack, '\0'); \ last_string = obstack_finish (&string_obstack); \ - yylval->string = last_string; \ } while (0) #define YY_OBS_FREE \ @@ -780,6 +779,13 @@ char *last_string; obstack_free (&string_obstack, last_string); \ } while (0) +void +scanner_last_string_free (void) +{ + YY_OBS_FREE; +} + + /* This is only to avoid GCC warnings. */ #define YY_USER_INIT if (yycontrol) {;}; @@ -802,7 +808,7 @@ static void handle_at PARAMS ((char *cp)); #define SC_PROLOGUE 7 #define SC_EPILOGUE 8 -#line 806 "scan-gram.c" +#line 812 "scan-gram.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -964,7 +970,7 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 91 "scan-gram.l" +#line 97 "scan-gram.l" /* At each yylex invocation, mark the current position as the @@ -987,7 +993,7 @@ YY_DECL /*----------------------------. | Scanning Bison directives. | `----------------------------*/ -#line 991 "scan-gram.c" +#line 997 "scan-gram.c" if ( yy_init ) { @@ -1089,228 +1095,232 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 115 "scan-gram.l" +#line 121 "scan-gram.l" return PERCENT_NONASSOC; YY_BREAK case 2: YY_RULE_SETUP -#line 116 "scan-gram.l" +#line 122 "scan-gram.l" return PERCENT_DEBUG; YY_BREAK case 3: YY_RULE_SETUP -#line 117 "scan-gram.l" +#line 123 "scan-gram.l" return PERCENT_DEFINE; YY_BREAK case 4: YY_RULE_SETUP -#line 118 "scan-gram.l" +#line 124 "scan-gram.l" return PERCENT_DEFINES; YY_BREAK case 5: YY_RULE_SETUP -#line 119 "scan-gram.l" +#line 125 "scan-gram.l" return PERCENT_ERROR_VERBOSE; YY_BREAK case 6: YY_RULE_SETUP -#line 120 "scan-gram.l" +#line 126 "scan-gram.l" return PERCENT_EXPECT; YY_BREAK case 7: YY_RULE_SETUP -#line 121 "scan-gram.l" +#line 127 "scan-gram.l" return PERCENT_FILE_PREFIX; YY_BREAK case 8: YY_RULE_SETUP -#line 122 "scan-gram.l" +#line 128 "scan-gram.l" return PERCENT_YACC; YY_BREAK case 9: YY_RULE_SETUP -#line 123 "scan-gram.l" +#line 129 "scan-gram.l" return PERCENT_LEFT; YY_BREAK case 10: YY_RULE_SETUP -#line 124 "scan-gram.l" +#line 130 "scan-gram.l" return PERCENT_LOCATIONS; YY_BREAK case 11: YY_RULE_SETUP -#line 125 "scan-gram.l" +#line 131 "scan-gram.l" return PERCENT_NAME_PREFIX; YY_BREAK case 12: YY_RULE_SETUP -#line 126 "scan-gram.l" +#line 132 "scan-gram.l" return PERCENT_NO_LINES; YY_BREAK case 13: YY_RULE_SETUP -#line 127 "scan-gram.l" +#line 133 "scan-gram.l" return PERCENT_NONASSOC; YY_BREAK case 14: YY_RULE_SETUP -#line 128 "scan-gram.l" +#line 134 "scan-gram.l" return PERCENT_NTERM; YY_BREAK case 15: YY_RULE_SETUP -#line 129 "scan-gram.l" +#line 135 "scan-gram.l" return PERCENT_OUTPUT; YY_BREAK case 16: YY_RULE_SETUP -#line 130 "scan-gram.l" +#line 136 "scan-gram.l" return PERCENT_PREC; YY_BREAK case 17: YY_RULE_SETUP -#line 131 "scan-gram.l" +#line 137 "scan-gram.l" return PERCENT_PURE_PARSER; YY_BREAK case 18: YY_RULE_SETUP -#line 132 "scan-gram.l" +#line 138 "scan-gram.l" return PERCENT_RIGHT; YY_BREAK case 19: YY_RULE_SETUP -#line 133 "scan-gram.l" +#line 139 "scan-gram.l" return PERCENT_SKELETON; YY_BREAK case 20: YY_RULE_SETUP -#line 134 "scan-gram.l" +#line 140 "scan-gram.l" return PERCENT_START; YY_BREAK case 21: YY_RULE_SETUP -#line 135 "scan-gram.l" +#line 141 "scan-gram.l" return PERCENT_TOKEN; YY_BREAK case 22: YY_RULE_SETUP -#line 136 "scan-gram.l" +#line 142 "scan-gram.l" return PERCENT_TOKEN; YY_BREAK case 23: YY_RULE_SETUP -#line 137 "scan-gram.l" +#line 143 "scan-gram.l" return PERCENT_TOKEN_TABLE; YY_BREAK case 24: YY_RULE_SETUP -#line 138 "scan-gram.l" +#line 144 "scan-gram.l" return PERCENT_TYPE; YY_BREAK case 25: YY_RULE_SETUP -#line 139 "scan-gram.l" +#line 145 "scan-gram.l" return PERCENT_UNION; YY_BREAK case 26: YY_RULE_SETUP -#line 140 "scan-gram.l" +#line 146 "scan-gram.l" return PERCENT_VERBOSE; YY_BREAK case 27: YY_RULE_SETUP -#line 141 "scan-gram.l" +#line 147 "scan-gram.l" return PERCENT_YACC; YY_BREAK case 28: YY_RULE_SETUP -#line 143 "scan-gram.l" +#line 149 "scan-gram.l" return EQUAL; YY_BREAK case 29: YY_RULE_SETUP -#line 144 "scan-gram.l" +#line 150 "scan-gram.l" return COLON; YY_BREAK case 30: YY_RULE_SETUP -#line 145 "scan-gram.l" +#line 151 "scan-gram.l" return PIPE; YY_BREAK case 31: YY_RULE_SETUP -#line 146 "scan-gram.l" +#line 152 "scan-gram.l" return SEMICOLON; YY_BREAK case 32: YY_RULE_SETUP -#line 148 "scan-gram.l" +#line 154 "scan-gram.l" YY_LINES; YY_STEP; YY_BREAK case 33: YY_RULE_SETUP -#line 149 "scan-gram.l" +#line 155 "scan-gram.l" YY_STEP; YY_BREAK case 34: YY_RULE_SETUP -#line 150 "scan-gram.l" +#line 156 "scan-gram.l" { - YY_OBS_INIT; YY_OBS_GROW; YY_OBS_FINISH; - yylval->symbol = getsym (last_string); - YY_OBS_FREE; + yylval->symbol = getsym (yytext); return ID; } YY_BREAK case 35: YY_RULE_SETUP -#line 157 "scan-gram.l" +#line 161 "scan-gram.l" yylval->integer = strtol (yytext, 0, 10); return INT; YY_BREAK /* Characters. We don't check there is only one. */ case 36: YY_RULE_SETUP -#line 160 "scan-gram.l" +#line 164 "scan-gram.l" YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER); YY_BREAK /* Strings. */ case 37: YY_RULE_SETUP -#line 163 "scan-gram.l" +#line 167 "scan-gram.l" YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING); YY_BREAK /* Comments. */ case 38: YY_RULE_SETUP -#line 166 "scan-gram.l" +#line 170 "scan-gram.l" yy_push_state (SC_COMMENT); YY_BREAK case 39: YY_RULE_SETUP -#line 167 "scan-gram.l" +#line 171 "scan-gram.l" YY_STEP; YY_BREAK /* Prologue. */ case 40: YY_RULE_SETUP -#line 170 "scan-gram.l" +#line 174 "scan-gram.l" YY_OBS_INIT; yy_push_state (SC_PROLOGUE); YY_BREAK /* Code in between braces. */ case 41: YY_RULE_SETUP -#line 173 "scan-gram.l" +#line 177 "scan-gram.l" YY_OBS_INIT; YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE); YY_BREAK /* A type. */ case 42: YY_RULE_SETUP -#line 176 "scan-gram.l" -YY_OBS_INIT; obstack_grow (&string_obstack, yytext + 1, yyleng - 2); YY_OBS_FINISH; return TYPE; +#line 180 "scan-gram.l" +{ + YY_OBS_INIT; + obstack_grow (&string_obstack, yytext + 1, yyleng - 2); + YY_OBS_FINISH; + yylval->string = last_string; + return TYPE; + } YY_BREAK case 43: YY_RULE_SETUP -#line 178 "scan-gram.l" +#line 189 "scan-gram.l" { if (++percent_percent_count == 2) yy_push_state (SC_EPILOGUE); @@ -1319,7 +1329,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 184 "scan-gram.l" +#line 195 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": invalid character: `%c'\n", *yytext); @@ -1336,12 +1346,12 @@ YY_RULE_SETUP case 45: YY_RULE_SETUP -#line 200 "scan-gram.l" +#line 211 "scan-gram.l" obstack_sgrow (&string_obstack, "@<:@"); YY_BREAK case 46: YY_RULE_SETUP -#line 201 "scan-gram.l" +#line 212 "scan-gram.l" obstack_sgrow (&string_obstack, "@:>@"); YY_BREAK @@ -1352,7 +1362,7 @@ obstack_sgrow (&string_obstack, "@:>@"); case 47: YY_RULE_SETUP -#line 212 "scan-gram.l" +#line 223 "scan-gram.l" { /* End of the comment. */ if (yy_top_state () == INITIAL) { @@ -1367,21 +1377,21 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 224 "scan-gram.l" +#line 235 "scan-gram.l" if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_BREAK case 49: YY_RULE_SETUP -#line 225 "scan-gram.l" +#line 236 "scan-gram.l" if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_LINES; YY_BREAK case 50: YY_RULE_SETUP -#line 226 "scan-gram.l" +#line 237 "scan-gram.l" /* Stray `*'. */if (yy_top_state () != INITIAL) YY_OBS_GROW; YY_BREAK case YY_STATE_EOF(SC_COMMENT): -#line 228 "scan-gram.l" +#line 239 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a comment\n"); @@ -1397,32 +1407,34 @@ case YY_STATE_EOF(SC_COMMENT): case 51: YY_RULE_SETUP -#line 243 "scan-gram.l" +#line 254 "scan-gram.l" { assert (yy_top_state () == INITIAL); YY_OBS_GROW; YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return STRING; } YY_BREAK case 52: YY_RULE_SETUP -#line 251 "scan-gram.l" +#line 263 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 53: YY_RULE_SETUP -#line 253 "scan-gram.l" +#line 265 "scan-gram.l" obstack_1grow (&string_obstack, '\n'); YY_LINES; YY_BREAK case YY_STATE_EOF(SC_ESCAPED_STRING): -#line 255 "scan-gram.l" +#line 267 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a string\n"); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return STRING; } @@ -1436,7 +1448,7 @@ case YY_STATE_EOF(SC_ESCAPED_STRING): case 54: YY_RULE_SETUP -#line 272 "scan-gram.l" +#line 285 "scan-gram.l" { YY_OBS_GROW; assert (yy_top_state () == INITIAL); @@ -1453,21 +1465,22 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 286 "scan-gram.l" +#line 299 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 56: YY_RULE_SETUP -#line 288 "scan-gram.l" +#line 301 "scan-gram.l" obstack_1grow (&string_obstack, '\n'); YY_LINES; YY_BREAK case YY_STATE_EOF(SC_ESCAPED_CHARACTER): -#line 290 "scan-gram.l" +#line 303 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a character\n"); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return CHARACTER; } @@ -1480,7 +1493,7 @@ case YY_STATE_EOF(SC_ESCAPED_CHARACTER): case 57: YY_RULE_SETUP -#line 307 "scan-gram.l" +#line 321 "scan-gram.l" { long c = strtol (yytext + 1, 0, 8); if (c > 255) @@ -1495,54 +1508,54 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 319 "scan-gram.l" +#line 333 "scan-gram.l" { obstack_1grow (&string_obstack, strtol (yytext + 2, 0, 16)); } YY_BREAK case 59: YY_RULE_SETUP -#line 323 "scan-gram.l" +#line 337 "scan-gram.l" obstack_1grow (&string_obstack, '\a'); YY_BREAK case 60: YY_RULE_SETUP -#line 324 "scan-gram.l" +#line 338 "scan-gram.l" obstack_1grow (&string_obstack, '\b'); YY_BREAK case 61: YY_RULE_SETUP -#line 325 "scan-gram.l" +#line 339 "scan-gram.l" obstack_1grow (&string_obstack, '\f'); YY_BREAK case 62: YY_RULE_SETUP -#line 326 "scan-gram.l" +#line 340 "scan-gram.l" obstack_1grow (&string_obstack, '\n'); YY_BREAK case 63: YY_RULE_SETUP -#line 327 "scan-gram.l" +#line 341 "scan-gram.l" obstack_1grow (&string_obstack, '\r'); YY_BREAK case 64: YY_RULE_SETUP -#line 328 "scan-gram.l" +#line 342 "scan-gram.l" obstack_1grow (&string_obstack, '\t'); YY_BREAK case 65: YY_RULE_SETUP -#line 329 "scan-gram.l" +#line 343 "scan-gram.l" obstack_1grow (&string_obstack, '\v'); YY_BREAK case 66: YY_RULE_SETUP -#line 330 "scan-gram.l" +#line 344 "scan-gram.l" obstack_1grow (&string_obstack, yytext[1]); YY_BREAK case 67: YY_RULE_SETUP -#line 331 "scan-gram.l" +#line 345 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unrecognized escape: %s\n", yytext); @@ -1558,7 +1571,7 @@ YY_RULE_SETUP case 68: YY_RULE_SETUP -#line 346 "scan-gram.l" +#line 360 "scan-gram.l" { YY_OBS_GROW; assert (yy_top_state () != INITIAL); @@ -1567,21 +1580,21 @@ YY_RULE_SETUP YY_BREAK case 69: YY_RULE_SETUP -#line 352 "scan-gram.l" +#line 366 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 70: YY_RULE_SETUP -#line 353 "scan-gram.l" +#line 367 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 71: YY_RULE_SETUP -#line 355 "scan-gram.l" +#line 369 "scan-gram.l" YY_OBS_GROW; YY_LINES; YY_BREAK case YY_STATE_EOF(SC_CHARACTER): -#line 357 "scan-gram.l" +#line 371 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a character\n"); @@ -1598,7 +1611,7 @@ case YY_STATE_EOF(SC_CHARACTER): case 72: YY_RULE_SETUP -#line 373 "scan-gram.l" +#line 387 "scan-gram.l" { assert (yy_top_state () != INITIAL); YY_OBS_GROW; @@ -1607,21 +1620,21 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 379 "scan-gram.l" +#line 393 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 74: YY_RULE_SETUP -#line 380 "scan-gram.l" +#line 394 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 75: YY_RULE_SETUP -#line 382 "scan-gram.l" +#line 396 "scan-gram.l" YY_OBS_GROW; YY_LINES; YY_BREAK case YY_STATE_EOF(SC_STRING): -#line 384 "scan-gram.l" +#line 398 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a string\n"); @@ -1638,24 +1651,24 @@ case YY_STATE_EOF(SC_STRING): /* Characters. We don't check there is only one. */ case 76: YY_RULE_SETUP -#line 400 "scan-gram.l" +#line 414 "scan-gram.l" YY_OBS_GROW; yy_push_state (SC_CHARACTER); YY_BREAK /* Strings. */ case 77: YY_RULE_SETUP -#line 403 "scan-gram.l" +#line 417 "scan-gram.l" YY_OBS_GROW; yy_push_state (SC_STRING); YY_BREAK /* Comments. */ case 78: YY_RULE_SETUP -#line 406 "scan-gram.l" +#line 420 "scan-gram.l" YY_OBS_GROW; yy_push_state (SC_COMMENT); YY_BREAK case 79: YY_RULE_SETUP -#line 407 "scan-gram.l" +#line 421 "scan-gram.l" YY_OBS_GROW; YY_BREAK @@ -1667,56 +1680,58 @@ YY_OBS_GROW; case 80: YY_RULE_SETUP -#line 418 "scan-gram.l" +#line 432 "scan-gram.l" { YY_OBS_GROW; if (--braces_level == 0) { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return BRACED_CODE; } } YY_BREAK case 81: YY_RULE_SETUP -#line 428 "scan-gram.l" +#line 443 "scan-gram.l" YY_OBS_GROW; braces_level++; YY_BREAK case 82: YY_RULE_SETUP -#line 430 "scan-gram.l" +#line 445 "scan-gram.l" { handle_dollar (yytext); } YY_BREAK case 83: YY_RULE_SETUP -#line 431 "scan-gram.l" +#line 446 "scan-gram.l" { handle_at (yytext); } YY_BREAK case 84: YY_RULE_SETUP -#line 433 "scan-gram.l" +#line 448 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 85: YY_RULE_SETUP -#line 434 "scan-gram.l" +#line 449 "scan-gram.l" YY_OBS_GROW; YY_LINES; YY_BREAK /* A lose $, or /, or etc. */ case 86: YY_RULE_SETUP -#line 437 "scan-gram.l" +#line 452 "scan-gram.l" YY_OBS_GROW; YY_BREAK case YY_STATE_EOF(SC_BRACED_CODE): -#line 439 "scan-gram.l" +#line 454 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a braced code\n"); yy_pop_state (); YY_OBS_FINISH; - return PROLOGUE; + yylval->string = last_string; + return BRACED_CODE; } YY_BREAK @@ -1727,35 +1742,37 @@ case YY_STATE_EOF(SC_BRACED_CODE): case 87: YY_RULE_SETUP -#line 456 "scan-gram.l" +#line 472 "scan-gram.l" { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return PROLOGUE; } YY_BREAK case 88: YY_RULE_SETUP -#line 462 "scan-gram.l" +#line 479 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 89: YY_RULE_SETUP -#line 463 "scan-gram.l" +#line 480 "scan-gram.l" YY_OBS_GROW; YY_BREAK case 90: YY_RULE_SETUP -#line 464 "scan-gram.l" +#line 481 "scan-gram.l" YY_OBS_GROW; YY_LINES; YY_BREAK case YY_STATE_EOF(SC_PROLOGUE): -#line 466 "scan-gram.l" +#line 483 "scan-gram.l" { LOCATION_PRINT (stderr, *yylloc); fprintf (stderr, ": unexpected end of file in a prologue\n"); yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return PROLOGUE; } YY_BREAK @@ -1768,24 +1785,25 @@ case YY_STATE_EOF(SC_PROLOGUE): case 91: YY_RULE_SETUP -#line 484 "scan-gram.l" +#line 502 "scan-gram.l" YY_OBS_GROW; YY_BREAK case YY_STATE_EOF(SC_EPILOGUE): -#line 486 "scan-gram.l" +#line 504 "scan-gram.l" { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return EPILOGUE; } YY_BREAK case 92: YY_RULE_SETUP -#line 494 "scan-gram.l" +#line 513 "scan-gram.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1789 "scan-gram.c" +#line 1807 "scan-gram.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2675,7 +2693,7 @@ int main() return 0; } #endif -#line 494 "scan-gram.l" +#line 513 "scan-gram.l" /*------------------------------------------------------------------. @@ -2792,3 +2810,9 @@ handle_at (char *cp) complain (_("%s is invalid"), quote (buf)); } } + +void +scanner_free (void) +{ + obstack_free (&string_obstack, 0); +} diff --git a/src/scan-gram.l b/src/scan-gram.l index e7ceecac..a3f6a2f6 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -59,7 +59,6 @@ char *last_string; do { \ obstack_1grow (&string_obstack, '\0'); \ last_string = obstack_finish (&string_obstack); \ - yylval->string = last_string; \ } while (0) #define YY_OBS_FREE \ @@ -67,6 +66,13 @@ char *last_string; obstack_free (&string_obstack, last_string); \ } while (0) +void +scanner_last_string_free (void) +{ + YY_OBS_FREE; +} + + /* This is only to avoid GCC warnings. */ #define YY_USER_INIT if (yycontrol) {;}; @@ -148,9 +154,7 @@ blanks [ \t\f]+ {eols} YY_LINES; YY_STEP; {blanks} YY_STEP; {id} { - YY_OBS_INIT; YY_OBS_GROW; YY_OBS_FINISH; - yylval->symbol = getsym (last_string); - YY_OBS_FREE; + yylval->symbol = getsym (yytext); return ID; } @@ -173,7 +177,14 @@ blanks [ \t\f]+ "{" YY_OBS_INIT; YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE); /* A type. */ - "<"[^>]+">" YY_OBS_INIT; obstack_grow (&string_obstack, yytext + 1, yyleng - 2); YY_OBS_FINISH; return TYPE; + "<"[^>]+">" { + YY_OBS_INIT; + obstack_grow (&string_obstack, yytext + 1, yyleng - 2); + YY_OBS_FINISH; + yylval->string = last_string; + return TYPE; + } + "%%" { if (++percent_percent_count == 2) @@ -244,6 +255,7 @@ blanks [ \t\f]+ assert (yy_top_state () == INITIAL); YY_OBS_GROW; YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return STRING; } @@ -257,6 +269,7 @@ blanks [ \t\f]+ fprintf (stderr, ": unexpected end of file in a string\n"); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return STRING; } @@ -292,6 +305,7 @@ blanks [ \t\f]+ fprintf (stderr, ": unexpected end of file in a character\n"); assert (yy_top_state () == INITIAL); YY_OBS_FINISH; + yylval->string = last_string; yy_pop_state (); return CHARACTER; } @@ -421,6 +435,7 @@ blanks [ \t\f]+ { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return BRACED_CODE; } } @@ -441,7 +456,8 @@ blanks [ \t\f]+ fprintf (stderr, ": unexpected end of file in a braced code\n"); yy_pop_state (); YY_OBS_FINISH; - return PROLOGUE; + yylval->string = last_string; + return BRACED_CODE; } } @@ -456,6 +472,7 @@ blanks [ \t\f]+ "%}" { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return PROLOGUE; } @@ -468,6 +485,7 @@ blanks [ \t\f]+ fprintf (stderr, ": unexpected end of file in a prologue\n"); yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return PROLOGUE; } @@ -486,6 +504,7 @@ blanks [ \t\f]+ <> { yy_pop_state (); YY_OBS_FINISH; + yylval->string = last_string; return EPILOGUE; } } @@ -607,3 +626,9 @@ handle_at (char *cp) complain (_("%s is invalid"), quote (buf)); } } + +void +scanner_free (void) +{ + obstack_free (&string_obstack, 0); +} -- 2.45.2