From 851e3f846852bf960587e54156dbbb5115d25f42 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 09:40:20 +0200 Subject: [PATCH 1/9] fix comment * data/c.m4 (b4_YYDEBUG_define): here. --- data/c.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/c.m4 b/data/c.m4 index 994d2964..561900af 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -602,7 +602,7 @@ m4_define([b4_YYDEBUG_define], # endif # else /* ! defined YYDEBUG */ # define ]b4_api_PREFIX[DEBUG ]b4_debug_flag[ -# endif /* ! defined ]b4_api_PREFIX[DEBUG */ +# endif /* ! defined YYDEBUG */ #endif /* ! defined ]b4_api_PREFIX[DEBUG */]])[]dnl ]) From e73ac5a09b54ad2c1e4169d7a5e309f7cf32633f Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 09:34:00 +0200 Subject: [PATCH 2/9] parse-gram: update the Bison interface * src/parse-gram.y (%pure-parser, %name-prefix): Replace with... (%define api.pure, %define api.prefix) * src/location.h, src/scan-gram.h: Adjust to api.prefix. --- src/location.h | 2 +- src/parse-gram.y | 12 ++++++------ src/scan-gram.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/location.h b/src/location.h index 4c2b410d..5ebb92e3 100644 --- a/src/location.h +++ b/src/location.h @@ -88,7 +88,7 @@ typedef struct } location; -#define YYLTYPE location +#define GRAM_LTYPE location #define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}} extern location const empty_location; diff --git a/src/parse-gram.y b/src/parse-gram.y index 3120bfc2..6a49923c 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -94,14 +94,14 @@ current_lhs(symbol *sym, location loc, named_ref *ref) %} %debug -%verbose -%defines -%locations -%pure-parser -%error-verbose +%define api.prefix "gram_" +%define api.pure %define parse.lac full -%name-prefix="gram_" +%defines +%error-verbose %expect 0 +%locations +%verbose %initial-action { diff --git a/src/scan-gram.h b/src/scan-gram.h index ed973c78..72138a27 100644 --- a/src/scan-gram.h +++ b/src/scan-gram.h @@ -32,7 +32,7 @@ void gram_scanner_last_string_free (void); extern FILE *gram_out; extern int gram_lineno; -# define GRAM_LEX_DECL int gram_lex (YYSTYPE *val, location *loc) +# define GRAM_LEX_DECL int gram_lex (GRAM_STYPE *val, location *loc) GRAM_LEX_DECL; #endif /* !SCAN_GRAM_H_ */ From 20df0160bc32607758065361f3444cfb591b19a6 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 09:42:03 +0200 Subject: [PATCH 3/9] regen --- src/parse-gram.c | 126 +++++++++++++++++++++++++---------------------- src/parse-gram.h | 50 +++++++++++-------- 2 files changed, 97 insertions(+), 79 deletions(-) diff --git a/src/parse-gram.c b/src/parse-gram.c index 148ef761..56139fd6 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.3.3-b10d3. */ +/* A Bison parser, made by GNU Bison 2.6.4.4-8c79c-dirty. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.3.3-b10d3" +#define YYBISON_VERSION "2.6.4.4-8c79c-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,7 +58,9 @@ /* Pull parsers. */ #define YYPULL 1 - +/* Substitute the type names. */ +#define YYSTYPE GRAM_STYPE +#define YYLTYPE GRAM_LTYPE /* Substitute the variable and function names. */ #define yyparse gram_parse #define yylex gram_lex @@ -167,7 +169,7 @@ current_lhs(symbol *sym, location loc, named_ref *ref) #define YYTYPE_UINT8 uint_fast8_t /* Line 358 of yacc.c */ -#line 171 "parse-gram.c" +#line 173 "parse-gram.c" # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -190,19 +192,27 @@ current_lhs(symbol *sym, location loc, named_ref *ref) #ifndef YY_GRAM_Y_TAB_H_INCLUDED # define YY_GRAM_Y_TAB_H_INCLUDED /* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif -#if YYDEBUG +#ifndef GRAM_DEBUG +# if defined YYDEBUG +# if YYDEBUG +# define GRAM_DEBUG 1 +# else +# define GRAM_DEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define GRAM_DEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined GRAM_DEBUG */ +#if GRAM_DEBUG extern int gram_debug; #endif /* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE +#ifndef GRAM_TOKENTYPE +# define GRAM_TOKENTYPE /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ - enum yytokentype { + enum gram_tokentype { GRAM_EOF = 0, STRING = 258, INT = 259, @@ -321,8 +331,8 @@ extern int gram_debug; -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED +typedef union GRAM_STYPE { /* Line 374 of yacc.c */ #line 115 "parse-gram.y" @@ -339,24 +349,24 @@ typedef union YYSTYPE /* Line 374 of yacc.c */ -#line 343 "parse-gram.c" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 +#line 353 "parse-gram.c" +} GRAM_STYPE; +# define GRAM_STYPE_IS_TRIVIAL 1 +# define gram_stype GRAM_STYPE /* obsolescent; will be withdrawn */ +# define GRAM_STYPE_IS_DECLARED 1 #endif -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED +typedef struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +} GRAM_LTYPE; +# define gram_ltype GRAM_LTYPE /* obsolescent; will be withdrawn */ +# define GRAM_LTYPE_IS_DECLARED 1 +# define GRAM_LTYPE_IS_TRIVIAL 1 #endif @@ -379,7 +389,7 @@ int gram_parse (); /* Copy the second part of user declarations. */ /* Line 377 of yacc.c */ -#line 383 "parse-gram.c" +#line 393 "parse-gram.c" #ifdef short # undef short @@ -514,8 +524,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL \ + && defined GRAM_STYPE_IS_TRIVIAL && GRAM_STYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -632,7 +642,7 @@ static const yytype_uint8 yytranslate[] = 55, 56, 57 }; -#if YYDEBUG +#if GRAM_DEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ static const yytype_uint16 yyprhs[] = @@ -700,7 +710,7 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 1 +#if GRAM_DEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -993,7 +1003,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1013,7 +1023,7 @@ while (YYID (0)) #endif /* Enable debugging if requested. */ -#if YYDEBUG +#if GRAM_DEBUG # ifndef YYFPRINTF # include /* INFRINGES ON USER NAME SPACE */ @@ -1074,126 +1084,126 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) #line 205 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }; /* Line 833 of yacc.c */ -#line 1078 "parse-gram.c" +#line 1088 "parse-gram.c" break; case 4: /* "integer" */ /* Line 833 of yacc.c */ #line 217 "parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); }; /* Line 833 of yacc.c */ -#line 1085 "parse-gram.c" +#line 1095 "parse-gram.c" break; case 43: /* "{...}" */ /* Line 833 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }; /* Line 833 of yacc.c */ -#line 1092 "parse-gram.c" +#line 1102 "parse-gram.c" break; case 44: /* "[identifier]" */ /* Line 833 of yacc.c */ #line 212 "parse-gram.y" { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }; /* Line 833 of yacc.c */ -#line 1099 "parse-gram.c" +#line 1109 "parse-gram.c" break; case 45: /* "char" */ /* Line 833 of yacc.c */ #line 199 "parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); }; /* Line 833 of yacc.c */ -#line 1106 "parse-gram.c" +#line 1116 "parse-gram.c" break; case 46: /* "epilogue" */ /* Line 833 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; /* Line 833 of yacc.c */ -#line 1113 "parse-gram.c" +#line 1123 "parse-gram.c" break; case 48: /* "identifier" */ /* Line 833 of yacc.c */ #line 211 "parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); }; /* Line 833 of yacc.c */ -#line 1120 "parse-gram.c" +#line 1130 "parse-gram.c" break; case 49: /* "identifier:" */ /* Line 833 of yacc.c */ #line 213 "parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }; /* Line 833 of yacc.c */ -#line 1127 "parse-gram.c" +#line 1137 "parse-gram.c" break; case 52: /* "%{...%}" */ /* Line 833 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; /* Line 833 of yacc.c */ -#line 1134 "parse-gram.c" +#line 1144 "parse-gram.c" break; case 54: /* "type" */ /* Line 833 of yacc.c */ #line 214 "parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }; /* Line 833 of yacc.c */ -#line 1141 "parse-gram.c" +#line 1151 "parse-gram.c" break; case 71: /* symbol.prec */ /* Line 833 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; /* Line 833 of yacc.c */ -#line 1148 "parse-gram.c" +#line 1158 "parse-gram.c" break; case 84: /* variable */ /* Line 833 of yacc.c */ #line 211 "parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); }; /* Line 833 of yacc.c */ -#line 1155 "parse-gram.c" +#line 1165 "parse-gram.c" break; case 85: /* content.opt */ /* Line 833 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; /* Line 833 of yacc.c */ -#line 1162 "parse-gram.c" +#line 1172 "parse-gram.c" break; case 86: /* braceless */ /* Line 833 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; /* Line 833 of yacc.c */ -#line 1169 "parse-gram.c" +#line 1179 "parse-gram.c" break; case 87: /* id */ /* Line 833 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; /* Line 833 of yacc.c */ -#line 1176 "parse-gram.c" +#line 1186 "parse-gram.c" break; case 88: /* id_colon */ /* Line 833 of yacc.c */ #line 221 "parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }; /* Line 833 of yacc.c */ -#line 1183 "parse-gram.c" +#line 1193 "parse-gram.c" break; case 89: /* symbol */ /* Line 833 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; /* Line 833 of yacc.c */ -#line 1190 "parse-gram.c" +#line 1200 "parse-gram.c" break; case 90: /* string_as_id */ /* Line 833 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; /* Line 833 of yacc.c */ -#line 1197 "parse-gram.c" +#line 1207 "parse-gram.c" break; default: break; @@ -1302,12 +1312,12 @@ do { \ /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; -#else /* !YYDEBUG */ +#else /* !GRAM_DEBUG */ # define YYDPRINTF(Args) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ +#endif /* !GRAM_DEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -1338,7 +1348,7 @@ int yydebug; required. Return 1 if memory is exhausted. */ static int yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd, -#if YYDEBUG +#if GRAM_DEBUG char const *yydebug_prefix, char const *yydebug_suffix, #endif @@ -1441,7 +1451,7 @@ do { \ the parser stacks to try to find a new initial context in which the current lookahead is syntactically acceptable. If it fails to find such a context, it discards the lookahead. */ -#if YYDEBUG +#if GRAM_DEBUG # define YY_LAC_DISCARD(Event) \ do { \ if (yy_lac_established) \ @@ -1544,7 +1554,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes, else { if (yy_lac_stack_realloc (yyes_capacity, 1, -#if YYDEBUG +#if GRAM_DEBUG " (", ")", #endif yyes, yyesa, &yyesp, yyes_prev)) @@ -1746,7 +1756,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yysize = yysize1; } } -# if YYDEBUG +# if GRAM_DEBUG else if (yydebug) YYFPRINTF (stderr, "No expected tokens.\n"); # endif @@ -1984,7 +1994,7 @@ YYLTYPE yylloc; yylsp = yyls; YYLVAL_INITIALIZE (); -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +#if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; yylloc.first_column = yylloc.last_column = 1; @@ -2000,7 +2010,7 @@ YYLTYPE yylloc; boundary_set (&yylloc.end, current_file, 1, 1); } /* Line 1596 of yacc.c */ -#line 2004 "parse-gram.c" +#line 2014 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -2888,7 +2898,7 @@ yyreduce: /* Line 1813 of yacc.c */ -#line 2892 "parse-gram.c" +#line 2902 "parse-gram.c" default: break; } if (yychar_backup != yychar) diff --git a/src/parse-gram.h b/src/parse-gram.h index 455a7683..a2c9934b 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.3.3-b10d3. */ +/* A Bison parser, made by GNU Bison 2.6.4.4-8c79c-dirty. */ /* Bison interface for Yacc-like parsers in C @@ -33,19 +33,27 @@ #ifndef YY_GRAM__________SRC_PARSE_GRAM_H_INCLUDED # define YY_GRAM__________SRC_PARSE_GRAM_H_INCLUDED /* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif -#if YYDEBUG +#ifndef GRAM_DEBUG +# if defined YYDEBUG +# if YYDEBUG +# define GRAM_DEBUG 1 +# else +# define GRAM_DEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define GRAM_DEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined GRAM_DEBUG */ +#if GRAM_DEBUG extern int gram_debug; #endif /* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE +#ifndef GRAM_TOKENTYPE +# define GRAM_TOKENTYPE /* Put the tokens into the symbol table, so that GDB and other debuggers know about them. */ - enum yytokentype { + enum gram_tokentype { GRAM_EOF = 0, STRING = 258, INT = 259, @@ -164,8 +172,8 @@ extern int gram_debug; -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED +typedef union GRAM_STYPE { /* Line 2077 of yacc.c */ #line 115 "parse-gram.y" @@ -182,24 +190,24 @@ typedef union YYSTYPE /* Line 2077 of yacc.c */ -#line 186 "parse-gram.h" -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 +#line 194 "parse-gram.h" +} GRAM_STYPE; +# define GRAM_STYPE_IS_TRIVIAL 1 +# define gram_stype GRAM_STYPE /* obsolescent; will be withdrawn */ +# define GRAM_STYPE_IS_DECLARED 1 #endif -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED +typedef struct GRAM_LTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 +} GRAM_LTYPE; +# define gram_ltype GRAM_LTYPE /* obsolescent; will be withdrawn */ +# define GRAM_LTYPE_IS_DECLARED 1 +# define GRAM_LTYPE_IS_TRIVIAL 1 #endif From 94843f0aa3d347ed66d09bc8552c3f6c856088c0 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 12:28:35 +0200 Subject: [PATCH 4/9] tests: restore the tests on -Werror When run as /bin/sh, Bash sets the shell variable POSIXLY_CORRECT to y. The test suite checks for the envvar POSIXLY_CORRECT to turn of some tests not supported in POSIX mode. Restore these tests. Reported by the Hydra build farm, from Rob Vermaas. * tests/local.at (AT_BISON_CHECK_WARNINGS_): Check the envvar POSIXLY_CORRECT, not the shell variable. --- tests/local.at | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/local.at b/tests/local.at index 036b0a1d..97107a55 100644 --- a/tests/local.at +++ b/tests/local.at @@ -462,10 +462,14 @@ m4_define([AT_BISON_CHECK_WARNINGS], [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])]) m4_define([AT_BISON_CHECK_WARNINGS_], -[[# Defining POSIXLY_CORRECT causes bison to complain if options -# are added after the grammar file name, so skip these checks -# in that case. -if test -z "${POSIXLY_CORRECT+set}"; then +[[# Defining POSIXLY_CORRECT causes bison to complain if options are +# added after the grammar file name, so skip these checks in that +# case. +# +# Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched +# as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not +# the environment variable. +if env | grep '^POSIXLY_CORRECT=' >/dev/null; then :; else ]AT_SAVE_SPECIAL_FILES[ # To avoid expanding it repeatedly, store specified stdout. From 324a5576515921a9c41913833cacde6dadee303a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 14:26:09 +0200 Subject: [PATCH 5/9] tests: don't use options that Clang does not support * configure.ac (WARN_CFLAGS, WARN_CXXFLAGS): Do not include options that Clang does not support. --- configure.ac | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4cc9ef91..651fa139 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,18 @@ if test "$enable_gcc_warnings" = yes; then -Wshadow -Wstrict-prototypes' warn_cxx='-Wnoexcept' AC_LANG_PUSH([C]) + # Clang supports many of GCC's -W options, but only issues warnings + # on the ones it does not recognize. In that case, gl_WARN_ADD + # thinks the option is supported, and unknown options are then added + # to CFLAGS. But then, when -Werror is added in the test suite for + # instance, the warning about the unknown option turns into an + # error. + # + # This should be addressed by gnulib's gl_WARN_ADD, but in the + # meanwhile, turn warnings about unknown options into errors in + # CFLAGS, and restore CFLAGS after the tests. + save_CFLAGS=$CFLAGS + gl_WARN_ADD([-Werror=unknown-warning-option], [CFLAGS]) for i in $warn_common $warn_c; do gl_WARN_ADD([$i], [WARN_CFLAGS]) @@ -80,19 +92,23 @@ if test "$enable_gcc_warnings" = yes; then # Warnings for the test suite only. gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST]) gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST]) + CFLAGS=$save_CFLAGS AC_LANG_POP([C]) AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + gl_WARN_ADD([-Werror=unknown-warning-option], [CXXFLAGS]) for i in $warn_common $warn_cxx; do gl_WARN_ADD([$i], [WARN_CXXFLAGS]) done - gl_WARN_ADD([ -Wzero-as-null-pointer-constant], [WARN_CXXFLAGS], + gl_WARN_ADD([-Wzero-as-null-pointer-constant], [WARN_CXXFLAGS], [AC_LANG_PROGRAM([], [nullptr])]) gl_WARN_ADD([-Werror], [WERROR_CXXFLAGS]) # Warnings for the test suite only. gl_WARN_ADD([-Wundef], [WARN_CXXFLAGS_TEST]) gl_WARN_ADD([-pedantic], [WARN_CXXFLAGS_TEST]) + CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) fi From 54dccdb2ca8bafc7c7556c6b1426caa8feaa5ebe Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 25 Oct 2012 14:42:24 +0200 Subject: [PATCH 6/9] tests: address a warning from GCC 4.4 236. torture.at:465: testing Exploding the Stack Size with Alloca ... ../../../tests/torture.at:474: bison -o input.c input.y ../../../tests/torture.at:474: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o input input.c $LIBS stderr: cc1: warnings being treated as errors input.y: In function 'main': input.y:60: error: 'status' may be used uninitialized in this function * tests/torture.at (AT_DATA_STACK_TORTURE): Initial status to avoid the previous error. --- tests/torture.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/torture.at b/tests/torture.at index a5e244b6..5aa18900 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -431,7 +431,7 @@ int main (int argc, const char **argv) { YYSTYPE yylval_init = get_args (argc, argv); - int status; + int status = 0; int count; ]m4_bmatch([$2], [api.push-pull both], [[ yypstate *ps = yypstate_new (); From e0992e5458708f4e57f0ddc387ed5e22f3b9953e Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 26 Oct 2012 14:16:29 +0200 Subject: [PATCH 7/9] maint: be compilable with GCC 4.0 The "shadows a global declaration" warning in GCC 4.0 was a bit annoying. It does not like that a type name be used in a prototype of a function (not the implementation, just the declaration): In file included from src/LR0.c:38: src/reader.h:56: warning: declaration of 'named_ref' shadows a global declaration src/named-ref.h:35: warning: shadowed declaration is here It does not like either when a global variable name is used in a prototype. Flex 2.5.37 generates this prototype: void gram_set_debug (int debug_flag ); * src/getargs.h, src/getargs.c (debug_flag): Rename as... (debug): this. Adjust dependencies. * src/reader.h: Don't use "named_ref" as a formal argument name. --- src/getargs.c | 4 ++-- src/getargs.h | 2 +- src/output.c | 2 +- src/parse-gram.y | 2 +- src/reader.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/getargs.c b/src/getargs.c index 70a25e03..64905694 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -49,7 +49,7 @@ #include "quote.h" #include "uniqstr.h" -bool debug_flag; +bool debug; bool defines_flag; bool graph_flag; bool xml_flag; @@ -664,7 +664,7 @@ getargs (int argc, char *argv[]) break; case 't': - debug_flag = true; + debug = true; break; case 'v': diff --git a/src/getargs.h b/src/getargs.h index 22538cf3..ef97822a 100644 --- a/src/getargs.h +++ b/src/getargs.h @@ -34,7 +34,7 @@ extern int skeleton_prio; /* for -I */ extern char const *include; -extern bool debug_flag; /* for -t */ +extern bool debug; /* for -t */ extern bool defines_flag; /* for -d */ extern bool graph_flag; /* for -g */ extern bool xml_flag; /* for -x */ diff --git a/src/output.c b/src/output.c index e77a2d1a..4a4d62d1 100644 --- a/src/output.c +++ b/src/output.c @@ -628,7 +628,7 @@ prepare (void) use_push_for_pull_flag = true; /* Flags. */ - MUSCLE_INSERT_BOOL ("debug_flag", debug_flag); + MUSCLE_INSERT_BOOL ("debug_flag", debug); MUSCLE_INSERT_BOOL ("defines_flag", defines_flag); MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose); MUSCLE_INSERT_BOOL ("glr_flag", glr_parser); diff --git a/src/parse-gram.y b/src/parse-gram.y index 6a49923c..5f77a5bd 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -252,7 +252,7 @@ prologue_declaration: plain_code.code, @1); code_scanner_last_string_free (); } -| "%debug" { debug_flag = true; } +| "%debug" { debug = true; } | "%define" variable content.opt { muscle_percent_define_insert ($2, @2, $3, diff --git a/src/reader.h b/src/reader.h index 3722a7f5..e154deb0 100644 --- a/src/reader.h +++ b/src/reader.h @@ -51,9 +51,9 @@ void grammar_current_rule_prec_set (symbol *precsym, location loc); void grammar_current_rule_dprec_set (int dprec, location loc); void grammar_current_rule_merge_set (uniqstr name, location loc); void grammar_current_rule_symbol_append (symbol *sym, location loc, - named_ref *named_ref); + named_ref *nref); void grammar_current_rule_action_append (const char *action, location loc, - named_ref *named_ref); + named_ref *nref); void reader (void); void free_merger_functions (void); From 5fb07775a1458defbd958fd4d1b59a49a49a57bf Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 26 Oct 2012 10:31:55 +0200 Subject: [PATCH 8/9] yacc.c: do not define location support when not using locations * data/yacc.c (YYLLOC_DEFAULT, YYRHSLOC): Don't define when not using locations. --- data/yacc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/data/yacc.c b/data/yacc.c index faf1d786..1b3dc752 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -769,10 +769,9 @@ while (YYID (0)) #define YYTERROR 1 #define YYERRCODE 256 +]b4_locations_if([[ ]b4_yylloc_default_define[ #define YYRHSLOC(Rhs, K) ((Rhs)[K]) -]b4_locations_if([[ - /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know @@ -787,18 +786,14 @@ while (YYID (0)) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif -#endif]], [[ - - -/* This macro is provided for backward compatibility. */ - +#endif]], +[[/* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif]])[ /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (]b4_pure_if([&yylval[]b4_locations_if([, &yylloc]), ])[YYLEX_PARAM) #else From bb8674a53789875e36d2eee5aacc42b1bc0c2889 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 26 Oct 2012 14:27:32 +0200 Subject: [PATCH 9/9] regen --- src/parse-gram.c | 306 +++++++++++++++++++++++------------------------ src/parse-gram.h | 6 +- 2 files changed, 155 insertions(+), 157 deletions(-) diff --git a/src/parse-gram.c b/src/parse-gram.c index 56139fd6..2c08b106 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.4.4-8c79c-dirty. */ +/* A Bison parser, made by GNU Bison 2.6.4.11-d01f-dirty. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.4.4-8c79c-dirty" +#define YYBISON_VERSION "2.6.4.11-d01f-dirty" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -970,6 +970,7 @@ while (YYID (0)) #define YYTERROR 1 #define YYERRCODE 256 + /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ @@ -996,8 +997,6 @@ while (YYID (0)) #define YYRHSLOC(Rhs, K) ((Rhs)[K]) - - /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know we won't break user code: when these are the locations we know. */ @@ -1015,7 +1014,6 @@ while (YYID (0)) /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else @@ -1080,130 +1078,130 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "string" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 205 "parse-gram.y" { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }; -/* Line 833 of yacc.c */ -#line 1088 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1086 "parse-gram.c" break; case 4: /* "integer" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 217 "parse-gram.y" { fprintf (stderr, "%d", ((*yyvaluep).integer)); }; -/* Line 833 of yacc.c */ -#line 1095 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1093 "parse-gram.c" break; case 43: /* "{...}" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }; -/* Line 833 of yacc.c */ -#line 1102 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1100 "parse-gram.c" break; case 44: /* "[identifier]" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 212 "parse-gram.y" { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }; -/* Line 833 of yacc.c */ -#line 1109 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1107 "parse-gram.c" break; case 45: /* "char" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 199 "parse-gram.y" { fputs (char_name (((*yyvaluep).character)), stderr); }; -/* Line 833 of yacc.c */ -#line 1116 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1114 "parse-gram.c" break; case 46: /* "epilogue" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; -/* Line 833 of yacc.c */ -#line 1123 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1121 "parse-gram.c" break; case 48: /* "identifier" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 211 "parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); }; -/* Line 833 of yacc.c */ -#line 1130 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1128 "parse-gram.c" break; case 49: /* "identifier:" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 213 "parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }; -/* Line 833 of yacc.c */ -#line 1137 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1135 "parse-gram.c" break; case 52: /* "%{...%}" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; -/* Line 833 of yacc.c */ -#line 1144 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1142 "parse-gram.c" break; case 54: /* "type" */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 214 "parse-gram.y" { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }; -/* Line 833 of yacc.c */ -#line 1151 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1149 "parse-gram.c" break; case 71: /* symbol.prec */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; -/* Line 833 of yacc.c */ -#line 1158 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1156 "parse-gram.c" break; case 84: /* variable */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 211 "parse-gram.y" { fputs (((*yyvaluep).uniqstr), stderr); }; -/* Line 833 of yacc.c */ -#line 1165 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1163 "parse-gram.c" break; case 85: /* content.opt */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; -/* Line 833 of yacc.c */ -#line 1172 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1170 "parse-gram.c" break; case 86: /* braceless */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 207 "parse-gram.y" { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }; -/* Line 833 of yacc.c */ -#line 1179 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1177 "parse-gram.c" break; case 87: /* id */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; -/* Line 833 of yacc.c */ -#line 1186 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1184 "parse-gram.c" break; case 88: /* id_colon */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 221 "parse-gram.y" { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }; -/* Line 833 of yacc.c */ -#line 1193 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1191 "parse-gram.c" break; case 89: /* symbol */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; -/* Line 833 of yacc.c */ -#line 1200 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1198 "parse-gram.c" break; case 90: /* string_as_id */ -/* Line 833 of yacc.c */ +/* Line 828 of yacc.c */ #line 220 "parse-gram.y" { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }; -/* Line 833 of yacc.c */ -#line 1207 "parse-gram.c" +/* Line 828 of yacc.c */ +#line 1205 "parse-gram.c" break; default: break; @@ -2001,7 +1999,7 @@ YYLTYPE yylloc; #endif /* User initialization code. */ -/* Line 1596 of yacc.c */ +/* Line 1591 of yacc.c */ #line 107 "parse-gram.y" { /* Bison's grammar can initial empty locations, hence a default @@ -2009,8 +2007,8 @@ YYLTYPE yylloc; boundary_set (&yylloc.start, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1); } -/* Line 1596 of yacc.c */ -#line 2014 "parse-gram.c" +/* Line 1591 of yacc.c */ +#line 2012 "parse-gram.c" yylsp[0] = yylloc; goto yysetstate; @@ -2204,7 +2202,7 @@ yyreduce: switch (yyn) { case 6: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 246 "parse-gram.y" { code_props plain_code; @@ -2218,13 +2216,13 @@ yyreduce: break; case 7: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 255 "parse-gram.y" - { debug_flag = true; } + { debug = true; } break; case 8: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 257 "parse-gram.y" { muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), @@ -2233,13 +2231,13 @@ yyreduce: break; case 9: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 261 "parse-gram.y" { defines_flag = true; } break; case 10: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 263 "parse-gram.y" { defines_flag = true; @@ -2248,37 +2246,37 @@ yyreduce: break; case 11: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 267 "parse-gram.y" { error_verbose = true; } break; case 12: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 268 "parse-gram.y" { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 13: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 269 "parse-gram.y" { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } break; case 14: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 270 "parse-gram.y" { spec_file_prefix = (yyvsp[(2) - (2)].chars); } break; case 15: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 271 "parse-gram.y" { spec_file_prefix = (yyvsp[(3) - (3)].chars); } break; case 16: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 273 "parse-gram.y" { nondeterministic_parser = true; @@ -2287,7 +2285,7 @@ yyreduce: break; case 17: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 278 "parse-gram.y" { code_props action; @@ -2300,67 +2298,67 @@ yyreduce: break; case 18: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 286 "parse-gram.y" { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } break; case 19: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 287 "parse-gram.y" { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 20: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 288 "parse-gram.y" { locations_flag = true; } break; case 21: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 289 "parse-gram.y" { spec_name_prefix = (yyvsp[(2) - (2)].chars); } break; case 22: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 290 "parse-gram.y" { spec_name_prefix = (yyvsp[(3) - (3)].chars); } break; case 23: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 291 "parse-gram.y" { no_lines_flag = true; } break; case 24: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 292 "parse-gram.y" { nondeterministic_parser = true; } break; case 25: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 293 "parse-gram.y" { spec_outfile = (yyvsp[(2) - (2)].chars); } break; case 26: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 294 "parse-gram.y" { spec_outfile = (yyvsp[(3) - (3)].chars); } break; case 27: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 295 "parse-gram.y" { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } break; case 28: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 297 "parse-gram.y" { /* %pure-parser is deprecated in favor of `%define api.pure', so use @@ -2379,13 +2377,13 @@ yyreduce: break; case 29: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 311 "parse-gram.y" { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } break; case 30: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 313 "parse-gram.y" { char const *skeleton_user = (yyvsp[(2) - (2)].chars); @@ -2413,25 +2411,25 @@ yyreduce: break; case 31: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 336 "parse-gram.y" { token_table_flag = true; } break; case 32: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 337 "parse-gram.y" { report_flag |= report_states; } break; case 33: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 338 "parse-gram.y" { yacc_flag = true; } break; case 37: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 346 "parse-gram.y" { grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); @@ -2439,7 +2437,7 @@ yyreduce: break; case 38: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 350 "parse-gram.y" { code_props code; @@ -2455,7 +2453,7 @@ yyreduce: break; case 39: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 362 "parse-gram.y" { code_props code; @@ -2471,7 +2469,7 @@ yyreduce: break; case 40: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 374 "parse-gram.y" { default_prec = true; @@ -2479,7 +2477,7 @@ yyreduce: break; case 41: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 378 "parse-gram.y" { default_prec = false; @@ -2487,7 +2485,7 @@ yyreduce: break; case 42: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 382 "parse-gram.y" { /* Do not invoke muscle_percent_code_grow here since it invokes @@ -2498,7 +2496,7 @@ yyreduce: break; case 43: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 389 "parse-gram.y" { muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); @@ -2507,19 +2505,19 @@ yyreduce: break; case 44: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 403 "parse-gram.y" {} break; case 45: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 404 "parse-gram.y" { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 46: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 409 "parse-gram.y" { union_seen = true; @@ -2529,13 +2527,13 @@ yyreduce: break; case 47: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 420 "parse-gram.y" { current_class = nterm_sym; } break; case 48: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 421 "parse-gram.y" { current_class = unknown_sym; @@ -2544,13 +2542,13 @@ yyreduce: break; case 49: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 425 "parse-gram.y" { current_class = token_sym; } break; case 50: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 426 "parse-gram.y" { current_class = unknown_sym; @@ -2559,7 +2557,7 @@ yyreduce: break; case 51: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 431 "parse-gram.y" { symbol_list *list; @@ -2571,7 +2569,7 @@ yyreduce: break; case 52: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 442 "parse-gram.y" { symbol_list *list; @@ -2587,109 +2585,109 @@ yyreduce: break; case 53: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 456 "parse-gram.y" { (yyval.assoc) = left_assoc; } break; case 54: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 457 "parse-gram.y" { (yyval.assoc) = right_assoc; } break; case 55: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 458 "parse-gram.y" { (yyval.assoc) = non_assoc; } break; case 56: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 462 "parse-gram.y" { current_type = NULL; } break; case 57: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 463 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } break; case 58: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 469 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 59: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 471 "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 60: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 475 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } break; case 61: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 476 "parse-gram.y" { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } break; case 62: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 482 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 63: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 484 "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 64: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 488 "parse-gram.y" { (yyval.list) = (yyvsp[(1) - (1)].list); } break; case 65: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 489 "parse-gram.y" { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } break; case 66: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 493 "parse-gram.y" { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } break; case 67: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 494 "parse-gram.y" { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 68: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 495 "parse-gram.y" { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } break; case 69: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 496 "parse-gram.y" { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } break; case 70: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 502 "parse-gram.y" { current_type = (yyvsp[(1) - (1)].uniqstr); @@ -2698,7 +2696,7 @@ yyreduce: break; case 71: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 507 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); @@ -2707,7 +2705,7 @@ yyreduce: break; case 72: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 512 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); @@ -2717,7 +2715,7 @@ yyreduce: break; case 73: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 518 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); @@ -2727,7 +2725,7 @@ yyreduce: break; case 74: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 524 "parse-gram.y" { symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); @@ -2738,7 +2736,7 @@ yyreduce: break; case 81: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 554 "parse-gram.y" { yyerrok; @@ -2746,13 +2744,13 @@ yyreduce: break; case 82: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 560 "parse-gram.y" { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); } break; case 83: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 561 "parse-gram.y" { /* Free the current lhs. */ @@ -2761,86 +2759,86 @@ yyreduce: break; case 84: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 568 "parse-gram.y" { grammar_current_rule_end ((yylsp[(1) - (1)])); } break; case 85: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 569 "parse-gram.y" { grammar_current_rule_end ((yylsp[(3) - (3)])); } break; case 87: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 575 "parse-gram.y" { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } break; case 88: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 578 "parse-gram.y" { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 89: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 580 "parse-gram.y" { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } break; case 90: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 582 "parse-gram.y" { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } break; case 91: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 584 "parse-gram.y" { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } break; case 92: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 586 "parse-gram.y" { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } break; case 93: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 590 "parse-gram.y" { (yyval.named_ref) = 0; } break; case 94: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 592 "parse-gram.y" { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 96: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 604 "parse-gram.y" { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } break; case 97: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 609 "parse-gram.y" { (yyval.chars) = ""; } break; case 98: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 610 "parse-gram.y" { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } break; case 100: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 621 "parse-gram.y" { code_props plain_code; @@ -2853,13 +2851,13 @@ yyreduce: break; case 101: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 641 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 102: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 643 "parse-gram.y" { (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); @@ -2869,13 +2867,13 @@ yyreduce: break; case 103: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 651 "parse-gram.y" { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } break; case 106: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 663 "parse-gram.y" { (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); @@ -2884,7 +2882,7 @@ yyreduce: break; case 108: -/* Line 1813 of yacc.c */ +/* Line 1808 of yacc.c */ #line 672 "parse-gram.y" { code_props plain_code; @@ -2897,8 +2895,8 @@ yyreduce: break; -/* Line 1813 of yacc.c */ -#line 2902 "parse-gram.c" +/* Line 1808 of yacc.c */ +#line 2900 "parse-gram.c" default: break; } if (yychar_backup != yychar) @@ -3148,7 +3146,7 @@ yyreturn: } -/* Line 2076 of yacc.c */ +/* Line 2071 of yacc.c */ #line 682 "parse-gram.y" diff --git a/src/parse-gram.h b/src/parse-gram.h index a2c9934b..39e29986 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.4.4-8c79c-dirty. */ +/* A Bison parser, made by GNU Bison 2.6.4.11-d01f-dirty. */ /* Bison interface for Yacc-like parsers in C @@ -175,7 +175,7 @@ extern int gram_debug; #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED typedef union GRAM_STYPE { -/* Line 2077 of yacc.c */ +/* Line 2072 of yacc.c */ #line 115 "parse-gram.y" symbol *symbol; @@ -189,7 +189,7 @@ typedef union GRAM_STYPE named_ref *named_ref; -/* Line 2077 of yacc.c */ +/* Line 2072 of yacc.c */ #line 194 "parse-gram.h" } GRAM_STYPE; # define GRAM_STYPE_IS_TRIVIAL 1