From 657ed6d3be43853c457dfa2c0d91ca2de1c6f39b Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 15 Dec 2012 14:58:05 +0100 Subject: [PATCH 01/10] tests: style changes * tests/glr-regression.at: Issue yyerror before yylex. --- tests/glr-regression.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/glr-regression.at b/tests/glr-regression.at index e08904b6..e14ce998 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -485,8 +485,8 @@ start: ; %% -]AT_YYLEX_DEFINE(["a"])[ ]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["a"])[ int main (void) { @@ -1698,8 +1698,8 @@ start: b: 'b'; d: /* nada. */; %% -]AT_YYLEX_DEFINE(["abc"])[ ]AT_YYERROR_DEFINE[ +]AT_YYLEX_DEFINE(["abc"])[ int main (void) { From 80a2826e69b201f9a64c3f18825afe879472efb4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Apr 2013 10:39:48 +0200 Subject: [PATCH 02/10] yacc.c: do not use __attribute__ unprotected Reported by Victor Khomenko. http://lists.gnu.org/archive/html/bug-bison/2013-04/msg00001.html * data/glr.c (YYUSE, __attribute__): Fuse their definition into... * data/c.m4 (b4_attribute_define): this new macro. * data/yacc.c, data/glr.c: Use it. --- NEWS | 5 +++++ THANKS | 1 + data/c.m4 | 28 ++++++++++++++++++++++++---- data/glr.c | 19 +------------------ data/yacc.c | 7 +------ 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/NEWS b/NEWS index 8da9cf9f..b499cc13 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,11 @@ GNU Bison NEWS * Noteworthy changes in release ?.? (????-??-??) [?] +** Bug fixes + +*** Fix compiler attribute portability (yacc.c) + + With locations enabled, __attribute__ was used unprotected. * Noteworthy changes in release 2.7 (2012-12-12) [stable] diff --git a/THANKS b/THANKS index ed978d37..9b24974f 100644 --- a/THANKS +++ b/THANKS @@ -121,6 +121,7 @@ Tom Tromey tromey@cygnus.com Tommy Nordgren tommy.nordgren@chello.se Troy A. Johnson troyj@ecn.purdue.edu Tys Lefering gccbison@gmail.com +Victor Khomenko victor.khomenko@newcastle.ac.uk Vin Shelton acs@alumni.princeton.edu W.C.A. Wijngaards wouter@NLnetLabs.nl Wayne Green wayne@infosavvy.com diff --git a/data/c.m4 b/data/c.m4 index dc3d3036..a1dc2c58 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -187,9 +187,29 @@ m4_define([b4_table_value_equals], [(!!(($2) == ($3)))])]) -## ---------## -## Values. ## -## ---------## +## ----------------- ## +## Compiler issues. ## +## ----------------- ## + +# b4_attribute_define +# ------------------- +# Provide portability for __attribute__. +m4_define([b4_attribute_define], +[#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(E) ((void) (E)) +#else +# define YYUSE(E) /* empty */ +#endif +]) # b4_null_define @@ -405,7 +425,7 @@ m4_define([b4_c_arg], ## ----------- ## # b4_sync_start(LINE, FILE) -# ----------------------- +# ------------------------- m4_define([b4_sync_start], [[#]line $1 $2]) diff --git a/data/glr.c b/data/glr.c index 02a76c21..958b0403 100644 --- a/data/glr.c +++ b/data/glr.c @@ -246,13 +246,6 @@ b4_percent_code_get[]dnl # endif #endif -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) -#else -# define YYUSE(E) /* empty */ -#endif - /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint # define YYID(N) (N) @@ -291,17 +284,7 @@ b4_percent_code_get[]dnl # define YYLONGJMP(Env, Val) (longjmp (Env, Val), YYASSERT (0)) #endif -/*-----------------. -| GCC extensions. | -`-----------------*/ - -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if (! defined __GNUC__ || __GNUC__ < 2 \ - || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) -# define __attribute__(Spec) /* empty */ -# endif -#endif +]b4_attribute_define[ #ifndef YYASSERT # define YYASSERT(Condition) ((void) ((Condition) || (abort (), 0))) diff --git a/data/yacc.c b/data/yacc.c index b34549f1..abc949b6 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -447,12 +447,7 @@ typedef short int yytype_int16; # endif #endif -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) -#else -# define YYUSE(E) /* empty */ -#endif +]b4_attribute_define[ /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint From e83be476a515a38f874e75a109430061c9198e4b Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Apr 2013 10:54:12 +0200 Subject: [PATCH 03/10] lalr1.cc: fix compiler warnings Reported by Rob Conde. http://lists.gnu.org/archive/html/bug-bison/2013-03/msg00003.html * data/stack.hh (operator=, stack(const stack&)): Make this class uncopyable, i.e., "undefine" these operators: make them private and don't implement them. (clear): New. * data/lalr1.cc: Use it instead of an assignment. (parser): Make this class uncopyable. --- NEWS | 2 ++ THANKS | 1 + data/lalr1.cc | 10 +++++++--- data/stack.hh | 8 ++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index b499cc13..ead84788 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ GNU Bison NEWS With locations enabled, __attribute__ was used unprotected. +*** Fix some compiler warnings (lalr1.cc) + * Noteworthy changes in release 2.7 (2012-12-12) [stable] ** Bug fixes diff --git a/THANKS b/THANKS index 9b24974f..0244a19e 100644 --- a/THANKS +++ b/THANKS @@ -103,6 +103,7 @@ Ralf Wildenhues Ralf.Wildenhues@gmx.de Richard Stallman rms@gnu.org Rob Vermaas rob.vermaas@gmail.com Robert Anisko anisko_r@epita.fr +Rob Conde rob.conde@ai-solutions.com Satya Kiran Popuri satyakiran@gmail.com Sebastian Setzer sebastian.setzer.ext@siemens.com Sebastien Fricker sebastien.fricker@gmail.com diff --git a/data/lalr1.cc b/data/lalr1.cc index 237b246f..68de8b40 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -107,6 +107,10 @@ b4_user_stype #endif private: + /// This class is not copyable. + ]b4_parser_class_name[ (const ]b4_parser_class_name[&); + ]b4_parser_class_name[& operator= (const ]b4_parser_class_name[&); + /// Report a syntax error. /// \param loc where the syntax error is found. /// \param msg a description of the syntax error. @@ -552,9 +556,9 @@ b4_dollar_popdef])[]dnl yynewstate, since the latter expects the semantical and the location values to have been already stored, initialize these stacks with a primary value. */ - yystate_stack_ = state_stack_type (0); - yysemantic_stack_ = semantic_stack_type (0); - yylocation_stack_ = location_stack_type (0); + yystate_stack_.clear (); + yysemantic_stack_.clear (); + yylocation_stack_.clear (); yysemantic_stack_.push (yylval); yylocation_stack_.push (yylloc); diff --git a/data/stack.hh b/data/stack.hh index ab1049c1..8f628607 100644 --- a/data/stack.hh +++ b/data/stack.hh @@ -77,6 +77,12 @@ b4_copyright([Stack handling for Bison parsers in C++], seq_.pop_front (); } + void + clear () + { + seq_.clear (); + } + inline unsigned int height () const @@ -88,6 +94,8 @@ b4_copyright([Stack handling for Bison parsers in C++], inline const_iterator end () const { return seq_.rend (); } private: + stack (const stack&); + stack& operator= (const stack&); S seq_; }; From 3cf3393bd419f907902034272d6a4b930c62b542 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Apr 2013 11:13:22 +0200 Subject: [PATCH 04/10] skeletons: avoid empty switch constructs Reported by Rob Conde. http://lists.gnu.org/archive/html/bug-bison/2013-03/msg00003.html * data/c.m4 (b4_symbol_actions): Rename as... (_b4_symbol_actions): this. (b4_symbol_actions): New wrapper. Do not emit empty switches. Adjust all b4_symbol_actions callers. --- data/c.m4 | 38 +++++++++++++++++++++----------------- data/glr.cc | 7 +------ data/lalr1.cc | 14 ++------------ 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/data/c.m4 b/data/c.m4 index a1dc2c58..bcafe422 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -440,15 +440,15 @@ m4_define([b4_case], $2 break;]) -# b4_symbol_actions(FILENAME, LINENO, -# SYMBOL-TAG, SYMBOL-NUM, -# SYMBOL-ACTION, SYMBOL-TYPENAME) -# ------------------------------------------------- +# _b4_symbol_actions(FILENAME, LINENO, +# SYMBOL-TAG, SYMBOL-NUM, +# SYMBOL-ACTION, SYMBOL-TYPENAME) +# -------------------------------------------------- # Issue the code for a symbol action (e.g., %printer). # # Define b4_dollar_dollar([TYPE-NAME]), and b4_at_dollar, which are # invoked where $$ and @$ were specified by the user. -m4_define([b4_symbol_actions], +m4_define([_b4_symbol_actions], [b4_dollar_pushdef([(*yyvaluep)], [$6], [(*yylocationp)])dnl case $4: /* $3 */ b4_syncline([$2], [$1]) @@ -458,6 +458,20 @@ b4_syncline([@oline@], [@ofile@]) b4_dollar_popdef[]dnl ]) +# b4_symbol_actions(KIND) +# ----------------------- +# Emit the symbol actions for KIND ("printers" or "destructors"). +# Dispatch on "yytype". +m4_define([b4_symbol_actions], +[m4_ifval(m4_defn([b4_symbol_$1]), +[[switch (yytype) + { +]m4_map([_b4_symbol_actions], m4_defn([b4_symbol_$1]))[ + default: + break; + }]], +[YYUSE (yytype);])]) + # b4_yydestruct_generate(FUNCTION-DECLARATOR) # ------------------------------------------- @@ -487,12 +501,7 @@ b4_parse_param_use[]dnl yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { -]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ - default: - break; - } + ]b4_symbol_actions([destructors])[ }]dnl ]) @@ -530,12 +539,7 @@ b4_parse_param_use[]dnl # else YYUSE (yyoutput); # endif - switch (yytype) - { -]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl -[ default: - break; - } + ]b4_symbol_actions([printers])[ } diff --git a/data/glr.cc b/data/glr.cc index 49b4fa10..73d0f28d 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -167,12 +167,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl std::ostream& yyoutput = debug_stream (); std::ostream& yyo = yyoutput; YYUSE (yyo); - switch (yytype) - { - ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl -[ default: - break; - } + ]b4_symbol_actions([printers])[ } diff --git a/data/lalr1.cc b/data/lalr1.cc index 68de8b40..750c3a4b 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -422,12 +422,7 @@ do { \ std::ostream& yyo = debug_stream (); std::ostream& yyoutput = yyo; YYUSE (yyoutput); - switch (yytype) - { - ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl -[ default: - break; - } + ]b4_symbol_actions([printers])[ } @@ -454,12 +449,7 @@ do { \ if (yymsg) YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ - default: - break; - } + ]b4_symbol_actions([destructors])[ } void From a565f732762ab6f5918805a306c7a4d17e2b8da7 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Apr 2013 11:19:09 +0200 Subject: [PATCH 05/10] gnulib: update --- bootstrap | 65 +++++++++++++++++++++++++++----------------------- gnulib | 2 +- lib/.gitignore | 1 - 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/bootstrap b/bootstrap index e3e270b0..96f1e762 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2012-07-19.14; # UTC +scriptversion=2013-03-08.16; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 @@ -306,34 +306,34 @@ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then die "Bootstrapping from a non-checked-out distribution is risky." fi -# Ensure that lines starting with ! sort last, per gitignore conventions -# for whitelisting exceptions after a more generic blacklist pattern. -sort_patterns() { - sort -u "$@" | sed '/^!/ { - H - d - } - $ { - P - x - s/^\n// - }' | sed '/^$/d' +# Strip blank and comment lines to leave significant entries. +gitignore_entries() { + sed '/^#/d; /^$/d' "$@" } -# If $STR is not already on a line by itself in $FILE, insert it, -# sorting the new contents of the file and replacing $FILE with the result. -insert_sorted_if_absent() { +# If $STR is not already on a line by itself in $FILE, insert it at the start. +# Entries are inserted at the start of the ignore list to ensure existing +# entries starting with ! are not overridden. Such entries support +# whitelisting exceptions after a more generic blacklist pattern. +insert_if_absent() { file=$1 str=$2 test -f $file || touch $file - echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ - || { echo "$str" | sort_patterns - $file > $file.bak \ - && mv $file.bak $file; } \ - || die "insert_sorted_if_absent $file $str: failed" + test -r $file || die "Error: failed to read ignore file: $file" + duplicate_entries=$(gitignore_entries $file | sort | uniq -d) + if [ "$duplicate_entries" ] ; then + die "Error: Duplicate entries in $file: " $duplicate_entries + fi + linesold=$(gitignore_entries $file | wc -l) + linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l) + if [ $linesold != $linesnew ] ; then + { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ + || die "insert_if_absent $file $str: failed" + fi } # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with -# insert_sorted_if_absent. +# insert_if_absent. insert_vc_ignore() { vc_ignore_file="$1" pattern="$2" @@ -344,7 +344,7 @@ insert_vc_ignore() { # .gitignore entry. pattern=$(echo "$pattern" | sed s,^,/,);; esac - insert_sorted_if_absent "$vc_ignore_file" "$pattern" + insert_if_absent "$vc_ignore_file" "$pattern" } # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. @@ -630,9 +630,13 @@ esac if $bootstrap_sync; then cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { echo "$0: updating bootstrap and restarting..." + case $(sh -c 'echo "$1"' -- a) in + a) ignored=--;; + *) ignored=ignored;; + esac exec sh -c \ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - -- "$GNULIB_SRCDIR/build-aux/bootstrap" \ + $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ "$0" "$@" --no-bootstrap-sync } fi @@ -889,20 +893,21 @@ find "$m4_base" "$source_base" \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ -type l -xtype l -delete > /dev/null 2>&1 +# Invoke autoreconf with --force --install to ensure upgrades of tools +# such as ylwrap. +AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + # Some systems (RHEL 5) are using ancient autotools, for which the # --no-recursive option had not been invented. Detect that lack and # omit the option when it's not supported. FIXME in 2017: remove this # hack when RHEL 5 autotools are updated, or when they become irrelevant. -no_recursive= case $($AUTORECONF --help) in - *--no-recursive*) no_recursive=--no-recursive;; + *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; esac # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. -echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" -AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ +echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" +AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ || die "autoreconf failed" # Get some extra files from gnulib, overriding existing files. diff --git a/gnulib b/gnulib index 4a8c422f..076ac82d 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 4a8c422f3139a9b4fb2c7ffae5aef3bea28bdc65 +Subproject commit 076ac82d1d7f4df54630f1b4917b3c14f227f032 diff --git a/lib/.gitignore b/lib/.gitignore index 2e92c2ff..9f63cba1 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -275,7 +275,6 @@ /bitrotate.c /math.c /sig-handler.c -/stdio.c /unistd.c /wctype-h.c /getdelim.c From b0db817ff28727905bfb106bd5304d31b151da65 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 28 Jan 2013 16:50:50 +0100 Subject: [PATCH 06/10] tests: please clang and use ".cc", not ".c", for C++ input When fed with foo.c, clang++ 3.2 answers: clang: error: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use *.cc and *.hh for C++. --- tests/output.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/output.at b/tests/output.at index 657903a5..e45ae48f 100644 --- a/tests/output.at +++ b/tests/output.at @@ -205,9 +205,9 @@ AT_DATA_GRAMMAR([cxx.y], %% start: {}; ]]) -AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y]) -AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore]) -AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"]) +AT_BISON_CHECK([-o "AS_ESCAPE([$1.cc])" --defines="AS_ESCAPE([$1.hh])" cxx.y]) +AT_CHECK([ls "AS_ESCAPE([$1.cc])" "AS_ESCAPE([$1.hh])"], [], [ignore]) +AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.cc])"]) $2 AT_BISON_OPTION_POPDEFS From de7331a0759815a4e1d5e736aa84e80ef9cd04a0 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 30 Jan 2013 15:52:34 +0100 Subject: [PATCH 07/10] build: avoid clang's colored diagnostics in the test suite The syncline tests, which try to recognize compiler diagnostics, are confused by escapes for colors. * configure.ac (warn_tests): New, to factor the warnings for both C and C++ tests. Add -fno-color-diagnostics to it. * tests/local.at (AT_TEST_TABLES_AND_PARSE): Do not remove glue together compiler flags. Conflicts: configure.ac --- configure.ac | 24 +++++++++++++++++++----- tests/local.at | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index e6403f4b..bf1847bf 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,13 @@ if test "$enable_gcc_warnings" = yes; then -Wformat -Wpointer-arith -Wwrite-strings' warn_c='-Wbad-function-cast -Wshadow -Wstrict-prototypes' warn_cxx='-Wnoexcept' + # Warnings for the test suite only. + # + # -fno-color-diagnostics: Clang's use of colors in the error + # messages is confusing the tests looking at the compiler's output + # (e.g., synclines.at). + warn_tests='-Wundef -pedantic -fno-color-diagnostics' + 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 @@ -111,12 +118,13 @@ if test "$enable_gcc_warnings" = yes; then AS_VAR_APPEND([WARN_CFLAGS], [" $WARN_CFLAGS_TEST"]) # Warnings for the test suite only. - gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST]) - gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST]) + for i in $warn_tests; + do + gl_WARN_ADD([$i], [WARN_CFLAGS_TEST]) + done CFLAGS=$save_CFLAGS AC_LANG_POP([C]) - AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS gl_WARN_ADD([-Werror=unknown-warning-option], [CXXFLAGS]) @@ -128,8 +136,14 @@ if test "$enable_gcc_warnings" = yes; then [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]) + for i in $warn_tests; + do + gl_WARN_ADD([$i], [WARN_CXXFLAGS_TEST]) + done + # Clang++ 3.2+ reject C code generated by Flex. + gl_WARN_ADD([-Wno-null-conversion], [WARN_NO_NULL_CONVERSION_CXXFLAGS]) + # Variants break strict aliasing analysis. + gl_WARN_ADD([-fno-strict-aliasing], [NO_STRICT_ALIAS_CXXFLAGS]) CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) fi diff --git a/tests/local.at b/tests/local.at index 68a7ecaa..be24f902 100644 --- a/tests/local.at +++ b/tests/local.at @@ -889,8 +889,8 @@ $9 # There is no "" around `wc` since some indent the result. m4_bmatch([$4], [%define lr.type canonical-lr], [if test 32767 -lt `wc -l < input.c`; then - CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic //'` - CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic //'` + CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic / /'` + CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic / /'` fi]) AT_COMPILE([[input]]) From 42bcf1ce4440f84e0f308156664d7db833378980 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 12 Jan 2013 16:03:15 +0100 Subject: [PATCH 08/10] build: fix VPATH issue * Makefile.am (update-b4-copyright, update-package-copyright-year): Fix path to build-aux. (cherry picked from commit f6df83b4e80b2a53c08b5dc654e247076a3b9b03) Conflicts: Makefile.am --- Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index aed166e6..16d1275a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,12 +56,11 @@ dist-hook: gen-ChangeLog .PHONY: update-b4-copyright update-package-copyright-year update-b4-copyright: - $(AM_V_GEN) find data -type f \ - | grep -v -E '^data/bison.m4$$' \ - | xargs $(build_aux)/$@ + $(AM_V_GEN)find $(srcdir)/data -type f \ + | xargs $(srcdir)/build-aux/$@ @echo 'warning: src/parse-gram.[hc] may need to be regenerated.' update-package-copyright-year: - $(AM_V_GEN)$(build_aux)/$@ configure.ac + $(AM_V_GEN)$(srcdir)/build-aux/$@ $(srcdir)/configure.ac gen_start_date = 2012-01-16 .PHONY: gen-ChangeLog From 68f91d58f15abe21c65a8b4d7022ccb854c857dc Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 8 Apr 2013 13:43:32 +0200 Subject: [PATCH 09/10] maint: update copyright years Run "make update-copyright". --- AUTHORS | 2 +- ChangeLog-2012 | 2 +- Makefile.am | 2 +- NEWS | 2 +- PACKAGING | 2 +- README | 2 +- README-alpha | 2 +- README-hacking | 2 +- THANKS | 2 +- TODO | 2 +- bootstrap.conf | 2 +- build-aux/Makefile.am | 2 +- build-aux/darwin11.4.0.valgrind | 2 +- build-aux/update-b4-copyright | 2 +- build-aux/update-package-copyright-year | 2 +- cfg.mk | 2 +- configure.ac | 4 ++-- data/Makefile.am | 2 +- data/README | 2 +- data/bison.m4 | 2 +- data/c++-skel.m4 | 2 +- data/c++.m4 | 2 +- data/c-like.m4 | 2 +- data/c-skel.m4 | 2 +- data/c.m4 | 2 +- data/glr.c | 6 +++--- data/glr.cc | 4 ++-- data/java-skel.m4 | 2 +- data/java.m4 | 2 +- data/lalr1.cc | 6 +++--- data/lalr1.java | 4 ++-- data/location.cc | 6 +++--- data/stack.hh | 6 +++--- data/xslt/bison.xsl | 2 +- data/xslt/xml2dot.xsl | 2 +- data/xslt/xml2text.xsl | 2 +- data/xslt/xml2xhtml.xsl | 2 +- data/yacc.c | 6 +++--- djgpp/Makefile.maint | 2 +- djgpp/README.in | 2 +- djgpp/config.bat | 2 +- djgpp/config.sed | 2 +- djgpp/config.site | 2 +- djgpp/config_h.sed | 2 +- djgpp/djunpack.bat | 2 +- djgpp/subpipe.c | 2 +- djgpp/subpipe.h | 2 +- djgpp/testsuite.sed | 2 +- doc/Makefile.am | 2 +- doc/bison.texi | 2 +- doc/refcard.tex | 2 +- etc/Makefile.am | 2 +- etc/README | 2 +- etc/bench.pl.in | 2 +- examples/Makefile.am | 2 +- examples/calc++/Makefile.am | 2 +- examples/calc++/test | 2 +- examples/extexi | 2 +- lib/Makefile.am | 2 +- lib/abitset.c | 2 +- lib/abitset.h | 2 +- lib/bbitset.h | 2 +- lib/bitset.c | 2 +- lib/bitset.h | 2 +- lib/bitset_stats.c | 2 +- lib/bitset_stats.h | 2 +- lib/bitsetv-print.c | 2 +- lib/bitsetv-print.h | 2 +- lib/bitsetv.c | 2 +- lib/bitsetv.h | 2 +- lib/ebitset.c | 2 +- lib/ebitset.h | 2 +- lib/get-errno.c | 2 +- lib/get-errno.h | 2 +- lib/lbitset.c | 2 +- lib/lbitset.h | 2 +- lib/libiberty.h | 2 +- lib/main.c | 2 +- lib/timevar.c | 2 +- lib/timevar.def | 2 +- lib/timevar.h | 2 +- lib/vbitset.c | 2 +- lib/vbitset.h | 2 +- lib/yyerror.c | 2 +- m4/bison-i18n.m4 | 2 +- m4/c-working.m4 | 2 +- m4/cxx.m4 | 2 +- m4/flex.m4 | 2 +- m4/timevar.m4 | 2 +- src/AnnotationList.c | 2 +- src/AnnotationList.h | 2 +- src/InadequacyList.c | 2 +- src/InadequacyList.h | 2 +- src/LR0.c | 2 +- src/LR0.h | 2 +- src/Makefile.am | 2 +- src/Sbitset.c | 2 +- src/Sbitset.h | 2 +- src/assoc.c | 2 +- src/assoc.h | 2 +- src/closure.c | 2 +- src/closure.h | 2 +- src/complain.c | 2 +- src/complain.h | 2 +- src/conflicts.c | 2 +- src/conflicts.h | 2 +- src/derives.c | 2 +- src/derives.h | 2 +- src/files.c | 2 +- src/files.h | 2 +- src/flex-scanner.h | 2 +- src/getargs.c | 2 +- src/getargs.h | 2 +- src/gram.c | 2 +- src/gram.h | 2 +- src/graphviz.c | 2 +- src/graphviz.h | 2 +- src/ielr.c | 2 +- src/ielr.h | 2 +- src/lalr.c | 2 +- src/lalr.h | 2 +- src/location.c | 2 +- src/location.h | 2 +- src/main.c | 2 +- src/muscle-tab.c | 2 +- src/muscle-tab.h | 2 +- src/named-ref.c | 2 +- src/named-ref.h | 2 +- src/nullable.c | 2 +- src/nullable.h | 2 +- src/output.c | 2 +- src/output.h | 2 +- src/parse-gram.c | 2 +- src/parse-gram.y | 2 +- src/print-xml.c | 2 +- src/print-xml.h | 2 +- src/print.c | 2 +- src/print.h | 2 +- src/print_graph.c | 2 +- src/print_graph.h | 2 +- src/reader.c | 2 +- src/reader.h | 2 +- src/reduce.c | 2 +- src/reduce.h | 2 +- src/relation.c | 2 +- src/relation.h | 2 +- src/scan-code.h | 2 +- src/scan-code.l | 2 +- src/scan-gram.h | 2 +- src/scan-gram.l | 2 +- src/scan-skel.h | 2 +- src/scan-skel.l | 2 +- src/state.c | 2 +- src/state.h | 2 +- src/symlist.c | 2 +- src/symlist.h | 2 +- src/symtab.c | 2 +- src/symtab.h | 2 +- src/system.h | 2 +- src/tables.c | 2 +- src/tables.h | 2 +- src/uniqstr.c | 2 +- src/uniqstr.h | 2 +- tests/Makefile.am | 2 +- tests/actions.at | 2 +- tests/atlocal.in | 2 +- tests/bison.in | 2 +- tests/c++.at | 2 +- tests/calc.at | 2 +- tests/conflicts.at | 2 +- tests/cxx-type.at | 2 +- tests/existing.at | 2 +- tests/glr-regression.at | 2 +- tests/headers.at | 2 +- tests/input.at | 2 +- tests/java.at | 2 +- tests/local.at | 2 +- tests/named-refs.at | 2 +- tests/output.at | 2 +- tests/push.at | 2 +- tests/reduce.at | 2 +- tests/regression.at | 2 +- tests/sets.at | 2 +- tests/skeletons.at | 2 +- tests/synclines.at | 2 +- tests/testsuite.at | 2 +- tests/torture.at | 2 +- 187 files changed, 200 insertions(+), 200 deletions(-) diff --git a/AUTHORS b/AUTHORS index 806b144f..fa4b1715 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,7 +24,7 @@ and nasty bugs. ----- -Copyright (C) 1998-2012 Free Software Foundation, Inc. +Copyright (C) 1998-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. diff --git a/ChangeLog-2012 b/ChangeLog-2012 index 789e7605..6981c554 100644 --- a/ChangeLog-2012 +++ b/ChangeLog-2012 @@ -24286,7 +24286,7 @@ ----- - Copyright (C) 1987-1988, 1991-2012 Free Software Foundation, + Copyright (C) 1987-1988, 1991-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without diff --git a/Makefile.am b/Makefile.am index 16d1275a..798704dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -## Copyright (C) 2001-2012 Free Software Foundation, Inc. +## Copyright (C) 2001-2013 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 diff --git a/NEWS b/NEWS index ead84788..42c79408 100644 --- a/NEWS +++ b/NEWS @@ -2023,7 +2023,7 @@ Output file does not redefine const for C++. ----- -Copyright (C) 1995-2012 Free Software Foundation, Inc. +Copyright (C) 1995-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Parser Generator. diff --git a/PACKAGING b/PACKAGING index c890eedd..c8bbbf6b 100644 --- a/PACKAGING +++ b/PACKAGING @@ -36,7 +36,7 @@ to the bison package. ----- -Copyright (C) 2002, 2005, 2009-2012 Free Software Foundation, Inc. +Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. diff --git a/README b/README index 04bf5106..ad667a23 100644 --- a/README +++ b/README @@ -44,7 +44,7 @@ End: ----- -Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2012 Free Software +Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. diff --git a/README-alpha b/README-alpha index a137c394..cf065eed 100644 --- a/README-alpha +++ b/README-alpha @@ -12,7 +12,7 @@ the problems you encounter. ----- -Copyright (C) 2002, 2004, 2009-2012 Free Software Foundation, Inc. +Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc. This file is part of GNU Bison. diff --git a/README-hacking b/README-hacking index 11b9f82a..515d2a91 100644 --- a/README-hacking +++ b/README-hacking @@ -408,7 +408,7 @@ Push these changes. ----- -Copyright (C) 2002-2005, 2007-2012 Free Software Foundation, Inc. +Copyright (C) 2002-2005, 2007-2013 Free Software Foundation, Inc. This file is part of GNU Bison. diff --git a/THANKS b/THANKS index 0244a19e..a2d3ea23 100644 --- a/THANKS +++ b/THANKS @@ -143,7 +143,7 @@ End: ----- -Copyright (C) 2000-2012 Free Software Foundation, Inc. +Copyright (C) 2000-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Parser Generator. diff --git a/TODO b/TODO index 978b5c6f..45307ce1 100644 --- a/TODO +++ b/TODO @@ -351,7 +351,7 @@ End: ----- -Copyright (C) 2001-2004, 2006, 2008-2012 Free Software Foundation, Inc. +Copyright (C) 2001-2004, 2006, 2008-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. diff --git a/bootstrap.conf b/bootstrap.conf index 9dccd001..d0685c22 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am index 5b077b8d..d307de49 100644 --- a/build-aux/Makefile.am +++ b/build-aux/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc. +## Copyright (C) 2006, 2009-2013 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 diff --git a/build-aux/darwin11.4.0.valgrind b/build-aux/darwin11.4.0.valgrind index ff355ebc..c5c3bd9c 100644 --- a/build-aux/darwin11.4.0.valgrind +++ b/build-aux/darwin11.4.0.valgrind @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012-2013 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 diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright index c0f5a133..5ba7dd66 100755 --- a/build-aux/update-b4-copyright +++ b/build-aux/update-b4-copyright @@ -3,7 +3,7 @@ # Update b4_copyright invocations or b4_copyright_years definitions to # include the current year. -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 diff --git a/build-aux/update-package-copyright-year b/build-aux/update-package-copyright-year index 8a8f9743..c36c8082 100755 --- a/build-aux/update-package-copyright-year +++ b/build-aux/update-package-copyright-year @@ -2,7 +2,7 @@ # In configure.ac, update PACKAGE_COPYRIGHT_YEAR to the current year. -# Copyright (C) 2010-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 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 diff --git a/cfg.mk b/cfg.mk index e77312ee..3418ac37 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 diff --git a/configure.ac b/configure.ac index bf1847bf..2c9be082 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU Bison. -*-Autoconf-*- # -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -26,7 +26,7 @@ m4_pattern_forbid([^gl_[A-Z]]) AC_INIT([GNU Bison], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-bison@gnu.org]) -AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2012]) +AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2013]) AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT_YEAR], [$PACKAGE_COPYRIGHT_YEAR], [The copyright year for this package]) diff --git a/data/Makefile.am b/data/Makefile.am index 1fd10b4a..5678c25f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2002, 2005-2012 Free Software Foundation, Inc. +## Copyright (C) 2002, 2005-2013 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 diff --git a/data/README b/data/README index e78c1cf6..9dc9ca6e 100644 --- a/data/README +++ b/data/README @@ -52,7 +52,7 @@ into various formats. ----- -Copyright (C) 2002, 2008-2012 Free Software Foundation, Inc. +Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc. This file is part of GNU Bison. diff --git a/data/bison.m4 b/data/bison.m4 index a24b162c..d8708284 100644 --- a/data/bison.m4 +++ b/data/bison.m4 @@ -2,7 +2,7 @@ # Language-independent M4 Macros for Bison. -# Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2013 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 diff --git a/data/c++-skel.m4 b/data/c++-skel.m4 index 4421d186..06597a8b 100644 --- a/data/c++-skel.m4 +++ b/data/c++-skel.m4 @@ -2,7 +2,7 @@ # C++ skeleton dispatching for Bison. -# Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2013 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 diff --git a/data/c++.m4 b/data/c++.m4 index 8b98b8c1..429b9e92 100644 --- a/data/c++.m4 +++ b/data/c++.m4 @@ -2,7 +2,7 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 diff --git a/data/c-like.m4 b/data/c-like.m4 index c2abce7e..4ee310da 100644 --- a/data/c-like.m4 +++ b/data/c-like.m4 @@ -2,7 +2,7 @@ # Common code for C-like languages (C, C++, Java, etc.) -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012-2013 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 diff --git a/data/c-skel.m4 b/data/c-skel.m4 index 8bcae599..36904aaf 100644 --- a/data/c-skel.m4 +++ b/data/c-skel.m4 @@ -2,7 +2,7 @@ # C skeleton dispatching for Bison. -# Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2013 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 diff --git a/data/c.m4 b/data/c.m4 index bcafe422..b1b6e289 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -2,7 +2,7 @@ # C M4 Macros for Bison. -# Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2013 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 diff --git a/data/glr.c b/data/glr.c index 958b0403..1a2e6ba6 100644 --- a/data/glr.c +++ b/data/glr.c @@ -2,7 +2,7 @@ # GLR skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -181,7 +181,7 @@ m4_define([b4_shared_declarations], b4_output_begin([b4_parser_file_name]) b4_copyright([Skeleton implementation for Bison GLR parsers in C], - [2002-2012])[ + [2002-2013])[ /* C GLR parser skeleton written by Paul Hilfinger. */ @@ -2563,7 +2563,7 @@ m4_if(b4_skeleton, ["glr.c"], [b4_defines_if( [b4_output_begin([b4_spec_defines_file]) b4_copyright([Skeleton interface for Bison GLR parsers in C], - [2002-2012])[ + [2002-2013])[ ]b4_cpp_guard_open([b4_spec_defines_file])[ ]b4_shared_declarations[ diff --git a/data/glr.cc b/data/glr.cc index 73d0f28d..52dc1200 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -2,7 +2,7 @@ # C++ GLR skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -227,7 +227,7 @@ m4_popdef([b4_parse_param]) b4_output_begin([b4_spec_defines_file]) b4_copyright([Skeleton interface for Bison GLR parsers in C++], - [2002-2006, 2009-2012])[ + [2002-2006, 2009-2013])[ /* C++ GLR parser skeleton written by Akim Demaille. */ diff --git a/data/java-skel.m4 b/data/java-skel.m4 index 81bf02ae..384a6370 100644 --- a/data/java-skel.m4 +++ b/data/java-skel.m4 @@ -2,7 +2,7 @@ # Java skeleton dispatching for Bison. -# Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2013 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 diff --git a/data/java.m4 b/data/java.m4 index 627028b3..7c2cfef7 100644 --- a/data/java.m4 +++ b/data/java.m4 @@ -2,7 +2,7 @@ # Java language support for Bison -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 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 diff --git a/data/lalr1.cc b/data/lalr1.cc index 750c3a4b..f6568695 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,6 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -33,7 +33,7 @@ m4_include(b4_pkgdatadir/[stack.hh]) b4_defines_if( [b4_output_begin([b4_spec_defines_file]) b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++], - [2002-2012]) + [2002-2013]) [ /** ** \file ]b4_spec_defines_file[ @@ -272,7 +272,7 @@ b4_output_end() b4_output_begin([b4_parser_file_name]) b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++], - [2002-2012]) + [2002-2013]) b4_percent_code_get([[top]])[]dnl m4_if(b4_prefix, [yy], [], [ diff --git a/data/lalr1.java b/data/lalr1.java index e961fc5b..7a7f763b 100644 --- a/data/lalr1.java +++ b/data/lalr1.java @@ -1,6 +1,6 @@ # Java skeleton for Bison -*- autoconf -*- -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 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 @@ -24,7 +24,7 @@ m4_ifval(m4_defn([b4_symbol_destructors]), b4_output_begin([b4_parser_file_name]) b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java], - [2007-2012]) + [2007-2013]) b4_percent_define_ifdef([package], [package b4_percent_define_get([package]); ])[/* First part of user declarations. */ diff --git a/data/location.cc b/data/location.cc index 4082e09d..f5011c66 100644 --- a/data/location.cc +++ b/data/location.cc @@ -1,6 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2007, 2009-2013 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 @@ -18,7 +18,7 @@ b4_output_begin([b4_dir_prefix[]position.hh]) b4_copyright([Positions for Bison parsers in C++], - [2002-2007, 2009-2012])[ + [2002-2007, 2009-2013])[ /** ** \file ]b4_dir_prefix[position.hh @@ -152,7 +152,7 @@ b4_output_end() b4_output_begin([b4_dir_prefix[]location.hh]) b4_copyright([Locations for Bison parsers in C++], - [2002-2007, 2009-2012])[ + [2002-2007, 2009-2013])[ /** ** \file ]b4_dir_prefix[location.hh diff --git a/data/stack.hh b/data/stack.hh index 8f628607..317a0612 100644 --- a/data/stack.hh +++ b/data/stack.hh @@ -1,6 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -16,11 +16,11 @@ # along with this program. If not, see . m4_pushdef([b4_copyright_years], - [2002-2012]) + [2002-2013]) b4_output_begin([b4_dir_prefix[]stack.hh]) b4_copyright([Stack handling for Bison parsers in C++], - [2002-2012])[ + [2002-2013])[ /** ** \file ]b4_dir_prefix[stack.hh diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl index 40575efd..10e3305b 100644 --- a/data/xslt/bison.xsl +++ b/data/xslt/bison.xsl @@ -3,7 +3,7 @@