diff --git a/.prev-version b/.prev-version index 75a22a26..b0f2dcb3 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -3.0.3 +3.0.4 diff --git a/Makefile.am b/Makefile.am index fd3db0f1..b6135cbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,8 +39,9 @@ AM_YFLAGS = -d -v -Werror -Wall -Wno-yacc --report=all # Initialization before completion by local.mk's. AM_CFLAGS = $(WARN_CFLAGS) -# Find builddir/src/scan-code.c etc. -AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib +# Find builddir/src/scan-code.c etc. For some reason "-I./lib" +# instead of "-Ilib" avoids infinite recursions on #include_next. +AM_CPPFLAGS = -I. -I./lib -I$(top_srcdir) -I$(top_srcdir)/lib BUILT_SOURCES = CLEANFILES = DISTCLEANFILES = diff --git a/NEWS b/NEWS index 1dcd0edd..c45e6e07 100644 --- a/NEWS +++ b/NEWS @@ -45,7 +45,7 @@ GNU Bison NEWS input: '0' | exp ^^^ -* Noteworthy changes in release ?.? (????-??-??) [?] +* Noteworthy changes in release 3.0.4 (2015-01-23) [stable] ** Bug fixes @@ -53,6 +53,10 @@ GNU Bison NEWS Fix a compiler warning when no %destructor use $$. +*** Test suites + + Several portability issues in tests were fixed. + * Noteworthy changes in release 3.0.3 (2015-01-15) [stable] ** Bug fixes diff --git a/THANKS b/THANKS index b9849103..26bea0a7 100644 --- a/THANKS +++ b/THANKS @@ -66,6 +66,7 @@ Jim Kent jkent@arch.sel.sony.com Jim Meyering jim@meyering.net Joel E. Denny joeldenny@joeldenny.org Johan van Selst johans@stack.nl +John Horigan john@glyphic.com Jonathan Fabrizio jonathan.fabrizio@lrde.epita.fr Jonathan Nieder jrnieder@gmail.com Juan Manuel Guerrero juan.guerrero@gmx.de @@ -113,6 +114,7 @@ Peter Fales psfales@lucent.com Peter Hamorsky hamo@upjs.sk Peter Simons simons@cryp.to Petr Machata pmachata@redhat.com +Pho pho@cielonegro.org Piotr Gackiewicz gacek@intertel.com.pl Quentin Hocquet hocquet@gostai.com Quoc Peyrot chojin@lrde.epita.fr diff --git a/configure.ac b/configure.ac index 559b5054..6f200400 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AC_ARG_ENABLE([gcc-warnings], [enable_gcc_warnings=no]) AM_CONDITIONAL([ENABLE_GCC_WARNINGS], [test "$enable_gcc_warnings" = yes]) if test "$enable_gcc_warnings" = yes; then - warn_common='-Wall-Wextra -Wno-sign-compare -Wcast-align -Wdocumentation + warn_common='-Wall -Wextra -Wno-sign-compare -Wcast-align -Wdocumentation -Wformat -Wpointer-arith -Wwrite-strings' warn_c='-Wbad-function-cast -Wshadow -Wstrict-prototypes' warn_cxx='-Wnoexcept' diff --git a/data/lalr1.cc b/data/lalr1.cc index 0e0e17ae..3773257c 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -149,10 +149,11 @@ b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])]) m4_define([b4_shared_declarations], [b4_percent_code_get([[requires]])[ ]b4_parse_assert_if([# include ])[ -# include +# include // std::abort # include # include -# include ]b4_defines_if([[ +# include +# include ]b4_defines_if([[ # include "stack.hh" ]b4_bison_locations_if([[# include "location.hh"]])])[ ]b4_variant_if([b4_variant_includes])[ @@ -569,7 +570,10 @@ m4_if(b4_prefix, [yy], [], ]b4_parser_class_name[::symbol_number_type ]b4_parser_class_name[::by_state::type_get () const { - return state == empty_state ? empty_symbol : yystos_[state]; + if (state == empty_state) + return empty_symbol; + else + return yystos_[state]; } inline @@ -622,6 +626,10 @@ m4_if(b4_prefix, [yy], [], std::ostream& yyoutput = yyo; YYUSE (yyoutput); symbol_number_type yytype = yysym.type_get (); + // Avoid a (spurious) G++ 4.8 warning about "array subscript is + // below array bounds". + if (yysym.empty ()) + std::abort (); yyo << (yytype < yyntokens_ ? "token" : "nterm") << ' ' << yytname_[yytype] << " ("]b4_locations_if([ << yysym.location << ": "])[; diff --git a/data/stack.hh b/data/stack.hh index e7ff0405..a56e6c74 100644 --- a/data/stack.hh +++ b/data/stack.hh @@ -32,12 +32,12 @@ m4_define([b4_stack_define], stack () : seq_ () { + seq_.reserve (200); } stack (unsigned int n) : seq_ (n) - { - } + {} inline T& @@ -114,8 +114,7 @@ m4_define([b4_stack_define], slice (const S& stack, unsigned int range) : stack_ (stack) , range_ (range) - { - } + {} inline const T& diff --git a/gnulib b/gnulib index 7585eb3f..ea6cb044 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 7585eb3f16ab1e83f1d46ed5bb243488d8c34228 +Subproject commit ea6cb044ca0ab57045900a494a0e4ae39ed5372c diff --git a/src/AnnotationList.c b/src/AnnotationList.c index bd4b39d3..cf0b49cf 100644 --- a/src/AnnotationList.c +++ b/src/AnnotationList.c @@ -546,7 +546,7 @@ AnnotationList__compute_from_inadequacies ( AnnotationList__insertInto (annotation_node, &annotation_lists[s->number], s->nitems); - aver (b); + aver (b); (void) b; } /* This aver makes sure the AnnotationList__computeDominantContribution check above diff --git a/src/InadequacyList.c b/src/InadequacyList.c index e827cb0a..f2e45f49 100644 --- a/src/InadequacyList.c +++ b/src/InadequacyList.c @@ -66,7 +66,7 @@ symbol * InadequacyList__getContributionToken (InadequacyList const *self, ContributionIndex i) { - aver (0 <= i && i < self->contributionCount); + aver (0 <= i && i < self->contributionCount); (void) i; return self->inadequacy.conflict.token; } diff --git a/src/graphviz.c b/src/graphviz.c index 10cfbcba..ac8070c4 100644 --- a/src/graphviz.c +++ b/src/graphviz.c @@ -113,8 +113,8 @@ conclude_red (struct obstack *out, int source, rule_number ruleno, with n the source state and m the rule number. This is because we don't want all the reductions bearing a same rule number to point to the same state, since that is not the desired format. */ - fprintf (fout, " %1$d -> \"%1$dR%2$d%3$s\" [", - source, ruleno, ed); + fprintf (fout, " %d -> \"%dR%d%s\" [", + source, source, ruleno, ed); /* (The lookahead tokens have been added to the beginning of the obstack, in the caller function.) */ diff --git a/src/ielr.c b/src/ielr.c index 60754b1a..99228377 100644 --- a/src/ielr.c +++ b/src/ielr.c @@ -1102,7 +1102,10 @@ ielr (void) else if (STREQ (type, "canonical-lr")) lr_type = LR_TYPE__CANONICAL_LR; else - aver (false); + { + aver (false); + abort (); + } free (type); } diff --git a/src/print.c b/src/print.c index 1a4eb07f..3fb8fbf0 100644 --- a/src/print.c +++ b/src/print.c @@ -344,6 +344,7 @@ print_reductions (FILE *out, state *s) || (STREQ (default_reductions, "consistent") && default_reduction_only) || (reds->num == 1 && reds->rules[0]->number == 0)); + (void) default_reduction_only; free (default_reductions); } } diff --git a/src/scan-code.l b/src/scan-code.l index 308d1d0d..eeca1616 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -664,7 +664,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) case LHS_REF: if (!type_name) - type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0); + type_name = symbol_list_n_type_name_get (rule, 0); if (!type_name) { @@ -695,8 +695,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) if (max_left_semantic_context < 1 - n) max_left_semantic_context = 1 - n; if (!type_name && 0 < n) - type_name = - symbol_list_n_type_name_get (effective_rule, dollar_loc, n); + type_name = symbol_list_n_type_name_get (effective_rule, n); if (!type_name) { if (union_seen | tag_seen) diff --git a/src/symlist.c b/src/symlist.c index d70763b0..d3dc3118 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -190,7 +190,7 @@ symbol_list_n_get (symbol_list *l, int n) `--------------------------------------------------------------*/ uniqstr -symbol_list_n_type_name_get (symbol_list *l, location loc, int n) +symbol_list_n_type_name_get (symbol_list *l, int n) { return symbol_list_n_get (l, n)->content.sym->content->type_name; } diff --git a/src/symlist.h b/src/symlist.h index aeb46229..45cb7963 100644 --- a/src/symlist.h +++ b/src/symlist.h @@ -124,7 +124,7 @@ symbol_list *symbol_list_n_get (symbol_list *l, int n); /* Get the data type (alternative in the union) of the value for symbol N in rule RULE. */ -uniqstr symbol_list_n_type_name_get (symbol_list *l, location loc, int n); +uniqstr symbol_list_n_type_name_get (symbol_list *l, int n); /* Check whether the node is a border element of a rule. */ bool symbol_list_null (symbol_list *node); diff --git a/src/symtab.c b/src/symtab.c index 95247733..f23b7961 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -187,7 +187,7 @@ code_props_type_string (code_props_type kind) case printer: return "%printer"; } - assert (0); + abort (); } diff --git a/src/symtab.h b/src/symtab.h index 42d479c2..d984070e 100644 --- a/src/symtab.h +++ b/src/symtab.h @@ -74,12 +74,12 @@ typedef enum declared, } status; -typedef enum code_props_type code_props_type; enum code_props_type { destructor = 0, printer = 1, }; +typedef enum code_props_type code_props_type; enum { CODE_PROPS_SIZE = 2 }; diff --git a/src/tables.c b/src/tables.c index c68ef870..eb8572fc 100644 --- a/src/tables.c +++ b/src/tables.c @@ -698,7 +698,7 @@ pack_vector (vector_number vector) if (ok) { - int loc; + int loc PACIFY_CC (= -1); int k; for (k = 0; k < t; k++) { diff --git a/tests/actions.at b/tests/actions.at index 7220b715..d538f883 100644 --- a/tests/actions.at +++ b/tests/actions.at @@ -633,7 +633,7 @@ main (int argc, const char *argv[]) { int status; yydebug = !!getenv ("YYDEBUG"); - assert (argc == 2); + assert (argc == 2); (void) argc; source = argv[1]; status = yyparse (); switch (status) @@ -1530,10 +1530,13 @@ AT_DATA_GRAMMAR([[input.y]], ]AT_SKEL_CC_IF([[ # include - static void - report (std::ostream& yyo, int ival, float fval) + namespace { - yyo << "ival: " << ival << ", fval: " << fval; + void + report (std::ostream& yyo, int ival, float fval) + { + yyo << "ival: " << ival << ", fval: " << fval; + } } ]], [[ # include diff --git a/tests/c++.at b/tests/c++.at index 737037d3..55d7d403 100644 --- a/tests/c++.at +++ b/tests/c++.at @@ -342,7 +342,6 @@ AT_PARSER_CHECK([./list], 0, ]], [[Destroy: "" Destroy: "0" -Destroy: (0) Destroy: 1 Destroy: "1" Destroy: () @@ -719,6 +718,7 @@ $1 #include // size_t and getenv. #include #include + #include bool debug = false; @@ -751,7 +751,7 @@ $1 ~Object () { log (this, "Object::~Object"); - objects::const_iterator i = instances.find (this); + objects::iterator i = instances.find (this); // Make sure this object is alive. assert (i != instances.end ()); Object::instances.erase (i); diff --git a/tests/calc.at b/tests/calc.at index 9696c4ee..85170097 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -94,8 +94,8 @@ main (int argc, const char **argv) status = ]AT_NAME_PREFIX[parse (]AT_PARAM_IF([[&result, &count]])[); if (fclose (input)) perror ("fclose"); - assert (global_result == result); - assert (global_count == count); + assert (global_result == result); (void) result; + assert (global_count == count); (void) count; return status; } ]]) diff --git a/tests/conflicts.at b/tests/conflicts.at index 03b8fa20..d320442d 100644 --- a/tests/conflicts.at +++ b/tests/conflicts.at @@ -395,7 +395,7 @@ AT_CLEANUP m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [ -AT_SETUP([[parse.error=verbose and consistent errors: $1]]) +AT_SETUP([[parse.error=verbose and consistent errors: ]$1]) AT_BISON_OPTION_PUSHDEFS([$1]) diff --git a/tests/cxx-type.at b/tests/cxx-type.at index eb11156f..e112a2cf 100644 --- a/tests/cxx-type.at +++ b/tests/cxx-type.at @@ -127,7 +127,7 @@ declarator : ID int main (int argc, char **argv) { - assert (argc == 2); + assert (argc == 2); (void) argc; if (!freopen (argv[1], "r", stdin)) return 3; return yyparse (); diff --git a/tests/glr-regression.at b/tests/glr-regression.at index 71f6e6d5..a815008d 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -72,7 +72,7 @@ const char *input = YY_NULLPTR; int main (int argc, const char* argv[]) { - assert (argc == 2); + assert (argc == 2); (void) argc; input = argv[1]; return yyparse (); } diff --git a/tests/named-refs.at b/tests/named-refs.at index f8df417d..17516a6a 100644 --- a/tests/named-refs.at +++ b/tests/named-refs.at @@ -162,8 +162,8 @@ int main (int argc, const char **argv) } status = yyparse (); fclose (input); - assert (global_result == result); - assert (global_count == count); + assert (global_result == result); (void) global_result; (void) result; + assert (global_count == count); (void) global_count; (void) count; return status; } ]]) diff --git a/tests/synclines.at b/tests/synclines.at index 260e2f9e..00c2fc1d 100644 --- a/tests/synclines.at +++ b/tests/synclines.at @@ -19,13 +19,13 @@ AT_BANNER([[User Actions.]]) -# AT_SYNCLINES_COMPILE(FILE) -# -------------------------- +# _AT_SYNCLINES_COMPILE(FILE) +# --------------------------- # Compile FILE expecting an error, and save in the file stdout the # normalized output. Ignore the exit status, since some compilers # (e.g. c89 on IRIX 6.5) trigger warnings on '#error', instead of # errors. -m4_define([AT_SYNCLINES_COMPILE], +m4_define([_AT_SYNCLINES_COMPILE], [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr]) # Transform stderr into something like this: @@ -75,6 +75,12 @@ m4_define([AT_SYNCLINES_COMPILE], # When c++ is used to compiler C, we might have more messages (Clang 3.2): # # clang: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated +# +# +# xlc reports things like: +# +# "input.yy", line 80.21: 1540-0218 (S) The call does not match any parameter list for "operator<<". +# "/usr/vacpp/include/iosfwd", line 32.6: 1506-205 (S) #error This file to be used only with IBM VisualAge C++ v4 and later compilers AT_CHECK([[$PERL -p -0777 - stderr <<\EOF # 1. Remove useless lines. @@ -92,6 +98,8 @@ AT_CHECK([[$PERL -p -0777 - stderr <<\EOF # 2. Normalize the lines we kept. + # xlc messages. Remove also error identifier (e.g., "1540-0218 (S)"). + s/^"(.*?)", line ([\w.]*): \d+-\d+ \(.\) /$][1:$][2: /gm; # Remove column. s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm; # Map all combinations of "error: " and "#error: " to "#error ". @@ -101,13 +109,14 @@ EOF 0, [stdout]) ]) -# AT_TEST(TITLE, INPUT, ERROR-MSG) -# -------------------------------- -# Check that compiling the parser produced from INPUT cause GCC -# to issue ERROR-MSG. -m4_pushdef([AT_TEST], -[AT_SETUP([$1]) -AT_BISON_OPTION_PUSHDEFS + + +# AT_SYNCLINES_COMPILE(FILE) +# -------------------------- +# Compile FILE expecting an error, and save in the file stdout the +# normalized output. If we can't get a trustable location +# from the compiler, just skip the test. +# # It seems impossible to find a generic scheme to check the location # of an error. Even requiring GCC is not sufficient, since for instance # the version modified by Apple: @@ -124,15 +133,29 @@ AT_BISON_OPTION_PUSHDEFS # # | input.y:2: "2" # | cpp-precomp: warning: errors during smart preprocessing, retrying in basic mode - +m4_define([AT_SYNCLINES_COMPILE], +[# Check if we can trust location translation. AT_DATA([syncline.c], [[#error "1" int i; /* avoids -pedantic warning about an empty translation unit. */ ]]) -AT_SYNCLINES_COMPILE([syncline.c]) +_AT_SYNCLINES_COMPILE([syncline.c]) AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]]) +# Then work for real. +_AT_SYNCLINES_COMPILE([$1]) +]) + + +# AT_TEST(TITLE, INPUT, ERROR-MSG) +# -------------------------------- +# Check that compiling the parser produced from INPUT cause GCC +# to issue ERROR-MSG. +m4_pushdef([AT_TEST], +[AT_SETUP([$1]) +AT_BISON_OPTION_PUSHDEFS + AT_DATA([[input.y]], [$2]) AT_BISON_CHECK([-o input.c input.y]) AT_SYNCLINES_COMPILE([input.c]) diff --git a/tests/torture.at b/tests/torture.at index ad9bf9b2..d6b2806a 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -403,7 +403,7 @@ get_args (int argc, const char **argv) { int res; char *endp; - assert (argc == 2); + assert (argc == 2); (void) argc; res = strtol (argv[1], &endp, 10); assert (argv[1] != endp); assert (0 <= res);