From 136a0f766b38072ec6ac6c386b230e04d4146151 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sun, 15 Oct 2006 12:37:07 +0000 Subject: [PATCH] 2006-10-16 Paolo Bonzini * data/bison.m4 (b4_user_requires, b4_user_provides): New. (b4_user_start_header): Remove. * data/glr.c: Use new macros instead of b4_*start_header and b4_*end_header. * data/glr.cc: Likewise. * data/lalr1.cc: Likewise. * data/push.c: Likewise. * data/yacc.c: Likewise. * doc/bison.texinfo: Remove %before-header, rename %{start,end,after}-header to %requires, %provides, %code. * src/parse-gram.y: Likewise (also rename token names accordingly). * src/scan-gram.l: Likewise. * tests/actions.at: Likewise. --- ChangeLog | 18 + data/bison.m4 | 8 +- data/glr.c | 14 +- data/glr.cc | 12 +- data/lalr1.cc | 14 +- data/push.c | 26 +- data/yacc.c | 26 +- doc/bison.texinfo | 79 ++- src/parse-gram.c | 1259 ++++++++++++++++++++++++--------------------- src/parse-gram.h | 182 +++---- src/parse-gram.y | 14 +- src/scan-gram.l | 7 +- tests/actions.at | 4 +- 13 files changed, 887 insertions(+), 776 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a1b7044..54a5ed5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-10-16 Paolo Bonzini + + * data/bison.m4 (b4_user_requires, b4_user_provides): New. + (b4_user_start_header): Remove. + * data/glr.c: Use new macros instead of b4_*start_header + and b4_*end_header. + * data/glr.cc: Likewise. + * data/lalr1.cc: Likewise. + * data/push.c: Likewise. + * data/yacc.c: Likewise. + + * doc/bison.texinfo: Remove %before-header, rename + %{start,end,after}-header to %requires, %provides, %code. + + * src/parse-gram.y: Likewise (also rename token names accordingly). + * src/scan-gram.l: Likewise. + * tests/actions.at: Likewise. + 2006-10-14 Paul Eggert * lib/Makefile.am (AM_CFLAGS): Remove $(WERROR_CFLAGS). diff --git a/data/bison.m4 b/data/bison.m4 index 6b3d5e86..87d113b6 100644 --- a/data/bison.m4 +++ b/data/bison.m4 @@ -178,14 +178,18 @@ m4_define([b4_define_user_code], # b4_user_actions # b4_user_initial_action # b4_user_post_prologue -# b4_user_start_header +# b4_user_pre_prologue +# b4_user_provides +# b4_user_requires # b4_user_stype # ---------------------- # Macros that issue user code, ending with synclines. b4_define_user_code([actions]) b4_define_user_code([initial_action]) b4_define_user_code([post_prologue]) -b4_define_user_code([start_header]) +b4_define_user_code([pre_prologue]) +b4_define_user_code([provides]) +b4_define_user_code([requires]) b4_define_user_code([stype]) diff --git a/data/glr.c b/data/glr.c index 92c5a626..406e3393 100644 --- a/data/glr.c +++ b/data/glr.c @@ -162,16 +162,16 @@ m4_if(b4_prefix, [yy], [], #define yylloc b4_prefix[]lloc])[ /* Copy the first part of user declarations. */ -]b4_pre_prologue +]b4_user_pre_prologue dnl # b4_shared_declarations dnl # ---------------------- dnl # Declaration that might either go into the header (if --defines) dnl # or open coded in the parser body. m4_define([b4_shared_declarations], -[m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_start_header])[]dnl +[m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[]dnl b4_token_enums(b4_tokens) @@ -202,9 +202,9 @@ typedef struct YYLTYPE # define YYLTYPE_IS_TRIVIAL 1 #endif -]m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +]m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl ]) b4_defines_if([#include @output_header_name@], diff --git a/data/glr.cc b/data/glr.cc index 8ee935aa..3a0b2161 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -225,9 +225,9 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++], #ifndef PARSER_HEADER_H # define PARSER_HEADER_H -]m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_user_start_header])[ +]m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[ #include #include @@ -373,8 +373,8 @@ m4_ifset([b4_global_tokens_and_yystype], } -]m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +]m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl [#endif /* ! defined PARSER_HEADER_H */] diff --git a/data/lalr1.cc b/data/lalr1.cc index e76077d6..efb639f1 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -43,9 +43,9 @@ dnl FIXME: This is wrong, we want computed header guards. #ifndef PARSER_HEADER_H # define PARSER_HEADER_H -]m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_user_start_header])[ +]m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[ #include #include @@ -295,9 +295,9 @@ b4_error_verbose_if([, int tok])[); # define YYSTYPE b4_namespace::b4_parser_class_name::semantic_type #endif ]) -m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl [#endif /* ! defined PARSER_HEADER_H */] ])dnl @@ -310,7 +310,7 @@ m4_if(b4_prefix, [yy], [], #define yylex b4_prefix[]lex])[ /* First part of user declarations. */ -]b4_pre_prologue +]b4_user_pre_prologue b4_defines_if([ #include @output_header_name@])[ diff --git a/data/push.c b/data/push.c index 4e3baf62..98ece5f4 100644 --- a/data/push.c +++ b/data/push.c @@ -168,7 +168,7 @@ b4_push_if([ #define yylloc_set b4_prefix[]lloc_set])])[ /* Copy the first part of user declarations. */ -]b4_pre_prologue[ +]b4_user_pre_prologue[ /* Enabling traces. */ #ifndef YYDEBUG @@ -188,9 +188,9 @@ b4_push_if([ # define YYTOKEN_TABLE ]b4_token_table[ #endif -]m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_start_header])[]dnl +]m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[]dnl b4_token_enums_defines(b4_tokens)[ @@ -220,9 +220,9 @@ typedef struct YYLTYPE # define YYLTYPE_IS_TRIVIAL 1 #endif]) -m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl [/* Copy the second part of user declarations. */ ]b4_user_post_prologue[ @@ -1710,9 +1710,9 @@ b4_defines_if( b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl ' [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006]) -m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_start_header])[]dnl +m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[]dnl b4_token_enums_defines(b4_tokens) @@ -1752,7 +1752,7 @@ enum { YYPUSH_MORE = 4 };])[ [extern YYLTYPE b4_prefix[]lloc;]) )dnl b4_locations_if -m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl ])dnl b4_defines_if diff --git a/data/yacc.c b/data/yacc.c index 74a014f1..00b033d8 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -161,7 +161,7 @@ m4_if(b4_prefix, [yy], [], b4_locations_if([#define yylloc b4_prefix[]lloc])])[ /* Copy the first part of user declarations. */ -]b4_pre_prologue[ +]b4_user_pre_prologue[ /* Enabling traces. */ #ifndef YYDEBUG @@ -181,9 +181,9 @@ b4_locations_if([#define yylloc b4_prefix[]lloc])])[ # define YYTOKEN_TABLE ]b4_token_table[ #endif -]m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_start_header])[]dnl +]m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[]dnl b4_token_enums_defines(b4_tokens)[ @@ -213,9 +213,9 @@ typedef struct YYLTYPE # define YYLTYPE_IS_TRIVIAL 1 #endif]) -m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl [/* Copy the second part of user declarations. */ ]b4_user_post_prologue[ @@ -1489,9 +1489,9 @@ b4_defines_if( b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl ' [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006]) -m4_ifdef([b4_start_header], -[[/* Copy the %start-header blocks. */ -]b4_start_header])[]dnl +m4_ifdef([b4_requires], +[[/* Copy the %requires blocks. */ +]b4_user_requires])[]dnl b4_token_enums_defines(b4_tokens) @@ -1529,7 +1529,7 @@ typedef struct YYLTYPE [extern YYLTYPE b4_prefix[]lloc;]) )dnl b4_locations_if -m4_ifdef([b4_end_header], -[[/* Copy the %end-header blocks. */ -]b4_end_header])[]dnl +m4_ifdef([b4_provides], +[[/* Copy the %provides blocks. */ +]b4_user_provides])[]dnl ])dnl b4_defines_if diff --git a/doc/bison.texinfo b/doc/bison.texinfo index 576a2746..bcff2ea5 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -2674,22 +2674,17 @@ of feature test macros like @code{_GNU_SOURCE} or feature test macros can affect the behavior of Bison-generated @code{#include} directives. -@findex %before-header -@findex %start-header -@findex %after-header +@findex %requires +@findex %code If you've instructed Bison to generate a header file (@pxref{Table of Symbols, ,%defines}), you probably want @code{#include "ptypes.h"} to appear in that header file as well. -In that case, use @code{%before-header}, @code{%start-header}, and -@code{%after-header} instead of @var{Prologue} sections -(@pxref{Table of Symbols, ,%start-header}): +In that case, use @code{%requires}, @code{%provides}, and +@code{%code} instead of @var{Prologue} sections +(@pxref{Table of Symbols, ,%requires}): @smallexample -%before-header @{ - #include -@} - -%start-header @{ +%requires @{ #include "ptypes.h" @} %union @{ @@ -2697,7 +2692,9 @@ In that case, use @code{%before-header}, @code{%start-header}, and tree t; /* @r{@code{tree} is defined in @file{ptypes.h}.} */ @} -%after-header @{ +%code @{ + #include + static void print_token_value (FILE *, int, YYSTYPE); #define YYPRINT(F, N, L) print_token_value (F, N, L) @} @@ -4327,11 +4324,11 @@ typically needs to be able to refer to the above-mentioned declarations and to the token type codes. @xref{Token Values, ,Semantic Values of Tokens}. -@findex %start-header -@findex %end-header -If you have declared @code{%start-header} or @code{%end-header}, the output +@findex %requires +@findex %provides +If you have declared @code{%requires} or @code{%provides}, the output header also contains their code. -@xref{Table of Symbols, ,%start-header}. +@xref{Table of Symbols, ,%requires}. @end deffn @deffn {Directive} %destructor @@ -7560,18 +7557,18 @@ the grammar for. @end example @noindent -@findex %start-header +@findex %requires Then come the declarations/inclusions needed to define the @code{%union}. Because the parser uses the parsing driver and reciprocally, both cannot include the header of the other. Because the driver's header needs detailed knowledge about the parser class (in particular its inner types), it is the parser's header which will simply use a forward declaration of the driver. -@xref{Table of Symbols, ,%start-header}. +@xref{Table of Symbols, ,%requires}. @comment file: calc++-parser.yy @example -%start-header @{ +%requires @{ # include class calcxx_driver; @} @@ -7630,13 +7627,13 @@ them. @end example @noindent -@findex %after-header -The code between @samp{%after-header @{} and @samp{@}} is output in the +@findex %code +The code between @samp{%code @{} and @samp{@}} is output in the @file{*.cc} file; it needs detailed knowledge about the driver. @comment file: calc++-parser.yy @example -%after-header @{ +%code @{ # include "calc++-driver.hh" @} @end example @@ -8308,49 +8305,35 @@ $end}, where @var{start} is the start symbol. @xref{Start Decl, , The Start-Symbol}. It cannot be used in the grammar. @end deffn -@deffn {Directive} %after-header @{@var{code}@} +@deffn {Directive} %code @{@var{code}@} Specifies code to be inserted into the code file after the contents of the header file. -@xref{Table of Symbols, ,%start-header}. +@xref{Table of Symbols, ,%requires}. @end deffn -@deffn {Directive} %before-header @{@var{code}@} -Specifies code to be inserted into the code file before the contents of the -header file. -@xref{Table of Symbols, ,%start-header}. -@end deffn - -@deffn {Directive} %end-header @{@var{code}@} +@deffn {Directive} %provides @{@var{code}@} Specifies code to be inserted both into the header file (if generated; @pxref{Table of Symbols, ,%defines}) and into the code file after any Bison-generated definitions. -@xref{Table of Symbols, ,%start-header}. +@xref{Table of Symbols, ,%requires}. @end deffn -@deffn {Directive} %start-header @{@var{code}@} +@deffn {Directive} %requires @{@var{code}@} Specifies code to be inserted both into the header file (if generated; @pxref{Table of Symbols, ,%defines}) and into the code file before any Bison-generated definitions. @cindex Prologue -@findex %before-header @findex %union -@findex %end-header -@findex %after-header +@findex %provides +@findex %code For example, the following declaration order in the grammar file reflects the order in which Bison will output these code blocks. However, you are free to declare these code blocks in your grammar file in whatever order is most convenient for you: @smallexample -%before-header @{ - /* Bison treats this block like a pre-prologue block: it inserts it - * into the code file before the contents of the header file. It - * does *not* insert it into the header file. This is a good place - * to put #include's that you want at the top of your code file. A - * common example is `#include "system.h"'. */ -@} -%start-header @{ +%requires @{ /* Bison inserts this block into both the header file and the code * file. In both files, the point of insertion is before any * Bison-generated token, semantic type, location type, and class @@ -8359,17 +8342,17 @@ convenient for you: @} %union @{ /* Unlike the traditional Yacc prologue blocks, the output order - * for the %*-header blocks is not affected by their declaration - * position relative to any %union in the grammar file. */ + * for %requires, %provides or %code blocks is not affected by their + * declaration position relative to any %union in the grammar file. */ @} -%end-header @{ +%provides @{ /* Bison inserts this block into both the header file and the code * file. In both files, the point of insertion is after the * Bison-generated definitions. This is a good place to declare or * define public functions or data structures that depend on the * Bison-generated definitions. */ @} -%after-header @{ +%code @{ /* Bison treats this block like a post-prologue block: it inserts * it into the code file after the contents of the header file. It * does *not* insert it into the header file. This is a good place diff --git a/src/parse-gram.c b/src/parse-gram.c index 064f8f41..2fbe52e1 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,20 +1,20 @@ -/* A Bison parser, made by GNU Bison 2.3a. */ +/* A Bison parser, made by GNU Bison 2.3a+. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, @@ -29,7 +29,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3a" +#define YYBISON_VERSION "2.3a+" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -72,8 +72,9 @@ #define yylloc gram_lloc /* Copy the first part of user declarations. */ -/* Line 164 of yacc.c. */ -#line 1 "parse-gram.y" + +/* Line 164 of yacc.c */ +#line 1 "../../src/parse-gram.y" /* Bison Grammar Parser -*- C -*- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -151,6 +152,9 @@ static int current_prec = 0; #define YYTYPE_UINT8 uint_fast8_t +/* Line 164 of yacc.c */ +#line 157 "../../src/parse-gram.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -191,48 +195,47 @@ static int current_prec = 0; PERCENT_PREC = 269, PERCENT_DPREC = 270, PERCENT_MERGE = 271, - PERCENT_AFTER_HEADER = 272, - PERCENT_BEFORE_HEADER = 273, - PERCENT_DEBUG = 274, - PERCENT_DEFAULT_PREC = 275, - PERCENT_DEFINE = 276, - PERCENT_DEFINES = 277, - PERCENT_END_HEADER = 278, - PERCENT_ERROR_VERBOSE = 279, - PERCENT_EXPECT = 280, - PERCENT_EXPECT_RR = 281, - PERCENT_FILE_PREFIX = 282, - PERCENT_GLR_PARSER = 283, - PERCENT_INITIAL_ACTION = 284, - PERCENT_LEX_PARAM = 285, - PERCENT_LOCATIONS = 286, - PERCENT_NAME_PREFIX = 287, - PERCENT_NO_DEFAULT_PREC = 288, - PERCENT_NO_LINES = 289, - PERCENT_NONDETERMINISTIC_PARSER = 290, - PERCENT_OUTPUT = 291, - PERCENT_PARSE_PARAM = 292, - PERCENT_PURE_PARSER = 293, - PERCENT_PUSH_PARSER = 294, - PERCENT_REQUIRE = 295, + PERCENT_CODE = 272, + PERCENT_DEBUG = 273, + PERCENT_DEFAULT_PREC = 274, + PERCENT_DEFINE = 275, + PERCENT_DEFINES = 276, + PERCENT_ERROR_VERBOSE = 277, + PERCENT_EXPECT = 278, + PERCENT_EXPECT_RR = 279, + PERCENT_FILE_PREFIX = 280, + PERCENT_GLR_PARSER = 281, + PERCENT_INITIAL_ACTION = 282, + PERCENT_LEX_PARAM = 283, + PERCENT_LOCATIONS = 284, + PERCENT_NAME_PREFIX = 285, + PERCENT_NO_DEFAULT_PREC = 286, + PERCENT_NO_LINES = 287, + PERCENT_NONDETERMINISTIC_PARSER = 288, + PERCENT_OUTPUT = 289, + PERCENT_PARSE_PARAM = 290, + PERCENT_PROVIDES = 291, + PERCENT_PURE_PARSER = 292, + PERCENT_PUSH_PARSER = 293, + PERCENT_REQUIRE = 294, + PERCENT_REQUIRES = 295, PERCENT_SKELETON = 296, PERCENT_START = 297, - PERCENT_START_HEADER = 298, - PERCENT_TOKEN_TABLE = 299, - PERCENT_VERBOSE = 300, - PERCENT_YACC = 301, - BRACED_CODE = 302, - CHAR = 303, - EPILOGUE = 304, - EQUAL = 305, - ID = 306, - ID_COLON = 307, - PERCENT_PERCENT = 308, - PIPE = 309, - PROLOGUE = 310, - SEMICOLON = 311, - TYPE = 312, - PERCENT_UNION = 313 + PERCENT_TOKEN_TABLE = 298, + PERCENT_VERBOSE = 299, + PERCENT_YACC = 300, + BRACED_CODE = 301, + CHAR = 302, + EPILOGUE = 303, + EQUAL = 304, + ID = 305, + ID_COLON = 306, + PERCENT_PERCENT = 307, + PIPE = 308, + PROLOGUE = 309, + SEMICOLON = 310, + TYPE = 311, + PERCENT_UNION = 312 }; #endif /* Tokens. */ @@ -251,56 +254,56 @@ static int current_prec = 0; #define PERCENT_PREC 269 #define PERCENT_DPREC 270 #define PERCENT_MERGE 271 -#define PERCENT_AFTER_HEADER 272 -#define PERCENT_BEFORE_HEADER 273 -#define PERCENT_DEBUG 274 -#define PERCENT_DEFAULT_PREC 275 -#define PERCENT_DEFINE 276 -#define PERCENT_DEFINES 277 -#define PERCENT_END_HEADER 278 -#define PERCENT_ERROR_VERBOSE 279 -#define PERCENT_EXPECT 280 -#define PERCENT_EXPECT_RR 281 -#define PERCENT_FILE_PREFIX 282 -#define PERCENT_GLR_PARSER 283 -#define PERCENT_INITIAL_ACTION 284 -#define PERCENT_LEX_PARAM 285 -#define PERCENT_LOCATIONS 286 -#define PERCENT_NAME_PREFIX 287 -#define PERCENT_NO_DEFAULT_PREC 288 -#define PERCENT_NO_LINES 289 -#define PERCENT_NONDETERMINISTIC_PARSER 290 -#define PERCENT_OUTPUT 291 -#define PERCENT_PARSE_PARAM 292 -#define PERCENT_PURE_PARSER 293 -#define PERCENT_PUSH_PARSER 294 -#define PERCENT_REQUIRE 295 +#define PERCENT_CODE 272 +#define PERCENT_DEBUG 273 +#define PERCENT_DEFAULT_PREC 274 +#define PERCENT_DEFINE 275 +#define PERCENT_DEFINES 276 +#define PERCENT_ERROR_VERBOSE 277 +#define PERCENT_EXPECT 278 +#define PERCENT_EXPECT_RR 279 +#define PERCENT_FILE_PREFIX 280 +#define PERCENT_GLR_PARSER 281 +#define PERCENT_INITIAL_ACTION 282 +#define PERCENT_LEX_PARAM 283 +#define PERCENT_LOCATIONS 284 +#define PERCENT_NAME_PREFIX 285 +#define PERCENT_NO_DEFAULT_PREC 286 +#define PERCENT_NO_LINES 287 +#define PERCENT_NONDETERMINISTIC_PARSER 288 +#define PERCENT_OUTPUT 289 +#define PERCENT_PARSE_PARAM 290 +#define PERCENT_PROVIDES 291 +#define PERCENT_PURE_PARSER 292 +#define PERCENT_PUSH_PARSER 293 +#define PERCENT_REQUIRE 294 +#define PERCENT_REQUIRES 295 #define PERCENT_SKELETON 296 #define PERCENT_START 297 -#define PERCENT_START_HEADER 298 -#define PERCENT_TOKEN_TABLE 299 -#define PERCENT_VERBOSE 300 -#define PERCENT_YACC 301 -#define BRACED_CODE 302 -#define CHAR 303 -#define EPILOGUE 304 -#define EQUAL 305 -#define ID 306 -#define ID_COLON 307 -#define PERCENT_PERCENT 308 -#define PIPE 309 -#define PROLOGUE 310 -#define SEMICOLON 311 -#define TYPE 312 -#define PERCENT_UNION 313 +#define PERCENT_TOKEN_TABLE 298 +#define PERCENT_VERBOSE 299 +#define PERCENT_YACC 300 +#define BRACED_CODE 301 +#define CHAR 302 +#define EPILOGUE 303 +#define EQUAL 304 +#define ID 305 +#define ID_COLON 306 +#define PERCENT_PERCENT 307 +#define PIPE 308 +#define PROLOGUE 309 +#define SEMICOLON 310 +#define TYPE 311 +#define PERCENT_UNION 312 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -{/* Line 198 of yacc.c. */ -#line 98 "parse-gram.y" +{ +/* Line 198 of yacc.c */ +#line 98 "../../src/parse-gram.y" symbol *symbol; symbol_list *list; @@ -310,8 +313,9 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; } -/* Line 198 of yacc.c. */ -#line 315 "parse-gram.c" + +/* Line 198 of yacc.c */ +#line 319 "../../src/parse-gram.c" YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -334,8 +338,9 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -/* Line 221 of yacc.c. */ -#line 339 "parse-gram.c" + +/* Line 221 of yacc.c */ +#line 344 "../../src/parse-gram.c" #ifdef short # undef short @@ -552,20 +557,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 185 +#define YYLAST 184 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 59 +#define YYNTOKENS 58 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 31 /* YYNRULES -- Number of rules. */ -#define YYNRULES 98 +#define YYNRULES 97 /* YYNRULES -- Number of states. */ -#define YYNSTATES 137 +#define YYNSTATES 135 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 313 +#define YYMAXUTOK 312 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -604,7 +609,7 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58 + 55, 56, 57 }; #if YYDEBUG @@ -612,61 +617,61 @@ static const yytype_uint8 yytranslate[] = YYRHS. */ static const yytype_uint8 yyprhs[] = { - 0, 0, 3, 8, 9, 12, 14, 16, 19, 22, - 24, 28, 30, 33, 35, 38, 41, 45, 47, 50, - 53, 55, 59, 61, 63, 67, 70, 72, 74, 77, - 80, 83, 85, 87, 89, 91, 93, 95, 98, 102, - 106, 108, 110, 111, 113, 117, 118, 122, 123, 127, - 131, 135, 137, 139, 141, 142, 144, 146, 149, 151, - 154, 156, 158, 160, 162, 164, 167, 170, 174, 176, - 179, 181, 184, 186, 189, 192, 193, 197, 199, 203, - 206, 207, 210, 213, 217, 221, 225, 227, 229, 230, - 232, 234, 236, 238, 240, 242, 244, 246, 247 + 0, 0, 3, 8, 9, 12, 14, 16, 19, 21, + 25, 27, 29, 32, 35, 39, 41, 44, 47, 49, + 53, 55, 57, 61, 64, 67, 69, 71, 74, 77, + 80, 82, 84, 86, 88, 90, 92, 95, 99, 103, + 105, 107, 108, 110, 114, 115, 119, 120, 124, 128, + 132, 134, 136, 138, 139, 141, 143, 146, 148, 151, + 153, 155, 157, 159, 161, 164, 167, 171, 173, 176, + 178, 181, 183, 186, 189, 190, 194, 196, 200, 203, + 204, 207, 210, 214, 218, 222, 224, 226, 227, 229, + 231, 233, 235, 237, 239, 241, 243, 244 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 60, 0, -1, 61, 53, 76, 89, -1, -1, 61, - 62, -1, 63, -1, 55, -1, 17, 84, -1, 18, - 84, -1, 19, -1, 21, 3, 83, -1, 22, -1, - 23, 84, -1, 24, -1, 25, 4, -1, 26, 4, - -1, 27, 50, 3, -1, 28, -1, 29, 47, -1, - 30, 47, -1, 31, -1, 32, 50, 3, -1, 34, - -1, 35, -1, 36, 50, 3, -1, 37, 47, -1, - 38, -1, 39, -1, 40, 3, -1, 41, 3, -1, - 43, 84, -1, 44, -1, 45, -1, 46, -1, 56, - -1, 68, -1, 65, -1, 42, 87, -1, 8, 47, - 72, -1, 9, 47, 72, -1, 20, -1, 33, -1, - -1, 51, -1, 58, 64, 47, -1, -1, 6, 66, - 75, -1, -1, 5, 67, 75, -1, 7, 57, 71, - -1, 69, 70, 71, -1, 11, -1, 12, -1, 13, - -1, -1, 57, -1, 87, -1, 71, 87, -1, 73, - -1, 72, 73, -1, 87, -1, 57, -1, 10, -1, - 57, -1, 85, -1, 85, 4, -1, 85, 88, -1, - 85, 4, 88, -1, 74, -1, 75, 74, -1, 77, - -1, 76, 77, -1, 78, -1, 63, 56, -1, 1, - 56, -1, -1, 86, 79, 80, -1, 81, -1, 80, - 54, 81, -1, 80, 56, -1, -1, 81, 87, -1, - 81, 47, -1, 81, 14, 87, -1, 81, 15, 4, - -1, 81, 16, 57, -1, 3, -1, 84, -1, -1, - 82, -1, 47, -1, 51, -1, 48, -1, 52, -1, - 85, -1, 88, -1, 3, -1, -1, 53, 49, -1 + 59, 0, -1, 60, 52, 75, 88, -1, -1, 60, + 61, -1, 62, -1, 54, -1, 17, 83, -1, 18, + -1, 20, 3, 82, -1, 21, -1, 22, -1, 23, + 4, -1, 24, 4, -1, 25, 49, 3, -1, 26, + -1, 27, 46, -1, 28, 46, -1, 29, -1, 30, + 49, 3, -1, 32, -1, 33, -1, 34, 49, 3, + -1, 35, 46, -1, 36, 83, -1, 37, -1, 38, + -1, 39, 3, -1, 40, 83, -1, 41, 3, -1, + 43, -1, 44, -1, 45, -1, 55, -1, 67, -1, + 64, -1, 42, 86, -1, 8, 46, 71, -1, 9, + 46, 71, -1, 19, -1, 31, -1, -1, 50, -1, + 57, 63, 46, -1, -1, 6, 65, 74, -1, -1, + 5, 66, 74, -1, 7, 56, 70, -1, 68, 69, + 70, -1, 11, -1, 12, -1, 13, -1, -1, 56, + -1, 86, -1, 70, 86, -1, 72, -1, 71, 72, + -1, 86, -1, 56, -1, 10, -1, 56, -1, 84, + -1, 84, 4, -1, 84, 87, -1, 84, 4, 87, + -1, 73, -1, 74, 73, -1, 76, -1, 75, 76, + -1, 77, -1, 62, 55, -1, 1, 55, -1, -1, + 85, 78, 79, -1, 80, -1, 79, 53, 80, -1, + 79, 55, -1, -1, 80, 86, -1, 80, 46, -1, + 80, 14, 86, -1, 80, 15, 4, -1, 80, 16, + 56, -1, 3, -1, 83, -1, -1, 81, -1, 46, + -1, 50, -1, 47, -1, 51, -1, 84, -1, 87, + -1, 3, -1, -1, 52, 48, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 209, 209, 217, 219, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 240, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 263, 264, 265, 269, 277, - 285, 289, 303, 304, 308, 336, 336, 341, 341, 346, - 357, 372, 373, 374, 378, 379, 384, 386, 391, 392, - 396, 397, 398, 403, 408, 413, 419, 425, 436, 437, - 446, 447, 453, 454, 455, 462, 462, 466, 467, 468, - 473, 474, 476, 478, 480, 482, 492, 493, 499, 503, - 508, 524, 526, 535, 540, 541, 546, 553, 555 + 0, 208, 208, 216, 218, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 237, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 261, 262, 263, 267, 275, 283, + 287, 301, 302, 306, 334, 334, 339, 339, 344, 355, + 370, 371, 372, 376, 377, 382, 384, 389, 390, 394, + 395, 396, 401, 406, 411, 417, 423, 434, 435, 444, + 445, 451, 452, 453, 460, 460, 464, 465, 466, 471, + 472, 474, 476, 478, 480, 490, 491, 497, 501, 506, + 522, 524, 533, 538, 539, 544, 551, 553 }; #endif @@ -678,16 +683,15 @@ static const char *const yytname[] = "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", "\"%printer\"", "\"%symbol-default\"", "\"%left\"", "\"%right\"", - "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", - "\"%after-header\"", "\"%before-header\"", "\"%debug\"", - "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%end-header\"", + "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"", + "\"%debug\"", "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"", "\"%initial-action\"", "\"%lex-param\"", "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"", "\"%nondeterministic-parser\"", - "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", - "\"%push-parser\"", "\"%require\"", "\"%skeleton\"", "\"%start\"", - "\"%start-header\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", + "\"%output\"", "\"%parse-param\"", "\"%provides\"", "\"%pure-parser\"", + "\"%push-parser\"", "\"%require\"", "\"%requires\"", "\"%skeleton\"", + "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"char\"", "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"", "\";\"", "\"type\"", "\"%union\"", "$accept", "input", "prologue_declarations", @@ -711,38 +715,38 @@ static const yytype_uint16 yytoknum[] = 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, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313 + 305, 306, 307, 308, 309, 310, 311, 312 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 59, 60, 61, 61, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, - 63, 63, 64, 64, 63, 66, 65, 67, 65, 65, - 68, 69, 69, 69, 70, 70, 71, 71, 72, 72, - 73, 73, 73, 74, 74, 74, 74, 74, 75, 75, - 76, 76, 77, 77, 77, 79, 78, 80, 80, 80, - 81, 81, 81, 81, 81, 81, 82, 82, 83, 83, - 84, 85, 85, 86, 87, 87, 88, 89, 89 + 0, 58, 59, 60, 60, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 62, 62, 62, 62, 62, 62, + 62, 63, 63, 62, 65, 64, 66, 64, 64, 67, + 68, 68, 68, 69, 69, 70, 70, 71, 71, 72, + 72, 72, 73, 73, 73, 73, 73, 74, 74, 75, + 75, 76, 76, 76, 78, 77, 79, 79, 79, 80, + 80, 80, 80, 80, 80, 81, 81, 82, 82, 83, + 84, 84, 85, 86, 86, 87, 88, 88 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { - 0, 2, 4, 0, 2, 1, 1, 2, 2, 1, - 3, 1, 2, 1, 2, 2, 3, 1, 2, 2, - 1, 3, 1, 1, 3, 2, 1, 1, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 3, 3, - 1, 1, 0, 1, 3, 0, 3, 0, 3, 3, - 3, 1, 1, 1, 0, 1, 1, 2, 1, 2, - 1, 1, 1, 1, 1, 2, 2, 3, 1, 2, - 1, 2, 1, 2, 2, 0, 3, 1, 3, 2, - 0, 2, 2, 3, 3, 3, 1, 1, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 2 + 0, 2, 4, 0, 2, 1, 1, 2, 1, 3, + 1, 1, 2, 2, 3, 1, 2, 2, 1, 3, + 1, 1, 3, 2, 2, 1, 1, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 2, 3, 3, 1, + 1, 0, 1, 3, 0, 3, 0, 3, 3, 3, + 1, 1, 1, 0, 1, 1, 2, 1, 2, 1, + 1, 1, 1, 1, 2, 2, 3, 1, 2, 1, + 2, 1, 2, 2, 0, 3, 1, 3, 2, 0, + 2, 2, 3, 3, 3, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -750,130 +754,130 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 0, 1, 47, 45, 0, 0, 0, 51, - 52, 53, 0, 0, 9, 40, 0, 11, 0, 13, - 0, 0, 0, 17, 0, 0, 20, 0, 41, 22, - 23, 0, 0, 26, 27, 0, 0, 0, 0, 31, - 32, 33, 0, 6, 34, 42, 4, 5, 36, 35, - 54, 0, 0, 0, 0, 0, 90, 7, 8, 88, - 12, 14, 15, 0, 18, 19, 0, 0, 25, 28, - 29, 96, 92, 91, 94, 37, 95, 30, 0, 93, - 0, 0, 70, 72, 75, 43, 0, 55, 0, 63, - 68, 48, 64, 46, 49, 56, 62, 61, 38, 58, - 60, 39, 86, 89, 10, 87, 16, 21, 24, 74, - 73, 0, 71, 2, 80, 44, 50, 69, 65, 66, - 57, 59, 98, 76, 77, 67, 80, 79, 0, 0, - 0, 82, 81, 78, 83, 84, 85 + 3, 0, 0, 1, 46, 44, 0, 0, 0, 50, + 51, 52, 0, 8, 39, 0, 10, 11, 0, 0, + 0, 15, 0, 0, 18, 0, 40, 20, 21, 0, + 0, 0, 25, 26, 0, 0, 0, 0, 30, 31, + 32, 0, 6, 33, 41, 4, 5, 35, 34, 53, + 0, 0, 0, 0, 0, 89, 7, 87, 12, 13, + 0, 16, 17, 0, 0, 23, 24, 27, 28, 29, + 95, 91, 90, 93, 36, 94, 0, 92, 0, 0, + 69, 71, 74, 42, 0, 54, 0, 62, 67, 47, + 63, 45, 48, 55, 61, 60, 37, 57, 59, 38, + 85, 88, 9, 86, 14, 19, 22, 73, 72, 0, + 70, 2, 79, 43, 49, 68, 64, 65, 56, 58, + 97, 75, 76, 66, 79, 78, 0, 0, 0, 81, + 80, 77, 82, 83, 84 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 2, 46, 80, 86, 48, 52, 51, 49, - 50, 88, 94, 98, 99, 90, 91, 81, 82, 83, - 114, 123, 124, 103, 104, 57, 74, 84, 100, 76, - 113 + -1, 1, 2, 45, 78, 84, 47, 51, 50, 48, + 49, 86, 92, 96, 97, 88, 89, 79, 80, 81, + 112, 121, 122, 101, 102, 56, 73, 82, 98, 75, + 111 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -90 -static const yytype_int8 yypact[] = +#define YYPACT_NINF -75 +static const yytype_int16 yypact[] = { - -90, 23, 92, -90, -90, -90, -24, -10, -6, -90, - -90, -90, -2, -2, -90, -90, 47, -90, -2, -90, - 62, 64, 20, -90, 25, 27, -90, 26, -90, -90, - -90, 28, 35, -90, -90, 72, 80, 14, -2, -90, - -90, -90, 19, -90, -90, 34, -90, -90, -90, -90, - 29, 16, 16, 14, 12, 12, -90, -90, -90, 8, - -90, -90, -90, 85, -90, -90, 86, 87, -90, -90, - -90, -90, -90, -90, -90, -90, -90, -90, 36, -90, - 37, 1, -90, -90, -90, -90, 48, -90, 14, -90, - -90, 16, 15, 16, 14, -90, -90, -90, 12, -90, - -90, 12, -90, -90, -90, -90, -90, -90, -90, -90, - -90, 45, -90, -90, -90, -90, 14, -90, 99, -90, - -90, -90, -90, -14, 33, -90, -90, -90, 14, 102, - 50, -90, -90, 33, -90, -90, -90 + -75, 5, 90, -75, -75, -75, -52, -25, -19, -75, + -75, -75, -13, -75, -75, 42, -75, -75, 47, 52, + 15, -75, 19, 21, -75, 20, -75, -75, -75, 22, + 24, -13, -75, -75, 69, -13, 70, 0, -75, -75, + -75, 17, -75, -75, 26, -75, -75, -75, -75, 27, + 10, 10, 0, 28, 28, -75, -75, 8, -75, -75, + 77, -75, -75, 79, 83, -75, -75, -75, -75, -75, + -75, -75, -75, -75, -75, -75, 32, -75, 33, 1, + -75, -75, -75, -75, 44, -75, 0, -75, -75, 10, + 59, 10, 0, -75, -75, -75, 28, -75, -75, 28, + -75, -75, -75, -75, -75, -75, -75, -75, -75, 43, + -75, -75, -75, -75, 0, -75, 89, -75, -75, -75, + -75, -36, 134, -75, -75, -75, 0, 96, 37, -75, + -75, 134, -75, -75, -75 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -90, -90, -90, -90, 106, -90, -90, -90, -90, -90, - -90, -90, 52, 88, -63, -35, 89, -90, 61, -90, - -90, -90, 30, -90, -90, 126, -47, -90, -37, -89, - -90 + -75, -75, -75, -75, 102, -75, -75, -75, -75, -75, + -75, -75, 50, 51, -62, -45, 55, -75, 60, -75, + -75, -75, 14, -75, -75, 4, -10, -75, -37, -74, + -75 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -98 +#define YYTABLE_NINF -97 static const yytype_int16 yytable[] = { - 75, -97, 78, 119, 92, 92, 4, 5, 6, 7, - 8, 102, 9, 10, 11, 71, 95, 71, 71, 118, - 78, 15, 96, 3, 4, 5, 6, 7, 8, 125, - 9, 10, 11, 53, 28, 121, 71, 54, 121, 15, - 126, 55, 127, 37, 92, 56, 92, 128, 129, 130, - 59, 95, 28, 79, 111, 56, 117, 120, 117, 45, - 72, 37, 72, 73, 72, 73, 61, 73, 62, 97, - 63, 79, 64, 89, 65, 69, 66, 45, 67, 120, - 131, 72, 68, 70, 73, 85, 87, 132, 106, 107, - 108, 134, 109, 110, 122, 115, 132, 4, 5, 6, - 7, 8, 71, 9, 10, 11, 135, 136, 47, 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, 41, 58, - 116, 93, 112, 101, 60, 42, 0, 43, 44, 0, - 45, 0, 0, 0, 0, 0, 133, 0, 0, 0, - 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, + 74, -96, 76, 70, 52, 3, 4, 5, 6, 7, + 8, 100, 9, 10, 11, 93, 117, 124, 76, 125, + 14, 53, 4, 5, 6, 7, 8, 54, 9, 10, + 11, 70, 26, 55, 119, 66, 14, 119, 94, 68, + 90, 90, 123, 37, 115, 57, 115, 71, 26, 93, + 72, 58, 77, 109, 55, 118, 59, 71, 44, 37, + 72, 103, 70, 116, 60, 61, 87, 62, 77, 63, + 65, 64, 67, 69, 44, 71, 83, 118, 72, 90, + 104, 90, 105, 85, 95, 130, 106, 107, 108, 132, + 113, 120, 70, 134, 130, 4, 5, 6, 7, 8, + 133, 9, 10, 11, 46, 99, 91, 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, 114, 70, 131, 110, + 0, 0, 41, 0, 42, 43, 0, 44, 126, 127, + 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 105 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 129, 71, 0, 0, 72 }; static const yytype_int16 yycheck[] = { - 37, 0, 1, 92, 51, 52, 5, 6, 7, 8, - 9, 3, 11, 12, 13, 3, 53, 3, 3, 4, - 1, 20, 10, 0, 5, 6, 7, 8, 9, 118, - 11, 12, 13, 57, 33, 98, 3, 47, 101, 20, - 54, 47, 56, 42, 91, 47, 93, 14, 15, 16, - 3, 88, 33, 52, 53, 47, 91, 94, 93, 58, - 48, 42, 48, 51, 48, 51, 4, 51, 4, 57, - 50, 52, 47, 57, 47, 3, 50, 58, 50, 116, - 47, 48, 47, 3, 51, 51, 57, 124, 3, 3, - 3, 128, 56, 56, 49, 47, 133, 5, 6, 7, - 8, 9, 3, 11, 12, 13, 4, 57, 2, 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, 13, - 88, 52, 81, 55, 18, 53, -1, 55, 56, -1, - 58, -1, -1, -1, -1, -1, 126, -1, -1, -1, - -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, + 37, 0, 1, 3, 56, 0, 5, 6, 7, 8, + 9, 3, 11, 12, 13, 52, 90, 53, 1, 55, + 19, 46, 5, 6, 7, 8, 9, 46, 11, 12, + 13, 3, 31, 46, 96, 31, 19, 99, 10, 35, + 50, 51, 116, 42, 89, 3, 91, 47, 31, 86, + 50, 4, 51, 52, 46, 92, 4, 47, 57, 42, + 50, 57, 3, 4, 49, 46, 56, 46, 51, 49, + 46, 49, 3, 3, 57, 47, 50, 114, 50, 89, + 3, 91, 3, 56, 56, 122, 3, 55, 55, 126, + 46, 48, 3, 56, 131, 5, 6, 7, 8, 9, + 4, 11, 12, 13, 2, 54, 51, 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, 86, 3, 124, 79, + -1, -1, 52, -1, 54, 55, -1, 57, 14, 15, + 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 59 + 46, 47, -1, -1, 50 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 60, 61, 0, 5, 6, 7, 8, 9, 11, + 0, 59, 60, 0, 5, 6, 7, 8, 9, 11, 12, 13, 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, 53, 55, 56, 58, 62, 63, 65, 68, - 69, 67, 66, 57, 47, 47, 47, 84, 84, 3, - 84, 4, 4, 50, 47, 47, 50, 50, 47, 3, - 3, 3, 48, 51, 85, 87, 88, 84, 1, 52, - 63, 76, 77, 78, 86, 51, 64, 57, 70, 57, - 74, 75, 85, 75, 71, 87, 10, 57, 72, 73, - 87, 72, 3, 82, 83, 84, 3, 3, 3, 56, - 56, 53, 77, 89, 79, 47, 71, 74, 4, 88, - 87, 73, 49, 80, 81, 88, 54, 56, 14, 15, - 16, 47, 87, 81, 87, 4, 57 + 45, 52, 54, 55, 57, 61, 62, 64, 67, 68, + 66, 65, 56, 46, 46, 46, 83, 3, 4, 4, + 49, 46, 46, 49, 49, 46, 83, 3, 83, 3, + 3, 47, 50, 84, 86, 87, 1, 51, 62, 75, + 76, 77, 85, 50, 63, 56, 69, 56, 73, 74, + 84, 74, 70, 86, 10, 56, 71, 72, 86, 71, + 3, 81, 82, 83, 3, 3, 3, 55, 55, 52, + 76, 88, 78, 46, 70, 73, 4, 87, 86, 72, + 48, 79, 80, 87, 53, 55, 14, 15, 16, 46, + 86, 80, 86, 4, 56 }; #define yyerrok (yyerrstatus = 0) @@ -1022,116 +1026,148 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "\"string\"" */ -/* Line 670 of yacc.c. */ -#line 187 "parse-gram.y" + +/* Line 670 of yacc.c */ +#line 186 "../../src/parse-gram.y" { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; -/* Line 670 of yacc.c. */ -#line 1030 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1036 "../../src/parse-gram.c" break; case 4: /* "\"integer\"" */ -/* Line 670 of yacc.c. */ -#line 198 "parse-gram.y" + +/* Line 670 of yacc.c */ +#line 197 "../../src/parse-gram.y" { fprintf (stderr, "%d", (yyvaluep->integer)); }; -/* Line 670 of yacc.c. */ -#line 1037 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1045 "../../src/parse-gram.c" break; - case 47: /* "\"{...}\"" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 46: /* "\"{...}\"" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1044 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1054 "../../src/parse-gram.c" break; - case 48: /* "\"char\"" */ -/* Line 670 of yacc.c. */ -#line 182 "parse-gram.y" + case 47: /* "\"char\"" */ + +/* Line 670 of yacc.c */ +#line 181 "../../src/parse-gram.y" { fputs (char_name ((yyvaluep->character)), stderr); }; -/* Line 670 of yacc.c. */ -#line 1051 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1063 "../../src/parse-gram.c" break; - case 49: /* "\"epilogue\"" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 48: /* "\"epilogue\"" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1058 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1072 "../../src/parse-gram.c" break; - case 51: /* "\"identifier\"" */ -/* Line 670 of yacc.c. */ -#line 194 "parse-gram.y" + case 50: /* "\"identifier\"" */ + +/* Line 670 of yacc.c */ +#line 193 "../../src/parse-gram.y" { fputs ((yyvaluep->uniqstr), stderr); }; -/* Line 670 of yacc.c. */ -#line 1065 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1081 "../../src/parse-gram.c" break; - case 52: /* "\"identifier:\"" */ -/* Line 670 of yacc.c. */ -#line 195 "parse-gram.y" + case 51: /* "\"identifier:\"" */ + +/* Line 670 of yacc.c */ +#line 194 "../../src/parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; -/* Line 670 of yacc.c. */ -#line 1072 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1090 "../../src/parse-gram.c" break; - case 55: /* "\"%{...%}\"" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 54: /* "\"%{...%}\"" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1079 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1099 "../../src/parse-gram.c" break; - case 57: /* "\"type\"" */ -/* Line 670 of yacc.c. */ -#line 193 "parse-gram.y" + case 56: /* "\"type\"" */ + +/* Line 670 of yacc.c */ +#line 192 "../../src/parse-gram.y" { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; -/* Line 670 of yacc.c. */ -#line 1086 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1108 "../../src/parse-gram.c" break; - case 82: /* "content" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 81: /* "content" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1093 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1117 "../../src/parse-gram.c" break; - case 83: /* "content.opt" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 82: /* "content.opt" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1100 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1126 "../../src/parse-gram.c" break; - case 84: /* "braceless" */ -/* Line 670 of yacc.c. */ -#line 189 "parse-gram.y" + case 83: /* "braceless" */ + +/* Line 670 of yacc.c */ +#line 188 "../../src/parse-gram.y" { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; -/* Line 670 of yacc.c. */ -#line 1107 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1135 "../../src/parse-gram.c" break; - case 85: /* "id" */ -/* Line 670 of yacc.c. */ -#line 201 "parse-gram.y" + case 84: /* "id" */ + +/* Line 670 of yacc.c */ +#line 200 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1114 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1144 "../../src/parse-gram.c" break; - case 86: /* "id_colon" */ -/* Line 670 of yacc.c. */ -#line 202 "parse-gram.y" + case 85: /* "id_colon" */ + +/* Line 670 of yacc.c */ +#line 201 "../../src/parse-gram.y" { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1121 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1153 "../../src/parse-gram.c" break; - case 87: /* "symbol" */ -/* Line 670 of yacc.c. */ -#line 201 "parse-gram.y" + case 86: /* "symbol" */ + +/* Line 670 of yacc.c */ +#line 200 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1128 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1162 "../../src/parse-gram.c" break; - case 88: /* "string_as_id" */ -/* Line 670 of yacc.c. */ -#line 201 "parse-gram.y" + case 87: /* "string_as_id" */ + +/* Line 670 of yacc.c */ +#line 200 "../../src/parse-gram.y" { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; -/* Line 670 of yacc.c. */ -#line 1135 "parse-gram.c" + +/* Line 670 of yacc.c */ +#line 1171 "../../src/parse-gram.c" break; default: break; @@ -1644,16 +1680,18 @@ YYLTYPE yylloc; /* User initialization code. */ - /* Line 1082 of yacc.c. */ -#line 89 "parse-gram.y" + +/* Line 1082 of yacc.c */ +#line 89 "../../src/parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default location is needed. */ boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1082 of yacc.c. */ -#line 1657 "parse-gram.c" + +/* Line 1082 of yacc.c */ +#line 1695 "../../src/parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -1837,189 +1875,212 @@ yyreduce: switch (yyn) { case 6: -/* Line 1269 of yacc.c. */ -#line 224 "parse-gram.y" + +/* Line 1269 of yacc.c */ +#line 223 "../../src/parse-gram.y" { prologue_augment (translate_code ((yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)])), (yylsp[(1) - (1)]), union_seen); } break; case 7: -/* Line 1269 of yacc.c. */ -#line 225 "parse-gram.y" + +/* Line 1269 of yacc.c */ +#line 224 "../../src/parse-gram.y" { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), true); } break; case 8: -/* Line 1269 of yacc.c. */ -#line 226 "parse-gram.y" - { prologue_augment ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]), false); } - break; - case 9: -/* Line 1269 of yacc.c. */ -#line 227 "parse-gram.y" +/* Line 1269 of yacc.c */ +#line 225 "../../src/parse-gram.y" { debug_flag = true; } break; - case 10: -/* Line 1269 of yacc.c. */ -#line 228 "parse-gram.y" + case 9: + +/* Line 1269 of yacc.c */ +#line 226 "../../src/parse-gram.y" { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); } break; - case 11: -/* Line 1269 of yacc.c. */ -#line 229 "parse-gram.y" + case 10: + +/* Line 1269 of yacc.c */ +#line 227 "../../src/parse-gram.y" { defines_flag = true; } break; - case 12: -/* Line 1269 of yacc.c. */ -#line 230 "parse-gram.y" - { muscle_code_grow ("end_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } - break; + case 11: - case 13: -/* Line 1269 of yacc.c. */ -#line 231 "parse-gram.y" +/* Line 1269 of yacc.c */ +#line 228 "../../src/parse-gram.y" { error_verbose = true; } break; - case 14: -/* Line 1269 of yacc.c. */ -#line 232 "parse-gram.y" + case 12: + +/* Line 1269 of yacc.c */ +#line 229 "../../src/parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 15: -/* Line 1269 of yacc.c. */ -#line 233 "parse-gram.y" + case 13: + +/* Line 1269 of yacc.c */ +#line 230 "../../src/parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; - case 16: -/* Line 1269 of yacc.c. */ -#line 234 "parse-gram.y" + case 14: + +/* Line 1269 of yacc.c */ +#line 231 "../../src/parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; - case 17: -/* Line 1269 of yacc.c. */ -#line 236 "parse-gram.y" + case 15: + +/* Line 1269 of yacc.c */ +#line 233 "../../src/parse-gram.y" { nondeterministic_parser = true; glr_parser = true; } break; - case 18: -/* Line 1269 of yacc.c. */ -#line 241 "parse-gram.y" + case 16: + +/* Line 1269 of yacc.c */ +#line 238 "../../src/parse-gram.y" { muscle_code_grow ("initial_action", translate_symbol_action ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); } break; - case 19: -/* Line 1269 of yacc.c. */ -#line 244 "parse-gram.y" + case 17: + +/* Line 1269 of yacc.c */ +#line 241 "../../src/parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 20: -/* Line 1269 of yacc.c. */ -#line 245 "parse-gram.y" + case 18: + +/* Line 1269 of yacc.c */ +#line 242 "../../src/parse-gram.y" { locations_flag = true; } break; - case 21: -/* Line 1269 of yacc.c. */ -#line 246 "parse-gram.y" + case 19: + +/* Line 1269 of yacc.c */ +#line 243 "../../src/parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; - case 22: -/* Line 1269 of yacc.c. */ -#line 247 "parse-gram.y" + case 20: + +/* Line 1269 of yacc.c */ +#line 244 "../../src/parse-gram.y" { no_lines_flag = true; } break; - case 23: -/* Line 1269 of yacc.c. */ -#line 248 "parse-gram.y" + case 21: + +/* Line 1269 of yacc.c */ +#line 245 "../../src/parse-gram.y" { nondeterministic_parser = true; } break; - case 24: -/* Line 1269 of yacc.c. */ -#line 249 "parse-gram.y" + case 22: + +/* Line 1269 of yacc.c */ +#line 246 "../../src/parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; - case 25: -/* Line 1269 of yacc.c. */ -#line 250 "parse-gram.y" + case 23: + +/* Line 1269 of yacc.c */ +#line 247 "../../src/parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 26: -/* Line 1269 of yacc.c. */ -#line 251 "parse-gram.y" + case 24: + +/* Line 1269 of yacc.c */ +#line 248 "../../src/parse-gram.y" + { muscle_code_grow ("provides", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + break; + + case 25: + +/* Line 1269 of yacc.c */ +#line 249 "../../src/parse-gram.y" { pure_parser = true; } break; - case 27: -/* Line 1269 of yacc.c. */ -#line 252 "parse-gram.y" + case 26: + +/* Line 1269 of yacc.c */ +#line 250 "../../src/parse-gram.y" { push_parser = true; } break; - case 28: -/* Line 1269 of yacc.c. */ -#line 253 "parse-gram.y" + case 27: + +/* Line 1269 of yacc.c */ +#line 251 "../../src/parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; + case 28: + +/* Line 1269 of yacc.c */ +#line 252 "../../src/parse-gram.y" + { muscle_code_grow ("requires", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } + break; + case 29: -/* Line 1269 of yacc.c. */ -#line 254 "parse-gram.y" + +/* Line 1269 of yacc.c */ +#line 253 "../../src/parse-gram.y" { skeleton = (yyvsp[(2) - (2)].chars); } break; case 30: -/* Line 1269 of yacc.c. */ -#line 255 "parse-gram.y" - { muscle_code_grow ("start_header", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } - break; - case 31: -/* Line 1269 of yacc.c. */ -#line 256 "parse-gram.y" +/* Line 1269 of yacc.c */ +#line 254 "../../src/parse-gram.y" { token_table_flag = true; } break; - case 32: -/* Line 1269 of yacc.c. */ -#line 257 "parse-gram.y" + case 31: + +/* Line 1269 of yacc.c */ +#line 255 "../../src/parse-gram.y" { report_flag = report_states; } break; - case 33: -/* Line 1269 of yacc.c. */ -#line 258 "parse-gram.y" + case 32: + +/* Line 1269 of yacc.c */ +#line 256 "../../src/parse-gram.y" { yacc_flag = true; } break; - case 37: -/* Line 1269 of yacc.c. */ -#line 266 "parse-gram.y" + case 36: + +/* Line 1269 of yacc.c */ +#line 264 "../../src/parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 38: -/* Line 1269 of yacc.c. */ -#line 270 "parse-gram.y" + case 37: + +/* Line 1269 of yacc.c */ +#line 268 "../../src/parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); @@ -2029,9 +2090,10 @@ yyreduce: } break; - case 39: -/* Line 1269 of yacc.c. */ -#line 278 "parse-gram.y" + case 38: + +/* Line 1269 of yacc.c */ +#line 276 "../../src/parse-gram.y" { symbol_list *list; const char *action = translate_symbol_action ((yyvsp[(2) - (3)].chars), (yylsp[(2) - (3)])); @@ -2041,37 +2103,42 @@ yyreduce: } break; - case 40: -/* Line 1269 of yacc.c. */ -#line 286 "parse-gram.y" + case 39: + +/* Line 1269 of yacc.c */ +#line 284 "../../src/parse-gram.y" { default_prec = true; } break; - case 41: -/* Line 1269 of yacc.c. */ -#line 290 "parse-gram.y" + case 40: + +/* Line 1269 of yacc.c */ +#line 288 "../../src/parse-gram.y" { default_prec = false; } break; - case 42: -/* Line 1269 of yacc.c. */ -#line 303 "parse-gram.y" + case 41: + +/* Line 1269 of yacc.c */ +#line 301 "../../src/parse-gram.y" {} break; - case 43: -/* Line 1269 of yacc.c. */ -#line 304 "parse-gram.y" + case 42: + +/* Line 1269 of yacc.c */ +#line 302 "../../src/parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 44: -/* Line 1269 of yacc.c. */ -#line 309 "parse-gram.y" + case 43: + +/* Line 1269 of yacc.c */ +#line 307 "../../src/parse-gram.y" { char const *body = (yyvsp[(3) - (3)].chars); @@ -2095,39 +2162,44 @@ yyreduce: } break; - case 45: -/* Line 1269 of yacc.c. */ -#line 336 "parse-gram.y" + case 44: + +/* Line 1269 of yacc.c */ +#line 334 "../../src/parse-gram.y" { current_class = nterm_sym; } break; - case 46: -/* Line 1269 of yacc.c. */ -#line 337 "parse-gram.y" + case 45: + +/* Line 1269 of yacc.c */ +#line 335 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 47: -/* Line 1269 of yacc.c. */ -#line 341 "parse-gram.y" + case 46: + +/* Line 1269 of yacc.c */ +#line 339 "../../src/parse-gram.y" { current_class = token_sym; } break; - case 48: -/* Line 1269 of yacc.c. */ -#line 342 "parse-gram.y" + case 47: + +/* Line 1269 of yacc.c */ +#line 340 "../../src/parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 49: -/* Line 1269 of yacc.c. */ -#line 347 "parse-gram.y" + case 48: + +/* Line 1269 of yacc.c */ +#line 345 "../../src/parse-gram.y" { symbol_list *list; tag_seen = true; @@ -2137,9 +2209,10 @@ yyreduce: } break; - case 50: -/* Line 1269 of yacc.c. */ -#line 358 "parse-gram.y" + case 49: + +/* Line 1269 of yacc.c */ +#line 356 "../../src/parse-gram.y" { symbol_list *list; ++current_prec; @@ -2153,99 +2226,114 @@ yyreduce: } break; - case 51: -/* Line 1269 of yacc.c. */ -#line 372 "parse-gram.y" + case 50: + +/* Line 1269 of yacc.c */ +#line 370 "../../src/parse-gram.y" { (yyval.assoc) = left_assoc; } break; - case 52: -/* Line 1269 of yacc.c. */ -#line 373 "parse-gram.y" + case 51: + +/* Line 1269 of yacc.c */ +#line 371 "../../src/parse-gram.y" { (yyval.assoc) = right_assoc; } break; - case 53: -/* Line 1269 of yacc.c. */ -#line 374 "parse-gram.y" + case 52: + +/* Line 1269 of yacc.c */ +#line 372 "../../src/parse-gram.y" { (yyval.assoc) = non_assoc; } break; - case 54: -/* Line 1269 of yacc.c. */ -#line 378 "parse-gram.y" + case 53: + +/* Line 1269 of yacc.c */ +#line 376 "../../src/parse-gram.y" { current_type = NULL; } break; - case 55: -/* Line 1269 of yacc.c. */ -#line 379 "parse-gram.y" + case 54: + +/* Line 1269 of yacc.c */ +#line 377 "../../src/parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 56: -/* Line 1269 of yacc.c. */ -#line 385 "parse-gram.y" + case 55: + +/* Line 1269 of yacc.c */ +#line 383 "../../src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 57: -/* Line 1269 of yacc.c. */ -#line 387 "parse-gram.y" + case 56: + +/* Line 1269 of yacc.c */ +#line 385 "../../src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } break; - case 58: -/* Line 1269 of yacc.c. */ -#line 391 "parse-gram.y" + case 57: + +/* Line 1269 of yacc.c */ +#line 389 "../../src/parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; - case 59: -/* Line 1269 of yacc.c. */ -#line 392 "parse-gram.y" + case 58: + +/* Line 1269 of yacc.c */ +#line 390 "../../src/parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; - case 60: -/* Line 1269 of yacc.c. */ -#line 396 "parse-gram.y" + case 59: + +/* Line 1269 of yacc.c */ +#line 394 "../../src/parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; - case 61: -/* Line 1269 of yacc.c. */ -#line 397 "parse-gram.y" + case 60: + +/* Line 1269 of yacc.c */ +#line 395 "../../src/parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 62: -/* Line 1269 of yacc.c. */ -#line 398 "parse-gram.y" + case 61: + +/* Line 1269 of yacc.c */ +#line 396 "../../src/parse-gram.y" { (yyval.list) = symbol_list_default_new ((yylsp[(1) - (1)])); } break; - case 63: -/* Line 1269 of yacc.c. */ -#line 404 "parse-gram.y" + case 62: + +/* Line 1269 of yacc.c */ +#line 402 "../../src/parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; - case 64: -/* Line 1269 of yacc.c. */ -#line 409 "parse-gram.y" + case 63: + +/* Line 1269 of yacc.c */ +#line 407 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); } break; - case 65: -/* Line 1269 of yacc.c. */ -#line 414 "parse-gram.y" + case 64: + +/* Line 1269 of yacc.c */ +#line 412 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2253,9 +2341,10 @@ yyreduce: } break; - case 66: -/* Line 1269 of yacc.c. */ -#line 420 "parse-gram.y" + case 65: + +/* Line 1269 of yacc.c */ +#line 418 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); @@ -2263,9 +2352,10 @@ yyreduce: } break; - case 67: -/* Line 1269 of yacc.c. */ -#line 426 "parse-gram.y" + case 66: + +/* Line 1269 of yacc.c */ +#line 424 "../../src/parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); @@ -2274,95 +2364,109 @@ yyreduce: } break; - case 74: -/* Line 1269 of yacc.c. */ -#line 456 "parse-gram.y" + case 73: + +/* Line 1269 of yacc.c */ +#line 454 "../../src/parse-gram.y" { yyerrok; } break; - case 75: -/* Line 1269 of yacc.c. */ -#line 462 "parse-gram.y" + case 74: + +/* Line 1269 of yacc.c */ +#line 460 "../../src/parse-gram.y" { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } break; - case 77: -/* Line 1269 of yacc.c. */ -#line 466 "parse-gram.y" + case 76: + +/* Line 1269 of yacc.c */ +#line 464 "../../src/parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; - case 78: -/* Line 1269 of yacc.c. */ -#line 467 "parse-gram.y" + case 77: + +/* Line 1269 of yacc.c */ +#line 465 "../../src/parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; - case 80: -/* Line 1269 of yacc.c. */ -#line 473 "parse-gram.y" + case 79: + +/* Line 1269 of yacc.c */ +#line 471 "../../src/parse-gram.y" { grammar_current_rule_begin (current_lhs, current_lhs_location); } break; - case 81: -/* Line 1269 of yacc.c. */ -#line 475 "parse-gram.y" + case 80: + +/* Line 1269 of yacc.c */ +#line 473 "../../src/parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } break; - case 82: -/* Line 1269 of yacc.c. */ -#line 477 "parse-gram.y" + case 81: + +/* Line 1269 of yacc.c */ +#line 475 "../../src/parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); } break; - case 83: -/* Line 1269 of yacc.c. */ -#line 479 "parse-gram.y" + case 82: + +/* Line 1269 of yacc.c */ +#line 477 "../../src/parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; - case 84: -/* Line 1269 of yacc.c. */ -#line 481 "parse-gram.y" + case 83: + +/* Line 1269 of yacc.c */ +#line 479 "../../src/parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; - case 85: -/* Line 1269 of yacc.c. */ -#line 483 "parse-gram.y" + case 84: + +/* Line 1269 of yacc.c */ +#line 481 "../../src/parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; - case 88: -/* Line 1269 of yacc.c. */ -#line 499 "parse-gram.y" + case 87: + +/* Line 1269 of yacc.c */ +#line 497 "../../src/parse-gram.y" { static char one[] = "1"; (yyval.chars) = one; } break; - case 90: -/* Line 1269 of yacc.c. */ -#line 509 "parse-gram.y" + case 89: + +/* Line 1269 of yacc.c */ +#line 507 "../../src/parse-gram.y" { (yyvsp[(1) - (1)].chars)[strlen ((yyvsp[(1) - (1)].chars)) - 1] = '\n'; (yyval.chars) = translate_code ((yyvsp[(1) - (1)].chars) + 1, (yylsp[(1) - (1)])); } break; - case 91: -/* Line 1269 of yacc.c. */ -#line 525 "parse-gram.y" + case 90: + +/* Line 1269 of yacc.c */ +#line 523 "../../src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 92: -/* Line 1269 of yacc.c. */ -#line 527 "parse-gram.y" + case 91: + +/* Line 1269 of yacc.c */ +#line 525 "../../src/parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); @@ -2370,24 +2474,27 @@ yyreduce: } break; - case 93: -/* Line 1269 of yacc.c. */ -#line 535 "parse-gram.y" + case 92: + +/* Line 1269 of yacc.c */ +#line 533 "../../src/parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; - case 96: -/* Line 1269 of yacc.c. */ -#line 547 "parse-gram.y" + case 95: + +/* Line 1269 of yacc.c */ +#line 545 "../../src/parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); } break; - case 98: -/* Line 1269 of yacc.c. */ -#line 556 "parse-gram.y" + case 97: + +/* Line 1269 of yacc.c */ +#line 554 "../../src/parse-gram.y" { muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)])); gram_scanner_last_string_free (); @@ -2395,8 +2502,9 @@ yyreduce: break; -/* Line 1269 of yacc.c. */ -#line 2400 "parse-gram.c" + +/* Line 1269 of yacc.c */ +#line 2508 "../../src/parse-gram.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2613,8 +2721,9 @@ yyreturn: } -/* Line 1486 of yacc.c. */ -#line 562 "parse-gram.y" + +/* Line 1486 of yacc.c */ +#line 560 "../../src/parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index e916fb3c..bdefc645 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,20 +1,20 @@ -/* A Bison parser, made by GNU Bison 2.3a. */ +/* A Bison parser, made by GNU Bison 2.3a+. */ /* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, @@ -29,7 +29,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -55,48 +55,47 @@ PERCENT_PREC = 269, PERCENT_DPREC = 270, PERCENT_MERGE = 271, - PERCENT_AFTER_HEADER = 272, - PERCENT_BEFORE_HEADER = 273, - PERCENT_DEBUG = 274, - PERCENT_DEFAULT_PREC = 275, - PERCENT_DEFINE = 276, - PERCENT_DEFINES = 277, - PERCENT_END_HEADER = 278, - PERCENT_ERROR_VERBOSE = 279, - PERCENT_EXPECT = 280, - PERCENT_EXPECT_RR = 281, - PERCENT_FILE_PREFIX = 282, - PERCENT_GLR_PARSER = 283, - PERCENT_INITIAL_ACTION = 284, - PERCENT_LEX_PARAM = 285, - PERCENT_LOCATIONS = 286, - PERCENT_NAME_PREFIX = 287, - PERCENT_NO_DEFAULT_PREC = 288, - PERCENT_NO_LINES = 289, - PERCENT_NONDETERMINISTIC_PARSER = 290, - PERCENT_OUTPUT = 291, - PERCENT_PARSE_PARAM = 292, - PERCENT_PURE_PARSER = 293, - PERCENT_PUSH_PARSER = 294, - PERCENT_REQUIRE = 295, + PERCENT_CODE = 272, + PERCENT_DEBUG = 273, + PERCENT_DEFAULT_PREC = 274, + PERCENT_DEFINE = 275, + PERCENT_DEFINES = 276, + PERCENT_ERROR_VERBOSE = 277, + PERCENT_EXPECT = 278, + PERCENT_EXPECT_RR = 279, + PERCENT_FILE_PREFIX = 280, + PERCENT_GLR_PARSER = 281, + PERCENT_INITIAL_ACTION = 282, + PERCENT_LEX_PARAM = 283, + PERCENT_LOCATIONS = 284, + PERCENT_NAME_PREFIX = 285, + PERCENT_NO_DEFAULT_PREC = 286, + PERCENT_NO_LINES = 287, + PERCENT_NONDETERMINISTIC_PARSER = 288, + PERCENT_OUTPUT = 289, + PERCENT_PARSE_PARAM = 290, + PERCENT_PROVIDES = 291, + PERCENT_PURE_PARSER = 292, + PERCENT_PUSH_PARSER = 293, + PERCENT_REQUIRE = 294, + PERCENT_REQUIRES = 295, PERCENT_SKELETON = 296, PERCENT_START = 297, - PERCENT_START_HEADER = 298, - PERCENT_TOKEN_TABLE = 299, - PERCENT_VERBOSE = 300, - PERCENT_YACC = 301, - BRACED_CODE = 302, - CHAR = 303, - EPILOGUE = 304, - EQUAL = 305, - ID = 306, - ID_COLON = 307, - PERCENT_PERCENT = 308, - PIPE = 309, - PROLOGUE = 310, - SEMICOLON = 311, - TYPE = 312, - PERCENT_UNION = 313 + PERCENT_TOKEN_TABLE = 298, + PERCENT_VERBOSE = 299, + PERCENT_YACC = 300, + BRACED_CODE = 301, + CHAR = 302, + EPILOGUE = 303, + EQUAL = 304, + ID = 305, + ID_COLON = 306, + PERCENT_PERCENT = 307, + PIPE = 308, + PROLOGUE = 309, + SEMICOLON = 310, + TYPE = 311, + PERCENT_UNION = 312 }; #endif /* Tokens. */ @@ -115,56 +114,56 @@ #define PERCENT_PREC 269 #define PERCENT_DPREC 270 #define PERCENT_MERGE 271 -#define PERCENT_AFTER_HEADER 272 -#define PERCENT_BEFORE_HEADER 273 -#define PERCENT_DEBUG 274 -#define PERCENT_DEFAULT_PREC 275 -#define PERCENT_DEFINE 276 -#define PERCENT_DEFINES 277 -#define PERCENT_END_HEADER 278 -#define PERCENT_ERROR_VERBOSE 279 -#define PERCENT_EXPECT 280 -#define PERCENT_EXPECT_RR 281 -#define PERCENT_FILE_PREFIX 282 -#define PERCENT_GLR_PARSER 283 -#define PERCENT_INITIAL_ACTION 284 -#define PERCENT_LEX_PARAM 285 -#define PERCENT_LOCATIONS 286 -#define PERCENT_NAME_PREFIX 287 -#define PERCENT_NO_DEFAULT_PREC 288 -#define PERCENT_NO_LINES 289 -#define PERCENT_NONDETERMINISTIC_PARSER 290 -#define PERCENT_OUTPUT 291 -#define PERCENT_PARSE_PARAM 292 -#define PERCENT_PURE_PARSER 293 -#define PERCENT_PUSH_PARSER 294 -#define PERCENT_REQUIRE 295 +#define PERCENT_CODE 272 +#define PERCENT_DEBUG 273 +#define PERCENT_DEFAULT_PREC 274 +#define PERCENT_DEFINE 275 +#define PERCENT_DEFINES 276 +#define PERCENT_ERROR_VERBOSE 277 +#define PERCENT_EXPECT 278 +#define PERCENT_EXPECT_RR 279 +#define PERCENT_FILE_PREFIX 280 +#define PERCENT_GLR_PARSER 281 +#define PERCENT_INITIAL_ACTION 282 +#define PERCENT_LEX_PARAM 283 +#define PERCENT_LOCATIONS 284 +#define PERCENT_NAME_PREFIX 285 +#define PERCENT_NO_DEFAULT_PREC 286 +#define PERCENT_NO_LINES 287 +#define PERCENT_NONDETERMINISTIC_PARSER 288 +#define PERCENT_OUTPUT 289 +#define PERCENT_PARSE_PARAM 290 +#define PERCENT_PROVIDES 291 +#define PERCENT_PURE_PARSER 292 +#define PERCENT_PUSH_PARSER 293 +#define PERCENT_REQUIRE 294 +#define PERCENT_REQUIRES 295 #define PERCENT_SKELETON 296 #define PERCENT_START 297 -#define PERCENT_START_HEADER 298 -#define PERCENT_TOKEN_TABLE 299 -#define PERCENT_VERBOSE 300 -#define PERCENT_YACC 301 -#define BRACED_CODE 302 -#define CHAR 303 -#define EPILOGUE 304 -#define EQUAL 305 -#define ID 306 -#define ID_COLON 307 -#define PERCENT_PERCENT 308 -#define PIPE 309 -#define PROLOGUE 310 -#define SEMICOLON 311 -#define TYPE 312 -#define PERCENT_UNION 313 +#define PERCENT_TOKEN_TABLE 298 +#define PERCENT_VERBOSE 299 +#define PERCENT_YACC 300 +#define BRACED_CODE 301 +#define CHAR 302 +#define EPILOGUE 303 +#define EQUAL 304 +#define ID 305 +#define ID_COLON 306 +#define PERCENT_PERCENT 307 +#define PIPE 308 +#define PROLOGUE 309 +#define SEMICOLON 310 +#define TYPE 311 +#define PERCENT_UNION 312 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -{/* Line 1535 of yacc.c. */ -#line 98 "parse-gram.y" +{ +/* Line 1535 of yacc.c */ +#line 98 "../../src/parse-gram.y" symbol *symbol; symbol_list *list; @@ -174,8 +173,9 @@ typedef union YYSTYPE uniqstr uniqstr; unsigned char character; } -/* Line 1535 of yacc.c. */ -#line 179 "parse-gram.h" + +/* Line 1535 of yacc.c */ +#line 179 "../../src/parse-gram.h" YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/parse-gram.y b/src/parse-gram.y index e9ec6366..80fe01f0 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -133,13 +133,11 @@ static int current_prec = 0; `----------------------*/ %token - PERCENT_AFTER_HEADER "%after-header" - PERCENT_BEFORE_HEADER "%before-header" + PERCENT_CODE "%code" PERCENT_DEBUG "%debug" PERCENT_DEFAULT_PREC "%default-prec" PERCENT_DEFINE "%define" PERCENT_DEFINES "%defines" - PERCENT_END_HEADER "%end-header" PERCENT_ERROR_VERBOSE "%error-verbose" PERCENT_EXPECT "%expect" PERCENT_EXPECT_RR "%expect-rr" @@ -155,12 +153,13 @@ static int current_prec = 0; "%nondeterministic-parser" PERCENT_OUTPUT "%output" PERCENT_PARSE_PARAM "%parse-param" + PERCENT_PROVIDES "%provides" PERCENT_PURE_PARSER "%pure-parser" PERCENT_PUSH_PARSER "%push-parser" PERCENT_REQUIRE "%require" + PERCENT_REQUIRES "%requires" PERCENT_SKELETON "%skeleton" PERCENT_START "%start" - PERCENT_START_HEADER "%start-header" PERCENT_TOKEN_TABLE "%token-table" PERCENT_VERBOSE "%verbose" PERCENT_YACC "%yacc" @@ -222,12 +221,10 @@ prologue_declarations: prologue_declaration: grammar_declaration | "%{...%}" { prologue_augment (translate_code ($1, @1), @1, union_seen); } -| "%after-header" braceless { prologue_augment ($2, @2, true); } -| "%before-header" braceless { prologue_augment ($2, @2, false); } +| "%code" braceless { prologue_augment ($2, @2, true); } | "%debug" { debug_flag = true; } | "%define" STRING content.opt { muscle_insert ($2, $3); } | "%defines" { defines_flag = true; } -| "%end-header" braceless { muscle_code_grow ("end_header", $2, @2); } | "%error-verbose" { error_verbose = true; } | "%expect" INT { expected_sr_conflicts = $2; } | "%expect-rr" INT { expected_rr_conflicts = $2; } @@ -248,11 +245,12 @@ prologue_declaration: | "%nondeterministic-parser" { nondeterministic_parser = true; } | "%output" "=" STRING { spec_outfile = $3; } | "%parse-param" "{...}" { add_param ("parse_param", $2, @2); } +| "%provides" braceless { muscle_code_grow ("provides", $2, @2); } | "%pure-parser" { pure_parser = true; } | "%push-parser" { push_parser = true; } | "%require" STRING { version_check (&@2, $2); } +| "%requires" braceless { muscle_code_grow ("requires", $2, @2); } | "%skeleton" STRING { skeleton = $2; } -| "%start-header" braceless { muscle_code_grow ("start_header", $2, @2); } | "%token-table" { token_table_flag = true; } | "%verbose" { report_flag = report_states; } | "%yacc" { yacc_flag = true; } diff --git a/src/scan-gram.l b/src/scan-gram.l index c1a53276..200a7a58 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -156,16 +156,14 @@ splice (\\[ \f\t\v]*\n)* `----------------------------*/ { - "%after-header" return PERCENT_AFTER_HEADER; - "%before-header" return PERCENT_BEFORE_HEADER; "%binary" return PERCENT_NONASSOC; + "%code" return PERCENT_CODE; "%debug" return PERCENT_DEBUG; "%default"[-_]"prec" return PERCENT_DEFAULT_PREC; "%define" return PERCENT_DEFINE; "%defines" return PERCENT_DEFINES; "%destructor" return PERCENT_DESTRUCTOR; "%dprec" return PERCENT_DPREC; - "%end-header" return PERCENT_END_HEADER; "%error"[-_]"verbose" return PERCENT_ERROR_VERBOSE; "%expect" return PERCENT_EXPECT; "%expect"[-_]"rr" return PERCENT_EXPECT_RR; @@ -187,13 +185,14 @@ splice (\\[ \f\t\v]*\n)* "%parse-param" return PERCENT_PARSE_PARAM; "%prec" return PERCENT_PREC; "%printer" return PERCENT_PRINTER; + "%provides" return PERCENT_PROVIDES; "%pure"[-_]"parser" return PERCENT_PURE_PARSER; "%push"[-_]"parser" return PERCENT_PUSH_PARSER; "%require" return PERCENT_REQUIRE; + "%requires" return PERCENT_REQUIRES; "%right" return PERCENT_RIGHT; "%skeleton" return PERCENT_SKELETON; "%start" return PERCENT_START; - "%start-header" return PERCENT_START_HEADER; "%symbol-default" return PERCENT_SYMBOL_DEFAULT; "%term" return PERCENT_TOKEN; "%token" return PERCENT_TOKEN; diff --git a/tests/actions.at b/tests/actions.at index 21244c6f..7d401baf 100644 --- a/tests/actions.at +++ b/tests/actions.at @@ -178,7 +178,7 @@ m4_if([$1$2$3], $[1]$[2]$[3], [], # helping macros. So don't put any directly in the Bison file. AT_BISON_OPTION_PUSHDEFS([$5]) AT_DATA_GRAMMAR([[input.y]], -[[%start-header { +[[%requires { #include #include #include @@ -197,7 +197,7 @@ m4_ifval([$6], [%union int ival; }]) AT_LALR1_CC_IF([%define "global_tokens_and_yystype"]) -m4_ifval([$6], [[%end-header {]], [[%after-header {]]) +m4_ifval([$6], [[%provides {]], [[%code {]]) AT_LALR1_CC_IF([typedef yy::location YYLTYPE;]) [static int yylex (]AT_LEX_FORMALS[); ]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);]) -- 2.45.2