Merge remote-tracking branch 'origin/maint'

* origin/maint: build: don't try to generate docs when cross-compiling package: fix a reporter's name %union: fix the support for named %union package: bump to 2015 flex: don't trust YY_USER_INIT yacc.c: fix broken union when api.value.type=union and %defines are used doc: fix missing xref gnulib: update location: remove some ugly debugging code traces build: use abort to pacify compiler errors package: bump to 2014 doc: specify documentation encoding
2026-03-12 13:53:03 +00:00 · 2015-01-05 13:51:30 +01:00
parent 8044fda634 a16074bb09
commit 13e294ee55
204 changed files with 754 additions and 473 deletions
--- a/src/AnnotationList.c
+++ b/src/AnnotationList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/AnnotationList.h
+++ b/src/AnnotationList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/InadequacyList.c
+++ b/src/InadequacyList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/InadequacyList.h
+++ b/src/InadequacyList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/LR0.c
+++ b/src/LR0.c
@@ -1,6 +1,6 @@
 /* Generate the LR(0) parser states for Bison.

-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -1,6 +1,6 @@
 /* Generate the LR(0) parser states for Bison.

-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/Sbitset.c
+++ b/src/Sbitset.c
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/Sbitset.h
+++ b/src/Sbitset.h
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,6 +1,6 @@
 /* Associativity information.

-   Copyright (C) 2002, 2005-2006, 2008-2013 Free Software Foundation,
+   Copyright (C) 2002, 2005-2006, 2008-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,6 +1,6 @@
 /* Associativity information.

-   Copyright (C) 2002, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/closure.c
+++ b/src/closure.c
@@ -1,6 +1,6 @@
 /* Closures for Bison

-   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2013 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,6 +1,6 @@
 /* Subroutines for bison

-   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2015 Free Software
   Foundation, Inc.

   This program is free software: you can redistribute it and/or modify
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000-2002, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 2000-2002, 2006, 2009-2015 Free Software Foundation,
   Inc.

   This program is free software: you can redistribute it and/or modify
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,6 +1,6 @@
 /* Find and resolve or report lookahead conflicts for bison,

-   Copyright (C) 1984, 1989, 1992, 2000-2013 Free Software Foundation,
+   Copyright (C) 1984, 1989, 1992, 2000-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,6 +1,6 @@
 /* Find and resolve or report lookahead conflicts for bison,

-   Copyright (C) 2000-2002, 2004, 2007, 2009-2013 Free Software
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,

-   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,

-   Copyright (C) 1984, 1989, 2000-2002, 2009-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/files.c
+++ b/src/files.c
@@ -1,6 +1,6 @@
 /* Open and close files for Bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/files.h
+++ b/src/files.h
@@ -1,6 +1,6 @@
 /* File names and variables for bison,

-   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2013 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,6 +1,6 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.

-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,6 @@
 /* Parse command line arguments for Bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,6 +1,6 @@
 /* Parse command line arguments for bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,6 +1,6 @@
 /* Allocate input grammar variables for Bison.

-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,6 +1,6 @@
 /* Data definitions for internal representation of Bison's input.

-   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2013 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.

-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/graphviz.h
+++ b/src/graphviz.h
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.

-   Copyright (C) 2006, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,6 @@
 /* IELR main implementation.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/ielr.h
+++ b/src/ielr.h
@@ -1,6 +1,6 @@
 /* IELR main implementation.

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,6 +1,6 @@
 /* Compute lookahead criteria for Bison.

-   Copyright (C) 1984, 1986, 1989, 2000-2013 Free Software Foundation,
+   Copyright (C) 1984, 1986, 1989, 2000-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for bison,

   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
-   2009-2013 Free Software Foundation, Inc.
+   2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/local.mk
+++ b/src/local.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015 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
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,6 @@
 /* Locations for Bison

-   Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,6 @@
 /* Locations for Bison

-   Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* Top level entry point of Bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2013 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison.

-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

@@ -37,7 +37,7 @@ muscle_kind_new (char const *k)
    return muscle_keyword;
  else if (STREQ (k, "string"))
    return muscle_string;
-  aver (0);
+  abort ();
 }

 char const *
@@ -49,7 +49,7 @@ muscle_kind_string (muscle_kind k)
    case muscle_keyword: return "keyword";
    case muscle_string:  return "string";
    }
-  aver (0);
+  abort ();
 }


--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison,

-   Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/named-ref.c
+++ b/src/named-ref.c
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/named-ref.h
+++ b/src/named-ref.h
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison

-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,6 +1,6 @@
 /* Calculate which nonterminals can expand into the null string for Bison.

-   Copyright (C) 1984, 1989, 2000-2006, 2009-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,6 +1,6 @@
 /* Part of the bison parser generator,

-   Copyright (C) 2000, 2002, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/output.h
+++ b/src/output.h
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for bison,

-   Copyright (C) 2000-2003, 2006-2007, 2009-2013 Free Software
+   Copyright (C) 2000-2003, 2006-2007, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.  */
+/* A Bison parser, made by GNU Bison 3.0.2.13-975bb-dirty.  */

 /* Bison interface for Yacc-like parsers in C

-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 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
@@ -61,7 +61,7 @@ extern int gram_debug;
    param_parse  = 1 << 1,
    param_both   = param_lex | param_parse
  } param_type;
-#line 645 "src/parse-gram.y" /* yacc.c:1909  */
+#line 647 "src/parse-gram.y" /* yacc.c:1909  */
 #include "muscle-tab.h"

 #line 68 "src/parse-gram.h" /* yacc.c:1909  */
@@ -132,7 +132,7 @@ extern int gram_debug;

 /* Value type.  */
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
-typedef union GRAM_STYPE GRAM_STYPE;
+
 union GRAM_STYPE
 {
 #line 182 "src/parse-gram.y" /* yacc.c:1909  */
@@ -155,7 +155,7 @@ named_ref *named_ref;
 param_type param;
 #line 409 "src/parse-gram.y" /* yacc.c:1909  */
 code_props_type code_type;
-#line 647 "src/parse-gram.y" /* yacc.c:1909  */
+#line 649 "src/parse-gram.y" /* yacc.c:1909  */

  struct
  {
@@ -165,6 +165,8 @@ code_props_type code_type;

 #line 167 "src/parse-gram.h" /* yacc.c:1909  */
 };
+
+typedef union GRAM_STYPE GRAM_STYPE;
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1
 #endif
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,6 +1,6 @@
 /* Bison Grammar Parser                             -*- C -*-

-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

@@ -421,7 +421,9 @@ code_props_type:

 union_name:
  %empty {}
-| ID     { muscle_code_grow ("union_name", $1, @1); }
+| ID     { muscle_percent_define_insert ("api.value.union.name",
+                                         @1, muscle_keyword, $1,
+                                         MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); }
 ;

 grammar_declaration:
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -1,6 +1,6 @@
 /* Print an xml on generated parser, for Bison,

-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -1,6 +1,6 @@
 /* Output an xml of the generated parser, for Bison.

-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,

-   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2013 Free
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/print.h
+++ b/src/print.h
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,

-   Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.

-   Copyright (C) 2001-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/print_graph.h
+++ b/src/print_graph.h
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.

-   Copyright (C) 2000, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison

   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-   2009-2013 Free Software Foundation, Inc.
+   2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/reader.h
+++ b/src/reader.h
@@ -1,6 +1,6 @@
 /* Input parser for Bison

-   Copyright (C) 2000-2003, 2005-2007, 2009-2013 Free Software
+   Copyright (C) 2000-2003, 2005-2007, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.

-   Copyright (C) 1988-1989, 2000-2003, 2005-2013 Free Software
+   Copyright (C) 1988-1989, 2000-2003, 2005-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.

-   Copyright (C) 2000-2002, 2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2000-2002, 2007, 2009-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,6 +1,6 @@
 /* Binary relations.

-   Copyright (C) 2002, 2004-2005, 2009-2013 Free Software Foundation,
+   Copyright (C) 2002, 2004-2005, 2009-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,6 +1,6 @@
 /* Binary relations.

-   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -1,6 +1,6 @@
 /* Bison code properties structure and scanner.

-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,6 @@
 /* Bison Action Scanner                             -*- C -*-

-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner

-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner                             -*- C -*-

-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

@@ -45,9 +45,6 @@

 #define YY_DECL GRAM_LEX_DECL

-#define YY_USER_INIT                                    \
-   code_start = scanner_cursor = loc->start;            \
-
 /* Location of scanner cursor.  */
 static boundary scanner_cursor;

@@ -166,6 +163,15 @@ eqopt    ([[:space:]]*=)?
  /* Where containing comment or string or character literal started,
     when applicable.  */
  boundary token_start PACIFY_CC (= scanner_cursor);
+
+  /* We cannot trust YY_USER_INIT, whose semantics changes over time
+     (it moved in Flex 2.5.38).  */
+  static bool first = true;
+  if (first)
+    {
+      scanner_cursor = loc->start;
+      first = false;
+    }
 %}


--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.

-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-

-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

@@ -192,7 +192,7 @@ flag (const char *arg)
  else if (STREQ (arg, "warn"))
    return Wother;
  else
-    aver (false);
+    abort ();
 }

 static void
--- a/src/state.c
+++ b/src/state.c
@@ -1,6 +1,6 @@
 /* Type definitions for the finite state machine for Bison.

-   Copyright (C) 2001-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/state.h
+++ b/src/state.h
@@ -1,6 +1,6 @@
 /* Type definitions for the finite state machine for Bison.

-   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison

-   Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison

-   Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2002, 2005-2007, 2009-2015 Free Software Foundation,
   Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,6 +1,6 @@
 /* Symbol table manager for Bison.

-   Copyright (C) 1984, 1989, 2000-2002, 2004-2013 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,6 +1,6 @@
 /* Definitions for symtab.c and callers, part of Bison.

-   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2013 Free Software
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015 Free Software
   Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,6 @@
 /* System-dependent definitions for Bison.

-   Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2007, 2009-2015 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
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2013 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015 Free
   Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,6 +1,6 @@
 /* Prepare the LALR and GLR parser tables.

-   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.

-   Copyright (C) 2002-2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.

--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,6 +1,6 @@
 /* Keeping a unique copy of strings.

-   Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.

   This file is part of Bison, the GNU Compiler Compiler.