Revert ymake build from ydb oss export

author: alexv-smirnov <alex@ydb.tech> 2023-03-28 22:25:04 +0300
committer: alexv-smirnov <alex@ydb.tech> 2023-03-28 22:25:04 +0300
commit: b8a17f9b1c166d2e9a26b99348a4c29d972caf55 (patch)
tree: 1a2d881f1a9452b9c6103dbf69d73da7624e98e5 /contrib/tools/bison
parent: 25659221f18577ea38430a8ec3349836f5626b6a (diff)
download: ydb-b8a17f9b1c166d2e9a26b99348a4c29d972caf55.tar.gz
55 files changed, 0 insertions, 26931 deletions
diff --git a/contrib/tools/bison/.yandex_meta/devtools.copyrights.report b/contrib/tools/bison/.yandex_meta/devtools.copyrights.report
deleted file mode 100644
index e264be6109..0000000000
--- a/contrib/tools/bison/.yandex_meta/devtools.copyrights.report
+++ /dev/null
@@ -1,2692 +0,0 @@
-# File format ($ symbol means the beginning of a line):
-#
-# $ # this message
-# $ # =======================
-# $     # comments (all commentaries should starts with some number of spaces and # symbol)
-# $ IGNORE_FILES {file1.ext1} {file2.ext2} - (optional) ignore listed files when generating license macro and credits
-# $
-# ${action} {license id} {license text hash}
-# $BELONGS ./ya/make/file/relative/path/1/ya.make ./ya/make/2/ya.make
-# ${all_file_action} filename
-# $ # user commentaries (many lines)
-# $ generated description - files with this license, license text... (some number of lines that starts with some number of spaces, do not modify)
-# ${action} {license spdx} {license text hash}
-# $BELONGS ./ya/make/file/relative/path/3/ya.make
-# ${all_file_action} filename
-# $    #    user commentaries
-# $ generated description
-# $ ...
-#
-# You can modify action, all_file_action and add commentaries
-# Available actions:
-# keep - keep license in contrib and use in credits
-# skip - skip license
-# remove - remove all files with this license
-# rename - save license text/links into licenses texts file, but not store SPDX into LINCENSE macro. You should store correct license id into devtools.license.spdx.txt file
-#
-# {all file action} records will be generated when license text contains filename that exists on filesystem (in contrib directory)
-# We suppose that that files can contain some license info
-# Available all file actions:
-# FILE_IGNORE - ignore file (do nothing)
-# FILE_INCLUDE - include all file data into licenses text file
-# =======================
-
-KEEP     COPYRIGHT_SERVICE_LABEL 00c986dd4ba920668d906f7bffbf6c5f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2003, 2005, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/binary-io.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 00dd95d1fc1ff44a6b8f1eaeaca16484
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/relation.h [3:3]
-        bison/src/tables.h [3:3]
-        gnulib/src/abitset.h [3:3]
-        gnulib/src/bitsetv-print.h [3:3]
-        gnulib/src/bitsetv.h [3:3]
-        gnulib/src/ebitset.h [3:3]
-        gnulib/src/lbitset.h [3:3]
-        gnulib/src/vbitset.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0191f5d454885cc3866beab030aa96c9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2008.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/btowc.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 058f1c652a23a2496bbf854dbca10300
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2003, 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/stdio-safer.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 063d09ea2a5468e2afe41cfa15c927f5
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2002, 2004, 2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/timevar.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0702da6758f2577f59e5bd336aa87866
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/printf-args.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 07467591c00eacc34d6d64e47366b9d4
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1994, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/format.c [3:3]
-        m4/src/freeze.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 09e897e3ccb0cecb90981328d372a171
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1988-1989, 2000-2003, 2005-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/reduce.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0a0dfef456f909f45e6f264305db10b5
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1993, 2004, 2006-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/path.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0bad473a35a35bb5eb87c9cc8247326a
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strstr.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0bc8b63acd6ba3e7095b3cc002d7355d
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000, 2002, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/nullable.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0d14cff7e7175319fa36210084ee76a5
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/regex.h [3:5]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 0d947c75a02496f83a5fc81c6c73ba00
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/print.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 110bb374a466559e87c9da3e8204e92a
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/get-errno.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 115f02d7dda2d6bf7dd3885d7af2c783
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/LR0.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 120581a5d502bc366df71ac0f1e21603
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/raise.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1229ae41ea00ec7cef49fc6db333e618
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2001.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/progname.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 13c7848e680b03caaed4b925d4531cd5
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/symlist.c [3:4]
-        bison/src/symlist.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 15e124024eb2c86926816fb98a7bec11
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/gettext.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1973769f9af453f936d9a16be9c5ce4b
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strdup.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 19b6c37a57b3f819d4f3981234726713
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/main.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 19badf1ab4d109ed57f0d52c5242ce53
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/mkdtemp.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 19c356d0dffd4901e70e9450940a07c8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/filenamecat-lgpl.c [3:3]
-        gnulib/src/filenamecat.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1ad2b427b79e2ebd3412ca0a54bfe627
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/muscle-tab.h [3:3]
-        gnulib/platform/win64/stdbool.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1d3aa15befc9a920b6fac9f78e6f4aec
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013
-           Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/memchr.c [1:2]
-        gnulib/src/memchr2.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1e7f599a240efccbda3ab4c9efc32120
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/unistd-safer.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1ee404cb9ac7689903b59268615d9b6d
-BELONGS gnulib/ya.make
-    License text:
-           Copyright 2002-2003, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/ldexpl.c [4:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1f41079d08ce5f59bf01135deba247c4
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2006-2007, 2010-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/wcwidth.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 1f89814f081e24eebf375e5c30252c5f
-BELONGS bison/ya.make
-    License text:
-        Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/README [55:55]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 232de1f77bbafd80547ce6228d7649f5
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/printf-parse.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 23301b45ba80435162a9b78237254a09
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1999, 2001-2002, 2006, 2009-2013 Free Software Foundation,
-           Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/tmpdir.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2611d35278bba7eb43f0271b9dc3af0d
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1994, 2003, 2006-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/symtab.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2a95c5c93500406da275ace71c40beb9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1991, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/cloexec.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2d088416678f14781abcb6db5aa0f892
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2003, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/math.h [4:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2d64f632b6704a25d9849da0928b0d0c
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1996-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/canonicalize-lgpl.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2dbefb710287caf60ae462785dc52fde
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/vasnprintf.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2e065ae9c67a2e73da331941c7e27dcb
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xmalloca.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2e182f93884b2a3949c39e8591b0e31e
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/c++-skel.m4 [5:5]
-        bison/data/c-skel.m4 [5:5]
-        bison/src/graphviz.c [3:3]
-        bison/src/scan-code.h [3:3]
-        bison/src/scan-gram.h [3:3]
-        gnulib/src/gl_anytree_oset.h [1:3]
-        gnulib/src/gl_avltree_oset.c [1:3]
-        gnulib/src/gl_oset.h [2:3]
-        gnulib/src/verror.c [2:2]
-        gnulib/src/verror.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2e732ac9f6b74dbcc834df9e53324a9f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2004, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/unlocked-io.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2eb8f1fb67449136ee939472aa7fa3eb
-BELONGS bison/ya.make
-    License text:
-        \# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/local.mk [1:1]
-        bison/src/muscle-tab.c [3:3]
-        bison/src/scan-skel.c [622:622]
-        bison/src/scan-skel.c.saved [612:612]
-        bison/src/scan-skel.l [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 2f34a0559fe65f59e2898c3370568950
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strchrnul.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3101335adcc4584165cd82c0de43552b
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xvasprintf.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 324db0696928de41d577abb6a030c9bf
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2005, 2007, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/uniwidth.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3289f2428f1bde15c29edfb025786a00
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990, 2001, 2003-2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/stripslash.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3294e832e79174df7252e8e6e973cb25
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
-           2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/lalr.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 334f42ec891b15fd249ee99c750c0ea8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/argmatch.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 33c3435ef2e7b730a5779285e67c4d37
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xvasprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 34e8868b2b0de4126d71a1c63394b9bf
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/calloc.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 35c2ad20484ae22f576dbbe29668b616
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/rmdir.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 36ffa696d53329f321433cf3b247a878
-BELONGS bison/ya.make
-    License text:
-        \# Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation,
-        \# Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/yacc.c [4:5]
-        bison/src/parse-gram.c [5:5]
-        bison/src/parse-gram.h [5:5]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 372539316e62c1ce62c57f38df8eb67e
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xalloc-oversized.h [3:3]
-        gnulib/src/xalloc.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 37641f5b43836a3429601194ebc9a4f2
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/unitypes.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3b643fb3a489e9de6c5ea29048b94696
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/getopt.c [5:7]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3d1c5160866e31c4478a17530dbde5f0
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-ctype.h [8:8]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 3e7a384e94a5349c3bd79dc469a46d0d
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/bbitset.h [3:4]
-        gnulib/src/lbitset.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 40459d4dbef659e21f6bb0d6a096e438
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2002, 2004, 2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/conflicts.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4184562b88c3624de8cdb446d894c390
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/m4sugar/foreach.m4 [7:7]
-        gnulib/platform/win64/sched.h [3:3]
-        gnulib/src/bitrotate.h [2:2]
-        gnulib/src/close.c [2:2]
-        gnulib/src/fclose.c [2:2]
-        gnulib/src/getdtablesize.c [2:3]
-        gnulib/src/ignore-value.h [3:3]
-        gnulib/src/isnand.c [2:2]
-        gnulib/src/memchr2.h [2:2]
-        gnulib/src/obstack_printf.c [2:2]
-        gnulib/src/perror.c [2:3]
-        gnulib/src/rawmemchr.c [2:2]
-        gnulib/src/sig-handler.h [3:3]
-        gnulib/src/sigaction.c [2:3]
-        gnulib/src/stdio-write.c [2:3]
-        gnulib/src/str-two-way.h [2:4]
-        gnulib/src/wcrtomb.c [2:3]
-        gnulib/src/xmemdup0.c [3:3]
-        gnulib/src/xmemdup0.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 44bb9314fc9057479455541413d51520
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/glthread/tls.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4603473a112e29f3e9315a949a3ddaf8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/vasprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 465e04de07b2e95f8a448170f20d31b8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright 2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/secure_getenv.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4854918d3ca04b7f4687772c04e78711
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990-1998, 2000-2007, 2009-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/error.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 48710321da010f086d88a01ba02f43f8
-BELONGS gnulib/ya.make
-    License text:
-        /* Sequential list data type implemented by a hash table with a linked list.
-           Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2006.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/gl_linkedhash_list.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4a34e1bd4cc3225f66a00029dd3d9fba
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/stdio-impl.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4c1dd767a16278f08645643b62405f7f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/bitset.h [3:3]
-        gnulib/src/bitset_stats.h [3:3]
-        gnulib/src/libiberty.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4d6253f33abc179952f327ee3b1f4e15
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/alloca.h [4:5]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4e7a32172851ba99194436761a31ea1f
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/LR0.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 4f5224922ca1060274bb2d14132e28d2
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/AnnotationList.c [3:3]
-        bison/src/AnnotationList.h [3:3]
-        bison/src/InadequacyList.c [3:3]
-        bison/src/InadequacyList.h [3:3]
-        bison/src/Sbitset.c [3:3]
-        bison/src/Sbitset.h [3:3]
-        bison/src/ielr.c [3:3]
-        bison/src/ielr.h [3:3]
-        bison/src/named-ref.c [3:3]
-        bison/src/named-ref.h [3:3]
-        gnulib/platform/win64/langinfo.h [3:3]
-        gnulib/src/fcntl.c [3:3]
-        gnulib/src/fd-hook.c [2:3]
-        gnulib/src/fd-hook.h [2:2]
-        gnulib/src/gl_xlist.h [2:3]
-        gnulib/src/gl_xoset.h [2:3]
-        gnulib/src/pipe2.c [2:2]
-        gnulib/src/stat.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5321d65e6ca662e722b1d7cf5c99dcdd
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000, 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/print_graph.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 53e8e76430c1f9f176e2b86cae3a1550
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2003, 2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/abitset.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 544ab2438f7aa43ef1ce1ed67e54b937
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/posix/getopt.h [3:5]
-        gnulib/platform/win64/getopt.h [3:5]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 57f755a70896c04eff0d8aa077c79db4
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/malloca.h [2:3]
-        gnulib/src/readlink.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5a88a0f0ec2edacc94ec9985fb835ad1
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002-2005, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/uniqstr.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5c9564f545f124dd0fe089c741ae0867
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/closure.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5ccfd3fc29d53e79100f45ae23b3ce40
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/closeout.c [3:4]
-        gnulib/src/quotearg.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5d1667bf16257cb8c0eddfec1ef63a4f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/unistd.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 5fa676449042cb8d35db7a6420ec9887
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/closure.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 605c920eb2434c3b95d6aa972321ec57
-BELONGS gnulib/ya.make
-    License text:
-           Copyright 2000-2003, 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-ctype.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 64f4044ab5e89b15adc1b10141e80bf8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-strcase.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 66d9e77c3f2d7507f9842af6cd5bb6ff
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002, 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/asnprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 67b620c22382ceac67c59e3655823122
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2004-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/bitsetv.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6a1b8cf39b7aab5d906edb00659c6986
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2004, 2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/mbswidth.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6b7cace6450b3a18eb817ece1ef02671
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/realloc.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6bf98b764139379753db5406efa84fc6
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2003, 2005-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/reader.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6de66b010a0194aab3aa38e295986d51
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/exitfail.h [3:3]
-        gnulib/src/get-errno.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6ef288fe470b028ed9393f0f9cdb0d5e
-BELONGS gnulib/ya.make
-    License text:
-        /* Variable with FSF copyright information, for version-etc.
-           Copyright (C) 1999-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/version-etc-fsf.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 6f2ef572ed987bb1f02a38b932cdfedf
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1996-1999, 2008-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/siglist.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 71de0111bb2934395d6c712100e955bf
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2003-2004, 2008-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/spawn.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 746d5c809161ab209e276c2923d2a1bb
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2002, 2004-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/symtab.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 758b455afc03ed0870367ac36e9b0d4e
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2005, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/intprops.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 773aa1e6c51eddee7d07ce7ce2b1ab99
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/cloexec.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 78283ff5133f1e769ba584bd31744897
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/stpcpy.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 784d708766ce06df6c18e76dbf618bbe
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xalloc-die.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7935d41d0aedbcd3a9d31d6965831efc
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/gram.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7aa58448380465b33fba89dad986d31e
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strverscmp.c [2:5]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7ac575d17a582e20f8b561c93c284942
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/dosname.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7af94b0141964410f71a364f05e9aa02
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2006, 2010-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/graphviz.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7b7a440b5b9672dede4b45418bd6ff73
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2012-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/c-like.m4 [5:5]
-        gnulib/src/localeconv.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7ccf05a38bd8f519c2e08ea318d8a0b8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2003, 2006-2007, 2009-2013 Free Software Foundation,
-           Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2006.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/clean-temp.c [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7f5835f8dfdbf10613f67b19ab1f6e0b
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is derived from the one in the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/mkstemp.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 7fe411a514c6a2124401c5518cfce0bf
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/spawn-pipe.h [2:3]
-        gnulib/src/wait-process.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 82553ecf28801654901f5bf04dc89de8
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002, 2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/assoc.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8558e31aa50787a2c1061fcdb2207b6f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/bitset.c [3:3]
-        gnulib/src/bitset_stats.c [3:3]
-        gnulib/src/ebitset.c [3:3]
-        gnulib/src/vbitset.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 87a2b4ef7420f613bbd7d104a9b85aca
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/debug.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 87a3af105c2220b3e5515f706361449e
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1997-1998, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/malloc.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 87b4383fae83c0bc4b1abfa5c78e9304
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/malloca.c [2:3]
-        gnulib/src/xmalloca.c [2:3]
-        gnulib/src/xstrndup.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8852eec613da8d0c23dbe9378c64629d
-BELONGS gnulib/ya.make
-    License text:
-        Copyright d Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/version-etc-fsf.c [26:30]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8853eda4f48bd2e1c9bfc3ef3d311b03
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2003, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/output.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8988632bc136efb8041411edd4493b82
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/c++.m4 [5:5]
-        bison/data/glr.c [5:5]
-        bison/data/glr.cc [3:3]
-        bison/data/lalr1.cc [3:3]
-        bison/data/location.cc [3:3]
-        bison/data/stack.hh [3:3]
-        bison/data/variant.hh [3:3]
-        bison/src/parse-gram.y [3:3]
-        bison/src/scan-gram.c [1022:1022]
-        bison/src/scan-gram.l [3:3]
-        gnulib/src/regcomp.c [2:4]
-        gnulib/src/regex.c [2:4]
-        gnulib/src/regex_internal.c [2:4]
-        gnulib/src/regex_internal.h [2:4]
-        gnulib/src/regexec.c [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8bf3a43f21c5d3f08faf7418d100ff8c
-BELONGS bison/ya.make
-    License text:
-                   _("Copyright (C) %d Free Software Foundation, Inc.\n"),
-                   2013);
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/getargs.c [390:391]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8c32b84ace7652058445cfe1ba65cb92
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002, 2004-2005, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/relation.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 8f5cd12bb2141575153cc3bc45e631f9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/stdlib-safer.h [3:3]
-        gnulib/src/unistd--.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 90ffc0412eb4612be24ef2f7051895af
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2002, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/derives.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 92888c328fc5b80476163710d2c48557
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-1999, 2001, 2003, 2009-2013 Free Software Foundation,
-           Inc.
-           Written by Jim Meyering <meyering@ascend.com>, 1998.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/hash.h [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9384394a620e0cb9ade742113242c202
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/system.h [3:3]
-        gnulib/src/bison-system.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 93b226e3d32ea3a3aee38ccefc218f65
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/files.c [3:4]
-        bison/src/getargs.c [3:4]
-        bison/src/getargs.h [3:4]
-        bison/src/output.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 951365a51f6640f4abefc658cd5a58a9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/dup-safer-flag.c [4:4]
-        gnulib/src/dup-safer.c [3:3]
-        gnulib/src/fopen-safer.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 96b7ccc2d168764231186a3b508352e2
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 2000, 2004, 2009-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/spawnattr_setflags.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 96e98ee2b2fa5faba27db56f0fdfb9e2
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 2000, 2008-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/spawn_int.h [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 97248f9adaddd0161d09fed429d59d4d
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/timevar.def [4:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9ae366a7ff1d7343508f4419d8f30902
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/java.m4 [5:5]
-        bison/data/lalr1.java [3:3]
-        bison/data/xslt/bison.xsl [6:6]
-        bison/data/xslt/xml2dot.xsl [6:6]
-        bison/data/xslt/xml2text.xsl [6:6]
-        bison/data/xslt/xml2xhtml.xsl [6:6]
-        gnulib/platform/posix/time.h [4:4]
-        gnulib/platform/win64/locale.h [3:3]
-        gnulib/platform/win64/sys/time.h [4:4]
-        gnulib/src/fflush.c [2:2]
-        gnulib/src/fopen.c [2:2]
-        gnulib/src/fpucw.h [2:3]
-        gnulib/src/fpurge.c [2:2]
-        gnulib/src/freadahead.c [2:2]
-        gnulib/src/freadahead.h [2:2]
-        gnulib/src/freading.c [2:2]
-        gnulib/src/freading.h [2:2]
-        gnulib/src/frexp.c [2:2]
-        gnulib/src/fseeko.c [2:2]
-        gnulib/src/fseterr.c [2:2]
-        gnulib/src/isnan.c [2:2]
-        gnulib/src/isnand-nolibm.h [2:2]
-        gnulib/src/isnanf-nolibm.h [2:2]
-        gnulib/src/isnanl-nolibm.h [2:2]
-        gnulib/src/nl_langinfo.c [3:3]
-        gnulib/src/open.c [2:2]
-        gnulib/src/signbitd.c [2:2]
-        gnulib/src/xprintf.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9b1b58fcfb772a472db1c3fb09bf34d1
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2004, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-stack.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9c30f1ea78d9be9ddafdcf0189aec4c9
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2002, 2007, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/reduce.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9d3c63a69b88a5d14c2eff6d066912c7
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999-2002, 2005-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2008.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/mbrtowc.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9d8402ad502e486aa208505a9dfe8317
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/files.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL 9fbaab46200cfc8c4b4e1562ded458ac
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/getopt1.c [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a051d0213c9c4f4bc059046e2ad3a410
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1997-2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/lstat.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a1f4e854db830a50c24ee5b826dcb9e8
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 1992, 2000-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/conflicts.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a2658233b244808dfe9f5e8edcd20137
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-           2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/reader.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a2a73a0e4276a111cc70d4e0c2a55b58
-BELONGS gnulib/ya.make
-    License text:
-            Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation,
-            Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/dirname.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a330e7f0c906968eef680ce3d2a69536
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2004, 2007-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/concat-filename.h [2:2]
-        gnulib/src/filename.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a49d222350d83caf91027426eed2347d
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2004-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/dup2.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a4c17a0a339347eccb15204e2957c984
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fd-safer-flag.c [4:4]
-        gnulib/src/fd-safer.c [3:3]
-        gnulib/src/pipe-safer.c [2:2]
-        gnulib/src/pipe2-safer.c [2:2]
-        gnulib/src/size_max.h [2:3]
-        gnulib/src/stdio--.h [3:3]
-        gnulib/src/verify.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a5b0a04f1aecea5af0e263f069cffbfb
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/derives.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a681cce71fccede25a5d0637e74d4cf1
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-2002, 2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/close-stream.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a6fa5ef5a6e35f8d45c238c9c265b6bc
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xstrndup.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL a8534a32046c85f9c163c599b7acf5fa
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1994, 2000, 2004, 2006-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/builtin.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b2c9d31895ebbcb3a10166e1aa5da8dd
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2002, 2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/complain.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b5af52841336985408a23491689633dc
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2002, 2004, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/timevar.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b66af3479dc35debfb845432fcee9505
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2001-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/print_graph.c [3:3]
-        bison/src/state.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b72d740bdbc0cb3ce1dca39e4d8bb82e
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2007, 2010-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/printf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b78d2fba2b832b27e3066a77aeceb44a
-BELONGS bison/ya.make gnulib/ya.make m4/ya.make
-    License text:
-           Copyright (C) 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/scan-code.c [633:633]
-        bison/src/scan-code.l [3:3]
-        gnulib/platform/posix/fcntl.h [4:4]
-        gnulib/platform/win64/fcntl.h [4:4]
-        gnulib/platform/win64/signal.h [4:4]
-        gnulib/src/gl_anylinked_list2.h [1:3]
-        gnulib/src/gl_list.h [2:3]
-        gnulib/src/sigprocmask.c [2:3]
-        m4/src/Makefile.am [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b8eb228e92142d90c52ac1f532deded9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/vasnprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b957f28d6fe2a6c19bfd1b221880d900
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2011-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2011.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/float.c [2:3]
-        gnulib/src/fstat.c [2:2]
-        gnulib/src/itold.c [2:3]
-        gnulib/src/mbtowc-impl.h [2:3]
-        gnulib/src/mbtowc.c [2:3]
-        gnulib/src/msvc-inval.c [2:2]
-        gnulib/src/msvc-inval.h [2:2]
-        gnulib/src/msvc-nothrow.c [3:3]
-        gnulib/src/msvc-nothrow.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b97536f0f5df238c15d5c12d52ab0c5a
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2003, 2009-2013 Free Software Foundation, Inc.
-           This file is part of the GNU CHARSET Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/localcharset.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL b9e1c0e6189c6ed19f4f652f15bb77ba
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1991, 1997, 2009-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strtoul.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL baa1a924d12ea2e1dd8741c79f2bc6e2
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2000-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/lalr.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bbdd659b46c4082c0eeaca1c99b1fc95
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/uniqstr.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bc024ddbff3d1712047f5138bde3fd38
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fatal-signal.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bc4e82047bdc4ca05fa4e50667ef5ba0
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1991, 1994-2002, 2005, 2008-2013 Free Software Foundation,
-           Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strsignal.c [1:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bd69d607134ae9156c6d0e83aac20d6c
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/m4sugar/m4sugar.m4 [6:6]
-        gnulib/src/version-etc.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bfbbd857033939813dcecf5eb6330a33
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2013 Free
-           Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/tables.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL bff340ef4d002beefef7f8ee38124215
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/closeout.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL c0163a2fe88e2703b1880e204238f2ec
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2005-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/sys/stat.h [3:3]
-        gnulib/src/glthread/lock.c [2:2]
-        gnulib/src/glthread/lock.h [2:2]
-        gnulib/src/glthread/threadlib.c [2:2]
-        gnulib/src/glthread/tls.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL c25c26483702f7bca157f8f73d5e056f
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/filenamecat.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL c34e2546d35ccbb2c1f4737dd351e6af
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/concat-filename.c [2:2]
-        gnulib/src/execute.c [2:3]
-        gnulib/src/spawn-pipe.c [2:3]
-        gnulib/src/xconcat-filename.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL c49923e7a55a963e7a02c2a7f406eef4
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2006, 2011-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2006.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/clean-temp.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL c5b4c3795b41b032298298e3146a344c
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1995-1997, 2003, 2006, 2008-2013 Free Software Foundation,
-           Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/error.h [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL cbb5e809e75ec34efb45dd221cee01cd
-BELONGS bison/ya.make
-    License text:
-        \## Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/local.mk [1:1]
-        bison/src/location.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL cbc68f7f97745cdfbb2786dc61187706
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002, 2004, 2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-stack.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL cbdf063c9090fff599e42620773cfc42
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/localcharset.c [3:3]
-        gnulib/src/spawni.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ce730c13959bb52afcf459694cce2f32
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001, 2003-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/w32spawn.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL cee5aea79c265d30d27535c2526b3ee2
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2002, 2005-2006, 2008-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/assoc.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL cf9cb97726f6ecb8f34de7433963ef78
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1994, 2004-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/input.c [3:3]
-        m4/src/m4.c [3:3]
-        m4/src/m4.h [3:3]
-        m4/src/output.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d00ba1bf4e95526accacbc7f64aeccc8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/sys/wait.h [3:3]
-        gnulib/src/progname.c [2:3]
-        gnulib/src/wait-process.c [2:3]
-        gnulib/src/waitpid.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d2a4dc23c40d2e7ebfda72ac558a7e00
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2003, 2005-2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fpending.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d306c8c4fdfe6db9e5acc75df9b76651
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strndup.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d439cf68b7f9268c998c12bf99084afe
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/symtab.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d4f3dde6c93b99bac65dd76fa1b716dc
-BELONGS bison/ya.make
-    License text:
-        \# Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/bison.m4 [5:5]
-        bison/data/c.m4 [5:5]
-        bison/src/location.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d5cd42bc7f6466d72fb5c45748172a64
-BELONGS m4/ya.make
-    License text:
-           Copyright (C) 1989-1994, 2006-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        m4/src/eval.c [3:4]
-        m4/src/macro.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d667ff08e8fafd0a2a686f94251f31af
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/dirname-lgpl.c [3:4]
-        gnulib/src/dirname.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL d82bb852333bcf3b61ce6e4e93b89bfc
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990-2000, 2002-2006, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xmalloc.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL db6dbf9bcaacaf77ea5d31d8bbdd1630
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-strcaseeq.h [2:2]
-        gnulib/src/streq.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL db9d33475f254f5a1910706dc89741fd
-BELONGS gnulib/ya.make
-    License text:
-        /* Copyright (C) 1992, 1995-2002, 2005-2013 Free Software Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/unsetenv.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL dbe06cb527798aade152667fb71b0913
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-2002, 2004-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/quotearg.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL dcfa1931578f1a4061e7fc8c5efdf19a
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/argmatch.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL def6c8d17d8b4ebfbe8abdc5ffe362c0
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2002.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/uniwidth/cjk.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL dff9484898bb53af32257afe4f396496
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xasprintf.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e04888e6284b3d292729f957fce5ea5c
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/flex-scanner.h [3:3]
-        gnulib/src/gl_anyhash_list1.h [1:3]
-        gnulib/src/gl_anyhash_list2.h [1:3]
-        gnulib/src/gl_anylinked_list1.h [1:3]
-        gnulib/src/gl_avltree_oset.h [1:3]
-        gnulib/src/gl_linkedhash_list.h [1:3]
-        gnulib/src/same-inode.h [3:3]
-        gnulib/src/tempname.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e09a4e35b0ddd119f86db14e8e583499
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2004, 2006-2007, 2009-2013 Free Software Foundation,
-           Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fpending.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e1f4113e5422c633ae2b1ff13e854267
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/strtol.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e329f07beb92d1b098a25208dc86a840
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/xsize.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e3f5708a6f1e8c1584c69be73c82fdbd
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1991-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/tempname.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e595547844fab779f343fa93a6e559e7
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-2001, 2003, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/quote.h [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e65fd6e5ba4f2ec80c3b64809d46a5a8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/exitfail.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e69675bed2dd82e4bedc940d9de1930b
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/complain.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e74e555b63d2c0888f49c3596fa5e8d5
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999-2000, 2002-2003, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/printf-parse.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e88757980644cf5eae50af779a400879
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/c-strcasecmp.c [2:2]
-        gnulib/src/c-strncasecmp.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL e922d0e340952e8a672efb7856e820f9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/getopt_int.h [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ea529c8bbc5b15ff88bb87fbba92801e
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1988-1994, 1996-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/obstack.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL eb85fd77411059a7499b2ce0cfa560c8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fprintf.c [2:2]
-        gnulib/src/snprintf.c [2:3]
-        gnulib/src/sprintf.c [2:2]
-        gnulib/src/vfprintf.c [2:2]
-        gnulib/src/vsprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ece2dc9da1a472caf28566b49eb32168
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software
-           Foundation, Inc.
-           This file is part of the GNU C Library.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/obstack.h [2:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ee222f77a16d4f3148321625257f15a6
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/tmpdir.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ee86e96aba3e305f890e3242468ea4e9
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/basename-lgpl.c [3:4]
-        gnulib/src/basename.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f1339d5d8e0306a4d480d601898663ee
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/print.h [3:3]
-        gnulib/src/spawn_faction_addclose.c [1:2]
-        gnulib/src/spawn_faction_adddup2.c [1:2]
-        gnulib/src/spawn_faction_addopen.c [1:2]
-        gnulib/src/spawn_faction_destroy.c [1:2]
-        gnulib/src/spawn_faction_init.c [1:2]
-        gnulib/src/spawnattr_destroy.c [1:2]
-        gnulib/src/spawnattr_init.c [1:2]
-        gnulib/src/spawnattr_setsigmask.c [1:2]
-        gnulib/src/spawnp.c [1:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f1b0e82c75e56c254067166dec9b3de8
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2004, 2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/bitsetv-print.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f1e942edc857af01ccc1e18f1ed8536d
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2008-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/execute.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f543df5a888ae1d9e91c52c201670303
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/state.h [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f54ec8492caaee6122ab97c025085b70
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/pathmax.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f556407274c01ef8e47714e8cc0bc9f8
-BELONGS gnulib/ya.make
-    License text:
-        //  Copyright (c) 2006-2013 Alexander Chemeris
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/platform/win64/stdint.h.disabled [4:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f5aa7024a2f8294083c22018f6aa36cc
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/gram.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f5b7778e3ba74a945ef4c73b5233e0e6
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/gettimeofday.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f62c5288c2c96dd652c7da573c17f4b3
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/printf-args.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f685ea5bcfd7737b3b787a467fc2e782
-BELONGS bison/ya.make
-    License text:
-           Copyright (C) 1984, 1989, 2000-2006, 2009-2013 Free Software
-           Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/nullable.c [3:4]
-
-KEEP     COPYRIGHT_SERVICE_LABEL f827cb68394ea15cb2b0b092b774f5b2
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1998-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/hash.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fa9f7175e6e86c6e3676fc6e365cd52b
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/rename.c [3:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fbaaeb67f80365fc3ed5e085bc80881b
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-           Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/src/scan-skel.h [3:3]
-        gnulib/src/mkstemp-safer.c [3:3]
-        gnulib/src/stdlib--.h [3:3]
-        gnulib/src/strnlen.c [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fd21bae584d2fc69b2af9ead1d430dea
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 1999, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/version-etc.h [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fda68d61b4c86c59c32f621da2b17880
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2000-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/mbswidth.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fe2068a4ac32499bd9c90c3059b52a95
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2003-2004, 2009-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2003.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/fatal-signal.h [2:3]
-
-KEEP     COPYRIGHT_SERVICE_LABEL fe8fcc676c3dcc20548fbdd1a0ce99a9
-BELONGS bison/ya.make gnulib/ya.make
-    License text:
-        \# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        bison/data/java-skel.m4 [5:5]
-        bison/src/print-xml.c [3:3]
-        bison/src/print-xml.h [3:3]
-        gnulib/src/closein.c [3:3]
-        gnulib/src/closein.h [3:3]
-        gnulib/src/float+.h [2:3]
-        gnulib/src/fseek.c [2:2]
-        gnulib/src/fseterr.h [2:2]
-        gnulib/src/ftello.c [2:2]
-        gnulib/src/isnanf.c [2:2]
-        gnulib/src/isnanl.c [2:2]
-        gnulib/src/lseek.c [2:2]
-        gnulib/src/printf-frexp.c [2:2]
-        gnulib/src/printf-frexp.h [2:2]
-        gnulib/src/printf-frexpl.c [2:2]
-        gnulib/src/printf-frexpl.h [2:2]
-        gnulib/src/signbitf.c [2:2]
-        gnulib/src/signbitl.c [2:2]
-        gnulib/src/xprintf.c [2:2]
-
-KEEP     COPYRIGHT_SERVICE_LABEL ffcb7ba2bd3e2505e88b4b6008cf627b
-BELONGS gnulib/ya.make
-    License text:
-           Copyright (C) 2001-2002, 2006-2013 Free Software Foundation, Inc.
-           Written by Bruno Haible <bruno@clisp.org>, 2002.
-    Scancode info:
-        Original SPDX id: COPYRIGHT_SERVICE_LABEL
-        Score           : 100.00
-        Match type      : COPYRIGHT
-    Files with this license:
-        gnulib/src/uniwidth/width.c [2:3]
diff --git a/contrib/tools/bison/.yandex_meta/devtools.licenses.report b/contrib/tools/bison/.yandex_meta/devtools.licenses.report
deleted file mode 100644
index e215e96c68..0000000000
--- a/contrib/tools/bison/.yandex_meta/devtools.licenses.report
+++ /dev/null
@@ -1,825 +0,0 @@
-# File format ($ symbol means the beginning of a line):
-#
-# $ # this message
-# $ # =======================
-# $     # comments (all commentaries should starts with some number of spaces and # symbol)
-# $ IGNORE_FILES {file1.ext1} {file2.ext2} - (optional) ignore listed files when generating license macro and credits
-# $
-# ${action} {license id} {license text hash}
-# $BELONGS ./ya/make/file/relative/path/1/ya.make ./ya/make/2/ya.make
-# ${all_file_action} filename
-# $ # user commentaries (many lines)
-# $ generated description - files with this license, license text... (some number of lines that starts with some number of spaces, do not modify)
-# ${action} {license spdx} {license text hash}
-# $BELONGS ./ya/make/file/relative/path/3/ya.make
-# ${all_file_action} filename
-# $    #    user commentaries
-# $ generated description
-# $ ...
-#
-# You can modify action, all_file_action and add commentaries
-# Available actions:
-# keep - keep license in contrib and use in credits
-# skip - skip license
-# remove - remove all files with this license
-# rename - save license text/links into licenses texts file, but not store SPDX into LINCENSE macro. You should store correct license id into devtools.license.spdx.txt file
-#
-# {all file action} records will be generated when license text contains filename that exists on filesystem (in contrib directory)
-# We suppose that that files can contain some license info
-# Available all file actions:
-# FILE_IGNORE - ignore file (do nothing)
-# FILE_INCLUDE - include all file data into licenses text file
-# =======================
-
-SKIP     LicenseRef-scancode-other-permissive 07824a8d3f10a5222411f9e279b43cdc
-BELONGS bison/ya.make
-    License text:
-              Verbatim copying and distribution of this entire page is
-              permitted in any medium, provided this notice is preserved.</div>
-    Scancode info:
-        Original SPDX id: LicenseRef-scancode-other-permissive
-        Score           : 94.44
-        Match type      : TEXT
-        Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/other-permissive.LICENSE
-    Files with this license:
-        bison/data/xslt/xml2xhtml.xsl [94:95]
-
-KEEP     GPL-3.0-or-later     10af471533a121c7a09244a41af2bc7f
-BELONGS m4/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 98.99
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        m4/src/Makefile.am [7:18]
-
-SKIP     GPL-3.0-only         116f62dff244753eb5a6e4f48e6a7e7b
-BELONGS bison/ya.make
-    License text:
-        \# Under Section 7 of GPL version 3, you are granted additional
-    Scancode info:
-        Original SPDX id: GPL-3.0-only
-        Score           : 100.00
-        Match type      : REFERENCE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, http://www.gnu.org/licenses/gpl-3.0.html, https://spdx.org/licenses/GPL-3.0-only
-    Files with this license:
-        bison/data/m4sugar/foreach.m4 [20:20]
-        bison/data/m4sugar/m4sugar.m4 [19:19]
-
-SKIP     LicenseRef-scancode-free-unknown 1fa0410782b5fff901b0496a79bcba9e
-BELONGS bison/ya.make
-    License text:
-        This is free software; see the source for copying conditions.  There is NO\n\
-        warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-    Scancode info:
-        Original SPDX id: LicenseRef-scancode-free-unknown
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/free-unknown.LICENSE
-    Files with this license:
-        bison/src/getargs.c [394:395]
-
-KEEP     GPL-3.0-or-later WITH Bison-exception-2.2 2330ef91d80c2c3d2e269e2292434d9a
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 92.02
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/src/parse-gram.c [1:31]
-    Scancode info:
-        Original SPDX id: Bison-exception-2.2
-        Score           : 92.02
-        Match type      : NOTICE
-        Links           : https://spdx.org/licenses/Bison-exception-2.2
-    Files with this license:
-        bison/src/parse-gram.c [1:31]
-
-KEEP     GPL-3.0-or-later     35d1da49e32346e7015e3afbe5b31200
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/c-ctype.c [5:16]
-        gnulib/src/c-ctype.h [10:21]
-
-KEEP     GPL-3.0-or-later WITH Bison-exception-2.2 38d968225181a24e1990b572a1b3c6fa
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 55.61
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/bison.m4 [44:61]
-    Scancode info:
-        Original SPDX id: Bison-exception-2.2
-        Score           : 55.61
-        Match type      : NOTICE
-        Links           : https://spdx.org/licenses/Bison-exception-2.2
-    Files with this license:
-        bison/data/bison.m4 [44:61]
-
-KEEP     GPL-3.0-or-later     3f43560ef83ab8f3e18de24f216342f9
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/asnprintf.c [4:15]
-        gnulib/src/fseeko.c [4:15]
-        gnulib/src/gettext.h [5:16]
-        gnulib/src/localcharset.c [5:16]
-        gnulib/src/localcharset.h [5:16]
-        gnulib/src/lseek.c [4:15]
-        gnulib/src/msvc-inval.c [4:15]
-        gnulib/src/msvc-inval.h [4:15]
-        gnulib/src/msvc-nothrow.c [5:16]
-        gnulib/src/msvc-nothrow.h [5:16]
-        gnulib/src/obstack_printf.c [4:15]
-        gnulib/src/pipe2.c [4:15]
-        gnulib/src/printf-args.c [5:16]
-        gnulib/src/printf-args.h [5:16]
-        gnulib/src/printf-parse.c [4:15]
-        gnulib/src/printf-parse.h [5:16]
-        gnulib/src/snprintf.c [5:16]
-        gnulib/src/str-two-way.h [6:17]
-        gnulib/src/strdup.c [6:17]
-        gnulib/src/strstr.c [5:16]
-        gnulib/src/strverscmp.c [7:18]
-        gnulib/src/vasnprintf.c [4:15]
-        gnulib/src/vasnprintf.h [4:15]
-        gnulib/src/vasprintf.c [4:15]
-
-KEEP     BSD-3-Clause         3f6b9bcdce261cc8c93ba5990ec17226
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: BSD-3-Clause
-        Score           : 100.00
-        Match type      : TEXT
-        Links           : http://www.opensource.org/licenses/BSD-3-Clause, https://spdx.org/licenses/BSD-3-Clause
-    Files with this license:
-        gnulib/platform/win64/stdint.h.disabled [6:29]
-
-KEEP     GPL-3.0-or-later     4530e35d86eb1a6a2cdaae130ce82211
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/concat-filename.c [4:15]
-        gnulib/src/stpcpy.c [8:19]
-        gnulib/src/strtol.c [9:20]
-        gnulib/src/xconcat-filename.c [4:15]
-
-KEEP     GPL-3.0-or-later     4ae51eba59eabe09f95132c440dce661
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/regcomp.c [6:18]
-        gnulib/src/regex.c [6:18]
-        gnulib/src/regex.h [7:19]
-        gnulib/src/regex_internal.c [6:18]
-        gnulib/src/regex_internal.h [6:18]
-        gnulib/src/regexec.c [6:18]
-
-KEEP     GPL-3.0-or-later     4bbd0de5f2f20eb4c60122883c69f671
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/bison.m4 [7:18]
-        bison/data/c++-skel.m4 [7:18]
-        bison/data/c++.m4 [7:18]
-        bison/data/c-like.m4 [7:18]
-        bison/data/c-skel.m4 [7:18]
-        bison/data/c.m4 [7:18]
-        bison/data/glr.c [7:18]
-        bison/data/glr.cc [5:16]
-        bison/data/java-skel.m4 [7:18]
-        bison/data/java.m4 [7:18]
-        bison/data/lalr1.cc [5:16]
-        bison/data/lalr1.java [5:16]
-        bison/data/location.cc [5:16]
-        bison/data/stack.hh [5:16]
-        bison/data/variant.hh [5:16]
-        bison/data/yacc.c [10:21]
-        bison/src/local.mk [3:14]
-
-KEEP     GPL-3.0-or-later     4c1501e84b9200d3a65db7c65c2a40eb
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/platform/win64/alloca.h [7:19]
-
-KEEP     GPL-3.0-or-later     5ba7dada0924de4a0806984d740f21db
-BELONGS m4/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 98.99
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        m4/src/builtin.c [8:19]
-        m4/src/debug.c [8:19]
-        m4/src/eval.c [8:19]
-        m4/src/format.c [7:18]
-        m4/src/freeze.c [7:18]
-        m4/src/input.c [7:18]
-        m4/src/m4.c [7:18]
-        m4/src/m4.h [7:18]
-        m4/src/macro.c [8:19]
-        m4/src/output.c [7:18]
-        m4/src/path.c [8:19]
-        m4/src/symtab.c [8:19]
-
-REMOVE   LicenseRef-scancode-fsf-unlimited-no-warranty 630c5854d8e4b92069b3e69c2071d9b1
-BELONGS m4/ya.make
-FILE_INCLUDE m4/src/Makefile.in found in files: m4/src/Makefile.in at line 6
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: LicenseRef-scancode-fsf-unlimited-no-warranty
-        Score           : 100.00
-        Match type      : TEXT
-        Links           : http://www.fsf.org/licensing/licenses/, https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
-    Files with this license:
-        m4/src/Makefile.in [6:13]
-
-KEEP     GPL-3.0-or-later     659dd41b50d94dd686004e4d8e78c706
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/platform/posix/time.h [6:17]
-        gnulib/platform/win64/langinfo.h [5:16]
-        gnulib/platform/win64/stdbool.h [5:16]
-        gnulib/platform/win64/sys/stat.h [5:16]
-        gnulib/platform/win64/sys/time.h [6:17]
-        gnulib/platform/win64/sys/wait.h [5:16]
-        gnulib/platform/win64/unistd.h [5:16]
-        gnulib/src/c-strcase.h [5:16]
-        gnulib/src/c-strcasecmp.c [4:15]
-        gnulib/src/c-strncasecmp.c [4:15]
-        gnulib/src/float+.h [5:16]
-        gnulib/src/gettimeofday.c [5:16]
-        gnulib/src/glthread/lock.c [4:15]
-        gnulib/src/glthread/lock.h [4:15]
-        gnulib/src/glthread/threadlib.c [4:15]
-        gnulib/src/malloc.c [5:16]
-        gnulib/src/malloca.c [5:16]
-        gnulib/src/malloca.h [5:16]
-        gnulib/src/pathmax.h [5:16]
-        gnulib/src/size_max.h [5:16]
-        gnulib/src/strnlen.c [5:16]
-        gnulib/src/waitpid.c [4:15]
-        gnulib/src/xsize.h [5:16]
-
-KEEP     GPL-3.0-or-later     68a0038b7c764a1ddb3715a6b57296d1
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/strndup.c [6:17]
-
-KEEP     GPL-3.0-or-later     73fdbcc7196895501feab70c4a68db5a
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/README [59:70]
-
-KEEP     GPL-3.0-or-later     7c229c32d3d54dacee032f7da11d3dc5
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/platform/posix/fcntl.h [6:17]
-        gnulib/platform/posix/getopt.h [7:18]
-        gnulib/platform/win64/fcntl.h [6:17]
-        gnulib/platform/win64/getopt.h [7:18]
-        gnulib/platform/win64/locale.h [5:16]
-        gnulib/platform/win64/math.h [6:17]
-        gnulib/platform/win64/sched.h [5:16]
-        gnulib/platform/win64/signal.h [6:17]
-        gnulib/platform/win64/spawn.h [6:17]
-        gnulib/src/argmatch.c [6:17]
-        gnulib/src/argmatch.h [6:17]
-        gnulib/src/basename-lgpl.c [6:17]
-        gnulib/src/basename.c [6:17]
-        gnulib/src/binary-io.h [4:15]
-        gnulib/src/bitrotate.h [4:15]
-        gnulib/src/btowc.c [5:16]
-        gnulib/src/c-stack.c [5:16]
-        gnulib/src/c-stack.h [5:16]
-        gnulib/src/calloc.c [5:16]
-        gnulib/src/canonicalize-lgpl.c [5:16]
-        gnulib/src/clean-temp.c [6:17]
-        gnulib/src/clean-temp.h [5:16]
-        gnulib/src/close-stream.c [5:16]
-        gnulib/src/close.c [4:15]
-        gnulib/src/closein.c [5:16]
-        gnulib/src/closein.h [5:16]
-        gnulib/src/closeout.c [6:17]
-        gnulib/src/closeout.h [6:17]
-        gnulib/src/concat-filename.h [4:15]
-        gnulib/src/dirname-lgpl.c [6:17]
-        gnulib/src/dirname.c [6:17]
-        gnulib/src/dup-safer-flag.c [6:17]
-        gnulib/src/dup-safer.c [5:16]
-        gnulib/src/dup2.c [5:16]
-        gnulib/src/error.c [5:16]
-        gnulib/src/error.h [6:17]
-        gnulib/src/execute.c [5:16]
-        gnulib/src/execute.h [5:16]
-        gnulib/src/exitfail.c [5:16]
-        gnulib/src/exitfail.h [5:16]
-        gnulib/src/fatal-signal.c [5:16]
-        gnulib/src/fatal-signal.h [5:16]
-        gnulib/src/fclose.c [4:15]
-        gnulib/src/fcntl.c [5:16]
-        gnulib/src/fd-safer-flag.c [6:17]
-        gnulib/src/fd-safer.c [5:16]
-        gnulib/src/fflush.c [4:15]
-        gnulib/src/filename.h [4:15]
-        gnulib/src/filenamecat-lgpl.c [5:16]
-        gnulib/src/filenamecat.c [5:16]
-        gnulib/src/filenamecat.h [6:17]
-        gnulib/src/float.c [5:16]
-        gnulib/src/fopen-safer.c [5:16]
-        gnulib/src/fopen.c [4:15]
-        gnulib/src/fpending.c [5:16]
-        gnulib/src/fprintf.c [4:15]
-        gnulib/src/fpucw.h [5:16]
-        gnulib/src/fpurge.c [4:15]
-        gnulib/src/freadahead.c [4:15]
-        gnulib/src/freadahead.h [4:15]
-        gnulib/src/freading.c [4:15]
-        gnulib/src/freading.h [4:15]
-        gnulib/src/frexp.c [4:15]
-        gnulib/src/fseek.c [4:15]
-        gnulib/src/fseterr.c [4:15]
-        gnulib/src/fseterr.h [4:15]
-        gnulib/src/fstat.c [4:15]
-        gnulib/src/ftello.c [4:15]
-        gnulib/src/getdtablesize.c [5:16]
-        gnulib/src/getopt.c [9:20]
-        gnulib/src/getopt1.c [6:17]
-        gnulib/src/getopt_int.h [6:17]
-        gnulib/src/gl_anyhash_list1.h [5:16]
-        gnulib/src/gl_anyhash_list2.h [5:16]
-        gnulib/src/gl_anylinked_list1.h [5:16]
-        gnulib/src/gl_anylinked_list2.h [5:16]
-        gnulib/src/gl_anytree_oset.h [5:16]
-        gnulib/src/gl_avltree_oset.c [5:16]
-        gnulib/src/gl_avltree_oset.h [5:16]
-        gnulib/src/gl_linkedhash_list.c [5:16]
-        gnulib/src/gl_linkedhash_list.h [5:16]
-        gnulib/src/gl_list.h [5:16]
-        gnulib/src/gl_oset.h [5:16]
-        gnulib/src/gl_xlist.h [5:16]
-        gnulib/src/gl_xoset.h [5:16]
-        gnulib/src/glthread/tls.c [4:15]
-        gnulib/src/glthread/tls.h [4:15]
-        gnulib/src/hash.c [7:18]
-        gnulib/src/hash.h [6:17]
-        gnulib/src/ignore-value.h [5:16]
-        gnulib/src/intprops.h [5:16]
-        gnulib/src/isnan.c [4:15]
-        gnulib/src/isnand-nolibm.h [4:15]
-        gnulib/src/isnand.c [4:15]
-        gnulib/src/isnanf-nolibm.h [4:15]
-        gnulib/src/isnanf.c [4:15]
-        gnulib/src/isnanl-nolibm.h [4:15]
-        gnulib/src/isnanl.c [4:15]
-        gnulib/src/itold.c [5:16]
-        gnulib/src/ldexpl.c [8:19]
-        gnulib/src/localeconv.c [4:15]
-        gnulib/src/lstat.c [5:16]
-        gnulib/src/mbrtowc.c [5:16]
-        gnulib/src/mbswidth.c [4:15]
-        gnulib/src/mbswidth.h [4:15]
-        gnulib/src/mbtowc-impl.h [5:16]
-        gnulib/src/mbtowc.c [5:16]
-        gnulib/src/memchr2.h [4:15]
-        gnulib/src/mkdtemp.c [5:16]
-        gnulib/src/mkstemp-safer.c [5:16]
-        gnulib/src/mkstemp.c [5:16]
-        gnulib/src/nl_langinfo.c [5:16]
-        gnulib/src/obstack.c [5:16]
-        gnulib/src/obstack.h [6:17]
-        gnulib/src/open.c [4:15]
-        gnulib/src/perror.c [5:16]
-        gnulib/src/pipe-safer.c [4:15]
-        gnulib/src/pipe2-safer.c [4:15]
-        gnulib/src/printf-frexp.c [4:15]
-        gnulib/src/printf-frexp.h [4:15]
-        gnulib/src/printf-frexpl.c [4:15]
-        gnulib/src/printf-frexpl.h [4:15]
-        gnulib/src/printf.c [4:15]
-        gnulib/src/progname.c [5:16]
-        gnulib/src/progname.h [5:16]
-        gnulib/src/quote.h [5:16]
-        gnulib/src/quotearg.c [5:16]
-        gnulib/src/quotearg.h [6:17]
-        gnulib/src/raise.c [5:16]
-        gnulib/src/rawmemchr.c [4:15]
-        gnulib/src/readlink.c [4:15]
-        gnulib/src/realloc.c [6:17]
-        gnulib/src/rename.c [5:16]
-        gnulib/src/rmdir.c [6:17]
-        gnulib/src/same-inode.h [5:16]
-        gnulib/src/sig-handler.h [5:16]
-        gnulib/src/sigaction.c [5:16]
-        gnulib/src/siglist.h [5:16]
-        gnulib/src/signbitd.c [4:15]
-        gnulib/src/signbitf.c [4:15]
-        gnulib/src/signbitl.c [4:15]
-        gnulib/src/sigprocmask.c [5:16]
-        gnulib/src/spawn-pipe.c [5:16]
-        gnulib/src/spawn-pipe.h [5:16]
-        gnulib/src/spawn_faction_addclose.c [4:15]
-        gnulib/src/spawn_faction_adddup2.c [4:15]
-        gnulib/src/spawn_faction_addopen.c [4:15]
-        gnulib/src/spawn_faction_destroy.c [4:15]
-        gnulib/src/spawn_faction_init.c [4:15]
-        gnulib/src/spawn_int.h [4:15]
-        gnulib/src/spawnattr_destroy.c [4:15]
-        gnulib/src/spawnattr_init.c [4:15]
-        gnulib/src/spawnattr_setflags.c [4:15]
-        gnulib/src/spawnattr_setsigmask.c [4:15]
-        gnulib/src/spawni.c [5:16]
-        gnulib/src/spawnp.c [4:15]
-        gnulib/src/sprintf.c [4:15]
-        gnulib/src/stat.c [4:15]
-        gnulib/src/stdio--.h [5:16]
-        gnulib/src/stdio-impl.h [4:15]
-        gnulib/src/stdio-safer.h [5:16]
-        gnulib/src/stdio-write.c [5:16]
-        gnulib/src/stdlib--.h [5:16]
-        gnulib/src/stdlib-safer.h [5:16]
-        gnulib/src/strchrnul.c [4:15]
-        gnulib/src/stripslash.c [6:17]
-        gnulib/src/strsignal.c [5:16]
-        gnulib/src/strtoul.c [4:15]
-        gnulib/src/tempname.c [5:16]
-        gnulib/src/tempname.h [5:16]
-        gnulib/src/tmpdir.c [5:16]
-        gnulib/src/tmpdir.h [4:15]
-        gnulib/src/unistd--.h [5:16]
-        gnulib/src/unistd-safer.h [5:16]
-        gnulib/src/unlocked-io.h [5:16]
-        gnulib/src/unsetenv.c [4:15]
-        gnulib/src/verify.h [5:16]
-        gnulib/src/verror.c [4:15]
-        gnulib/src/verror.h [4:15]
-        gnulib/src/version-etc-fsf.c [4:15]
-        gnulib/src/version-etc.c [4:15]
-        gnulib/src/version-etc.h [4:15]
-        gnulib/src/vfprintf.c [4:15]
-        gnulib/src/vsprintf.c [4:15]
-        gnulib/src/w32spawn.h [5:16]
-        gnulib/src/wait-process.c [5:16]
-        gnulib/src/wait-process.h [5:16]
-        gnulib/src/wcrtomb.c [5:16]
-        gnulib/src/wcwidth.c [4:15]
-        gnulib/src/xalloc-die.c [6:17]
-        gnulib/src/xalloc-oversized.h [5:16]
-        gnulib/src/xalloc.h [5:16]
-        gnulib/src/xasprintf.c [5:16]
-        gnulib/src/xmalloc.c [5:16]
-        gnulib/src/xmalloca.c [5:16]
-        gnulib/src/xmalloca.h [5:16]
-        gnulib/src/xmemdup0.c [5:16]
-        gnulib/src/xmemdup0.h [5:16]
-        gnulib/src/xprintf.c [4:15]
-        gnulib/src/xprintf.h [4:15]
-        gnulib/src/xstrndup.c [5:16]
-        gnulib/src/xstrndup.h [5:16]
-        gnulib/src/xvasprintf.c [4:15]
-        gnulib/src/xvasprintf.h [4:15]
-
-KEEP     LGPL-2.0-or-later    99de7539428539ca5bda44e3fc08a41c
-BELONGS gnulib/ya.make
-FILE_INCLUDE gnulib/src/filenamecat-lgpl.c found in files: gnulib/src/filenamecat.c at line 30
-    License text:
-        /* Just like mfile_name_concat (filenamecat-lgpl.c), except, rather than
-    Scancode info:
-        Original SPDX id: LGPL-2.0-or-later
-        Score           : 75.00
-        Match type      : REFERENCE
-        Links           : http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html, https://spdx.org/licenses/LGPL-2.0-or-later
-    Files with this license:
-        gnulib/src/filenamecat.c [30:30]
-
-KEEP     GPL-3.0-or-later     a6532c8141a6e70f23165e25c02c7e03
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/memchr.c [13:24]
-        gnulib/src/memchr2.c [11:22]
-
-SKIP     GPL-3.0-only         a705c9099b04501ac6e8db37ebbdcba2
-BELONGS bison/ya.make
-    License text:
-        \# this program; see the files COPYINGv3 and COPYING.EXCEPTION
-    Scancode info:
-        Original SPDX id: GPL-3.0-only
-        Score           : 70.00
-        Match type      : REFERENCE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, http://www.gnu.org/licenses/gpl-3.0.html, https://spdx.org/licenses/GPL-3.0-only
-    Files with this license:
-        bison/data/m4sugar/foreach.m4 [26:26]
-        bison/data/m4sugar/m4sugar.m4 [25:25]
-
-KEEP     GPL-3.0-or-later     bd5912a561636d67d8f95a9e34cf5b04
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/platform/win64/unitypes.h [5:16]
-        gnulib/platform/win64/uniwidth.h [6:17]
-        gnulib/src/c-strcaseeq.h [4:15]
-        gnulib/src/fd-hook.c [5:16]
-        gnulib/src/fd-hook.h [4:15]
-        gnulib/src/secure_getenv.c [5:16]
-        gnulib/src/streq.h [4:15]
-        gnulib/src/uniwidth/cjk.h [5:16]
-        gnulib/src/uniwidth/width.c [5:16]
-
-KEEP     GPL-3.0-or-later     c43a3f8af41c78419310d68f52c2a0fd
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/version-etc.c [88:90]
-
-KEEP     GPL-3.0-or-later     c4c548dae76e011d78bb84eea8225ad2
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/local.mk [3:14]
-
-KEEP     GPL-3.0-or-later     d4567748e68738e056e4352a3e312182
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/cloexec.c [5:16]
-        gnulib/src/cloexec.h [5:16]
-        gnulib/src/dosname.h [5:16]
-        gnulib/src/fpending.h [6:17]
-
-KEEP     GPL-3.0-or-later WITH Bison-exception-2.2 dc3f0903b73e18bed1ecb46a6502b677
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 92.02
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/src/parse-gram.h [1:31]
-    Scancode info:
-        Original SPDX id: Bison-exception-2.2
-        Score           : 92.02
-        Match type      : NOTICE
-        Links           : https://spdx.org/licenses/Bison-exception-2.2
-    Files with this license:
-        bison/src/parse-gram.h [1:31]
-
-KEEP     GPL-3.0-or-later     df04da72b7873e789c56d0a957b4a435
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 97.20
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/xslt/bison.xsl [10:26]
-
-KEEP     GPL-3.0-or-later     e4ec3ae72487e0581d08cc2b920ee113
-BELONGS bison/ya.make gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/src/AnnotationList.c [7:18]
-        bison/src/AnnotationList.h [7:18]
-        bison/src/InadequacyList.c [7:18]
-        bison/src/InadequacyList.h [7:18]
-        bison/src/LR0.c [8:19]
-        bison/src/LR0.h [8:19]
-        bison/src/Sbitset.c [7:18]
-        bison/src/Sbitset.h [7:18]
-        bison/src/assoc.c [8:19]
-        bison/src/assoc.h [7:18]
-        bison/src/closure.c [8:19]
-        bison/src/closure.h [8:19]
-        bison/src/complain.c [6:17]
-        bison/src/complain.h [6:17]
-        bison/src/conflicts.c [8:19]
-        bison/src/conflicts.h [8:19]
-        bison/src/derives.c [8:19]
-        bison/src/derives.h [8:19]
-        bison/src/files.c [8:19]
-        bison/src/files.h [8:19]
-        bison/src/flex-scanner.h [7:18]
-        bison/src/getargs.c [8:19]
-        bison/src/getargs.h [8:19]
-        bison/src/gram.c [8:19]
-        bison/src/gram.h [8:19]
-        bison/src/graphviz.c [7:18]
-        bison/src/graphviz.h [7:18]
-        bison/src/ielr.c [7:18]
-        bison/src/ielr.h [7:18]
-        bison/src/lalr.c [8:19]
-        bison/src/lalr.h [8:19]
-        bison/src/location.c [7:18]
-        bison/src/location.h [7:18]
-        bison/src/main.c [8:19]
-        bison/src/muscle-tab.c [7:18]
-        bison/src/muscle-tab.h [7:18]
-        bison/src/named-ref.c [7:18]
-        bison/src/named-ref.h [7:18]
-        bison/src/nullable.c [8:19]
-        bison/src/nullable.h [7:18]
-        bison/src/output.c [8:19]
-        bison/src/output.h [8:19]
-        bison/src/parse-gram.y [7:18]
-        bison/src/print-xml.c [7:18]
-        bison/src/print-xml.h [7:18]
-        bison/src/print.c [8:19]
-        bison/src/print.h [7:18]
-        bison/src/print_graph.c [7:18]
-        bison/src/print_graph.h [7:18]
-        bison/src/reader.c [8:19]
-        bison/src/reader.h [8:19]
-        bison/src/reduce.c [8:19]
-        bison/src/reduce.h [8:19]
-        bison/src/relation.c [8:19]
-        bison/src/relation.h [7:18]
-        bison/src/scan-code.c [637:648]
-        bison/src/scan-code.h [7:18]
-        bison/src/scan-code.l [7:18]
-        bison/src/scan-gram.c [1026:1037]
-        bison/src/scan-gram.h [7:18]
-        bison/src/scan-gram.l [7:18]
-        bison/src/scan-skel.c [626:637]
-        bison/src/scan-skel.c.saved [616:627]
-        bison/src/scan-skel.h [7:18]
-        bison/src/scan-skel.l [7:18]
-        bison/src/state.c [7:18]
-        bison/src/state.h [8:19]
-        bison/src/symlist.c [8:19]
-        bison/src/symlist.h [8:19]
-        bison/src/symtab.c [8:19]
-        bison/src/symtab.h [8:19]
-        bison/src/system.h [5:16]
-        bison/src/tables.c [8:19]
-        bison/src/tables.h [7:18]
-        bison/src/uniqstr.c [7:18]
-        bison/src/uniqstr.h [7:18]
-        gnulib/src/abitset.c [8:19]
-        gnulib/src/abitset.h [7:18]
-        gnulib/src/bbitset.h [8:19]
-        gnulib/src/bison-system.h [5:16]
-        gnulib/src/bitset.c [7:18]
-        gnulib/src/bitset.h [7:18]
-        gnulib/src/bitset_stats.c [7:18]
-        gnulib/src/bitset_stats.h [7:18]
-        gnulib/src/bitsetv-print.c [6:17]
-        gnulib/src/bitsetv-print.h [7:18]
-        gnulib/src/bitsetv.c [6:17]
-        gnulib/src/bitsetv.h [7:18]
-        gnulib/src/ebitset.c [7:18]
-        gnulib/src/ebitset.h [7:18]
-        gnulib/src/get-errno.c [5:16]
-        gnulib/src/get-errno.h [5:16]
-        gnulib/src/lbitset.c [8:19]
-        gnulib/src/lbitset.h [7:18]
-        gnulib/src/libiberty.h [5:16]
-        gnulib/src/timevar.c [8:19]
-        gnulib/src/timevar.def [10:21]
-        gnulib/src/timevar.h [8:19]
-        gnulib/src/vbitset.c [7:18]
-        gnulib/src/vbitset.h [7:18]
-
-KEEP     GPL-3.0-or-later     ebf8cac55088b3e06e4c10c2cd60f3d8
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/bison.m4 [37:48]
-
-KEEP     GPL-3.0-or-later     ef9133e87f09eac2c03d4b0de8e97bbc
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/xslt/xml2dot.xsl [10:21]
-        bison/data/xslt/xml2text.xsl [10:21]
-        bison/data/xslt/xml2xhtml.xsl [10:21]
-
-KEEP     GPL-3.0-or-later     f35abb2e4128ba709bfba3bd5a3e7ce3
-BELONGS gnulib/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        gnulib/src/dirname.h [6:17]
-
-KEEP     GPL-3.0-or-later     f5531b760ee4420f92c3336539845312
-BELONGS bison/ya.make
-    Note: matched license text is too long. Read it in the source files.
-    Scancode info:
-        Original SPDX id: GPL-3.0-or-later
-        Score           : 93.40
-        Match type      : NOTICE
-        Links           : http://www.gnu.org/licenses/gpl-3.0-standalone.html, https://spdx.org/licenses/GPL-3.0-or-later
-    Files with this license:
-        bison/data/m4sugar/foreach.m4 [9:27]
-        bison/data/m4sugar/m4sugar.m4 [8:26]
diff --git a/contrib/tools/bison/bison/.yandex_meta/licenses.list.txt b/contrib/tools/bison/bison/.yandex_meta/licenses.list.txt
deleted file mode 100644
index 4afcac990d..0000000000
--- a/contrib/tools/bison/bison/.yandex_meta/licenses.list.txt
+++ /dev/null
@@ -1,487 +0,0 @@
-====================COPYRIGHT====================
-           _("Copyright (C) %d Free Software Foundation, Inc.\n"),
-           2013);
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-   2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
-   2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2000-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 1992, 2000-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2002, 2004-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2013 Free
-   Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2002, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1984, 1989, 2000-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1988-1989, 2000-2003, 2005-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2002, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2002, 2004, 2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2002, 2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2002, 2007, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2003, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2004-2005, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2005-2006, 2008-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2005, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006, 2010-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation,
-# Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-## Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc.
-
-
-====================GPL-3.0-or-later====================
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bison="http://www.gnu.org/software/bison/">
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-# This file is part of Autoconf.  This program is free
-# software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the Autoconf Configure Script Exception,
-# version 3.0, as published by the Free Software Foundation.
-#
-# You should have received a copy of the GNU General Public License
-# and a copy of the Autoconf Configure Script Exception along with
-# this program; see the files COPYINGv3 and COPYING.EXCEPTION
-# respectively.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-====================GPL-3.0-or-later====================
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.])
-
-
-====================GPL-3.0-or-later WITH Bison-exception-2.2====================
-/* A Bison parser, made by GNU Bison 3.0.  */
-
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-====================GPL-3.0-or-later WITH Bison-exception-2.2====================
-/* A Bison parser, made by GNU Bison 3.0.  */
-
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-====================GPL-3.0-or-later WITH Bison-exception-2.2====================
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.])
-
-b4_comment([As a special exception, you may create a larger work that contains
-part or all of the Bison parser skeleton and distribute that work
-under terms of your choice, so long as that work isn't itself a
-parser generator using the skeleton or a modified version thereof
-as a parser skeleton.  Alternatively, if you modify or redistribute
-the parser skeleton itself, you may (at your option) remove this
-special exception, which will cause the skeleton and the resulting
-Bison output files to be licensed under the GNU General Public
-License without this special exception.
-
-This special exception was added by the Free Software Foundation in
-version 2.2 of Bison.])])
diff --git a/contrib/tools/bison/bison/data/bison.m4 b/contrib/tools/bison/bison/data/bison.m4
deleted file mode 100644
index ca27159c87..0000000000
--- a/contrib/tools/bison/bison/data/bison.m4
+++ /dev/null
@@ -1,1063 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# Language-independent M4 Macros for Bison.
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-## ---------------- ##
-## Identification.  ##
-## ---------------- ##
-
-# b4_copyright(TITLE, [YEARS])
-# ----------------------------
-# If YEARS are not defined, use b4_copyright_years.
-m4_define([b4_copyright],
-[b4_comment([A Bison parser, made by GNU Bison b4_version.])
-
-b4_comment([$1
-
-]m4_dquote(m4_text_wrap([Copyright (C)
-]m4_ifval([$2], [[$2]], [m4_defn([b4_copyright_years])])[
-Free Software Foundation, Inc.]))[
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.])
-
-b4_comment([As a special exception, you may create a larger work that contains
-part or all of the Bison parser skeleton and distribute that work
-under terms of your choice, so long as that work isn't itself a
-parser generator using the skeleton or a modified version thereof
-as a parser skeleton.  Alternatively, if you modify or redistribute
-the parser skeleton itself, you may (at your option) remove this
-special exception, which will cause the skeleton and the resulting
-Bison output files to be licensed under the GNU General Public
-License without this special exception.
-
-This special exception was added by the Free Software Foundation in
-version 2.2 of Bison.])])
-
-
-## -------- ##
-## Output.  ##
-## -------- ##
-
-# b4_output_begin(FILE)
-# ---------------------
-# Enable output, i.e., send to diversion 0, expand after "#", and
-# generate the tag to output into FILE.  Must be followed by EOL.
-m4_define([b4_output_begin],
-[m4_changecom()
-m4_divert_push(0)dnl
-@output(m4_unquote([$1])@)@dnl
-])
-
-
-# b4_output_end()
-# ---------------
-# Output nothing, restore # as comment character (no expansions after #).
-m4_define([b4_output_end],
-[m4_divert_pop(0)
-m4_changecom([#])
-])
-
-
-# b4_divert_kill(CODE)
-# --------------------
-# Expand CODE for its side effects, discard its output.
-m4_define([b4_divert_kill],
-[m4_divert_text([KILL], [$1])])
-
-
-# b4_define_silent(MACRO, CODE)
-# -----------------------------
-# Same as m4_define, but throw away the expansion of CODE.
-m4_define([b4_define_silent],
-[m4_define([$1], [b4_divert_kill([$2])])])
-
-
-## ---------------- ##
-## Error handling.  ##
-## ---------------- ##
-
-# The following error handling macros print error directives that should not
-# become arguments of other macro invocations since they would likely then be
-# mangled.  Thus, they print to stdout directly.
-
-# b4_cat(TEXT)
-# ------------
-# Write TEXT to stdout.  Precede the final newline with an @ so that it's
-# escaped.  For example:
-#
-#   b4_cat([[@complain(invalid input@)]])
-m4_define([b4_cat],
-[m4_syscmd([cat <<'_m4eof'
-]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@
-_m4eof
-])dnl
-m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])
-
-# b4_error(KIND, START, END, FORMAT, [ARG1], [ARG2], ...)
-# -------------------------------------------------------
-# Write @KIND(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.
-#
-# For example:
-#
-#   b4_error([[complain]], [[input.y:2.3]], [[input.y:5.4]],
-#            [[invalid %s]], [[foo]])
-m4_define([b4_error],
-[b4_cat([[@complain][(]$1[@,]$2[@,]$3[@,]$4[]]dnl
-[m4_if([$#], [4], [],
-       [m4_foreach([b4_arg],
-                   m4_dquote(m4_shift(m4_shift(m4_shift(m4_shift($@))))),
-                   [[@,]b4_arg])])[@)]])])
-
-# b4_warn(FORMAT, [ARG1], [ARG2], ...)
-# ------------------------------------
-# Write @warn(FORMAT@,ARG1@,ARG2@,...@) to stdout.
-#
-# For example:
-#
-#   b4_warn([[invalid value for '%s': %s]], [[foo]], [[3]])
-#
-# As a simple test suite, this:
-#
-#   m4_divert(-1)
-#   m4_define([asdf], [ASDF])
-#   m4_define([fsa], [FSA])
-#   m4_define([fdsa], [FDSA])
-#   b4_warn_at([[[asdf), asdf]]], [[[fsa), fsa]]], [[[fdsa), fdsa]]])
-#   b4_warn_at([[asdf), asdf]], [[fsa), fsa]], [[fdsa), fdsa]])
-#   b4_warn_at()
-#   b4_warn_at(1)
-#   b4_warn_at(1, 2)
-#
-# Should produce this without newlines:
-#
-#   @warn_at([asdf), asdf]@,@,@,[fsa), fsa]@,[fdsa), fdsa]@)
-#   @warn(asdf), asdf@,@,@,fsa), fsa@,fdsa), fdsa@)
-#   @warn(@)
-#   @warn(1@)
-#   @warn(1@,2@)
-m4_define([b4_warn],
-[b4_error([[warn]], [], [], $@)])
-
-# b4_warn_at(START, END, FORMAT, [ARG1], [ARG2], ...)
-# ---------------------------------------------------
-# Write @warn(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.
-#
-# For example:
-#
-#   b4_warn_at([[input.y:2.3]], [[input.y:5.4]], [[invalid %s]], [[foo]])
-m4_define([b4_warn_at],
-[b4_error([[warn]], $@)])
-
-# b4_complain(FORMAT, [ARG1], [ARG2], ...)
-# ----------------------------------------
-# Bounce to b4_complain_at.
-#
-# See b4_warn example.
-m4_define([b4_complain],
-[b4_error([[complain]], [], [], $@)])
-
-# b4_complain_at(START, END, FORMAT, [ARG1], [ARG2], ...)
-# -------------------------------------------------------
-# Write @complain(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.
-#
-# See b4_warn_at example.
-m4_define([b4_complain_at],
-[b4_error([[complain]], $@)])
-
-# b4_fatal(FORMAT, [ARG1], [ARG2], ...)
-# -------------------------------------
-# Bounce to b4_fatal_at.
-#
-# See b4_warn example.
-m4_define([b4_fatal],
-[b4_error([[fatal]], [], [], $@)dnl
-m4_exit(1)])
-
-# b4_fatal_at(START, END, FORMAT, [ARG1], [ARG2], ...)
-# ----------------------------------------------------
-# Write @fatal(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout and exit.
-#
-# See b4_warn_at example.
-m4_define([b4_fatal_at],
-[b4_error([[fatal]], $@)dnl
-m4_exit(1)])
-
-
-## ------------ ##
-## Data Types.  ##
-## ------------ ##
-
-# b4_ints_in(INT1, INT2, LOW, HIGH)
-# ---------------------------------
-# Return 1 iff both INT1 and INT2 are in [LOW, HIGH], 0 otherwise.
-m4_define([b4_ints_in],
-[m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])])
-
-
-# b4_subtract(LHS, RHS)
-# ---------------------
-# Evaluate LHS - RHS if they are integer literals, otherwise expand
-# to (LHS) - (RHS).
-m4_define([b4_subtract],
-[m4_bmatch([$1$2], [^[0123456789]*$],
-           [m4_eval([$1 - $2])],
-           [($1) - ($2)])])
-
-# b4_join(ARG1, ...)
-# _b4_join(ARG1, ...)
-# -------------------
-# Join with comma, skipping empty arguments.
-# b4_join calls itself recursively until it sees the first non-empty
-# argument, then calls _b4_join which prepends each non-empty argument
-# with a comma.
-m4_define([b4_join],
-[m4_if([$#$1],
-       [1], [],
-       [m4_ifval([$1],
-                 [$1[]_$0(m4_shift($@))],
-                 [$0(m4_shift($@))])])])
-
-# _b4_join(ARGS1, ...)
-# --------------------
-m4_define([_b4_join],
-[m4_if([$#$1],
-       [1], [],
-       [m4_ifval([$1], [, $1])[]$0(m4_shift($@))])])
-
-
-
-
-# b4_integral_parser_tables_map(MACRO)
-# -------------------------------------
-# Map MACRO on all the integral tables.  MACRO is expected to have
-# the signature MACRO(TABLE-NAME, CONTENT, COMMENT).
-m4_define([b4_integral_parser_tables_map],
-[$1([pact], [b4_pact],
-    [[YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-STATE-NUM.]])
-
-$1([defact], [b4_defact],
-   [[YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-Performed when YYTABLE does not specify something else to do.  Zero
-means the default is an error.]])
-
-$1([pgoto], [b4_pgoto], [[YYPGOTO[NTERM-NUM].]])
-
-$1([defgoto], [b4_defgoto], [[YYDEFGOTO[NTERM-NUM].]])
-
-$1([table], [b4_table],
-   [[YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-positive, shift that token.  If negative, reduce the rule whose
-number is the opposite.  If YYTABLE_NINF, syntax error.]])
-
-$1([check], [b4_check])
-
-$1([stos], [b4_stos],
-   [[YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-symbol of state STATE-NUM.]])
-
-$1([r1], [b4_r1],
-   [[YYR1[YYN] -- Symbol number of symbol that rule YYN derives.]])
-
-$1([r2], [b4_r2],
-   [[YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.]])
-])
-
-
-# b4_parser_tables_declare
-# b4_parser_tables_define
-# ------------------------
-# Define/declare the (deterministic) parser tables.
-m4_define([b4_parser_tables_declare],
-[b4_integral_parser_tables_map([b4_integral_parser_table_declare])])
-
-m4_define([b4_parser_tables_define],
-[b4_integral_parser_tables_map([b4_integral_parser_table_define])])
-
-
-
-## ------------------ ##
-## Decoding options.  ##
-## ------------------ ##
-
-# b4_flag_if(FLAG, IF-TRUE, IF-FALSE)
-# -----------------------------------
-# Run IF-TRUE if b4_FLAG_flag is 1, IF-FALSE if FLAG is 0, otherwise fail.
-m4_define([b4_flag_if],
-[m4_case(b4_$1_flag,
-         [0], [$3],
-         [1], [$2],
-         [m4_fatal([invalid $1 value: ]b4_$1_flag)])])
-
-
-# b4_define_flag_if(FLAG)
-# -----------------------
-# Define "b4_FLAG_if(IF-TRUE, IF-FALSE)" that depends on the
-# value of the Boolean FLAG.
-m4_define([b4_define_flag_if],
-[_b4_define_flag_if($[1], $[2], [$1])])
-
-# _b4_define_flag_if($1, $2, FLAG)
-# --------------------------------
-# Work around the impossibility to define macros inside macros,
-# because issuing '[$1]' is not possible in M4.  GNU M4 should provide
-# $$1 a la M5/TeX.
-m4_define([_b4_define_flag_if],
-[m4_if([$1$2], $[1]$[2], [],
-       [m4_fatal([$0: Invalid arguments: $@])])dnl
-m4_define([b4_$3_if],
-          [b4_flag_if([$3], [$1], [$2])])])
-
-
-# b4_FLAG_if(IF-TRUE, IF-FALSE)
-# -----------------------------
-# Expand IF-TRUE, if FLAG is true, IF-FALSE otherwise.
-b4_define_flag_if([defines])            # Whether headers are requested.
-b4_define_flag_if([glr])                # Whether a GLR parser is requested.
-b4_define_flag_if([nondeterministic])   # Whether conflicts should be handled.
-b4_define_flag_if([token_table])        # Whether yytoken_table is demanded.
-b4_define_flag_if([yacc])               # Whether POSIX Yacc is emulated.
-
-
-## --------- ##
-## Symbols.  ##
-## --------- ##
-
-# In order to unify the handling of the various aspects of symbols
-# (tag, type_name, whether terminal, etc.), bison.exe defines one
-# macro per (token, field), where field can has_id, id, etc.: see
-# src/output.c:prepare_symbols_definitions().
-#
-# The various FIELDS are:
-#
-# - has_id: 0 or 1.
-#   Whether the symbol has an id.
-# - id: string
-#   If has_id, the id.  Guaranteed to be usable as a C identifier.
-#   Prefixed by api.token.prefix if defined.
-# - tag: string.
-#   A representat of the symbol.  Can be 'foo', 'foo.id', '"foo"' etc.
-# - user_number: integer
-#   The assigned (external) number as used by yylex.
-# - is_token: 0 or 1
-#   Whether this is a terminal symbol.
-# - number: integer
-#   The internalized number (used after yytranslate).
-# - has_type: 0, 1
-#   Whether has a semantic value.
-# - type_tag: string
-#   When api.value.type=union, the generated name for the union member.
-#   yytype_INT etc. for symbols that has_id, otherwise yytype_1 etc.
-# - type
-#   If it has a semantic value, its type tag, or, if variant are used,
-#   its type.
-#   In the case of api.value.type=union, type is the real type (e.g. int).
-# - has_printer: 0, 1
-# - printer: string
-# - printer_file: string
-# - printer_line: integer
-#   If the symbol has a printer, everything about it.
-# - has_destructor, destructor, destructor_file, destructor_line
-#   Likewise.
-#
-# The following macros provide access to these values.
-
-# b4_symbol_(NUM, FIELD)
-# ----------------------
-# Recover a FIELD about symbol #NUM.  Thanks to m4_indir, fails if
-# undefined.
-m4_define([b4_symbol_],
-[m4_indir([b4_symbol($1, $2)])])
-
-
-# b4_symbol(NUM, FIELD)
-# ---------------------
-# Recover a FIELD about symbol #NUM.  Thanks to m4_indir, fails if
-# undefined.  If FIELD = id, prepend the token prefix.
-m4_define([b4_symbol],
-[m4_case([$2],
-         [id],    [m4_do([b4_percent_define_get([api.token.prefix])],
-                         [b4_symbol_([$1], [id])])],
-         [b4_symbol_($@)])])
-
-
-# b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE)
-# -------------------------------------------
-# If FIELD about symbol #NUM is 1 expand IF-TRUE, if is 0, expand IF-FALSE.
-# Otherwise an error.
-m4_define([b4_symbol_if],
-[m4_case(b4_symbol([$1], [$2]),
-         [1], [$3],
-         [0], [$4],
-         [m4_fatal([$0: field $2 of $1 is not a Boolean:] b4_symbol([$1], [$2]))])])
-
-
-# b4_symbol_tag_comment(SYMBOL-NUM)
-# ---------------------------------
-# Issue a comment giving the tag of symbol NUM.
-m4_define([b4_symbol_tag_comment],
-[b4_comment([b4_symbol([$1], [tag])])
-])
-
-
-# b4_symbol_action_location(SYMBOL-NUM, KIND)
-# -------------------------------------------
-# Report the location of the KIND action as FILE:LINE.
-m4_define([b4_symbol_action_location],
-[b4_symbol([$1], [$2_file]):b4_syncline([b4_symbol([$1], [$2_line])])])
-
-
-# b4_symbol_action(SYMBOL-NUM, KIND)
-# ----------------------------------
-# Run the action KIND (destructor or printer) for SYMBOL-NUM.
-# Same as in C, but using references instead of pointers.
-m4_define([b4_symbol_action],
-[b4_symbol_if([$1], [has_$2],
-[b4_dollar_pushdef([(*yyvaluep)],
-                   b4_symbol_if([$1], [has_type],
-                                [m4_dquote(b4_symbol([$1], [type]))]),
-                   [(*yylocationp)])dnl
-    b4_symbol_case_([$1])[]dnl
-b4_syncline([b4_symbol([$1], [$2_line])], ["b4_symbol([$1], [$2_file])"])
-      b4_symbol([$1], [$2])
-b4_syncline([@oline@], [@ofile@])
-        break;
-
-b4_dollar_popdef[]dnl
-])])
-
-
-# b4_symbol_destructor(SYMBOL-NUM)
-# b4_symbol_printer(SYMBOL-NUM)
-# --------------------------------
-m4_define([b4_symbol_destructor], [b4_symbol_action([$1], [destructor])])
-m4_define([b4_symbol_printer],    [b4_symbol_action([$1], [printer])])
-
-
-# b4_symbol_actions(KIND, [TYPE = yytype])
-# ----------------------------------------
-# Emit the symbol actions for KIND ("printer" or "destructor").
-# Dispatch on TYPE.
-m4_define([b4_symbol_actions],
-[m4_pushdef([b4_actions_], m4_expand([b4_symbol_foreach([b4_symbol_$1])]))dnl
-m4_ifval(m4_defn([b4_actions_]),
-[switch (m4_default([$2], [yytype]))
-    {
-      m4_defn([b4_actions_])
-      default:
-        break;
-    }dnl
-],
-[YYUSE (m4_default([$2], [yytype]));])dnl
-m4_popdef([b4_actions_])dnl
-])
-
-# b4_symbol_case_(SYMBOL-NUM)
-# ---------------------------
-# Issue a "case NUM" for SYMBOL-NUM.
-m4_define([b4_symbol_case_],
-[case b4_symbol([$1], [number]): b4_symbol_tag_comment([$1])])
-])
-
-
-# b4_symbol_foreach(MACRO)
-# ------------------------
-# Invoke MACRO(SYMBOL-NUM) for each SYMBOL-NUM.
-m4_define([b4_symbol_foreach],
-          [m4_map([$1], m4_defn([b4_symbol_numbers]))])
-
-# b4_symbol_map(MACRO)
-# --------------------
-# Return a list (possibly empty elements) of MACRO invoked for each
-# SYMBOL-NUM.
-m4_define([b4_symbol_map],
-[m4_map_args_sep([$1(], [)], [,], b4_symbol_numbers)])
-
-
-# b4_token_visible_if(NUM, IF-TRUE, IF-FALSE)
-# -------------------------------------------
-# Whether NUM denotes a token that has an exported definition (i.e.,
-# shows in enum yytokentype).
-m4_define([b4_token_visible_if],
-[b4_symbol_if([$1], [is_token],
-              [b4_symbol_if([$1], [has_id], [$2], [$3])],
-              [$3])])
-
-# b4_token_has_definition(NUM)
-# ----------------------------
-# 1 if NUM is visible, nothing otherwise.
-m4_define([b4_token_has_definition],
-[b4_token_visible_if([$1], [1])])
-
-# b4_any_token_visible_if([IF-TRUE], [IF-FALSE])
-# ----------------------------------------------
-# Whether there is a token that needs to be defined.
-m4_define([b4_any_token_visible_if],
-[m4_ifval(b4_symbol_foreach([b4_token_has_definition]),
-          [$1], [$2])])
-
-
-# b4_token_format(FORMAT, NUM)
-# ----------------------------
-m4_define([b4_token_format],
-[b4_token_visible_if([$2],
-[m4_quote(m4_format([$1],
-                     [b4_symbol([$2], [id])],
-                     [b4_symbol([$2], [user_number])]))])])
-
-
-## ------- ##
-## Types.  ##
-## ------- ##
-
-# b4_type_action_(NUMS)
-# ---------------------
-# Run actions for the symbol NUMS that all have the same type-name.
-# Skip NUMS that have no type-name.
-#
-# To specify the action to run, define b4_dollar_dollar(NUMBER,
-# TAG, TYPE).
-m4_define([b4_type_action_],
-[b4_symbol_if([$1], [has_type],
-[m4_map([      b4_symbol_case_], [$@])[]dnl
-        b4_dollar_dollar([b4_symbol([$1], [number])],
-                         [b4_symbol([$1], [tag])],
-                         [b4_symbol([$1], [type])]);
-        break;
-
-])])
-
-# b4_type_foreach(MACRO)
-# ----------------------
-# Invoke MACRO(SYMBOL-NUMS) for each set of SYMBOL-NUMS for each type set.
-m4_define([b4_type_foreach],
-          [m4_map([$1], m4_defn([b4_type_names]))])
-
-
-
-## ----------- ##
-## Synclines.  ##
-## ----------- ##
-
-# b4_basename(NAME)
-# -----------------
-# Similar to POSIX basename; the differences don't matter here.
-# Beware that NAME is not evaluated.
-m4_define([b4_basename],
-[m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])])
-
-
-# b4_syncline(LINE, FILE)
-# -----------------------
-m4_define([b4_syncline],
-[b4_flag_if([synclines],
-[b4_sync_start([$1], [$2]) b4_sync_end([__line__],
-                                       [b4_basename(m4_quote(__file__))])[]dnl
-])])
-
-# b4_sync_start(LINE, FILE)
-# -----------------------
-# Syncline for the new place.  Typically a directive for the compiler.
-m4_define([b4_sync_start], [b4_comment([$2:$1])])
-
-# b4_sync_end(LINE, FILE)
-# -----------------------
-# Syncline for the current place, which ends.  Typically a comment
-# left for the reader.
-m4_define([b4_sync_end],   [b4_comment([$2:$1])])
-
-
-# b4_user_code(USER-CODE)
-# -----------------------
-# Emit code from the user, ending it with synclines.
-m4_define([b4_user_code],
-[$1
-b4_syncline([@oline@], [@ofile@])])
-
-
-# b4_define_user_code(MACRO)
-# --------------------------
-# From b4_MACRO, build b4_user_MACRO that includes the synclines.
-m4_define([b4_define_user_code],
-[m4_define([b4_user_$1],
-[b4_user_code([b4_$1])])])
-
-
-# b4_user_actions
-# b4_user_initial_action
-# b4_user_post_prologue
-# b4_user_pre_prologue
-# b4_user_union_members
-# ----------------------
-# Macros that issue user code, ending with synclines.
-b4_define_user_code([actions])
-b4_define_user_code([initial_action])
-b4_define_user_code([post_prologue])
-b4_define_user_code([pre_prologue])
-b4_define_user_code([union_members])
-
-
-# b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE)
-# -----------------------------------------------------
-# Complain if any name of type WHAT is used by the user (as recorded in
-# USER-LIST) but is not used by Bison (as recorded by macros in the
-# namespace BISON-NAMESPACE).
-#
-# USER-LIST must expand to a list specifying all user occurrences of all names
-# of type WHAT.   Each item in the list must be a triplet specifying one
-# occurrence: name, start boundary, and end boundary.  Empty string names are
-# fine.  An empty list is fine.
-#
-# For example, to define b4_foo_user_names to be used for USER-LIST with three
-# name occurrences and with correct quoting:
-#
-#   m4_define([b4_foo_user_names],
-#             [[[[[[bar]], [[parser.y:1.7]], [[parser.y:1.16]]]],
-#               [[[[bar]], [[parser.y:5.7]], [[parser.y:5.16]]]],
-#               [[[[baz]], [[parser.y:8.7]], [[parser.y:8.16]]]]]])
-#
-# The macro BISON-NAMESPACE(bar) must be defined iff the name bar of type WHAT
-# is used by Bison (in the front-end or in the skeleton).  Empty string names
-# are fine, but it would be ugly for Bison to actually use one.
-#
-# For example, to use b4_foo_bison_names for BISON-NAMESPACE and define that
-# the names bar and baz are used by Bison:
-#
-#   m4_define([b4_foo_bison_names(bar)])
-#   m4_define([b4_foo_bison_names(baz)])
-#
-# To invoke b4_check_user_names with TYPE foo, with USER-LIST
-# b4_foo_user_names, with BISON-NAMESPACE b4_foo_bison_names, and with correct
-# quoting:
-#
-#   b4_check_user_names([[foo]], [b4_foo_user_names],
-#                       [[b4_foo_bison_names]])
-m4_define([b4_check_user_names],
-[m4_foreach([b4_occurrence], $2,
-[m4_pushdef([b4_occurrence], b4_occurrence)dnl
-m4_pushdef([b4_user_name], m4_car(b4_occurrence))dnl
-m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl
-m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl
-m4_ifndef($3[(]m4_quote(b4_user_name)[)],
-          [b4_complain_at([b4_start], [b4_end],
-                          [[%s '%s' is not used]],
-                          [$1], [b4_user_name])])[]dnl
-m4_popdef([b4_occurrence])dnl
-m4_popdef([b4_user_name])dnl
-m4_popdef([b4_start])dnl
-m4_popdef([b4_end])dnl
-])])
-
-
-
-## --------------------- ##
-## b4_percent_define_*.  ##
-## --------------------- ##
-
-
-# b4_percent_define_use(VARIABLE)
-# -------------------------------
-# Declare that VARIABLE was used.
-m4_define([b4_percent_define_use],
-[m4_define([b4_percent_define_bison_variables(]$1[)])dnl
-])
-
-# b4_percent_define_get(VARIABLE, [DEFAULT])
-# ------------------------------------------
-# Mimic muscle_percent_define_get in ../src/muscle-tab.h.  That is, if
-# the %define variable VARIABLE is defined, emit its value.  Contrary
-# to its C counterpart, return DEFAULT otherwise.  Also, record
-# Bison's usage of VARIABLE by defining
-# b4_percent_define_bison_variables(VARIABLE).
-#
-# For example:
-#
-#   b4_percent_define_get([[foo]])
-m4_define([b4_percent_define_get],
-[b4_percent_define_use([$1])dnl
-b4_percent_define_ifdef_([$1],
-                         [m4_indir([b4_percent_define(]$1[)])],
-                         [$2])])
-
-# b4_percent_define_get_loc(VARIABLE)
-# -----------------------------------
-# Mimic muscle_percent_define_get_loc in ../src/muscle-tab.h exactly.  That is,
-# if the %define variable VARIABLE is undefined, complain fatally since that's
-# a Bison or skeleton error.  Otherwise, return its definition location in a
-# form approriate for the first two arguments of b4_warn_at, b4_complain_at, or
-# b4_fatal_at.  Don't record this as a Bison usage of VARIABLE as there's no
-# reason to suspect that the user-supplied value has yet influenced the output.
-#
-# For example:
-#
-#   b4_complain_at(b4_percent_define_get_loc([[foo]]), [[invalid foo]])
-m4_define([b4_percent_define_get_loc],
-[m4_ifdef([b4_percent_define_loc(]$1[)],
-          [m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl
-b4_loc[]dnl
-m4_popdef([b4_loc])],
-          [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
-
-# b4_percent_define_get_kind(VARIABLE)
-# ------------------------------------
-# Get the kind (code, keyword, string) of VARIABLE, i.e., how its
-# value was defined (braces, not delimiters, quotes).
-#
-# If the %define variable VARIABLE is undefined, complain fatally
-# since that's a Bison or skeleton error.  Don't record this as a
-# Bison usage of VARIABLE as there's no reason to suspect that the
-# user-supplied value has yet influenced the output.
-m4_define([b4_percent_define_get_kind],
-[m4_ifdef([b4_percent_define_kind(]$1[)],
-          [m4_indir([b4_percent_define_kind(]$1[)])],
-          [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
-
-# b4_percent_define_get_syncline(VARIABLE)
-# ----------------------------------------
-# Mimic muscle_percent_define_get_syncline in ../src/muscle-tab.h exactly.
-# That is, if the %define variable VARIABLE is undefined, complain fatally
-# since that's a Bison or skeleton error.  Otherwise, return its definition
-# location as a b4_syncline invocation.  Don't record this as a Bison usage of
-# VARIABLE as there's no reason to suspect that the user-supplied value has yet
-# influenced the output.
-#
-# For example:
-#
-#   b4_percent_define_get_syncline([[foo]])
-m4_define([b4_percent_define_get_syncline],
-[m4_ifdef([b4_percent_define_syncline(]$1[)],
-          [m4_indir([b4_percent_define_syncline(]$1[)])],
-          [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
-
-# b4_percent_define_ifdef_(VARIABLE, IF-TRUE, [IF-FALSE])
-# ------------------------------------------------------
-# If the %define variable VARIABLE is defined, expand IF-TRUE, else expand
-# IF-FALSE.  Don't record usage of VARIABLE.
-#
-# For example:
-#
-#   b4_percent_define_ifdef_([[foo]], [[it's defined]], [[it's undefined]])
-m4_define([b4_percent_define_ifdef_],
-[m4_ifdef([b4_percent_define(]$1[)],
-          [$2],
-          [$3])])
-
-# b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE])
-# ------------------------------------------------------
-# Mimic muscle_percent_define_ifdef in ../src/muscle-tab.h exactly.  That is,
-# if the %define variable VARIABLE is defined, expand IF-TRUE, else expand
-# IF-FALSE.  Also, record Bison's usage of VARIABLE by defining
-# b4_percent_define_bison_variables(VARIABLE).
-#
-# For example:
-#
-#   b4_percent_define_ifdef([[foo]], [[it's defined]], [[it's undefined]])
-m4_define([b4_percent_define_ifdef],
-[b4_percent_define_ifdef_([$1],
-                         [b4_percent_define_use([$1])$2],
-                         [$3])])
-
-
-## --------- ##
-## Options.  ##
-## --------- ##
-
-
-# b4_percent_define_flag_if(VARIABLE, IF-TRUE, [IF-FALSE])
-# --------------------------------------------------------
-# Mimic muscle_percent_define_flag_if in ../src/muscle-tab.h exactly.  That is,
-# if the %define variable VARIABLE is defined to "" or "true", expand IF-TRUE.
-# If it is defined to "false", expand IF-FALSE.  Complain if it is undefined
-# (a Bison or skeleton error since the default value should have been set
-# already) or defined to any other value (possibly a user error).  Also, record
-# Bison's usage of VARIABLE by defining
-# b4_percent_define_bison_variables(VARIABLE).
-#
-# For example:
-#
-#   b4_percent_define_flag_if([[foo]], [[it's true]], [[it's false]])
-m4_define([b4_percent_define_flag_if],
-[b4_percent_define_ifdef([$1],
-  [m4_case(b4_percent_define_get([$1]),
-           [], [$2], [true], [$2], [false], [$3],
-           [m4_expand_once([b4_complain_at(b4_percent_define_get_loc([$1]),
-                                           [[invalid value for %%define Boolean variable '%s']],
-                                           [$1])],
-                           [[b4_percent_define_flag_if($1)]])])],
-  [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
-
-
-# b4_percent_define_default(VARIABLE, DEFAULT, [KIND = keyword])
-# --------------------------------------------------------------
-# Mimic muscle_percent_define_default in ../src/muscle-tab.h exactly.  That is,
-# if the %define variable VARIABLE is undefined, set its value to DEFAULT.
-# Don't record this as a Bison usage of VARIABLE as there's no reason to
-# suspect that the value has yet influenced the output.
-#
-# For example:
-#
-#   b4_percent_define_default([[foo]], [[default value]])
-m4_define([b4_percent_define_default],
-[b4_percent_define_ifdef_([$1], [],
-           [m4_define([b4_percent_define(]$1[)], [$2])dnl
-            m4_define([b4_percent_define_kind(]$1[)],
-                      [m4_default([$3], [keyword])])dnl
-            m4_define([b4_percent_define_loc(]$1[)],
-                      [[[[<skeleton default value>:-1.-1]],
-                        [[<skeleton default value>:-1.-1]]]])dnl
-            m4_define([b4_percent_define_syncline(]$1[)], [[]])])])
-
-
-# b4_percent_define_if_define(NAME, [VARIABLE = NAME])
-# ----------------------------------------------------
-# Define b4_NAME_if that executes its $1 or $2 depending whether
-# VARIABLE was %defined.  The characters '.' and `-' in VARIABLE are mapped
-# to '_'.
-m4_define([b4_percent_define_if_define_],
-[m4_define(m4_bpatsubst([b4_$1_if], [[-.]], [_]),
-           [b4_percent_define_flag_if(m4_default([$2], [$1]),
-                                      [$3], [$4])])])
-m4_define([b4_percent_define_if_define],
-[b4_percent_define_default([m4_default([$2], [$1])], [[false]])
-b4_percent_define_if_define_([$1], [$2], $[1], $[2])])
-
-
-# b4_percent_define_check_kind(VARIABLE, KIND, [DIAGNOSTIC = complain])
-# ---------------------------------------------------------------------
-m4_define([b4_percent_define_check_kind],
-[b4_percent_define_ifdef_([$1],
-  [m4_if(b4_percent_define_get_kind([$1]), [$2], [],
-    [b4_error([m4_default([$3], [complain])],
-              b4_percent_define_get_loc([$1]),
-              [m4_case([$2],
-                 [code], [[%%define variable '%s' requires '{...}' values]],
-                 [keyword], [[%%define variable '%s' requires keyword values]],
-                 [string], [[%%define variable '%s' requires '"..."' values]])],
-              [$1])])])dnl
-])
-
-
-# b4_percent_define_check_values(VALUES)
-# --------------------------------------
-# Mimic muscle_percent_define_check_values in ../src/muscle-tab.h exactly
-# except that the VALUES structure is more appropriate for M4.  That is, VALUES
-# is a list of sublists of strings.  For each sublist, the first string is the
-# name of a %define variable, and all remaining strings in that sublist are the
-# valid values for that variable.  Complain if such a variable is undefined (a
-# Bison error since the default value should have been set already) or defined
-# to any other value (possibly a user error).  Don't record this as a Bison
-# usage of the variable as there's no reason to suspect that the value has yet
-# influenced the output.
-#
-# For example:
-#
-#   b4_percent_define_check_values([[[[foo]], [[foo-value1]], [[foo-value2]]]],
-#                                  [[[[bar]], [[bar-value1]]]])
-m4_define([b4_percent_define_check_values],
-[m4_foreach([b4_sublist], m4_quote($@),
-            [_b4_percent_define_check_values(b4_sublist)])])
-
-m4_define([_b4_percent_define_check_values],
-[b4_percent_define_ifdef_([$1],
-  [b4_percent_define_check_kind(]$1[, [keyword], [deprecated])dnl
-   m4_pushdef([b4_good_value], [0])dnl
-   m4_if($#, 1, [],
-         [m4_foreach([b4_value], m4_dquote(m4_shift($@)),
-                     [m4_if(m4_indir([b4_percent_define(]$1[)]), b4_value,
-                            [m4_define([b4_good_value], [1])])])])dnl
-   m4_if(b4_good_value, [0],
-         [b4_complain_at(b4_percent_define_get_loc([$1]),
-                         [[invalid value for %%define variable '%s': '%s']],
-                         [$1],
-                         m4_dquote(m4_indir([b4_percent_define(]$1[)])))
-          m4_foreach([b4_value], m4_dquote(m4_shift($@)),
-                     [b4_error([[note]], b4_percent_define_get_loc([$1]), []
-                                     [[accepted value: '%s']],
-                                     m4_dquote(b4_value))])])dnl
-   m4_popdef([b4_good_value])],
-  [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
-
-# b4_percent_code_get([QUALIFIER])
-# --------------------------------
-# If any %code blocks for QUALIFIER are defined, emit them beginning with a
-# comment and ending with synclines and a newline.  If QUALIFIER is not
-# specified or empty, do this for the unqualified %code blocks.  Also, record
-# Bison's usage of QUALIFIER (if specified) by defining
-# b4_percent_code_bison_qualifiers(QUALIFIER).
-#
-# For example, to emit any unqualified %code blocks followed by any %code
-# blocks for the qualifier foo:
-#
-#   b4_percent_code_get
-#   b4_percent_code_get([[foo]])
-m4_define([b4_percent_code_get],
-[m4_pushdef([b4_macro_name], [[b4_percent_code(]$1[)]])dnl
-m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl
-m4_ifdef(b4_macro_name,
-[b4_comment([m4_if([$#], [0], [[Unqualified %code]],
-                   [["%code ]$1["]])[ blocks.]])
-b4_user_code([m4_indir(b4_macro_name)])
-])dnl
-m4_popdef([b4_macro_name])])
-
-# b4_percent_code_ifdef(QUALIFIER, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------
-# If any %code blocks for QUALIFIER (or unqualified %code blocks if
-# QUALIFIER is empty) are defined, expand IF-TRUE, else expand IF-FALSE.
-# Also, record Bison's usage of QUALIFIER (if specified) by defining
-# b4_percent_code_bison_qualifiers(QUALIFIER).
-m4_define([b4_percent_code_ifdef],
-[m4_ifdef([b4_percent_code(]$1[)],
-          [m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])$2],
-          [$3])])
-
-
-## ------------------ ##
-## Common variables.  ##
-## ------------------ ##
-
-
-# b4_parse_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
-# b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT])
-# b4_token_ctor_if([IF-YYLEX-RETURNS-A-TOKEN], [IF-NOT])
-# ----------------------------------------------
-b4_percent_define_if_define([token_ctor], [api.token.constructor])
-b4_percent_define_if_define([locations])     # Whether locations are tracked.
-b4_percent_define_if_define([parse.assert])
-b4_percent_define_if_define([parse.trace])
-
-
-# b4_bison_locations_if([IF-TRUE])
-# --------------------------------
-# Expand IF-TRUE if using locations, and using the default location
-# type.
-m4_define([b4_bison_locations_if],
-[b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], [$1])])])
-
-
-# b4_error_verbose_if([IF-ERRORS-ARE-VERBOSE], [IF-NOT])
-# ------------------------------------------------------
-# Map %define parse.error "(simple|verbose)" to b4_error_verbose_if and
-# b4_error_verbose_flag.
-b4_percent_define_default([[parse.error]], [[simple]])
-b4_percent_define_check_values([[[[parse.error]],
-                                 [[simple]], [[verbose]]]])
-m4_define([b4_error_verbose_flag],
-          [m4_case(b4_percent_define_get([[parse.error]]),
-                   [simple],  [[0]],
-                   [verbose], [[1]])])
-b4_define_flag_if([error_verbose])
-
-# yytoken_table is needed to support verbose errors.
-b4_error_verbose_if([m4_define([b4_token_table_flag], [1])])
-
-
-# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
-# ----------------------------------------------
-b4_percent_define_if_define([variant])
-m4_define([b4_variant_flag], [[0]])
-b4_percent_define_ifdef([[api.value.type]],
-   [m4_case(b4_percent_define_get_kind([[api.value.type]]), [keyword],
-            [m4_case(b4_percent_define_get([[api.value.type]]), [variant],
-                    [m4_define([b4_variant_flag], [[1]])])])])
-b4_define_flag_if([variant])
-
-
-## ----------------------------------------------------------- ##
-## After processing the skeletons, check that all the user's   ##
-## %define variables and %code qualifiers were used by Bison.  ##
-## ----------------------------------------------------------- ##
-
-m4_define([b4_check_user_names_wrap],
-[m4_ifdef([b4_percent_]$1[_user_]$2[s],
-          [b4_check_user_names([[%]$1 $2],
-                               [b4_percent_]$1[_user_]$2[s],
-                               [[b4_percent_]$1[_bison_]$2[s]])])])
-
-m4_wrap_lifo([
-b4_check_user_names_wrap([[define]], [[variable]])
-b4_check_user_names_wrap([[code]], [[qualifier]])
-])
-
-
-## ---------------- ##
-## Default values.  ##
-## ---------------- ##
-
-# m4_define_default([b4_lex_param], [])   dnl breaks other skeletons
-m4_define_default([b4_pre_prologue], [])
-m4_define_default([b4_post_prologue], [])
-m4_define_default([b4_epilogue], [])
-m4_define_default([b4_parse_param], [])
-
-# The initial column and line.
-m4_define_default([b4_location_initial_column], [1])
-m4_define_default([b4_location_initial_line],   [1])
-
-
-## --------------- ##
-## Sanity checks.  ##
-## --------------- ##
-
-# api.location.prefix={...} (Java and C++).
-b4_percent_define_check_kind([api.location.type], [code], [deprecated])
-
-# api.position.prefix={...} (Java).
-b4_percent_define_check_kind([api.position.type], [code], [deprecated])
-
-# api.prefix >< %name-prefix.
-b4_percent_define_check_kind([api.prefix], [code], [deprecated])
-b4_percent_define_ifdef([api.prefix],
-[m4_ifdef([b4_prefix],
-[b4_complain_at(b4_percent_define_get_loc([api.prefix]),
-                [['%s' and '%s' cannot be used together]],
-                [%name-prefix],
-                [%define api.prefix])])])
-
-# api.token.prefix={...}
-# Make it a warning for those who used betas of Bison 3.0.
-b4_percent_define_check_kind([api.token.prefix], [code], [deprecated])
-
-# api.value.type >< %union.
-b4_percent_define_ifdef([api.value.type],
-[m4_ifdef([b4_union_members],
-[b4_complain_at(b4_percent_define_get_loc([api.value.type]),
-                [['%s' and '%s' cannot be used together]],
-                [%union],
-                [%define api.value.type])])])
-
-# api.value.type=union >< %yacc.
-b4_percent_define_ifdef([api.value.type],
-[m4_if(b4_percent_define_get([api.value.type]), [union],
-[b4_yacc_if(dnl
-[b4_complain_at(b4_percent_define_get_loc([api.value.type]),
-                [['%s' and '%s' cannot be used together]],
-                [%yacc],
-                [%define api.value.type "union"])])])])
diff --git a/contrib/tools/bison/bison/data/c-like.m4 b/contrib/tools/bison/bison/data/c-like.m4
deleted file mode 100644
index eb06de2a4d..0000000000
--- a/contrib/tools/bison/bison/data/c-like.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# Common code for C-like languages (C, C++, Java, etc.)
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# b4_comment_(TEXT, OPEN, CONTINUE, END)
-# --------------------------------------
-# Put TEXT in comment.  Avoid trailing spaces: don't indent empty lines.
-# Avoid adding indentation to the first line, as the indentation comes
-# from OPEN.  That's why we don't patsubst([$1], [^\(.\)], [   \1]).
-#
-# Prefix all the output lines with PREFIX.
-m4_define([b4_comment_],
-[$2[]m4_bpatsubst(m4_expand([[$1]]), [
-\(.\)], [
-$3\1])$4])
-
-
-# b4_comment(TEXT, [PREFIX])
-# --------------------------
-# Put TEXT in comment.  Prefix all the output lines with PREFIX.
-m4_define([b4_comment],
-[b4_comment_([$1], [$2/* ], [$2   ], [  */])])
-
-
-
-
-# b4_dollar_dollar_(VALUE, FIELD, DEFAULT-FIELD)
-# ----------------------------------------------
-# If FIELD (or DEFAULT-FIELD) is non-null, return "VALUE.FIELD",
-# otherwise just VALUE.  Be sure to pass "(VALUE)" is VALUE is a
-# pointer.
-m4_define([b4_dollar_dollar_],
-[b4_symbol_value([$1],
-                 m4_if([$2], [[]],
-                       [[$3]], [[$2]]))])
-
-# b4_dollar_pushdef(VALUE-POINTER, DEFAULT-FIELD, LOCATION)
-# b4_dollar_popdef
-# ---------------------------------------------------------
-# Define b4_dollar_dollar for VALUE and DEFAULT-FIELD,
-# and b4_at_dollar for LOCATION.
-m4_define([b4_dollar_pushdef],
-[m4_pushdef([b4_dollar_dollar],
-            [b4_dollar_dollar_([$1], m4_dquote($][1), [$2])])dnl
-m4_pushdef([b4_at_dollar], [$3])dnl
-])
-m4_define([b4_dollar_popdef],
-[m4_popdef([b4_at_dollar])dnl
-m4_popdef([b4_dollar_dollar])dnl
-])
diff --git a/contrib/tools/bison/bison/data/c-skel.m4 b/contrib/tools/bison/bison/data/c-skel.m4
deleted file mode 100644
index 36904aaf7b..0000000000
--- a/contrib/tools/bison/bison/data/c-skel.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# C skeleton dispatching for Bison.
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-b4_glr_if(             [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
-b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.c]])])
-
-m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[yacc.c]])
-m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
-
-m4_include(b4_used_skeleton)
diff --git a/contrib/tools/bison/bison/data/c.m4 b/contrib/tools/bison/bison/data/c.m4
deleted file mode 100644
index b1b4394871..0000000000
--- a/contrib/tools/bison/bison/data/c.m4
+++ /dev/null
@@ -1,839 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# C M4 Macros for Bison.
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-m4_include(b4_pkgdatadir/[c-like.m4])
-
-# b4_tocpp(STRING)
-# ----------------
-# Convert STRING into a valid C macro name.
-m4_define([b4_tocpp],
-[m4_toupper(m4_bpatsubst(m4_quote($1), [[^a-zA-Z0-9]+], [_]))])
-
-
-# b4_cpp_guard(FILE)
-# ------------------
-# A valid C macro name to use as a CPP header guard for FILE.
-m4_define([b4_cpp_guard],
-[[YY_]b4_tocpp(m4_defn([b4_prefix])/[$1])[_INCLUDED]])
-
-
-# b4_cpp_guard_open(FILE)
-# b4_cpp_guard_close(FILE)
-# ------------------------
-# If FILE does not expand to nothing, open/close CPP inclusion guards for FILE.
-m4_define([b4_cpp_guard_open],
-[m4_ifval(m4_quote($1),
-[#ifndef b4_cpp_guard([$1])
-# define b4_cpp_guard([$1])])])
-
-m4_define([b4_cpp_guard_close],
-[m4_ifval(m4_quote($1),
-[#endif b4_comment([!b4_cpp_guard([$1])])])])
-
-
-## ---------------- ##
-## Identification.  ##
-## ---------------- ##
-
-# b4_identification
-# -----------------
-# Depends on individual skeletons to define b4_pure_flag, b4_push_flag, or
-# b4_pull_flag if they use the values of the %define variables api.pure or
-# api.push-pull.
-m4_define([b4_identification],
-[[/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "]b4_version["
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME ]b4_skeleton[]m4_ifdef([b4_pure_flag], [[
-
-/* Pure parsers.  */
-#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[
-
-/* Push parsers.  */
-#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[
-
-/* Pull parsers.  */
-#define YYPULL ]b4_pull_flag])[
-]])
-
-
-## ---------------- ##
-## Default values.  ##
-## ---------------- ##
-
-# b4_api_prefix, b4_api_PREFIX
-# ----------------------------
-# Corresponds to %define api.prefix
-b4_percent_define_default([[api.prefix]], [[yy]])
-m4_define([b4_api_prefix],
-[b4_percent_define_get([[api.prefix]])])
-m4_define([b4_api_PREFIX],
-[m4_toupper(b4_api_prefix)])
-
-
-# b4_prefix
-# ---------
-# If the %name-prefix is not given, it is api.prefix.
-m4_define_default([b4_prefix], [b4_api_prefix])
-
-# If the %union is not named, its name is YYSTYPE.
-m4_define_default([b4_union_name], [b4_api_PREFIX[]STYPE])
-
-
-## ------------------------ ##
-## Pure/impure interfaces.  ##
-## ------------------------ ##
-
-# b4_lex_formals
-# --------------
-# All the yylex formal arguments.
-# b4_lex_param arrives quoted twice, but we want to keep only one level.
-m4_define([b4_lex_formals],
-[b4_pure_if([[[[YYSTYPE *yylvalp]], [[&yylval]]][]dnl
-b4_locations_if([, [[YYLTYPE *yyllocp], [&yylloc]]])])dnl
-m4_ifdef([b4_lex_param], [, ]b4_lex_param)])
-
-
-# b4_lex
-# ------
-# Call yylex.
-m4_define([b4_lex],
-[b4_function_call([yylex], [int], b4_lex_formals)])
-
-
-# b4_user_args
-# ------------
-m4_define([b4_user_args],
-[m4_ifset([b4_parse_param], [, b4_args(b4_parse_param)])])
-
-
-# b4_parse_param
-# --------------
-# If defined, b4_parse_param arrives double quoted, but below we prefer
-# it to be single quoted.
-m4_define([b4_parse_param],
-b4_parse_param)
-
-
-# b4_parse_param_for(DECL, FORMAL, BODY)
-# ---------------------------------------
-# Iterate over the user parameters, binding the declaration to DECL,
-# the formal name to FORMAL, and evaluating the BODY.
-m4_define([b4_parse_param_for],
-[m4_foreach([$1_$2], m4_defn([b4_parse_param]),
-[m4_pushdef([$1], m4_unquote(m4_car($1_$2)))dnl
-m4_pushdef([$2], m4_shift($1_$2))dnl
-$3[]dnl
-m4_popdef([$2])dnl
-m4_popdef([$1])dnl
-])])
-
-# b4_parse_param_use([VAL], [LOC])
-# --------------------------------
-# 'YYUSE' VAL, LOC if locations are enabled, and all the parse-params.
-m4_define([b4_parse_param_use],
-[m4_ifvaln([$1], [  YYUSE ([$1]);])dnl
-b4_locations_if([m4_ifvaln([$2], [  YYUSE ([$2]);])])dnl
-b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);
-])dnl
-])
-
-
-## ------------ ##
-## Data Types.  ##
-## ------------ ##
-
-# b4_int_type(MIN, MAX)
-# ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# MIN to MAX (included).
-m4_define([b4_int_type],
-[m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
-       b4_ints_in($@,   [-128],   [127]), [1], [signed char],
-
-       b4_ints_in($@,      [0], [65535]), [1], [unsigned short int],
-       b4_ints_in($@, [-32768], [32767]), [1], [short int],
-
-       m4_eval([0 <= $1]),                [1], [unsigned int],
-
-                                               [int])])
-
-
-# b4_int_type_for(NAME)
-# ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# 'NAME_min' to 'NAME_max' (included).
-m4_define([b4_int_type_for],
-[b4_int_type($1_min, $1_max)])
-
-
-# b4_table_value_equals(TABLE, VALUE, LITERAL)
-# --------------------------------------------
-# Without inducing a comparison warning from the compiler, check if the
-# literal value LITERAL equals VALUE from table TABLE, which must have
-# TABLE_min and TABLE_max defined.
-m4_define([b4_table_value_equals],
-[m4_if(m4_eval($3 < m4_indir([b4_]$1[_min])
-               || m4_indir([b4_]$1[_max]) < $3), [1],
-       [[0]],
-       [(!!(($2) == ($3)))])])
-
-
-## ----------------- ##
-## 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
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-])
-
-
-## ---------##
-## Values.  ##
-## ---------##
-
-
-# b4_null_define
-# --------------
-# Portability issues: define a YY_NULL appropriate for the current
-# language (C, C++98, or C++11).
-m4_define([b4_null_define],
-[# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif[]dnl
-])
-
-
-# b4_null
-# -------
-# Return a null pointer constant.
-m4_define([b4_null], [YY_NULL])
-
-# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
-# -------------------------------------------------------------
-# Define "yy<TABLE-NAME>" whose contents is CONTENT.
-m4_define([b4_integral_parser_table_define],
-[m4_ifvaln([$3], [b4_comment([$3], [  ])])dnl
-static const b4_int_type_for([$2]) yy$1[[]] =
-{
-  $2
-};dnl
-])
-
-
-## ------------------------- ##
-## Assigning token numbers.  ##
-## ------------------------- ##
-
-# b4_token_define(TOKEN-NUM)
-# --------------------------
-# Output the definition of this token as #define.
-m4_define([b4_token_define],
-[b4_token_format([#define %s %s], [$1])])
-
-# b4_token_defines
-# ----------------
-# Output the definition of the tokens.
-m4_define([b4_token_defines],
-[b4_any_token_visible_if([/* Tokens.  */
-m4_join([
-], b4_symbol_map([b4_token_define]))
-])])
-
-
-# b4_token_enum(TOKEN-NUM)
-# ------------------------
-# Output the definition of this token as an enum.
-m4_define([b4_token_enum],
-[b4_token_format([%s = %s], [$1])])
-
-
-# b4_token_enums
-# --------------
-# Output the definition of the tokens (if there are) as enums.
-m4_define([b4_token_enums],
-[b4_any_token_visible_if([[/* Token type.  */
-#ifndef ]b4_api_PREFIX[TOKENTYPE
-# define ]b4_api_PREFIX[TOKENTYPE
-  enum ]b4_api_prefix[tokentype
-  {
-    ]m4_join([,
-    ],
-             b4_symbol_map([b4_token_enum]))[
-  };
-#endif
-]])])
-
-
-# b4_token_enums_defines
-# ----------------------
-# Output the definition of the tokens (if there are any) as enums and,
-# if POSIX Yacc is enabled, as #defines.
-m4_define([b4_token_enums_defines],
-[b4_token_enums[]b4_yacc_if([b4_token_defines])])
-
-
-## ----------------- ##
-## Semantic Values.  ##
-## ----------------- ##
-
-
-# b4_symbol_value(VAL, [TYPE])
-# ----------------------------
-# Given a semantic value VAL ($$, $1 etc.), extract its value of type
-# TYPE if TYPE is given, otherwise just return VAL.  The result can be
-# used safetly, it is put in parens to avoid nasty precedence issues.
-# TYPE is *not* put in braces, provide some if needed.
-m4_define([b4_symbol_value],
-[($1[]m4_ifval([$2], [.$2]))])
-
-
-
-## ---------------------- ##
-## Defining C functions.  ##
-## ---------------------- ##
-
-
-# b4_function_define(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
-# -----------------------------------------------------------
-# Declare the function NAME in C.
-m4_define([b4_function_define],
-[$2
-$1 (b4_formals(m4_shift2($@)))[]dnl
-])
-
-
-# b4_formals([DECL1, NAME1], ...)
-# -------------------------------
-# The formal arguments of a C function definition.
-m4_define([b4_formals],
-[m4_if([$#], [0], [void],
-       [$#$1], [1], [void],
-               [m4_map_sep([b4_formal], [, ], [$@])])])
-
-m4_define([b4_formal],
-[$1])
-
-
-
-## ----------------------- ##
-## Declaring C functions.  ##
-## ----------------------- ##
-
-
-# b4_function_declare(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
-# ------------------------------------------------------------
-# Declare the function NAME.
-m4_define([b4_function_declare],
-[$2 $1 (b4_formals(m4_shift2($@)));[]dnl
-])
-
-
-
-
-## --------------------- ##
-## Calling C functions.  ##
-## --------------------- ##
-
-
-# b4_function_call(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
-# -----------------------------------------------------------
-# Call the function NAME with arguments NAME1, NAME2 etc.
-m4_define([b4_function_call],
-[$1 (b4_args(m4_shift2($@)))[]dnl
-])
-
-
-# b4_args([DECL1, NAME1], ...)
-# ----------------------------
-# Output the arguments NAME1, NAME2...
-m4_define([b4_args],
-[m4_map_sep([b4_arg], [, ], [$@])])
-
-m4_define([b4_arg],
-[$2])
-
-
-## ----------- ##
-## Synclines.  ##
-## ----------- ##
-
-# b4_sync_start(LINE, FILE)
-# -------------------------
-m4_define([b4_sync_start], [[#]line $1 $2])
-
-
-## -------------- ##
-## User actions.  ##
-## -------------- ##
-
-# b4_case(LABEL, STATEMENTS)
-# --------------------------
-m4_define([b4_case],
-[  case $1:
-$2
-b4_syncline([@oline@], [@ofile@])
-    break;])
-
-
-# b4_predicate_case(LABEL, CONDITIONS)
-# ------------------------------------
-m4_define([b4_predicate_case],
-[  case $1:
-    if (! ($2)) YYERROR;
-b4_syncline([@oline@], [@ofile@])
-    break;])
-
-
-# b4_yydestruct_define
-# --------------------
-# Define the "yydestruct" function.
-m4_define_default([b4_yydestruct_define],
-[[/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-]b4_function_define([yydestruct],
-    [static void],
-    [[const char *yymsg],    [yymsg]],
-    [[int yytype],           [yytype]],
-    [[YYSTYPE *yyvaluep],    [yyvaluep]][]dnl
-b4_locations_if(            [, [[YYLTYPE *yylocationp], [yylocationp]]])[]dnl
-m4_ifset([b4_parse_param], [, b4_parse_param]))[
-{
-]b4_parse_param_use([yyvaluep], [yylocationp])dnl
-[  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  ]b4_symbol_actions([destructor])[
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}]dnl
-])
-
-
-# b4_yy_symbol_print_define
-# -------------------------
-# Define the "yy_symbol_print" function.
-m4_define_default([b4_yy_symbol_print_define],
-[[
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
-
-]b4_function_define([yy_symbol_value_print],
-    [static void],
-               [[FILE *yyoutput],                       [yyoutput]],
-               [[int yytype],                           [yytype]],
-               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl
-b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl
-m4_ifset([b4_parse_param], [, b4_parse_param]))[
-{
-  FILE *yyo = yyoutput;
-]b4_parse_param_use([yyo], [yylocationp])dnl
-[  if (!yyvaluep)
-    return;]
-dnl glr.c does not feature yytoknum.
-m4_if(b4_skeleton, ["yacc.c"],
-[[# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-]])dnl
-  b4_symbol_actions([printer])[
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-]b4_function_define([yy_symbol_print],
-    [static void],
-               [[FILE *yyoutput],                       [yyoutput]],
-               [[int yytype],                           [yytype]],
-               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl
-b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl
-m4_ifset([b4_parse_param], [, b4_parse_param]))[
-{
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
-
-]b4_locations_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPRINTF (yyoutput, ": ");
-])dnl
-[  yy_symbol_value_print (yyoutput, yytype, yyvaluep]dnl
-b4_locations_if([, yylocationp])[]b4_user_args[);
-  YYFPRINTF (yyoutput, ")");
-}]dnl
-])
-
-
-## ---------------- ##
-## api.value.type.  ##
-## ---------------- ##
-
-
-# ---------------------- #
-# api.value.type=union.  #
-# ---------------------- #
-
-# b4_symbol_type_register(SYMBOL-NUM)
-# -----------------------------------
-# Symbol SYMBOL-NUM has a type (for variant) instead of a type-tag.
-# Extend the definition of %union's body with a field of that type,
-# and extend the symbol's "type" field to point to the field name,
-# instead of the type name.
-m4_define([b4_symbol_type_register],
-[m4_define([b4_symbol($1, type_tag)],
-           [b4_symbol_if([$1], [has_id],
-                         [b4_symbol([$1], [id])],
-                         [yytype_[]b4_symbol([$1], [number])])])dnl
-m4_append([b4_user_union_members],
-m4_expand([
-  b4_symbol_tag_comment([$1])dnl
-  b4_symbol([$1], [type]) b4_symbol([$1], [type_tag]);]))
-])
-
-
-# b4_type_define_tag(SYMBOL1-NUM, ...)
-# ------------------------------------
-# For the batch of symbols SYMBOL1-NUM... (which all have the same
-# type), enhance the %union definition for each of them, and set
-# there "type" field to the field tag name, instead of the type name.
-m4_define([b4_type_define_tag],
-[b4_symbol_if([$1], [has_type],
-              [m4_map([b4_symbol_type_register], [$@])])
-])
-
-
-# b4_symbol_value_union(VAL, [TYPE])
-# ----------------------------------
-# Same of b4_symbol_value, but when api.value.type=union.
-m4_define([b4_symbol_value_union],
-[m4_ifval([$2],
-          [(*($2*)(&$1))],
-          [$1])])
-])
-
-
-# b4_value_type_setup_union
-# -------------------------
-# Setup support for api.value.type=union.  Symbols are defined with a
-# type instead of a union member name: build the corresponding union,
-# and give the symbols their tag.
-m4_define([b4_value_type_setup_union],
-[m4_define([b4_union_members])
-b4_type_foreach([b4_type_define_tag])
-m4_copy_force([b4_symbol_value_union], [b4_symbol_value])
-])
-
-
-# ---------------- #
-# api.value.type.  #
-# ---------------- #
-
-
-# b4_value_type_setup_variant
-# ---------------------------
-# Setup support for api.value.type=variant.  By default, fail, specialized
-# by other skeletons.
-m4_define([b4_value_type_setup_variant],
-[b4_complain_at(b4_percent_define_get_loc([[api.value.type]]),
-                [['%s' does not support '%s']],
-                [b4_skeleton],
-                [%define api.value.type variant])])
-
-
-# _b4_value_type_setup_keyword
-# ----------------------------
-# api.value.type is defined with a keyword/string syntax.  Check if
-# that is properly defined, and prepare its use.
-m4_define([_b4_value_type_setup_keyword],
-[b4_percent_define_check_values([[[[api.value.type]],
-                                  [[none]],
-                                  [[union]],
-                                  [[union-directive]],
-                                  [[variant]],
-                                  [[yystype]]]])dnl
-m4_case(b4_percent_define_get([[api.value.type]]),
-        [union],   [b4_value_type_setup_union],
-        [variant], [b4_value_type_setup_variant])])
-
-
-# b4_value_type_setup
-# -------------------
-# Check if api.value.type is properly defined, and possibly prepare
-# its use.
-b4_define_silent([b4_value_type_setup],
-[# Define default value.
-b4_percent_define_ifdef([[api.value.type]], [],
-[# %union => api.value.type=union-directive
-m4_ifdef([b4_union_members],
-[m4_define([b4_percent_define_kind(api.value.type)], [keyword])
-m4_define([b4_percent_define(api.value.type)], [union-directive])],
-[# no tag seen => api.value.type={int}
-m4_if(b4_tag_seen_flag, 0,
-[m4_define([b4_percent_define_kind(api.value.type)], [code])
-m4_define([b4_percent_define(api.value.type)], [int])],
-[# otherwise api.value.type=yystype
-m4_define([b4_percent_define_kind(api.value.type)], [keyword])
-m4_define([b4_percent_define(api.value.type)], [yystype])])])])
-
-# Set up.
-m4_bmatch(b4_percent_define_get_kind([[api.value.type]]),
-   [keyword\|string], [_b4_value_type_setup_keyword])
-])
-
-
-## -------------- ##
-## Declarations.  ##
-## -------------- ##
-
-
-# b4_value_type_define
-# --------------------
-m4_define([b4_value_type_define],
-[b4_value_type_setup[]dnl
-/* Value type.  */
-m4_bmatch(b4_percent_define_get_kind([[api.value.type]]),
-[code],
-[[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED
-typedef ]b4_percent_define_get([[api.value.type]])[ ]b4_api_PREFIX[STYPE;
-# define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1
-# define ]b4_api_PREFIX[STYPE_IS_DECLARED 1
-#endif
-]],
-[m4_bmatch(b4_percent_define_get([[api.value.type]]),
-[union\|union-directive],
-[[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED
-typedef union ]b4_union_name[ ]b4_api_PREFIX[STYPE;
-union ]b4_union_name[
-{
-]b4_user_union_members[
-};
-# define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1
-# define ]b4_api_PREFIX[STYPE_IS_DECLARED 1
-#endif
-]])])])
-
-
-# b4_location_type_define
-# -----------------------
-m4_define([b4_location_type_define],
-[[/* Location type.  */
-#if ! defined ]b4_api_PREFIX[LTYPE && ! defined ]b4_api_PREFIX[LTYPE_IS_DECLARED
-typedef struct ]b4_api_PREFIX[LTYPE ]b4_api_PREFIX[LTYPE;
-struct ]b4_api_PREFIX[LTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define ]b4_api_PREFIX[LTYPE_IS_DECLARED 1
-# define ]b4_api_PREFIX[LTYPE_IS_TRIVIAL 1
-#endif
-]])
-
-
-# b4_declare_yylstype
-# -------------------
-# Declarations that might either go into the header (if --defines) or
-# in the parser body.  Declare YYSTYPE/YYLTYPE, and yylval/yylloc.
-m4_define([b4_declare_yylstype],
-[b4_value_type_define[]b4_locations_if([
-b4_location_type_define])
-
-b4_pure_if([], [[extern ]b4_api_PREFIX[STYPE ]b4_prefix[lval;
-]b4_locations_if([[extern ]b4_api_PREFIX[LTYPE ]b4_prefix[lloc;]])])[]dnl
-])
-
-
-# b4_YYDEBUG_define
-# -----------------
-m4_define([b4_YYDEBUG_define],
-[[/* Debug traces.  */
-]m4_if(b4_api_prefix, [yy],
-[[#ifndef YYDEBUG
-# define YYDEBUG ]b4_parse_trace_if([1], [0])[
-#endif]],
-[[#ifndef ]b4_api_PREFIX[DEBUG
-# if defined YYDEBUG
-#if YYDEBUG
-#   define ]b4_api_PREFIX[DEBUG 1
-#  else
-#   define ]b4_api_PREFIX[DEBUG 0
-#  endif
-# else /* ! defined YYDEBUG */
-#  define ]b4_api_PREFIX[DEBUG ]b4_parse_trace_if([1], [0])[
-# endif /* ! defined YYDEBUG */
-#endif  /* ! defined ]b4_api_PREFIX[DEBUG */]])[]dnl
-])
-
-# b4_declare_yydebug
-# ------------------
-m4_define([b4_declare_yydebug],
-[b4_YYDEBUG_define[
-#if ]b4_api_PREFIX[DEBUG
-extern int ]b4_prefix[debug;
-#endif][]dnl
-])
-
-# b4_yylloc_default_define
-# ------------------------
-# Define YYLLOC_DEFAULT.
-m4_define([b4_yylloc_default_define],
-[[/* 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).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (N)                                                            \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
-    while (0)
-#endif
-]])
-
-# b4_yy_location_print_define
-# ---------------------------
-# Define YY_LOCATION_PRINT.
-m4_define([b4_yy_location_print_define],
-[b4_locations_if([[
-/* 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.  */
-
-#ifndef YY_LOCATION_PRINT
-# if defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL
-
-/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
-
-__attribute__((__unused__))
-]b4_function_define([yy_location_print_],
-    [static unsigned],
-               [[FILE *yyo],                    [yyo]],
-               [[YYLTYPE const * const yylocp], [yylocp]])[
-{
-  unsigned res = 0;
-  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
-  if (0 <= yylocp->first_line)
-    {
-      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
-      if (0 <= yylocp->first_column)
-        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
-    }
-  if (0 <= yylocp->last_line)
-    {
-      if (yylocp->first_line < yylocp->last_line)
-        {
-          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
-          if (0 <= end_col)
-            res += YYFPRINTF (yyo, ".%d", end_col);
-        }
-      else if (0 <= end_col && yylocp->first_column < end_col)
-        res += YYFPRINTF (yyo, "-%d", end_col);
-    }
-  return res;
- }
-
-#  define YY_LOCATION_PRINT(File, Loc)          \
-  yy_location_print_ (File, &(Loc))
-
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif]],
-[[/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif]])
-])
-
-# b4_yyloc_default
-# ----------------
-# Expand to a possible default value for yylloc.
-m4_define([b4_yyloc_default],
-[[
-# if defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL
-  = { ]m4_join([, ],
-               m4_defn([b4_location_initial_line]),
-               m4_defn([b4_location_initial_column]),
-               m4_defn([b4_location_initial_line]),
-               m4_defn([b4_location_initial_column]))[ }
-# endif
-]])
diff --git a/contrib/tools/bison/bison/data/glr.c b/contrib/tools/bison/bison/data/glr.c
deleted file mode 100644
index ff70890f33..0000000000
--- a/contrib/tools/bison/bison/data/glr.c
+++ /dev/null
@@ -1,2563 +0,0 @@
-                                                                    -*- C -*-
-
-# GLR skeleton for Bison
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# If we are loaded by glr.cc, do not override c++.m4 definitions by
-# those of c.m4.
-m4_if(b4_skeleton, ["glr.c"],
-      [m4_include(b4_pkgdatadir/[c.m4])])
-
-## ---------------- ##
-## Default values.  ##
-## ---------------- ##
-
-# Stack parameters.
-m4_define_default([b4_stack_depth_max], [10000])
-m4_define_default([b4_stack_depth_init],  [200])
-
-
-
-## ------------------------ ##
-## Pure/impure interfaces.  ##
-## ------------------------ ##
-
-b4_define_flag_if([pure])
-# If glr.cc is including this file and thus has already set b4_pure_flag,
-# do not change the value of b4_pure_flag, and do not record a use of api.pure.
-m4_ifndef([b4_pure_flag],
-[b4_percent_define_default([[api.pure]], [[false]])
- m4_define([b4_pure_flag],
-           [b4_percent_define_flag_if([[api.pure]], [[1]], [[0]])])])
-
-# b4_user_formals
-# ---------------
-# The possible parse-params formal arguments preceded by a comma.
-#
-# This is not shared with yacc.c in c.m4 because  GLR relies on ISO C
-# formal argument declarations.
-m4_define([b4_user_formals],
-[m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])])
-
-
-# b4_yyerror_args
-# ---------------
-# Optional effective arguments passed to yyerror: user args plus yylloc, and
-# a trailing comma.
-m4_define([b4_yyerror_args],
-[b4_pure_if([b4_locations_if([yylocp, ])])dnl
-m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])])
-
-
-# b4_lyyerror_args
-# ----------------
-# Same as above, but on the lookahead, hence &yylloc instead of yylocp.
-m4_define([b4_lyyerror_args],
-[b4_pure_if([b4_locations_if([&yylloc, ])])dnl
-m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])])
-
-
-# b4_pure_args
-# ------------
-# Same as b4_yyerror_args, but with a leading comma.
-m4_define([b4_pure_args],
-[b4_pure_if([b4_locations_if([, yylocp])])[]b4_user_args])
-
-
-# b4_lpure_args
-# -------------
-# Same as above, but on the lookahead, hence &yylloc instead of yylocp.
-m4_define([b4_lpure_args],
-[b4_pure_if([b4_locations_if([, &yylloc])])[]b4_user_args])
-
-
-
-# b4_pure_formals
-# ---------------
-# Arguments passed to yyerror: user formals plus yylocp with leading comma.
-m4_define([b4_pure_formals],
-[b4_pure_if([b4_locations_if([, YYLTYPE *yylocp])])[]b4_user_formals])
-
-
-# b4_locuser_formals(LOC = yylocp)
-# --------------------------------
-m4_define([b4_locuser_formals],
-[b4_locations_if([, YYLTYPE *m4_default([$1], [yylocp])])[]b4_user_formals])
-
-
-# b4_locuser_args(LOC = yylocp)
-# -----------------------------
-m4_define([b4_locuser_args],
-[b4_locations_if([, m4_default([$1], [yylocp])])[]b4_user_args])
-
-
-
-## ----------------- ##
-## Semantic Values.  ##
-## ----------------- ##
-
-
-# b4_lhs_value([TYPE])
-# --------------------
-# Expansion of $<TYPE>$.
-m4_define([b4_lhs_value],
-[b4_symbol_value([(*yyvalp)], [$1])])
-
-
-# b4_rhs_data(RULE-LENGTH, NUM)
-# -----------------------------
-# Expand to the semantic stack place that contains value and location
-# of symbol number NUM in a rule of length RULE-LENGTH.
-m4_define([b4_rhs_data],
-[((yyGLRStackItem const *)yyvsp)@{YYFILL (b4_subtract([$2], [$1]))@}.yystate])
-
-
-# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
-# --------------------------------------
-# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
-# symbols on RHS.
-m4_define([b4_rhs_value],
-[b4_symbol_value([b4_rhs_data([$1], [$2]).yysemantics.yysval], [$3])])
-
-
-
-## ----------- ##
-## Locations.  ##
-## ----------- ##
-
-# b4_lhs_location()
-# -----------------
-# Expansion of @$.
-m4_define([b4_lhs_location],
-[(*yylocp)])
-
-
-# b4_rhs_location(RULE-LENGTH, NUM)
-# ---------------------------------
-# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
-# on RHS.
-m4_define([b4_rhs_location],
-[(b4_rhs_data([$1], [$2]).yyloc)])
-
-
-## -------------- ##
-## Declarations.  ##
-## -------------- ##
-
-# b4_shared_declarations
-# ----------------------
-# Declaration that might either go into the header (if --defines)
-# or open coded in the parser body.  glr.cc has its own definition.
-m4_if(b4_skeleton, ["glr.c"],
-[m4_define([b4_shared_declarations],
-[b4_declare_yydebug[
-]b4_percent_code_get([[requires]])[
-]b4_token_enums[
-]b4_declare_yylstype[
-]b4_function_declare(b4_prefix[parse], [int], b4_parse_param)[
-]b4_percent_code_get([[provides]])[]dnl
-])
-])
-
-## -------------- ##
-## Output files.  ##
-## -------------- ##
-
-b4_output_begin([b4_parser_file_name])
-b4_copyright([Skeleton implementation for Bison GLR parsers in C],
-             [2002-2013])[
-
-/* C GLR parser skeleton written by Paul Hilfinger.  */
-
-]b4_identification
-
-b4_percent_code_get([[top]])[
-]m4_if(b4_api_prefix, [yy], [],
-[[/* Substitute the type names.  */
-#define YYSTYPE ]b4_api_PREFIX[STYPE]b4_locations_if([[
-#define YYLTYPE ]b4_api_PREFIX[LTYPE]])])[
-]m4_if(b4_prefix, [yy], [],
-[[/* Substitute the variable and function names.  */
-#define yyparse ]b4_prefix[parse
-#define yylex   ]b4_prefix[lex
-#define yyerror ]b4_prefix[error
-#define yydebug ]b4_prefix[debug
-]]b4_pure_if([], [[
-#define yylval  ]b4_prefix[lval
-#define yychar  ]b4_prefix[char
-#define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
-#define yylloc  ]b4_prefix[lloc]])]))[
-
-/* First part of user declarations.  */
-]b4_user_pre_prologue[
-
-]b4_null_define[
-
-]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
-               [b4_shared_declarations])[
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE ]b4_error_verbose_if([1], [0])[
-#endif
-
-/* Default (constant) value used for initialization for null
-   right-hand sides.  Unlike the standard yacc.c template, here we set
-   the default value of $$ to a zeroed-out value.  Since the default
-   value is undefined, this behavior is technically correct.  */
-static YYSTYPE yyval_default;]b4_locations_if([[
-static YYLTYPE yyloc_default][]b4_yyloc_default;])[
-
-/* Copy the second part of user declarations.  */
-]b4_user_post_prologue
-b4_percent_code_get[]dnl
-
-[#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef YYFREE
-# define YYFREE free
-#endif
-#ifndef YYMALLOC
-# define YYMALLOC malloc
-#endif
-#ifndef YYREALLOC
-# define YYREALLOC realloc
-#endif
-
-#define YYSIZEMAX ((size_t) -1)
-
-#ifdef __cplusplus
-   typedef bool yybool;
-#else
-   typedef unsigned char yybool;
-#endif
-#define yytrue 1
-#define yyfalse 0
-
-#ifndef YYSETJMP
-# include <setjmp.h>
-# define YYJMP_BUF jmp_buf
-# define YYSETJMP(Env) setjmp (Env)
-/* Pacify clang.  */
-# define YYLONGJMP(Env, Val) (longjmp (Env, Val), YYASSERT (0))
-#endif
-
-]b4_attribute_define[
-
-#ifndef YYASSERT
-# define YYASSERT(Condition) ((void) ((Condition) || (abort (), 0)))
-#endif
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  ]b4_final_state_number[
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   ]b4_last[
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  ]b4_tokens_number[
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  ]b4_nterms_number[
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  ]b4_rules_number[
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  ]b4_states_number[
-/* YYMAXRHS -- Maximum number of symbols on right-hand side of rule.  */
-#define YYMAXRHS ]b4_r2_max[
-/* YYMAXLEFT -- Maximum number of symbols to the left of a handle
-   accessed by $0, $-1, etc., in any rule.  */
-#define YYMAXLEFT ]b4_max_left_semantic_context[
-
-/* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
-#define YYUNDEFTOK  ]b4_undef_token_number[
-#define YYMAXUTOK   ]b4_user_token_number_max[
-
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
-{
-  ]b4_translate[
-};
-
-#if ]b4_api_PREFIX[DEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const ]b4_int_type_for([b4_rline])[ yyrline[] =
-{
-  ]b4_rline[
-};
-#endif
-
-#if ]b4_api_PREFIX[DEBUG || YYERROR_VERBOSE || ]b4_token_table_flag[
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  ]b4_tname[
-};
-#endif
-
-#define YYPACT_NINF ]b4_pact_ninf[
-#define YYTABLE_NINF ]b4_table_ninf[
-
-]b4_parser_tables_define[
-
-/* YYDPREC[RULE-NUM] -- Dynamic precedence of rule #RULE-NUM (0 if none).  */
-static const ]b4_int_type_for([b4_dprec])[ yydprec[] =
-{
-  ]b4_dprec[
-};
-
-/* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
-static const ]b4_int_type_for([b4_merger])[ yymerger[] =
-{
-  ]b4_merger[
-};
-
-/* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
-   in the case of predicates.  */
-static const yybool yyimmediate[] =
-{
-  ]b4_immediate[
-};
-
-/* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
-   list of conflicting reductions corresponding to action entry for
-   state STATE-NUM in yytable.  0 means no conflicts.  The list in
-   yyconfl is terminated by a rule number of 0.  */
-static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] =
-{
-  ]b4_conflict_list_heads[
-};
-
-/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
-   0, pointed into by YYCONFLP.  */
-]dnl Do not use b4_int_type_for here, since there are places where
-dnl pointers onto yyconfl are taken, whose type is "short int *".
-dnl We probably ought to introduce a type for confl.
-[static const short int yyconfl[] =
-{
-  ]b4_conflicting_rules[
-};
-
-/* Error token number */
-#define YYTERROR 1
-
-]b4_locations_if([[
-]b4_yylloc_default_define[
-# define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc)
-]])[
-
-]b4_pure_if(
-[
-#undef yynerrs
-#define yynerrs (yystackp->yyerrcnt)
-#undef yychar
-#define yychar (yystackp->yyrawchar)
-#undef yylval
-#define yylval (yystackp->yyval)
-#undef yylloc
-#define yylloc (yystackp->yyloc)
-m4_if(b4_prefix[], [yy], [],
-[#define b4_prefix[]nerrs yynerrs
-#define b4_prefix[]char yychar
-#define b4_prefix[]lval yylval
-#define b4_prefix[]lloc yylloc])],
-[YYSTYPE yylval;]b4_locations_if([[
-YYLTYPE yylloc;]])[
-
-int yynerrs;
-int yychar;])[
-
-static const int YYEOF = 0;
-static const int YYEMPTY = -2;
-
-typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
-
-#define YYCHK(YYE)                              \
-  do {                                          \
-    YYRESULTTAG yychk_flag = YYE;               \
-    if (yychk_flag != yyok)                     \
-      return yychk_flag;                        \
-  } while (0)
-
-#if ]b4_api_PREFIX[DEBUG
-
-# ifndef YYFPRINTF
-#  define YYFPRINTF fprintf
-# endif
-
-]b4_yy_location_print_define[
-
-# define YYDPRINTF(Args)                        \
-  do {                                          \
-    if (yydebug)                                \
-      YYFPRINTF Args;                           \
-  } while (0)
-
-]b4_yy_symbol_print_define[
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                  \
-  do {                                                                  \
-    if (yydebug)                                                        \
-      {                                                                 \
-        YYFPRINTF (stderr, "%s ", Title);                               \
-        yy_symbol_print (stderr, Type, Value]b4_locuser_args([Location])[);        \
-        YYFPRINTF (stderr, "\n");                                       \
-      }                                                                 \
-  } while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-
-struct yyGLRStack;
-static void yypstack (struct yyGLRStack* yystackp, size_t yyk)
-  __attribute__ ((__unused__));
-static void yypdumpstack (struct yyGLRStack* yystackp)
-  __attribute__ ((__unused__));
-
-#else /* !]b4_api_PREFIX[DEBUG */
-
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-
-#endif /* !]b4_api_PREFIX[DEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH ]b4_stack_depth_init[
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH ]b4_stack_depth_max[
-#endif
-
-/* Minimum number of free items on the stack allowed after an
-   allocation.  This is to allow allocation and initialization
-   to be completed by functions that call yyexpandGLRStack before the
-   stack is expanded, thus insuring that all necessary pointers get
-   properly redirected to new data.  */
-#define YYHEADROOM 2
-
-#ifndef YYSTACKEXPANDABLE
-#  define YYSTACKEXPANDABLE 1
-#endif
-
-#if YYSTACKEXPANDABLE
-# define YY_RESERVE_GLRSTACK(Yystack)                   \
-  do {                                                  \
-    if (Yystack->yyspaceLeft < YYHEADROOM)              \
-      yyexpandGLRStack (Yystack);                       \
-  } while (0)
-#else
-# define YY_RESERVE_GLRSTACK(Yystack)                   \
-  do {                                                  \
-    if (Yystack->yyspaceLeft < YYHEADROOM)              \
-      yyMemoryExhausted (Yystack);                      \
-  } while (0)
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static size_t
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      size_t yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return strlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-#endif /* !YYERROR_VERBOSE */
-
-/** State numbers, as in LALR(1) machine */
-typedef int yyStateNum;
-
-/** Rule numbers, as in LALR(1) machine */
-typedef int yyRuleNum;
-
-/** Grammar symbol */
-typedef int yySymbol;
-
-/** Item references, as in LALR(1) machine */
-typedef short int yyItemNum;
-
-typedef struct yyGLRState yyGLRState;
-typedef struct yyGLRStateSet yyGLRStateSet;
-typedef struct yySemanticOption yySemanticOption;
-typedef union yyGLRStackItem yyGLRStackItem;
-typedef struct yyGLRStack yyGLRStack;
-
-struct yyGLRState {
-  /** Type tag: always true.  */
-  yybool yyisState;
-  /** Type tag for yysemantics.  If true, yysval applies, otherwise
-   *  yyfirstVal applies.  */
-  yybool yyresolved;
-  /** Number of corresponding LALR(1) machine state.  */
-  yyStateNum yylrState;
-  /** Preceding state in this stack */
-  yyGLRState* yypred;
-  /** Source position of the last token produced by my symbol */
-  size_t yyposn;
-  union {
-    /** First in a chain of alternative reductions producing the
-     *  non-terminal corresponding to this state, threaded through
-     *  yynext.  */
-    yySemanticOption* yyfirstVal;
-    /** Semantic value for this state.  */
-    YYSTYPE yysval;
-  } yysemantics;]b4_locations_if([[
-  /** Source location for this state.  */
-  YYLTYPE yyloc;]])[
-};
-
-struct yyGLRStateSet {
-  yyGLRState** yystates;
-  /** During nondeterministic operation, yylookaheadNeeds tracks which
-   *  stacks have actually needed the current lookahead.  During deterministic
-   *  operation, yylookaheadNeeds[0] is not maintained since it would merely
-   *  duplicate yychar != YYEMPTY.  */
-  yybool* yylookaheadNeeds;
-  size_t yysize, yycapacity;
-};
-
-struct yySemanticOption {
-  /** Type tag: always false.  */
-  yybool yyisState;
-  /** Rule number for this reduction */
-  yyRuleNum yyrule;
-  /** The last RHS state in the list of states to be reduced.  */
-  yyGLRState* yystate;
-  /** The lookahead for this reduction.  */
-  int yyrawchar;
-  YYSTYPE yyval;]b4_locations_if([[
-  YYLTYPE yyloc;]])[
-  /** Next sibling in chain of options.  To facilitate merging,
-   *  options are chained in decreasing order by address.  */
-  yySemanticOption* yynext;
-};
-
-/** Type of the items in the GLR stack.  The yyisState field
- *  indicates which item of the union is valid.  */
-union yyGLRStackItem {
-  yyGLRState yystate;
-  yySemanticOption yyoption;
-};
-
-struct yyGLRStack {
-  int yyerrState;
-]b4_locations_if([[  /* To compute the location of the error token.  */
-  yyGLRStackItem yyerror_range[3];]])[
-]b4_pure_if(
-[
-  int yyerrcnt;
-  int yyrawchar;
-  YYSTYPE yyval;]b4_locations_if([[
-  YYLTYPE yyloc;]])[
-])[
-  YYJMP_BUF yyexception_buffer;
-  yyGLRStackItem* yyitems;
-  yyGLRStackItem* yynextFree;
-  size_t yyspaceLeft;
-  yyGLRState* yysplitPoint;
-  yyGLRState* yylastDeleted;
-  yyGLRStateSet yytops;
-};
-
-#if YYSTACKEXPANDABLE
-static void yyexpandGLRStack (yyGLRStack* yystackp);
-#endif
-
-static void yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg)
-  __attribute__ ((__noreturn__));
-static void
-yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg)
-{
-  if (yymsg != YY_NULL)
-    yyerror (]b4_yyerror_args[yymsg);
-  YYLONGJMP (yystackp->yyexception_buffer, 1);
-}
-
-static void yyMemoryExhausted (yyGLRStack* yystackp)
-  __attribute__ ((__noreturn__));
-static void
-yyMemoryExhausted (yyGLRStack* yystackp)
-{
-  YYLONGJMP (yystackp->yyexception_buffer, 2);
-}
-
-#if ]b4_api_PREFIX[DEBUG || YYERROR_VERBOSE
-/** A printable representation of TOKEN.  */
-static inline const char*
-yytokenName (yySymbol yytoken)
-{
-  if (yytoken == YYEMPTY)
-    return "";
-
-  return yytname[yytoken];
-}
-#endif
-
-/** Fill in YYVSP[YYLOW1 .. YYLOW0-1] from the chain of states starting
- *  at YYVSP[YYLOW0].yystate.yypred.  Leaves YYVSP[YYLOW1].yystate.yypred
- *  containing the pointer to the next state in the chain.  */
-static void yyfillin (yyGLRStackItem *, int, int) __attribute__ ((__unused__));
-static void
-yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
-{
-  int i;
-  yyGLRState *s = yyvsp[yylow0].yystate.yypred;
-  for (i = yylow0-1; i >= yylow1; i -= 1)
-    {
-#if ]b4_api_PREFIX[DEBUG
-      yyvsp[i].yystate.yylrState = s->yylrState;
-#endif
-      yyvsp[i].yystate.yyresolved = s->yyresolved;
-      if (s->yyresolved)
-        yyvsp[i].yystate.yysemantics.yysval = s->yysemantics.yysval;
-      else
-        /* The effect of using yysval or yyloc (in an immediate rule) is
-         * undefined.  */
-        yyvsp[i].yystate.yysemantics.yyfirstVal = YY_NULL;]b4_locations_if([[
-      yyvsp[i].yystate.yyloc = s->yyloc;]])[
-      s = yyvsp[i].yystate.yypred = s->yypred;
-    }
-}
-
-/* Do nothing if YYNORMAL or if *YYLOW <= YYLOW1.  Otherwise, fill in
- * YYVSP[YYLOW1 .. *YYLOW-1] as in yyfillin and set *YYLOW = YYLOW1.
- * For convenience, always return YYLOW1.  */
-static inline int yyfill (yyGLRStackItem *, int *, int, yybool)
-     __attribute__ ((__unused__));
-static inline int
-yyfill (yyGLRStackItem *yyvsp, int *yylow, int yylow1, yybool yynormal)
-{
-  if (!yynormal && yylow1 < *yylow)
-    {
-      yyfillin (yyvsp, *yylow, yylow1);
-      *yylow = yylow1;
-    }
-  return yylow1;
-}
-
-/** Perform user action for rule number YYN, with RHS length YYRHSLEN,
- *  and top stack item YYVSP.  YYLVALP points to place to put semantic
- *  value ($$), and yylocp points to place for location information
- *  (@@$).  Returns yyok for normal return, yyaccept for YYACCEPT,
- *  yyerr for YYERROR, yyabort for YYABORT.  */
-static YYRESULTTAG
-yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
-              yyGLRStack* yystackp,
-              YYSTYPE* yyvalp]b4_locuser_formals[)
-{
-  yybool yynormal __attribute__ ((__unused__)) =
-    (yystackp->yysplitPoint == YY_NULL);
-  int yylow;
-]b4_parse_param_use([yyvalp], [yylocp])dnl
-[  YYUSE (yyrhslen);
-# undef yyerrok
-# define yyerrok (yystackp->yyerrState = 0)
-# undef YYACCEPT
-# define YYACCEPT return yyaccept
-# undef YYABORT
-# define YYABORT return yyabort
-# undef YYERROR
-# define YYERROR return yyerrok, yyerr
-# undef YYRECOVERING
-# define YYRECOVERING() (yystackp->yyerrState != 0)
-# undef yyclearin
-# define yyclearin (yychar = YYEMPTY)
-# undef YYFILL
-# define YYFILL(N) yyfill (yyvsp, &yylow, N, yynormal)
-# undef YYBACKUP
-# define YYBACKUP(Token, Value)                                              \
-  return yyerror (]b4_yyerror_args[YY_("syntax error: cannot back up")),     \
-         yyerrok, yyerr
-
-  yylow = 1;
-  if (yyrhslen == 0)
-    *yyvalp = yyval_default;
-  else
-    *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;]b4_locations_if([[
-  YYLLOC_DEFAULT ((*yylocp), (yyvsp - yyrhslen), yyrhslen);
-  yystackp->yyerror_range[1].yystate.yyloc = *yylocp;
-]])[
-  switch (yyn)
-    {
-      ]b4_user_actions[
-      default: break;
-    }
-
-  return yyok;
-# undef yyerrok
-# undef YYABORT
-# undef YYACCEPT
-# undef YYERROR
-# undef YYBACKUP
-# undef yyclearin
-# undef YYRECOVERING
-}
-
-
-static void
-yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
-{
-  YYUSE (yy0);
-  YYUSE (yy1);
-
-  switch (yyn)
-    {
-]b4_mergers[
-      default: break;
-    }
-}
-
-                              /* Bison grammar-table manipulation.  */
-
-]b4_yydestruct_define[
-
-/** Number of symbols composing the right hand side of rule #RULE.  */
-static inline int
-yyrhsLength (yyRuleNum yyrule)
-{
-  return yyr2[yyrule];
-}
-
-static void
-yydestroyGLRState (char const *yymsg, yyGLRState *yys]b4_user_formals[)
-{
-  if (yys->yyresolved)
-    yydestruct (yymsg, yystos[yys->yylrState],
-                &yys->yysemantics.yysval]b4_locuser_args([&yys->yyloc])[);
-  else
-    {
-#if ]b4_api_PREFIX[DEBUG
-      if (yydebug)
-        {
-          if (yys->yysemantics.yyfirstVal)
-            YYFPRINTF (stderr, "%s unresolved ", yymsg);
-          else
-            YYFPRINTF (stderr, "%s incomplete ", yymsg);
-          yy_symbol_print (stderr, yystos[yys->yylrState],
-                           YY_NULL]b4_locuser_args([&yys->yyloc])[);
-          YYFPRINTF (stderr, "\n");
-        }
-#endif
-
-      if (yys->yysemantics.yyfirstVal)
-        {
-          yySemanticOption *yyoption = yys->yysemantics.yyfirstVal;
-          yyGLRState *yyrh;
-          int yyn;
-          for (yyrh = yyoption->yystate, yyn = yyrhsLength (yyoption->yyrule);
-               yyn > 0;
-               yyrh = yyrh->yypred, yyn -= 1)
-            yydestroyGLRState (yymsg, yyrh]b4_user_args[);
-        }
-    }
-}
-
-/** Left-hand-side symbol for rule #YYRULE.  */
-static inline yySymbol
-yylhsNonterm (yyRuleNum yyrule)
-{
-  return yyr1[yyrule];
-}
-
-#define yypact_value_is_default(Yystate) \
-  ]b4_table_value_equals([[pact]], [[Yystate]], [b4_pact_ninf])[
-
-/** True iff LR state YYSTATE has only a default reduction (regardless
- *  of token).  */
-static inline yybool
-yyisDefaultedState (yyStateNum yystate)
-{
-  return yypact_value_is_default (yypact[yystate]);
-}
-
-/** The default reduction for YYSTATE, assuming it has one.  */
-static inline yyRuleNum
-yydefaultAction (yyStateNum yystate)
-{
-  return yydefact[yystate];
-}
-
-#define yytable_value_is_error(Yytable_value) \
-  ]b4_table_value_equals([[table]], [[Yytable_value]], [b4_table_ninf])[
-
-/** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN.
- *  Result R means
- *    R < 0:  Reduce on rule -R.
- *    R = 0:  Error.
- *    R > 0:  Shift to state R.
- *  Set *YYCONFLICTS to a pointer into yyconfl to a 0-terminated list
- *  of conflicting reductions.
- */
-static inline void
-yygetLRActions (yyStateNum yystate, int yytoken,
-                int* yyaction, const short int** yyconflicts)
-{
-  int yyindex = yypact[yystate] + yytoken;
-  if (yypact_value_is_default (yypact[yystate])
-      || yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken)
-    {
-      *yyaction = -yydefact[yystate];
-      *yyconflicts = yyconfl;
-    }
-  else if (! yytable_value_is_error (yytable[yyindex]))
-    {
-      *yyaction = yytable[yyindex];
-      *yyconflicts = yyconfl + yyconflp[yyindex];
-    }
-  else
-    {
-      *yyaction = 0;
-      *yyconflicts = yyconfl + yyconflp[yyindex];
-    }
-}
-
-static inline yyStateNum
-yyLRgotoState (yyStateNum yystate, yySymbol yylhs)
-{
-  int yyr = yypgoto[yylhs - YYNTOKENS] + yystate;
-  if (0 <= yyr && yyr <= YYLAST && yycheck[yyr] == yystate)
-    return yytable[yyr];
-  else
-    return yydefgoto[yylhs - YYNTOKENS];
-}
-
-static inline yybool
-yyisShiftAction (int yyaction)
-{
-  return 0 < yyaction;
-}
-
-static inline yybool
-yyisErrorAction (int yyaction)
-{
-  return yyaction == 0;
-}
-
-                                /* GLRStates */
-
-/** Return a fresh GLRStackItem in YYSTACKP.  The item is an LR state
- *  if YYISSTATE, and otherwise a semantic option.  Callers should call
- *  YY_RESERVE_GLRSTACK afterwards to make sure there is sufficient
- *  headroom.  */
-
-static inline yyGLRStackItem*
-yynewGLRStackItem (yyGLRStack* yystackp, yybool yyisState)
-{
-  yyGLRStackItem* yynewItem = yystackp->yynextFree;
-  yystackp->yyspaceLeft -= 1;
-  yystackp->yynextFree += 1;
-  yynewItem->yystate.yyisState = yyisState;
-  return yynewItem;
-}
-
-/** Add a new semantic action that will execute the action for rule
- *  YYRULE on the semantic values in YYRHS to the list of
- *  alternative actions for YYSTATE.  Assumes that YYRHS comes from
- *  stack #YYK of *YYSTACKP. */
-static void
-yyaddDeferredAction (yyGLRStack* yystackp, size_t yyk, yyGLRState* yystate,
-                     yyGLRState* yyrhs, yyRuleNum yyrule)
-{
-  yySemanticOption* yynewOption =
-    &yynewGLRStackItem (yystackp, yyfalse)->yyoption;
-  yynewOption->yystate = yyrhs;
-  yynewOption->yyrule = yyrule;
-  if (yystackp->yytops.yylookaheadNeeds[yyk])
-    {
-      yynewOption->yyrawchar = yychar;
-      yynewOption->yyval = yylval;]b4_locations_if([
-      yynewOption->yyloc = yylloc;])[
-    }
-  else
-    yynewOption->yyrawchar = YYEMPTY;
-  yynewOption->yynext = yystate->yysemantics.yyfirstVal;
-  yystate->yysemantics.yyfirstVal = yynewOption;
-
-  YY_RESERVE_GLRSTACK (yystackp);
-}
-
-                                /* GLRStacks */
-
-/** Initialize YYSET to a singleton set containing an empty stack.  */
-static yybool
-yyinitStateSet (yyGLRStateSet* yyset)
-{
-  yyset->yysize = 1;
-  yyset->yycapacity = 16;
-  yyset->yystates = (yyGLRState**) YYMALLOC (16 * sizeof yyset->yystates[0]);
-  if (! yyset->yystates)
-    return yyfalse;
-  yyset->yystates[0] = YY_NULL;
-  yyset->yylookaheadNeeds =
-    (yybool*) YYMALLOC (16 * sizeof yyset->yylookaheadNeeds[0]);
-  if (! yyset->yylookaheadNeeds)
-    {
-      YYFREE (yyset->yystates);
-      return yyfalse;
-    }
-  return yytrue;
-}
-
-static void yyfreeStateSet (yyGLRStateSet* yyset)
-{
-  YYFREE (yyset->yystates);
-  YYFREE (yyset->yylookaheadNeeds);
-}
-
-/** Initialize *YYSTACKP to a single empty stack, with total maximum
- *  capacity for all stacks of YYSIZE.  */
-static yybool
-yyinitGLRStack (yyGLRStack* yystackp, size_t yysize)
-{
-  yystackp->yyerrState = 0;
-  yynerrs = 0;
-  yystackp->yyspaceLeft = yysize;
-  yystackp->yyitems =
-    (yyGLRStackItem*) YYMALLOC (yysize * sizeof yystackp->yynextFree[0]);
-  if (!yystackp->yyitems)
-    return yyfalse;
-  yystackp->yynextFree = yystackp->yyitems;
-  yystackp->yysplitPoint = YY_NULL;
-  yystackp->yylastDeleted = YY_NULL;
-  return yyinitStateSet (&yystackp->yytops);
-}
-
-
-#if YYSTACKEXPANDABLE
-# define YYRELOC(YYFROMITEMS,YYTOITEMS,YYX,YYTYPE) \
-  &((YYTOITEMS) - ((YYFROMITEMS) - (yyGLRStackItem*) (YYX)))->YYTYPE
-
-/** If *YYSTACKP is expandable, extend it.  WARNING: Pointers into the
-    stack from outside should be considered invalid after this call.
-    We always expand when there are 1 or fewer items left AFTER an
-    allocation, so that we can avoid having external pointers exist
-    across an allocation.  */
-static void
-yyexpandGLRStack (yyGLRStack* yystackp)
-{
-  yyGLRStackItem* yynewItems;
-  yyGLRStackItem* yyp0, *yyp1;
-  size_t yynewSize;
-  size_t yyn;
-  size_t yysize = yystackp->yynextFree - yystackp->yyitems;
-  if (YYMAXDEPTH - YYHEADROOM < yysize)
-    yyMemoryExhausted (yystackp);
-  yynewSize = 2*yysize;
-  if (YYMAXDEPTH < yynewSize)
-    yynewSize = YYMAXDEPTH;
-  yynewItems = (yyGLRStackItem*) YYMALLOC (yynewSize * sizeof yynewItems[0]);
-  if (! yynewItems)
-    yyMemoryExhausted (yystackp);
-  for (yyp0 = yystackp->yyitems, yyp1 = yynewItems, yyn = yysize;
-       0 < yyn;
-       yyn -= 1, yyp0 += 1, yyp1 += 1)
-    {
-      *yyp1 = *yyp0;
-      if (*(yybool *) yyp0)
-        {
-          yyGLRState* yys0 = &yyp0->yystate;
-          yyGLRState* yys1 = &yyp1->yystate;
-          if (yys0->yypred != YY_NULL)
-            yys1->yypred =
-              YYRELOC (yyp0, yyp1, yys0->yypred, yystate);
-          if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != YY_NULL)
-            yys1->yysemantics.yyfirstVal =
-              YYRELOC (yyp0, yyp1, yys0->yysemantics.yyfirstVal, yyoption);
-        }
-      else
-        {
-          yySemanticOption* yyv0 = &yyp0->yyoption;
-          yySemanticOption* yyv1 = &yyp1->yyoption;
-          if (yyv0->yystate != YY_NULL)
-            yyv1->yystate = YYRELOC (yyp0, yyp1, yyv0->yystate, yystate);
-          if (yyv0->yynext != YY_NULL)
-            yyv1->yynext = YYRELOC (yyp0, yyp1, yyv0->yynext, yyoption);
-        }
-    }
-  if (yystackp->yysplitPoint != YY_NULL)
-    yystackp->yysplitPoint = YYRELOC (yystackp->yyitems, yynewItems,
-                                 yystackp->yysplitPoint, yystate);
-
-  for (yyn = 0; yyn < yystackp->yytops.yysize; yyn += 1)
-    if (yystackp->yytops.yystates[yyn] != YY_NULL)
-      yystackp->yytops.yystates[yyn] =
-        YYRELOC (yystackp->yyitems, yynewItems,
-                 yystackp->yytops.yystates[yyn], yystate);
-  YYFREE (yystackp->yyitems);
-  yystackp->yyitems = yynewItems;
-  yystackp->yynextFree = yynewItems + yysize;
-  yystackp->yyspaceLeft = yynewSize - yysize;
-}
-#endif
-
-static void
-yyfreeGLRStack (yyGLRStack* yystackp)
-{
-  YYFREE (yystackp->yyitems);
-  yyfreeStateSet (&yystackp->yytops);
-}
-
-/** Assuming that YYS is a GLRState somewhere on *YYSTACKP, update the
- *  splitpoint of *YYSTACKP, if needed, so that it is at least as deep as
- *  YYS.  */
-static inline void
-yyupdateSplit (yyGLRStack* yystackp, yyGLRState* yys)
-{
-  if (yystackp->yysplitPoint != YY_NULL && yystackp->yysplitPoint > yys)
-    yystackp->yysplitPoint = yys;
-}
-
-/** Invalidate stack #YYK in *YYSTACKP.  */
-static inline void
-yymarkStackDeleted (yyGLRStack* yystackp, size_t yyk)
-{
-  if (yystackp->yytops.yystates[yyk] != YY_NULL)
-    yystackp->yylastDeleted = yystackp->yytops.yystates[yyk];
-  yystackp->yytops.yystates[yyk] = YY_NULL;
-}
-
-/** Undelete the last stack in *YYSTACKP that was marked as deleted.  Can
-    only be done once after a deletion, and only when all other stacks have
-    been deleted.  */
-static void
-yyundeleteLastStack (yyGLRStack* yystackp)
-{
-  if (yystackp->yylastDeleted == YY_NULL || yystackp->yytops.yysize != 0)
-    return;
-  yystackp->yytops.yystates[0] = yystackp->yylastDeleted;
-  yystackp->yytops.yysize = 1;
-  YYDPRINTF ((stderr, "Restoring last deleted stack as stack #0.\n"));
-  yystackp->yylastDeleted = YY_NULL;
-}
-
-static inline void
-yyremoveDeletes (yyGLRStack* yystackp)
-{
-  size_t yyi, yyj;
-  yyi = yyj = 0;
-  while (yyj < yystackp->yytops.yysize)
-    {
-      if (yystackp->yytops.yystates[yyi] == YY_NULL)
-        {
-          if (yyi == yyj)
-            {
-              YYDPRINTF ((stderr, "Removing dead stacks.\n"));
-            }
-          yystackp->yytops.yysize -= 1;
-        }
-      else
-        {
-          yystackp->yytops.yystates[yyj] = yystackp->yytops.yystates[yyi];
-          /* In the current implementation, it's unnecessary to copy
-             yystackp->yytops.yylookaheadNeeds[yyi] since, after
-             yyremoveDeletes returns, the parser immediately either enters
-             deterministic operation or shifts a token.  However, it doesn't
-             hurt, and the code might evolve to need it.  */
-          yystackp->yytops.yylookaheadNeeds[yyj] =
-            yystackp->yytops.yylookaheadNeeds[yyi];
-          if (yyj != yyi)
-            {
-              YYDPRINTF ((stderr, "Rename stack %lu -> %lu.\n",
-                          (unsigned long int) yyi, (unsigned long int) yyj));
-            }
-          yyj += 1;
-        }
-      yyi += 1;
-    }
-}
-
-/** Shift to a new state on stack #YYK of *YYSTACKP, corresponding to LR
- * state YYLRSTATE, at input position YYPOSN, with (resolved) semantic
- * value *YYVALP and source location *YYLOCP.  */
-static inline void
-yyglrShift (yyGLRStack* yystackp, size_t yyk, yyStateNum yylrState,
-            size_t yyposn,
-            YYSTYPE* yyvalp]b4_locations_if([, YYLTYPE* yylocp])[)
-{
-  yyGLRState* yynewState = &yynewGLRStackItem (yystackp, yytrue)->yystate;
-
-  yynewState->yylrState = yylrState;
-  yynewState->yyposn = yyposn;
-  yynewState->yyresolved = yytrue;
-  yynewState->yypred = yystackp->yytops.yystates[yyk];
-  yynewState->yysemantics.yysval = *yyvalp;]b4_locations_if([
-  yynewState->yyloc = *yylocp;])[
-  yystackp->yytops.yystates[yyk] = yynewState;
-
-  YY_RESERVE_GLRSTACK (yystackp);
-}
-
-/** Shift stack #YYK of *YYSTACKP, to a new state corresponding to LR
- *  state YYLRSTATE, at input position YYPOSN, with the (unresolved)
- *  semantic value of YYRHS under the action for YYRULE.  */
-static inline void
-yyglrShiftDefer (yyGLRStack* yystackp, size_t yyk, yyStateNum yylrState,
-                 size_t yyposn, yyGLRState* yyrhs, yyRuleNum yyrule)
-{
-  yyGLRState* yynewState = &yynewGLRStackItem (yystackp, yytrue)->yystate;
-
-  yynewState->yylrState = yylrState;
-  yynewState->yyposn = yyposn;
-  yynewState->yyresolved = yyfalse;
-  yynewState->yypred = yystackp->yytops.yystates[yyk];
-  yynewState->yysemantics.yyfirstVal = YY_NULL;
-  yystackp->yytops.yystates[yyk] = yynewState;
-
-  /* Invokes YY_RESERVE_GLRSTACK.  */
-  yyaddDeferredAction (yystackp, yyk, yynewState, yyrhs, yyrule);
-}
-
-#if !]b4_api_PREFIX[DEBUG
-# define YY_REDUCE_PRINT(Args)
-#else
-# define YY_REDUCE_PRINT(Args)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print Args;               \
-} while (0)
-
-/*----------------------------------------------------------------------.
-| Report that stack #YYK of *YYSTACKP is going to be reduced by YYRULE. |
-`----------------------------------------------------------------------*/
-
-static inline void
-yy_reduce_print (int yynormal, yyGLRStackItem* yyvsp, size_t yyk,
-                 yyRuleNum yyrule]b4_user_formals[)
-{
-  int yynrhs = yyrhsLength (yyrule);]b4_locations_if([
-  int yylow = 1;])[
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack %lu by rule %d (line %lu):\n",
-             (unsigned long int) yyk, yyrule - 1,
-             (unsigned long int) yyrline[yyrule]);
-  if (! yynormal)
-    yyfillin (yyvsp, 1, -yynrhs);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyvsp[yyi - yynrhs + 1].yystate.yylrState],
-                       &yyvsp[yyi - yynrhs + 1].yystate.yysemantics.yysval
-                       ]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
-                       b4_user_args[);
-      if (!yyvsp[yyi - yynrhs + 1].yystate.yyresolved)
-        YYFPRINTF (stderr, " (unresolved)");
-      YYFPRINTF (stderr, "\n");
-    }
-}
-#endif
-
-/** Pop the symbols consumed by reduction #YYRULE from the top of stack
- *  #YYK of *YYSTACKP, and perform the appropriate semantic action on their
- *  semantic values.  Assumes that all ambiguities in semantic values
- *  have been previously resolved.  Set *YYVALP to the resulting value,
- *  and *YYLOCP to the computed location (if any).  Return value is as
- *  for userAction.  */
-static inline YYRESULTTAG
-yydoAction (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
-            YYSTYPE* yyvalp]b4_locuser_formals[)
-{
-  int yynrhs = yyrhsLength (yyrule);
-
-  if (yystackp->yysplitPoint == YY_NULL)
-    {
-      /* Standard special case: single stack.  */
-      yyGLRStackItem* yyrhs = (yyGLRStackItem*) yystackp->yytops.yystates[yyk];
-      YYASSERT (yyk == 0);
-      yystackp->yynextFree -= yynrhs;
-      yystackp->yyspaceLeft += yynrhs;
-      yystackp->yytops.yystates[0] = & yystackp->yynextFree[-1].yystate;
-      YY_REDUCE_PRINT ((1, yyrhs, yyk, yyrule]b4_user_args[));
-      return yyuserAction (yyrule, yynrhs, yyrhs, yystackp,
-                           yyvalp]b4_locuser_args[);
-    }
-  else
-    {
-      int yyi;
-      yyGLRState* yys;
-      yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1];
-      yys = yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred
-        = yystackp->yytops.yystates[yyk];]b4_locations_if([[
-      if (yynrhs == 0)
-        /* Set default location.  */
-        yyrhsVals[YYMAXRHS + YYMAXLEFT - 1].yystate.yyloc = yys->yyloc;]])[
-      for (yyi = 0; yyi < yynrhs; yyi += 1)
-        {
-          yys = yys->yypred;
-          YYASSERT (yys);
-        }
-      yyupdateSplit (yystackp, yys);
-      yystackp->yytops.yystates[yyk] = yys;
-      YY_REDUCE_PRINT ((0, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yyk, yyrule]b4_user_args[));
-      return yyuserAction (yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1,
-                           yystackp, yyvalp]b4_locuser_args[);
-    }
-}
-
-/** Pop items off stack #YYK of *YYSTACKP according to grammar rule YYRULE,
- *  and push back on the resulting nonterminal symbol.  Perform the
- *  semantic action associated with YYRULE and store its value with the
- *  newly pushed state, if YYFORCEEVAL or if *YYSTACKP is currently
- *  unambiguous.  Otherwise, store the deferred semantic action with
- *  the new state.  If the new state would have an identical input
- *  position, LR state, and predecessor to an existing state on the stack,
- *  it is identified with that existing state, eliminating stack #YYK from
- *  *YYSTACKP.  In this case, the semantic value is
- *  added to the options for the existing state's semantic value.
- */
-static inline YYRESULTTAG
-yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
-             yybool yyforceEval]b4_user_formals[)
-{
-  size_t yyposn = yystackp->yytops.yystates[yyk]->yyposn;
-
-  if (yyforceEval || yystackp->yysplitPoint == YY_NULL)
-    {
-      YYRESULTTAG yyflag;
-      YYSTYPE yysval;]b4_locations_if([
-      YYLTYPE yyloc;])[
-
-      yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
-      if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULL)
-        {
-          YYDPRINTF ((stderr, "Parse on stack %lu rejected by rule #%d.\n",
-                     (unsigned long int) yyk, yyrule - 1));
-        }
-      if (yyflag != yyok)
-        return yyflag;
-      YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyrule], &yysval, &yyloc);
-      yyglrShift (yystackp, yyk,
-                  yyLRgotoState (yystackp->yytops.yystates[yyk]->yylrState,
-                                 yylhsNonterm (yyrule)),
-                  yyposn, &yysval]b4_locations_if([, &yyloc])[);
-    }
-  else
-    {
-      size_t yyi;
-      int yyn;
-      yyGLRState* yys, *yys0 = yystackp->yytops.yystates[yyk];
-      yyStateNum yynewLRState;
-
-      for (yys = yystackp->yytops.yystates[yyk], yyn = yyrhsLength (yyrule);
-           0 < yyn; yyn -= 1)
-        {
-          yys = yys->yypred;
-          YYASSERT (yys);
-        }
-      yyupdateSplit (yystackp, yys);
-      yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));
-      YYDPRINTF ((stderr,
-                  "Reduced stack %lu by rule #%d; action deferred.  "
-                  "Now in state %d.\n",
-                  (unsigned long int) yyk, yyrule - 1, yynewLRState));
-      for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
-        if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULL)
-          {
-            yyGLRState *yysplit = yystackp->yysplitPoint;
-            yyGLRState *yyp = yystackp->yytops.yystates[yyi];
-            while (yyp != yys && yyp != yysplit && yyp->yyposn >= yyposn)
-              {
-                if (yyp->yylrState == yynewLRState && yyp->yypred == yys)
-                  {
-                    yyaddDeferredAction (yystackp, yyk, yyp, yys0, yyrule);
-                    yymarkStackDeleted (yystackp, yyk);
-                    YYDPRINTF ((stderr, "Merging stack %lu into stack %lu.\n",
-                                (unsigned long int) yyk,
-                                (unsigned long int) yyi));
-                    return yyok;
-                  }
-                yyp = yyp->yypred;
-              }
-          }
-      yystackp->yytops.yystates[yyk] = yys;
-      yyglrShiftDefer (yystackp, yyk, yynewLRState, yyposn, yys0, yyrule);
-    }
-  return yyok;
-}
-
-static size_t
-yysplitStack (yyGLRStack* yystackp, size_t yyk)
-{
-  if (yystackp->yysplitPoint == YY_NULL)
-    {
-      YYASSERT (yyk == 0);
-      yystackp->yysplitPoint = yystackp->yytops.yystates[yyk];
-    }
-  if (yystackp->yytops.yysize >= yystackp->yytops.yycapacity)
-    {
-      yyGLRState** yynewStates;
-      yybool* yynewLookaheadNeeds;
-
-      yynewStates = YY_NULL;
-
-      if (yystackp->yytops.yycapacity
-          > (YYSIZEMAX / (2 * sizeof yynewStates[0])))
-        yyMemoryExhausted (yystackp);
-      yystackp->yytops.yycapacity *= 2;
-
-      yynewStates =
-        (yyGLRState**) YYREALLOC (yystackp->yytops.yystates,
-                                  (yystackp->yytops.yycapacity
-                                   * sizeof yynewStates[0]));
-      if (yynewStates == YY_NULL)
-        yyMemoryExhausted (yystackp);
-      yystackp->yytops.yystates = yynewStates;
-
-      yynewLookaheadNeeds =
-        (yybool*) YYREALLOC (yystackp->yytops.yylookaheadNeeds,
-                             (yystackp->yytops.yycapacity
-                              * sizeof yynewLookaheadNeeds[0]));
-      if (yynewLookaheadNeeds == YY_NULL)
-        yyMemoryExhausted (yystackp);
-      yystackp->yytops.yylookaheadNeeds = yynewLookaheadNeeds;
-    }
-  yystackp->yytops.yystates[yystackp->yytops.yysize]
-    = yystackp->yytops.yystates[yyk];
-  yystackp->yytops.yylookaheadNeeds[yystackp->yytops.yysize]
-    = yystackp->yytops.yylookaheadNeeds[yyk];
-  yystackp->yytops.yysize += 1;
-  return yystackp->yytops.yysize-1;
-}
-
-/** True iff YYY0 and YYY1 represent identical options at the top level.
- *  That is, they represent the same rule applied to RHS symbols
- *  that produce the same terminal symbols.  */
-static yybool
-yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1)
-{
-  if (yyy0->yyrule == yyy1->yyrule)
-    {
-      yyGLRState *yys0, *yys1;
-      int yyn;
-      for (yys0 = yyy0->yystate, yys1 = yyy1->yystate,
-           yyn = yyrhsLength (yyy0->yyrule);
-           yyn > 0;
-           yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)
-        if (yys0->yyposn != yys1->yyposn)
-          return yyfalse;
-      return yytrue;
-    }
-  else
-    return yyfalse;
-}
-
-/** Assuming identicalOptions (YYY0,YYY1), destructively merge the
- *  alternative semantic values for the RHS-symbols of YYY1 and YYY0.  */
-static void
-yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1)
-{
-  yyGLRState *yys0, *yys1;
-  int yyn;
-  for (yys0 = yyy0->yystate, yys1 = yyy1->yystate,
-       yyn = yyrhsLength (yyy0->yyrule);
-       yyn > 0;
-       yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1)
-    {
-      if (yys0 == yys1)
-        break;
-      else if (yys0->yyresolved)
-        {
-          yys1->yyresolved = yytrue;
-          yys1->yysemantics.yysval = yys0->yysemantics.yysval;
-        }
-      else if (yys1->yyresolved)
-        {
-          yys0->yyresolved = yytrue;
-          yys0->yysemantics.yysval = yys1->yysemantics.yysval;
-        }
-      else
-        {
-          yySemanticOption** yyz0p = &yys0->yysemantics.yyfirstVal;
-          yySemanticOption* yyz1 = yys1->yysemantics.yyfirstVal;
-          while (yytrue)
-            {
-              if (yyz1 == *yyz0p || yyz1 == YY_NULL)
-                break;
-              else if (*yyz0p == YY_NULL)
-                {
-                  *yyz0p = yyz1;
-                  break;
-                }
-              else if (*yyz0p < yyz1)
-                {
-                  yySemanticOption* yyz = *yyz0p;
-                  *yyz0p = yyz1;
-                  yyz1 = yyz1->yynext;
-                  (*yyz0p)->yynext = yyz;
-                }
-              yyz0p = &(*yyz0p)->yynext;
-            }
-          yys1->yysemantics.yyfirstVal = yys0->yysemantics.yyfirstVal;
-        }
-    }
-}
-
-/** Y0 and Y1 represent two possible actions to take in a given
- *  parsing state; return 0 if no combination is possible,
- *  1 if user-mergeable, 2 if Y0 is preferred, 3 if Y1 is preferred.  */
-static int
-yypreference (yySemanticOption* y0, yySemanticOption* y1)
-{
-  yyRuleNum r0 = y0->yyrule, r1 = y1->yyrule;
-  int p0 = yydprec[r0], p1 = yydprec[r1];
-
-  if (p0 == p1)
-    {
-      if (yymerger[r0] == 0 || yymerger[r0] != yymerger[r1])
-        return 0;
-      else
-        return 1;
-    }
-  if (p0 == 0 || p1 == 0)
-    return 0;
-  if (p0 < p1)
-    return 3;
-  if (p1 < p0)
-    return 2;
-  return 0;
-}
-
-static YYRESULTTAG yyresolveValue (yyGLRState* yys,
-                                   yyGLRStack* yystackp]b4_user_formals[);
-
-
-/** Resolve the previous YYN states starting at and including state YYS
- *  on *YYSTACKP. If result != yyok, some states may have been left
- *  unresolved possibly with empty semantic option chains.  Regardless
- *  of whether result = yyok, each state has been left with consistent
- *  data so that yydestroyGLRState can be invoked if necessary.  */
-static YYRESULTTAG
-yyresolveStates (yyGLRState* yys, int yyn,
-                 yyGLRStack* yystackp]b4_user_formals[)
-{
-  if (0 < yyn)
-    {
-      YYASSERT (yys->yypred);
-      YYCHK (yyresolveStates (yys->yypred, yyn-1, yystackp]b4_user_args[));
-      if (! yys->yyresolved)
-        YYCHK (yyresolveValue (yys, yystackp]b4_user_args[));
-    }
-  return yyok;
-}
-
-/** Resolve the states for the RHS of YYOPT on *YYSTACKP, perform its
- *  user action, and return the semantic value and location in *YYVALP
- *  and *YYLOCP.  Regardless of whether result = yyok, all RHS states
- *  have been destroyed (assuming the user action destroys all RHS
- *  semantic values if invoked).  */
-static YYRESULTTAG
-yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystackp,
-                 YYSTYPE* yyvalp]b4_locuser_formals[)
-{
-  yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1];
-  int yynrhs = yyrhsLength (yyopt->yyrule);
-  YYRESULTTAG yyflag =
-    yyresolveStates (yyopt->yystate, yynrhs, yystackp]b4_user_args[);
-  if (yyflag != yyok)
-    {
-      yyGLRState *yys;
-      for (yys = yyopt->yystate; yynrhs > 0; yys = yys->yypred, yynrhs -= 1)
-        yydestroyGLRState ("Cleanup: popping", yys]b4_user_args[);
-      return yyflag;
-    }
-
-  yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred = yyopt->yystate;]b4_locations_if([[
-  if (yynrhs == 0)
-    /* Set default location.  */
-    yyrhsVals[YYMAXRHS + YYMAXLEFT - 1].yystate.yyloc = yyopt->yystate->yyloc;]])[
-  {
-    int yychar_current = yychar;
-    YYSTYPE yylval_current = yylval;]b4_locations_if([
-    YYLTYPE yylloc_current = yylloc;])[
-    yychar = yyopt->yyrawchar;
-    yylval = yyopt->yyval;]b4_locations_if([
-    yylloc = yyopt->yyloc;])[
-    yyflag = yyuserAction (yyopt->yyrule, yynrhs,
-                           yyrhsVals + YYMAXRHS + YYMAXLEFT - 1,
-                           yystackp, yyvalp]b4_locuser_args[);
-    yychar = yychar_current;
-    yylval = yylval_current;]b4_locations_if([
-    yylloc = yylloc_current;])[
-  }
-  return yyflag;
-}
-
-#if ]b4_api_PREFIX[DEBUG
-static void
-yyreportTree (yySemanticOption* yyx, int yyindent)
-{
-  int yynrhs = yyrhsLength (yyx->yyrule);
-  int yyi;
-  yyGLRState* yys;
-  yyGLRState* yystates[1 + YYMAXRHS];
-  yyGLRState yyleftmost_state;
-
-  for (yyi = yynrhs, yys = yyx->yystate; 0 < yyi; yyi -= 1, yys = yys->yypred)
-    yystates[yyi] = yys;
-  if (yys == YY_NULL)
-    {
-      yyleftmost_state.yyposn = 0;
-      yystates[0] = &yyleftmost_state;
-    }
-  else
-    yystates[0] = yys;
-
-  if (yyx->yystate->yyposn < yys->yyposn + 1)
-    YYFPRINTF (stderr, "%*s%s -> <Rule %d, empty>\n",
-               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
-               yyx->yyrule - 1);
-  else
-    YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %lu .. %lu>\n",
-               yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
-               yyx->yyrule - 1, (unsigned long int) (yys->yyposn + 1),
-               (unsigned long int) yyx->yystate->yyposn);
-  for (yyi = 1; yyi <= yynrhs; yyi += 1)
-    {
-      if (yystates[yyi]->yyresolved)
-        {
-          if (yystates[yyi-1]->yyposn+1 > yystates[yyi]->yyposn)
-            YYFPRINTF (stderr, "%*s%s <empty>\n", yyindent+2, "",
-                       yytokenName (yystos[yystates[yyi]->yylrState]));
-          else
-            YYFPRINTF (stderr, "%*s%s <tokens %lu .. %lu>\n", yyindent+2, "",
-                       yytokenName (yystos[yystates[yyi]->yylrState]),
-                       (unsigned long int) (yystates[yyi-1]->yyposn + 1),
-                       (unsigned long int) yystates[yyi]->yyposn);
-        }
-      else
-        yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);
-    }
-}
-#endif
-
-static YYRESULTTAG
-yyreportAmbiguity (yySemanticOption* yyx0,
-                   yySemanticOption* yyx1]b4_pure_formals[)
-{
-  YYUSE (yyx0);
-  YYUSE (yyx1);
-
-#if ]b4_api_PREFIX[DEBUG
-  YYFPRINTF (stderr, "Ambiguity detected.\n");
-  YYFPRINTF (stderr, "Option 1,\n");
-  yyreportTree (yyx0, 2);
-  YYFPRINTF (stderr, "\nOption 2,\n");
-  yyreportTree (yyx1, 2);
-  YYFPRINTF (stderr, "\n");
-#endif
-
-  yyerror (]b4_yyerror_args[YY_("syntax is ambiguous"));
-  return yyabort;
-}]b4_locations_if([[
-
-/** Resolve the locations for each of the YYN1 states in *YYSTACKP,
- *  ending at YYS1.  Has no effect on previously resolved states.
- *  The first semantic option of a state is always chosen.  */
-static void
-yyresolveLocations (yyGLRState* yys1, int yyn1,
-                    yyGLRStack *yystackp]b4_user_formals[)
-{
-  if (0 < yyn1)
-    {
-      yyresolveLocations (yys1->yypred, yyn1 - 1, yystackp]b4_user_args[);
-      if (!yys1->yyresolved)
-        {
-          yyGLRStackItem yyrhsloc[1 + YYMAXRHS];
-          int yynrhs;
-          yySemanticOption *yyoption = yys1->yysemantics.yyfirstVal;
-          YYASSERT (yyoption != YY_NULL);
-          yynrhs = yyrhsLength (yyoption->yyrule);
-          if (yynrhs > 0)
-            {
-              yyGLRState *yys;
-              int yyn;
-              yyresolveLocations (yyoption->yystate, yynrhs,
-                                  yystackp]b4_user_args[);
-              for (yys = yyoption->yystate, yyn = yynrhs;
-                   yyn > 0;
-                   yys = yys->yypred, yyn -= 1)
-                yyrhsloc[yyn].yystate.yyloc = yys->yyloc;
-            }
-          else
-            {
-              /* Both yyresolveAction and yyresolveLocations traverse the GSS
-                 in reverse rightmost order.  It is only necessary to invoke
-                 yyresolveLocations on a subforest for which yyresolveAction
-                 would have been invoked next had an ambiguity not been
-                 detected.  Thus the location of the previous state (but not
-                 necessarily the previous state itself) is guaranteed to be
-                 resolved already.  */
-              yyGLRState *yyprevious = yyoption->yystate;
-              yyrhsloc[0].yystate.yyloc = yyprevious->yyloc;
-            }
-          {
-            int yychar_current = yychar;
-            YYSTYPE yylval_current = yylval;
-            YYLTYPE yylloc_current = yylloc;
-            yychar = yyoption->yyrawchar;
-            yylval = yyoption->yyval;
-            yylloc = yyoption->yyloc;
-            YYLLOC_DEFAULT ((yys1->yyloc), yyrhsloc, yynrhs);
-            yychar = yychar_current;
-            yylval = yylval_current;
-            yylloc = yylloc_current;
-          }
-        }
-    }
-}]])[
-
-/** Resolve the ambiguity represented in state YYS in *YYSTACKP,
- *  perform the indicated actions, and set the semantic value of YYS.
- *  If result != yyok, the chain of semantic options in YYS has been
- *  cleared instead or it has been left unmodified except that
- *  redundant options may have been removed.  Regardless of whether
- *  result = yyok, YYS has been left with consistent data so that
- *  yydestroyGLRState can be invoked if necessary.  */
-static YYRESULTTAG
-yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[)
-{
-  yySemanticOption* yyoptionList = yys->yysemantics.yyfirstVal;
-  yySemanticOption* yybest = yyoptionList;
-  yySemanticOption** yypp;
-  yybool yymerge = yyfalse;
-  YYSTYPE yysval;
-  YYRESULTTAG yyflag;]b4_locations_if([
-  YYLTYPE *yylocp = &yys->yyloc;])[
-
-  for (yypp = &yyoptionList->yynext; *yypp != YY_NULL; )
-    {
-      yySemanticOption* yyp = *yypp;
-
-      if (yyidenticalOptions (yybest, yyp))
-        {
-          yymergeOptionSets (yybest, yyp);
-          *yypp = yyp->yynext;
-        }
-      else
-        {
-          switch (yypreference (yybest, yyp))
-            {
-            case 0:]b4_locations_if([[
-              yyresolveLocations (yys, 1, yystackp]b4_user_args[);]])[
-              return yyreportAmbiguity (yybest, yyp]b4_pure_args[);
-              break;
-            case 1:
-              yymerge = yytrue;
-              break;
-            case 2:
-              break;
-            case 3:
-              yybest = yyp;
-              yymerge = yyfalse;
-              break;
-            default:
-              /* This cannot happen so it is not worth a YYASSERT (yyfalse),
-                 but some compilers complain if the default case is
-                 omitted.  */
-              break;
-            }
-          yypp = &yyp->yynext;
-        }
-    }
-
-  if (yymerge)
-    {
-      yySemanticOption* yyp;
-      int yyprec = yydprec[yybest->yyrule];
-      yyflag = yyresolveAction (yybest, yystackp, &yysval]b4_locuser_args[);
-      if (yyflag == yyok)
-        for (yyp = yybest->yynext; yyp != YY_NULL; yyp = yyp->yynext)
-          {
-            if (yyprec == yydprec[yyp->yyrule])
-              {
-                YYSTYPE yysval_other;]b4_locations_if([
-                YYLTYPE yydummy;])[
-                yyflag = yyresolveAction (yyp, yystackp, &yysval_other]b4_locuser_args([&yydummy])[);
-                if (yyflag != yyok)
-                  {
-                    yydestruct ("Cleanup: discarding incompletely merged value for",
-                                yystos[yys->yylrState],
-                                &yysval]b4_locuser_args[);
-                    break;
-                  }
-                yyuserMerge (yymerger[yyp->yyrule], &yysval, &yysval_other);
-              }
-          }
-    }
-  else
-    yyflag = yyresolveAction (yybest, yystackp, &yysval]b4_locuser_args([yylocp])[);
-
-  if (yyflag == yyok)
-    {
-      yys->yyresolved = yytrue;
-      yys->yysemantics.yysval = yysval;
-    }
-  else
-    yys->yysemantics.yyfirstVal = YY_NULL;
-  return yyflag;
-}
-
-static YYRESULTTAG
-yyresolveStack (yyGLRStack* yystackp]b4_user_formals[)
-{
-  if (yystackp->yysplitPoint != YY_NULL)
-    {
-      yyGLRState* yys;
-      int yyn;
-
-      for (yyn = 0, yys = yystackp->yytops.yystates[0];
-           yys != yystackp->yysplitPoint;
-           yys = yys->yypred, yyn += 1)
-        continue;
-      YYCHK (yyresolveStates (yystackp->yytops.yystates[0], yyn, yystackp
-                             ]b4_user_args[));
-    }
-  return yyok;
-}
-
-static void
-yycompressStack (yyGLRStack* yystackp)
-{
-  yyGLRState* yyp, *yyq, *yyr;
-
-  if (yystackp->yytops.yysize != 1 || yystackp->yysplitPoint == YY_NULL)
-    return;
-
-  for (yyp = yystackp->yytops.yystates[0], yyq = yyp->yypred, yyr = YY_NULL;
-       yyp != yystackp->yysplitPoint;
-       yyr = yyp, yyp = yyq, yyq = yyp->yypred)
-    yyp->yypred = yyr;
-
-  yystackp->yyspaceLeft += yystackp->yynextFree - yystackp->yyitems;
-  yystackp->yynextFree = ((yyGLRStackItem*) yystackp->yysplitPoint) + 1;
-  yystackp->yyspaceLeft -= yystackp->yynextFree - yystackp->yyitems;
-  yystackp->yysplitPoint = YY_NULL;
-  yystackp->yylastDeleted = YY_NULL;
-
-  while (yyr != YY_NULL)
-    {
-      yystackp->yynextFree->yystate = *yyr;
-      yyr = yyr->yypred;
-      yystackp->yynextFree->yystate.yypred = &yystackp->yynextFree[-1].yystate;
-      yystackp->yytops.yystates[0] = &yystackp->yynextFree->yystate;
-      yystackp->yynextFree += 1;
-      yystackp->yyspaceLeft -= 1;
-    }
-}
-
-static YYRESULTTAG
-yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
-                   size_t yyposn]b4_pure_formals[)
-{
-  while (yystackp->yytops.yystates[yyk] != YY_NULL)
-    {
-      yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState;
-      YYDPRINTF ((stderr, "Stack %lu Entering state %d\n",
-                  (unsigned long int) yyk, yystate));
-
-      YYASSERT (yystate != YYFINAL);
-
-      if (yyisDefaultedState (yystate))
-        {
-          YYRESULTTAG yyflag;
-          yyRuleNum yyrule = yydefaultAction (yystate);
-          if (yyrule == 0)
-            {
-              YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                          (unsigned long int) yyk));
-              yymarkStackDeleted (yystackp, yyk);
-              return yyok;
-            }
-          yyflag = yyglrReduce (yystackp, yyk, yyrule, yyimmediate[yyrule]]b4_user_args[);
-          if (yyflag == yyerr)
-            {
-              YYDPRINTF ((stderr,
-                          "Stack %lu dies "
-                          "(predicate failure or explicit user error).\n",
-                          (unsigned long int) yyk));
-              yymarkStackDeleted (yystackp, yyk);
-              return yyok;
-            }
-          if (yyflag != yyok)
-            return yyflag;
-        }
-      else
-        {
-          yySymbol yytoken;
-          int yyaction;
-          const short int* yyconflicts;
-
-          yystackp->yytops.yylookaheadNeeds[yyk] = yytrue;
-          if (yychar == YYEMPTY)
-            {
-              YYDPRINTF ((stderr, "Reading a token: "));
-              yychar = ]b4_lex[;
-            }
-
-          if (yychar <= YYEOF)
-            {
-              yychar = yytoken = YYEOF;
-              YYDPRINTF ((stderr, "Now at end of input.\n"));
-            }
-          else
-            {
-              yytoken = YYTRANSLATE (yychar);
-              YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-            }
-
-          yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);
-
-          while (*yyconflicts != 0)
-            {
-              YYRESULTTAG yyflag;
-              size_t yynewStack = yysplitStack (yystackp, yyk);
-              YYDPRINTF ((stderr, "Splitting off stack %lu from %lu.\n",
-                          (unsigned long int) yynewStack,
-                          (unsigned long int) yyk));
-              yyflag = yyglrReduce (yystackp, yynewStack,
-                                    *yyconflicts,
-                                    yyimmediate[*yyconflicts]]b4_user_args[);
-              if (yyflag == yyok)
-                YYCHK (yyprocessOneStack (yystackp, yynewStack,
-                                          yyposn]b4_pure_args[));
-              else if (yyflag == yyerr)
-                {
-                  YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                              (unsigned long int) yynewStack));
-                  yymarkStackDeleted (yystackp, yynewStack);
-                }
-              else
-                return yyflag;
-              yyconflicts += 1;
-            }
-
-          if (yyisShiftAction (yyaction))
-            break;
-          else if (yyisErrorAction (yyaction))
-            {
-              YYDPRINTF ((stderr, "Stack %lu dies.\n",
-                          (unsigned long int) yyk));
-              yymarkStackDeleted (yystackp, yyk);
-              break;
-            }
-          else
-            {
-              YYRESULTTAG yyflag = yyglrReduce (yystackp, yyk, -yyaction,
-                                                yyimmediate[-yyaction]]b4_user_args[);
-              if (yyflag == yyerr)
-                {
-                  YYDPRINTF ((stderr,
-                              "Stack %lu dies "
-                              "(predicate failure or explicit user error).\n",
-                              (unsigned long int) yyk));
-                  yymarkStackDeleted (yystackp, yyk);
-                  break;
-                }
-              else if (yyflag != yyok)
-                return yyflag;
-            }
-        }
-    }
-  return yyok;
-}
-
-static void
-yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
-{
-  if (yystackp->yyerrState != 0)
-    return;
-#if ! YYERROR_VERBOSE
-  yyerror (]b4_lyyerror_args[YY_("syntax error"));
-#else
-  {
-  yySymbol yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-  size_t yysize0 = yytnamerr (YY_NULL, yytokenName (yytoken));
-  size_t yysize = yysize0;
-  yybool yysize_overflow = yyfalse;
-  char* yymsg = YY_NULL;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected").  */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[yystackp->yytops.yystates[0]->yylrState];
-      yyarg[yycount++] = yytokenName (yytoken);
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for this
-             state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytokenName (yyx);
-                {
-                  size_t yysz = yysize + yytnamerr (YY_NULL, yytokenName (yyx));
-                  yysize_overflow |= yysz < yysize;
-                  yysize = yysz;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-#define YYCASE_(N, S)                   \
-      case N:                           \
-        yyformat = S;                   \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-#undef YYCASE_
-    }
-
-  {
-    size_t yysz = yysize + strlen (yyformat);
-    yysize_overflow |= yysz < yysize;
-    yysize = yysz;
-  }
-
-  if (!yysize_overflow)
-    yymsg = (char *) YYMALLOC (yysize);
-
-  if (yymsg)
-    {
-      char *yyp = yymsg;
-      int yyi = 0;
-      while ((*yyp = *yyformat))
-        {
-          if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-            {
-              yyp += yytnamerr (yyp, yyarg[yyi++]);
-              yyformat += 2;
-            }
-          else
-            {
-              yyp++;
-              yyformat++;
-            }
-        }
-      yyerror (]b4_lyyerror_args[yymsg);
-      YYFREE (yymsg);
-    }
-  else
-    {
-      yyerror (]b4_lyyerror_args[YY_("syntax error"));
-      yyMemoryExhausted (yystackp);
-    }
-  }
-#endif /* YYERROR_VERBOSE */
-  yynerrs += 1;
-}
-
-/* Recover from a syntax error on *YYSTACKP, assuming that *YYSTACKP->YYTOKENP,
-   yylval, and yylloc are the syntactic category, semantic value, and location
-   of the lookahead.  */
-static void
-yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
-{
-  size_t yyk;
-  int yyj;
-
-  if (yystackp->yyerrState == 3)
-    /* We just shifted the error token and (perhaps) took some
-       reductions.  Skip tokens until we can proceed.  */
-    while (yytrue)
-      {
-        yySymbol yytoken;
-        if (yychar == YYEOF)
-          yyFail (yystackp][]b4_lpure_args[, YY_NULL);
-        if (yychar != YYEMPTY)
-          {]b4_locations_if([[
-            /* We throw away the lookahead, but the error range
-               of the shifted error token must take it into account.  */
-            yyGLRState *yys = yystackp->yytops.yystates[0];
-            yyGLRStackItem yyerror_range[3];
-            yyerror_range[1].yystate.yyloc = yys->yyloc;
-            yyerror_range[2].yystate.yyloc = yylloc;
-            YYLLOC_DEFAULT ((yys->yyloc), yyerror_range, 2);]])[
-            yytoken = YYTRANSLATE (yychar);
-            yydestruct ("Error: discarding",
-                        yytoken, &yylval]b4_locuser_args([&yylloc])[);
-          }
-        YYDPRINTF ((stderr, "Reading a token: "));
-        yychar = ]b4_lex[;
-        if (yychar <= YYEOF)
-          {
-            yychar = yytoken = YYEOF;
-            YYDPRINTF ((stderr, "Now at end of input.\n"));
-          }
-        else
-          {
-            yytoken = YYTRANSLATE (yychar);
-            YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-          }
-        yyj = yypact[yystackp->yytops.yystates[0]->yylrState];
-        if (yypact_value_is_default (yyj))
-          return;
-        yyj += yytoken;
-        if (yyj < 0 || YYLAST < yyj || yycheck[yyj] != yytoken)
-          {
-            if (yydefact[yystackp->yytops.yystates[0]->yylrState] != 0)
-              return;
-          }
-        else if (! yytable_value_is_error (yytable[yyj]))
-          return;
-      }
-
-  /* Reduce to one stack.  */
-  for (yyk = 0; yyk < yystackp->yytops.yysize; yyk += 1)
-    if (yystackp->yytops.yystates[yyk] != YY_NULL)
-      break;
-  if (yyk >= yystackp->yytops.yysize)
-    yyFail (yystackp][]b4_lpure_args[, YY_NULL);
-  for (yyk += 1; yyk < yystackp->yytops.yysize; yyk += 1)
-    yymarkStackDeleted (yystackp, yyk);
-  yyremoveDeletes (yystackp);
-  yycompressStack (yystackp);
-
-  /* Now pop stack until we find a state that shifts the error token.  */
-  yystackp->yyerrState = 3;
-  while (yystackp->yytops.yystates[0] != YY_NULL)
-    {
-      yyGLRState *yys = yystackp->yytops.yystates[0];
-      yyj = yypact[yys->yylrState];
-      if (! yypact_value_is_default (yyj))
-        {
-          yyj += YYTERROR;
-          if (0 <= yyj && yyj <= YYLAST && yycheck[yyj] == YYTERROR
-              && yyisShiftAction (yytable[yyj]))
-            {
-              /* Shift the error token.  */]b4_locations_if([[
-              /* First adjust its location.*/
-              YYLTYPE yyerrloc;
-              yystackp->yyerror_range[2].yystate.yyloc = yylloc;
-              YYLLOC_DEFAULT (yyerrloc, (yystackp->yyerror_range), 2);]])[
-              YY_SYMBOL_PRINT ("Shifting", yystos[yytable[yyj]],
-                               &yylval, &yyerrloc);
-              yyglrShift (yystackp, 0, yytable[yyj],
-                          yys->yyposn, &yylval]b4_locations_if([, &yyerrloc])[);
-              yys = yystackp->yytops.yystates[0];
-              break;
-            }
-        }]b4_locations_if([[
-      yystackp->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
-      if (yys->yypred != YY_NULL)
-        yydestroyGLRState ("Error: popping", yys]b4_user_args[);
-      yystackp->yytops.yystates[0] = yys->yypred;
-      yystackp->yynextFree -= 1;
-      yystackp->yyspaceLeft += 1;
-    }
-  if (yystackp->yytops.yystates[0] == YY_NULL)
-    yyFail (yystackp][]b4_lpure_args[, YY_NULL);
-}
-
-#define YYCHK1(YYE)                                                          \
-  do {                                                                       \
-    switch (YYE) {                                                           \
-    case yyok:                                                               \
-      break;                                                                 \
-    case yyabort:                                                            \
-      goto yyabortlab;                                                       \
-    case yyaccept:                                                           \
-      goto yyacceptlab;                                                      \
-    case yyerr:                                                              \
-      goto yyuser_error;                                                     \
-    default:                                                                 \
-      goto yybuglab;                                                         \
-    }                                                                        \
-  } while (0)
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-]b4_function_define([yyparse], [int], b4_parse_param)[
-{
-  int yyresult;
-  yyGLRStack yystack;
-  yyGLRStack* const yystackp = &yystack;
-  size_t yyposn;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yychar = YYEMPTY;
-  yylval = yyval_default;]b4_locations_if([
-  yylloc = yyloc_default;])[
-]m4_ifdef([b4_initial_action], [
-b4_dollar_pushdef([yylval], [], [yylloc])dnl
-  /* User initialization code.  */
-  b4_user_initial_action
-b4_dollar_popdef])[]dnl
-[
-  if (! yyinitGLRStack (yystackp, YYINITDEPTH))
-    goto yyexhaustedlab;
-  switch (YYSETJMP (yystack.yyexception_buffer))
-    {
-    case 0: break;
-    case 1: goto yyabortlab;
-    case 2: goto yyexhaustedlab;
-    default: goto yybuglab;
-    }
-  yyglrShift (&yystack, 0, 0, 0, &yylval]b4_locations_if([, &yylloc])[);
-  yyposn = 0;
-
-  while (yytrue)
-    {
-      /* For efficiency, we have two loops, the first of which is
-         specialized to deterministic operation (single stack, no
-         potential ambiguity).  */
-      /* Standard mode */
-      while (yytrue)
-        {
-          yyRuleNum yyrule;
-          int yyaction;
-          const short int* yyconflicts;
-
-          yyStateNum yystate = yystack.yytops.yystates[0]->yylrState;
-          YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-          if (yystate == YYFINAL)
-            goto yyacceptlab;
-          if (yyisDefaultedState (yystate))
-            {
-              yyrule = yydefaultAction (yystate);
-              if (yyrule == 0)
-                {
-]b4_locations_if([[               yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
-                  yyreportSyntaxError (&yystack]b4_user_args[);
-                  goto yyuser_error;
-                }
-              YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue]b4_user_args[));
-            }
-          else
-            {
-              yySymbol yytoken;
-              if (yychar == YYEMPTY)
-                {
-                  YYDPRINTF ((stderr, "Reading a token: "));
-                  yychar = ]b4_lex[;
-                }
-
-              if (yychar <= YYEOF)
-                {
-                  yychar = yytoken = YYEOF;
-                  YYDPRINTF ((stderr, "Now at end of input.\n"));
-                }
-              else
-                {
-                  yytoken = YYTRANSLATE (yychar);
-                  YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-                }
-
-              yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts);
-              if (*yyconflicts != 0)
-                break;
-              if (yyisShiftAction (yyaction))
-                {
-                  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-                  yychar = YYEMPTY;
-                  yyposn += 1;
-                  yyglrShift (&yystack, 0, yyaction, yyposn, &yylval]b4_locations_if([, &yylloc])[);
-                  if (0 < yystack.yyerrState)
-                    yystack.yyerrState -= 1;
-                }
-              else if (yyisErrorAction (yyaction))
-                {
-]b4_locations_if([[               yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
-                  yyreportSyntaxError (&yystack]b4_user_args[);
-                  goto yyuser_error;
-                }
-              else
-                YYCHK1 (yyglrReduce (&yystack, 0, -yyaction, yytrue]b4_user_args[));
-            }
-        }
-
-      while (yytrue)
-        {
-          yySymbol yytoken_to_shift;
-          size_t yys;
-
-          for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
-            yystackp->yytops.yylookaheadNeeds[yys] = yychar != YYEMPTY;
-
-          /* yyprocessOneStack returns one of three things:
-
-              - An error flag.  If the caller is yyprocessOneStack, it
-                immediately returns as well.  When the caller is finally
-                yyparse, it jumps to an error label via YYCHK1.
-
-              - yyok, but yyprocessOneStack has invoked yymarkStackDeleted
-                (&yystack, yys), which sets the top state of yys to NULL.  Thus,
-                yyparse's following invocation of yyremoveDeletes will remove
-                the stack.
-
-              - yyok, when ready to shift a token.
-
-             Except in the first case, yyparse will invoke yyremoveDeletes and
-             then shift the next token onto all remaining stacks.  This
-             synchronization of the shift (that is, after all preceding
-             reductions on all stacks) helps prevent double destructor calls
-             on yylval in the event of memory exhaustion.  */
-
-          for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
-            YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn]b4_lpure_args[));
-          yyremoveDeletes (&yystack);
-          if (yystack.yytops.yysize == 0)
-            {
-              yyundeleteLastStack (&yystack);
-              if (yystack.yytops.yysize == 0)
-                yyFail (&yystack][]b4_lpure_args[, YY_("syntax error"));
-              YYCHK1 (yyresolveStack (&yystack]b4_user_args[));
-              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
-]b4_locations_if([[           yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[
-              yyreportSyntaxError (&yystack]b4_user_args[);
-              goto yyuser_error;
-            }
-
-          /* If any yyglrShift call fails, it will fail after shifting.  Thus,
-             a copy of yylval will already be on stack 0 in the event of a
-             failure in the following loop.  Thus, yychar is set to YYEMPTY
-             before the loop to make sure the user destructor for yylval isn't
-             called twice.  */
-          yytoken_to_shift = YYTRANSLATE (yychar);
-          yychar = YYEMPTY;
-          yyposn += 1;
-          for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
-            {
-              int yyaction;
-              const short int* yyconflicts;
-              yyStateNum yystate = yystack.yytops.yystates[yys]->yylrState;
-              yygetLRActions (yystate, yytoken_to_shift, &yyaction,
-                              &yyconflicts);
-              /* Note that yyconflicts were handled by yyprocessOneStack.  */
-              YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long int) yys));
-              YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, &yylval, &yylloc);
-              yyglrShift (&yystack, yys, yyaction, yyposn,
-                          &yylval]b4_locations_if([, &yylloc])[);
-              YYDPRINTF ((stderr, "Stack %lu now in state #%d\n",
-                          (unsigned long int) yys,
-                          yystack.yytops.yystates[yys]->yylrState));
-            }
-
-          if (yystack.yytops.yysize == 1)
-            {
-              YYCHK1 (yyresolveStack (&yystack]b4_user_args[));
-              YYDPRINTF ((stderr, "Returning to deterministic operation.\n"));
-              yycompressStack (&yystack);
-              break;
-            }
-        }
-      continue;
-    yyuser_error:
-      yyrecoverSyntaxError (&yystack]b4_user_args[);
-      yyposn = yystack.yytops.yystates[0]->yyposn;
-    }
-
- yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
- yybuglab:
-  YYASSERT (yyfalse);
-  goto yyabortlab;
-
- yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
- yyexhaustedlab:
-  yyerror (]b4_lyyerror_args[YY_("memory exhausted"));
-  yyresult = 2;
-  goto yyreturn;
-
- yyreturn:
-  if (yychar != YYEMPTY)
-    yydestruct ("Cleanup: discarding lookahead",
-                YYTRANSLATE (yychar), &yylval]b4_locuser_args([&yylloc])[);
-
-  /* If the stack is well-formed, pop the stack until it is empty,
-     destroying its entries as we go.  But free the stack regardless
-     of whether it is well-formed.  */
-  if (yystack.yyitems)
-    {
-      yyGLRState** yystates = yystack.yytops.yystates;
-      if (yystates)
-        {
-          size_t yysize = yystack.yytops.yysize;
-          size_t yyk;
-          for (yyk = 0; yyk < yysize; yyk += 1)
-            if (yystates[yyk])
-              {
-                while (yystates[yyk])
-                  {
-                    yyGLRState *yys = yystates[yyk];
-]b4_locations_if([[                 yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]]
-)[                  if (yys->yypred != YY_NULL)
-                      yydestroyGLRState ("Cleanup: popping", yys]b4_user_args[);
-                    yystates[yyk] = yys->yypred;
-                    yystack.yynextFree -= 1;
-                    yystack.yyspaceLeft += 1;
-                  }
-                break;
-              }
-        }
-      yyfreeGLRStack (&yystack);
-    }
-
-  return yyresult;
-}
-
-/* DEBUGGING ONLY */
-#if ]b4_api_PREFIX[DEBUG
-static void
-yy_yypstack (yyGLRState* yys)
-{
-  if (yys->yypred)
-    {
-      yy_yypstack (yys->yypred);
-      YYFPRINTF (stderr, " -> ");
-    }
-  YYFPRINTF (stderr, "%d@@%lu", yys->yylrState,
-             (unsigned long int) yys->yyposn);
-}
-
-static void
-yypstates (yyGLRState* yyst)
-{
-  if (yyst == YY_NULL)
-    YYFPRINTF (stderr, "<null>");
-  else
-    yy_yypstack (yyst);
-  YYFPRINTF (stderr, "\n");
-}
-
-static void
-yypstack (yyGLRStack* yystackp, size_t yyk)
-{
-  yypstates (yystackp->yytops.yystates[yyk]);
-}
-
-#define YYINDEX(YYX)                                                         \
-    ((YYX) == YY_NULL ? -1 : (yyGLRStackItem*) (YYX) - yystackp->yyitems)
-
-
-static void
-yypdumpstack (yyGLRStack* yystackp)
-{
-  yyGLRStackItem* yyp;
-  size_t yyi;
-  for (yyp = yystackp->yyitems; yyp < yystackp->yynextFree; yyp += 1)
-    {
-      YYFPRINTF (stderr, "%3lu. ",
-                 (unsigned long int) (yyp - yystackp->yyitems));
-      if (*(yybool *) yyp)
-        {
-          YYFPRINTF (stderr, "Res: %d, LR State: %d, posn: %lu, pred: %ld",
-                     yyp->yystate.yyresolved, yyp->yystate.yylrState,
-                     (unsigned long int) yyp->yystate.yyposn,
-                     (long int) YYINDEX (yyp->yystate.yypred));
-          if (! yyp->yystate.yyresolved)
-            YYFPRINTF (stderr, ", firstVal: %ld",
-                       (long int) YYINDEX (yyp->yystate
-                                             .yysemantics.yyfirstVal));
-        }
-      else
-        {
-          YYFPRINTF (stderr, "Option. rule: %d, state: %ld, next: %ld",
-                     yyp->yyoption.yyrule - 1,
-                     (long int) YYINDEX (yyp->yyoption.yystate),
-                     (long int) YYINDEX (yyp->yyoption.yynext));
-        }
-      YYFPRINTF (stderr, "\n");
-    }
-  YYFPRINTF (stderr, "Tops:");
-  for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
-    YYFPRINTF (stderr, "%lu: %ld; ", (unsigned long int) yyi,
-               (long int) YYINDEX (yystackp->yytops.yystates[yyi]));
-  YYFPRINTF (stderr, "\n");
-}
-#endif
-
-#undef yylval
-#undef yychar
-#undef yynerrs]b4_locations_if([
-#undef yylloc])
-
-m4_if(b4_prefix, [yy], [],
-[[/* Substitute the variable and function names.  */
-#define yyparse ]b4_prefix[parse
-#define yylex   ]b4_prefix[lex
-#define yyerror ]b4_prefix[error
-#define yylval  ]b4_prefix[lval
-#define yychar  ]b4_prefix[char
-#define yydebug ]b4_prefix[debug
-#define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
-#define yylloc  ]b4_prefix[lloc]])])[
-
-]b4_epilogue[]dnl
-b4_output_end()
-
-# glr.cc produces its own header.
-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-2013])[
-
-]b4_cpp_guard_open([b4_spec_defines_file])[
-]b4_shared_declarations[
-]b4_cpp_guard_close([b4_spec_defines_file])[
-]b4_output_end()
-])])
diff --git a/contrib/tools/bison/bison/data/java-skel.m4 b/contrib/tools/bison/bison/data/java-skel.m4
deleted file mode 100644
index 384a6370dd..0000000000
--- a/contrib/tools/bison/bison/data/java-skel.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# Java skeleton dispatching for Bison.
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-b4_glr_if(             [b4_complain([%%glr-parser not supported for Java])])
-b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for Java])])
-
-m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]])
-m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
-
-m4_include(b4_used_skeleton)
diff --git a/contrib/tools/bison/bison/data/java.m4 b/contrib/tools/bison/bison/data/java.m4
deleted file mode 100644
index f985f977f1..0000000000
--- a/contrib/tools/bison/bison/data/java.m4
+++ /dev/null
@@ -1,342 +0,0 @@
-                                                            -*- Autoconf -*-
-
-# Java language support for Bison
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-m4_include(b4_pkgdatadir/[c-like.m4])
-
-
-# b4_list2(LIST1, LIST2)
-# ----------------------
-# Join two lists with a comma if necessary.
-m4_define([b4_list2],
-          [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])
-
-
-# b4_percent_define_get3(DEF, PRE, POST, NOT)
-# -------------------------------------------
-# Expand to the value of DEF surrounded by PRE and POST if it's %define'ed,
-# otherwise NOT.
-m4_define([b4_percent_define_get3],
-          [m4_ifval(m4_quote(b4_percent_define_get([$1])),
-                [$2[]b4_percent_define_get([$1])[]$3], [$4])])
-
-
-
-# b4_flag_value(BOOLEAN-FLAG)
-# ---------------------------
-m4_define([b4_flag_value], [b4_flag_if([$1], [true], [false])])
-
-
-# b4_public_if(TRUE, FALSE)
-# -------------------------
-b4_percent_define_default([[public]], [[false]])
-m4_define([b4_public_if],
-[b4_percent_define_flag_if([public], [$1], [$2])])
-
-
-# b4_abstract_if(TRUE, FALSE)
-# ---------------------------
-b4_percent_define_default([[abstract]], [[false]])
-m4_define([b4_abstract_if],
-[b4_percent_define_flag_if([abstract], [$1], [$2])])
-
-
-# b4_final_if(TRUE, FALSE)
-# ---------------------------
-b4_percent_define_default([[final]], [[false]])
-m4_define([b4_final_if],
-[b4_percent_define_flag_if([final], [$1], [$2])])
-
-
-# b4_strictfp_if(TRUE, FALSE)
-# ---------------------------
-b4_percent_define_default([[strictfp]], [[false]])
-m4_define([b4_strictfp_if],
-[b4_percent_define_flag_if([strictfp], [$1], [$2])])
-
-
-# b4_lexer_if(TRUE, FALSE)
-# ------------------------
-m4_define([b4_lexer_if],
-[b4_percent_code_ifdef([[lexer]], [$1], [$2])])
-
-
-# b4_identification
-# -----------------
-m4_define([b4_identification],
-[  /** Version number for the Bison executable that generated this parser.  */
-  public static final String bisonVersion = "b4_version";
-
-  /** Name of the skeleton that generated this parser.  */
-  public static final String bisonSkeleton = b4_skeleton;
-])
-
-
-## ------------ ##
-## Data types.  ##
-## ------------ ##
-
-# b4_int_type(MIN, MAX)
-# ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# MIN to MAX (included).
-m4_define([b4_int_type],
-[m4_if(b4_ints_in($@,   [-128],   [127]), [1], [byte],
-       b4_ints_in($@, [-32768], [32767]), [1], [short],
-                                               [int])])
-
-# b4_int_type_for(NAME)
-# ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# 'NAME_min' to 'NAME_max' (included).
-m4_define([b4_int_type_for],
-[b4_int_type($1_min, $1_max)])
-
-# b4_null
-# -------
-m4_define([b4_null], [null])
-
-
-# b4_typed_parser_table_define(TYPE, NAME, DATA, COMMENT)
-# -------------------------------------------------------
-m4_define([b4_typed_parser_table_define],
-[m4_ifval([$4], [b4_comment([$4])
-  ])dnl
-[private static final ]$1[ yy$2_[] = yy$2_init();
-  private static final ]$1[[] yy$2_init()
-  {
-    return new ]$1[[]
-    {
-  ]$3[
-    };
-  }]])
-
-
-# b4_integral_parser_table_define(NAME, DATA, COMMENT)
-#-----------------------------------------------------
-m4_define([b4_integral_parser_table_define],
-[b4_typed_parser_table_define([b4_int_type_for([$2])], [$1], [$2], [$3])])
-
-
-## ------------------------- ##
-## Assigning token numbers.  ##
-## ------------------------- ##
-
-# b4_token_enum(TOKEN-NUM)
-# ------------------------
-# Output the definition of this token as an enum.
-m4_define([b4_token_enum],
-[b4_token_format([    /** Token number, to be returned by the scanner.  */
-    static final int %s = %s;
-], [$1])])
-
-# b4_token_enums
-# --------------
-# Output the definition of the tokens (if there are) as enums.
-m4_define([b4_token_enums],
-[b4_any_token_visible_if([/* Tokens.  */
-b4_symbol_foreach([b4_token_enum])])])
-
-# b4-case(ID, CODE)
-# -----------------
-# We need to fool Java's stupid unreachable code detection.
-m4_define([b4_case], [  case $1:
-  if (yyn == $1)
-    $2;
-  break;
-    ])
-
-# b4_predicate_case(LABEL, CONDITIONS)
-# ------------------------------------
-m4_define([b4_predicate_case], [  case $1:
-     if (! ($2)) YYERROR;
-    break;
-    ])
-
-
-## -------- ##
-## Checks.  ##
-## -------- ##
-
-b4_percent_define_check_kind([[api.value.type]],    [code], [deprecated])
-
-b4_percent_define_check_kind([[annotations]],       [code], [deprecated])
-b4_percent_define_check_kind([[extends]],           [code], [deprecated])
-b4_percent_define_check_kind([[implements]],        [code], [deprecated])
-b4_percent_define_check_kind([[init_throws]],       [code], [deprecated])
-b4_percent_define_check_kind([[lex_throws]],        [code], [deprecated])
-b4_percent_define_check_kind([[parser_class_name]], [code], [deprecated])
-b4_percent_define_check_kind([[throws]],            [code], [deprecated])
-
-
-
-## ---------------- ##
-## Default values.  ##
-## ---------------- ##
-
-m4_define([b4_yystype], [b4_percent_define_get([[api.value.type]])])
-b4_percent_define_default([[api.value.type]], [[Object]])
-
-# %name-prefix
-m4_define_default([b4_prefix], [[YY]])
-
-b4_percent_define_default([[parser_class_name]], [b4_prefix[]Parser])
-m4_define([b4_parser_class_name], [b4_percent_define_get([[parser_class_name]])])
-
-b4_percent_define_default([[lex_throws]], [[java.io.IOException]])
-m4_define([b4_lex_throws], [b4_percent_define_get([[lex_throws]])])
-
-b4_percent_define_default([[throws]], [])
-m4_define([b4_throws], [b4_percent_define_get([[throws]])])
-
-b4_percent_define_default([[init_throws]], [])
-m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])])
-
-b4_percent_define_default([[api.location.type]], [Location])
-m4_define([b4_location_type], [b4_percent_define_get([[api.location.type]])])
-
-b4_percent_define_default([[api.position.type]], [Position])
-m4_define([b4_position_type], [b4_percent_define_get([[api.position.type]])])
-
-
-## ----------------- ##
-## Semantic Values.  ##
-## ----------------- ##
-
-
-# b4_lhs_value([TYPE])
-# --------------------
-# Expansion of $<TYPE>$.
-m4_define([b4_lhs_value], [yyval])
-
-
-# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
-# --------------------------------------
-# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
-# symbols on RHS.
-#
-# In this simple implementation, %token and %type have class names
-# between the angle brackets.
-m4_define([b4_rhs_value],
-[(m4_ifval($3, [($3)])[](yystack.valueAt ($1-($2))))])
-
-# b4_lhs_location()
-# -----------------
-# Expansion of @$.
-m4_define([b4_lhs_location],
-[(yyloc)])
-
-
-# b4_rhs_location(RULE-LENGTH, NUM)
-# ---------------------------------
-# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
-# on RHS.
-m4_define([b4_rhs_location],
-[yystack.locationAt ($1-($2))])
-
-
-# b4_lex_param
-# b4_parse_param
-# --------------
-# If defined, b4_lex_param arrives double quoted, but below we prefer
-# it to be single quoted.  Same for b4_parse_param.
-
-# TODO: should be in bison.m4
-m4_define_default([b4_lex_param], [[]])
-m4_define([b4_lex_param], b4_lex_param)
-m4_define([b4_parse_param], b4_parse_param)
-
-# b4_lex_param_decl
-# -----------------
-# Extra formal arguments of the constructor.
-m4_define([b4_lex_param_decl],
-[m4_ifset([b4_lex_param],
-          [b4_remove_comma([$1],
-                           b4_param_decls(b4_lex_param))],
-          [$1])])
-
-m4_define([b4_param_decls],
-          [m4_map([b4_param_decl], [$@])])
-m4_define([b4_param_decl], [, $1])
-
-m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)])
-
-
-
-# b4_parse_param_decl
-# -------------------
-# Extra formal arguments of the constructor.
-m4_define([b4_parse_param_decl],
-[m4_ifset([b4_parse_param],
-          [b4_remove_comma([$1],
-                           b4_param_decls(b4_parse_param))],
-          [$1])])
-
-
-
-# b4_lex_param_call
-# -----------------
-# Delegating the lexer parameters to the lexer constructor.
-m4_define([b4_lex_param_call],
-          [m4_ifset([b4_lex_param],
-                    [b4_remove_comma([$1],
-                                     b4_param_calls(b4_lex_param))],
-                    [$1])])
-m4_define([b4_param_calls],
-          [m4_map([b4_param_call], [$@])])
-m4_define([b4_param_call], [, $2])
-
-
-
-# b4_parse_param_cons
-# -------------------
-# Extra initialisations of the constructor.
-m4_define([b4_parse_param_cons],
-          [m4_ifset([b4_parse_param],
-                    [b4_constructor_calls(b4_parse_param)])])
-
-m4_define([b4_constructor_calls],
-          [m4_map([b4_constructor_call], [$@])])
-m4_define([b4_constructor_call],
-          [this.$2 = $2;
-          ])
-
-
-
-# b4_parse_param_vars
-# -------------------
-# Extra instance variables.
-m4_define([b4_parse_param_vars],
-          [m4_ifset([b4_parse_param],
-                    [
-    /* User arguments.  */
-b4_var_decls(b4_parse_param)])])
-
-m4_define([b4_var_decls],
-          [m4_map_sep([b4_var_decl], [
-], [$@])])
-m4_define([b4_var_decl],
-          [    protected final $1;])
-
-
-
-# b4_maybe_throws(THROWS)
-# -----------------------
-# Expand to either an empty string or "throws THROWS".
-m4_define([b4_maybe_throws],
-          [m4_ifval($1, [throws $1])])
diff --git a/contrib/tools/bison/bison/data/lalr1.java b/contrib/tools/bison/bison/data/lalr1.java
deleted file mode 100644
index d137ed814b..0000000000
--- a/contrib/tools/bison/bison/data/lalr1.java
+++ /dev/null
@@ -1,1065 +0,0 @@
-# Java skeleton for Bison -*- autoconf -*-
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-m4_include(b4_pkgdatadir/[java.m4])
-
-b4_defines_if([b4_fatal([%s: %%defines does not make sense in Java],
-              [b4_skeleton])])
-
-# We do not depend on %debug in Java, but pacify warnings about
-# non-used flags.
-b4_parse_trace_if([0], [0])
-
-m4_define([b4_symbol_no_destructor_assert],
-[b4_symbol_if([$1], [has_destructor],
-              [b4_fatal([%s: %s: %%destructor does not make sense in Java],
-                        [b4_skeleton],
-                        [b4_symbol_action_location([$1], [destructor])])])])
-b4_symbol_foreach([b4_symbol_no_destructor_assert])
-
-# Setup some macros for api.push-pull.
-b4_percent_define_default([[api.push-pull]], [[pull]])
-b4_percent_define_check_values([[[[api.push-pull]],
-                                 [[pull]], [[push]], [[both]]]])
-
-# Define m4 conditional macros that encode the value
-# of the api.push-pull flag.
-b4_define_flag_if([pull]) m4_define([b4_pull_flag], [[1]])
-b4_define_flag_if([push]) m4_define([b4_push_flag], [[1]])
-m4_case(b4_percent_define_get([[api.push-pull]]),
-        [pull], [m4_define([b4_push_flag], [[0]])],
-        [push], [m4_define([b4_pull_flag], [[0]])])
-
-# Define a macro to be true when api.push-pull has the value "both".
-m4_define([b4_both_if],[b4_push_if([b4_pull_if([$1],[$2])],[$2])])
-
-# Handle BISON_USE_PUSH_FOR_PULL for the test suite.  So that push parsing
-# tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the
-# behavior of Bison at all when push parsing is already requested.
-b4_define_flag_if([use_push_for_pull])
-b4_use_push_for_pull_if([
-  b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])],
-             [m4_define([b4_push_flag], [[1]])])])
-
-# Define a macro to encapsulate the parse state variables.
-# This allows them to be defined either in parse() when doing
-# pull parsing, or as class instance variable when doing push parsing.
-m4_define([b4_define_state],[[
-    /* Lookahead and lookahead in internal form.  */
-    int yychar = yyempty_;
-    int yytoken = 0;
-
-    /* State.  */
-    int yyn = 0;
-    int yylen = 0;
-    int yystate = 0;
-    YYStack yystack = new YYStack ();
-    int label = YYNEWSTATE;
-
-    /* Error handling.  */
-    int yynerrs_ = 0;
-    ]b4_locations_if([/* The location where the error started.  */
-    b4_location_type yyerrloc = null;
-
-    /* Location. */
-    b4_location_type yylloc = new b4_location_type (null, null);])[
-
-    /* Semantic value of the lookahead.  */
-    ]b4_yystype[ yylval = null;
-]])
-
-b4_output_begin([b4_parser_file_name])
-b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java],
-             [2007-2013])
-
-b4_percent_define_ifdef([package], [package b4_percent_define_get([package]);
-])[/* First part of user declarations.  */
-]b4_user_pre_prologue
-b4_user_post_prologue
-b4_percent_code_get([[imports]])
-[/**
- * A Bison parser, automatically generated from <tt>]m4_bpatsubst(b4_file_name, [^"\(.*\)"$], [\1])[</tt>.
- *
- * @@author LALR (1) parser skeleton written by Paolo Bonzini.
- */
-]b4_percent_define_get3([annotations], [], [ ])dnl
-b4_public_if([public ])dnl
-b4_abstract_if([abstract ])dnl
-b4_final_if([final ])dnl
-b4_strictfp_if([strictfp ])dnl
-[class ]b4_parser_class_name[]dnl
-b4_percent_define_get3([extends], [ extends ])dnl
-b4_percent_define_get3([implements], [ implements ])[
-{
-  ]b4_identification[
-]b4_error_verbose_if([[
-  /**
-   * True if verbose error messages are enabled.
-   */
-  private boolean yyErrorVerbose = true;
-
-  /**
-   * Return whether verbose error messages are enabled.
-   */
-  public final boolean getErrorVerbose() { return yyErrorVerbose; }
-
-  /**
-   * Set the verbosity of error messages.
-   * @@param verbose True to request verbose error messages.
-   */
-  public final void setErrorVerbose(boolean verbose)
-  { yyErrorVerbose = verbose; }
-]])
-
-b4_locations_if([[
-  /**
-   * A class defining a pair of positions.  Positions, defined by the
-   * <code>]b4_position_type[</code> class, denote a point in the input.
-   * Locations represent a part of the input through the beginning
-   * and ending positions.
-   */
-  public class ]b4_location_type[ {
-    /**
-     * The first, inclusive, position in the range.
-     */
-    public ]b4_position_type[ begin;
-
-    /**
-     * The first position beyond the range.
-     */
-    public ]b4_position_type[ end;
-
-    /**
-     * Create a <code>]b4_location_type[</code> denoting an empty range located at
-     * a given point.
-     * @@param loc The position at which the range is anchored.
-     */
-    public ]b4_location_type[ (]b4_position_type[ loc) {
-      this.begin = this.end = loc;
-    }
-
-    /**
-     * Create a <code>]b4_location_type[</code> from the endpoints of the range.
-     * @@param begin The first position included in the range.
-     * @@param end   The first position beyond the range.
-     */
-    public ]b4_location_type[ (]b4_position_type[ begin, ]b4_position_type[ end) {
-      this.begin = begin;
-      this.end = end;
-    }
-
-    /**
-     * Print a representation of the location.  For this to be correct,
-     * <code>]b4_position_type[</code> should override the <code>equals</code>
-     * method.
-     */
-    public String toString () {
-      if (begin.equals (end))
-        return begin.toString ();
-      else
-        return begin.toString () + "-" + end.toString ();
-    }
-  }
-
-]])
-
-  b4_locations_if([[
-  private ]b4_location_type[ yylloc (YYStack rhs, int n)
-  {
-    if (n > 0)
-      return new ]b4_location_type[ (rhs.locationAt (n-1).begin, rhs.locationAt (0).end);
-    else
-      return new ]b4_location_type[ (rhs.locationAt (0).end);
-  }]])[
-
-  /**
-   * Communication interface between the scanner and the Bison-generated
-   * parser <tt>]b4_parser_class_name[</tt>.
-   */
-  public interface Lexer {
-    /** Token returned by the scanner to signal the end of its input.  */
-    public static final int EOF = 0;
-
-]b4_token_enums[
-
-    ]b4_locations_if([[/**
-     * Method to retrieve the beginning position of the last scanned token.
-     * @@return the position at which the last scanned token starts.
-     */
-    ]b4_position_type[ getStartPos ();
-
-    /**
-     * Method to retrieve the ending position of the last scanned token.
-     * @@return the first position beyond the last scanned token.
-     */
-    ]b4_position_type[ getEndPos ();]])[
-
-    /**
-     * Method to retrieve the semantic value of the last scanned token.
-     * @@return the semantic value of the last scanned token.
-     */
-    ]b4_yystype[ getLVal ();
-
-    /**
-     * Entry point for the scanner.  Returns the token identifier corresponding
-     * to the next token and prepares to return the semantic value
-     * ]b4_locations_if([and beginning/ending positions ])[of the token.
-     * @@return the token identifier corresponding to the next token.
-     */
-    int yylex () ]b4_maybe_throws([b4_lex_throws])[;
-
-    /**
-     * Entry point for error reporting.  Emits an error
-     * ]b4_locations_if([referring to the given location ])[in a user-defined way.
-     *
-     * ]b4_locations_if([[@@param loc The location of the element to which the
-     *                error message is related]])[
-     * @@param msg The string for the error message.
-     */
-     void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String msg);]
-  }
-
-  b4_lexer_if([[private class YYLexer implements Lexer {
-]b4_percent_code_get([[lexer]])[
-  }
-
-  ]])[/**
-   * The object doing lexical analysis for us.
-   */
-  private Lexer yylexer;
-  ]
-  b4_parse_param_vars
-
-b4_lexer_if([[
-  /**
-   * Instantiates the Bison-generated parser.
-   */
-  public ]b4_parser_class_name (b4_parse_param_decl([b4_lex_param_decl])[) ]b4_maybe_throws([b4_init_throws])[
-  {
-    ]b4_percent_code_get([[init]])[
-    this.yylexer = new YYLexer(]b4_lex_param_call[);
-    ]b4_parse_param_cons[
-  }
-]])
-
-  /**
-   * Instantiates the Bison-generated parser.
-   * @@param yylexer The scanner that will supply tokens to the parser.
-   */
-  b4_lexer_if([[protected]], [[public]]) b4_parser_class_name[ (]b4_parse_param_decl([[Lexer yylexer]])[) ]b4_maybe_throws([b4_init_throws])[
-  {
-    ]b4_percent_code_get([[init]])[
-    this.yylexer = yylexer;
-    ]b4_parse_param_cons[
-  }
-
-  private java.io.PrintStream yyDebugStream = System.err;
-
-  /**
-   * Return the <tt>PrintStream</tt> on which the debugging output is
-   * printed.
-   */
-  public final java.io.PrintStream getDebugStream () { return yyDebugStream; }
-
-  /**
-   * Set the <tt>PrintStream</tt> on which the debug output is printed.
-   * @@param s The stream that is used for debugging output.
-   */
-  public final void setDebugStream(java.io.PrintStream s) { yyDebugStream = s; }
-
-  private int yydebug = 0;
-
-  /**
-   * Answer the verbosity of the debugging output; 0 means that all kinds of
-   * output from the parser are suppressed.
-   */
-  public final int getDebugLevel() { return yydebug; }
-
-  /**
-   * Set the verbosity of the debugging output; 0 means that all kinds of
-   * output from the parser are suppressed.
-   * @@param level The verbosity level for debugging output.
-   */
-  public final void setDebugLevel(int level) { yydebug = level; }
-
-  /**
-   * Print an error message via the lexer.
-   *]b4_locations_if([[ Use a <code>null</code> location.]])[
-   * @@param msg The error message.
-   */
-  public final void yyerror (String msg)
-  {
-    yylexer.yyerror (]b4_locations_if([[(]b4_location_type[)null, ]])[msg);
-  }
-]b4_locations_if([[
-  /**
-   * Print an error message via the lexer.
-   * @@param loc The location associated with the message.
-   * @@param msg The error message.
-   */
-  public final void yyerror (]b4_location_type[ loc, String msg)
-  {
-    yylexer.yyerror (loc, msg);
-  }
-
-  /**
-   * Print an error message via the lexer.
-   * @@param pos The position associated with the message.
-   * @@param msg The error message.
-   */
-  public final void yyerror (]b4_position_type[ pos, String msg)
-  {
-    yylexer.yyerror (new ]b4_location_type[ (pos), msg);
-  }]])
-
-  [protected final void yycdebug (String s) {
-    if (yydebug > 0)
-      yyDebugStream.println (s);
-  }
-
-  private final class YYStack {
-    private int[] stateStack = new int[16];
-    ]b4_locations_if([[private ]b4_location_type[[] locStack = new ]b4_location_type[[16];]])[
-    private ]b4_yystype[[] valueStack = new ]b4_yystype[[16];
-
-    public int size = 16;
-    public int height = -1;
-
-    public final void push (int state, ]b4_yystype[ value]dnl
-                            b4_locations_if([, ]b4_location_type[ loc])[) {
-      height++;
-      if (size == height)
-        {
-          int[] newStateStack = new int[size * 2];
-          System.arraycopy (stateStack, 0, newStateStack, 0, height);
-          stateStack = newStateStack;
-          ]b4_locations_if([[
-          ]b4_location_type[[] newLocStack = new ]b4_location_type[[size * 2];
-          System.arraycopy (locStack, 0, newLocStack, 0, height);
-          locStack = newLocStack;]])
-
-          b4_yystype[[] newValueStack = new ]b4_yystype[[size * 2];
-          System.arraycopy (valueStack, 0, newValueStack, 0, height);
-          valueStack = newValueStack;
-
-          size *= 2;
-        }
-
-      stateStack[height] = state;
-      ]b4_locations_if([[locStack[height] = loc;]])[
-      valueStack[height] = value;
-    }
-
-    public final void pop () {
-      pop (1);
-    }
-
-    public final void pop (int num) {
-      // Avoid memory leaks... garbage collection is a white lie!
-      if (num > 0) {
-        java.util.Arrays.fill (valueStack, height - num + 1, height + 1, null);
-        ]b4_locations_if([[java.util.Arrays.fill (locStack, height - num + 1, height + 1, null);]])[
-      }
-      height -= num;
-    }
-
-    public final int stateAt (int i) {
-      return stateStack[height - i];
-    }
-
-    ]b4_locations_if([[public final ]b4_location_type[ locationAt (int i) {
-      return locStack[height - i];
-    }
-
-    ]])[public final ]b4_yystype[ valueAt (int i) {
-      return valueStack[height - i];
-    }
-
-    // Print the state stack on the debug stream.
-    public void print (java.io.PrintStream out)
-    {
-      out.print ("Stack now");
-
-      for (int i = 0; i <= height; i++)
-        {
-          out.print (' ');
-          out.print (stateStack[i]);
-        }
-      out.println ();
-    }
-  }
-
-  /**
-   * Returned by a Bison action in order to stop the parsing process and
-   * return success (<tt>true</tt>).
-   */
-  public static final int YYACCEPT = 0;
-
-  /**
-   * Returned by a Bison action in order to stop the parsing process and
-   * return failure (<tt>false</tt>).
-   */
-  public static final int YYABORT = 1;
-
-]b4_push_if([
-  /**
-   * Returned by a Bison action in order to request a new token.
-   */
-  public static final int YYPUSH_MORE = 4;])[
-
-  /**
-   * Returned by a Bison action in order to start error recovery without
-   * printing an error message.
-   */
-  public static final int YYERROR = 2;
-
-  /**
-   * Internal return codes that are not supported for user semantic
-   * actions.
-   */
-  private static final int YYERRLAB = 3;
-  private static final int YYNEWSTATE = 4;
-  private static final int YYDEFAULT = 5;
-  private static final int YYREDUCE = 6;
-  private static final int YYERRLAB1 = 7;
-  private static final int YYRETURN = 8;
-]b4_push_if([[  private static final int YYGETTOKEN = 9; /* Signify that a new token is expected when doing push-parsing.  */]])[
-
-  private int yyerrstatus_ = 0;
-
-]b4_push_if([dnl
-b4_define_state])[
-  /**
-   * Return whether error recovery is being done.  In this state, the parser
-   * reads token until it reaches a known state, and then restarts normal
-   * operation.
-   */
-  public final boolean recovering ()
-  {
-    return yyerrstatus_ == 0;
-  }
-
-  private int yyaction (int yyn, YYStack yystack, int yylen) ]b4_maybe_throws([b4_throws])[
-  {
-    ]b4_yystype[ yyval;
-    ]b4_locations_if([b4_location_type[ yyloc = yylloc (yystack, yylen);]])[
-
-    /* If YYLEN is nonzero, implement the default value of the action:
-       '$$ = $1'.  Otherwise, use the top of the stack.
-
-       Otherwise, the following line sets YYVAL to garbage.
-       This behavior is undocumented and Bison
-       users should not rely upon it.  */
-    if (yylen > 0)
-      yyval = yystack.valueAt (yylen - 1);
-    else
-      yyval = yystack.valueAt (0);
-
-    yy_reduce_print (yyn, yystack);
-
-    switch (yyn)
-      {
-        ]b4_user_actions[
-        default: break;
-      }
-
-    yy_symbol_print ("-> $$ =", yyr1_[yyn], yyval]b4_locations_if([, yyloc])[);
-
-    yystack.pop (yylen);
-    yylen = 0;
-
-    /* Shift the result of the reduction.  */
-    yyn = yyr1_[yyn];
-    int yystate = yypgoto_[yyn - yyntokens_] + yystack.stateAt (0);
-    if (0 <= yystate && yystate <= yylast_
-        && yycheck_[yystate] == yystack.stateAt (0))
-      yystate = yytable_[yystate];
-    else
-      yystate = yydefgoto_[yyn - yyntokens_];
-
-    yystack.push (yystate, yyval]b4_locations_if([, yyloc])[);
-    return YYNEWSTATE;
-  }
-
-]b4_error_verbose_if([[
-  /* Return YYSTR after stripping away unnecessary quotes and
-     backslashes, so that it's suitable for yyerror.  The heuristic is
-     that double-quoting is unnecessary unless the string contains an
-     apostrophe, a comma, or backslash (other than backslash-backslash).
-     YYSTR is taken from yytname.  */
-  private final String yytnamerr_ (String yystr)
-  {
-    if (yystr.charAt (0) == '"')
-      {
-        StringBuffer yyr = new StringBuffer ();
-        strip_quotes: for (int i = 1; i < yystr.length (); i++)
-          switch (yystr.charAt (i))
-            {
-            case '\'':
-            case ',':
-              break strip_quotes;
-
-            case '\\':
-              if (yystr.charAt(++i) != '\\')
-                break strip_quotes;
-              /* Fall through.  */
-            default:
-              yyr.append (yystr.charAt (i));
-              break;
-
-            case '"':
-              return yyr.toString ();
-            }
-      }
-    else if (yystr.equals ("$end"))
-      return "end of input";
-
-    return yystr;
-  }
-]])[
-
-  /*--------------------------------.
-  | Print this symbol on YYOUTPUT.  |
-  `--------------------------------*/
-
-  private void yy_symbol_print (String s, int yytype,
-                                 ]b4_yystype[ yyvaluep]dnl
-                                 b4_locations_if([, Object yylocationp])[)
-  {
-    if (yydebug > 0)
-    yycdebug (s + (yytype < yyntokens_ ? " token " : " nterm ")
-              + yytname_[yytype] + " ("]b4_locations_if([
-              + yylocationp + ": "])[
-              + (yyvaluep == null ? "(null)" : yyvaluep.toString ()) + ")");
-  }
-
-]b4_push_if([],[[
-  /**
-   * Parse input from the scanner that was specified at object construction
-   * time.  Return whether the end of the input was reached successfully.
-   *
-   * @@return <tt>true</tt> if the parsing succeeds.  Note that this does not
-   *          imply that there were no syntax errors.
-   */
-   public boolean parse () ]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[]])[
-]b4_push_if([
-  /**
-   * Push Parse input from external lexer
-   *
-   * @@param yylextoken current token
-   * @@param yylexval current lval
-]b4_locations_if([   * @@param yylexloc current position])[
-   *
-   * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt>
-   */
-  public int push_parse (int yylextoken, b4_yystype yylexval[]b4_locations_if([, b4_location_type yylexloc]))
-      b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])])[
-  {
-    ]b4_locations_if([/* @@$.  */
-    b4_location_type yyloc;])[
-]b4_push_if([],[[
-]b4_define_state[
-    yycdebug ("Starting parse\n");
-    yyerrstatus_ = 0;
-
-    /* Initialize the stack.  */
-    yystack.push (yystate, yylval ]b4_locations_if([, yylloc])[);
-]m4_ifdef([b4_initial_action], [
-b4_dollar_pushdef([yylval], [], [yylloc])dnl
-    /* User initialization code.  */
-    b4_user_initial_action
-b4_dollar_popdef[]dnl
-])[
-]])[
-]b4_push_if([[
-    if (!this.push_parse_initialized)
-      {
-        push_parse_initialize ();
-]m4_ifdef([b4_initial_action], [
-b4_dollar_pushdef([yylval], [], [yylloc])dnl
-    /* User initialization code.  */
-    b4_user_initial_action
-b4_dollar_popdef[]dnl
-])[
-        yycdebug ("Starting parse\n");
-        yyerrstatus_ = 0;
-      } else
-        label = YYGETTOKEN;
-
-    boolean push_token_consumed = true;
-]])[
-    for (;;)
-      switch (label)
-      {
-        /* New state.  Unlike in the C/C++ skeletons, the state is already
-           pushed when we come here.  */
-      case YYNEWSTATE:
-        yycdebug ("Entering state " + yystate + "\n");
-        if (yydebug > 0)
-          yystack.print (yyDebugStream);
-
-        /* Accept?  */
-        if (yystate == yyfinal_)
-          ]b4_push_if([{label = YYACCEPT; break;}],
-                      [return true;])[
-
-        /* Take a decision.  First try without lookahead.  */
-        yyn = yypact_[yystate];
-        if (yy_pact_value_is_default_ (yyn))
-          {
-            label = YYDEFAULT;
-            break;
-          }
-]b4_push_if([        /* Fall Through */
-
-      case YYGETTOKEN:])[
-        /* Read a lookahead token.  */
-        if (yychar == yyempty_)
-          {
-]b4_push_if([[
-            if (!push_token_consumed)
-              return YYPUSH_MORE;
-            yycdebug ("Reading a token: ");
-            yychar = yylextoken;
-            yylval = yylexval;]b4_locations_if([
-            yylloc = yylexloc;])[
-            push_token_consumed = false;]])[
-]b4_push_if([],[[
-            yycdebug ("Reading a token: ");
-            yychar = yylexer.yylex ();
-            yylval = yylexer.getLVal ();]b4_locations_if([
-            yylloc = new b4_location_type (yylexer.getStartPos (),
-                            yylexer.getEndPos ());])[
-]])[
-          }
-
-        /* Convert token to internal form.  */
-        if (yychar <= Lexer.EOF)
-          {
-            yychar = yytoken = Lexer.EOF;
-            yycdebug ("Now at end of input.\n");
-          }
-        else
-          {
-            yytoken = yytranslate_ (yychar);
-            yy_symbol_print ("Next token is", yytoken,
-                             yylval]b4_locations_if([, yylloc])[);
-          }
-
-        /* If the proper action on seeing token YYTOKEN is to reduce or to
-           detect an error, take that action.  */
-        yyn += yytoken;
-        if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken)
-          label = YYDEFAULT;
-
-        /* <= 0 means reduce or error.  */
-        else if ((yyn = yytable_[yyn]) <= 0)
-          {
-            if (yy_table_value_is_error_ (yyn))
-              label = YYERRLAB;
-            else
-              {
-                yyn = -yyn;
-                label = YYREDUCE;
-              }
-          }
-
-        else
-          {
-            /* Shift the lookahead token.  */
-            yy_symbol_print ("Shifting", yytoken,
-                             yylval]b4_locations_if([, yylloc])[);
-
-            /* Discard the token being shifted.  */
-            yychar = yyempty_;
-
-            /* Count tokens shifted since error; after three, turn off error
-               status.  */
-            if (yyerrstatus_ > 0)
-              --yyerrstatus_;
-
-            yystate = yyn;
-            yystack.push (yystate, yylval]b4_locations_if([, yylloc])[);
-            label = YYNEWSTATE;
-          }
-        break;
-
-      /*-----------------------------------------------------------.
-      | yydefault -- do the default action for the current state.  |
-      `-----------------------------------------------------------*/
-      case YYDEFAULT:
-        yyn = yydefact_[yystate];
-        if (yyn == 0)
-          label = YYERRLAB;
-        else
-          label = YYREDUCE;
-        break;
-
-      /*-----------------------------.
-      | yyreduce -- Do a reduction.  |
-      `-----------------------------*/
-      case YYREDUCE:
-        yylen = yyr2_[yyn];
-        label = yyaction (yyn, yystack, yylen);
-        yystate = yystack.stateAt (0);
-        break;
-
-      /*------------------------------------.
-      | yyerrlab -- here on detecting error |
-      `------------------------------------*/
-      case YYERRLAB:
-        /* If not already recovering from an error, report this error.  */
-        if (yyerrstatus_ == 0)
-          {
-            ++yynerrs_;
-            if (yychar == yyempty_)
-              yytoken = yyempty_;
-            yyerror (]b4_locations_if([yylloc, ])[yysyntax_error (yystate, yytoken));
-          }
-
-        ]b4_locations_if([yyerrloc = yylloc;])[
-        if (yyerrstatus_ == 3)
-          {
-        /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-        if (yychar <= Lexer.EOF)
-          {
-          /* Return failure if at end of input.  */
-          if (yychar == Lexer.EOF)
-            ]b4_push_if([{label = YYABORT; break;}],[return false;])[
-          }
-        else
-            yychar = yyempty_;
-          }
-
-        /* Else will try to reuse lookahead token after shifting the error
-           token.  */
-        label = YYERRLAB1;
-        break;
-
-      /*-------------------------------------------------.
-      | errorlab -- error raised explicitly by YYERROR.  |
-      `-------------------------------------------------*/
-      case YYERROR:
-
-        ]b4_locations_if([yyerrloc = yystack.locationAt (yylen - 1);])[
-        /* Do not reclaim the symbols of the rule which action triggered
-           this YYERROR.  */
-        yystack.pop (yylen);
-        yylen = 0;
-        yystate = yystack.stateAt (0);
-        label = YYERRLAB1;
-        break;
-
-      /*-------------------------------------------------------------.
-      | yyerrlab1 -- common code for both syntax error and YYERROR.  |
-      `-------------------------------------------------------------*/
-      case YYERRLAB1:
-        yyerrstatus_ = 3;       /* Each real token shifted decrements this.  */
-
-        for (;;)
-          {
-            yyn = yypact_[yystate];
-            if (!yy_pact_value_is_default_ (yyn))
-              {
-                yyn += yyterror_;
-                if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
-                  {
-                    yyn = yytable_[yyn];
-                    if (0 < yyn)
-                      break;
-                  }
-              }
-
-            /* Pop the current state because it cannot handle the
-             * error token.  */
-            if (yystack.height == 0)
-              ]b4_push_if([{label = YYABORT; break;}],[return false;])[
-
-            ]b4_locations_if([yyerrloc = yystack.locationAt (0);])[
-            yystack.pop ();
-            yystate = yystack.stateAt (0);
-            if (yydebug > 0)
-              yystack.print (yyDebugStream);
-          }
-
-        if (label == YYABORT)
-            /* Leave the switch.  */
-            break;
-
-]b4_locations_if([
-        /* Muck with the stack to setup for yylloc.  */
-        yystack.push (0, null, yylloc);
-        yystack.push (0, null, yyerrloc);
-        yyloc = yylloc (yystack, 2);
-        yystack.pop (2);])[
-
-        /* Shift the error token.  */
-        yy_symbol_print ("Shifting", yystos_[yyn],
-                         yylval]b4_locations_if([, yyloc])[);
-
-        yystate = yyn;
-        yystack.push (yyn, yylval]b4_locations_if([, yyloc])[);
-        label = YYNEWSTATE;
-        break;
-
-        /* Accept.  */
-      case YYACCEPT:
-        ]b4_push_if([this.push_parse_initialized = false; return YYACCEPT;],
-                    [return true;])[
-
-        /* Abort.  */
-      case YYABORT:
-        ]b4_push_if([this.push_parse_initialized = false; return YYABORT;],
-                    [return false;])[
-      }
-}
-]b4_push_if([[
-  boolean push_parse_initialized = false;
-
-    /**
-     * (Re-)Initialize the state of the push parser.
-     */
-  public void push_parse_initialize()
-  {
-    /* Lookahead and lookahead in internal form.  */
-    this.yychar = yyempty_;
-    this.yytoken = 0;
-
-    /* State.  */
-    this.yyn = 0;
-    this.yylen = 0;
-    this.yystate = 0;
-    this.yystack = new YYStack ();
-    this.label = YYNEWSTATE;
-
-    /* Error handling.  */
-    this.yynerrs_ = 0;
-    ]b4_locations_if([/* The location where the error started.  */
-    this.yyerrloc = null;
-    this.yylloc = new b4_location_type (null, null);])[
-
-    /* Semantic value of the lookahead.  */
-    this.yylval = null;
-
-    yystack.push (this.yystate, this.yylval]b4_locations_if([, this.yylloc])[);
-
-    this.push_parse_initialized = true;
-
-  }
-]b4_locations_if([
-  /**
-   * Push parse given input from an external lexer.
-   *
-   * @@param yylextoken current token
-   * @@param yylexval current lval
-   * @@param yyylexpos current position
-   *
-   * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt>
-   */
-  public int push_parse (int yylextoken, b4_yystype yylexval, b4_position_type yylexpos)
-      b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])
-  {
-    return push_parse (yylextoken, yylexval, new b4_location_type (yylexpos));
-  }
-])[]])
-
-b4_both_if([[
-  /**
-   * Parse input from the scanner that was specified at object construction
-   * time.  Return whether the end of the input was reached successfully.
-   * This version of parse () is defined only when api.push-push=both.
-   *
-   * @@return <tt>true</tt> if the parsing succeeds.  Note that this does not
-   *          imply that there were no syntax errors.
-   */
-   public boolean parse () ]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[
-   {
-      if (yylexer == null)
-        throw new NullPointerException("Null Lexer");
-      int status;
-      do {
-        int token = yylexer.yylex();
-        ]b4_yystype[ lval = yylexer.getLVal();
-]b4_locations_if([dnl
-        b4_location_type yyloc = new b4_location_type (yylexer.getStartPos (),
-                                              yylexer.getEndPos ());])[
-        ]b4_locations_if([status = push_parse(token,lval,yyloc);],[
-        status = push_parse(token,lval);])[
-      } while (status == YYPUSH_MORE);
-      return (status == YYACCEPT);
-  }
-]])[
-
-  // Generate an error message.
-  private String yysyntax_error (int yystate, int tok)
-  {]b4_error_verbose_if([[
-    if (yyErrorVerbose)
-      {
-        /* There are many possibilities here to consider:
-           - If this state is a consistent state with a default action,
-             then the only way this function was invoked is if the
-             default action is an error action.  In that case, don't
-             check for expected tokens because there are none.
-           - The only way there can be no lookahead present (in tok) is
-             if this state is a consistent state with a default action.
-             Thus, detecting the absence of a lookahead is sufficient to
-             determine that there is no unexpected or expected token to
-             report.  In that case, just report a simple "syntax error".
-           - Don't assume there isn't a lookahead just because this
-             state is a consistent state with a default action.  There
-             might have been a previous inconsistent state, consistent
-             state with a non-default action, or user semantic action
-             that manipulated yychar.  (However, yychar is currently out
-             of scope during semantic actions.)
-           - Of course, the expected token list depends on states to
-             have correct lookahead information, and it depends on the
-             parser not to perform extra reductions after fetching a
-             lookahead from the scanner and before detecting a syntax
-             error.  Thus, state merging (from LALR or IELR) and default
-             reductions corrupt the expected token list.  However, the
-             list is correct for canonical LR with one exception: it
-             will still contain any token that will not be accepted due
-             to an error action in a later state.
-        */
-        if (tok != yyempty_)
-          {
-            /* FIXME: This method of building the message is not compatible
-               with internationalization.  */
-            StringBuffer res =
-              new StringBuffer ("syntax error, unexpected ");
-            res.append (yytnamerr_ (yytname_[tok]));
-            int yyn = yypact_[yystate];
-            if (!yy_pact_value_is_default_ (yyn))
-              {
-                /* Start YYX at -YYN if negative to avoid negative
-                   indexes in YYCHECK.  In other words, skip the first
-                   -YYN actions for this state because they are default
-                   actions.  */
-                int yyxbegin = yyn < 0 ? -yyn : 0;
-                /* Stay within bounds of both yycheck and yytname.  */
-                int yychecklim = yylast_ - yyn + 1;
-                int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
-                int count = 0;
-                for (int x = yyxbegin; x < yyxend; ++x)
-                  if (yycheck_[x + yyn] == x && x != yyterror_
-                      && !yy_table_value_is_error_ (yytable_[x + yyn]))
-                    ++count;
-                if (count < 5)
-                  {
-                    count = 0;
-                    for (int x = yyxbegin; x < yyxend; ++x)
-                      if (yycheck_[x + yyn] == x && x != yyterror_
-                          && !yy_table_value_is_error_ (yytable_[x + yyn]))
-                        {
-                          res.append (count++ == 0 ? ", expecting " : " or ");
-                          res.append (yytnamerr_ (yytname_[x]));
-                        }
-                  }
-              }
-            return res.toString ();
-          }
-      }
-]])[
-    return "syntax error";
-  }
-
-  /**
-   * Whether the given <code>yypact_</code> value indicates a defaulted state.
-   * @@param yyvalue   the value to check
-   */
-  private static boolean yy_pact_value_is_default_ (int yyvalue)
-  {
-    return yyvalue == yypact_ninf_;
-  }
-
-  /**
-   * Whether the given <code>yytable_</code>
-   * value indicates a syntax error.
-   * @@param yyvalue the value to check
-   */
-  private static boolean yy_table_value_is_error_ (int yyvalue)
-  {
-    return yyvalue == yytable_ninf_;
-  }
-
-  private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[;
-  private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[;
-
-  ]b4_parser_tables_define[
-  ]b4_integral_parser_table_define([token_number], [b4_toknum],
-     [[YYTOKEN_NUMBER[YYLEX-NUM] -- Internal symbol number corresponding
-   to YYLEX-NUM.]])[
-
-  /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-     First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
-  ]b4_typed_parser_table_define([String], [tname], [b4_tname])[
-
-  ]b4_integral_parser_table_define([rline], [b4_rline],
-  [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[
-
-
-  // Report on the debug stream that the rule yyrule is going to be reduced.
-  private void yy_reduce_print (int yyrule, YYStack yystack)
-  {
-    if (yydebug == 0)
-      return;
-
-    int yylno = yyrline_[yyrule];
-    int yynrhs = yyr2_[yyrule];
-    /* Print the symbols being reduced, and their result.  */
-    yycdebug ("Reducing stack by rule " + (yyrule - 1)
-              + " (line " + yylno + "), ");
-
-    /* The symbols being reduced.  */
-    for (int yyi = 0; yyi < yynrhs; yyi++)
-      yy_symbol_print ("   $" + (yyi + 1) + " =",
-                       yystos_[yystack.stateAt(yynrhs - (yyi + 1))],
-                       ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([,
-                       b4_rhs_location(yynrhs, yyi + 1)])[);
-  }
-
-  /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-  ]b4_integral_parser_table_define([translate_table], [b4_translate])[
-
-  private static final ]b4_int_type_for([b4_translate])[ yytranslate_ (int t)
-  {
-    if (t >= 0 && t <= yyuser_token_number_max_)
-      return yytranslate_table_[t];
-    else
-      return yyundef_token_;
-  }
-
-  private static final int yylast_ = ]b4_last[;
-  private static final int yynnts_ = ]b4_nterms_number[;
-  private static final int yyempty_ = -2;
-  private static final int yyfinal_ = ]b4_final_state_number[;
-  private static final int yyterror_ = 1;
-  private static final int yyerrcode_ = 256;
-  private static final int yyntokens_ = ]b4_tokens_number[;
-
-  private static final int yyuser_token_number_max_ = ]b4_user_token_number_max[;
-  private static final int yyundef_token_ = ]b4_undef_token_number[;
-
-]/* User implementation code.  */
-b4_percent_code_get[]dnl
-
-}
-
-b4_epilogue[]dnl
-b4_output_end()
diff --git a/contrib/tools/bison/bison/data/local.mk b/contrib/tools/bison/bison/data/local.mk
deleted file mode 100644
index b8290522f2..0000000000
--- a/contrib/tools/bison/bison/data/local.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-## 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
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-dist_pkgdata_DATA =                             \
-  data/README                                   \
-  data/bison.m4                                 \
-  data/c++-skel.m4                              \
-  data/c++.m4                                   \
-  data/c-like.m4                                \
-  data/c-skel.m4                                \
-  data/c.m4                                     \
-  data/glr.c                                    \
-  data/glr.cc                                   \
-  data/java-skel.m4                             \
-  data/java.m4                                  \
-  data/lalr1.cc                                 \
-  data/lalr1.java                               \
-  data/location.cc                              \
-  data/stack.hh                                 \
-  data/variant.hh                               \
-  data/yacc.c
-
-m4sugardir = $(pkgdatadir)/m4sugar
-dist_m4sugar_DATA =                             \
-  data/m4sugar/foreach.m4                       \
-  data/m4sugar/m4sugar.m4
-
-xsltdir = $(pkgdatadir)/xslt
-dist_xslt_DATA =                                \
-  data/xslt/bison.xsl                           \
-  data/xslt/xml2dot.xsl                         \
-  data/xslt/xml2text.xsl                        \
-  data/xslt/xml2xhtml.xsl
diff --git a/contrib/tools/bison/bison/data/location.cc b/contrib/tools/bison/bison/data/location.cc
deleted file mode 100644
index 9a60f2503f..0000000000
--- a/contrib/tools/bison/bison/data/location.cc
+++ /dev/null
@@ -1,335 +0,0 @@
-# C++ skeleton for Bison
-
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-m4_pushdef([b4_copyright_years],
-           [2002-2013])
-
-# b4_position_define
-# ------------------
-# Define class position.
-m4_define([b4_position_define],
-[[  /// Abstract a position.
-  class position
-  {
-  public:]m4_ifdef([b4_location_constructors], [[
-    /// Construct a position.
-    explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
-                       unsigned int l = ]b4_location_initial_line[u,
-                       unsigned int c = ]b4_location_initial_column[u)
-      : filename (f)
-      , line (l)
-      , column (c)
-    {
-    }
-
-]])[
-    /// Initialization.
-    void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL,
-                     unsigned int l = ]b4_location_initial_line[u,
-                     unsigned int c = ]b4_location_initial_column[u)
-    {
-      filename = fn;
-      line = l;
-      column = c;
-    }
-
-    /** \name Line and Column related manipulators
-     ** \{ */
-    /// (line related) Advance to the COUNT next lines.
-    void lines (int count = 1)
-    {
-      if (count)
-        {
-          column = ]b4_location_initial_column[u;
-          line = add_ (line, count, ]b4_location_initial_line[);
-        }
-    }
-
-    /// (column related) Advance to the COUNT next columns.
-    void columns (int count = 1)
-    {
-      column = add_ (column, count, ]b4_location_initial_column[);
-    }
-    /** \} */
-
-    /// File name to which this position refers.
-    ]b4_percent_define_get([[filename_type]])[* filename;
-    /// Current line number.
-    unsigned int line;
-    /// Current column number.
-    unsigned int column;
-
-  private:
-    /// Compute max(min, lhs+rhs) (provided min <= lhs).
-    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
-    {
-      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
-              ? rhs + lhs
-              : min);
-    }
-  };
-
-  /// Add and assign a position.
-  inline position&
-  operator+= (position& res, int width)
-  {
-    res.columns (width);
-    return res;
-  }
-
-  /// Add two position objects.
-  inline position
-  operator+ (position res, int width)
-  {
-    return res += width;
-  }
-
-  /// Add and assign a position.
-  inline position&
-  operator-= (position& res, int width)
-  {
-    return res += -width;
-  }
-
-  /// Add two position objects.
-  inline position
-  operator- (position res, int width)
-  {
-    return res -= width;
-  }
-]b4_percent_define_flag_if([[define_location_comparison]], [[
-  /// Compare two position objects.
-  inline bool
-  operator== (const position& pos1, const position& pos2)
-  {
-    return (pos1.line == pos2.line
-            && pos1.column == pos2.column
-            && (pos1.filename == pos2.filename
-                || (pos1.filename && pos2.filename
-                    && *pos1.filename == *pos2.filename)));
-  }
-
-  /// Compare two position objects.
-  inline bool
-  operator!= (const position& pos1, const position& pos2)
-  {
-    return !(pos1 == pos2);
-  }
-]])[
-  /** \brief Intercept output stream redirection.
-   ** \param ostr the destination output stream
-   ** \param pos a reference to the position to redirect
-   */
-  template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
-  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
-  {
-    if (pos.filename)
-      ostr << *pos.filename << ':';
-    return ostr << pos.line << '.' << pos.column;
-  }
-]])
-
-
-# b4_location_define
-# ------------------
-m4_define([b4_location_define],
-[[  /// Abstract a location.
-  class location
-  {
-  public:
-]m4_ifdef([b4_location_constructors], [
-    /// Construct a location from \a b to \a e.
-    location (const position& b, const position& e)
-      : begin (b)
-      , end (e)
-    {
-    }
-
-    /// Construct a 0-width location in \a p.
-    explicit location (const position& p = position ())
-      : begin (p)
-      , end (p)
-    {
-    }
-
-    /// Construct a 0-width location in \a f, \a l, \a c.
-    explicit location (]b4_percent_define_get([[filename_type]])[* f,
-                       unsigned int l = ]b4_location_initial_line[u,
-                       unsigned int c = ]b4_location_initial_column[u)
-      : begin (f, l, c)
-      , end (f, l, c)
-    {
-    }
-
-])[
-    /// Initialization.
-    void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL,
-                     unsigned int l = ]b4_location_initial_line[u,
-                     unsigned int c = ]b4_location_initial_column[u)
-    {
-      begin.initialize (f, l, c);
-      end = begin;
-    }
-
-    /** \name Line and Column related manipulators
-     ** \{ */
-  public:
-    /// Reset initial location to final location.
-    void step ()
-    {
-      begin = end;
-    }
-
-    /// Extend the current location to the COUNT next columns.
-    void columns (int count = 1)
-    {
-      end += count;
-    }
-
-    /// Extend the current location to the COUNT next lines.
-    void lines (int count = 1)
-    {
-      end.lines (count);
-    }
-    /** \} */
-
-
-  public:
-    /// Beginning of the located region.
-    position begin;
-    /// End of the located region.
-    position end;
-  };
-
-  /// Join two location objects to create a location.
-  inline location operator+ (location res, const location& end)
-  {
-    res.end = end.end;
-    return res;
-  }
-
-  /// Change end position in place.
-  inline location& operator+= (location& res, int width)
-  {
-    res.columns (width);
-    return res;
-  }
-
-  /// Change end position.
-  inline location operator+ (location res, int width)
-  {
-    return res += width;
-  }
-
-  /// Change end position in place.
-  inline location& operator-= (location& res, int width)
-  {
-    return res += -width;
-  }
-
-  /// Change end position.
-  inline location operator- (const location& begin, int width)
-  {
-    return begin + -width;
-  }
-]b4_percent_define_flag_if([[define_location_comparison]], [[
-  /// Compare two location objects.
-  inline bool
-  operator== (const location& loc1, const location& loc2)
-  {
-    return loc1.begin == loc2.begin && loc1.end == loc2.end;
-  }
-
-  /// Compare two location objects.
-  inline bool
-  operator!= (const location& loc1, const location& loc2)
-  {
-    return !(loc1 == loc2);
-  }
-]])[
-  /** \brief Intercept output stream redirection.
-   ** \param ostr the destination output stream
-   ** \param loc a reference to the location to redirect
-   **
-   ** Avoid duplicate information.
-   */
-  template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
-  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
-  {
-    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
-    ostr << loc.begin// << "(" << loc.end << ") "
-;
-    if (loc.end.filename
-        && (!loc.begin.filename
-            || *loc.begin.filename != *loc.end.filename))
-      ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
-    else if (loc.begin.line < loc.end.line)
-      ostr << '-' << loc.end.line << '.' << end_col;
-    else if (loc.begin.column < end_col)
-      ostr << '-' << end_col;
-    return ostr;
-  }
-]])
-
-
-b4_defines_if([
-b4_output_begin([b4_dir_prefix[]position.hh])
-b4_copyright([Positions for Bison parsers in C++])[
-
-/**
- ** \file ]b4_dir_prefix[position.hh
- ** Define the ]b4_namespace_ref[::position class.
- */
-
-]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[
-
-# include <algorithm> // std::max
-# include <iostream>
-# include <string>
-
-]b4_null_define[
-
-]b4_namespace_open[
-]b4_position_define[
-]b4_namespace_close[
-]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
-b4_output_end()
-
-
-b4_output_begin([b4_dir_prefix[]location.hh])
-b4_copyright([Locations for Bison parsers in C++])[
-
-/**
- ** \file ]b4_dir_prefix[location.hh
- ** Define the ]b4_namespace_ref[::location class.
- */
-
-]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[
-
-# include "position.hh"
-
-]b4_namespace_open[
-]b4_location_define[
-]b4_namespace_close[
-]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
-b4_output_end()
-])
-
-
-m4_popdef([b4_copyright_years])
diff --git a/contrib/tools/bison/bison/data/m4sugar/foreach.m4 b/contrib/tools/bison/bison/data/m4sugar/foreach.m4
deleted file mode 100644
index f6a6394472..0000000000
--- a/contrib/tools/bison/bison/data/m4sugar/foreach.m4
+++ /dev/null
@@ -1,362 +0,0 @@
-#                                                  -*- Autoconf -*-
-# This file is part of Autoconf.
-# foreach-based replacements for recursive functions.
-# Speeds up GNU M4 1.4.x by avoiding quadratic $@ recursion, but penalizes
-# GNU M4 1.6 by requiring more memory and macro expansions.
-#
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-# This file is part of Autoconf.  This program is free
-# software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the Autoconf Configure Script Exception,
-# version 3.0, as published by the Free Software Foundation.
-#
-# You should have received a copy of the GNU General Public License
-# and a copy of the Autoconf Configure Script Exception along with
-# this program; see the files COPYINGv3 and COPYING.EXCEPTION
-# respectively.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Eric Blake.
-
-# In M4 1.4.x, every byte of $@ is rescanned.  This means that an
-# algorithm on n arguments that recurses with one less argument each
-# iteration will scan n * (n + 1) / 2 arguments, for O(n^2) time.  In
-# M4 1.6, this was fixed so that $@ is only scanned once, then
-# back-references are made to information stored about the scan.
-# Thus, n iterations need only scan n arguments, for O(n) time.
-# Additionally, in M4 1.4.x, recursive algorithms did not clean up
-# memory very well, requiring O(n^2) memory rather than O(n) for n
-# iterations.
-#
-# This file is designed to overcome the quadratic nature of $@
-# recursion by writing a variant of m4_foreach that uses m4_for rather
-# than $@ recursion to operate on the list.  This involves more macro
-# expansions, but avoids the need to rescan a quadratic number of
-# arguments, making these replacements very attractive for M4 1.4.x.
-# On the other hand, in any version of M4, expanding additional macros
-# costs additional time; therefore, in M4 1.6, where $@ recursion uses
-# fewer macros, these replacements actually pessimize performance.
-# Additionally, the use of $10 to mean the tenth argument violates
-# POSIX; although all versions of m4 1.4.x support this meaning, a
-# future m4 version may switch to take it as the first argument
-# concatenated with a literal 0, so the implementations in this file
-# are not future-proof.  Thus, this file is conditionally included as
-# part of m4_init(), only when it is detected that M4 probably has
-# quadratic behavior (ie. it lacks the macro __m4_version__).
-#
-# Please keep this file in sync with m4sugar.m4.
-
-# _m4_foreach(PRE, POST, IGNORED, ARG...)
-# ---------------------------------------
-# Form the common basis of the m4_foreach and m4_map macros.  For each
-# ARG, expand PRE[ARG]POST[].  The IGNORED argument makes recursion
-# easier, and must be supplied rather than implicit.
-#
-# This version minimizes the number of times that $@ is evaluated by
-# using m4_for to generate a boilerplate into _m4_f then passing $@ to
-# that temporary macro.  Thus, the recursion is done in m4_for without
-# reparsing any user input, and is not quadratic.  For an idea of how
-# this works, note that m4_foreach(i,[1,2],[i]) calls
-#   _m4_foreach([m4_define([i],],[)i],[],[1],[2])
-# which defines _m4_f:
-#   $1[$4]$2[]$1[$5]$2[]_m4_popdef([_m4_f])
-# then calls _m4_f([m4_define([i],],[)i],[],[1],[2]) for a net result:
-#   m4_define([i],[1])i[]m4_define([i],[2])i[]_m4_popdef([_m4_f]).
-m4_define([_m4_foreach],
-[m4_if([$#], [3], [],
-       [m4_pushdef([_m4_f], _m4_for([4], [$#], [1],
-   [$0_([1], [2],], [)])[_m4_popdef([_m4_f])])_m4_f($@)])])
-
-m4_define([_m4_foreach_],
-[[$$1[$$3]$$2[]]])
-
-# m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)
-# -----------------------------------------------------------
-# Find the first VAL that SWITCH matches, and expand the corresponding
-# IF-VAL.  If there are no matches, expand DEFAULT.
-#
-# Use m4_for to create a temporary macro in terms of a boilerplate
-# m4_if with final cleanup.  If $# is even, we have DEFAULT; if it is
-# odd, then rounding the last $# up in the temporary macro is
-# harmless.  For example, both m4_case(1,2,3,4,5) and
-# m4_case(1,2,3,4,5,6) result in the intermediate _m4_case being
-#   m4_if([$1],[$2],[$3],[$1],[$4],[$5],_m4_popdef([_m4_case])[$6])
-m4_define([m4_case],
-[m4_if(m4_eval([$# <= 2]), [1], [$2],
-[m4_pushdef([_$0], [m4_if(]_m4_for([2], m4_eval([($# - 1) / 2 * 2]), [2],
-     [_$0_(], [)])[_m4_popdef(
-	 [_$0])]m4_dquote($m4_eval([($# + 1) & ~1]))[)])_$0($@)])])
-
-m4_define([_m4_case_],
-[$0_([1], [$1], m4_incr([$1]))])
-
-m4_define([_m4_case__],
-[[[$$1],[$$2],[$$3],]])
-
-# m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT)
-# -----------------------------------------------------
-# m4 equivalent of
-#
-# if (SWITCH =~ RE1)
-#   VAL1;
-# elif (SWITCH =~ RE2)
-#   VAL2;
-# elif ...
-#   ...
-# else
-#   DEFAULT
-#
-# We build the temporary macro _m4_b:
-#   m4_define([_m4_b], _m4_defn([_m4_bmatch]))_m4_b([$1], [$2], [$3])...
-#   _m4_b([$1], [$m-1], [$m])_m4_b([], [], [$m+1]_m4_popdef([_m4_b]))
-# then invoke m4_unquote(_m4_b($@)), for concatenation with later text.
-m4_define([m4_bmatch],
-[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],
-       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],
-       [$#], 2, [$2],
-       [m4_pushdef([_m4_b], [m4_define([_m4_b],
-  _m4_defn([_$0]))]_m4_for([3], m4_eval([($# + 1) / 2 * 2 - 1]),
-  [2], [_$0_(], [)])[_m4_b([], [],]m4_dquote([$]m4_eval(
-  [($# + 1) / 2 * 2]))[_m4_popdef([_m4_b]))])m4_unquote(_m4_b($@))])])
-
-m4_define([_m4_bmatch],
-[m4_if(m4_bregexp([$1], [$2]), [-1], [], [[$3]m4_define([$0])])])
-
-m4_define([_m4_bmatch_],
-[$0_([1], m4_decr([$1]), [$1])])
-
-m4_define([_m4_bmatch__],
-[[_m4_b([$$1], [$$2], [$$3])]])
-
-
-# m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT])
-# -------------------------------------------------------------------
-# Similar to m4_if, except that each TEST is expanded when encountered.
-# If the expansion of TESTn matches the string VALn, the result is IF-VALn.
-# The result is DEFAULT if no tests passed.  This macro allows
-# short-circuiting of expensive tests, where it pays to arrange quick
-# filter tests to run first.
-#
-# m4_cond already guarantees either 3*n or 3*n + 1 arguments, 1 <= n.
-# We only have to speed up _m4_cond, by building the temporary _m4_c:
-#   m4_define([_m4_c], _m4_defn([m4_unquote]))_m4_c([m4_if(($1), [($2)],
-#   [[$3]m4_define([_m4_c])])])_m4_c([m4_if(($4), [($5)],
-#   [[$6]m4_define([_m4_c])])])..._m4_c([m4_if(($m-2), [($m-1)],
-#   [[$m]m4_define([_m4_c])])])_m4_c([[$m+1]]_m4_popdef([_m4_c]))
-# We invoke m4_unquote(_m4_c($@)), for concatenation with later text.
-m4_define([_m4_cond],
-[m4_pushdef([_m4_c], [m4_define([_m4_c],
-  _m4_defn([m4_unquote]))]_m4_for([2], m4_eval([$# / 3 * 3 - 1]), [3],
-  [$0_(], [)])[_m4_c(]m4_dquote(m4_dquote(
-  [$]m4_eval([$# / 3 * 3 + 1])))[_m4_popdef([_m4_c]))])m4_unquote(_m4_c($@))])
-
-m4_define([_m4_cond_],
-[$0_(m4_decr([$1]), [$1], m4_incr([$1]))])
-
-m4_define([_m4_cond__],
-[[_m4_c([m4_if(($$1), [($$2)], [[$$3]m4_define([_m4_c])])])]])
-
-# m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...)
-# ----------------------------------------------------
-# m4 equivalent of
-#
-#   $_ = STRING;
-#   s/RE1/SUBST1/g;
-#   s/RE2/SUBST2/g;
-#   ...
-#
-# m4_bpatsubsts already validated an odd number of arguments; we only
-# need to speed up _m4_bpatsubsts.  To avoid nesting, we build the
-# temporary _m4_p:
-#   m4_define([_m4_p], [$1])m4_define([_m4_p],
-#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$2], [$3]))m4_define([_m4_p],
-#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$4], [$5]))m4_define([_m4_p],...
-#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$m-1], [$m]))m4_unquote(
-#   _m4_defn([_m4_p])_m4_popdef([_m4_p]))
-m4_define([_m4_bpatsubsts],
-[m4_pushdef([_m4_p], [m4_define([_m4_p],
-  ]m4_dquote([$]1)[)]_m4_for([3], [$#], [2], [$0_(],
-  [)])[m4_unquote(_m4_defn([_m4_p])_m4_popdef([_m4_p]))])_m4_p($@)])
-
-m4_define([_m4_bpatsubsts_],
-[$0_(m4_decr([$1]), [$1])])
-
-m4_define([_m4_bpatsubsts__],
-[[m4_define([_m4_p],
-m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$$1], [$$2]))]])
-
-# m4_shiftn(N, ...)
-# -----------------
-# Returns ... shifted N times.  Useful for recursive "varargs" constructs.
-#
-# m4_shiftn already validated arguments; we only need to speed up
-# _m4_shiftn.  If N is 3, then we build the temporary _m4_s, defined as
-#   ,[$5],[$6],...,[$m]_m4_popdef([_m4_s])
-# before calling m4_shift(_m4_s($@)).
-m4_define([_m4_shiftn],
-[m4_if(m4_incr([$1]), [$#], [], [m4_pushdef([_m4_s],
-  _m4_for(m4_eval([$1 + 2]), [$#], [1],
-  [[,]m4_dquote($], [)])[_m4_popdef([_m4_s])])m4_shift(_m4_s($@))])])
-
-# m4_do(STRING, ...)
-# ------------------
-# This macro invokes all its arguments (in sequence, of course).  It is
-# useful for making your macros more structured and readable by dropping
-# unnecessary dnl's and have the macros indented properly.
-#
-# Here, we use the temporary macro _m4_do, defined as
-#   $1[]$2[]...[]$n[]_m4_popdef([_m4_do])
-m4_define([m4_do],
-[m4_if([$#], [0], [],
-       [m4_pushdef([_$0], _m4_for([1], [$#], [1],
-		   [$], [[[]]])[_m4_popdef([_$0])])_$0($@)])])
-
-# m4_dquote_elt(ARGS)
-# -------------------
-# Return ARGS as an unquoted list of double-quoted arguments.
-#
-# _m4_foreach to the rescue.
-m4_define([m4_dquote_elt],
-[m4_if([$#], [0], [], [[[$1]]_m4_foreach([,m4_dquote(], [)], $@)])])
-
-# m4_reverse(ARGS)
-# ----------------
-# Output ARGS in reverse order.
-#
-# Invoke _m4_r($@) with the temporary _m4_r built as
-#   [$m], [$m-1], ..., [$2], [$1]_m4_popdef([_m4_r])
-m4_define([m4_reverse],
-[m4_if([$#], [0], [], [$#], [1], [[$1]],
-[m4_pushdef([_m4_r], [[$$#]]_m4_for(m4_decr([$#]), [1], [-1],
-    [[, ]m4_dquote($], [)])[_m4_popdef([_m4_r])])_m4_r($@)])])
-
-
-# m4_map_args_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)
-# -------------------------------------------------------------
-# Perform a pairwise grouping of consecutive ARGs, by expanding
-# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the
-# final argument is expanded with END-EXPR([ARGn]).
-#
-# Build the temporary macro _m4_map_args_pair, with the $2([$m+1])
-# only output if $# is odd:
-#   $1([$3], [$4])[]$1([$5], [$6])[]...$1([$m-1],
-#   [$m])[]m4_default([$2], [$1])([$m+1])[]_m4_popdef([_m4_map_args_pair])
-m4_define([m4_map_args_pair],
-[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
-       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],
-       [$#], [2], [],
-       [$#], [3], [m4_default([$2], [$1])([$3])[]],
-       [m4_pushdef([_$0], _m4_for([3],
-   m4_eval([$# / 2 * 2 - 1]), [2], [_$0_(], [)])_$0_end(
-   [1], [2], [$#])[_m4_popdef([_$0])])_$0($@)])])
-
-m4_define([_m4_map_args_pair_],
-[$0_([1], [$1], m4_incr([$1]))])
-
-m4_define([_m4_map_args_pair__],
-[[$$1([$$2], [$$3])[]]])
-
-m4_define([_m4_map_args_pair_end],
-[m4_if(m4_eval([$3 & 1]), [1], [[m4_default([$$2], [$$1])([$$3])[]]])])
-
-# m4_join(SEP, ARG1, ARG2...)
-# ---------------------------
-# Produce ARG1SEPARG2...SEPARGn.  Avoid back-to-back SEP when a given ARG
-# is the empty string.  No expansion is performed on SEP or ARGs.
-#
-# Use a self-modifying separator, since we don't know how many
-# arguments might be skipped before a separator is first printed, but
-# be careful if the separator contains $.  _m4_foreach to the rescue.
-m4_define([m4_join],
-[m4_pushdef([_m4_sep], [m4_define([_m4_sep], _m4_defn([m4_echo]))])]dnl
-[_m4_foreach([_$0([$1],], [)], $@)_m4_popdef([_m4_sep])])
-
-m4_define([_m4_join],
-[m4_if([$2], [], [], [_m4_sep([$1])[$2]])])
-
-# m4_joinall(SEP, ARG1, ARG2...)
-# ------------------------------
-# Produce ARG1SEPARG2...SEPARGn.  An empty ARG results in back-to-back SEP.
-# No expansion is performed on SEP or ARGs.
-#
-# A bit easier than m4_join.  _m4_foreach to the rescue.
-m4_define([m4_joinall],
-[[$2]m4_if(m4_eval([$# <= 2]), [1], [],
-	   [_m4_foreach([$1], [], m4_shift($@))])])
-
-# m4_list_cmp(A, B)
-# -----------------
-# Compare the two lists of integer expressions A and B.
-#
-# m4_list_cmp takes care of any side effects; we only override
-# _m4_list_cmp_raw, where we can safely expand lists multiple times.
-# First, insert padding so that both lists are the same length; the
-# trailing +0 is necessary to handle a missing list.  Next, create a
-# temporary macro to perform pairwise comparisons until an inequality
-# is found.  For example, m4_list_cmp([1], [1,2]) creates _m4_cmp as
-#   m4_if(m4_eval([($1) != ($3)]), [1], [m4_cmp([$1], [$3])],
-#         m4_eval([($2) != ($4)]), [1], [m4_cmp([$2], [$4])],
-#         [0]_m4_popdef([_m4_cmp]))
-# then calls _m4_cmp([1+0], [0*2], [1], [2+0])
-m4_define([_m4_list_cmp_raw],
-[m4_if([$1], [$2], 0,
-       [_m4_list_cmp($1+0_m4_list_pad(m4_count($1), m4_count($2)),
-		     $2+0_m4_list_pad(m4_count($2), m4_count($1)))])])
-
-m4_define([_m4_list_pad],
-[m4_if(m4_eval($1 < $2), [1],
-       [_m4_for(m4_incr([$1]), [$2], [1], [,0*])])])
-
-m4_define([_m4_list_cmp],
-[m4_pushdef([_m4_cmp], [m4_if(]_m4_for(
-   [1], m4_eval([$# >> 1]), [1], [$0_(], [,]m4_eval([$# >> 1])[)])[
-      [0]_m4_popdef([_m4_cmp]))])_m4_cmp($@)])
-
-m4_define([_m4_list_cmp_],
-[$0_([$1], m4_eval([$1 + $2]))])
-
-m4_define([_m4_list_cmp__],
-[[m4_eval([($$1) != ($$2)]), [1], [m4_cmp([$$1], [$$2])],
-]])
-
-# m4_max(EXPR, ...)
-# m4_min(EXPR, ...)
-# -----------------
-# Return the decimal value of the maximum (or minimum) in a series of
-# integer expressions.
-#
-# _m4_foreach to the rescue; we only need to replace _m4_minmax.  Here,
-# we need a temporary macro to track the best answer so far, so that
-# the foreach expression is tractable.
-m4_define([_m4_minmax],
-[m4_pushdef([_m4_best], m4_eval([$2]))_m4_foreach(
-  [m4_define([_m4_best], $1(_m4_best,], [))], m4_shift($@))]dnl
-[_m4_best[]_m4_popdef([_m4_best])])
-
-# m4_set_add_all(SET, VALUE...)
-# -----------------------------
-# Add each VALUE into SET.  This is O(n) in the number of VALUEs, and
-# can be faster than calling m4_set_add for each VALUE.
-#
-# _m4_foreach to the rescue.  If no deletions have occurred, then
-# avoid the speed penalty of m4_set_add.
-m4_define([m4_set_add_all],
-[m4_if([$#], [0], [], [$#], [1], [],
-       [m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1])
-	  + m4_len(_m4_foreach(m4_ifdef([_m4_set_cleanup($1)],
-  [[m4_set_add]], [[_$0]])[([$1],], [)], $@))))])])
-
-m4_define([_m4_set_add_all],
-[m4_ifdef([_m4_set([$1],$2)], [],
-	  [m4_define([_m4_set([$1],$2)],
-		     [1])m4_pushdef([_m4_set([$1])], [$2])-])])
diff --git a/contrib/tools/bison/bison/data/m4sugar/m4sugar.m4 b/contrib/tools/bison/bison/data/m4sugar/m4sugar.m4
deleted file mode 100644
index b732abc789..0000000000
--- a/contrib/tools/bison/bison/data/m4sugar/m4sugar.m4
+++ /dev/null
@@ -1,3307 +0,0 @@
-divert(-1)#                                                  -*- Autoconf -*-
-# This file is part of Autoconf.
-# Base M4 layer.
-# Requires GNU M4.
-#
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-
-# This file is part of Autoconf.  This program is free
-# software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the Autoconf Configure Script Exception,
-# version 3.0, as published by the Free Software Foundation.
-#
-# You should have received a copy of the GNU General Public License
-# and a copy of the Autoconf Configure Script Exception along with
-# this program; see the files COPYINGv3 and COPYING.EXCEPTION
-# respectively.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Akim Demaille.
-
-# Set the quotes, whatever the current quoting system.
-changequote()
-changequote([, ])
-
-# Some old m4's don't support m4exit.  But they provide
-# equivalent functionality by core dumping because of the
-# long macros we define.
-ifdef([__gnu__], ,
-[errprint(M4sugar requires GNU M4. Install it before installing M4sugar or
-set the M4 environment variable to its absolute file name.)
-m4exit(2)])
-
-
-## ------------------------------- ##
-## 1. Simulate --prefix-builtins.  ##
-## ------------------------------- ##
-
-# m4_define
-# m4_defn
-# m4_undefine
-define([m4_define],   defn([define]))
-define([m4_defn],     defn([defn]))
-define([m4_undefine], defn([undefine]))
-
-m4_undefine([define])
-m4_undefine([defn])
-m4_undefine([undefine])
-
-
-# m4_copy(SRC, DST)
-# -----------------
-# Define DST as the definition of SRC.
-# What's the difference between:
-# 1. m4_copy([from], [to])
-# 2. m4_define([to], [from($@)])
-# Well, obviously 1 is more expensive in space.  Maybe 2 is more expensive
-# in time, but because of the space cost of 1, it's not that obvious.
-# Nevertheless, one huge difference is the handling of `$0'.  If `from'
-# uses `$0', then with 1, `to''s `$0' is `to', while it is `from' in 2.
-# The user would certainly prefer to see `to'.
-#
-# This definition is in effect during m4sugar initialization, when
-# there are no pushdef stacks; later on, we redefine it to something
-# more powerful for all other clients to use.
-m4_define([m4_copy],
-[m4_define([$2], m4_defn([$1]))])
-
-
-# m4_rename(SRC, DST)
-# -------------------
-# Rename the macro SRC to DST.
-m4_define([m4_rename],
-[m4_copy([$1], [$2])m4_undefine([$1])])
-
-
-# m4_rename_m4(MACRO-NAME)
-# ------------------------
-# Rename MACRO-NAME to m4_MACRO-NAME.
-m4_define([m4_rename_m4],
-[m4_rename([$1], [m4_$1])])
-
-
-# m4_copy_unm4(m4_MACRO-NAME)
-# ---------------------------
-# Copy m4_MACRO-NAME to MACRO-NAME.
-m4_define([m4_copy_unm4],
-[m4_copy([$1], m4_bpatsubst([$1], [^m4_\(.*\)], [[\1]]))])
-
-
-# Some m4 internals have names colliding with tokens we might use.
-# Rename them a` la `m4 --prefix-builtins'.  Conditionals first, since
-# some subsequent renames are conditional.
-m4_rename_m4([ifdef])
-m4_rename([ifelse], [m4_if])
-
-m4_rename_m4([builtin])
-m4_rename_m4([changecom])
-m4_rename_m4([changequote])
-m4_ifdef([changeword],dnl conditionally available in 1.4.x
-[m4_undefine([changeword])])
-m4_rename_m4([debugfile])
-m4_rename_m4([debugmode])
-m4_rename_m4([decr])
-m4_rename_m4([divnum])
-m4_rename_m4([dumpdef])
-m4_rename_m4([errprint])
-m4_rename_m4([esyscmd])
-m4_rename_m4([eval])
-m4_rename_m4([format])
-m4_undefine([include])
-m4_rename_m4([incr])
-m4_rename_m4([index])
-m4_rename_m4([indir])
-m4_rename_m4([len])
-m4_rename([m4exit], [m4_exit])
-m4_undefine([m4wrap])
-m4_ifdef([mkstemp],dnl added in M4 1.4.8
-[m4_rename_m4([mkstemp])
-m4_copy([m4_mkstemp], [m4_maketemp])
-m4_undefine([maketemp])],
-[m4_rename_m4([maketemp])
-m4_copy([m4_maketemp], [m4_mkstemp])])
-m4_rename([patsubst], [m4_bpatsubst])
-m4_rename_m4([popdef])
-m4_rename_m4([pushdef])
-m4_rename([regexp], [m4_bregexp])
-m4_rename_m4([shift])
-m4_undefine([sinclude])
-m4_rename_m4([substr])
-m4_ifdef([symbols],dnl present only in alpha-quality 1.4o
-[m4_rename_m4([symbols])])
-m4_rename_m4([syscmd])
-m4_rename_m4([sysval])
-m4_rename_m4([traceoff])
-m4_rename_m4([traceon])
-m4_rename_m4([translit])
-
-# _m4_defn(ARG)
-# -------------
-# _m4_defn is for internal use only - it bypasses the wrapper, so it
-# must only be used on one argument at a time, and only on macros
-# known to be defined.  Make sure this still works if the user renames
-# m4_defn but not _m4_defn.
-m4_copy([m4_defn], [_m4_defn])
-
-# _m4_divert_raw(NUM)
-# -------------------
-# _m4_divert_raw is for internal use only.  Use this instead of
-# m4_builtin([divert], NUM), so that tracing diversion flow is easier.
-m4_rename([divert], [_m4_divert_raw])
-
-# _m4_popdef(ARG...)
-# ------------------
-# _m4_popdef is for internal use only - it bypasses the wrapper, so it
-# must only be used on macros known to be defined.  Make sure this
-# still works if the user renames m4_popdef but not _m4_popdef.
-m4_copy([m4_popdef], [_m4_popdef])
-
-# _m4_undefine(ARG...)
-# --------------------
-# _m4_undefine is for internal use only - it bypasses the wrapper, so
-# it must only be used on macros known to be defined.  Make sure this
-# still works if the user renames m4_undefine but not _m4_undefine.
-m4_copy([m4_undefine], [_m4_undefine])
-
-# _m4_undivert(NUM...)
-# --------------------
-# _m4_undivert is for internal use only, and should always be given
-# arguments.  Use this instead of m4_builtin([undivert], NUM...), so
-# that tracing diversion flow is easier.
-m4_rename([undivert], [_m4_undivert])
-
-
-## ------------------- ##
-## 2. Error messages.  ##
-## ------------------- ##
-
-
-# m4_location
-# -----------
-# Output the current file, colon, and the current line number.
-m4_define([m4_location],
-[__file__:__line__])
-
-
-# m4_errprintn(MSG)
-# -----------------
-# Same as `errprint', but with the missing end of line.
-m4_define([m4_errprintn],
-[m4_errprint([$1
-])])
-
-
-# m4_warning(MSG)
-# ---------------
-# Warn the user.
-m4_define([m4_warning],
-[m4_errprintn(m4_location[: warning: $1])])
-
-
-# m4_fatal(MSG, [EXIT-STATUS])
-# ----------------------------
-# Fatal the user.                                                      :)
-m4_define([m4_fatal],
-[m4_errprintn(m4_location[: error: $1]
-m4_expansion_stack)m4_exit(m4_if([$2],, 1, [$2]))])
-
-
-# m4_assert(EXPRESSION, [EXIT-STATUS = 1])
-# ----------------------------------------
-# This macro ensures that EXPRESSION evaluates to true, and exits if
-# EXPRESSION evaluates to false.
-m4_define([m4_assert],
-[m4_if(m4_eval([$1]), 0,
-       [m4_fatal([assert failed: $1], [$2])])])
-
-
-
-## ------------- ##
-## 3. Warnings.  ##
-## ------------- ##
-
-
-# _m4_warn(CATEGORY, MESSAGE, [STACK-TRACE])
-# ------------------------------------------
-# Report a MESSAGE to the user if the CATEGORY of warnings is enabled.
-# This is for traces only.
-# If present, STACK-TRACE is a \n-separated list of "LOCATION: MESSAGE",
-# where the last line (and no other) ends with "the top level".
-#
-# Within m4, the macro is a no-op.  This macro really matters
-# when autom4te post-processes the trace output.
-m4_define([_m4_warn], [])
-
-
-# m4_warn(CATEGORY, MESSAGE)
-# --------------------------
-# Report a MESSAGE to the user if the CATEGORY of warnings is enabled.
-m4_define([m4_warn],
-[_m4_warn([$1], [$2],
-m4_ifdef([_m4_expansion_stack], [m4_expansion_stack]))])
-
-
-
-## ------------------- ##
-## 4. File inclusion.  ##
-## ------------------- ##
-
-
-# We also want to neutralize include (and sinclude for symmetry),
-# but we want to extend them slightly: warn when a file is included
-# several times.  This is, in general, a dangerous operation, because
-# too many people forget to quote the first argument of m4_define.
-#
-# For instance in the following case:
-#   m4_define(foo, [bar])
-# then a second reading will turn into
-#   m4_define(bar, [bar])
-# which is certainly not what was meant.
-
-# m4_include_unique(FILE)
-# -----------------------
-# Declare that the FILE was loading; and warn if it has already
-# been included.
-m4_define([m4_include_unique],
-[m4_ifdef([m4_include($1)],
-	  [m4_warn([syntax], [file `$1' included several times])])dnl
-m4_define([m4_include($1)])])
-
-
-# m4_include(FILE)
-# ----------------
-# Like the builtin include, but warns against multiple inclusions.
-m4_define([m4_include],
-[m4_include_unique([$1])dnl
-m4_builtin([include], [$1])])
-
-
-# m4_sinclude(FILE)
-# -----------------
-# Like the builtin sinclude, but warns against multiple inclusions.
-m4_define([m4_sinclude],
-[m4_include_unique([$1])dnl
-m4_builtin([sinclude], [$1])])
-
-
-
-## ------------------------------------ ##
-## 5. Additional branching constructs.  ##
-## ------------------------------------ ##
-
-# Both `m4_ifval' and `m4_ifset' tests against the empty string.  The
-# difference is that `m4_ifset' is specialized on macros.
-#
-# In case of arguments of macros, eg. $1, it makes little difference.
-# In the case of a macro `FOO', you don't want to check `m4_ifval(FOO,
-# TRUE)', because if `FOO' expands with commas, there is a shifting of
-# the arguments.  So you want to run `m4_ifval([FOO])', but then you just
-# compare the *string* `FOO' against `', which, of course fails.
-#
-# So you want the variation `m4_ifset' that expects a macro name as $1.
-# If this macro is both defined and defined to a non empty value, then
-# it runs TRUE, etc.
-
-
-# m4_ifblank(COND, [IF-BLANK], [IF-TEXT])
-# m4_ifnblank(COND, [IF-TEXT], [IF-BLANK])
-# ----------------------------------------
-# If COND is empty, or consists only of blanks (space, tab, newline),
-# then expand IF-BLANK, otherwise expand IF-TEXT.  This differs from
-# m4_ifval only if COND has just whitespace, but it helps optimize in
-# spite of users who mistakenly leave trailing space after what they
-# thought was an empty argument:
-#   macro(
-#         []
-#        )
-#
-# Writing one macro in terms of the other causes extra overhead, so
-# we inline both definitions.
-m4_define([m4_ifblank],
-[m4_if(m4_translit([[$1]],  [ ][	][
-]), [], [$2], [$3])])
-
-m4_define([m4_ifnblank],
-[m4_if(m4_translit([[$1]],  [ ][	][
-]), [], [$3], [$2])])
-
-
-# m4_ifval(COND, [IF-TRUE], [IF-FALSE])
-# -------------------------------------
-# If COND is not the empty string, expand IF-TRUE, otherwise IF-FALSE.
-# Comparable to m4_ifdef.
-m4_define([m4_ifval],
-[m4_if([$1], [], [$3], [$2])])
-
-
-# m4_n(TEXT)
-# ----------
-# If TEXT is not empty, return TEXT and a new line, otherwise nothing.
-m4_define([m4_n],
-[m4_if([$1],
-       [], [],
-	   [$1
-])])
-
-
-# m4_ifvaln(COND, [IF-TRUE], [IF-FALSE])
-# --------------------------------------
-# Same as `m4_ifval', but add an extra newline to IF-TRUE or IF-FALSE
-# unless that argument is empty.
-m4_define([m4_ifvaln],
-[m4_if([$1],
-       [],   [m4_n([$3])],
-	     [m4_n([$2])])])
-
-
-# m4_ifset(MACRO, [IF-TRUE], [IF-FALSE])
-# --------------------------------------
-# If MACRO has no definition, or of its definition is the empty string,
-# expand IF-FALSE, otherwise IF-TRUE.
-m4_define([m4_ifset],
-[m4_ifdef([$1],
-	  [m4_ifval(_m4_defn([$1]), [$2], [$3])],
-	  [$3])])
-
-
-# m4_ifndef(NAME, [IF-NOT-DEFINED], [IF-DEFINED])
-# -----------------------------------------------
-m4_define([m4_ifndef],
-[m4_ifdef([$1], [$3], [$2])])
-
-
-# m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)
-# -----------------------------------------------------------
-# m4 equivalent of
-# switch (SWITCH)
-# {
-#   case VAL1:
-#     IF-VAL1;
-#     break;
-#   case VAL2:
-#     IF-VAL2;
-#     break;
-#   ...
-#   default:
-#     DEFAULT;
-#     break;
-# }.
-# All the values are optional, and the macro is robust to active
-# symbols properly quoted.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_case],
-[m4_if([$#], 0, [],
-       [$#], 1, [],
-       [$#], 2, [$2],
-       [$1], [$2], [$3],
-       [$0([$1], m4_shift3($@))])])
-
-
-# m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT)
-# -----------------------------------------------------
-# m4 equivalent of
-#
-# if (SWITCH =~ RE1)
-#   VAL1;
-# elif (SWITCH =~ RE2)
-#   VAL2;
-# elif ...
-#   ...
-# else
-#   DEFAULT
-#
-# All the values are optional, and the macro is robust to active symbols
-# properly quoted.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_bmatch],
-[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],
-       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],
-       [$#], 2, [$2],
-       [m4_if(m4_bregexp([$1], [$2]), -1, [$0([$1], m4_shift3($@))],
-	      [$3])])])
-
-# m4_argn(N, ARGS...)
-# -------------------
-# Extract argument N (greater than 0) from ARGS.  Example:
-#   m4_define([b], [B])
-#   m4_argn([2], [a], [b], [c]) => b
-#
-# Rather than using m4_car(m4_shiftn([$1], $@)), we exploit the fact that
-# GNU m4 can directly reference any argument, through an indirect macro.
-m4_define([m4_argn],
-[m4_assert([0 < $1])]dnl
-[m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@)])
-
-
-# m4_car(ARGS...)
-# m4_cdr(ARGS...)
-# ---------------
-# Manipulate m4 lists.  m4_car returns the first argument.  m4_cdr
-# bundles all but the first argument into a quoted list.  These two
-# macros are generally used with list arguments, with quoting removed
-# to break the list into multiple m4 ARGS.
-m4_define([m4_car], [[$1]])
-m4_define([m4_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-
-# _m4_cdr(ARGS...)
-# ----------------
-# Like m4_cdr, except include a leading comma unless only one argument
-# remains.  Why?  Because comparing a large list against [] is more
-# expensive in expansion time than comparing the number of arguments; so
-# _m4_cdr can be used to reduce the number of arguments when it is time
-# to end recursion.
-m4_define([_m4_cdr],
-[m4_if([$#], 1, [],
-       [, m4_dquote(m4_shift($@))])])
-
-
-
-# m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT])
-# -------------------------------------------------------------------
-# Similar to m4_if, except that each TEST is expanded when encountered.
-# If the expansion of TESTn matches the string VALn, the result is IF-VALn.
-# The result is DEFAULT if no tests passed.  This macro allows
-# short-circuiting of expensive tests, where it pays to arrange quick
-# filter tests to run first.
-#
-# For an example, consider a previous implementation of _AS_QUOTE_IFELSE:
-#
-#    m4_if(m4_index([$1], [\]), [-1], [$2],
-#          m4_eval(m4_index([$1], [\\]) >= 0), [1], [$2],
-#          m4_eval(m4_index([$1], [\$]) >= 0), [1], [$2],
-#          m4_eval(m4_index([$1], [\`]) >= 0), [1], [$3],
-#          m4_eval(m4_index([$1], [\"]) >= 0), [1], [$3],
-#          [$2])
-#
-# Here, m4_index is computed 5 times, and m4_eval 4, even if $1 contains
-# no backslash.  It is more efficient to do:
-#
-#    m4_cond([m4_index([$1], [\])], [-1], [$2],
-#            [m4_eval(m4_index([$1], [\\]) >= 0)], [1], [$2],
-#            [m4_eval(m4_index([$1], [\$]) >= 0)], [1], [$2],
-#            [m4_eval(m4_index([$1], [\`]) >= 0)], [1], [$3],
-#            [m4_eval(m4_index([$1], [\"]) >= 0)], [1], [$3],
-#            [$2])
-#
-# In the common case of $1 with no backslash, only one m4_index expansion
-# occurs, and m4_eval is avoided altogether.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_cond],
-[m4_if([$#], [0], [m4_fatal([$0: cannot be called without arguments])],
-       [$#], [1], [$1],
-       m4_eval([$# % 3]), [2], [m4_fatal([$0: missing an argument])],
-       [_$0($@)])])
-
-m4_define([_m4_cond],
-[m4_if(($1), [($2)], [$3],
-       [$#], [3], [],
-       [$#], [4], [$4],
-       [$0(m4_shift3($@))])])
-
-
-## ---------------------------------------- ##
-## 6. Enhanced version of some primitives.  ##
-## ---------------------------------------- ##
-
-# m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...)
-# ----------------------------------------------------
-# m4 equivalent of
-#
-#   $_ = STRING;
-#   s/RE1/SUBST1/g;
-#   s/RE2/SUBST2/g;
-#   ...
-#
-# All the values are optional, and the macro is robust to active symbols
-# properly quoted.
-#
-# I would have liked to name this macro `m4_bpatsubst', unfortunately,
-# due to quotation problems, I need to double quote $1 below, therefore
-# the anchors are broken :(  I can't let users be trapped by that.
-#
-# Recall that m4_shift3 always results in an argument.  Hence, we need
-# to distinguish between a final deletion vs. ending recursion.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_bpatsubsts],
-[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],
-       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],
-       [$#], 2, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2]))],
-       [$#], 3, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2], [$3]))],
-       [_$0($@m4_if(m4_eval($# & 1), 0, [,]))])])
-m4_define([_m4_bpatsubsts],
-[m4_if([$#], 2, [$1],
-       [$0(m4_builtin([patsubst], [[$1]], [$2], [$3]),
-	   m4_shift3($@))])])
-
-
-# m4_copy(SRC, DST)
-# -----------------
-# Define the pushdef stack DST as a copy of the pushdef stack SRC;
-# give an error if DST is already defined.  This is particularly nice
-# for copying self-modifying pushdef stacks, where the top definition
-# includes one-shot initialization that is later popped to the normal
-# definition.  This version intentionally does nothing if SRC is
-# undefined.
-#
-# Some macros simply can't be renamed with this method: namely, anything
-# involved in the implementation of m4_stack_foreach_sep.
-m4_define([m4_copy],
-[m4_ifdef([$2], [m4_fatal([$0: won't overwrite defined macro: $2])],
-	  [m4_stack_foreach_sep([$1], [m4_pushdef([$2],], [)])])]dnl
-[m4_ifdef([m4_location($1)], [m4_define([m4_location($2)], m4_location)])])
-
-
-# m4_copy_force(SRC, DST)
-# m4_rename_force(SRC, DST)
-# -------------------------
-# Like m4_copy/m4_rename, except blindly overwrite any existing DST.
-# Note that m4_copy_force tolerates undefined SRC, while m4_rename_force
-# does not.
-m4_define([m4_copy_force],
-[m4_ifdef([$2], [_m4_undefine([$2])])m4_copy($@)])
-
-m4_define([m4_rename_force],
-[m4_ifdef([$2], [_m4_undefine([$2])])m4_rename($@)])
-
-
-# m4_define_default(MACRO, VALUE)
-# -------------------------------
-# If MACRO is undefined, set it to VALUE.
-m4_define([m4_define_default],
-[m4_ifndef([$1], [m4_define($@)])])
-
-
-# m4_default(EXP1, EXP2)
-# m4_default_nblank(EXP1, EXP2)
-# -----------------------------
-# Returns EXP1 if not empty/blank, otherwise EXP2.  Expand the result.
-#
-# m4_default is called on hot paths, so inline the contents of m4_ifval,
-# for one less round of expansion.
-m4_define([m4_default],
-[m4_if([$1], [], [$2], [$1])])
-
-m4_define([m4_default_nblank],
-[m4_ifblank([$1], [$2], [$1])])
-
-
-# m4_default_quoted(EXP1, EXP2)
-# m4_default_nblank_quoted(EXP1, EXP2)
-# ------------------------------------
-# Returns EXP1 if non empty/blank, otherwise EXP2.  Leave the result quoted.
-#
-# For comparison:
-#   m4_define([active], [ACTIVE])
-#   m4_default([active], [default]) => ACTIVE
-#   m4_default([], [active]) => ACTIVE
-#   -m4_default([ ], [active])- => - -
-#   -m4_default_nblank([ ], [active])- => -ACTIVE-
-#   m4_default_quoted([active], [default]) => active
-#   m4_default_quoted([], [active]) => active
-#   -m4_default_quoted([ ], [active])- => - -
-#   -m4_default_nblank_quoted([ ], [active])- => -active-
-#
-# m4_default macro is called on hot paths, so inline the contents of m4_ifval,
-# for one less round of expansion.
-m4_define([m4_default_quoted],
-[m4_if([$1], [], [[$2]], [[$1]])])
-
-m4_define([m4_default_nblank_quoted],
-[m4_ifblank([$1], [[$2]], [[$1]])])
-
-
-# m4_defn(NAME)
-# -------------
-# Like the original, except guarantee a warning when using something which is
-# undefined (unlike M4 1.4.x).  This replacement is not a full-featured
-# replacement: if any of the defined macros contain unbalanced quoting, but
-# when pasted together result in a well-quoted string, then only native m4
-# support is able to get it correct.  But that's where quadrigraphs come in
-# handy, if you really need unbalanced quotes inside your macros.
-#
-# This macro is called frequently, so minimize the amount of additional
-# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,
-# (added in M4 1.6), then let m4 do the job for us (see m4_init).
-m4_define([m4_defn],
-[m4_if([$#], [0], [[$0]],
-       [$#], [1], [m4_ifdef([$1], [_m4_defn([$1])],
-			    [m4_fatal([$0: undefined macro: $1])])],
-       [m4_map_args([$0], $@)])])
-
-
-# m4_dumpdef(NAME...)
-# -------------------
-# In m4 1.4.x, dumpdef writes to the current debugfile, rather than
-# stderr.  This in turn royally confuses autom4te; so we follow the
-# lead of newer m4 and always dump to stderr.  Unlike the original,
-# this version requires an argument, since there is no convenient way
-# in m4 1.4.x to grab the names of all defined macros.  Newer m4
-# always dumps to stderr, regardless of the current debugfile; it also
-# provides m4symbols as a way to grab all current macro names.  But
-# dumpdefs is not frequently called, so we don't need to worry about
-# conditionally using these newer features.  Also, this version
-# doesn't sort multiple arguments.
-#
-# If we detect m4 1.6 or newer, then provide an alternate definition,
-# installed during m4_init, that allows builtins through.
-# Unfortunately, there is no nice way in m4 1.4.x to dump builtins.
-m4_define([m4_dumpdef],
-[m4_if([$#], [0], [m4_fatal([$0: missing argument])],
-       [$#], [1], [m4_ifdef([$1], [m4_errprintn(
-  [$1:	]m4_dquote(_m4_defn([$1])))], [m4_fatal([$0: undefined macro: $1])])],
-       [m4_map_args([$0], $@)])])
-
-m4_define([_m4_dumpdef],
-[m4_if([$#], [0], [m4_fatal([$0: missing argument])],
-       [$#], [1], [m4_builtin([dumpdef], [$1])],
-       [m4_map_args_sep([m4_builtin([dumpdef],], [)], [], $@)])])
-
-
-# m4_dumpdefs(NAME...)
-# --------------------
-# Similar to `m4_dumpdef(NAME)', but if NAME was m4_pushdef'ed, display its
-# value stack (most recent displayed first).  Also, this version silently
-# ignores undefined macros, rather than erroring out.
-#
-# This macro cheats, because it relies on the current definition of NAME
-# while the second argument of m4_stack_foreach_lifo is evaluated (which
-# would be undefined according to the API).
-m4_define([m4_dumpdefs],
-[m4_if([$#], [0], [m4_fatal([$0: missing argument])],
-       [$#], [1], [m4_stack_foreach_lifo([$1], [m4_dumpdef([$1])m4_ignore])],
-       [m4_map_args([$0], $@)])])
-
-# m4_esyscmd_s(COMMAND)
-# ---------------------
-# Like m4_esyscmd, except strip any trailing newlines, thus behaving
-# more like shell command substitution.
-m4_define([m4_esyscmd_s],
-[m4_chomp_all(m4_esyscmd([$1]))])
-
-
-# m4_popdef(NAME)
-# ---------------
-# Like the original, except guarantee a warning when using something which is
-# undefined (unlike M4 1.4.x).
-#
-# This macro is called frequently, so minimize the amount of additional
-# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,
-# (added in M4 1.6), then let m4 do the job for us (see m4_init).
-m4_define([m4_popdef],
-[m4_if([$#], [0], [[$0]],
-       [$#], [1], [m4_ifdef([$1], [_m4_popdef([$1])],
-			    [m4_fatal([$0: undefined macro: $1])])],
-       [m4_map_args([$0], $@)])])
-
-
-# m4_shiftn(N, ...)
-# -----------------
-# Returns ... shifted N times.  Useful for recursive "varargs" constructs.
-#
-# Autoconf does not use this macro, because it is inherently slower than
-# calling the common cases of m4_shift2 or m4_shift3 directly.  But it
-# might as well be fast for other clients, such as Libtool.  One way to
-# do this is to expand $@ only once in _m4_shiftn (otherwise, for long
-# lists, the expansion of m4_if takes twice as much memory as what the
-# list itself occupies, only to throw away the unused branch).  The end
-# result is strictly equivalent to
-#   m4_if([$1], 1, [m4_shift(,m4_shift(m4_shift($@)))],
-#         [_m4_shiftn(m4_decr([$1]), m4_shift(m4_shift($@)))])
-# but with the final `m4_shift(m4_shift($@)))' shared between the two
-# paths.  The first leg uses a no-op m4_shift(,$@) to balance out the ().
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_shiftn],
-[m4_assert(0 < $1 && $1 < $#)_$0($@)])
-
-m4_define([_m4_shiftn],
-[m4_if([$1], 1, [m4_shift(],
-       [$0(m4_decr([$1])]), m4_shift(m4_shift($@)))])
-
-# m4_shift2(...)
-# m4_shift3(...)
-# --------------
-# Returns ... shifted twice, and three times.  Faster than m4_shiftn.
-m4_define([m4_shift2], [m4_shift(m4_shift($@))])
-m4_define([m4_shift3], [m4_shift(m4_shift(m4_shift($@)))])
-
-# _m4_shift2(...)
-# _m4_shift3(...)
-# ---------------
-# Like m4_shift2 or m4_shift3, except include a leading comma unless shifting
-# consumes all arguments.  Why?  Because in recursion, it is nice to
-# distinguish between 1 element left and 0 elements left, based on how many
-# arguments this shift expands to.
-m4_define([_m4_shift2],
-[m4_if([$#], [2], [],
-       [, m4_shift(m4_shift($@))])])
-m4_define([_m4_shift3],
-[m4_if([$#], [3], [],
-       [, m4_shift(m4_shift(m4_shift($@)))])])
-
-
-# m4_undefine(NAME)
-# -----------------
-# Like the original, except guarantee a warning when using something which is
-# undefined (unlike M4 1.4.x).
-#
-# This macro is called frequently, so minimize the amount of additional
-# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,
-# (added in M4 1.6), then let m4 do the job for us (see m4_init).
-m4_define([m4_undefine],
-[m4_if([$#], [0], [[$0]],
-       [$#], [1], [m4_ifdef([$1], [_m4_undefine([$1])],
-			    [m4_fatal([$0: undefined macro: $1])])],
-       [m4_map_args([$0], $@)])])
-
-# _m4_wrap(PRE, POST)
-# -------------------
-# Helper macro for m4_wrap and m4_wrap_lifo.  Allows nested calls to
-# m4_wrap within wrapped text.  Use _m4_defn and _m4_popdef for speed.
-m4_define([_m4_wrap],
-[m4_ifdef([$0_text],
-	  [m4_define([$0_text], [$1]_m4_defn([$0_text])[$2])],
-	  [m4_builtin([m4wrap], [m4_unquote(
-  _m4_defn([$0_text])_m4_popdef([$0_text]))])m4_define([$0_text], [$1$2])])])
-
-# m4_wrap(TEXT)
-# -------------
-# Append TEXT to the list of hooks to be executed at the end of input.
-# Whereas the order of the original may be LIFO in the underlying m4,
-# this version is always FIFO.
-m4_define([m4_wrap],
-[_m4_wrap([], [$1[]])])
-
-# m4_wrap_lifo(TEXT)
-# ------------------
-# Prepend TEXT to the list of hooks to be executed at the end of input.
-# Whereas the order of m4_wrap may be FIFO in the underlying m4, this
-# version is always LIFO.
-m4_define([m4_wrap_lifo],
-[_m4_wrap([$1[]])])
-
-## ------------------------- ##
-## 7. Quoting manipulation.  ##
-## ------------------------- ##
-
-
-# m4_apply(MACRO, LIST)
-# ---------------------
-# Invoke MACRO, with arguments provided from the quoted list of
-# comma-separated quoted arguments.  If LIST is empty, invoke MACRO
-# without arguments.  The expansion will not be concatenated with
-# subsequent text.
-m4_define([m4_apply],
-[m4_if([$2], [], [$1], [$1($2)])[]])
-
-# _m4_apply(MACRO, LIST)
-# ----------------------
-# Like m4_apply, except do nothing if LIST is empty.
-m4_define([_m4_apply],
-[m4_if([$2], [], [], [$1($2)[]])])
-
-
-# m4_count(ARGS)
-# --------------
-# Return a count of how many ARGS are present.
-m4_define([m4_count], [$#])
-
-
-# m4_curry(MACRO, ARG...)
-# -----------------------
-# Perform argument currying.  The expansion of this macro is another
-# macro that takes exactly one argument, appends it to the end of the
-# original ARG list, then invokes MACRO.  For example:
-#   m4_curry([m4_curry], [m4_reverse], [1])([2])([3]) => 3, 2, 1
-# Not quite as practical as m4_incr, but you could also do:
-#   m4_define([add], [m4_eval(([$1]) + ([$2]))])
-#   m4_define([add_one], [m4_curry([add], [1])])
-#   add_one()([2]) => 3
-m4_define([m4_curry], [$1(m4_shift($@,)_$0])
-m4_define([_m4_curry],               [[$1])])
-
-
-# m4_do(STRING, ...)
-# ------------------
-# This macro invokes all its arguments (in sequence, of course).  It is
-# useful for making your macros more structured and readable by dropping
-# unnecessary dnl's and have the macros indented properly.  No concatenation
-# occurs after a STRING; use m4_unquote(m4_join(,STRING)) for that.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_do],
-[m4_if([$#], 0, [],
-       [$#], 1, [$1[]],
-       [$1[]$0(m4_shift($@))])])
-
-
-# m4_dquote(ARGS)
-# ---------------
-# Return ARGS as a quoted list of quoted arguments.
-m4_define([m4_dquote],  [[$@]])
-
-
-# m4_dquote_elt(ARGS)
-# -------------------
-# Return ARGS as an unquoted list of double-quoted arguments.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_dquote_elt],
-[m4_if([$#], [0], [],
-       [$#], [1], [[[$1]]],
-       [[[$1]],$0(m4_shift($@))])])
-
-
-# m4_echo(ARGS)
-# -------------
-# Return the ARGS, with the same level of quoting.  Whitespace after
-# unquoted commas are consumed.
-m4_define([m4_echo], [$@])
-
-
-# m4_expand(ARG)
-# _m4_expand(ARG)
-# ---------------
-# Return the expansion of ARG as a single string.  Unlike
-# m4_quote($1), this preserves whitespace following single-quoted
-# commas that appear within ARG.  It also deals with shell case
-# statements.
-#
-#   m4_define([active], [ACT, IVE])
-#   m4_define([active2], [[ACT, IVE]])
-#   m4_quote(active, active2)
-#   => ACT,IVE,ACT, IVE
-#   m4_expand([active, active2])
-#   => ACT, IVE, ACT, IVE
-#
-# Unfortunately, due to limitations in m4, ARG must expand to
-# something with balanced quotes (use quadrigraphs to get around
-# this), and should not contain the unlikely delimiters -=<{( or
-# )}>=-.  It is possible to have unbalanced quoted `(' or `)', as well
-# as unbalanced unquoted `)'.  m4_expand can handle unterminated
-# comments or dnl on the final line, at the expense of speed; it also
-# aids in detecting attempts to incorrectly change the current
-# diversion inside ARG.  Meanwhile, _m4_expand is faster but must be
-# given a terminated expansion, and has no safety checks for
-# mis-diverted text.
-#
-# Exploit that extra unquoted () will group unquoted commas and the
-# following whitespace.  m4_bpatsubst can't handle newlines inside $1,
-# and m4_substr strips quoting.  So we (ab)use m4_changequote, using
-# temporary quotes to remove the delimiters that conveniently included
-# the unquoted () that were added prior to the changequote.
-#
-# Thanks to shell case statements, too many people are prone to pass
-# underquoted `)', so we try to detect that by passing a marker as a
-# fourth argument; if the marker is not present, then we assume that
-# we encountered an early `)', and re-expand the first argument, but
-# this time with one more `(' in the second argument and in the
-# open-quote delimiter.  We must also ignore the slop from the
-# previous try.  The final macro is thus half line-noise, half art.
-m4_define([m4_expand],
-[m4_pushdef([m4_divert], _m4_defn([_m4_divert_unsafe]))]dnl
-[m4_pushdef([m4_divert_push], _m4_defn([_m4_divert_unsafe]))]dnl
-[m4_chomp(_$0([$1
-]))_m4_popdef([m4_divert], [m4_divert_push])])
-
-m4_define([_m4_expand], [$0_([$1], [(], -=<{($1)}>=-, [}>=-])])
-
-m4_define([_m4_expand_],
-[m4_if([$4], [}>=-],
-       [m4_changequote([-=<{$2], [)}>=-])$3m4_changequote([, ])],
-       [$0([$1], [($2], -=<{($2$1)}>=-, [}>=-])m4_ignore$2])])
-
-
-# m4_ignore(ARGS)
-# ---------------
-# Expands to nothing.  Useful for conditionally ignoring an arbitrary
-# number of arguments (see _m4_list_cmp for an example).
-m4_define([m4_ignore])
-
-
-# m4_make_list(ARGS)
-# ------------------
-# Similar to m4_dquote, this creates a quoted list of quoted ARGS.  This
-# version is less efficient than m4_dquote, but separates each argument
-# with a comma and newline, rather than just comma, for readability.
-# When developing an m4sugar algorithm, you could temporarily use
-#   m4_pushdef([m4_dquote],m4_defn([m4_make_list]))
-# around your code to make debugging easier.
-m4_define([m4_make_list], [m4_join([,
-], m4_dquote_elt($@))])
-
-
-# m4_noquote(STRING)
-# ------------------
-# Return the result of ignoring all quotes in STRING and invoking the
-# macros it contains.  Among other things, this is useful for enabling
-# macro invocations inside strings with [] blocks (for instance regexps
-# and help-strings).  On the other hand, since all quotes are disabled,
-# any macro expanded during this time that relies on nested [] quoting
-# will likely crash and burn.  This macro is seldom useful; consider
-# m4_unquote or m4_expand instead.
-m4_define([m4_noquote],
-[m4_changequote([-=<{(],[)}>=-])$1-=<{()}>=-m4_changequote([,])])
-
-
-# m4_quote(ARGS)
-# --------------
-# Return ARGS as a single argument.  Any whitespace after unquoted commas
-# is stripped.  There is always output, even when there were no arguments.
-#
-# It is important to realize the difference between `m4_quote(exp)' and
-# `[exp]': in the first case you obtain the quoted *result* of the
-# expansion of EXP, while in the latter you just obtain the string
-# `exp'.
-m4_define([m4_quote],  [[$*]])
-
-
-# _m4_quote(ARGS)
-# ---------------
-# Like m4_quote, except that when there are no arguments, there is no
-# output.  For conditional scenarios (such as passing _m4_quote as the
-# macro name in m4_mapall), this feature can be used to distinguish between
-# one argument of the empty string vs. no arguments.  However, in the
-# normal case with arguments present, this is less efficient than m4_quote.
-m4_define([_m4_quote],
-[m4_if([$#], [0], [], [[$*]])])
-
-
-# m4_reverse(ARGS)
-# ----------------
-# Output ARGS in reverse order.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_reverse],
-[m4_if([$#], [0], [], [$#], [1], [[$1]],
-       [$0(m4_shift($@)), [$1]])])
-
-
-# m4_unquote(ARGS)
-# ----------------
-# Remove one layer of quotes from each ARG, performing one level of
-# expansion.  For one argument, m4_unquote([arg]) is more efficient than
-# m4_do([arg]), but for multiple arguments, the difference is that
-# m4_unquote separates arguments with commas while m4_do concatenates.
-# Follow this macro with [] if concatenation with subsequent text is
-# undesired.
-m4_define([m4_unquote], [$*])
-
-
-## -------------------------- ##
-## 8. Implementing m4 loops.  ##
-## -------------------------- ##
-
-
-# m4_for(VARIABLE, FIRST, LAST, [STEP = +/-1], EXPRESSION)
-# --------------------------------------------------------
-# Expand EXPRESSION defining VARIABLE to FROM, FROM + 1, ..., TO with
-# increments of STEP.  Both limits are included, and bounds are
-# checked for consistency.  The algorithm is robust to indirect
-# VARIABLE names.  Changing VARIABLE inside EXPRESSION will not impact
-# the number of iterations.
-#
-# Uses _m4_defn for speed, and avoid dnl in the macro body.  Factor
-# the _m4_for call so that EXPRESSION is only parsed once.
-m4_define([m4_for],
-[m4_pushdef([$1], m4_eval([$2]))]dnl
-[m4_cond([m4_eval(([$3]) > ([$2]))], 1,
-	   [m4_pushdef([_m4_step], m4_eval(m4_default_quoted([$4],
-	      1)))m4_assert(_m4_step > 0)_$0(_m4_defn([$1]),
-  m4_eval((([$3]) - ([$2])) / _m4_step * _m4_step + ([$2])), _m4_step,],
-	 [m4_eval(([$3]) < ([$2]))], 1,
-	   [m4_pushdef([_m4_step], m4_eval(m4_default_quoted([$4],
-	      -1)))m4_assert(_m4_step < 0)_$0(_m4_defn([$1]),
-  m4_eval((([$2]) - ([$3])) / -(_m4_step) * _m4_step + ([$2])), _m4_step,],
-	 [m4_pushdef([_m4_step])_$0(_m4_defn([$1]), _m4_defn([$1]), 0,])]dnl
-[[m4_define([$1],], [)$5])m4_popdef([_m4_step], [$1])])
-
-# _m4_for(COUNT, LAST, STEP, PRE, POST)
-# -------------------------------------
-# Core of the loop, no consistency checks, all arguments are plain
-# numbers.  Expand PRE[COUNT]POST, then alter COUNT by STEP and
-# iterate if COUNT is not LAST.
-m4_define([_m4_for],
-[$4[$1]$5[]m4_if([$1], [$2], [],
-		 [$0(m4_eval([$1 + $3]), [$2], [$3], [$4], [$5])])])
-
-
-# Implementing `foreach' loops in m4 is much more tricky than it may
-# seem.  For example, the old M4 1.4.4 manual had an incorrect example,
-# which looked like this (when translated to m4sugar):
-#
-# | # foreach(VAR, (LIST), STMT)
-# | m4_define([foreach],
-# |   [m4_pushdef([$1])_foreach([$1], [$2], [$3])m4_popdef([$1])])
-# | m4_define([_arg1], [$1])
-# | m4_define([_foreach],
-# |   [m4_if([$2], [()], ,
-# |     [m4_define([$1], _arg1$2)$3[]_foreach([$1], (m4_shift$2), [$3])])])
-#
-# But then if you run
-#
-# | m4_define(a, 1)
-# | m4_define(b, 2)
-# | m4_define(c, 3)
-# | foreach([f], [([a], [(b], [c)])], [echo f
-# | ])
-#
-# it gives
-#
-#  => echo 1
-#  => echo (2,3)
-#
-# which is not what is expected.
-#
-# Of course the problem is that many quotes are missing.  So you add
-# plenty of quotes at random places, until you reach the expected
-# result.  Alternatively, if you are a quoting wizard, you directly
-# reach the following implementation (but if you really did, then
-# apply to the maintenance of m4sugar!).
-#
-# | # foreach(VAR, (LIST), STMT)
-# | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])])
-# | m4_define([_arg1], [[$1]])
-# | m4_define([_foreach],
-# |  [m4_if($2, [()], ,
-# |    [m4_define([$1], [_arg1$2])$3[]_foreach([$1], [(m4_shift$2)], [$3])])])
-#
-# which this time answers
-#
-#  => echo a
-#  => echo (b
-#  => echo c)
-#
-# Bingo!
-#
-# Well, not quite.
-#
-# With a better look, you realize that the parens are more a pain than
-# a help: since anyway you need to quote properly the list, you end up
-# with always using an outermost pair of parens and an outermost pair
-# of quotes.  Rejecting the parens both eases the implementation, and
-# simplifies the use:
-#
-# | # foreach(VAR, (LIST), STMT)
-# | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])])
-# | m4_define([_arg1], [$1])
-# | m4_define([_foreach],
-# |  [m4_if($2, [], ,
-# |    [m4_define([$1], [_arg1($2)])$3[]_foreach([$1], [m4_shift($2)], [$3])])])
-#
-#
-# Now, just replace the `$2' with `m4_quote($2)' in the outer `m4_if'
-# to improve robustness, and you come up with a nice implementation
-# that doesn't require extra parentheses in the user's LIST.
-#
-# But wait -  now the algorithm is quadratic, because every recursion of
-# the algorithm keeps the entire LIST and merely adds another m4_shift to
-# the quoted text.  If the user has a lot of elements in LIST, you can
-# bring the system to its knees with the memory m4 then requires, or trip
-# the m4 --nesting-limit recursion factor.  The only way to avoid
-# quadratic growth is ensure m4_shift is expanded prior to the recursion.
-# Hence the design below.
-#
-# The M4 manual now includes a chapter devoted to this issue, with
-# the lessons learned from m4sugar.  And still, this design is only
-# optimal for M4 1.6; see foreach.m4 for yet more comments on why
-# M4 1.4.x uses yet another implementation.
-
-
-# m4_foreach(VARIABLE, LIST, EXPRESSION)
-# --------------------------------------
-#
-# Expand EXPRESSION assigning each value of the LIST to VARIABLE.
-# LIST should have the form `item_1, item_2, ..., item_n', i.e. the
-# whole list must *quoted*.  Quote members too if you don't want them
-# to be expanded.
-#
-# This macro is robust to active symbols:
-#      | m4_define(active, [ACT, IVE])
-#      | m4_foreach(Var, [active, active], [-Var-])
-#     => -ACT--IVE--ACT--IVE-
-#
-#      | m4_foreach(Var, [[active], [active]], [-Var-])
-#     => -ACT, IVE--ACT, IVE-
-#
-#      | m4_foreach(Var, [[[active]], [[active]]], [-Var-])
-#     => -active--active-
-#
-# This macro is called frequently, so avoid extra expansions such as
-# m4_ifval and dnl.  Also, since $2 might be quite large, try to use it
-# as little as possible in _m4_foreach; each extra use requires that much
-# more memory for expansion.  So, rather than directly compare $2 against
-# [] and use m4_car/m4_cdr for recursion, we instead unbox the list (which
-# requires swapping the argument order in the helper), insert an ignored
-# third argument, and use m4_shift3 to detect when recursion is complete,
-# at which point this looks very much like m4_map_args.
-m4_define([m4_foreach],
-[m4_if([$2], [], [],
-       [m4_pushdef([$1])_$0([m4_define([$1],], [)$3], [],
-  $2)m4_popdef([$1])])])
-
-# _m4_foreach(PRE, POST, IGNORED, ARG...)
-# ---------------------------------------
-# Form the common basis of the m4_foreach and m4_map macros.  For each
-# ARG, expand PRE[ARG]POST[].  The IGNORED argument makes recursion
-# easier, and must be supplied rather than implicit.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([_m4_foreach],
-[m4_if([$#], [3], [],
-       [$1[$4]$2[]$0([$1], [$2], m4_shift3($@))])])
-
-
-# m4_foreach_w(VARIABLE, LIST, EXPRESSION)
-# ----------------------------------------
-# Like m4_foreach, but the list is whitespace separated.  Depending on
-# EXPRESSION, it may be more efficient to use m4_map_args_w.
-#
-# This macro is robust to active symbols:
-#    m4_foreach_w([Var], [ active
-#    b	act\
-#    ive  ], [-Var-])end
-#    => -active--b--active-end
-#
-# This used to use a slower implementation based on m4_foreach:
-#   m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])
-m4_define([m4_foreach_w],
-[m4_pushdef([$1])m4_map_args_w([$2],
-  [m4_define([$1],], [)$3])m4_popdef([$1])])
-
-
-# m4_map(MACRO, LIST)
-# m4_mapall(MACRO, LIST)
-# ----------------------
-# Invoke MACRO($1), MACRO($2) etc. where $1, $2... are the elements of
-# LIST.  $1, $2... must in turn be lists, appropriate for m4_apply.
-# If LIST contains an empty sublist, m4_map skips the expansion of
-# MACRO, while m4_mapall expands MACRO with no arguments.
-#
-# Since LIST may be quite large, we want to minimize how often it
-# appears in the expansion.  Rather than use m4_car/m4_cdr iteration,
-# we unbox the list, and use _m4_foreach for iteration.  For m4_map,
-# an empty list behaves like an empty sublist and gets ignored; for
-# m4_mapall, we must special-case the empty list.
-m4_define([m4_map],
-[_m4_foreach([_m4_apply([$1],], [)], [], $2)])
-
-m4_define([m4_mapall],
-[m4_if([$2], [], [],
-       [_m4_foreach([m4_apply([$1],], [)], [], $2)])])
-
-
-# m4_map_sep(MACRO, [SEPARATOR], LIST)
-# m4_mapall_sep(MACRO, [SEPARATOR], LIST)
-# ---------------------------------------
-# Invoke MACRO($1), SEPARATOR, MACRO($2), ..., MACRO($N) where $1,
-# $2... $N are the elements of LIST, and are in turn lists appropriate
-# for m4_apply.  SEPARATOR is expanded, in order to allow the creation
-# of a list of arguments by using a single-quoted comma as the
-# separator.  For each empty sublist, m4_map_sep skips the expansion
-# of MACRO and SEPARATOR, while m4_mapall_sep expands MACRO with no
-# arguments.
-#
-# For m4_mapall_sep, merely expand the first iteration without the
-# separator, then include separator as part of subsequent recursion;
-# but avoid extra expansion of LIST's side-effects via a helper macro.
-# For m4_map_sep, things are trickier - we don't know if the first
-# list element is an empty sublist, so we must define a self-modifying
-# helper macro and use that as the separator instead.
-m4_define([m4_map_sep],
-[m4_pushdef([m4_Sep], [m4_define([m4_Sep], _m4_defn([m4_unquote]))])]dnl
-[_m4_foreach([_m4_apply([m4_Sep([$2])[]$1],], [)], [], $3)m4_popdef([m4_Sep])])
-
-m4_define([m4_mapall_sep],
-[m4_if([$3], [], [], [_$0([$1], [$2], $3)])])
-
-m4_define([_m4_mapall_sep],
-[m4_apply([$1], [$3])_m4_foreach([m4_apply([$2[]$1],], [)], m4_shift2($@))])
-
-# m4_map_args(EXPRESSION, ARG...)
-# -------------------------------
-# Expand EXPRESSION([ARG]) for each argument.  More efficient than
-#   m4_foreach([var], [ARG...], [EXPRESSION(m4_defn([var]))])
-# Shorthand for m4_map_args_sep([EXPRESSION(], [)], [], ARG...).
-m4_define([m4_map_args],
-[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
-       [$#], [1], [],
-       [$#], [2], [$1([$2])[]],
-       [_m4_foreach([$1(], [)], $@)])])
-
-
-# m4_map_args_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)
-# -------------------------------------------------------------
-# Perform a pairwise grouping of consecutive ARGs, by expanding
-# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the
-# final argument is expanded with END-EXPR([ARGn]).
-#
-# For example:
-#   m4_define([show], [($*)m4_newline])dnl
-#   m4_map_args_pair([show], [], [a], [b], [c], [d], [e])dnl
-#   => (a,b)
-#   => (c,d)
-#   => (e)
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_map_args_pair],
-[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
-       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],
-       [$#], [2], [],
-       [$#], [3], [m4_default([$2], [$1])([$3])[]],
-       [$#], [4], [$1([$3], [$4])[]],
-       [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])])
-
-
-# m4_map_args_sep([PRE], [POST], [SEP], ARG...)
-# ---------------------------------------------
-# Expand PRE[ARG]POST for each argument, with SEP between arguments.
-m4_define([m4_map_args_sep],
-[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
-       [$#], [1], [],
-       [$#], [2], [],
-       [$#], [3], [],
-       [$#], [4], [$1[$4]$2[]],
-       [$1[$4]$2[]_m4_foreach([$3[]$1], [$2], m4_shift3($@))])])
-
-
-# m4_map_args_w(STRING, [PRE], [POST], [SEP])
-# -------------------------------------------
-# Perform the expansion of PRE[word]POST[] for each word in STRING
-# separated by whitespace.  More efficient than:
-#   m4_foreach_w([var], [STRING], [PRE[]m4_defn([var])POST])
-# Additionally, expand SEP between words.
-#
-# As long as we have to use m4_bpatsubst to split the string, we might
-# as well make it also apply PRE and POST; this avoids iteration
-# altogether.  But we must be careful of any \ in PRE or POST.
-# _m4_strip returns a quoted string, but that's okay, since it also
-# supplies an empty leading and trailing argument due to our
-# intentional whitespace around STRING.  We use m4_substr to strip the
-# empty elements and remove the extra layer of quoting.
-m4_define([m4_map_args_w],
-[_$0(_m4_split([ ]m4_flatten([$1])[ ], [[	 ]+],
-	       m4_if(m4_index([$2$3$4], [\]), [-1], [[$3[]$4[]$2]],
-		     [m4_bpatsubst([[$3[]$4[]$2]], [\\], [\\\\])])),
-     m4_len([[]$3[]$4]), m4_len([$4[]$2[]]))])
-
-m4_define([_m4_map_args_w],
-[m4_substr([$1], [$2], m4_eval(m4_len([$1]) - [$2] - [$3]))])
-
-
-# m4_stack_foreach(MACRO, FUNC)
-# m4_stack_foreach_lifo(MACRO, FUNC)
-# ----------------------------------
-# Pass each stacked definition of MACRO to the one-argument macro FUNC.
-# m4_stack_foreach proceeds in FIFO order, while m4_stack_foreach_lifo
-# processes the topmost definitions first.  In addition, FUNC should
-# not push or pop definitions of MACRO, and should not expect anything about
-# the active definition of MACRO (it will not be the topmost, and may not
-# be the one passed to FUNC either).
-#
-# Some macros simply can't be examined with this method: namely,
-# anything involved in the implementation of _m4_stack_reverse.
-m4_define([m4_stack_foreach],
-[_m4_stack_reverse([$1], [m4_tmp-$1])]dnl
-[_m4_stack_reverse([m4_tmp-$1], [$1], [$2(_m4_defn([m4_tmp-$1]))])])
-
-m4_define([m4_stack_foreach_lifo],
-[_m4_stack_reverse([$1], [m4_tmp-$1], [$2(_m4_defn([m4_tmp-$1]))])]dnl
-[_m4_stack_reverse([m4_tmp-$1], [$1])])
-
-# m4_stack_foreach_sep(MACRO, [PRE], [POST], [SEP])
-# m4_stack_foreach_sep_lifo(MACRO, [PRE], [POST], [SEP])
-# ------------------------------------------------------
-# Similar to m4_stack_foreach and m4_stack_foreach_lifo, in that every
-# definition of a pushdef stack will be visited.  But rather than
-# passing the definition as a single argument to a macro, this variant
-# expands the concatenation of PRE[]definition[]POST, and expands SEP
-# between consecutive expansions.  Note that m4_stack_foreach([a], [b])
-# is equivalent to m4_stack_foreach_sep([a], [b(], [)]).
-m4_define([m4_stack_foreach_sep],
-[_m4_stack_reverse([$1], [m4_tmp-$1])]dnl
-[_m4_stack_reverse([m4_tmp-$1], [$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]])])
-
-m4_define([m4_stack_foreach_sep_lifo],
-[_m4_stack_reverse([$1], [m4_tmp-$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]])]dnl
-[_m4_stack_reverse([m4_tmp-$1], [$1])])
-
-
-# _m4_stack_reverse(OLD, NEW, [ACTION], [SEP])
-# --------------------------------------------
-# A recursive worker for pushdef stack manipulation.  Destructively
-# copy the OLD stack into the NEW, and expanding ACTION for each
-# iteration.  After the first iteration, SEP is promoted to the front
-# of ACTION (note that SEP should include a trailing [] if it is to
-# avoid interfering with ACTION).  The current definition is examined
-# after the NEW has been pushed but before OLD has been popped; this
-# order is important, as ACTION is permitted to operate on either
-# _m4_defn([OLD]) or _m4_defn([NEW]).  Since the operation is
-# destructive, this macro is generally used twice, with a temporary
-# macro name holding the swapped copy.
-m4_define([_m4_stack_reverse],
-[m4_ifdef([$1], [m4_pushdef([$2],
-  _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4$3])])])
-
-
-
-## --------------------------- ##
-## 9. More diversion support.  ##
-## --------------------------- ##
-
-
-# m4_cleardivert(DIVERSION-NAME...)
-# ---------------------------------
-# Discard any text in DIVERSION-NAME.
-#
-# This works even inside m4_expand.
-m4_define([m4_cleardivert],
-[m4_if([$#], [0], [m4_fatal([$0: missing argument])],
-       [_m4_divert_raw([-1])m4_undivert($@)_m4_divert_raw(
-	 _m4_divert(_m4_defn([_m4_divert_diversion]), [-]))])])
-
-
-# _m4_divert(DIVERSION-NAME or NUMBER, [NOWARN])
-# ----------------------------------------------
-# If DIVERSION-NAME is the name of a diversion, return its number,
-# otherwise if it is a NUMBER return it.  Issue a warning about
-# the use of a number instead of a name, unless NOWARN is provided.
-m4_define([_m4_divert],
-[m4_ifdef([_m4_divert($1)],
-	  [m4_indir([_m4_divert($1)])],
-	  [m4_if([$2], [], [m4_warn([syntax],
-	     [prefer named diversions])])$1])])
-
-# KILL is only used to suppress output.
-m4_define([_m4_divert(KILL)],           -1)
-
-# The empty diversion name is a synonym for 0.
-m4_define([_m4_divert()],                0)
-
-
-# m4_divert_stack
-# ---------------
-# Print the diversion stack, if it's nonempty.  The caller is
-# responsible for any leading or trailing newline.
-m4_define([m4_divert_stack],
-[m4_stack_foreach_sep_lifo([_m4_divert_stack], [], [], [
-])])
-
-
-# m4_divert_stack_push(MACRO-NAME, DIVERSION-NAME)
-# ------------------------------------------------
-# Form an entry of the diversion stack from caller MACRO-NAME and
-# entering DIVERSION-NAME and push it.
-m4_define([m4_divert_stack_push],
-[m4_pushdef([_m4_divert_stack], m4_location[: $1: $2])])
-
-
-# m4_divert(DIVERSION-NAME)
-# -------------------------
-# Change the diversion stream to DIVERSION-NAME.
-m4_define([m4_divert],
-[m4_popdef([_m4_divert_stack])]dnl
-[m4_define([_m4_divert_diversion], [$1])]dnl
-[m4_divert_stack_push([$0], [$1])]dnl
-[_m4_divert_raw(_m4_divert([$1]))])
-
-
-# m4_divert_push(DIVERSION-NAME, [NOWARN])
-# ----------------------------------------
-# Change the diversion stream to DIVERSION-NAME, while stacking old values.
-# For internal use only: if NOWARN is not empty, DIVERSION-NAME can be a
-# number instead of a name.
-m4_define([m4_divert_push],
-[m4_divert_stack_push([$0], [$1])]dnl
-[m4_pushdef([_m4_divert_diversion], [$1])]dnl
-[_m4_divert_raw(_m4_divert([$1], [$2]))])
-
-
-# m4_divert_pop([DIVERSION-NAME])
-# -------------------------------
-# Change the diversion stream to its previous value, unstacking it.
-# If specified, verify we left DIVERSION-NAME.
-# When we pop the last value from the stack, we divert to -1.
-m4_define([m4_divert_pop],
-[m4_if([$1], [], [],
-       [$1], _m4_defn([_m4_divert_diversion]), [],
-       [m4_fatal([$0($1): diversion mismatch:
-]m4_divert_stack)])]dnl
-[_m4_popdef([_m4_divert_stack], [_m4_divert_diversion])]dnl
-[m4_ifdef([_m4_divert_diversion], [],
-	   [m4_fatal([too many m4_divert_pop])])]dnl
-[_m4_divert_raw(_m4_divert(_m4_defn([_m4_divert_diversion]), [-]))])
-
-
-# m4_divert_text(DIVERSION-NAME, CONTENT)
-# ---------------------------------------
-# Output CONTENT into DIVERSION-NAME (which may be a number actually).
-# An end of line is appended for free to CONTENT.
-m4_define([m4_divert_text],
-[m4_divert_push([$1])$2
-m4_divert_pop([$1])])
-
-
-# m4_divert_once(DIVERSION-NAME, CONTENT)
-# ---------------------------------------
-# Output CONTENT into DIVERSION-NAME once, if not already there.
-# An end of line is appended for free to CONTENT.
-m4_define([m4_divert_once],
-[m4_expand_once([m4_divert_text([$1], [$2])])])
-
-
-# _m4_divert_unsafe(DIVERSION-NAME)
-# ---------------------------------
-# Issue a warning that the attempt to change the current diversion to
-# DIVERSION-NAME is unsafe, because this macro is being expanded
-# during argument collection of m4_expand.
-m4_define([_m4_divert_unsafe],
-[m4_fatal([$0: cannot change diversion to `$1' inside m4_expand])])
-
-
-# m4_undivert(DIVERSION-NAME...)
-# ------------------------------
-# Undivert DIVERSION-NAME.  Unlike the M4 version, this requires at
-# least one DIVERSION-NAME; also, due to support for named diversions,
-# this should not be used to undivert files.
-m4_define([m4_undivert],
-[m4_if([$#], [0], [m4_fatal([$0: missing argument])],
-       [$#], [1], [_m4_undivert(_m4_divert([$1]))],
-       [m4_map_args([$0], $@)])])
-
-
-## --------------------------------------------- ##
-## 10. Defining macros with bells and whistles.  ##
-## --------------------------------------------- ##
-
-# `m4_defun' is basically `m4_define' but it equips the macro with the
-# needed machinery for `m4_require'.  A macro must be m4_defun'd if
-# either it is m4_require'd, or it m4_require's.
-#
-# Two things deserve attention and are detailed below:
-#  1. Implementation of m4_require
-#  2. Keeping track of the expansion stack
-#
-# 1. Implementation of m4_require
-# ===============================
-#
-# Of course m4_defun calls m4_provide, so that a macro which has
-# been expanded is not expanded again when m4_require'd, but the
-# difficult part is the proper expansion of macros when they are
-# m4_require'd.
-#
-# The implementation is based on three ideas, (i) using diversions to
-# prepare the expansion of the macro and its dependencies (by Franc,ois
-# Pinard), (ii) expand the most recently m4_require'd macros _after_
-# the previous macros (by Axel Thimm), and (iii) track instances of
-# provide before require (by Eric Blake).
-#
-#
-# The first idea: why use diversions?
-# -----------------------------------
-#
-# When a macro requires another, the other macro is expanded in new
-# diversion, GROW.  When the outer macro is fully expanded, we first
-# undivert the most nested diversions (GROW - 1...), and finally
-# undivert GROW.  To understand why we need several diversions,
-# consider the following example:
-#
-# | m4_defun([TEST1], [Test...m4_require([TEST2])1])
-# | m4_defun([TEST2], [Test...m4_require([TEST3])2])
-# | m4_defun([TEST3], [Test...3])
-#
-# Because m4_require is not required to be first in the outer macros, we
-# must keep the expansions of the various levels of m4_require separated.
-# Right before executing the epilogue of TEST1, we have:
-#
-#	   GROW - 2: Test...3
-#	   GROW - 1: Test...2
-#	   GROW:     Test...1
-#	   BODY:
-#
-# Finally the epilogue of TEST1 undiverts GROW - 2, GROW - 1, and
-# GROW into the regular flow, BODY.
-#
-#	   GROW - 2:
-#	   GROW - 1:
-#	   GROW:
-#	   BODY:        Test...3; Test...2; Test...1
-#
-# (The semicolons are here for clarification, but of course are not
-# emitted.)  This is what Autoconf 2.0 (I think) to 2.13 (I'm sure)
-# implement.
-#
-#
-# The second idea: first required first out
-# -----------------------------------------
-#
-# The natural implementation of the idea above is buggy and produces
-# very surprising results in some situations.  Let's consider the
-# following example to explain the bug:
-#
-# | m4_defun([TEST1],  [m4_require([TEST2a])m4_require([TEST2b])])
-# | m4_defun([TEST2a], [])
-# | m4_defun([TEST2b], [m4_require([TEST3])])
-# | m4_defun([TEST3],  [m4_require([TEST2a])])
-# |
-# | AC_INIT
-# | TEST1
-#
-# The dependencies between the macros are:
-#
-#		 3 --- 2b
-#		/        \              is m4_require'd by
-#	       /          \       left -------------------- right
-#	    2a ------------ 1
-#
-# If you strictly apply the rules given in the previous section you get:
-#
-#	   GROW - 2: TEST3
-#	   GROW - 1: TEST2a; TEST2b
-#	   GROW:     TEST1
-#	   BODY:
-#
-# (TEST2a, although required by TEST3 is not expanded in GROW - 3
-# because is has already been expanded before in GROW - 1, so it has
-# been AC_PROVIDE'd, so it is not expanded again) so when you undivert
-# the stack of diversions, you get:
-#
-#	   GROW - 2:
-#	   GROW - 1:
-#	   GROW:
-#	   BODY:        TEST3; TEST2a; TEST2b; TEST1
-#
-# i.e., TEST2a is expanded after TEST3 although the latter required the
-# former.
-#
-# Starting from 2.50, we use an implementation provided by Axel Thimm.
-# The idea is simple: the order in which macros are emitted must be the
-# same as the one in which macros are expanded.  (The bug above can
-# indeed be described as: a macro has been m4_provide'd before its
-# dependent, but it is emitted after: the lack of correlation between
-# emission and expansion order is guilty).
-#
-# How to do that?  You keep the stack of diversions to elaborate the
-# macros, but each time a macro is fully expanded, emit it immediately.
-#
-# In the example above, when TEST2a is expanded, but it's epilogue is
-# not run yet, you have:
-#
-#	   GROW - 2:
-#	   GROW - 1: TEST2a
-#	   GROW:     Elaboration of TEST1
-#	   BODY:
-#
-# The epilogue of TEST2a emits it immediately:
-#
-#	   GROW - 2:
-#	   GROW - 1:
-#	   GROW:     Elaboration of TEST1
-#	   BODY:     TEST2a
-#
-# TEST2b then requires TEST3, so right before the epilogue of TEST3, you
-# have:
-#
-#	   GROW - 2: TEST3
-#	   GROW - 1: Elaboration of TEST2b
-#	   GROW:     Elaboration of TEST1
-#	   BODY:      TEST2a
-#
-# The epilogue of TEST3 emits it:
-#
-#	   GROW - 2:
-#	   GROW - 1: Elaboration of TEST2b
-#	   GROW:     Elaboration of TEST1
-#	   BODY:     TEST2a; TEST3
-#
-# TEST2b is now completely expanded, and emitted:
-#
-#	   GROW - 2:
-#	   GROW - 1:
-#	   GROW:     Elaboration of TEST1
-#	   BODY:     TEST2a; TEST3; TEST2b
-#
-# and finally, TEST1 is finished and emitted:
-#
-#	   GROW - 2:
-#	   GROW - 1:
-#	   GROW:
-#	   BODY:     TEST2a; TEST3; TEST2b: TEST1
-#
-# The idea is simple, but the implementation is a bit involved.  If
-# you are like me, you will want to see the actual functioning of this
-# implementation to be convinced.  The next section gives the full
-# details.
-#
-#
-# The Axel Thimm implementation at work
-# -------------------------------------
-#
-# We consider the macros above, and this configure.ac:
-#
-#	    AC_INIT
-#	    TEST1
-#
-# You should keep the definitions of _m4_defun_pro, _m4_defun_epi, and
-# m4_require at hand to follow the steps.
-#
-# This implementation tries not to assume that the current diversion is
-# BODY, so as soon as a macro (m4_defun'd) is expanded, we first
-# record the current diversion under the name _m4_divert_dump (denoted
-# DUMP below for short).  This introduces an important difference with
-# the previous versions of Autoconf: you cannot use m4_require if you
-# are not inside an m4_defun'd macro, and especially, you cannot
-# m4_require directly from the top level.
-#
-# We have not tried to simulate the old behavior (better yet, we
-# diagnose it), because it is too dangerous: a macro m4_require'd from
-# the top level is expanded before the body of `configure', i.e., before
-# any other test was run.  I let you imagine the result of requiring
-# AC_STDC_HEADERS for instance, before AC_PROG_CC was actually run....
-#
-# After AC_INIT was run, the current diversion is BODY.
-# * AC_INIT was run
-#   DUMP:                undefined
-#   diversion stack:     BODY |-
-#
-# * TEST1 is expanded
-# The prologue of TEST1 sets _m4_divert_dump, which is the diversion
-# where the current elaboration will be dumped, to the current
-# diversion.  It also m4_divert_push to GROW, where the full
-# expansion of TEST1 and its dependencies will be elaborated.
-#   DUMP:        BODY
-#   BODY:        empty
-#   diversions:  GROW, BODY |-
-#
-# * TEST1 requires TEST2a
-# _m4_require_call m4_divert_pushes another temporary diversion,
-# GROW - 1, and expands TEST2a in there.
-#   DUMP:        BODY
-#   BODY:        empty
-#   GROW - 1:    TEST2a
-#   diversions:  GROW - 1, GROW, BODY |-
-# Then the content of the temporary diversion is moved to DUMP and the
-# temporary diversion is popped.
-#   DUMP:        BODY
-#   BODY:        TEST2a
-#   diversions:  GROW, BODY |-
-#
-# * TEST1 requires TEST2b
-# Again, _m4_require_call pushes GROW - 1 and heads to expand TEST2b.
-#   DUMP:        BODY
-#   BODY:        TEST2a
-#   diversions:  GROW - 1, GROW, BODY |-
-#
-# * TEST2b requires TEST3
-# _m4_require_call pushes GROW - 2 and expands TEST3 here.
-# (TEST3 requires TEST2a, but TEST2a has already been m4_provide'd, so
-# nothing happens.)
-#   DUMP:        BODY
-#   BODY:        TEST2a
-#   GROW - 2:    TEST3
-#   diversions:  GROW - 2, GROW - 1, GROW, BODY |-
-# Then the diversion is appended to DUMP, and popped.
-#   DUMP:        BODY
-#   BODY:        TEST2a; TEST3
-#   diversions:  GROW - 1, GROW, BODY |-
-#
-# * TEST1 requires TEST2b (contd.)
-# The content of TEST2b is expanded...
-#   DUMP:        BODY
-#   BODY:        TEST2a; TEST3
-#   GROW - 1:    TEST2b,
-#   diversions:  GROW - 1, GROW, BODY |-
-# ... and moved to DUMP.
-#   DUMP:        BODY
-#   BODY:        TEST2a; TEST3; TEST2b
-#   diversions:  GROW, BODY |-
-#
-# * TEST1 is expanded: epilogue
-# TEST1's own content is in GROW...
-#   DUMP:        BODY
-#   BODY:        TEST2a; TEST3; TEST2b
-#   GROW:        TEST1
-#   diversions:  BODY |-
-# ... and it's epilogue moves it to DUMP and then undefines DUMP.
-#   DUMP:       undefined
-#   BODY:       TEST2a; TEST3; TEST2b; TEST1
-#   diversions: BODY |-
-#
-#
-# The third idea: track macros provided before they were required
-# ---------------------------------------------------------------
-#
-# Using just the first two ideas, Autoconf 2.50 through 2.63 still had
-# a subtle bug for more than seven years.  Let's consider the
-# following example to explain the bug:
-#
-# | m4_defun([TEST1], [1])
-# | m4_defun([TEST2], [2[]m4_require([TEST1])])
-# | m4_defun([TEST3], [3 TEST1 m4_require([TEST2])])
-# | TEST3
-#
-# After the prologue of TEST3, we are collecting text in GROW with the
-# intent of dumping it in BODY during the epilogue.  Next, we
-# encounter the direct invocation of TEST1, which provides the macro
-# in place in GROW.  From there, we encounter a requirement for TEST2,
-# which must be collected in a new diversion.  While expanding TEST2,
-# we encounter a requirement for TEST1, but since it has already been
-# expanded, the Axel Thimm algorithm states that we can treat it as a
-# no-op.  But that would lead to an end result of `2 3 1', meaning
-# that we have once again output a macro (TEST2) prior to its
-# requirements (TEST1).
-#
-# The problem can only occur if a single defun'd macro first provides,
-# then later indirectly requires, the same macro.  Note that directly
-# expanding then requiring a macro is okay: because the dependency was
-# met, the require phase can be a no-op.  For that matter, the outer
-# macro can even require two helpers, where the first helper expands
-# the macro, and the second helper indirectly requires the macro.
-# Out-of-order expansion is only present if the inner macro is
-# required by something that will be hoisted in front of where the
-# direct expansion occurred.  In other words, we must be careful not
-# to warn on:
-#
-# | m4_defun([TEST4], [4])
-# | m4_defun([TEST5], [5 TEST4 m4_require([TEST4])])
-# | TEST5 => 5 4
-#
-# or even the more complex:
-#
-# | m4_defun([TEST6], [6])
-# | m4_defun([TEST7], [7 TEST6])
-# | m4_defun([TEST8], [8 m4_require([TEST6])])
-# | m4_defun([TEST9], [9 m4_require([TEST8])])
-# | m4_defun([TEST10], [10 m4_require([TEST7]) m4_require([TEST9])])
-# | TEST10 => 7 6 8 9 10
-#
-# So, to detect whether a require was direct or indirect, m4_defun and
-# m4_require track the name of the macro that caused a diversion to be
-# created (using the stack _m4_diverting, coupled with an O(1) lookup
-# _m4_diverting([NAME])), and m4_provide stores the name associated
-# with the diversion at which a macro was provided.  A require call is
-# direct if it occurs within the same diversion where the macro was
-# provided, or if the diversion associated with the providing context
-# has been collected.
-#
-# The implementation of the warning involves tracking the set of
-# macros which have been provided since the start of the outermost
-# defun'd macro (the set is named _m4_provide).  When starting an
-# outermost macro, the set is emptied; when a macro is provided, it is
-# added to the set; when require expands the body of a macro, it is
-# removed from the set; and when a macro is indirectly required, the
-# set is checked.  If a macro is in the set, then it has been provided
-# before it was required, and we satisfy dependencies by expanding the
-# macro as if it had never been provided; in the example given above,
-# this means we now output `1 2 3 1'.  Meanwhile, a warning is issued
-# to inform the user that her macros trigger the bug in older autoconf
-# versions, and that her output file now contains redundant contents
-# (and possibly new problems, if the repeated macro was not
-# idempotent).  Meanwhile, macros defined by m4_defun_once instead of
-# m4_defun are idempotent, avoiding any warning or duplicate output.
-#
-#
-# 2. Keeping track of the expansion stack
-# =======================================
-#
-# When M4 expansion goes wrong it is often extremely hard to find the
-# path amongst macros that drove to the failure.  What is needed is
-# the stack of macro `calls'. One could imagine that GNU M4 would
-# maintain a stack of macro expansions, unfortunately it doesn't, so
-# we do it by hand.  This is of course extremely costly, but the help
-# this stack provides is worth it.  Nevertheless to limit the
-# performance penalty this is implemented only for m4_defun'd macros,
-# not for define'd macros.
-#
-# Each time we enter an m4_defun'd macros, we add a definition in
-# _m4_expansion_stack, and when we exit the macro, we remove it (thanks
-# to pushdef/popdef).  m4_stack_foreach is used to print the expansion
-# stack in the rare cases when it's needed.
-#
-# In addition, we want to detect circular m4_require dependencies.
-# Each time we expand a macro FOO we define _m4_expanding(FOO); and
-# m4_require(BAR) simply checks whether _m4_expanding(BAR) is defined.
-
-
-# m4_expansion_stack
-# ------------------
-# Expands to the entire contents of the expansion stack.  The caller
-# must supply a trailing newline.  This macro always prints a
-# location; check whether _m4_expansion_stack is defined to filter out
-# the case when no defun'd macro is in force.
-m4_define([m4_expansion_stack],
-[m4_stack_foreach_sep_lifo([_$0], [_$0_entry(], [)
-])m4_location[: the top level]])
-
-# _m4_expansion_stack_entry(MACRO)
-# --------------------------------
-# Format an entry for MACRO found on the expansion stack.
-m4_define([_m4_expansion_stack_entry],
-[_m4_defn([m4_location($1)])[: $1 is expanded from...]])
-
-# m4_expansion_stack_push(MACRO)
-# ------------------------------
-# Form an entry of the expansion stack on entry to MACRO and push it.
-m4_define([m4_expansion_stack_push],
-[m4_pushdef([_m4_expansion_stack], [$1])])
-
-
-# _m4_divert(GROW)
-# ----------------
-# This diversion is used by the m4_defun/m4_require machinery.  It is
-# important to keep room before GROW because for each nested
-# AC_REQUIRE we use an additional diversion (i.e., two m4_require's
-# will use GROW - 2.  More than 3 levels has never seemed to be
-# needed.)
-#
-# ...
-# - GROW - 2
-#   m4_require'd code, 2 level deep
-# - GROW - 1
-#   m4_require'd code, 1 level deep
-# - GROW
-#   m4_defun'd macros are elaborated here.
-
-m4_define([_m4_divert(GROW)],       10000)
-
-
-# _m4_defun_pro(MACRO-NAME)
-# -------------------------
-# The prologue for Autoconf macros.
-#
-# This is called frequently, so minimize the number of macro invocations
-# by avoiding dnl and m4_defn overhead.
-m4_define([_m4_defun_pro],
-[m4_ifdef([_m4_expansion_stack], [], [_m4_defun_pro_outer([$1])])]dnl
-[m4_expansion_stack_push([$1])m4_pushdef([_m4_expanding($1)])])
-
-m4_define([_m4_defun_pro_outer],
-[m4_set_delete([_m4_provide])]dnl
-[m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])]dnl
-[m4_pushdef([_m4_divert_dump], m4_divnum)m4_divert_push([GROW])])
-
-# _m4_defun_epi(MACRO-NAME)
-# -------------------------
-# The Epilogue for Autoconf macros.  MACRO-NAME only helps tracing
-# the PRO/EPI pairs.
-#
-# This is called frequently, so minimize the number of macro invocations
-# by avoiding dnl and m4_popdef overhead.
-m4_define([_m4_defun_epi],
-[_m4_popdef([_m4_expanding($1)], [_m4_expansion_stack])]dnl
-[m4_ifdef([_m4_expansion_stack], [], [_m4_defun_epi_outer([$1])])]dnl
-[m4_provide([$1])])
-
-m4_define([_m4_defun_epi_outer],
-[_m4_popdef([_m4_divert_dump], [_m4_diverting([$1])], [_m4_diverting])]dnl
-[m4_divert_pop([GROW])m4_undivert([GROW])])
-
-
-# _m4_divert_dump
-# ---------------
-# If blank, we are outside of any defun'd macro.  Otherwise, expands
-# to the diversion number (not name) where require'd macros should be
-# moved once completed.
-m4_define([_m4_divert_dump])
-
-
-# m4_divert_require(DIVERSION, NAME-TO-CHECK, [BODY-TO-EXPAND])
-# -------------------------------------------------------------
-# Same as m4_require, but BODY-TO-EXPAND goes into the named DIVERSION;
-# requirements still go in the current diversion though.
-#
-m4_define([m4_divert_require],
-[m4_ifdef([_m4_expanding($2)],
-  [m4_fatal([$0: circular dependency of $2])])]dnl
-[m4_if(_m4_divert_dump, [],
-  [m4_fatal([$0($2): cannot be used outside of an m4_defun'd macro])])]dnl
-[m4_provide_if([$2], [],
-  [_m4_require_call([$2], [$3], _m4_divert([$1], [-]))])])
-
-
-# m4_defun(NAME, EXPANSION, [MACRO = m4_define])
-# ----------------------------------------------
-# Define a macro NAME which automatically provides itself.  Add
-# machinery so the macro automatically switches expansion to the
-# diversion stack if it is not already using it, prior to EXPANSION.
-# In this case, once finished, it will bring back all the code
-# accumulated in the diversion stack.  This, combined with m4_require,
-# achieves the topological ordering of macros.  We don't use this
-# macro to define some frequently called macros that are not involved
-# in ordering constraints, to save m4 processing.
-#
-# MACRO is an undocumented argument; when set to m4_pushdef, and NAME
-# is already defined, the new definition is added to the pushdef
-# stack, rather than overwriting the current definition.  It can thus
-# be used to write self-modifying macros, which pop themselves to a
-# previously m4_define'd definition so that subsequent use of the
-# macro is faster.
-m4_define([m4_defun],
-[m4_define([m4_location($1)], m4_location)]dnl
-[m4_default([$3], [m4_define])([$1],
-  [_m4_defun_pro(]m4_dquote($[0])[)$2[]_m4_defun_epi(]m4_dquote($[0])[)])])
-
-
-# m4_defun_init(NAME, INIT, COMMON)
-# ---------------------------------
-# Like m4_defun, but split EXPANSION into two portions: INIT which is
-# done only the first time NAME is invoked, and COMMON which is
-# expanded every time.
-#
-# For now, the COMMON definition is always m4_define'd, giving an even
-# lighter-weight definition.  m4_defun allows self-providing, but once
-# a macro is provided, m4_require no longer cares if it is m4_define'd
-# or m4_defun'd.  m4_defun also provides location tracking to identify
-# dependency bugs, but once the INIT has been expanded, we know there
-# are no dependency bugs.  However, if a future use needs COMMON to be
-# m4_defun'd, we can add a parameter, similar to the third parameter
-# to m4_defun.
-m4_define([m4_defun_init],
-[m4_define([$1], [$3[]])m4_defun([$1],
-   [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl
-[m4_if(]m4_dquote($[#])[, [0], [], ]m4_dquote([,$]@)[))], [m4_pushdef])])
-
-
-# m4_defun_once(NAME, EXPANSION)
-# ------------------------------
-# Like m4_defun, but guarantee that EXPANSION only happens once
-# (thereafter, using NAME is a no-op).
-#
-# If _m4_divert_dump is empty, we are called at the top level;
-# otherwise, we must ensure that we are required in front of the
-# current defun'd macro.  Use a helper macro so that EXPANSION need
-# only occur once in the definition of NAME, since it might be large.
-m4_define([m4_defun_once],
-[m4_define([m4_location($1)], m4_location)]dnl
-[m4_define([$1], [_m4_defun_once([$1], [$2], m4_if(_m4_divert_dump, [],
-  [[_m4_defun_pro([$1])m4_unquote(], [)_m4_defun_epi([$1])]],
-m4_ifdef([_m4_diverting([$1])], [-]), [-], [[m4_unquote(], [)]],
-  [[_m4_require_call([$1],], [, _m4_divert_dump)]]))])])
-
-m4_define([_m4_defun_once],
-[m4_pushdef([$1])$3[$2[]m4_provide([$1])]$4])
-
-
-# m4_pattern_forbid(ERE, [WHY])
-# -----------------------------
-# Declare that no token matching the forbidden extended regular
-# expression ERE should be seen in the output unless...
-m4_define([m4_pattern_forbid], [])
-
-
-# m4_pattern_allow(ERE)
-# ---------------------
-# ... that token also matches the allowed extended regular expression ERE.
-# Both used via traces.
-m4_define([m4_pattern_allow], [])
-
-
-## --------------------------------- ##
-## 11. Dependencies between macros.  ##
-## --------------------------------- ##
-
-
-# m4_before(THIS-MACRO-NAME, CALLED-MACRO-NAME)
-# ---------------------------------------------
-# Issue a warning if CALLED-MACRO-NAME was called before THIS-MACRO-NAME.
-m4_define([m4_before],
-[m4_provide_if([$2],
-	       [m4_warn([syntax], [$2 was called before $1])])])
-
-
-# m4_require(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK])
-# -----------------------------------------------------------
-# If NAME-TO-CHECK has never been expanded (actually, if it is not
-# m4_provide'd), expand BODY-TO-EXPAND *before* the current macro
-# expansion; follow the expansion with a newline.  Once expanded, emit
-# it in _m4_divert_dump.  Keep track of the m4_require chain in
-# _m4_expansion_stack.
-#
-# The normal cases are:
-#
-# - NAME-TO-CHECK == BODY-TO-EXPAND
-#   Which you can use for regular macros with or without arguments, e.g.,
-#     m4_require([AC_PROG_CC], [AC_PROG_CC])
-#     m4_require([AC_CHECK_HEADERS(threads.h)], [AC_CHECK_HEADERS(threads.h)])
-#   which is just the same as
-#     m4_require([AC_PROG_CC])
-#     m4_require([AC_CHECK_HEADERS(threads.h)])
-#
-# - BODY-TO-EXPAND == m4_indir([NAME-TO-CHECK])
-#   In the case of macros with irregular names.  For instance:
-#     m4_require([AC_LANG_COMPILER(C)], [indir([AC_LANG_COMPILER(C)])])
-#   which means `if the macro named `AC_LANG_COMPILER(C)' (the parens are
-#   part of the name, it is not an argument) has not been run, then
-#   call it.'
-#   Had you used
-#     m4_require([AC_LANG_COMPILER(C)], [AC_LANG_COMPILER(C)])
-#   then m4_require would have tried to expand `AC_LANG_COMPILER(C)', i.e.,
-#   call the macro `AC_LANG_COMPILER' with `C' as argument.
-#
-#   You could argue that `AC_LANG_COMPILER', when it receives an argument
-#   such as `C' should dispatch the call to `AC_LANG_COMPILER(C)'.  But this
-#   `extension' prevents `AC_LANG_COMPILER' from having actual arguments that
-#   it passes to `AC_LANG_COMPILER(C)'.
-#
-# This is called frequently, so minimize the number of macro invocations
-# by avoiding dnl and other overhead on the common path.
-m4_define([m4_require],
-[m4_ifdef([_m4_expanding($1)],
-  [m4_fatal([$0: circular dependency of $1])])]dnl
-[m4_if(_m4_divert_dump, [],
-  [m4_fatal([$0($1): cannot be used outside of an ]dnl
-m4_if([$0], [m4_require], [[m4_defun]], [[AC_DEFUN]])['d macro])])]dnl
-[m4_provide_if([$1], [m4_set_contains([_m4_provide], [$1],
-    [_m4_require_check([$1], _m4_defn([m4_provide($1)]), [$0])], [m4_ignore])],
-  [_m4_require_call])([$1], [$2], _m4_divert_dump)])
-
-
-# _m4_require_call(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK],
-#                  DIVERSION-NUMBER)
-# -----------------------------------------------------------------
-# If m4_require decides to expand the body, it calls this macro.  The
-# expansion is placed in DIVERSION-NUMBER.
-#
-# This is called frequently, so minimize the number of macro invocations
-# by avoiding dnl and other overhead on the common path.
-# The use of a witness macro protecting the warning allows aclocal
-# to silence any warnings when probing for what macros are required
-# and must therefore be located, when using the Autoconf-without-aclocal-m4
-# autom4te language.  For more background, see:
-# https://lists.gnu.org/archive/html/automake-patches/2012-11/msg00035.html
-m4_define([_m4_require_call],
-[m4_pushdef([_m4_divert_grow], m4_decr(_m4_divert_grow))]dnl
-[m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])]dnl
-[m4_divert_push(_m4_divert_grow, [-])]dnl
-[m4_if([$2], [], [$1], [$2])
-m4_provide_if([$1], [m4_set_remove([_m4_provide], [$1])],
-  [m4_ifndef([m4_require_silent_probe],
-    [m4_warn([syntax], [$1 is m4_require'd but not m4_defun'd])])])]dnl
-[_m4_divert_raw($3)_m4_undivert(_m4_divert_grow)]dnl
-[m4_divert_pop(_m4_divert_grow)_m4_popdef([_m4_divert_grow],
-[_m4_diverting([$1])], [_m4_diverting])])
-
-
-# _m4_require_check(NAME-TO-CHECK, OWNER, CALLER)
-# -----------------------------------------------
-# NAME-TO-CHECK has been identified as previously expanded in the
-# diversion owned by OWNER.  If this is a problem, warn on behalf of
-# CALLER and return _m4_require_call; otherwise return m4_ignore.
-m4_define([_m4_require_check],
-[m4_if(_m4_defn([_m4_diverting]), [$2], [m4_ignore],
-       m4_ifdef([_m4_diverting([$2])], [-]), [-], [m4_warn([syntax],
-   [$3: `$1' was expanded before it was required
-http://www.gnu.org/software/autoconf/manual/autoconf.html#Expanded-Before-Required])_m4_require_call],
-       [m4_ignore])])
-
-
-# _m4_divert_grow
-# ---------------
-# The counter for _m4_require_call.
-m4_define([_m4_divert_grow], _m4_divert([GROW]))
-
-
-# m4_expand_once(TEXT, [WITNESS = TEXT])
-# --------------------------------------
-# If TEXT has never been expanded, expand it *here*.  Use WITNESS as
-# as a memory that TEXT has already been expanded.
-m4_define([m4_expand_once],
-[m4_provide_if(m4_default_quoted([$2], [$1]),
-	       [],
-	       [m4_provide(m4_default_quoted([$2], [$1]))[]$1])])
-
-
-# m4_provide(MACRO-NAME)
-# ----------------------
-m4_define([m4_provide],
-[m4_ifdef([m4_provide($1)], [],
-[m4_set_add([_m4_provide], [$1], [m4_define([m4_provide($1)],
-  m4_ifdef([_m4_diverting], [_m4_defn([_m4_diverting])]))])])])
-
-
-# m4_provide_if(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -------------------------------------------------------
-# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
-# The purpose of this macro is to provide the user with a means to
-# check macros which are provided without letting her know how the
-# information is coded.
-m4_define([m4_provide_if],
-[m4_ifdef([m4_provide($1)],
-	  [$2], [$3])])
-
-
-## --------------------- ##
-## 12. Text processing.  ##
-## --------------------- ##
-
-
-# m4_cr_letters
-# m4_cr_LETTERS
-# m4_cr_Letters
-# -------------
-m4_define([m4_cr_letters], [abcdefghijklmnopqrstuvwxyz])
-m4_define([m4_cr_LETTERS], [ABCDEFGHIJKLMNOPQRSTUVWXYZ])
-m4_define([m4_cr_Letters],
-m4_defn([m4_cr_letters])dnl
-m4_defn([m4_cr_LETTERS])dnl
-)
-
-
-# m4_cr_digits
-# ------------
-m4_define([m4_cr_digits], [0123456789])
-
-
-# m4_cr_alnum
-# -----------
-m4_define([m4_cr_alnum],
-m4_defn([m4_cr_Letters])dnl
-m4_defn([m4_cr_digits])dnl
-)
-
-
-# m4_cr_symbols1
-# m4_cr_symbols2
-# --------------
-m4_define([m4_cr_symbols1],
-m4_defn([m4_cr_Letters])dnl
-_)
-
-m4_define([m4_cr_symbols2],
-m4_defn([m4_cr_symbols1])dnl
-m4_defn([m4_cr_digits])dnl
-)
-
-# m4_cr_all
-# ---------
-# The character range representing everything, with `-' as the last
-# character, since it is special to m4_translit.  Use with care, because
-# it contains characters special to M4 (fortunately, both ASCII and EBCDIC
-# have [] in order, so m4_defn([m4_cr_all]) remains a valid string).  It
-# also contains characters special to terminals, so it should never be
-# displayed in an error message.  Also, attempts to map [ and ] to other
-# characters via m4_translit must deal with the fact that m4_translit does
-# not add quotes to the output.
-#
-# In EBCDIC, $ is immediately followed by *, which leads to problems
-# if m4_cr_all is inlined into a macro definition; so swap them.
-#
-# It is mainly useful in generating inverted character range maps, for use
-# in places where m4_translit is faster than an equivalent m4_bpatsubst;
-# the regex `[^a-z]' is equivalent to:
-#  m4_translit(m4_dquote(m4_defn([m4_cr_all])), [a-z])
-m4_define([m4_cr_all],
-m4_translit(m4_dquote(m4_format(m4_dquote(m4_for(
-  ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [$*-], [*$])-)
-
-
-# _m4_define_cr_not(CATEGORY)
-# ---------------------------
-# Define m4_cr_not_CATEGORY as the inverse of m4_cr_CATEGORY.
-m4_define([_m4_define_cr_not],
-[m4_define([m4_cr_not_$1],
-	   m4_translit(m4_dquote(m4_defn([m4_cr_all])),
-		       m4_defn([m4_cr_$1])))])
-
-
-# m4_cr_not_letters
-# m4_cr_not_LETTERS
-# m4_cr_not_Letters
-# m4_cr_not_digits
-# m4_cr_not_alnum
-# m4_cr_not_symbols1
-# m4_cr_not_symbols2
-# ------------------
-# Inverse character sets
-_m4_define_cr_not([letters])
-_m4_define_cr_not([LETTERS])
-_m4_define_cr_not([Letters])
-_m4_define_cr_not([digits])
-_m4_define_cr_not([alnum])
-_m4_define_cr_not([symbols1])
-_m4_define_cr_not([symbols2])
-
-
-# m4_newline([STRING])
-# --------------------
-# Expands to a newline, possibly followed by STRING.  Exists mostly for
-# formatting reasons.
-m4_define([m4_newline], [
-$1])
-
-
-# m4_re_escape(STRING)
-# --------------------
-# Escape RE active characters in STRING.
-m4_define([m4_re_escape],
-[m4_bpatsubst([$1],
-	      [[][*+.?\^$]], [\\\&])])
-
-
-# m4_re_string
-# ------------
-# Regexp for `[a-zA-Z_0-9]*'
-# m4_dquote provides literal [] for the character class.
-m4_define([m4_re_string],
-m4_dquote(m4_defn([m4_cr_symbols2]))dnl
-[*]dnl
-)
-
-
-# m4_re_word
-# ----------
-# Regexp for `[a-zA-Z_][a-zA-Z_0-9]*'
-m4_define([m4_re_word],
-m4_dquote(m4_defn([m4_cr_symbols1]))dnl
-m4_defn([m4_re_string])dnl
-)
-
-
-# m4_tolower(STRING)
-# m4_toupper(STRING)
-# ------------------
-# These macros convert STRING to lowercase or uppercase.
-#
-# Rather than expand the m4_defn each time, we inline them up front.
-m4_define([m4_tolower],
-[m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_LETTERS]))[,
-		     ]m4_dquote(m4_defn([m4_cr_letters]))[)])
-m4_define([m4_toupper],
-[m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_letters]))[,
-		     ]m4_dquote(m4_defn([m4_cr_LETTERS]))[)])
-
-
-# m4_split(STRING, [REGEXP])
-# --------------------------
-# Split STRING into an m4 list of quoted elements.  The elements are
-# quoted with [ and ].  Beginning spaces and end spaces *are kept*.
-# Use m4_strip to remove them.
-#
-# REGEXP specifies where to split.  Default is [\t ]+.
-#
-# If STRING is empty, the result is an empty list.
-#
-# Pay attention to the m4_changequotes.  When m4 reads the definition of
-# m4_split, it still has quotes set to [ and ].  Luckily, these are matched
-# in the macro body, so the definition is stored correctly.  Use the same
-# alternate quotes as m4_noquote; it must be unlikely to appear in $1.
-#
-# Also, notice that $1 is quoted twice, since we want the result to
-# be quoted.  Then you should understand that the argument of
-# patsubst is -=<{(STRING)}>=- (i.e., with additional -=<{( and )}>=-).
-#
-# This macro is safe on active symbols, i.e.:
-#   m4_define(active, ACTIVE)
-#   m4_split([active active ])end
-#   => [active], [active], []end
-#
-# Optimize on regex of ` ' (space), since m4_foreach_w already guarantees
-# that the list contains single space separators, and a common case is
-# splitting a single-element list.  This macro is called frequently,
-# so avoid unnecessary dnl inside the definition.
-m4_define([m4_split],
-[m4_if([$1], [], [],
-       [$2], [ ], [m4_if(m4_index([$1], [ ]), [-1], [[[$1]]],
-			 [_$0([$1], [$2], [, ])])],
-       [$2], [], [_$0([$1], [[	 ]+], [, ])],
-       [_$0([$1], [$2], [, ])])])
-
-m4_define([_m4_split],
-[m4_changequote([-=<{(],[)}>=-])]dnl
-[[m4_bpatsubst(-=<{(-=<{($1)}>=-)}>=-, -=<{($2)}>=-,
-	       -=<{(]$3[)}>=-)]m4_changequote([, ])])
-
-
-# m4_chomp(STRING)
-# m4_chomp_all(STRING)
-# --------------------
-# Return STRING quoted, but without a trailing newline.  m4_chomp
-# removes at most one newline, while m4_chomp_all removes all
-# consecutive trailing newlines.  Embedded newlines are not touched,
-# and a trailing backslash-newline leaves just a trailing backslash.
-#
-# m4_bregexp is slower than m4_index, and we don't always want to
-# remove all newlines; hence the two variants.  We massage characters
-# to give a nicer pattern to match, particularly since m4_bregexp is
-# line-oriented.  Both versions must guarantee a match, to avoid bugs
-# with precision -1 in m4_format in older m4.
-m4_define([m4_chomp],
-[m4_format([[%.*s]], m4_index(m4_translit([[$1]], [
-/.], [/  ])[./.], [/.]), [$1])])
-
-m4_define([m4_chomp_all],
-[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [
-/], [/ ]), [/*$]), [$1])])
-
-
-# m4_flatten(STRING)
-# ------------------
-# If STRING contains end of lines, replace them with spaces.  If there
-# are backslashed end of lines, remove them.  This macro is safe with
-# active symbols.
-#    m4_define(active, ACTIVE)
-#    m4_flatten([active
-#    act\
-#    ive])end
-#    => active activeend
-#
-# In m4, m4_bpatsubst is expensive, so first check for a newline.
-m4_define([m4_flatten],
-[m4_if(m4_index([$1], [
-]), [-1], [[$1]],
-       [m4_translit(m4_bpatsubst([[[$1]]], [\\
-]), [
-], [ ])])])
-
-
-# m4_strip(STRING)
-# ----------------
-# Expands into STRING with tabs and spaces singled out into a single
-# space, and removing leading and trailing spaces.
-#
-# This macro is robust to active symbols.
-#    m4_define(active, ACTIVE)
-#    m4_strip([  active <tab> <tab>active ])end
-#    => active activeend
-#
-# First, notice that we guarantee trailing space.  Why?  Because regular
-# expressions are greedy, and `.* ?' would always group the space into the
-# .* portion.  The algorithm is simpler by avoiding `?' at the end.  The
-# algorithm correctly strips everything if STRING is just ` '.
-#
-# Then notice the second pattern: it is in charge of removing the
-# leading/trailing spaces.  Why not just `[^ ]'?  Because they are
-# applied to over-quoted strings, i.e. more or less [STRING], due
-# to the limitations of m4_bpatsubsts.  So the leading space in STRING
-# is the *second* character; equally for the trailing space.
-m4_define([m4_strip],
-[m4_bpatsubsts([$1 ],
-	       [[	 ]+], [ ],
-	       [^. ?\(.*\) .$], [[[\1]]])])
-
-
-# m4_normalize(STRING)
-# --------------------
-# Apply m4_flatten and m4_strip to STRING.
-#
-# The argument is quoted, so that the macro is robust to active symbols:
-#
-#    m4_define(active, ACTIVE)
-#    m4_normalize([  act\
-#    ive
-#    active ])end
-#    => active activeend
-
-m4_define([m4_normalize],
-[m4_strip(m4_flatten([$1]))])
-
-
-
-# m4_join(SEP, ARG1, ARG2...)
-# ---------------------------
-# Produce ARG1SEPARG2...SEPARGn.  Avoid back-to-back SEP when a given ARG
-# is the empty string.  No expansion is performed on SEP or ARGs.
-#
-# Since the number of arguments to join can be arbitrarily long, we
-# want to avoid having more than one $@ in the macro definition;
-# otherwise, the expansion would require twice the memory of the already
-# long list.  Hence, m4_join merely looks for the first non-empty element,
-# and outputs just that element; while _m4_join looks for all non-empty
-# elements, and outputs them following a separator.  The final trick to
-# note is that we decide between recursing with $0 or _$0 based on the
-# nested m4_if ending with `_'.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift2($@))])])
-m4_define([_m4_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift2($@))])])
-
-# m4_joinall(SEP, ARG1, ARG2...)
-# ------------------------------
-# Produce ARG1SEPARG2...SEPARGn.  An empty ARG results in back-to-back SEP.
-# No expansion is performed on SEP or ARGs.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_joinall], [[$2]_$0([$1], m4_shift($@))])
-m4_define([_m4_joinall],
-[m4_if([$#], [2], [], [[$1$3]$0([$1], m4_shift2($@))])])
-
-# m4_combine([SEPARATOR], PREFIX-LIST, [INFIX], SUFFIX...)
-# --------------------------------------------------------
-# Produce the pairwise combination of every element in the quoted,
-# comma-separated PREFIX-LIST with every element from the SUFFIX arguments.
-# Each pair is joined with INFIX, and pairs are separated by SEPARATOR.
-# No expansion occurs on SEPARATOR, INFIX, or elements of either list.
-#
-# For example:
-#   m4_combine([, ], [[a], [b], [c]], [-], [1], [2], [3])
-#   => a-1, a-2, a-3, b-1, b-2, b-3, c-1, c-2, c-3
-#
-# This definition is a bit hairy; the thing to realize is that we want
-# to construct m4_map_args_sep([[prefix$3]], [], [[$1]], m4_shift3($@))
-# as the inner loop, using each prefix generated by the outer loop,
-# and without recalculating m4_shift3 every outer iteration.
-m4_define([m4_combine],
-[m4_if([$2], [], [], m4_eval([$# > 3]), [1],
-[m4_map_args_sep([m4_map_args_sep(m4_dquote(], [)[[$3]], [], [[$1]],]]]dnl
-[m4_dquote(m4_dquote(m4_shift3($@)))[[)], [[$1]], $2)])])
-
-
-# m4_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR`'STRING'
-# at the end.  It is valid to use this macro with MACRO-NAME undefined,
-# in which case no SEPARATOR is added.  Be aware that the criterion is
-# `not being defined', and not `not being empty'.
-#
-# Note that neither STRING nor SEPARATOR are expanded here; rather, when
-# you expand MACRO-NAME, they will be expanded at that point in time.
-#
-# This macro is robust to active symbols.  It can be used to grow
-# strings.
-#
-#    | m4_define(active, ACTIVE)dnl
-#    | m4_append([sentence], [This is an])dnl
-#    | m4_append([sentence], [ active ])dnl
-#    | m4_append([sentence], [symbol.])dnl
-#    | sentence
-#    | m4_undefine([active])dnl
-#    | sentence
-#    => This is an ACTIVE symbol.
-#    => This is an active symbol.
-#
-# It can be used to define hooks.
-#
-#    | m4_define(active, ACTIVE)dnl
-#    | m4_append([hooks], [m4_define([act1], [act2])])dnl
-#    | m4_append([hooks], [m4_define([act2], [active])])dnl
-#    | m4_undefine([active])dnl
-#    | act1
-#    | hooks
-#    | act1
-#    => act1
-#    =>
-#    => active
-#
-# It can also be used to create lists, although this particular usage was
-# broken prior to autoconf 2.62.
-#    | m4_append([list], [one], [, ])dnl
-#    | m4_append([list], [two], [, ])dnl
-#    | m4_append([list], [three], [, ])dnl
-#    | list
-#    | m4_dquote(list)
-#    => one, two, three
-#    => [one],[two],[three]
-#
-# Note that m4_append can benefit from amortized O(n) m4 behavior, if
-# the underlying m4 implementation is smart enough to avoid copying existing
-# contents when enlarging a macro's definition into any pre-allocated storage
-# (m4 1.4.x unfortunately does not implement this optimization).  We do
-# not implement m4_prepend, since it is inherently O(n^2) (pre-allocated
-# storage only occurs at the end of a macro, so the existing contents must
-# always be moved).
-#
-# Use _m4_defn for speed.
-m4_define([m4_append],
-[m4_define([$1], m4_ifdef([$1], [_m4_defn([$1])[$3]])[$2])])
-
-
-# m4_append_uniq(MACRO-NAME, STRING, [SEPARATOR], [IF-UNIQ], [IF-DUP])
-# --------------------------------------------------------------------
-# Like `m4_append', but append only if not yet present.  Additionally,
-# expand IF-UNIQ if STRING was appended, or IF-DUP if STRING was already
-# present.  Also, warn if SEPARATOR is not empty and occurs within STRING,
-# as the algorithm no longer guarantees uniqueness.
-#
-# Note that while m4_append can be O(n) (depending on the quality of the
-# underlying M4 implementation), m4_append_uniq is inherently O(n^2)
-# because each append operation searches the entire string.
-m4_define([m4_append_uniq],
-[m4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [],
-		       [m4_warn([syntax],
-				[$0: `$2' contains `$3'])])])_$0($@)])
-m4_define([_m4_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]_m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [m4_append([$1], [$2], [$3])$4], [$5])],
-	  [m4_define([$1], [$2])$4])])
-
-# m4_append_uniq_w(MACRO-NAME, STRINGS)
-# -------------------------------------
-# For each of the words in the whitespace separated list STRINGS, append
-# only the unique strings to the definition of MACRO-NAME.
-#
-# Use _m4_defn for speed.
-m4_define([m4_append_uniq_w],
-[m4_map_args_w([$2], [_m4_append_uniq([$1],], [, [ ])])])
-
-
-# m4_escape(STRING)
-# -----------------
-# Output quoted STRING, but with embedded #, $, [ and ] turned into
-# quadrigraphs.
-#
-# It is faster to check if STRING is already good using m4_translit
-# than to blindly perform four m4_bpatsubst.
-#
-# Because the translit is stripping quotes, it must also neutralize
-# anything that might be in a macro name, as well as comments, commas,
-# and parentheses.  All the problem characters are unified so that a
-# single m4_index can scan the result.
-#
-# Rather than expand m4_defn every time m4_escape is expanded, we
-# inline its expansion up front.
-m4_define([m4_escape],
-[m4_if(m4_index(m4_translit([$1],
-   [[]#,()]]m4_dquote(m4_defn([m4_cr_symbols2]))[, [$$$]), [$]),
-  [-1], [m4_echo], [_$0])([$1])])
-
-m4_define([_m4_escape],
-[m4_changequote([-=<{(],[)}>=-])]dnl
-[m4_bpatsubst(m4_bpatsubst(m4_bpatsubst(m4_bpatsubst(
-	  -=<{(-=<{(-=<{(-=<{(-=<{($1)}>=-)}>=-)}>=-)}>=-)}>=-,
-	-=<{(#)}>=-, -=<{(@%:@)}>=-),
-      -=<{(\[)}>=-, -=<{(@<:@)}>=-),
-    -=<{(\])}>=-, -=<{(@:>@)}>=-),
-  -=<{(\$)}>=-, -=<{(@S|@)}>=-)m4_changequote([,])])
-
-
-# m4_text_wrap(STRING, [PREFIX], [FIRST-PREFIX], [WIDTH])
-# -------------------------------------------------------
-# Expands into STRING wrapped to hold in WIDTH columns (default = 79).
-# If PREFIX is given, each line is prefixed with it.  If FIRST-PREFIX is
-# specified, then the first line is prefixed with it.  As a special case,
-# if the length of FIRST-PREFIX is greater than that of PREFIX, then
-# FIRST-PREFIX will be left alone on the first line.
-#
-# No expansion occurs on the contents STRING, PREFIX, or FIRST-PREFIX,
-# although quadrigraphs are correctly recognized.  More precisely,
-# you may redefine m4_qlen to recognize whatever escape sequences that
-# you will post-process.
-#
-# Typical outputs are:
-#
-# m4_text_wrap([Short string */], [   ], [/* ], 20)
-#  => /* Short string */
-#
-# m4_text_wrap([Much longer string */], [   ], [/* ], 20)
-#  => /* Much longer
-#  =>    string */
-#
-# m4_text_wrap([Short doc.], [          ], [  --short ], 30)
-#  =>   --short Short doc.
-#
-# m4_text_wrap([Short doc.], [          ], [  --too-wide ], 30)
-#  =>   --too-wide
-#  =>           Short doc.
-#
-# m4_text_wrap([Super long documentation.], [          ], [  --too-wide ], 30)
-#  =>   --too-wide
-#  =>      Super long
-#  =>      documentation.
-#
-# FIXME: there is no checking of a longer PREFIX than WIDTH, but do
-# we really want to bother with people trying each single corner
-# of a software?
-#
-# This macro does not leave a trailing space behind the last word of a line,
-# which complicates it a bit.  The algorithm is otherwise stupid and simple:
-# all the words are preceded by m4_Separator which is defined to empty for
-# the first word, and then ` ' (single space) for all the others.
-#
-# The algorithm uses a helper that uses $2 through $4 directly, rather than
-# using local variables, to avoid m4_defn overhead, or expansion swallowing
-# any $.  It also bypasses m4_popdef overhead with _m4_popdef since no user
-# macro expansion occurs in the meantime.  Also, the definition is written
-# with m4_do, to avoid time wasted on dnl during expansion (since this is
-# already a time-consuming macro).
-m4_define([m4_text_wrap],
-[_$0(m4_escape([$1]), [$2], m4_default_quoted([$3], [$2]),
-     m4_default_quoted([$4], [79]))])
-
-m4_define([_m4_text_wrap],
-m4_do(dnl set up local variables, to avoid repeated calculations
-[[m4_pushdef([m4_Indent], m4_qlen([$2]))]],
-[[m4_pushdef([m4_Cursor], m4_qlen([$3]))]],
-[[m4_pushdef([m4_Separator], [m4_define([m4_Separator], [ ])])]],
-dnl expand the first prefix, then check its length vs. regular prefix
-dnl same length: nothing special
-dnl prefix1 longer: output on line by itself, and reset cursor
-dnl prefix1 shorter: pad to length of prefix, and reset cursor
-[[[$3]m4_cond([m4_Cursor], m4_Indent, [],
-	      [m4_eval(m4_Cursor > m4_Indent)], [1], [
-[$2]m4_define([m4_Cursor], m4_Indent)],
-	      [m4_format([%*s], m4_max([0],
-  m4_eval(m4_Indent - m4_Cursor)), [])m4_define([m4_Cursor], m4_Indent)])]],
-dnl now, for each word, compute the cursor after the word is output, then
-dnl check if the cursor would exceed the wrap column
-dnl if so, reset cursor, and insert newline and prefix
-dnl if not, insert the separator (usually a space)
-dnl either way, insert the word
-[[m4_map_args_w([$1], [$0_word(], [, [$2], [$4])])]],
-dnl finally, clean up the local variables
-[[_m4_popdef([m4_Separator], [m4_Cursor], [m4_Indent])]]))
-
-m4_define([_m4_text_wrap_word],
-[m4_define([m4_Cursor], m4_eval(m4_Cursor + m4_qlen([$1]) + 1))]dnl
-[m4_if(m4_eval(m4_Cursor > ([$3])),
-      [1], [m4_define([m4_Cursor], m4_eval(m4_Indent + m4_qlen([$1]) + 1))
-[$2]],
-      [m4_Separator[]])[$1]])
-
-# m4_text_box(MESSAGE, [FRAME-CHARACTER = `-'])
-# ---------------------------------------------
-# Turn MESSAGE into:
-#  ## ------- ##
-#  ## MESSAGE ##
-#  ## ------- ##
-# using FRAME-CHARACTER in the border.
-#
-# Quadrigraphs are correctly recognized.  More precisely, you may
-# redefine m4_qlen to recognize whatever escape sequences that you
-# will post-process.
-m4_define([m4_text_box],
-[m4_pushdef([m4_Border],
-	    m4_translit(m4_format([[[%*s]]], m4_decr(m4_qlen(_m4_expand([$1
-]))), []), [ ], m4_default_quoted([$2], [-])))]dnl
-[[##] _m4_defn([m4_Border]) [##]
-[##] $1 [##]
-[##] _m4_defn([m4_Border]) [##]_m4_popdef([m4_Border])])
-
-
-# m4_qlen(STRING)
-# ---------------
-# Expands to the length of STRING after autom4te converts all quadrigraphs.
-#
-# If you use some other means of post-processing m4 output rather than
-# autom4te, then you may redefine this macro to recognize whatever
-# escape sequences your post-processor will handle.  For that matter,
-# m4_define([m4_qlen], m4_defn([m4_len])) is sufficient if you don't
-# do any post-processing.
-#
-# Avoid bpatsubsts for the common case of no quadrigraphs.  Cache
-# results, as configure scripts tend to ask about lengths of common
-# strings like `/*' and `*/' rather frequently.  Minimize the number
-# of times that $1 occurs in m4_qlen, so there is less text to parse
-# on a cache hit.
-m4_define([m4_qlen],
-[m4_ifdef([$0-$1], [_m4_defn([$0-]], [_$0(])[$1])])
-m4_define([_m4_qlen],
-[m4_define([m4_qlen-$1],
-m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])],
-      [m4_len(m4_bpatsubst([[$1]],
-			   [@\(\(<:\|:>\|S|\|%:\|\{:\|:\}\)\(@\)\|&t@\)],
-			   [\3]))]))_m4_defn([m4_qlen-$1])])
-
-# m4_copyright_condense(TEXT)
-# ---------------------------
-# Condense the copyright notice in TEXT to only display the final
-# year, wrapping the results to fit in 80 columns.
-m4_define([m4_copyright_condense],
-[m4_text_wrap(m4_bpatsubst(m4_flatten([[$1]]),
-[(C)[-	 ,0-9]*\([1-9][0-9][0-9][0-9]\)], [(C) \1]))])
-
-## ----------------------- ##
-## 13. Number processing.  ##
-## ----------------------- ##
-
-# m4_cmp(A, B)
-# ------------
-# Compare two integer expressions.
-# A < B -> -1
-# A = B ->  0
-# A > B ->  1
-m4_define([m4_cmp],
-[m4_eval((([$1]) > ([$2])) - (([$1]) < ([$2])))])
-
-
-# m4_list_cmp(A, B)
-# -----------------
-#
-# Compare the two lists of integer expressions A and B.  For instance:
-#   m4_list_cmp([1, 0],     [1])    ->  0
-#   m4_list_cmp([1, 0],     [1, 0]) ->  0
-#   m4_list_cmp([1, 2],     [1, 0]) ->  1
-#   m4_list_cmp([1, 2, 3],  [1, 2]) ->  1
-#   m4_list_cmp([1, 2, -3], [1, 2]) -> -1
-#   m4_list_cmp([1, 0],     [1, 2]) -> -1
-#   m4_list_cmp([1],        [1, 2]) -> -1
-#   m4_define([xa], [oops])dnl
-#   m4_list_cmp([[0xa]],    [5+5])  -> 0
-#
-# Rather than face the overhead of m4_case, we use a helper function whose
-# expansion includes the name of the macro to invoke on the tail, either
-# m4_ignore or m4_unquote.  This is particularly useful when comparing
-# long lists, since less text is being expanded for deciding when to end
-# recursion.  The recursion is between a pair of macros that alternate
-# which list is trimmed by one element; this is more efficient than
-# calling m4_cdr on both lists from a single macro.  Guarantee exactly
-# one expansion of both lists' side effects.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_list_cmp],
-[_$0_raw(m4_dquote($1), m4_dquote($2))])
-
-m4_define([_m4_list_cmp_raw],
-[m4_if([$1], [$2], [0], [_m4_list_cmp_1([$1], $2)])])
-
-m4_define([_m4_list_cmp],
-[m4_if([$1], [], [0m4_ignore], [$2], [0], [m4_unquote], [$2m4_ignore])])
-
-m4_define([_m4_list_cmp_1],
-[_m4_list_cmp_2([$2], [m4_shift2($@)], $1)])
-
-m4_define([_m4_list_cmp_2],
-[_m4_list_cmp([$1$3], m4_cmp([$3+0], [$1+0]))(
-  [_m4_list_cmp_1(m4_dquote(m4_shift3($@)), $2)])])
-
-# m4_max(EXPR, ...)
-# m4_min(EXPR, ...)
-# -----------------
-# Return the decimal value of the maximum (or minimum) in a series of
-# integer expressions.
-#
-# M4 1.4.x doesn't provide ?:.  Hence this huge m4_eval.  Avoid m4_eval
-# if both arguments are identical, but be aware of m4_max(0xa, 10) (hence
-# the use of <=, not just <, in the second multiply).
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_max],
-[m4_if([$#], [0], [m4_fatal([too few arguments to $0])],
-       [$#], [1], [m4_eval([$1])],
-       [$#$1], [2$2], [m4_eval([$1])],
-       [$#], [2], [_$0($@)],
-       [_m4_minmax([_$0], $@)])])
-
-m4_define([_m4_max],
-[m4_eval((([$1]) > ([$2])) * ([$1]) + (([$1]) <= ([$2])) * ([$2]))])
-
-m4_define([m4_min],
-[m4_if([$#], [0], [m4_fatal([too few arguments to $0])],
-       [$#], [1], [m4_eval([$1])],
-       [$#$1], [2$2], [m4_eval([$1])],
-       [$#], [2], [_$0($@)],
-       [_m4_minmax([_$0], $@)])])
-
-m4_define([_m4_min],
-[m4_eval((([$1]) < ([$2])) * ([$1]) + (([$1]) >= ([$2])) * ([$2]))])
-
-# _m4_minmax(METHOD, ARG1, ARG2...)
-# ---------------------------------
-# Common recursion code for m4_max and m4_min.  METHOD must be _m4_max
-# or _m4_min, and there must be at least two arguments to combine.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([_m4_minmax],
-[m4_if([$#], [3], [$1([$2], [$3])],
-       [$0([$1], $1([$2], [$3]), m4_shift3($@))])])
-
-
-# m4_sign(A)
-# ----------
-# The sign of the integer expression A.
-m4_define([m4_sign],
-[m4_eval((([$1]) > 0) - (([$1]) < 0))])
-
-
-
-## ------------------------ ##
-## 14. Version processing.  ##
-## ------------------------ ##
-
-
-# m4_version_unletter(VERSION)
-# ----------------------------
-# Normalize beta version numbers with letters to numeric expressions, which
-# can then be handed to m4_eval for the purpose of comparison.
-#
-#   Nl -> (N+1).-1.(l#)
-#
-# for example:
-#   [2.14a] -> [0,2,14+1,-1,[0r36:a]] -> 2.15.-1.10
-#   [2.14b] -> [0,2,15+1,-1,[0r36:b]] -> 2.15.-1.11
-#   [2.61aa.b] -> [0,2.61,1,-1,[0r36:aa],+1,-1,[0r36:b]] -> 2.62.-1.370.1.-1.11
-#   [08] -> [0,[0r10:0]8] -> 8
-#
-# This macro expects reasonable version numbers, but can handle double
-# letters and does not expand any macros.  Original version strings can
-# use both `.' and `-' separators.
-#
-# Inline constant expansions, to avoid m4_defn overhead.
-# _m4_version_unletter is the real workhorse used by m4_version_compare,
-# but since [0r36:a] and commas are less readable than 10 and dots, we
-# provide a wrapper for human use.
-m4_define([m4_version_unletter],
-[m4_substr(m4_map_args([.m4_eval], m4_unquote(_$0([$1]))), [3])])
-m4_define([_m4_version_unletter],
-[m4_bpatsubst(m4_bpatsubst(m4_translit([[[[0,$1]]]], [.-], [,,]),]dnl
-m4_dquote(m4_dquote(m4_defn([m4_cr_Letters])))[[+],
-	      [+1,-1,[0r36:\&]]), [,0], [,[0r10:0]])])
-
-
-# m4_version_compare(VERSION-1, VERSION-2)
-# ----------------------------------------
-# Compare the two version numbers and expand into
-#  -1 if VERSION-1 < VERSION-2
-#   0 if           =
-#   1 if           >
-#
-# Since _m4_version_unletter does not output side effects, we can
-# safely bypass the overhead of m4_version_cmp.
-m4_define([m4_version_compare],
-[_m4_list_cmp_raw(_m4_version_unletter([$1]), _m4_version_unletter([$2]))])
-
-
-# m4_PACKAGE_NAME
-# m4_PACKAGE_TARNAME
-# m4_PACKAGE_VERSION
-# m4_PACKAGE_STRING
-# m4_PACKAGE_BUGREPORT
-# --------------------
-# If m4sugar/version.m4 is present, then define version strings.  This
-# file is optional, provided by Autoconf but absent in Bison.
-m4_sinclude([m4sugar/version.m4])
-
-
-# m4_version_prereq(VERSION, [IF-OK], [IF-NOT = FAIL])
-# ----------------------------------------------------
-# Check this Autoconf version against VERSION.
-m4_define([m4_version_prereq],
-m4_ifdef([m4_PACKAGE_VERSION],
-[[m4_if(m4_version_compare(]m4_dquote(m4_defn([m4_PACKAGE_VERSION]))[, [$1]),
-	[-1],
-	[m4_default([$3],
-		    [m4_fatal([Autoconf version $1 or higher is required],
-			      [63])])],
-	[$2])]],
-[[m4_fatal([m4sugar/version.m4 not found])]]))
-
-
-## ------------------ ##
-## 15. Set handling.  ##
-## ------------------ ##
-
-# Autoconf likes to create arbitrarily large sets; for example, as of
-# this writing, the configure.ac for coreutils tracks a set of more
-# than 400 AC_SUBST.  How do we track all of these set members,
-# without introducing duplicates?  We could use m4_append_uniq, with
-# the set NAME residing in the contents of the macro NAME.
-# Unfortunately, m4_append_uniq is quadratic for set creation, because
-# it costs O(n) to search the string for each of O(n) insertions; not
-# to mention that with m4 1.4.x, even using m4_append is slow, costing
-# O(n) rather than O(1) per insertion.  Other set operations, not used
-# by Autoconf but still possible by manipulation of the definition
-# tracked in macro NAME, include O(n) deletion of one element and O(n)
-# computation of set size.  Because the set is exposed to the user via
-# the definition of a single macro, we cannot cache any data about the
-# set without risking the cache being invalidated by the user
-# redefining NAME.
-#
-# Can we do better?  Yes, because m4 gives us an O(1) search function
-# for free: ifdef.  Additionally, even m4 1.4.x gives us an O(1)
-# insert operation for free: pushdef.  But to use these, we must
-# represent the set via a group of macros; to keep the set consistent,
-# we must hide the set so that the user can only manipulate it through
-# accessor macros.  The contents of the set are maintained through two
-# access points; _m4_set([name]) is a pushdef stack of values in the
-# set, useful for O(n) traversal of the set contents; while the
-# existence of _m4_set([name],value) with no particular value is
-# useful for O(1) querying of set membership.  And since the user
-# cannot externally manipulate the set, we are free to add additional
-# caching macros for other performance improvements.  Deletion can be
-# O(1) per element rather than O(n), by reworking the definition of
-# _m4_set([name],value) to be 0 or 1 based on current membership, and
-# adding _m4_set_cleanup(name) to defer the O(n) cleanup of
-# _m4_set([name]) until we have another reason to do an O(n)
-# traversal.  The existence of _m4_set_cleanup(name) can then be used
-# elsewhere to determine if we must dereference _m4_set([name],value),
-# or assume that definition implies set membership.  Finally, size can
-# be tracked in an O(1) fashion with _m4_set_size(name).
-#
-# The quoting in _m4_set([name],value) is chosen so that there is no
-# ambiguity with a set whose name contains a comma, and so that we can
-# supply the value via _m4_defn([_m4_set([name])]) without needing any
-# quote manipulation.
-
-# m4_set_add(SET, VALUE, [IF-UNIQ], [IF-DUP])
-# -------------------------------------------
-# Add VALUE as an element of SET.  Expand IF-UNIQ on the first
-# addition, and IF-DUP if it is already in the set.  Addition of one
-# element is O(1), such that overall set creation is O(n).
-#
-# We do not want to add a duplicate for a previously deleted but
-# unpruned element, but it is just as easy to check existence directly
-# as it is to query _m4_set_cleanup($1).
-m4_define([m4_set_add],
-[m4_ifdef([_m4_set([$1],$2)],
-	  [m4_if(m4_indir([_m4_set([$1],$2)]), [0],
-		 [m4_define([_m4_set([$1],$2)],
-			    [1])_m4_set_size([$1], [m4_incr])$3], [$4])],
-	  [m4_define([_m4_set([$1],$2)],
-		     [1])m4_pushdef([_m4_set([$1])],
-				    [$2])_m4_set_size([$1], [m4_incr])$3])])
-
-# m4_set_add_all(SET, VALUE...)
-# -----------------------------
-# Add each VALUE into SET.  This is O(n) in the number of VALUEs, and
-# can be faster than calling m4_set_add for each VALUE.
-#
-# Implement two recursion helpers; the check variant is slower but
-# handles the case where an element has previously been removed but
-# not pruned.  The recursion helpers ignore their second argument, so
-# that we can use the faster m4_shift2 and 2 arguments, rather than
-# _m4_shift2 and one argument, as the signal to end recursion.
-#
-# Please keep foreach.m4 in sync with any adjustments made here.
-m4_define([m4_set_add_all],
-[m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1])
-  + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@))))])
-
-m4_define([_m4_set_add_all],
-[m4_if([$#], [2], [],
-       [m4_ifdef([_m4_set([$1],$3)], [],
-		 [m4_define([_m4_set([$1],$3)], [1])m4_pushdef([_m4_set([$1])],
-	   [$3])-])$0([$1], m4_shift2($@))])])
-
-m4_define([_m4_set_add_all_check],
-[m4_if([$#], [2], [],
-       [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))])])
-
-# m4_set_contains(SET, VALUE, [IF-PRESENT], [IF-ABSENT])
-# ------------------------------------------------------
-# Expand IF-PRESENT if SET contains VALUE, otherwise expand IF-ABSENT.
-# This is always O(1).
-m4_define([m4_set_contains],
-[m4_ifdef([_m4_set_cleanup($1)],
-	  [m4_if(m4_ifdef([_m4_set([$1],$2)],
-		    [m4_indir([_m4_set([$1],$2)])], [0]), [1], [$3], [$4])],
-	  [m4_ifdef([_m4_set([$1],$2)], [$3], [$4])])])
-
-# m4_set_contents(SET, [SEP])
-# ---------------------------
-# Expand to a single string containing all the elements in SET,
-# separated by SEP, without modifying SET.  No provision is made for
-# disambiguating set elements that contain non-empty SEP as a
-# sub-string, or for recognizing a set that contains only the empty
-# string.  Order of the output is not guaranteed.  If any elements
-# have been previously removed from the set, this action will prune
-# the unused memory.  This is O(n) in the size of the set before
-# pruning.
-#
-# Use _m4_popdef for speed.  The existence of _m4_set_cleanup($1)
-# determines which version of _1 helper we use.
-m4_define([m4_set_contents],
-[m4_set_map_sep([$1], [], [], [[$2]])])
-
-# _m4_set_contents_1(SET)
-# _m4_set_contents_1c(SET)
-# _m4_set_contents_2(SET, [PRE], [POST], [SEP])
-# ---------------------------------------------
-# Expand to a list of quoted elements currently in the set, each
-# surrounded by PRE and POST, and moving SEP in front of PRE on
-# recursion.  To avoid nesting limit restrictions, the algorithm must
-# be broken into two parts; _1 destructively copies the stack in
-# reverse into _m4_set_($1), producing no output; then _2
-# destructively copies _m4_set_($1) back into the stack in reverse.
-# If no elements were deleted, then this visits the set in the order
-# that elements were inserted.  Behavior is undefined if PRE/POST/SEP
-# tries to recursively list or modify SET in any way other than
-# calling m4_set_remove on the current element.  Use _1 if all entries
-# in the stack are guaranteed to be in the set, and _1c to prune
-# removed entries.  Uses _m4_defn and _m4_popdef for speed.
-m4_define([_m4_set_contents_1],
-[_m4_stack_reverse([_m4_set([$1])], [_m4_set_($1)])])
-
-m4_define([_m4_set_contents_1c],
-[m4_ifdef([_m4_set([$1])],
-	  [m4_set_contains([$1], _m4_defn([_m4_set([$1])]),
-		   [m4_pushdef([_m4_set_($1)], _m4_defn([_m4_set([$1])]))],
-		   [_m4_popdef([_m4_set([$1],]_m4_defn(
-      [_m4_set([$1])])[)])])_m4_popdef([_m4_set([$1])])$0([$1])],
-	  [_m4_popdef([_m4_set_cleanup($1)])])])
-
-m4_define([_m4_set_contents_2],
-[_m4_stack_reverse([_m4_set_($1)], [_m4_set([$1])],
-  [$2[]_m4_defn([_m4_set_($1)])$3], [$4[]])])
-
-# m4_set_delete(SET)
-# ------------------
-# Delete all elements in SET, and reclaim any memory occupied by the
-# set.  This is O(n) in the set size.
-#
-# Use _m4_defn and _m4_popdef for speed.
-m4_define([m4_set_delete],
-[m4_ifdef([_m4_set([$1])],
-	  [_m4_popdef([_m4_set([$1],]_m4_defn([_m4_set([$1])])[)],
-		      [_m4_set([$1])])$0([$1])],
-	  [m4_ifdef([_m4_set_cleanup($1)],
-		    [_m4_popdef([_m4_set_cleanup($1)])])m4_ifdef(
-		    [_m4_set_size($1)],
-		    [_m4_popdef([_m4_set_size($1)])])])])
-
-# m4_set_difference(SET1, SET2)
-# -----------------------------
-# Produce a LIST of quoted elements that occur in SET1 but not SET2.
-# Output a comma prior to any elements, to distinguish the empty
-# string from no elements.  This can be directly used as a series of
-# arguments, such as for m4_join, or wrapped inside quotes for use in
-# m4_foreach.  Order of the output is not guaranteed.
-#
-# Short-circuit the idempotence relation.
-m4_define([m4_set_difference],
-[m4_if([$1], [$2], [], [m4_set_map_sep([$1], [_$0([$2],], [)])])])
-
-m4_define([_m4_set_difference],
-[m4_set_contains([$1], [$2], [], [,[$2]])])
-
-# m4_set_dump(SET, [SEP])
-# -----------------------
-# Expand to a single string containing all the elements in SET,
-# separated by SEP, then delete SET.  In general, if you only need to
-# list the contents once, this is faster than m4_set_contents.  No
-# provision is made for disambiguating set elements that contain
-# non-empty SEP as a sub-string.  Order of the output is not
-# guaranteed.  This is O(n) in the size of the set before pruning.
-#
-# Use _m4_popdef for speed.  Use existence of _m4_set_cleanup($1) to
-# decide if more expensive recursion is needed.
-m4_define([m4_set_dump],
-[m4_ifdef([_m4_set_size($1)],
-	  [_m4_popdef([_m4_set_size($1)])])m4_ifdef([_m4_set_cleanup($1)],
-    [_$0_check], [_$0])([$1], [], [$2])])
-
-# _m4_set_dump(SET, [SEP], [PREP])
-# _m4_set_dump_check(SET, [SEP], [PREP])
-# --------------------------------------
-# Print SEP and the current element, then delete the element and
-# recurse with empty SEP changed to PREP.  The check variant checks
-# whether the element has been previously removed.  Use _m4_defn and
-# _m4_popdef for speed.
-m4_define([_m4_set_dump],
-[m4_ifdef([_m4_set([$1])],
-	  [[$2]_m4_defn([_m4_set([$1])])_m4_popdef([_m4_set([$1],]_m4_defn(
-		[_m4_set([$1])])[)], [_m4_set([$1])])$0([$1], [$2$3])])])
-
-m4_define([_m4_set_dump_check],
-[m4_ifdef([_m4_set([$1])],
-	  [m4_set_contains([$1], _m4_defn([_m4_set([$1])]),
-			   [[$2]_m4_defn([_m4_set([$1])])])_m4_popdef(
-    [_m4_set([$1],]_m4_defn([_m4_set([$1])])[)],
-    [_m4_set([$1])])$0([$1], [$2$3])],
-	  [_m4_popdef([_m4_set_cleanup($1)])])])
-
-# m4_set_empty(SET, [IF-EMPTY], [IF-ELEMENTS])
-# --------------------------------------------
-# Expand IF-EMPTY if SET has no elements, otherwise IF-ELEMENTS.
-m4_define([m4_set_empty],
-[m4_ifdef([_m4_set_size($1)],
-	  [m4_if(m4_indir([_m4_set_size($1)]), [0], [$2], [$3])], [$2])])
-
-# m4_set_foreach(SET, VAR, ACTION)
-# --------------------------------
-# For each element of SET, define VAR to the element and expand
-# ACTION.  ACTION should not recursively list SET's contents, add
-# elements to SET, nor delete any element from SET except the one
-# currently in VAR.  The order that the elements are visited in is not
-# guaranteed.  This is faster than the corresponding m4_foreach([VAR],
-#   m4_indir([m4_dquote]m4_set_listc([SET])), [ACTION])
-m4_define([m4_set_foreach],
-[m4_pushdef([$2])m4_set_map_sep([$1], [m4_define([$2],], [)$3])])
-
-# m4_set_intersection(SET1, SET2)
-# -------------------------------
-# Produce a LIST of quoted elements that occur in both SET1 or SET2.
-# Output a comma prior to any elements, to distinguish the empty
-# string from no elements.  This can be directly used as a series of
-# arguments, such as for m4_join, or wrapped inside quotes for use in
-# m4_foreach.  Order of the output is not guaranteed.
-#
-# Iterate over the smaller set, and short-circuit the idempotence
-# relation.
-m4_define([m4_set_intersection],
-[m4_if([$1], [$2], [m4_set_listc([$1])],
-       m4_eval(m4_set_size([$2]) < m4_set_size([$1])), [1], [$0([$2], [$1])],
-       [m4_set_map_sep([$1], [_$0([$2],], [)])])])
-
-m4_define([_m4_set_intersection],
-[m4_set_contains([$1], [$2], [,[$2]])])
-
-# m4_set_list(SET)
-# m4_set_listc(SET)
-# -----------------
-# Produce a LIST of quoted elements of SET.  This can be directly used
-# as a series of arguments, such as for m4_join or m4_set_add_all, or
-# wrapped inside quotes for use in m4_foreach or m4_map.  With
-# m4_set_list, there is no way to distinguish an empty set from a set
-# containing only the empty string; with m4_set_listc, a leading comma
-# is output if there are any elements.
-m4_define([m4_set_list],
-[m4_set_map_sep([$1], [], [], [,])])
-
-m4_define([m4_set_listc],
-[m4_set_map_sep([$1], [,])])
-
-# m4_set_map(SET, ACTION)
-# -----------------------
-# For each element of SET, expand ACTION with a single argument of the
-# current element.  ACTION should not recursively list SET's contents,
-# add elements to SET, nor delete any element from SET except the one
-# passed as an argument.  The order that the elements are visited in
-# is not guaranteed.  This is faster than either of the corresponding
-#   m4_map_args([ACTION]m4_set_listc([SET]))
-#   m4_set_foreach([SET], [VAR], [ACTION(m4_defn([VAR]))])
-m4_define([m4_set_map],
-[m4_set_map_sep([$1], [$2(], [)])])
-
-# m4_set_map_sep(SET, [PRE], [POST], [SEP])
-# -----------------------------------------
-# For each element of SET, expand PRE[value]POST[], and expand SEP
-# between elements.
-m4_define([m4_set_map_sep],
-[m4_ifdef([_m4_set_cleanup($1)], [_m4_set_contents_1c],
-	  [_m4_set_contents_1])([$1])_m4_set_contents_2($@)])
-
-# m4_set_remove(SET, VALUE, [IF-PRESENT], [IF-ABSENT])
-# ----------------------------------------------------
-# If VALUE is an element of SET, delete it and expand IF-PRESENT.
-# Otherwise expand IF-ABSENT.  Deleting a single value is O(1),
-# although it leaves memory occupied until the next O(n) traversal of
-# the set which will compact the set.
-#
-# Optimize if the element being removed is the most recently added,
-# since defining _m4_set_cleanup($1) slows down so many other macros.
-# In particular, this plays well with m4_set_foreach and m4_set_map.
-m4_define([m4_set_remove],
-[m4_set_contains([$1], [$2], [_m4_set_size([$1],
-    [m4_decr])m4_if(_m4_defn([_m4_set([$1])]), [$2],
-		    [_m4_popdef([_m4_set([$1],$2)], [_m4_set([$1])])],
-		    [m4_define([_m4_set_cleanup($1)])m4_define(
-		      [_m4_set([$1],$2)], [0])])$3], [$4])])
-
-# m4_set_size(SET)
-# ----------------
-# Expand to the number of elements currently in SET.  This operation
-# is O(1), and thus more efficient than m4_count(m4_set_list([SET])).
-m4_define([m4_set_size],
-[m4_ifdef([_m4_set_size($1)], [m4_indir([_m4_set_size($1)])], [0])])
-
-# _m4_set_size(SET, ACTION)
-# -------------------------
-# ACTION must be either m4_incr or m4_decr, and the size of SET is
-# changed accordingly.  If the set is empty, ACTION must not be
-# m4_decr.
-m4_define([_m4_set_size],
-[m4_define([_m4_set_size($1)],
-	   m4_ifdef([_m4_set_size($1)], [$2(m4_indir([_m4_set_size($1)]))],
-		    [1]))])
-
-# m4_set_union(SET1, SET2)
-# ------------------------
-# Produce a LIST of double quoted elements that occur in either SET1
-# or SET2, without duplicates.  Output a comma prior to any elements,
-# to distinguish the empty string from no elements.  This can be
-# directly used as a series of arguments, such as for m4_join, or
-# wrapped inside quotes for use in m4_foreach.  Order of the output is
-# not guaranteed.
-#
-# We can rely on the fact that m4_set_listc prunes SET1, so we don't
-# need to check _m4_set([$1],element) for 0.  Short-circuit the
-# idempotence relation.
-m4_define([m4_set_union],
-[m4_set_listc([$1])m4_if([$1], [$2], [],
-  [m4_set_map_sep([$2], [_$0([$1],], [)])])])
-
-m4_define([_m4_set_union],
-[m4_ifdef([_m4_set([$1],$2)], [], [,[$2]])])
-
-
-## ------------------- ##
-## 16. File handling.  ##
-## ------------------- ##
-
-
-# It is a real pity that M4 comes with no macros to bind a diversion
-# to a file.  So we have to deal without, which makes us a lot more
-# fragile than we should.
-
-
-# m4_file_append(FILE-NAME, CONTENT)
-# ----------------------------------
-m4_define([m4_file_append],
-[m4_syscmd([cat >>$1 <<_m4eof
-$2
-_m4eof
-])
-m4_if(m4_sysval, [0], [],
-      [m4_fatal([$0: cannot write: $1])])])
-
-
-
-## ------------------------ ##
-## 17. Setting M4sugar up.  ##
-## ------------------------ ##
-
-# _m4_divert_diversion should be defined.
-m4_divert_push([KILL])
-
-# m4_init
-# -------
-# Initialize the m4sugar language.
-m4_define([m4_init],
-[# All the M4sugar macros start with `m4_', except `dnl' kept as is
-# for sake of simplicity.
-m4_pattern_forbid([^_?m4_])
-m4_pattern_forbid([^dnl$])
-
-# If __m4_version__ is defined, we assume that we are being run by M4
-# 1.6 or newer, thus $@ recursion is linear, and debugmode(+do)
-# is available for faster checks of dereferencing undefined macros
-# and forcing dumpdef to print to stderr regardless of debugfile.
-# But if it is missing, we assume we are being run by M4 1.4.x, that
-# $@ recursion is quadratic, and that we need foreach-based
-# replacement macros.  Also, m4 prior to 1.4.8 loses track of location
-# during m4wrap text; __line__ should never be 0.
-#
-# Use the raw builtin to avoid tripping up include tracing.
-# Meanwhile, avoid m4_copy, since it temporarily undefines m4_defn.
-m4_ifdef([__m4_version__],
-[m4_debugmode([+do])
-m4_define([m4_defn], _m4_defn([_m4_defn]))
-m4_define([m4_dumpdef], _m4_defn([_m4_dumpdef]))
-m4_define([m4_popdef], _m4_defn([_m4_popdef]))
-m4_define([m4_undefine], _m4_defn([_m4_undefine]))],
-[m4_builtin([include], [m4sugar/foreach.m4])
-m4_wrap_lifo([m4_if(__line__, [0], [m4_pushdef([m4_location],
-]]m4_dquote(m4_dquote(m4_dquote(__file__:__line__)))[[)])])])
-
-# Rewrite the first entry of the diversion stack.
-m4_divert([KILL])
-
-# Check the divert push/pop perfect balance.
-# Some users are prone to also use m4_wrap to register last-minute
-# m4_divert_text; so after our diversion cleanups, we restore
-# KILL as the bottom of the diversion stack.
-m4_wrap([m4_popdef([_m4_divert_diversion])m4_ifdef(
-  [_m4_divert_diversion], [m4_fatal([$0: unbalanced m4_divert_push:
-]m4_divert_stack)])_m4_popdef([_m4_divert_stack])m4_divert_push([KILL])])
-])
diff --git a/contrib/tools/bison/bison/data/xslt/bison.xsl b/contrib/tools/bison/bison/data/xslt/bison.xsl
deleted file mode 100644
index 10e3305bd7..0000000000
--- a/contrib/tools/bison/bison/data/xslt/bison.xsl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    bison.xsl - common templates for Bison XSLT.
-
-    Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-    This file is part of Bison, the GNU Compiler Compiler.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bison="http://www.gnu.org/software/bison/">
-
-<xsl:key
-  name="bison:symbolByName"
-  match="/bison-xml-report/grammar/nonterminals/nonterminal"
-  use="@name"
-/>
-<xsl:key
-  name="bison:symbolByName"
-  match="/bison-xml-report/grammar/terminals/terminal"
-  use="@name"
-/>
-<xsl:key
-  name="bison:ruleByNumber"
-  match="/bison-xml-report/grammar/rules/rule"
-  use="@number"
-/>
-<xsl:key
-  name="bison:ruleByLhs"
-  match="/bison-xml-report/grammar/rules/rule[
-         @usefulness != 'useless-in-grammar']"
-  use="lhs"
-/>
-<xsl:key
-  name="bison:ruleByRhs"
-  match="/bison-xml-report/grammar/rules/rule[
-         @usefulness != 'useless-in-grammar']"
-  use="rhs/symbol"
-/>
-
-<!-- For the specified state, output: #sr-conflicts,#rr-conflicts -->
-<xsl:template match="state" mode="bison:count-conflicts">
-  <xsl:variable name="transitions" select="actions/transitions"/>
-  <xsl:variable name="reductions" select="actions/reductions"/>
-  <xsl:variable
-    name="terminals"
-    select="
-      $transitions/transition[@type='shift']/@symbol
-      | $reductions/reduction/@symbol
-    "
-  />
-  <xsl:variable name="conflict-data">
-    <xsl:for-each select="$terminals">
-      <xsl:variable name="name" select="."/>
-      <xsl:if test="generate-id($terminals[. = $name][1]) = generate-id(.)">
-        <xsl:variable
-          name="shift-count"
-          select="count($transitions/transition[@symbol=$name])"
-        />
-        <xsl:variable
-          name="reduce-count"
-          select="count($reductions/reduction[@symbol=$name])"
-        />
-        <xsl:if test="$shift-count > 0 and $reduce-count > 0">
-          <xsl:text>s</xsl:text>
-        </xsl:if>
-        <xsl:if test="$reduce-count > 1">
-          <xsl:text>r</xsl:text>
-        </xsl:if>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:variable>
-  <xsl:value-of select="string-length(translate($conflict-data, 'r', ''))"/>
-  <xsl:text>,</xsl:text>
-  <xsl:value-of select="string-length(translate($conflict-data, 's', ''))"/>
-</xsl:template>
-
-<xsl:template name="space">
-  <xsl:param name="repeat">0</xsl:param>
-  <xsl:param name="fill" select="' '"/>
-  <xsl:if test="number($repeat) &gt;= 1">
-    <xsl:call-template name="space">
-      <xsl:with-param name="repeat" select="$repeat - 1"/>
-      <xsl:with-param name="fill" select="$fill"/>
-    </xsl:call-template>
-    <xsl:value-of select="$fill"/>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/tools/bison/bison/data/xslt/xml2dot.xsl b/contrib/tools/bison/bison/data/xslt/xml2dot.xsl
deleted file mode 100644
index 93bec59989..0000000000
--- a/contrib/tools/bison/bison/data/xslt/xml2dot.xsl
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    xml2dot.xsl - transform Bison XML Report into DOT.
-
-    Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-    This file is part of Bison, the GNU Compiler Compiler.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    Written by Wojciech Polak <polak@gnu.org>.
-  -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bison="http://www.gnu.org/software/bison/">
-
-<xsl:import href="bison.xsl"/>
-<xsl:output method="text" encoding="UTF-8" indent="no"/>
-
-<xsl:template match="/">
-  <xsl:apply-templates select="bison-xml-report"/>
-</xsl:template>
-
-<xsl:template match="bison-xml-report">
-  <xsl:text>// Generated by GNU Bison </xsl:text>
-  <xsl:value-of select="@version"/>
-  <xsl:text>.&#10;</xsl:text>
-  <xsl:text>// Report bugs to &lt;</xsl:text>
-  <xsl:value-of select="@bug-report"/>
-  <xsl:text>&gt;.&#10;</xsl:text>
-  <xsl:text>// Home page: &lt;</xsl:text>
-  <xsl:value-of select="@url"/>
-  <xsl:text>&gt;.&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="automaton">
-    <xsl:with-param name="filename" select="filename"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="automaton">
-  <xsl:param name="filename"/>
-  <xsl:text>digraph "</xsl:text>
-  <xsl:call-template name="escape">
-    <xsl:with-param name="subject" select="$filename"/>
-  </xsl:call-template>
-  <xsl:text>"&#10;{
-  node [fontname = courier, shape = box, colorscheme = paired6]
-  edge [fontname = courier]
-
-</xsl:text>
-  <xsl:apply-templates select="state"/>
-  <xsl:text>}&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="automaton/state">
-  <xsl:call-template name="output-node">
-    <xsl:with-param name="number" select="@number"/>
-    <xsl:with-param name="label">
-      <xsl:apply-templates select="itemset/item"/>
-    </xsl:with-param>
-  </xsl:call-template>
-  <xsl:apply-templates select="actions/transitions"/>
-  <xsl:apply-templates select="actions/reductions">
-    <xsl:with-param name="staten">
-      <xsl:value-of select="@number"/>
-    </xsl:with-param>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="actions/reductions">
-  <xsl:param name="staten"/>
-  <xsl:for-each select='reduction'>
-    <!-- These variables are needed because the current context can't be
-         refered to directly in XPath expressions. -->
-    <xsl:variable name="rul">
-      <xsl:value-of select="@rule"/>
-    </xsl:variable>
-    <xsl:variable name="ena">
-      <xsl:value-of select="@enabled"/>
-    </xsl:variable>
-    <!-- The foreach's body is protected by this, so that we are actually
-         going to iterate once per reduction rule, and not per lookahead. -->
-    <xsl:if test='not(preceding-sibling::*[@rule=$rul and @enabled=$ena])'>
-      <xsl:variable name="rule">
-        <xsl:choose>
-          <!-- The acceptation state is refered to as 'accept' in the XML, but
-               just as '0' in the DOT. -->
-          <xsl:when test="@rule='accept'">
-            <xsl:text>0</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="@rule"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <!-- The edge's beginning -->
-      <xsl:call-template name="reduction-edge-start">
-        <xsl:with-param name="state" select="$staten"/>
-        <xsl:with-param name="rule" select="$rule"/>
-        <xsl:with-param name="enabled" select="@enabled"/>
-      </xsl:call-template>
-
-      <!-- The edge's tokens -->
-      <!-- Don't show labels for the default action. In other cases, there will
-           always be at least one token, so 'label="[]"' will not occur. -->
-      <xsl:if test='$rule!=0 and not(../reduction[@enabled=$ena and @rule=$rule and @symbol="$default"])'>
-        <xsl:text>label="[</xsl:text>
-        <xsl:for-each select='../reduction[@enabled=$ena and @rule=$rule]'>
-          <xsl:call-template name="escape">
-            <xsl:with-param name="subject" select="@symbol"/>
-          </xsl:call-template>
-          <xsl:if test="position() != last ()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>]", </xsl:text>
-      </xsl:if>
-
-      <!-- The edge's end -->
-      <xsl:text>style=solid]&#10;</xsl:text>
-
-      <!-- The diamond representing the reduction -->
-      <xsl:call-template name="reduction-node">
-        <xsl:with-param name="state" select="$staten"/>
-        <xsl:with-param name="rule" select="$rule"/>
-        <xsl:with-param name="color">
-          <xsl:choose>
-            <xsl:when test='@enabled="true"'>
-              <xsl:text>3</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>5</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="actions/transitions">
-  <xsl:apply-templates select="transition"/>
-</xsl:template>
-
-<xsl:template match="item">
-  <xsl:param name="prev-rule-number"
-    select="preceding-sibling::item[1]/@rule-number"/>
-  <xsl:apply-templates select="key('bison:ruleByNumber', @rule-number)">
-    <xsl:with-param name="point" select="@point"/>
-    <xsl:with-param name="num" select="@rule-number"/>
-    <xsl:with-param name="prev-lhs"
-      select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]"
-   />
-  </xsl:apply-templates>
-  <xsl:apply-templates select="lookaheads"/>
-</xsl:template>
-
-<xsl:template match="rule">
-  <xsl:param name="point"/>
-  <xsl:param name="num"/>
-  <xsl:param name="prev-lhs"/>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:choose>
-    <xsl:when test="$num &lt; 10">
-      <xsl:text>  </xsl:text>
-    </xsl:when>
-    <xsl:when test="$num &lt; 100">
-      <xsl:text> </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text></xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$num"/>
-  <xsl:text> </xsl:text>
-  <xsl:choose>
-  <xsl:when test="$prev-lhs = lhs[text()]">
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="'|'"/>
-        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="lhs"/>
-      <xsl:text>:</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$point = 0">
-    <xsl:text> .</xsl:text>
-  </xsl:if>
-  <xsl:for-each select="rhs/symbol|rhs/empty">
-    <xsl:apply-templates select="."/>
-    <xsl:if test="$point = position()">
-      <xsl:text> .</xsl:text>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="empty"/>
-
-<xsl:template match="lookaheads">
-  <xsl:text>  [</xsl:text>
-  <xsl:apply-templates select="symbol"/>
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="lookaheads/symbol">
-  <xsl:value-of select="."/>
-  <xsl:if test="position() != last()">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="reduction-edge-start">
-  <xsl:param name="state"/>
-  <xsl:param name="rule"/>
-  <xsl:param name="enabled"/>
-
-  <xsl:text>  </xsl:text>
-  <xsl:value-of select="$state"/>
-  <xsl:text> -> "</xsl:text>
-  <xsl:value-of select="$state"/>
-  <xsl:text>R</xsl:text>
-  <xsl:value-of select="$rule"/>
-  <xsl:if test='$enabled = "false"'>
-    <xsl:text>d</xsl:text>
-  </xsl:if>
-  <xsl:text>" [</xsl:text>
-</xsl:template>
-
-<xsl:template name="reduction-node">
-  <xsl:param name="state"/>
-  <xsl:param name="rule"/>
-  <xsl:param name="color"/>
-
-  <xsl:text> "</xsl:text>
-  <xsl:value-of select="$state"/>
-  <xsl:text>R</xsl:text>
-  <xsl:value-of select="$rule"/>
-  <xsl:if test="$color = 5">
-    <xsl:text>d</xsl:text>
-  </xsl:if>
-  <xsl:text>" [label="</xsl:text>
-  <xsl:choose>
-  <xsl:when test="$rule = 0">
-    <xsl:text>Acc", fillcolor=1</xsl:text>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:text>R</xsl:text>
-    <xsl:value-of select="$rule"/>
-    <xsl:text>", fillcolor=</xsl:text>
-    <xsl:value-of select="$color"/>
-  </xsl:otherwise>
-  </xsl:choose>
-  <xsl:text>, shape=diamond, style=filled]&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="transition">
-  <xsl:call-template name="output-edge">
-    <xsl:with-param name="src" select="../../../@number"/>
-    <xsl:with-param name="dst" select="@state"/>
-    <xsl:with-param name="style">
-      <xsl:choose>
-        <xsl:when test="@symbol = 'error'">
-          <xsl:text>dotted</xsl:text>
-        </xsl:when>
-        <xsl:when test="@type = 'shift'">
-          <xsl:text>solid</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>dashed</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="label">
-      <xsl:if test="not(@symbol = 'error')">
-        <xsl:value-of select="@symbol"/>
-      </xsl:if>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="output-node">
-  <xsl:param name="number"/>
-  <xsl:param name="label"/>
-  <xsl:text>  </xsl:text>
-  <xsl:value-of select="$number"/>
-  <xsl:text> [label="</xsl:text>
-  <xsl:text>State </xsl:text>
-  <xsl:value-of select="$number"/>
-  <xsl:text>\n</xsl:text>
-  <xsl:call-template name="escape">
-    <xsl:with-param name="subject" select="$label"/>
-  </xsl:call-template>
-  <xsl:text>\l"]&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template name="output-edge">
-  <xsl:param name="src"/>
-  <xsl:param name="dst"/>
-  <xsl:param name="style"/>
-  <xsl:param name="label"/>
-  <xsl:text>  </xsl:text>
-  <xsl:value-of select="$src"/>
-  <xsl:text> -> </xsl:text>
-  <xsl:value-of select="$dst"/>
-  <xsl:text> [style=</xsl:text>
-  <xsl:value-of select="$style"/>
-  <xsl:if test="$label and $label != ''">
-    <xsl:text> label="</xsl:text>
-    <xsl:call-template name="escape">
-      <xsl:with-param name="subject" select="$label"/>
-    </xsl:call-template>
-    <xsl:text>"</xsl:text>
-  </xsl:if>
-  <xsl:text>]&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template name="escape">
-  <xsl:param name="subject"/> <!-- required -->
-  <xsl:call-template name="string-replace">
-    <xsl:with-param name="subject">
-      <xsl:call-template name="string-replace">
-        <xsl:with-param name="subject">
-          <xsl:call-template name="string-replace">
-            <xsl:with-param name="subject" select="$subject"/>
-            <xsl:with-param name="search" select="'\'"/>
-            <xsl:with-param name="replace" select="'\\'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="search" select="'&quot;'"/>
-        <xsl:with-param name="replace" select="'\&quot;'"/>
-      </xsl:call-template>
-    </xsl:with-param>
-    <xsl:with-param name="search" select="'&#10;'"/>
-    <xsl:with-param name="replace" select="'\l'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="string-replace">
-  <xsl:param name="subject"/>
-  <xsl:param name="search"/>
-  <xsl:param name="replace"/>
-  <xsl:choose>
-    <xsl:when test="contains($subject, $search)">
-      <xsl:variable name="before" select="substring-before($subject, $search)"/>
-      <xsl:variable name="after" select="substring-after($subject, $search)"/>
-      <xsl:value-of select="$before"/>
-      <xsl:value-of select="$replace"/>
-      <xsl:call-template name="string-replace">
-        <xsl:with-param name="subject" select="$after"/>
-        <xsl:with-param name="search" select="$search"/>
-        <xsl:with-param name="replace" select="$replace"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$subject"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="lpad">
-  <xsl:param name="str" select="''"/>
-  <xsl:param name="pad" select="0"/>
-  <xsl:variable name="diff" select="$pad - string-length($str)" />
-  <xsl:choose>
-    <xsl:when test="$diff &lt; 0">
-      <xsl:value-of select="$str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space">
-        <xsl:with-param name="repeat" select="$diff"/>
-      </xsl:call-template>
-      <xsl:value-of select="$str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/tools/bison/bison/data/xslt/xml2text.xsl b/contrib/tools/bison/bison/data/xslt/xml2text.xsl
deleted file mode 100644
index 2626f566b1..0000000000
--- a/contrib/tools/bison/bison/data/xslt/xml2text.xsl
+++ /dev/null
@@ -1,569 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    xml2text.xsl - transform Bison XML Report into plain text.
-
-    Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-    This file is part of Bison, the GNU Compiler Compiler.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    Written by Wojciech Polak <polak@gnu.org>.
-  -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bison="http://www.gnu.org/software/bison/">
-
-<xsl:import href="bison.xsl"/>
-<xsl:output method="text" encoding="UTF-8" indent="no"/>
-
-<xsl:template match="/">
-  <xsl:apply-templates select="bison-xml-report"/>
-</xsl:template>
-
-<xsl:template match="bison-xml-report">
-  <xsl:apply-templates select="grammar" mode="reductions"/>
-  <xsl:apply-templates select="grammar" mode="useless-in-parser"/>
-  <xsl:apply-templates select="automaton" mode="conflicts"/>
-  <xsl:apply-templates select="grammar"/>
-  <xsl:apply-templates select="automaton"/>
-</xsl:template>
-
-<xsl:template match="grammar" mode="reductions">
-  <xsl:apply-templates select="nonterminals" mode="useless-in-grammar"/>
-  <xsl:apply-templates select="terminals" mode="unused-in-grammar"/>
-  <xsl:apply-templates select="rules" mode="useless-in-grammar"/>
-</xsl:template>
-
-<xsl:template match="nonterminals" mode="useless-in-grammar">
-  <xsl:if test="nonterminal[@usefulness='useless-in-grammar']">
-    <xsl:text>Nonterminals useless in grammar&#10;&#10;</xsl:text>
-    <xsl:for-each select="nonterminal[@usefulness='useless-in-grammar']">
-      <xsl:text>   </xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>&#10;</xsl:text>
-    </xsl:for-each>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="terminals" mode="unused-in-grammar">
-  <xsl:if test="terminal[@usefulness='unused-in-grammar']">
-    <xsl:text>Terminals unused in grammar&#10;&#10;</xsl:text>
-    <xsl:for-each select="terminal[@usefulness='unused-in-grammar']">
-      <xsl:sort select="@symbol-number" data-type="number"/>
-      <xsl:text>   </xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:text>&#10;</xsl:text>
-    </xsl:for-each>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="rules" mode="useless-in-grammar">
-  <xsl:variable name="set" select="rule[@usefulness='useless-in-grammar']"/>
-  <xsl:if test="$set">
-    <xsl:text>Rules useless in grammar&#10;</xsl:text>
-    <xsl:call-template name="style-rule-set">
-      <xsl:with-param name="rule-set" select="$set"/>
-    </xsl:call-template>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="grammar" mode="useless-in-parser">
-  <xsl:variable
-    name="set" select="rules/rule[@usefulness='useless-in-parser']"
-  />
-  <xsl:if test="$set">
-    <xsl:text>Rules useless in parser due to conflicts&#10;</xsl:text>
-    <xsl:call-template name="style-rule-set">
-      <xsl:with-param name="rule-set" select="$set"/>
-    </xsl:call-template>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="grammar">
-  <xsl:text>Grammar&#10;</xsl:text>
-  <xsl:call-template name="style-rule-set">
-    <xsl:with-param
-      name="rule-set" select="rules/rule[@usefulness!='useless-in-grammar']"
-    />
-  </xsl:call-template>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="terminals"/>
-  <xsl:apply-templates select="nonterminals"/>
-</xsl:template>
-
-<xsl:template name="style-rule-set">
-  <xsl:param name="rule-set"/>
-  <xsl:for-each select="$rule-set">
-    <xsl:apply-templates select=".">
-      <xsl:with-param name="pad" select="'3'"/>
-      <xsl:with-param name="prev-lhs">
-        <xsl:if test="position()>1">
-          <xsl:variable name="position" select="position()"/>
-          <xsl:value-of select="$rule-set[$position - 1]/lhs"/>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="grammar/terminals">
-  <xsl:text>Terminals, with rules where they appear&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="terminal"/>
-  <xsl:text>&#10;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="grammar/nonterminals">
-  <xsl:text>Nonterminals, with rules where they appear&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="nonterminal[@usefulness!='useless-in-grammar']"/>
-</xsl:template>
-
-<xsl:template match="terminal">
-  <xsl:value-of select="@name"/>
-  <xsl:call-template name="line-wrap">
-    <xsl:with-param name="first-line-length">
-      <xsl:choose>
-        <xsl:when test="string-length(@name) &gt; 66">0</xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="66 - string-length(@name)" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="line-length" select="66" />
-    <xsl:with-param name="text">
-      <xsl:value-of select="concat(' (', @token-number, ')')"/>
-      <xsl:for-each select="key('bison:ruleByRhs', @name)">
-        <xsl:value-of select="concat(' ', @number)"/>
-      </xsl:for-each>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <xsl:value-of select="@name"/>
-  <xsl:value-of select="concat(' (', @symbol-number, ')')"/>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:variable name="output">
-    <xsl:call-template name="line-wrap">
-      <xsl:with-param name="line-length" select="66" />
-      <xsl:with-param name="text">
-        <xsl:text>    </xsl:text>
-        <xsl:if test="key('bison:ruleByLhs', @name)">
-          <xsl:text>on@left:</xsl:text>
-          <xsl:for-each select="key('bison:ruleByLhs', @name)">
-            <xsl:value-of select="concat(' ', @number)"/>
-          </xsl:for-each>
-        </xsl:if>
-        <xsl:if test="key('bison:ruleByRhs', @name)">
-          <xsl:if test="key('bison:ruleByLhs', @name)">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-          <xsl:text>on@right:</xsl:text>
-          <xsl:for-each select="key('bison:ruleByRhs', @name)">
-            <xsl:value-of select="concat(' ', @number)"/>
-          </xsl:for-each>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="translate($output, '@', ' ')" />
-</xsl:template>
-
-<xsl:template match="automaton" mode="conflicts">
-  <xsl:variable name="conflict-report">
-    <xsl:apply-templates select="state" mode="conflicts"/>
-  </xsl:variable>
-  <xsl:if test="string-length($conflict-report) != 0">
-    <xsl:value-of select="$conflict-report"/>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="state" mode="conflicts">
-  <xsl:variable name="conflict-counts">
-    <xsl:apply-templates select="." mode="bison:count-conflicts" />
-  </xsl:variable>
-  <xsl:variable
-    name="sr-count" select="substring-before($conflict-counts, ',')"
-  />
-  <xsl:variable
-    name="rr-count" select="substring-after($conflict-counts, ',')"
-  />
-  <xsl:if test="$sr-count > 0 or $rr-count > 0">
-    <xsl:value-of select="concat('State ', @number, ' conflicts:')"/>
-    <xsl:if test="$sr-count > 0">
-      <xsl:value-of select="concat(' ', $sr-count, ' shift/reduce')"/>
-      <xsl:if test="$rr-count > 0">
-        <xsl:value-of select="(',')"/>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="$rr-count > 0">
-      <xsl:value-of select="concat(' ', $rr-count, ' reduce/reduce')"/>
-    </xsl:if>
-    <xsl:value-of select="'&#10;'"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="automaton">
-  <xsl:apply-templates select="state">
-    <xsl:with-param name="pad" select="'3'"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="automaton/state">
-  <xsl:param name="pad"/>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:text>State </xsl:text>
-  <xsl:value-of select="@number"/>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="itemset/item">
-    <xsl:with-param name="pad" select="$pad"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates select="actions/transitions">
-    <xsl:with-param name="type" select="'shift'"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates select="actions/errors"/>
-  <xsl:apply-templates select="actions/reductions"/>
-  <xsl:apply-templates select="actions/transitions">
-    <xsl:with-param name="type" select="'goto'"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates select="solved-conflicts"/>
-</xsl:template>
-
-<xsl:template match="actions/transitions">
-  <xsl:param name="type"/>
-  <xsl:if test="transition[@type = $type]">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="transition[@type = $type]">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="transition[@type = $type]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="actions/errors">
-  <xsl:if test="error">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="error">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="error"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="actions/reductions">
-  <xsl:if test="reduction">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="reduction">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="reduction"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="item">
-  <xsl:param name="pad"/>
-  <xsl:param name="prev-rule-number"
-             select="preceding-sibling::item[1]/@rule-number"/>
-  <xsl:apply-templates
-    select="key('bison:ruleByNumber', current()/@rule-number)"
-  >
-    <xsl:with-param name="itemset" select="'true'"/>
-    <xsl:with-param name="pad" select="$pad"/>
-    <xsl:with-param
-      name="prev-lhs"
-      select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]"
-   />
-    <xsl:with-param name="point" select="@point"/>
-    <xsl:with-param name="lookaheads">
-      <xsl:apply-templates select="lookaheads"/>
-    </xsl:with-param>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="rule">
-  <xsl:param name="itemset"/>
-  <xsl:param name="pad"/>
-  <xsl:param name="prev-lhs"/>
-  <xsl:param name="point"/>
-  <xsl:param name="lookaheads"/>
-
-  <xsl:if test="$itemset != 'true' and not($prev-lhs = lhs[text()])">
-    <xsl:text>&#10;</xsl:text>
-  </xsl:if>
-
-  <xsl:text>  </xsl:text>
-  <xsl:call-template name="lpad">
-    <xsl:with-param name="str" select="string(@number)"/>
-    <xsl:with-param name="pad" select="number($pad)"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-
-  <!-- LHS -->
-  <xsl:choose>
-    <xsl:when test="$itemset != 'true' and $prev-lhs = lhs[text()]">
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="'|'"/>
-        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]">
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="'|'"/>
-        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="lhs"/>
-      <xsl:text>:</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <!-- RHS -->
-  <xsl:for-each select="rhs/*">
-    <xsl:if test="position() = $point + 1">
-      <xsl:text> .</xsl:text>
-    </xsl:if>
-    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="$itemset != 'true'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="position() = last() and position() = $point">
-      <xsl:text> .</xsl:text>
-    </xsl:if>
-  </xsl:for-each>
-  <xsl:if test="$lookaheads">
-    <xsl:value-of select="$lookaheads"/>
-  </xsl:if>
-
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="empty">
-  <xsl:text> %empty</xsl:text>
-</xsl:template>
-
-<xsl:template match="lookaheads">
-  <xsl:text>  [</xsl:text>
-  <xsl:apply-templates select="symbol"/>
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="lookaheads/symbol">
-  <xsl:value-of select="."/>
-  <xsl:if test="position() != last()">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="transition">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="@type = 'shift'">
-      <xsl:text>shift, and go to state </xsl:text>
-      <xsl:value-of select="@state"/>
-    </xsl:when>
-    <xsl:when test="@type = 'goto'">
-      <xsl:text>go to state </xsl:text>
-      <xsl:value-of select="@state"/>
-    </xsl:when>
-  </xsl:choose>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="error">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:text>error</xsl:text>
-  <xsl:text> (</xsl:text>
-  <xsl:value-of select="text()"/>
-  <xsl:text>)</xsl:text>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="reduction">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:if test="@enabled = 'false'">
-    <xsl:text>[</xsl:text>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="@rule = 'accept'">
-      <xsl:text>accept</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>reduce using rule </xsl:text>
-      <xsl:value-of select="@rule"/>
-      <xsl:text> (</xsl:text>
-      <xsl:value-of
-          select="key('bison:ruleByNumber', current()/@rule)/lhs[text()]"/>
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="@enabled = 'false'">
-    <xsl:text>]</xsl:text>
-  </xsl:if>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="solved-conflicts">
-  <xsl:if test="resolution">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="resolution"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="resolution">
-  <xsl:text>    Conflict between rule </xsl:text>
-  <xsl:value-of select="@rule"/>
-  <xsl:text> and token </xsl:text>
-  <xsl:value-of select="@symbol"/>
-  <xsl:text> resolved as </xsl:text>
-  <xsl:if test="@type = 'error'">
-    <xsl:text>an </xsl:text>
-  </xsl:if>
-  <xsl:value-of select="@type"/>
-  <xsl:text> (</xsl:text>
-  <xsl:value-of select="."/>
-  <xsl:text>).&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template name="max-width-symbol">
-  <xsl:param name="node"/>
-  <xsl:variable name="longest">
-    <xsl:for-each select="$node">
-      <xsl:sort data-type="number" select="string-length(@symbol)"
-                order="descending"/>
-      <xsl:if test="position() = 1">
-        <xsl:value-of select="string-length(@symbol)"/>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:variable>
-  <xsl:value-of select="$longest"/>
-</xsl:template>
-
-<xsl:template name="lpad">
-  <xsl:param name="str" select="''"/>
-  <xsl:param name="pad" select="0"/>
-  <xsl:variable name="diff" select="$pad - string-length($str)" />
-  <xsl:choose>
-    <xsl:when test="$diff &lt; 0">
-      <xsl:value-of select="$str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space">
-        <xsl:with-param name="repeat" select="$diff"/>
-      </xsl:call-template>
-      <xsl:value-of select="$str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="rpad">
-  <xsl:param name="str" select="''"/>
-  <xsl:param name="pad" select="0"/>
-  <xsl:variable name="diff" select="$pad - string-length($str)"/>
-  <xsl:choose>
-    <xsl:when test="$diff &lt; 0">
-      <xsl:value-of select="$str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$str"/>
-      <xsl:call-template name="space">
-        <xsl:with-param name="repeat" select="$diff"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="line-wrap">
-  <xsl:param name="line-length"/> <!-- required -->
-  <xsl:param name="first-line-length" select="$line-length"/>
-  <xsl:param name="text"/> <!-- required -->
-  <xsl:choose>
-    <xsl:when test="normalize-space($text) = ''" />
-    <xsl:when test="string-length($text) &lt;= $first-line-length">
-      <xsl:value-of select="concat($text, '&#10;')" />
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="break-pos">
-        <xsl:call-template name="ws-search">
-          <xsl:with-param name="text" select="$text" />
-          <xsl:with-param name="start" select="$first-line-length+1" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="substring($text, 1, $break-pos - 1)" />
-      <xsl:text>&#10;</xsl:text>
-      <xsl:call-template name="line-wrap">
-        <xsl:with-param name="line-length" select="$line-length" />
-        <xsl:with-param
-          name="text" select="concat('    ', substring($text, $break-pos+1))"
-        />
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="ws-search">
-  <xsl:param name="text"/> <!-- required -->
-  <xsl:param name="start"/> <!-- required -->
-  <xsl:variable name="search-text" select="substring($text, $start)" />
-  <xsl:choose>
-    <xsl:when test="not(contains($search-text, ' '))">
-      <xsl:value-of select="string-length($text)+1" />
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of
-        select="$start + string-length(substring-before($search-text, ' '))"
-      />
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/tools/bison/bison/data/xslt/xml2xhtml.xsl b/contrib/tools/bison/bison/data/xslt/xml2xhtml.xsl
deleted file mode 100644
index d2cfed4ccd..0000000000
--- a/contrib/tools/bison/bison/data/xslt/xml2xhtml.xsl
+++ /dev/null
@@ -1,745 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    xml2html.xsl - transform Bison XML Report into XHTML.
-
-    Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-    This file is part of Bison, the GNU Compiler Compiler.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    Written by Wojciech Polak <polak@gnu.org>.
-  -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:bison="http://www.gnu.org/software/bison/">
-
-<xsl:import href="bison.xsl"/>
-
-<xsl:output method="xml" encoding="UTF-8"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-            indent="yes"/>
-
-<xsl:template match="/">
-  <html>
-    <head>
-      <title>
-        <xsl:value-of select="bison-xml-report/filename"/>
-        <xsl:text> - GNU Bison XML Automaton Report</xsl:text>
-      </title>
-      <style type="text/css"><![CDATA[
-      body {
-        font-family: "Nimbus Sans L", Arial, sans-serif;
-        font-size: 9pt;
-      }
-      a:link {
-        color: #1f00ff;
-        text-decoration: none;
-      }
-      a:visited {
-        color: #1f00ff;
-        text-decoration: none;
-      }
-      a:hover {
-        color: red;
-      }
-      #menu a {
-        text-decoration: underline;
-      }
-      .i {
-        font-style: italic;
-      }
-      .pre {
-        font-family: monospace;
-        white-space: pre;
-      }
-      ol.decimal {
-        list-style-type: decimal;
-      }
-      ol.lower-alpha {
-        list-style-type: lower-alpha;
-      }
-      .point {
-        color: #cc0000;
-      }
-      #footer {
-        margin-top: 3.5em;
-        font-size: 7pt;
-      }
-      ]]></style>
-    </head>
-    <body>
-      <xsl:apply-templates select="bison-xml-report"/>
-      <xsl:text>&#10;&#10;</xsl:text>
-      <div id="footer"><hr />This document was generated using
-      <a href="http://www.gnu.org/software/bison/" title="GNU Bison">
-      GNU Bison <xsl:value-of select="/bison-xml-report/@version"/></a>
-      XML Automaton Report.<br />
-      <!-- default copying notice -->
-      Verbatim copying and distribution of this entire page is
-      permitted in any medium, provided this notice is preserved.</div>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="bison-xml-report">
-  <h1>GNU Bison XML Automaton Report</h1>
-  <p>
-    input grammar: <span class="i"><xsl:value-of select="filename"/></span>
-  </p>
-
-  <xsl:text>&#10;&#10;</xsl:text>
-  <h3>Table of Contents</h3>
-  <ul id="menu">
-    <li>
-      <a href="#reductions">Reductions</a>
-      <ul class="lower-alpha">
-        <li><a href="#nonterminals_useless_in_grammar">Nonterminals useless in grammar</a></li>
-        <li><a href="#terminals_unused_in_grammar">Terminals unused in grammar</a></li>
-        <li><a href="#rules_useless_in_grammar">Rules useless in grammar</a></li>
-        <xsl:if test="grammar/rules/rule[@usefulness='useless-in-parser']">
-          <li><a href="#rules_useless_in_parser">Rules useless in parser due to conflicts</a></li>
-        </xsl:if>
-      </ul>
-    </li>
-    <li><a href="#conflicts">Conflicts</a></li>
-    <li>
-      <a href="#grammar">Grammar</a>
-      <ul class="lower-alpha">
-        <li><a href="#grammar">Itemset</a></li>
-        <li><a href="#terminals">Terminal symbols</a></li>
-        <li><a href="#nonterminals">Nonterminal symbols</a></li>
-      </ul>
-    </li>
-    <li><a href="#automaton">Automaton</a></li>
-  </ul>
-  <xsl:apply-templates select="grammar" mode="reductions"/>
-  <xsl:apply-templates select="grammar" mode="useless-in-parser"/>
-  <xsl:apply-templates select="automaton" mode="conflicts"/>
-  <xsl:apply-templates select="grammar"/>
-  <xsl:apply-templates select="automaton"/>
-</xsl:template>
-
-<xsl:template match="grammar" mode="reductions">
-  <h2>
-    <a name="reductions"/>
-    <xsl:text> Reductions</xsl:text>
-  </h2>
-  <xsl:apply-templates select="nonterminals" mode="useless-in-grammar"/>
-  <xsl:apply-templates select="terminals" mode="unused-in-grammar"/>
-  <xsl:apply-templates select="rules" mode="useless-in-grammar"/>
-</xsl:template>
-
-<xsl:template match="nonterminals" mode="useless-in-grammar">
-  <h3>
-    <a name="nonterminals_useless_in_grammar"/>
-    <xsl:text> Nonterminals useless in grammar</xsl:text>
-  </h3>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:if test="nonterminal[@usefulness='useless-in-grammar']">
-    <p class="pre">
-      <xsl:for-each select="nonterminal[@usefulness='useless-in-grammar']">
-        <xsl:text>   </xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text>&#10;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#10;&#10;</xsl:text>
-    </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="terminals" mode="unused-in-grammar">
-  <h3>
-    <a name="terminals_unused_in_grammar"/>
-    <xsl:text> Terminals unused in grammar</xsl:text>
-  </h3>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:if test="terminal[@usefulness='unused-in-grammar']">
-    <p class="pre">
-      <xsl:for-each select="terminal[@usefulness='unused-in-grammar']">
-        <xsl:sort select="@symbol-number" data-type="number"/>
-        <xsl:text>   </xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text>&#10;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#10;&#10;</xsl:text>
-    </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="rules" mode="useless-in-grammar">
-  <h3>
-    <a name="rules_useless_in_grammar"/>
-    <xsl:text> Rules useless in grammar</xsl:text>
-  </h3>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:variable name="set" select="rule[@usefulness='useless-in-grammar']"/>
-  <xsl:if test="$set">
-    <p class="pre">
-      <xsl:call-template name="style-rule-set">
-        <xsl:with-param name="rule-set" select="$set"/>
-      </xsl:call-template>
-      <xsl:text>&#10;&#10;</xsl:text>
-    </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="grammar" mode="useless-in-parser">
-  <xsl:variable
-    name="set" select="rules/rule[@usefulness='useless-in-parser']"
-  />
-  <xsl:if test="$set">
-    <h2>
-      <a name="rules_useless_in_parser"/>
-      <xsl:text> Rules useless in parser due to conflicts</xsl:text>
-    </h2>
-    <xsl:text>&#10;</xsl:text>
-    <p class="pre">
-      <xsl:call-template name="style-rule-set">
-        <xsl:with-param name="rule-set" select="$set"/>
-      </xsl:call-template>
-    </p>
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="grammar">
-  <h2>
-    <a name="grammar"/>
-    <xsl:text> Grammar</xsl:text>
-  </h2>
-  <xsl:text>&#10;</xsl:text>
-  <p class="pre">
-    <xsl:call-template name="style-rule-set">
-      <xsl:with-param
-        name="rule-set" select="rules/rule[@usefulness!='useless-in-grammar']"
-      />
-    </xsl:call-template>
-  </p>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:apply-templates select="terminals"/>
-  <xsl:apply-templates select="nonterminals"/>
-</xsl:template>
-
-<xsl:template name="style-rule-set">
-  <xsl:param name="rule-set"/>
-  <xsl:for-each select="$rule-set">
-    <xsl:apply-templates select=".">
-      <xsl:with-param name="pad" select="'3'"/>
-      <xsl:with-param name="prev-lhs">
-        <xsl:if test="position()>1">
-          <xsl:variable name="position" select="position()"/>
-          <xsl:value-of select="$rule-set[$position - 1]/lhs"/>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="automaton" mode="conflicts">
-  <h2>
-    <a name="conflicts"/>
-    <xsl:text> Conflicts</xsl:text>
-  </h2>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <xsl:variable name="conflict-report">
-    <xsl:apply-templates select="state" mode="conflicts"/>
-  </xsl:variable>
-  <xsl:if test="string-length($conflict-report) != 0">
-    <p class="pre">
-      <xsl:copy-of select="$conflict-report"/>
-      <xsl:text>&#10;&#10;</xsl:text>
-    </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="state" mode="conflicts">
-  <xsl:variable name="conflict-counts">
-    <xsl:apply-templates select="." mode="bison:count-conflicts" />
-  </xsl:variable>
-  <xsl:variable
-    name="sr-count" select="substring-before($conflict-counts, ',')"
-  />
-  <xsl:variable
-    name="rr-count" select="substring-after($conflict-counts, ',')"
-  />
-  <xsl:if test="$sr-count > 0 or $rr-count > 0">
-    <a>
-      <xsl:attribute name="href">
-        <xsl:value-of select="concat('#state_', @number)"/>
-      </xsl:attribute>
-      <xsl:value-of select="concat('State ', @number)"/>
-    </a>
-    <xsl:text> conflicts:</xsl:text>
-    <xsl:if test="$sr-count > 0">
-      <xsl:value-of select="concat(' ', $sr-count, ' shift/reduce')"/>
-      <xsl:if test="$rr-count > 0">
-        <xsl:value-of select="(',')"/>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="$rr-count > 0">
-      <xsl:value-of select="concat(' ', $rr-count, ' reduce/reduce')"/>
-    </xsl:if>
-    <xsl:value-of select="'&#10;'"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="grammar/terminals">
-  <h3>
-    <a name="terminals"/>
-    <xsl:text> Terminals, with rules where they appear</xsl:text>
-  </h3>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <p class="pre">
-    <xsl:apply-templates select="terminal"/>
-  </p>
-  <xsl:text>&#10;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="grammar/nonterminals">
-  <h3>
-    <a name="nonterminals"/>
-    <xsl:text> Nonterminals, with rules where they appear</xsl:text>
-  </h3>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <p class="pre">
-    <xsl:apply-templates
-      select="nonterminal[@usefulness!='useless-in-grammar']"
-    />
-  </p>
-</xsl:template>
-
-<xsl:template match="terminal">
-  <b><xsl:value-of select="@name"/></b>
-  <xsl:value-of select="concat(' (', @token-number, ')')"/>
-  <xsl:for-each select="key('bison:ruleByRhs', @name)">
-    <xsl:apply-templates select="." mode="number-link"/>
-  </xsl:for-each>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <b><xsl:value-of select="@name"/></b>
-  <xsl:value-of select="concat(' (', @symbol-number, ')')"/>
-  <xsl:text>&#10;    </xsl:text>
-  <xsl:if test="key('bison:ruleByLhs', @name)">
-    <xsl:text>on left:</xsl:text>
-    <xsl:for-each select="key('bison:ruleByLhs', @name)">
-      <xsl:apply-templates select="." mode="number-link"/>
-    </xsl:for-each>
-  </xsl:if>
-  <xsl:if test="key('bison:ruleByRhs', @name)">
-    <xsl:if test="key('bison:ruleByLhs', @name)">
-      <xsl:text>&#10;    </xsl:text>
-    </xsl:if>
-    <xsl:text>on right:</xsl:text>
-    <xsl:for-each select="key('bison:ruleByRhs', @name)">
-      <xsl:apply-templates select="." mode="number-link"/>
-    </xsl:for-each>
-  </xsl:if>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="rule" mode="number-link">
-  <xsl:text> </xsl:text>
-  <a>
-    <xsl:attribute name="href">
-      <xsl:value-of select="concat('#rule_', @number)"/>
-    </xsl:attribute>
-    <xsl:value-of select="@number"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="automaton">
-  <h2>
-    <a name="automaton"/>
-    <xsl:text> Automaton</xsl:text>
-  </h2>
-  <xsl:apply-templates select="state">
-    <xsl:with-param name="pad" select="'3'"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="automaton/state">
-  <xsl:param name="pad"/>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <h3>
-    <a>
-      <xsl:attribute name="name">
-        <xsl:value-of select="concat('state_', @number)"/>
-      </xsl:attribute>
-    </a>
-    <xsl:text>state </xsl:text>
-    <xsl:value-of select="@number"/>
-  </h3>
-  <xsl:text>&#10;&#10;</xsl:text>
-  <p class="pre">
-    <xsl:apply-templates select="itemset/item">
-      <xsl:with-param name="pad" select="$pad"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="actions/transitions">
-      <xsl:with-param name="type" select="'shift'"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="actions/errors"/>
-    <xsl:apply-templates select="actions/reductions"/>
-    <xsl:apply-templates select="actions/transitions">
-      <xsl:with-param name="type" select="'goto'"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="solved-conflicts"/>
-  </p>
-</xsl:template>
-
-<xsl:template match="actions/transitions">
-  <xsl:param name="type"/>
-  <xsl:if test="transition[@type = $type]">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="transition[@type = $type]">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="transition[@type = $type]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="actions/errors">
-  <xsl:if test="error">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="error">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="error"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="actions/reductions">
-  <xsl:if test="reduction">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="reduction">
-      <xsl:with-param name="pad">
-        <xsl:call-template name="max-width-symbol">
-          <xsl:with-param name="node" select="reduction"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="item">
-  <xsl:param name="pad"/>
-  <xsl:param name="prev-rule-number"
-             select="preceding-sibling::item[1]/@rule-number"/>
-  <xsl:apply-templates
-    select="key('bison:ruleByNumber', current()/@rule-number)"
-  >
-    <xsl:with-param name="itemset" select="'true'"/>
-    <xsl:with-param name="pad" select="$pad"/>
-    <xsl:with-param name="prev-lhs"
-      select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]"
-   />
-    <xsl:with-param name="point" select="@point"/>
-    <xsl:with-param name="lookaheads">
-      <xsl:apply-templates select="lookaheads"/>
-    </xsl:with-param>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="rule">
-  <xsl:param name="itemset"/>
-  <xsl:param name="pad"/>
-  <xsl:param name="prev-lhs"/>
-  <xsl:param name="point"/>
-  <xsl:param name="lookaheads"/>
-
-  <xsl:if test="$itemset != 'true' and not($prev-lhs = lhs[text()])">
-    <xsl:text>&#10;</xsl:text>
-  </xsl:if>
-
-  <xsl:if test="$itemset != 'true'">
-    <a>
-      <xsl:attribute name="name">
-        <xsl:value-of select="concat('rule_', @number)"/>
-      </xsl:attribute>
-    </a>
-  </xsl:if>
-  <xsl:text>  </xsl:text>
-
-  <xsl:choose>
-    <xsl:when test="$itemset = 'true'">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:value-of select="concat('#rule_', @number)"/>
-        </xsl:attribute>
-        <xsl:call-template name="lpad">
-          <xsl:with-param name="str" select="string(@number)"/>
-          <xsl:with-param name="pad" select="number($pad)"/>
-        </xsl:call-template>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="string(@number)"/>
-        <xsl:with-param name="pad" select="number($pad)"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:text> </xsl:text>
-
-  <!-- LHS -->
-  <xsl:choose>
-    <xsl:when test="$itemset != 'true' and $prev-lhs = lhs[text()]">
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="'|'"/>
-        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 2"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]">
-      <xsl:call-template name="lpad">
-        <xsl:with-param name="str" select="'|'"/>
-        <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 2"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <span class="i">
-        <xsl:value-of select="lhs"/>
-      </span>
-      <xsl:text> &#8594;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <!-- RHS -->
-  <xsl:for-each select="rhs/*">
-    <xsl:if test="position() = $point + 1">
-      <xsl:text> </xsl:text>
-      <span class="point">.</span>
-    </xsl:if>
-    <xsl:if test="$itemset = 'true' and name(.) != 'empty'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="$itemset != 'true'">
-      <xsl:apply-templates select="."/>
-    </xsl:if>
-    <xsl:if test="position() = last() and position() = $point">
-      <xsl:text> </xsl:text>
-      <span class="point">.</span>
-    </xsl:if>
-  </xsl:for-each>
-  <xsl:if test="$lookaheads">
-    <xsl:value-of select="$lookaheads"/>
-  </xsl:if>
-
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:text> </xsl:text>
-  <xsl:choose>
-    <xsl:when test="name(key('bison:symbolByName', .)) = 'nonterminal'">
-      <span class="i"><xsl:value-of select="."/></span>
-    </xsl:when>
-    <xsl:otherwise>
-      <b><xsl:value-of select="."/></b>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="empty">
-  <xsl:text> &#949;</xsl:text>
-</xsl:template>
-
-<xsl:template match="lookaheads">
-  <xsl:text>  [</xsl:text>
-  <xsl:apply-templates select="symbol"/>
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="lookaheads/symbol">
-  <xsl:value-of select="."/>
-  <xsl:if test="position() != last()">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="transition">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="@type = 'shift'">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:value-of select="concat('#state_', @state)"/>
-        </xsl:attribute>
-        <xsl:value-of select="concat('shift, and go to state ', @state)"/>
-      </a>
-    </xsl:when>
-    <xsl:when test="@type = 'goto'">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:value-of select="concat('#state_', @state)"/>
-        </xsl:attribute>
-        <xsl:value-of select="concat('go to state ', @state)"/>
-      </a>
-    </xsl:when>
-  </xsl:choose>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="error">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:text>error</xsl:text>
-  <xsl:text> (</xsl:text>
-  <xsl:value-of select="text()"/>
-  <xsl:text>)</xsl:text>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="reduction">
-  <xsl:param name="pad"/>
-  <xsl:text>    </xsl:text>
-  <xsl:call-template name="rpad">
-    <xsl:with-param name="str" select="string(@symbol)"/>
-    <xsl:with-param name="pad" select="number($pad) + 2"/>
-  </xsl:call-template>
-  <xsl:if test="@enabled = 'false'">
-    <xsl:text>[</xsl:text>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="@rule = 'accept'">
-      <xsl:text>accept</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <a>
-        <xsl:attribute name="href">
-          <xsl:value-of select="concat('#rule_', @rule)"/>
-        </xsl:attribute>
-        <xsl:value-of select="concat('reduce using rule ', @rule)"/>
-      </a>
-      <xsl:text> (</xsl:text>
-      <xsl:value-of
-        select="key('bison:ruleByNumber', current()/@rule)/lhs[text()]"
-      />
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="@enabled = 'false'">
-    <xsl:text>]</xsl:text>
-  </xsl:if>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="solved-conflicts">
-  <xsl:if test="resolution">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates select="resolution"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="resolution">
-  <xsl:text>    Conflict between </xsl:text>
-  <a>
-    <xsl:attribute name="href">
-      <xsl:value-of select="concat('#rule_', @rule)"/>
-    </xsl:attribute>
-    <xsl:value-of select="concat('rule ',@rule)"/>
-  </a>
-  <xsl:text> and token </xsl:text>
-  <xsl:value-of select="@symbol"/>
-  <xsl:text> resolved as </xsl:text>
-  <xsl:if test="@type = 'error'">
-    <xsl:text>an </xsl:text>
-  </xsl:if>
-  <xsl:value-of select="@type"/>
-  <xsl:text> (</xsl:text>
-  <xsl:value-of select="."/>
-  <xsl:text>).&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template name="max-width-symbol">
-  <xsl:param name="node"/>
-  <xsl:variable name="longest">
-    <xsl:for-each select="$node">
-      <xsl:sort data-type="number" select="string-length(@symbol)"
-                order="descending"/>
-      <xsl:if test="position() = 1">
-        <xsl:value-of select="string-length(@symbol)"/>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:variable>
-  <xsl:value-of select="$longest"/>
-</xsl:template>
-
-<xsl:template name="lpad">
-  <xsl:param name="str" select="''"/>
-  <xsl:param name="pad" select="0"/>
-  <xsl:variable name="diff" select="$pad - string-length($str)" />
-  <xsl:choose>
-    <xsl:when test="$diff &lt; 0">
-      <xsl:value-of select="$str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space">
-        <xsl:with-param name="repeat" select="$diff"/>
-      </xsl:call-template>
-      <xsl:value-of select="$str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="rpad">
-  <xsl:param name="str" select="''"/>
-  <xsl:param name="pad" select="0"/>
-  <xsl:variable name="diff" select="$pad - string-length($str)"/>
-  <xsl:choose>
-    <xsl:when test="$diff &lt; 0">
-      <xsl:value-of select="$str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$str"/>
-      <xsl:call-template name="space">
-        <xsl:with-param name="repeat" select="$diff"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space">
-  <xsl:param name="repeat">0</xsl:param>
-  <xsl:param name="fill" select="' '"/>
-  <xsl:if test="number($repeat) &gt;= 1">
-    <xsl:call-template name="space">
-      <xsl:with-param name="repeat" select="$repeat - 1"/>
-      <xsl:with-param name="fill" select="$fill"/>
-    </xsl:call-template>
-    <xsl:value-of select="$fill"/>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/tools/bison/bison/src/local.mk b/contrib/tools/bison/bison/src/local.mk
deleted file mode 100644
index 9e0848c29d..0000000000
--- a/contrib/tools/bison/bison/src/local.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-LDADD = lib/libbison.a $(LIBINTL)
-
-bin_PROGRAMS = src/bison
-# Prettify Automake-computed names of compiled objects.
-src_bison_SHORTNAME = bison
-
-src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
-src_bison_SOURCES =                             \
-  src/AnnotationList.c                          \
-  src/AnnotationList.h                          \
-  src/InadequacyList.c                          \
-  src/InadequacyList.h                          \
-  src/LR0.c                                     \
-  src/LR0.h                                     \
-  src/Sbitset.c                                 \
-  src/Sbitset.h                                 \
-  src/assoc.c                                   \
-  src/assoc.h                                   \
-  src/closure.c                                 \
-  src/closure.h                                 \
-  src/complain.c                                \
-  src/complain.h                                \
-  src/conflicts.c                               \
-  src/conflicts.h                               \
-  src/derives.c                                 \
-  src/derives.h                                 \
-  src/files.c                                   \
-  src/files.h                                   \
-  src/flex-scanner.h                            \
-  src/getargs.c                                 \
-  src/getargs.h                                 \
-  src/gram.c                                    \
-  src/gram.h                                    \
-  src/graphviz.c                                \
-  src/graphviz.h                                \
-  src/lalr.c                                    \
-  src/lalr.h                                    \
-  src/ielr.c                                    \
-  src/ielr.h                                    \
-  src/location.c                                \
-  src/location.h                                \
-  src/main.c                                    \
-  src/muscle-tab.c                              \
-  src/muscle-tab.h                              \
-  src/named-ref.c                               \
-  src/named-ref.h                               \
-  src/nullable.c                                \
-  src/nullable.h                                \
-  src/output.c                                  \
-  src/output.h                                  \
-  src/parse-gram.y                              \
-  src/print-xml.c                               \
-  src/print-xml.h                               \
-  src/print.c                                   \
-  src/print.h                                   \
-  src/print_graph.c                             \
-  src/print_graph.h                             \
-  src/reader.c                                  \
-  src/reader.h                                  \
-  src/reduce.c                                  \
-  src/reduce.h                                  \
-  src/relation.c                                \
-  src/relation.h                                \
-  src/scan-code-c.c                             \
-  src/scan-code.h                               \
-  src/scan-gram-c.c                             \
-  src/scan-gram.h                               \
-  src/scan-skel-c.c                             \
-  src/scan-skel.h                               \
-  src/state.c                                   \
-  src/state.h                                   \
-  src/symlist.c                                 \
-  src/symlist.h                                 \
-  src/symtab.c                                  \
-  src/symtab.h                                  \
-  src/system.h                                  \
-  src/tables.c                                  \
-  src/tables.h                                  \
-  src/uniqstr.c                                 \
-  src/uniqstr.h
-
-EXTRA_src_bison_SOURCES =                       \
-  src/scan-code.l                               \
-  src/scan-gram.l                               \
-  src/scan-skel.l
-
-BUILT_SOURCES +=                                \
-  src/parse-gram.c                              \
-  src/parse-gram.h                              \
-  src/scan-code.c                               \
-  src/scan-gram.c                               \
-  src/scan-skel.c
-
-
-## ------ ##
-## yacc.  ##
-## ------ ##
-
-bin_SCRIPTS = $(YACC_SCRIPT)
-EXTRA_SCRIPTS = src/yacc
-MOSTLYCLEANFILES += src/yacc
-
-src/yacc:
-	$(AM_V_GEN)rm -f $@ $@.tmp
-	$(AM_V_at)echo '#! /bin/sh' >$@.tmp
-	$(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
-	$(AM_V_at)chmod a+x $@.tmp
-	$(AM_V_at)mv $@.tmp $@
diff --git a/contrib/tools/bison/bison/src/parse-gram.y b/contrib/tools/bison/bison/src/parse-gram.y
deleted file mode 100644
index 8c438dfeda..0000000000
--- a/contrib/tools/bison/bison/src/parse-gram.y
+++ /dev/null
@@ -1,874 +0,0 @@
-/* Bison Grammar Parser                             -*- C -*-
-
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-%code requires
-{
-  #include "symlist.h"
-  #include "symtab.h"
-}
-
-%code top
-{
-  /* On column 0 to please syntax-check.  */
-#include <config.h>
-#include "string--.h"
-}
-
-%code
-{
-  #include "system.h"
-
-  #include "c-ctype.h"
-  #include "complain.h"
-  #include "conflicts.h"
-  #include "files.h"
-  #include "getargs.h"
-  #include "gram.h"
-  #include "named-ref.h"
-  #include "quotearg.h"
-  #include "reader.h"
-  #include "scan-gram.h"
-  #include "scan-code.h"
-  #include "xmemdup0.h"
-
-  static int current_prec = 0;
-  static location current_lhs_location;
-  static named_ref *current_lhs_named_ref;
-  static symbol *current_lhs_symbol;
-  static symbol_class current_class = unknown_sym;
-  static uniqstr current_type = NULL;
-
-  /** Set the new current left-hand side symbol, possibly common
-   * to several right-hand side parts of rule.
-   */
-  static void current_lhs (symbol *sym, location loc, named_ref *ref);
-
-  #define YYLLOC_DEFAULT(Current, Rhs, N)         \
-    (Current) = lloc_default (Rhs, N)
-  static YYLTYPE lloc_default (YYLTYPE const *, int);
-
-  #define YY_LOCATION_PRINT(File, Loc)            \
-    location_print (Loc, File)
-
-  /* Strip initial '{' and final '}' (must be first and last characters).
-     Return the result.  */
-  static char *strip_braces (char *code);
-
-  /* Convert CODE by calling code_props_plain_init if PLAIN, otherwise
-     code_props_symbol_action_init.  Call
-     gram_scanner_last_string_free to release the latest string from
-     the scanner (should be CODE). */
-  static char const *translate_code (char *code, location loc, bool plain);
-
-  /* Convert CODE by calling code_props_plain_init after having
-     stripped the first and last characters (expected to be '{', and
-     '}').  Call gram_scanner_last_string_free to release the latest
-     string from the scanner (should be CODE). */
-  static char const *translate_code_braceless (char *code, location loc);
-
-  static void version_check (location const *loc, char const *version);
-
-  static void gram_error (location const *, char const *);
-
-  /* A string that describes a char (e.g., 'a' -> "'a'").  */
-  static char const *char_name (char);
-
-  #define YYTYPE_INT16 int_fast16_t
-  #define YYTYPE_INT8 int_fast8_t
-  #define YYTYPE_UINT16 uint_fast16_t
-  #define YYTYPE_UINT8 uint_fast8_t
-}
-
-%define api.prefix {gram_}
-%define api.pure full
-%define locations
-%define parse.error verbose
-%define parse.lac full
-%define parse.trace
-%defines
-%expect 0
-%verbose
-
-%initial-action
-{
-  /* Bison's grammar can initial empty locations, hence a default
-     location is needed. */
-  boundary_set (&@$.start, current_file, 1, 1);
-  boundary_set (&@$.end, current_file, 1, 1);
-}
-
-/* Define the tokens together with their human representation.  */
-%token GRAM_EOF 0 "end of file"
-%token STRING     "string"
-
-%token PERCENT_TOKEN       "%token"
-%token PERCENT_NTERM       "%nterm"
-
-%token PERCENT_TYPE        "%type"
-%token PERCENT_DESTRUCTOR  "%destructor"
-%token PERCENT_PRINTER     "%printer"
-
-%token PERCENT_LEFT        "%left"
-%token PERCENT_RIGHT       "%right"
-%token PERCENT_NONASSOC    "%nonassoc"
-%token PERCENT_PRECEDENCE  "%precedence"
-
-%token PERCENT_PREC          "%prec"
-%token PERCENT_DPREC         "%dprec"
-%token PERCENT_MERGE         "%merge"
-
-/*----------------------.
-| Global Declarations.  |
-`----------------------*/
-
-%token
-  PERCENT_CODE            "%code"
-  PERCENT_DEFAULT_PREC    "%default-prec"
-  PERCENT_DEFINE          "%define"
-  PERCENT_DEFINES         "%defines"
-  PERCENT_ERROR_VERBOSE   "%error-verbose"
-  PERCENT_EXPECT          "%expect"
-  PERCENT_EXPECT_RR       "%expect-rr"
-  PERCENT_FLAG            "%<flag>"
-  PERCENT_FILE_PREFIX     "%file-prefix"
-  PERCENT_GLR_PARSER      "%glr-parser"
-  PERCENT_INITIAL_ACTION  "%initial-action"
-  PERCENT_LANGUAGE        "%language"
-  PERCENT_NAME_PREFIX     "%name-prefix"
-  PERCENT_NO_DEFAULT_PREC "%no-default-prec"
-  PERCENT_NO_LINES        "%no-lines"
-  PERCENT_NONDETERMINISTIC_PARSER
-                          "%nondeterministic-parser"
-  PERCENT_OUTPUT          "%output"
-  PERCENT_REQUIRE         "%require"
-  PERCENT_SKELETON        "%skeleton"
-  PERCENT_START           "%start"
-  PERCENT_TOKEN_TABLE     "%token-table"
-  PERCENT_VERBOSE         "%verbose"
-  PERCENT_YACC            "%yacc"
-;
-
-%token BRACED_CODE     "{...}"
-%token BRACED_PREDICATE "%?{...}"
-%token BRACKETED_ID    "[identifier]"
-%token CHAR            "char"
-%token EPILOGUE        "epilogue"
-%token EQUAL           "="
-%token ID              "identifier"
-%token ID_COLON        "identifier:"
-%token PERCENT_PERCENT "%%"
-%token PIPE            "|"
-%token PROLOGUE        "%{...%}"
-%token SEMICOLON       ";"
-%token TAG             "<tag>"
-%token TAG_ANY         "<*>"
-%token TAG_NONE        "<>"
-
-%union {unsigned char character;}
-%type <character> CHAR
-%printer { fputs (char_name ($$), yyo); } CHAR
-
-%union {char *code;};
-%type <code> "{...}" "%?{...}" "%{...%}" EPILOGUE STRING
-%printer { fputs (quotearg_style (c_quoting_style, $$), yyo); } STRING
-%printer { fprintf (yyo, "{\n%s\n}", $$); } <code>
-
-%union {uniqstr uniqstr;}
-%type <uniqstr> BRACKETED_ID ID ID_COLON PERCENT_FLAG TAG tag variable
-%printer { fputs ($$, yyo); } <uniqstr>
-%printer { fprintf (yyo, "[%s]", $$); } BRACKETED_ID
-%printer { fprintf (yyo, "%s:", $$); } ID_COLON
-%printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG
-%printer { fprintf (yyo, "<%s>", $$); } TAG tag
-
-%union {int integer;};
-%token <integer> INT "integer"
-%printer { fprintf (yyo, "%d", $$); } <integer>
-
-%union {symbol *symbol;}
-%type <symbol> id id_colon string_as_id symbol symbol.prec
-%printer { fprintf (yyo, "%s", $$->tag); } <symbol>
-%printer { fprintf (yyo, "%s:", $$->tag); } id_colon
-
-%union {assoc assoc;};
-%type <assoc> precedence_declarator
-
-%union {symbol_list *list;}
-%type <list>  symbols.1 symbols.prec generic_symlist generic_symlist_item
-
-%union {named_ref *named_ref;}
-%type <named_ref> named_ref.opt
-
-/*---------.
-| %param.  |
-`---------*/
-%code requires
-{
-  typedef enum
-  {
-    param_none   = 0,
-    param_lex    = 1 << 0,
-    param_parse  = 1 << 1,
-    param_both   = param_lex | param_parse
-  } param_type;
-};
-%code
-{
-  /** Add a lex-param and/or a parse-param.
-   *
-   * \param type  where to push this formal argument.
-   * \param decl  the formal argument.  Destroyed.
-   * \param loc   the location in the source.
-   */
-  static void add_param (param_type type, char *decl, location loc);
-  static param_type current_param = param_none;
-};
-%union {param_type param;}
-%token <param> PERCENT_PARAM "%param";
-%printer
-{
-  switch ($$)
-    {
-#define CASE(In, Out)                                           \
-      case param_ ## In: fputs ("%" #Out, yyo); break
-      CASE (lex,   lex-param);
-      CASE (parse, parse-param);
-      CASE (both,  param);
-#undef CASE
-      case param_none: aver (false); break;
-    }
-} <param>;
-
-
-                     /*==========\
-                     | Grammar.  |
-                     \==========*/
-%%
-
-input:
-  prologue_declarations "%%" grammar epilogue.opt
-;
-
-
-        /*------------------------------------.
-        | Declarations: before the first %%.  |
-        `------------------------------------*/
-
-prologue_declarations:
-  %empty
-| prologue_declarations prologue_declaration
-;
-
-prologue_declaration:
-  grammar_declaration
-| "%{...%}"
-    {
-      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
-                        translate_code ($1, @1, true), @1);
-      code_scanner_last_string_free ();
-    }
-| "%<flag>"
-    {
-      muscle_percent_define_ensure ($1, @1, true);
-    }
-| "%define" variable value
-    {
-      muscle_percent_define_insert ($2, @2, $3.kind, $3.chars,
-                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-    }
-| "%defines"                       { defines_flag = true; }
-| "%defines" STRING
-    {
-      defines_flag = true;
-      spec_defines_file = xstrdup ($2);
-    }
-| "%error-verbose"
-    {
-      muscle_percent_define_insert ("parse.error", @1, muscle_keyword,
-                                    "verbose",
-                                    MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
-    }
-| "%expect" INT                    { expected_sr_conflicts = $2; }
-| "%expect-rr" INT                 { expected_rr_conflicts = $2; }
-| "%file-prefix" STRING            { spec_file_prefix = $2; }
-| "%glr-parser"
-    {
-      nondeterministic_parser = true;
-      glr_parser = true;
-    }
-| "%initial-action" "{...}"
-    {
-      muscle_code_grow ("initial_action", translate_code ($2, @2, false), @2);
-      code_scanner_last_string_free ();
-    }
-| "%language" STRING            { language_argmatch ($2, grammar_prio, @1); }
-| "%name-prefix" STRING         { spec_name_prefix = $2; }
-| "%no-lines"                   { no_lines_flag = true; }
-| "%nondeterministic-parser"    { nondeterministic_parser = true; }
-| "%output" STRING              { spec_outfile = $2; }
-| "%param" { current_param = $1; } params { current_param = param_none; }
-| "%require" STRING             { version_check (&@2, $2); }
-| "%skeleton" STRING
-    {
-      char const *skeleton_user = $2;
-      if (strchr (skeleton_user, '/'))
-        {
-          size_t dir_length = strlen (current_file);
-          char *skeleton_build;
-          while (dir_length && current_file[dir_length - 1] != '/')
-            --dir_length;
-          while (dir_length && current_file[dir_length - 1] == '/')
-            --dir_length;
-          skeleton_build =
-            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
-          if (dir_length > 0)
-            {
-              memcpy (skeleton_build, current_file, dir_length);
-              skeleton_build[dir_length++] = '/';
-            }
-          strcpy (skeleton_build + dir_length, skeleton_user);
-          skeleton_user = uniqstr_new (skeleton_build);
-          free (skeleton_build);
-        }
-      skeleton_arg (skeleton_user, grammar_prio, @1);
-    }
-| "%token-table"                { token_table_flag = true; }
-| "%verbose"                    { report_flag |= report_states; }
-| "%yacc"                       { yacc_flag = true; }
-| /*FIXME: Err?  What is this horror doing here? */ ";"
-;
-
-params:
-   params "{...}"  { add_param (current_param, $2, @2); }
-| "{...}"          { add_param (current_param, $1, @1); }
-;
-
-
-/*----------------------.
-| grammar_declaration.  |
-`----------------------*/
-
-grammar_declaration:
-  precedence_declaration
-| symbol_declaration
-| "%start" symbol
-    {
-      grammar_start_symbol_set ($2, @2);
-    }
-| code_props_type "{...}" generic_symlist
-    {
-      code_props code;
-      code_props_symbol_action_init (&code, $2, @2);
-      code_props_translate_code (&code);
-      {
-        symbol_list *list;
-        for (list = $3; list; list = list->next)
-          symbol_list_code_props_set (list, $1, &code);
-        symbol_list_free ($3);
-      }
-    }
-| "%default-prec"
-    {
-      default_prec = true;
-    }
-| "%no-default-prec"
-    {
-      default_prec = false;
-    }
-| "%code" "{...}"
-    {
-      /* Do not invoke muscle_percent_code_grow here since it invokes
-         muscle_user_name_list_grow.  */
-      muscle_code_grow ("percent_code()",
-                        translate_code_braceless ($2, @2), @2);
-      code_scanner_last_string_free ();
-    }
-| "%code" ID "{...}"
-    {
-      muscle_percent_code_grow ($2, @2, translate_code_braceless ($3, @3), @3);
-      code_scanner_last_string_free ();
-    }
-;
-
-%type <code_type> code_props_type;
-%union {code_props_type code_type;};
-%printer { fprintf (yyo, "%s", code_props_type_string ($$)); } <code_type>;
-code_props_type:
-  "%destructor"  { $$ = destructor; }
-| "%printer"     { $$ = printer; }
-;
-
-/*---------.
-| %union.  |
-`---------*/
-
-%token PERCENT_UNION "%union";
-
-union_name:
-  %empty {}
-| ID     { muscle_code_grow ("union_name", $1, @1); }
-;
-
-grammar_declaration:
-  "%union" union_name "{...}"
-    {
-      union_seen = true;
-      muscle_code_grow ("union_members", translate_code_braceless ($3, @3), @3);
-      code_scanner_last_string_free ();
-    }
-;
-
-
-
-
-symbol_declaration:
-  "%nterm" { current_class = nterm_sym; } symbol_defs.1
-    {
-      current_class = unknown_sym;
-      current_type = NULL;
-    }
-| "%token" { current_class = token_sym; } symbol_defs.1
-    {
-      current_class = unknown_sym;
-      current_type = NULL;
-    }
-| "%type" TAG symbols.1
-    {
-      symbol_list *list;
-      tag_seen = true;
-      for (list = $3; list; list = list->next)
-        symbol_type_set (list->content.sym, $2, @2);
-      symbol_list_free ($3);
-    }
-;
-
-precedence_declaration:
-  precedence_declarator tag.opt symbols.prec
-    {
-      symbol_list *list;
-      ++current_prec;
-      for (list = $3; list; list = list->next)
-        {
-          symbol_type_set (list->content.sym, current_type, @2);
-          symbol_precedence_set (list->content.sym, current_prec, $1, @1);
-        }
-      symbol_list_free ($3);
-      current_type = NULL;
-    }
-;
-
-precedence_declarator:
-  "%left"       { $$ = left_assoc; }
-| "%right"      { $$ = right_assoc; }
-| "%nonassoc"   { $$ = non_assoc; }
-| "%precedence" { $$ = precedence_assoc; }
-;
-
-tag.opt:
-  %empty { current_type = NULL; }
-| TAG    { current_type = $1; tag_seen = true; }
-;
-
-/* Just like symbols.1 but accept INT for the sake of POSIX.  */
-symbols.prec:
-  symbol.prec
-    { $$ = symbol_list_sym_new ($1, @1); }
-| symbols.prec symbol.prec
-    { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); }
-;
-
-symbol.prec:
-  symbol
-    {
-      $$ = $1;
-      symbol_class_set ($1, token_sym, @1, false);
-    }
-| symbol INT
-    {
-      $$ = $1;
-      symbol_user_token_number_set ($1, $2, @2);
-      symbol_class_set ($1, token_sym, @1, false);
-    }
-;
-
-/* One or more symbols to be %typed. */
-symbols.1:
-  symbol
-    { $$ = symbol_list_sym_new ($1, @1); }
-| symbols.1 symbol
-    { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); }
-;
-
-generic_symlist:
-  generic_symlist_item { $$ = $1; }
-| generic_symlist generic_symlist_item { $$ = symbol_list_append ($1, $2); }
-;
-
-generic_symlist_item:
-  symbol    { $$ = symbol_list_sym_new ($1, @1); }
-| tag       { $$ = symbol_list_type_new ($1, @1); }
-;
-
-tag:
-  TAG
-| "<*>" { $$ = uniqstr_new ("*"); }
-| "<>"  { $$ = uniqstr_new (""); }
-;
-
-/* One token definition.  */
-symbol_def:
-  TAG
-    {
-      current_type = $1;
-      tag_seen = true;
-    }
-| id
-    {
-      symbol_class_set ($1, current_class, @1, true);
-      symbol_type_set ($1, current_type, @1);
-    }
-| id INT
-    {
-      symbol_class_set ($1, current_class, @1, true);
-      symbol_type_set ($1, current_type, @1);
-      symbol_user_token_number_set ($1, $2, @2);
-    }
-| id string_as_id
-    {
-      symbol_class_set ($1, current_class, @1, true);
-      symbol_type_set ($1, current_type, @1);
-      symbol_make_alias ($1, $2, @$);
-    }
-| id INT string_as_id
-    {
-      symbol_class_set ($1, current_class, @1, true);
-      symbol_type_set ($1, current_type, @1);
-      symbol_user_token_number_set ($1, $2, @2);
-      symbol_make_alias ($1, $3, @$);
-    }
-;
-
-/* One or more symbol definitions. */
-symbol_defs.1:
-  symbol_def
-| symbol_defs.1 symbol_def
-;
-
-
-        /*------------------------------------------.
-        | The grammar section: between the two %%.  |
-        `------------------------------------------*/
-
-grammar:
-  rules_or_grammar_declaration
-| grammar rules_or_grammar_declaration
-;
-
-/* As a Bison extension, one can use the grammar declarations in the
-   body of the grammar.  */
-rules_or_grammar_declaration:
-  rules
-| grammar_declaration ";"
-| error ";"
-    {
-      yyerrok;
-    }
-;
-
-rules:
-  id_colon named_ref.opt { current_lhs ($1, @1, $2); } rhses.1
-  {
-    /* Free the current lhs. */
-    current_lhs (0, @1, 0);
-  }
-;
-
-rhses.1:
-  rhs                { grammar_current_rule_end (@1); }
-| rhses.1 "|" rhs    { grammar_current_rule_end (@3); }
-| rhses.1 ";"
-;
-
-%token PERCENT_EMPTY "%empty";
-rhs:
-  %empty
-    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
-                                  current_lhs_named_ref); }
-| rhs symbol named_ref.opt
-    { grammar_current_rule_symbol_append ($2, @2, $3); }
-| rhs "{...}" named_ref.opt
-    { grammar_current_rule_action_append ($2, @2, $3, false); }
-| rhs "%?{...}"
-    { grammar_current_rule_action_append ($2, @2, NULL, true); }
-| rhs "%empty"
-    { grammar_current_rule_empty_set (@2); }
-| rhs "%prec" symbol
-    { grammar_current_rule_prec_set ($3, @3); }
-| rhs "%dprec" INT
-    { grammar_current_rule_dprec_set ($3, @3); }
-| rhs "%merge" TAG
-    { grammar_current_rule_merge_set ($3, @3); }
-;
-
-named_ref.opt:
-  %empty         { $$ = 0; }
-| BRACKETED_ID   { $$ = named_ref_new ($1, @1); }
-;
-
-/*---------------------.
-| variable and value.  |
-`---------------------*/
-
-/* The STRING form of variable is deprecated and is not M4-friendly.
-   For example, M4 fails for '%define "[" "value"'.  */
-variable:
-  ID
-| STRING { $$ = uniqstr_new ($1); }
-;
-
-/* Some content or empty by default. */
-%code requires {#include "muscle-tab.h"};
-%union
-{
-  struct
-  {
-    char const *chars;
-    muscle_kind kind;
-  } value;
-};
-%type <value> value;
-%printer
-{
-  switch ($$.kind)
-    {
-    case muscle_code:    fprintf (yyo,  "{%s}",  $$.chars); break;
-    case muscle_keyword: fprintf (yyo,   "%s",   $$.chars); break;
-    case muscle_string:  fprintf (yyo, "\"%s\"", $$.chars); break;
-    }
-} <value>;
-
-value:
-  %empty  { $$.kind = muscle_keyword; $$.chars = ""; }
-| ID      { $$.kind = muscle_keyword; $$.chars = $1; }
-| STRING  { $$.kind = muscle_string;  $$.chars = $1; }
-| "{...}" { $$.kind = muscle_code;    $$.chars = strip_braces ($1); }
-;
-
-
-/*--------------.
-| Identifiers.  |
-`--------------*/
-
-/* Identifiers are returned as uniqstr values by the scanner.
-   Depending on their use, we may need to make them genuine symbols.  */
-
-id:
-  ID
-    { $$ = symbol_from_uniqstr ($1, @1); }
-| CHAR
-    {
-      $$ = symbol_get (char_name ($1), @1);
-      symbol_class_set ($$, token_sym, @1, false);
-      symbol_user_token_number_set ($$, $1, @1);
-    }
-;
-
-id_colon:
-  ID_COLON { $$ = symbol_from_uniqstr ($1, @1); }
-;
-
-
-symbol:
-  id
-| string_as_id
-;
-
-/* A string used as an ID: quote it.  */
-string_as_id:
-  STRING
-    {
-      $$ = symbol_get (quotearg_style (c_quoting_style, $1), @1);
-      symbol_class_set ($$, token_sym, @1, false);
-    }
-;
-
-epilogue.opt:
-  %empty
-| "%%" EPILOGUE
-    {
-      muscle_code_grow ("epilogue", translate_code ($2, @2, true), @2);
-      code_scanner_last_string_free ();
-    }
-;
-
-%%
-
-/* Return the location of the left-hand side of a rule whose
-   right-hand side is RHS[1] ... RHS[N].  Ignore empty nonterminals in
-   the right-hand side, and return an empty location equal to the end
-   boundary of RHS[0] if the right-hand side is empty.  */
-
-static YYLTYPE
-lloc_default (YYLTYPE const *rhs, int n)
-{
-  int i;
-  YYLTYPE loc;
-
-  /* SGI MIPSpro 7.4.1m miscompiles "loc.start = loc.end = rhs[n].end;".
-     The bug is fixed in 7.4.2m, but play it safe for now.  */
-  loc.start = rhs[n].end;
-  loc.end = rhs[n].end;
-
-  /* Ignore empty nonterminals the start of the right-hand side.
-     Do not bother to ignore them at the end of the right-hand side,
-     since empty nonterminals have the same end as their predecessors.  */
-  for (i = 1; i <= n; i++)
-    if (! equal_boundaries (rhs[i].start, rhs[i].end))
-      {
-        loc.start = rhs[i].start;
-        break;
-      }
-
-  return loc;
-}
-
-static
-char *strip_braces (char *code)
-{
-  code[strlen (code) - 1] = 0;
-  return code + 1;
-}
-
-static
-char const *
-translate_code (char *code, location loc, bool plain)
-{
-  code_props plain_code;
-  if (plain)
-    code_props_plain_init (&plain_code, code, loc);
-  else
-    code_props_symbol_action_init (&plain_code, code, loc);
-  code_props_translate_code (&plain_code);
-  gram_scanner_last_string_free ();
-  return plain_code.code;
-}
-
-static
-char const *
-translate_code_braceless (char *code, location loc)
-{
-  return translate_code (strip_braces (code), loc, true);
-}
-
-static void
-add_param (param_type type, char *decl, location loc)
-{
-  static char const alphanum[26 + 26 + 1 + 10 + 1] =
-    "abcdefghijklmnopqrstuvwxyz"
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    "_"
-    "0123456789";
-
-  char const *name_start = NULL;
-  {
-    char *p;
-    /* Stop on last actual character.  */
-    for (p = decl; p[1]; p++)
-      if ((p == decl
-           || ! memchr (alphanum, p[-1], sizeof alphanum))
-          && memchr (alphanum, p[0], sizeof alphanum - 10))
-        name_start = p;
-
-    /* Strip the surrounding '{' and '}', and any blanks just inside
-       the braces.  */
-    --p;
-  while (c_isspace ((unsigned char) *p))
-      --p;
-    p[1] = '\0';
-    ++decl;
-  while (c_isspace ((unsigned char) *decl))
-      ++decl;
-  }
-
-  if (! name_start)
-    complain (&loc, complaint, _("missing identifier in parameter declaration"));
-  else
-    {
-      char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
-      if (type & param_lex)
-        muscle_pair_list_grow ("lex_param", decl, name);
-      if (type & param_parse)
-        muscle_pair_list_grow ("parse_param", decl, name);
-      free (name);
-    }
-
-  gram_scanner_last_string_free ();
-}
-
-
-static void
-version_check (location const *loc, char const *version)
-{
-  if (strverscmp (version, PACKAGE_VERSION) > 0)
-    {
-      complain (loc, complaint, "require bison %s, but have %s",
-                version, PACKAGE_VERSION);
-      exit (EX_MISMATCH);
-    }
-}
-
-static void
-gram_error (location const *loc, char const *msg)
-{
-  complain (loc, complaint, "%s", msg);
-}
-
-char const *
-token_name (int type)
-{
-  return yytname[YYTRANSLATE (type)];
-}
-
-static char const *
-char_name (char c)
-{
-  if (c == '\'')
-    return "'\\''";
-  else
-    {
-      char buf[4];
-      buf[0] = '\''; buf[1] = c; buf[2] = '\''; buf[3] = '\0';
-      return quotearg_style (escape_quoting_style, buf);
-    }
-}
-
-static
-void
-current_lhs (symbol *sym, location loc, named_ref *ref)
-{
-  current_lhs_symbol = sym;
-  current_lhs_location = loc;
-  /* In order to simplify memory management, named references for lhs
-     are always assigned by deep copy into the current symbol_list
-     node.  This is because a single named-ref in the grammar may
-     result in several uses when the user factors lhs between several
-     rules using "|".  Therefore free the parser's original copy.  */
-  free (current_lhs_named_ref);
-  current_lhs_named_ref = ref;
-}
diff --git a/contrib/tools/bison/bison/src/scan-code.l b/contrib/tools/bison/bison/src/scan-code.l
deleted file mode 100644
index cced97bfea..0000000000
--- a/contrib/tools/bison/bison/src/scan-code.l
+++ /dev/null
@@ -1,865 +0,0 @@
-/* Bison Action Scanner                             -*- C -*-
-
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-%option debug nodefault noinput nounput noyywrap never-interactive
-%option prefix="code_" outfile="lex.yy.c"
-
-%{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef code_wrap
-#define code_wrap() 1
-
-#define FLEX_PREFIX(Id) code_ ## Id
-#include <src/flex-scanner.h>
-
-#include <src/complain.h>
-#include <src/reader.h>
-#include <src/getargs.h>
-#include <src/muscle-tab.h>
-#include <src/scan-code.h>
-#include <src/symlist.h>
-
-#include <c-ctype.h>
-#include <get-errno.h>
-#include <quote.h>
-
-/* The current calling start condition: SC_RULE_ACTION or
-   SC_SYMBOL_ACTION. */
-# define YY_DECL static char *code_lex (code_props *self, int sc_context)
-YY_DECL;
-
-#define YY_USER_ACTION  location_compute (loc, &loc->end, yytext, yyleng);
-
-static char *fetch_type_name (char *cp, char const **type_name,
-                              location dollar_loc);
-
-static void handle_action_dollar (symbol_list *rule, char *cp,
-                                  location dollar_loc);
-static void handle_action_at (symbol_list *rule, char *cp, location at_loc);
-
-/* A string to be pushed to obstack after dollar/at has been handled. */
-static char *ref_tail_fields;
-
-static location the_location;
-static location *loc = &the_location;
-
-/* A string representing the most recent translation.  */
-static char *last_string;
-
-/* True if an untyped $$ or $n was seen.  */
-static bool untyped_var_seen;
-
-%}
- /* C and C++ comments in code. */
-%x SC_COMMENT SC_LINE_COMMENT
- /* Strings and characters in code. */
-%x SC_STRING SC_CHARACTER
- /* Whether in a rule or symbol action.  Specifies the translation
-    of $ and @.  */
-%x SC_RULE_ACTION SC_SYMBOL_ACTION
-
-
-/* POSIX says that a tag must be both an id and a C union member, but
-   historically almost any character is allowed in a tag.  We disallow
-   NUL and newline, as this simplifies our implementation.  We allow
-   "->" as a means to dereference a pointer.  */
-tag      ([^\0\n>]|->)+
-
-/* Zero or more instances of backslash-newline.  Following GCC, allow
-   white space between the backslash and the newline.  */
-splice   (\\[ \f\t\v]*\n)*
-
-/* C style identifier. Must start with letter. Will be used for
-   named symbol references. Shall be kept synchronized with
-   scan-gram.l "letter" and "id". */
-letter    [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
-id        {letter}({letter}|[-0-9])*
-ref      -?[0-9]+|{id}|"["{id}"]"|"$"
-
-%%
-
-%{
-  /* This scanner is special: it is invoked only once, henceforth
-     is expected to return only once.  This initialization is
-     therefore done once per action to translate. */
-  aver (sc_context == SC_SYMBOL_ACTION
-        || sc_context == SC_RULE_ACTION
-        || sc_context == INITIAL);
-  BEGIN sc_context;
-%}
-
-  /*------------------------------------------------------------.
-  | Scanning a C comment.  The initial '/ *' is already eaten.  |
-  `------------------------------------------------------------*/
-
-<SC_COMMENT>
-{
-  "*"{splice}"/"  STRING_GROW; BEGIN sc_context;
-}
-
-
-  /*--------------------------------------------------------------.
-  | Scanning a line comment.  The initial '//' is already eaten.  |
-  `--------------------------------------------------------------*/
-
-<SC_LINE_COMMENT>
-{
-  "\n"           STRING_GROW; BEGIN sc_context;
-  {splice}       STRING_GROW;
-}
-
-
-  /*--------------------------------------------.
-  | Scanning user-code characters and strings.  |
-  `--------------------------------------------*/
-
-<SC_CHARACTER,SC_STRING>
-{
-  {splice}|\\{splice}.  STRING_GROW;
-}
-
-<SC_CHARACTER>
-{
-  "'"           STRING_GROW; BEGIN sc_context;
-}
-
-<SC_STRING>
-{
-  "\""          STRING_GROW; BEGIN sc_context;
-}
-
-
-<SC_RULE_ACTION,SC_SYMBOL_ACTION>
-{
-  "'"              STRING_GROW; BEGIN SC_CHARACTER;
-  "\""             STRING_GROW; BEGIN SC_STRING;
-  "/"{splice}"*"   STRING_GROW; BEGIN SC_COMMENT;
-  "/"{splice}"/"   STRING_GROW; BEGIN SC_LINE_COMMENT;
-
-  [$@]  {
-    complain (loc, Wother, _("stray '%s'"), yytext);
-    obstack_escape (&obstack_for_string, yytext);
-  }
-}
-
-<SC_RULE_ACTION>
-{
-  "$"("<"{tag}">")?{ref}  {
-    ref_tail_fields = NULL;
-    handle_action_dollar (self->rule, yytext, *loc);
-    if (ref_tail_fields)
-      obstack_sgrow (&obstack_for_string, ref_tail_fields);
-  }
-  "@"{ref} {
-    ref_tail_fields = NULL;
-    handle_action_at (self->rule, yytext, *loc);
-    if (ref_tail_fields)
-      obstack_sgrow (&obstack_for_string, ref_tail_fields);
-  }
-}
-
-<SC_SYMBOL_ACTION>
-{
-  "$"("<"{tag}">")?"$" {
-    const char *type_name = NULL;
-    fetch_type_name (yytext + 1, &type_name, *loc)[-1] = 0;
-    obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar(");
-    obstack_quote (&obstack_for_string, type_name);
-    obstack_sgrow (&obstack_for_string, ")[");
-    self->is_value_used = true;
-  }
-  "@$" {
-    obstack_sgrow (&obstack_for_string, "]b4_at_dollar[");
-    muscle_percent_define_ensure("locations", the_location, true);
-  }
-}
-
-
-<*>
-{
-  /* Escape M4 quoting characters in C code.  */
-  [$@\[\]]    obstack_escape (&obstack_for_string, yytext);
-
-  /* By default, grow the string obstack with the input.  */
-  .|\n        STRING_GROW;
-
- /* End of processing. */
-  <<EOF>>     STRING_FINISH; return last_string;
-}
-
-%%
-
-static inline bool
-is_dot_or_dash (char ch)
-{
-  return ch == '.' || ch == '-';
-}
-
-static inline bool
-contains_dot_or_dash (const char* p)
-{
-  for (; *p; ++p)
-    if (is_dot_or_dash (*p))
-      return true;
-  return false;
-}
-
-/* Defines a variant of a symbolic name resolution. */
-typedef struct
-{
-  /* Index in symbol list. */
-  unsigned symbol_index;
-
-  /* Matched symbol id and loc. */
-  uniqstr id;
-  location loc;
-
-  /* Hiding named reference. */
-  named_ref* hidden_by;
-
-  /* Error flags. May contain zero (no errors) or
-     a combination of VARIANT_* values. */
-  unsigned err;
-} variant;
-
-/* Set when the variant refers to a symbol hidden
-   by an explicit symbol reference. */
-#define VARIANT_HIDDEN (1 << 0)
-
-/* Set when the variant refers to a symbol containing
-   dots or dashes. Will require explicit bracketing. */
-#define VARIANT_BAD_BRACKETING (1 << 1)
-
-/* Set when the variant refers to a symbol which is
-   not visible from current midrule. */
-#define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2)
-
-static variant *variant_table = NULL;
-static unsigned variant_table_size = 0;
-static unsigned variant_count = 0;
-
-static variant *
-variant_table_grow (void)
-{
-  ++variant_count;
-  if (variant_count > variant_table_size)
-    {
-      while (variant_count > variant_table_size)
-        variant_table_size = 2 * variant_table_size + 3;
-      variant_table = xnrealloc (variant_table, variant_table_size,
-                                 sizeof *variant_table);
-    }
-  return &variant_table[variant_count - 1];
-}
-
-static void
-variant_table_free (void)
-{
-  free (variant_table);
-  variant_table = NULL;
-  variant_table_size = variant_count = 0;
-}
-
-static char *
-find_prefix_end (const char *prefix, char *begin, char *end)
-{
-  char *ptr = begin;
-
-  for (; *prefix && ptr != end; ++prefix, ++ptr)
-    if (*prefix != *ptr)
-      return 0;
-
-  if (*prefix)
-    return 0;
-
-  return ptr;
-}
-
-static variant *
-variant_add (uniqstr id, location id_loc, unsigned symbol_index,
-             char *cp, char *cp_end, bool explicit_bracketing)
-{
-  char *prefix_end;
-
-  prefix_end = find_prefix_end (id, cp, cp_end);
-  if (prefix_end &&
-      (prefix_end == cp_end ||
-       (!explicit_bracketing && is_dot_or_dash (*prefix_end))))
-    {
-      variant *r = variant_table_grow ();
-      r->symbol_index = symbol_index;
-      r->id = id;
-      r->loc = id_loc;
-      r->hidden_by = NULL;
-      r->err = 0;
-      return r;
-    }
-  else
-    return NULL;
-}
-
-static const char *
-get_at_spec(unsigned symbol_index)
-{
-  static char at_buf[20];
-  if (symbol_index == 0)
-    strcpy (at_buf, "$$");
-  else
-    snprintf (at_buf, sizeof at_buf, "$%u", symbol_index);
-  return at_buf;
-}
-
-static void
-show_sub_message (warnings warning,
-                  const char* cp, bool explicit_bracketing,
-                  int midrule_rhs_index, char dollar_or_at,
-                  unsigned indent, const variant *var)
-{
-  const char *at_spec = get_at_spec (var->symbol_index);
-
-  if (var->err == 0)
-    complain_indent (&var->loc, warning, &indent,
-                     _("refers to: %c%s at %s"), dollar_or_at,
-                     var->id, at_spec);
-  else
-    {
-      static struct obstack msg_buf;
-      const char *tail = explicit_bracketing ? "" : cp + strlen (var->id);
-      const char *id = var->hidden_by ? var->hidden_by->id : var->id;
-      location id_loc = var->hidden_by ? var->hidden_by->loc : var->loc;
-
-      /* Create the explanation message. */
-      obstack_init (&msg_buf);
-
-      obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
-      if (contains_dot_or_dash (id))
-        obstack_printf (&msg_buf, "[%s]", id);
-      else
-        obstack_sgrow (&msg_buf, id);
-      obstack_sgrow (&msg_buf, tail);
-
-      if (var->err & VARIANT_HIDDEN)
-        {
-          obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
-          if (contains_dot_or_dash (var->id))
-            obstack_printf (&msg_buf, "[%s]", var->id);
-          else
-            obstack_sgrow (&msg_buf, var->id);
-          obstack_sgrow (&msg_buf, tail);
-        }
-
-      obstack_printf (&msg_buf, _(" at %s"), at_spec);
-
-      if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
-        obstack_printf (&msg_buf,
-                        _(", cannot be accessed from mid-rule action at $%d"),
-                        midrule_rhs_index);
-
-      complain_indent (&id_loc, warning, &indent, "%s",
-                        obstack_finish0 (&msg_buf));
-      obstack_free (&msg_buf, 0);
-    }
-}
-
-static void
-show_sub_messages (warnings warning,
-                   const char* cp, bool explicit_bracketing,
-                   int midrule_rhs_index, char dollar_or_at,
-                   unsigned indent)
-{
-  unsigned i;
-
-  for (i = 0; i < variant_count; ++i)
-    show_sub_message (warning | silent,
-                      cp, explicit_bracketing,
-                      midrule_rhs_index, dollar_or_at,
-                      indent, &variant_table[i]);
-}
-
-/* Returned from "parse_ref" when the reference
-   is inappropriate. */
-#define INVALID_REF (INT_MIN)
-
-/* Returned from "parse_ref" when the reference
-   points to LHS ($$) of the current rule or midrule. */
-#define LHS_REF (INT_MIN + 1)
-
-/* Parse named or positional reference. In case of positional
-   references, can return negative values for $-n "deep" stack
-   accesses. */
-static long int
-parse_ref (char *cp, symbol_list *rule, int rule_length,
-           int midrule_rhs_index, char *text, location text_loc,
-           char dollar_or_at)
-{
-  symbol_list *l;
-  char *cp_end;
-  bool explicit_bracketing;
-  unsigned i;
-  unsigned valid_variants = 0;
-  unsigned valid_variant_index = 0;
-
-  if ('$' == *cp)
-    return LHS_REF;
-
-  if (c_isdigit (*cp) || (*cp == '-' && c_isdigit (* (cp + 1))))
-    {
-      long int num = strtol (cp, &cp, 10);
-      if (1 - INT_MAX + rule_length <= num && num <= rule_length)
-        return num;
-      else
-        {
-          complain (&text_loc, complaint, _("integer out of range: %s"),
-                    quote (text));
-          return INVALID_REF;
-        }
-    }
-
-  if ('[' == *cp)
-    {
-      /* Ignore the brackets. */
-      char *p;
-      for (p = ++cp; *p != ']'; ++p)
-        continue;
-      cp_end = p;
-
-      explicit_bracketing = true;
-    }
-  else
-    {
-      /* Take all characters of the name. */
-      char* p;
-      for (p = cp; *p; ++p)
-        if (is_dot_or_dash (*p))
-          {
-            ref_tail_fields = p;
-            break;
-          }
-      for (p = cp; *p; ++p)
-        continue;
-      cp_end = p;
-
-      explicit_bracketing = false;
-    }
-
-  /* Add all relevant variants. */
-  {
-    unsigned symbol_index;
-    variant_count = 0;
-    for (symbol_index = 0, l = rule; !symbol_list_null (l);
-         ++symbol_index, l = l->next)
-      {
-        variant *var;
-        if (l->content_type != SYMLIST_SYMBOL)
-          continue;
-
-        var = variant_add (l->content.sym->tag, l->sym_loc,
-                           symbol_index, cp, cp_end, explicit_bracketing);
-        if (var && l->named_ref)
-          var->hidden_by = l->named_ref;
-
-        if (l->named_ref)
-          variant_add (l->named_ref->id, l->named_ref->loc,
-                       symbol_index, cp, cp_end, explicit_bracketing);
-      }
-  }
-
-  /* Check errors. */
-  for (i = 0; i < variant_count; ++i)
-    {
-      variant *var = &variant_table[i];
-      unsigned symbol_index = var->symbol_index;
-
-      /* Check visibility from mid-rule actions. */
-      if (midrule_rhs_index != 0
-          && (symbol_index == 0 || midrule_rhs_index < symbol_index))
-        var->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE;
-
-      /* Check correct bracketing. */
-      if (!explicit_bracketing && contains_dot_or_dash (var->id))
-        var->err |= VARIANT_BAD_BRACKETING;
-
-      /* Check using of hidden symbols. */
-      if (var->hidden_by)
-        var->err |= VARIANT_HIDDEN;
-
-      if (!var->err)
-        {
-          valid_variant_index = i;
-          ++valid_variants;
-        }
-    }
-
-  switch (valid_variants)
-    {
-    case 0:
-      {
-        unsigned len = (explicit_bracketing || !ref_tail_fields) ?
-          cp_end - cp : ref_tail_fields - cp;
-        unsigned indent = 0;
-
-        complain_indent (&text_loc, complaint, &indent,
-                         _("invalid reference: %s"), quote (text));
-        indent += SUB_INDENT;
-        if (len == 0)
-          {
-            location sym_loc = text_loc;
-            sym_loc.start.column += 1;
-            sym_loc.end = sym_loc.start;
-            complain_indent (&sym_loc, complaint, &indent,
-                             _("syntax error after '%c', expecting integer, "
-                               "letter, '_', '[', or '$'"),
-                             dollar_or_at);
-          }
-        else if (midrule_rhs_index)
-          complain_indent (&rule->location, complaint, &indent,
-                           _("symbol not found in production before $%d: "
-                             "%.*s"),
-                           midrule_rhs_index, len, cp);
-        else
-          complain_indent (&rule->location, complaint, &indent,
-                           _("symbol not found in production: %.*s"),
-                           len, cp);
-
-        if (variant_count > 0)
-          show_sub_messages (complaint,
-                             cp, explicit_bracketing, midrule_rhs_index,
-                             dollar_or_at, indent);
-        return INVALID_REF;
-      }
-    case 1:
-      {
-        unsigned indent = 0;
-        if (variant_count > 1)
-          {
-            complain_indent (&text_loc, Wother, &indent,
-                             _("misleading reference: %s"), quote (text));
-            show_sub_messages (Wother,
-                               cp, explicit_bracketing, midrule_rhs_index,
-                               dollar_or_at, indent + SUB_INDENT);
-          }
-        {
-          unsigned symbol_index =
-            variant_table[valid_variant_index].symbol_index;
-          return (symbol_index == midrule_rhs_index) ? LHS_REF : symbol_index;
-        }
-      }
-    case 2:
-    default:
-      {
-        unsigned indent = 0;
-        complain_indent (&text_loc, complaint, &indent,
-                         _("ambiguous reference: %s"), quote (text));
-        show_sub_messages (complaint,
-                           cp, explicit_bracketing, midrule_rhs_index,
-                           dollar_or_at, indent + SUB_INDENT);
-        return INVALID_REF;
-      }
-    }
-
-  /* Not reachable. */
-  return INVALID_REF;
-}
-
-/* Keeps track of the maximum number of semantic values to the left of
-   a handle (those referenced by $0, $-1, etc.) are required by the
-   semantic actions of this grammar. */
-int max_left_semantic_context = 0;
-
-
-/* If CP points to a typename (i.e., <.*?>), set TYPE_NAME to its
-   beginning (i.e., after the opening "<", and return the pointer
-   immediately after it.  */
-
-static
-char *
-fetch_type_name (char *cp, char const **type_name,
-                 location dollar_loc)
-{
-  if (*cp == '<')
-    {
-      *type_name = ++cp;
-      /* Series of non-'>' or "->".  */
-      while (*cp != '>' || cp[-1] == '-')
-        ++cp;
-
-      /* The '>' symbol will be later replaced by '\0'. Original
-         'text' is needed for error messages. */
-      ++cp;
-      if (untyped_var_seen)
-        complain (&dollar_loc, complaint,
-                  _("explicit type given in untyped grammar"));
-      tag_seen = true;
-    }
-  return cp;
-}
-
-/*------------------------------------------------------------------.
-| TEXT is pointing to a wannabee semantic value (i.e., a '$').      |
-|                                                                   |
-| Possible inputs: $[<TYPENAME>]($|integer)                         |
-|                                                                   |
-| Output to OBSTACK_FOR_STRING a reference to this semantic value.  |
-`------------------------------------------------------------------*/
-
-static void
-handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
-{
-  char const *type_name = NULL;
-  char *cp = text + 1;
-  symbol_list *effective_rule;
-  int effective_rule_length;
-  int n;
-
-  if (rule->midrule_parent_rule)
-    {
-      effective_rule = rule->midrule_parent_rule;
-      effective_rule_length = rule->midrule_parent_rhs_index - 1;
-    }
-  else
-    {
-      effective_rule = rule;
-      effective_rule_length = symbol_list_length (rule->next);
-    }
-
-  /* Get the type name if explicit. */
-  cp = fetch_type_name (cp, &type_name, dollar_loc);
-
-  n = parse_ref (cp, effective_rule, effective_rule_length,
-                 rule->midrule_parent_rhs_index, text, dollar_loc, '$');
-
-  /* End type_name. */
-  if (type_name)
-    cp[-1] = '\0';
-
-  switch (n)
-    {
-    case INVALID_REF:
-      break;
-
-    case LHS_REF:
-      if (!type_name)
-        type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0);
-
-      if (!type_name)
-        {
-          if (union_seen | tag_seen)
-            {
-              if (rule->midrule_parent_rule)
-                complain (&dollar_loc, complaint,
-                             _("$$ for the midrule at $%d of %s"
-                               " has no declared type"),
-                             rule->midrule_parent_rhs_index,
-                             quote (effective_rule->content.sym->tag));
-              else
-                complain (&dollar_loc, complaint,
-                          _("$$ of %s has no declared type"),
-                          quote (rule->content.sym->tag));
-            }
-          else
-            untyped_var_seen = true;
-        }
-
-      obstack_sgrow (&obstack_for_string, "]b4_lhs_value(");
-      obstack_quote (&obstack_for_string, type_name);
-      obstack_sgrow (&obstack_for_string, ")[");
-      rule->action_props.is_value_used = true;
-      break;
-
-    default:
-      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);
-      if (!type_name)
-        {
-          if (union_seen | tag_seen)
-            complain (&dollar_loc, complaint,
-                      _("$%s of %s has no declared type"), cp,
-                      quote (effective_rule->content.sym->tag));
-          else
-            untyped_var_seen = true;
-        }
-
-      obstack_printf (&obstack_for_string,
-                      "]b4_rhs_value(%d, %d, ", effective_rule_length, n);
-      obstack_quote (&obstack_for_string, type_name);
-      obstack_sgrow (&obstack_for_string, ")[");
-      if (n > 0)
-        symbol_list_n_get (effective_rule, n)->action_props.is_value_used =
-          true;
-      break;
-    }
-}
-
-
-/*------------------------------------------------------.
-| TEXT is a location token (i.e., a '@...').  Output to |
-| OBSTACK_FOR_STRING a reference to this location.      |
-`------------------------------------------------------*/
-
-static void
-handle_action_at (symbol_list *rule, char *text, location at_loc)
-{
-  char *cp = text + 1;
-  symbol_list *effective_rule;
-  int effective_rule_length;
-  int n;
-
-  if (rule->midrule_parent_rule)
-    {
-      effective_rule = rule->midrule_parent_rule;
-      effective_rule_length = rule->midrule_parent_rhs_index - 1;
-    }
-  else
-    {
-      effective_rule = rule;
-      effective_rule_length = symbol_list_length (rule->next);
-    }
-
-  muscle_percent_define_ensure("locations", at_loc, true);
-
-  n = parse_ref (cp, effective_rule, effective_rule_length,
-                       rule->midrule_parent_rhs_index, text, at_loc, '@');
-  switch (n)
-    {
-    case INVALID_REF:
-      break;
-
-    case LHS_REF:
-      obstack_sgrow (&obstack_for_string, "]b4_lhs_location[");
-      break;
-
-    default:
-      obstack_printf (&obstack_for_string, "]b4_rhs_location(%d, %d)[",
-                      effective_rule_length, n);
-      break;
-    }
-}
-
-
-/*-------------------------.
-| Initialize the scanner.  |
-`-------------------------*/
-
-/* Translate the dollars and ats in \a self, in the context \a sc_context
-   (SC_RULE_ACTION, SC_SYMBOL_ACTION, INITIAL).  */
-
-static char const *
-translate_action (code_props *self, int sc_context)
-{
-  char *res;
-  static bool initialized = false;
-  if (!initialized)
-    {
-      obstack_init (&obstack_for_string);
-      yy_flex_debug = 0;
-      initialized = true;
-    }
-
-  loc->start = loc->end = self->location.start;
-  yy_switch_to_buffer (yy_scan_string (self->code));
-  res = code_lex (self, sc_context);
-  yy_delete_buffer (YY_CURRENT_BUFFER);
-
-  return res;
-}
-
-/*------------------------------------------------------------------------.
-| Implementation of the public interface as documented in "scan-code.h".  |
-`------------------------------------------------------------------------*/
-
-void
-code_props_none_init (code_props *self)
-{
-  *self = code_props_none;
-}
-
-code_props code_props_none = CODE_PROPS_NONE_INIT;
-
-void
-code_props_plain_init (code_props *self, char const *code,
-                       location code_loc)
-{
-  code_props_none_init (self);
-  self->kind = CODE_PROPS_PLAIN;
-  self->code = code;
-  self->location = code_loc;
-}
-
-void
-code_props_symbol_action_init (code_props *self, char const *code,
-                               location code_loc)
-{
-  code_props_none_init (self);
-  self->kind = CODE_PROPS_SYMBOL_ACTION;
-  self->code = code;
-  self->location = code_loc;
-}
-
-void
-code_props_rule_action_init (code_props *self, char const *code,
-                             location code_loc, symbol_list *rule,
-                             named_ref *name, bool is_predicate)
-{
-  code_props_none_init (self);
-  self->kind = CODE_PROPS_RULE_ACTION;
-  self->code = code;
-  self->location = code_loc;
-  self->rule = rule;
-  self->named_ref = name;
-  self->is_predicate = is_predicate;
-}
-
-void
-code_props_translate_code (code_props *self)
-{
-  switch (self->kind)
-    {
-      case CODE_PROPS_NONE:
-        break;
-      case CODE_PROPS_PLAIN:
-        self->code = translate_action (self, INITIAL);
-        break;
-      case CODE_PROPS_SYMBOL_ACTION:
-        self->code = translate_action (self, SC_SYMBOL_ACTION);
-        break;
-      case CODE_PROPS_RULE_ACTION:
-        self->code = translate_action (self, SC_RULE_ACTION);
-        break;
-    }
-}
-
-void
-code_scanner_last_string_free (void)
-{
-  STRING_FREE;
-}
-
-void
-code_scanner_free (void)
-{
-  obstack_free (&obstack_for_string, 0);
-  variant_table_free ();
-
-  /* Reclaim Flex's buffers.  */
-  yylex_destroy ();
-}
diff --git a/contrib/tools/bison/bison/src/scan-gram.l b/contrib/tools/bison/bison/src/scan-gram.l
deleted file mode 100644
index 665e80de64..0000000000
--- a/contrib/tools/bison/bison/src/scan-gram.l
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* Bison Grammar Scanner                             -*- C -*-
-
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-%option debug nodefault noinput noyywrap never-interactive
-%option prefix="gram_" outfile="lex.yy.c"
-
-%{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef gram_wrap
-#define gram_wrap() 1
-
-#define FLEX_PREFIX(Id) gram_ ## Id
-#include <src/flex-scanner.h>
-
-#include <src/complain.h>
-#include <src/files.h>
-#include <src/getargs.h>
-#include <src/gram.h>
-#include <quotearg.h>
-#include <src/reader.h>
-#include <src/uniqstr.h>
-
-#include <c-ctype.h>
-#include <mbswidth.h>
-#include <quote.h>
-
-#include <src/scan-gram.h>
-
-#define YY_DECL GRAM_LEX_DECL
-
-#define YY_USER_INIT                                    \
-   code_start = scanner_cursor = loc->start;            \
-
-/* Location of scanner cursor.  */
-static boundary scanner_cursor;
-
-#define YY_USER_ACTION  location_compute (loc, &scanner_cursor, yytext, yyleng);
-
-static size_t no_cr_read (FILE *, char *, size_t);
-#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
-
-#define RETURN_PERCENT_PARAM(Value)                     \
-  RETURN_VALUE(PERCENT_PARAM, param, param_ ## Value)
-
-#define RETURN_PERCENT_FLAG(Value)                              \
-  RETURN_VALUE(PERCENT_FLAG, uniqstr, uniqstr_new (Value))
-
-#define RETURN_VALUE(Token, Field, Value)       \
-  do {                                          \
-    val->Field = Value;                         \
-    return Token;                               \
-  } while (0)
-
-#define ROLLBACK_CURRENT_TOKEN                                  \
-  do {                                                          \
-    scanner_cursor.column -= mbsnwidth (yytext, yyleng, 0);     \
-    yyless (0);                                                 \
-  } while (0)
-
-#define DEPRECATED(Msg)                                         \
-  do {                                                          \
-    size_t i;                                                   \
-    deprecated_directive (loc, yytext, Msg);                    \
-    scanner_cursor.column -= mbsnwidth (Msg, strlen (Msg), 0);  \
-    for (i = strlen (Msg); i != 0; --i)                         \
-      unput (Msg[i - 1]);                                       \
-  } while (0)
-
-/* A string representing the most recently saved token.  */
-static char *last_string;
-
-/* Bracketed identifier. */
-static uniqstr bracketed_id_str = 0;
-static location bracketed_id_loc;
-static boundary bracketed_id_start;
-static int bracketed_id_context_state = 0;
-
-void
-gram_scanner_last_string_free (void)
-{
-  STRING_FREE;
-}
-
-static void handle_syncline (char *, location);
-static unsigned long int scan_integer (char const *p, int base, location loc);
-static int convert_ucn_to_byte (char const *hex_text);
-static void unexpected_eof (boundary, char const *);
-static void unexpected_newline (boundary, char const *);
-
-%}
- /* A C-like comment in directives/rules. */
-%x SC_YACC_COMMENT
- /* Strings and characters in directives/rules. */
-%x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
- /* A identifier was just read in directives/rules.  Special state
-    to capture the sequence 'identifier :'. */
-%x SC_AFTER_IDENTIFIER
-
- /* POSIX says that a tag must be both an id and a C union member, but
-    historically almost any character is allowed in a tag.  We
-    disallow NUL, as this simplifies our implementation.  We match
-    angle brackets in nested pairs: several languages use them for
-    generics/template types.  */
-%x SC_TAG
-
- /* Four types of user code:
-    - prologue (code between '%{' '%}' in the first section, before %%);
-    - actions, printers, union, etc, (between braced in the middle section);
-    - epilogue (everything after the second %%).
-    - predicate (code between '%?{' and '{' in middle section); */
-%x SC_PROLOGUE SC_BRACED_CODE SC_EPILOGUE SC_PREDICATE
- /* C and C++ comments in code. */
-%x SC_COMMENT SC_LINE_COMMENT
- /* Strings and characters in code. */
-%x SC_STRING SC_CHARACTER
- /* Bracketed identifiers support. */
-%x SC_BRACKETED_ID SC_RETURN_BRACKETED_ID
-
-letter    [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
-notletter [^.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]{-}[%\{]
-id        {letter}({letter}|[-0-9])*
-int       [0-9]+
-
-/* Zero or more instances of backslash-newline.  Following GCC, allow
-   white space between the backslash and the newline.  */
-splice   (\\[ \f\t\v]*\n)*
-
-/* An equal sign, with optional leading whitespaces. This is used in some
-   deprecated constructs. */
-eqopt    ([[:space:]]*=)?
-
-%%
-%{
-  /* Nesting level.  Either for nested braces, or nested angle brackets
-     (but not mixed).  */
-  int nesting PACIFY_CC (= 0);
-
-  /* Parent context state, when applicable.  */
-  int context_state PACIFY_CC (= 0);
-
-  /* Location of most recent identifier, when applicable.  */
-  location id_loc PACIFY_CC (= empty_location);
-
-  /* Where containing code started, when applicable.  Its initial
-     value is relevant only when yylex is invoked in the SC_EPILOGUE
-     start condition.  */
-  boundary code_start = scanner_cursor;
-
-  /* Where containing comment or string or character literal started,
-     when applicable.  */
-  boundary token_start PACIFY_CC (= scanner_cursor);
-%}
-
-
-  /*-----------------------.
-  | Scanning white space.  |
-  `-----------------------*/
-
-<INITIAL,SC_AFTER_IDENTIFIER,SC_BRACKETED_ID,SC_RETURN_BRACKETED_ID>
-{
-  /* Comments and white space.  */
-  "," {
-     complain (loc, Wother, _("stray ',' treated as white space"));
-  }
-  [ \f\n\t\v]  |
-  "//".*       continue;
-  "/*" {
-    token_start = loc->start;
-    context_state = YY_START;
-    BEGIN SC_YACC_COMMENT;
-  }
-
-  /* #line directives are not documented, and may be withdrawn or
-     modified in future versions of Bison.  */
-  ^"#line "{int}(" \"".*"\"")?"\n" {
-    handle_syncline (yytext + sizeof "#line " - 1, *loc);
-  }
-}
-
-
-  /*----------------------------.
-  | Scanning Bison directives.  |
-  `----------------------------*/
-
-  /* For directives that are also command line options, the regex must be
-        "%..."
-     after "[-_]"s are removed, and the directive must match the --long
-     option name, with a single string argument.  Otherwise, add exceptions
-     to ../build-aux/cross-options.pl.  */
-
-<INITIAL>
-{
-  "%binary"                         return PERCENT_NONASSOC;
-  "%code"                           return PERCENT_CODE;
-  "%debug"                          RETURN_PERCENT_FLAG("parse.trace");
-  "%default-prec"                   return PERCENT_DEFAULT_PREC;
-  "%define"                         return PERCENT_DEFINE;
-  "%defines"                        return PERCENT_DEFINES;
-  "%destructor"                     return PERCENT_DESTRUCTOR;
-  "%dprec"                          return PERCENT_DPREC;
-  "%empty"                          return PERCENT_EMPTY;
-  "%error-verbose"                  return PERCENT_ERROR_VERBOSE;
-  "%expect"                         return PERCENT_EXPECT;
-  "%expect-rr"                      return PERCENT_EXPECT_RR;
-  "%file-prefix"                    return PERCENT_FILE_PREFIX;
-  "%fixed-output-files"             return PERCENT_YACC;
-  "%initial-action"                 return PERCENT_INITIAL_ACTION;
-  "%glr-parser"                     return PERCENT_GLR_PARSER;
-  "%language"                       return PERCENT_LANGUAGE;
-  "%left"                           return PERCENT_LEFT;
-  "%lex-param"                      RETURN_PERCENT_PARAM(lex);
-  "%locations"                      RETURN_PERCENT_FLAG("locations");
-  "%merge"                          return PERCENT_MERGE;
-  "%name-prefix"                    return PERCENT_NAME_PREFIX;
-  "%no-default-prec"                return PERCENT_NO_DEFAULT_PREC;
-  "%no-lines"                       return PERCENT_NO_LINES;
-  "%nonassoc"                       return PERCENT_NONASSOC;
-  "%nondeterministic-parser"        return PERCENT_NONDETERMINISTIC_PARSER;
-  "%nterm"                          return PERCENT_NTERM;
-  "%output"                         return PERCENT_OUTPUT;
-  "%param"                          RETURN_PERCENT_PARAM(both);
-  "%parse-param"                    RETURN_PERCENT_PARAM(parse);
-  "%prec"                           return PERCENT_PREC;
-  "%precedence"                     return PERCENT_PRECEDENCE;
-  "%printer"                        return PERCENT_PRINTER;
-  "%pure-parser"                    RETURN_PERCENT_FLAG("api.pure");
-  "%require"                        return PERCENT_REQUIRE;
-  "%right"                          return PERCENT_RIGHT;
-  "%skeleton"                       return PERCENT_SKELETON;
-  "%start"                          return PERCENT_START;
-  "%term"                           return PERCENT_TOKEN;
-  "%token"                          return PERCENT_TOKEN;
-  "%token-table"                    return PERCENT_TOKEN_TABLE;
-  "%type"                           return PERCENT_TYPE;
-  "%union"                          return PERCENT_UNION;
-  "%verbose"                        return PERCENT_VERBOSE;
-  "%yacc"                           return PERCENT_YACC;
-
-  /* deprecated */
-  "%default"[-_]"prec"              DEPRECATED("%default-prec");
-  "%error"[-_]"verbose"             DEPRECATED("%define parse.error verbose");
-  "%expect"[-_]"rr"                 DEPRECATED("%expect-rr");
-  "%file-prefix"{eqopt}             DEPRECATED("%file-prefix");
-  "%fixed"[-_]"output"[-_]"files"   DEPRECATED("%fixed-output-files");
-  "%name"[-_]"prefix"{eqopt}        DEPRECATED("%name-prefix");
-  "%no"[-_]"default"[-_]"prec"      DEPRECATED("%no-default-prec");
-  "%no"[-_]"lines"                  DEPRECATED("%no-lines");
-  "%output"{eqopt}                  DEPRECATED("%output");
-  "%pure"[-_]"parser"               DEPRECATED("%pure-parser");
-  "%token"[-_]"table"               DEPRECATED("%token-table");
-
-  "%"{id}|"%"{notletter}([[:graph:]])+ {
-    complain (loc, complaint, _("invalid directive: %s"), quote (yytext));
-  }
-
-  "="                     return EQUAL;
-  "|"                     return PIPE;
-  ";"                     return SEMICOLON;
-
-  {id} {
-    val->uniqstr = uniqstr_new (yytext);
-    id_loc = *loc;
-    bracketed_id_str = NULL;
-    BEGIN SC_AFTER_IDENTIFIER;
-  }
-
-  {int} {
-    val->integer = scan_integer (yytext, 10, *loc);
-    return INT;
-  }
-  0[xX][0-9abcdefABCDEF]+ {
-    val->integer = scan_integer (yytext, 16, *loc);
-    return INT;
-  }
-
-  /* Identifiers may not start with a digit.  Yet, don't silently
-     accept "1FOO" as "1 FOO".  */
-  {int}{id} {
-    complain (loc, complaint, _("invalid identifier: %s"), quote (yytext));
-  }
-
-  /* Characters.  */
-  "'"         token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
-
-  /* Strings. */
-  "\""        token_start = loc->start; BEGIN SC_ESCAPED_STRING;
-
-  /* Prologue. */
-  "%{"        code_start = loc->start; BEGIN SC_PROLOGUE;
-
-  /* Code in between braces.  */
-  "{" {
-    STRING_GROW;
-    nesting = 0;
-    code_start = loc->start;
-    BEGIN SC_BRACED_CODE;
-  }
-
-  /* Semantic predicate. */
-  "%?"[ \f\n\t\v]*"{" {
-    nesting = 0;
-    code_start = loc->start;
-    BEGIN SC_PREDICATE;
-  }
-
-  /* A type. */
-  "<*>"       return TAG_ANY;
-  "<>"        return TAG_NONE;
-  "<"         {
-    nesting = 0;
-    token_start = loc->start;
-    BEGIN SC_TAG;
-  }
-
-  "%%" {
-    static int percent_percent_count;
-    if (++percent_percent_count == 2)
-      BEGIN SC_EPILOGUE;
-    return PERCENT_PERCENT;
-  }
-
-  "[" {
-    bracketed_id_str = NULL;
-    bracketed_id_start = loc->start;
-    bracketed_id_context_state = YY_START;
-    BEGIN SC_BRACKETED_ID;
-  }
-
-  [^\[%A-Za-z0-9_<>{}\"\'*;|=/, \f\n\t\v]+|. {
-    complain (loc, complaint, "%s: %s",
-              ngettext ("invalid character", "invalid characters", yyleng),
-              quote_mem (yytext, yyleng));
-  }
-
-  <<EOF>> {
-    loc->start = loc->end = scanner_cursor;
-    yyterminate ();
-  }
-}
-
-
-  /*--------------------------------------------------------------.
-  | Supporting \0 complexifies our implementation for no expected |
-  | added value.                                                  |
-  `--------------------------------------------------------------*/
-
-<SC_ESCAPED_CHARACTER,SC_ESCAPED_STRING,SC_TAG>
-{
-  \0        complain (loc, complaint, _("invalid null character"));
-}
-
-
-  /*-----------------------------------------------------------------.
-  | Scanning after an identifier, checking whether a colon is next.  |
-  `-----------------------------------------------------------------*/
-
-<SC_AFTER_IDENTIFIER>
-{
-  "[" {
-    if (bracketed_id_str)
-      {
-        ROLLBACK_CURRENT_TOKEN;
-        BEGIN SC_RETURN_BRACKETED_ID;
-        *loc = id_loc;
-        return ID;
-      }
-    else
-      {
-        bracketed_id_start = loc->start;
-        bracketed_id_context_state = YY_START;
-        BEGIN SC_BRACKETED_ID;
-      }
-  }
-  ":" {
-    BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
-    *loc = id_loc;
-    return ID_COLON;
-  }
-  . {
-    ROLLBACK_CURRENT_TOKEN;
-    BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
-    *loc = id_loc;
-    return ID;
-  }
-  <<EOF>> {
-    BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
-    *loc = id_loc;
-    return ID;
-  }
-}
-
-  /*--------------------------------.
-  | Scanning bracketed identifiers. |
-  `--------------------------------*/
-
-<SC_BRACKETED_ID>
-{
-  {id} {
-    if (bracketed_id_str)
-      {
-        complain (loc, complaint,
-                  _("unexpected identifier in bracketed name: %s"),
-                  quote (yytext));
-      }
-    else
-      {
-        bracketed_id_str = uniqstr_new (yytext);
-        bracketed_id_loc = *loc;
-      }
-  }
-  "]" {
-    BEGIN bracketed_id_context_state;
-    if (bracketed_id_str)
-      {
-        if (INITIAL == bracketed_id_context_state)
-          {
-            val->uniqstr = bracketed_id_str;
-            bracketed_id_str = 0;
-            *loc = bracketed_id_loc;
-            return BRACKETED_ID;
-          }
-      }
-    else
-      complain (loc, complaint, _("an identifier expected"));
-  }
-
-  [^\].A-Za-z0-9_/ \f\n\t\v]+|. {
-    complain (loc, complaint, "%s: %s",
-              ngettext ("invalid character in bracketed name",
-                        "invalid characters in bracketed name", yyleng),
-              quote_mem (yytext, yyleng));
-  }
-
-  <<EOF>> {
-    BEGIN bracketed_id_context_state;
-    unexpected_eof (bracketed_id_start, "]");
-  }
-}
-
-<SC_RETURN_BRACKETED_ID>
-{
-  . {
-    ROLLBACK_CURRENT_TOKEN;
-    val->uniqstr = bracketed_id_str;
-    bracketed_id_str = 0;
-    *loc = bracketed_id_loc;
-    BEGIN INITIAL;
-    return BRACKETED_ID;
-  }
-}
-
-
-  /*---------------------------------------------------------------.
-  | Scanning a Yacc comment.  The initial '/ *' is already eaten.  |
-  `---------------------------------------------------------------*/
-
-<SC_YACC_COMMENT>
-{
-  "*/"     BEGIN context_state;
-  .|\n     continue;
-  <<EOF>>  unexpected_eof (token_start, "*/"); BEGIN context_state;
-}
-
-
-  /*------------------------------------------------------------.
-  | Scanning a C comment.  The initial '/ *' is already eaten.  |
-  `------------------------------------------------------------*/
-
-<SC_COMMENT>
-{
-  "*"{splice}"/"  STRING_GROW; BEGIN context_state;
-  <<EOF>>         unexpected_eof (token_start, "*/"); BEGIN context_state;
-}
-
-
-  /*--------------------------------------------------------------.
-  | Scanning a line comment.  The initial '//' is already eaten.  |
-  `--------------------------------------------------------------*/
-
-<SC_LINE_COMMENT>
-{
-  "\n"           STRING_GROW; BEGIN context_state;
-  {splice}       STRING_GROW;
-  <<EOF>>        BEGIN context_state;
-}
-
-
-  /*------------------------------------------------.
-  | Scanning a Bison string, including its escapes. |
-  | The initial quote is already eaten.             |
-  `------------------------------------------------*/
-
-<SC_ESCAPED_STRING>
-{
-  "\"" {
-    STRING_FINISH;
-    loc->start = token_start;
-    val->code = last_string;
-    BEGIN INITIAL;
-    return STRING;
-  }
-  <<EOF>>   unexpected_eof (token_start, "\"");
-  "\n"      unexpected_newline (token_start, "\"");
-}
-
-  /*----------------------------------------------------------.
-  | Scanning a Bison character literal, decoding its escapes. |
-  | The initial quote is already eaten.                       |
-  `----------------------------------------------------------*/
-
-<SC_ESCAPED_CHARACTER>
-{
-  "'" {
-    STRING_FINISH;
-    loc->start = token_start;
-    val->character = last_string[0];
-
-    /* FIXME: Eventually, make these errors.  */
-    if (last_string[0] == '\0')
-    {
-      complain (loc, Wother, _("empty character literal"));
-      /* '\0' seems dangerous even if we are about to complain.  */
-      val->character = '\'';
-    }
-    else if (last_string[1] != '\0')
-      complain (loc, Wother,
-                _("extra characters in character literal"));
-    STRING_FREE;
-    BEGIN INITIAL;
-    return CHAR;
-  }
-  "\n"      unexpected_newline (token_start, "'");
-  <<EOF>>   unexpected_eof (token_start, "'");
-}
-
-
-
-  /*--------------------------------------------------------------.
-  | Scanning a tag.  The initial angle bracket is already eaten.  |
-  `--------------------------------------------------------------*/
-
-<SC_TAG>
-{
-  ">" {
-    --nesting;
-    if (nesting < 0)
-      {
-        STRING_FINISH;
-        loc->start = token_start;
-        val->uniqstr = uniqstr_new (last_string);
-        STRING_FREE;
-        BEGIN INITIAL;
-        return TAG;
-      }
-    STRING_GROW;
-  }
-
-  ([^<>]|->)+ STRING_GROW;
-  "<"+   STRING_GROW; nesting += yyleng;
-
-  <<EOF>>   unexpected_eof (token_start, ">");
-}
-
-  /*----------------------------.
-  | Decode escaped characters.  |
-  `----------------------------*/
-
-<SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>
-{
-  \\[0-7]{1,3} {
-    unsigned long int c = strtoul (yytext + 1, NULL, 8);
-    if (!c || UCHAR_MAX < c)
-      complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
-    else
-      obstack_1grow (&obstack_for_string, c);
-  }
-
-  \\x[0-9abcdefABCDEF]+ {
-    verify (UCHAR_MAX < ULONG_MAX);
-    unsigned long int c = strtoul (yytext + 2, NULL, 16);
-    if (!c || UCHAR_MAX < c)
-      complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
-    else
-      obstack_1grow (&obstack_for_string, c);
-  }
-
-  \\a   obstack_1grow (&obstack_for_string, '\a');
-  \\b   obstack_1grow (&obstack_for_string, '\b');
-  \\f   obstack_1grow (&obstack_for_string, '\f');
-  \\n   obstack_1grow (&obstack_for_string, '\n');
-  \\r   obstack_1grow (&obstack_for_string, '\r');
-  \\t   obstack_1grow (&obstack_for_string, '\t');
-  \\v   obstack_1grow (&obstack_for_string, '\v');
-
-  /* \\[\"\'?\\] would be shorter, but it confuses xgettext.  */
-  \\("\""|"'"|"?"|"\\")  obstack_1grow (&obstack_for_string, yytext[1]);
-
-  \\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} {
-    int c = convert_ucn_to_byte (yytext);
-    if (c <= 0)
-      complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
-    else
-      obstack_1grow (&obstack_for_string, c);
-  }
-  \\(.|\n)      {
-    char const *p = yytext + 1;
-    /* Quote only if escaping won't make the character visible.  */
-    if (c_isspace ((unsigned char) *p) && c_isprint ((unsigned char) *p))
-      p = quote (p);
-    else
-      p = quotearg_style_mem (escape_quoting_style, p, 1);
-    complain (loc, complaint, _("invalid character after \\-escape: %s"),
-                 p);
-  }
-}
-
-  /*--------------------------------------------.
-  | Scanning user-code characters and strings.  |
-  `--------------------------------------------*/
-
-<SC_CHARACTER,SC_STRING>
-{
-  {splice}|\\{splice}[^\n\[\]]  STRING_GROW;
-}
-
-<SC_CHARACTER>
-{
-  "'"           STRING_GROW; BEGIN context_state;
-  \n            unexpected_newline (token_start, "'");
-  <<EOF>>       unexpected_eof (token_start, "'");
-}
-
-<SC_STRING>
-{
-  "\""          STRING_GROW; BEGIN context_state;
-  \n            unexpected_newline (token_start, "\"");
-  <<EOF>>       unexpected_eof (token_start, "\"");
-}
-
-
-  /*---------------------------------------------------.
-  | Strings, comments etc. can be found in user code.  |
-  `---------------------------------------------------*/
-
-<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE,SC_PREDICATE>
-{
-  "'" {
-    STRING_GROW;
-    context_state = YY_START;
-    token_start = loc->start;
-    BEGIN SC_CHARACTER;
-  }
-  "\"" {
-    STRING_GROW;
-    context_state = YY_START;
-    token_start = loc->start;
-    BEGIN SC_STRING;
-  }
-  "/"{splice}"*" {
-    STRING_GROW;
-    context_state = YY_START;
-    token_start = loc->start;
-    BEGIN SC_COMMENT;
-  }
-  "/"{splice}"/" {
-    STRING_GROW;
-    context_state = YY_START;
-    BEGIN SC_LINE_COMMENT;
-  }
-}
-
-
-
-  /*-----------------------------------------------------------.
-  | Scanning some code in braces (actions, predicates). The    |
-  | initial "{" is already eaten.                              |
-  `-----------------------------------------------------------*/
-
-<SC_BRACED_CODE,SC_PREDICATE>
-{
-  "{"|"<"{splice}"%"  STRING_GROW; nesting++;
-  "%"{splice}">"      STRING_GROW; nesting--;
-
-  /* Tokenize '<<%' correctly (as '<<' '%') rather than incorrrectly
-     (as '<' '<%').  */
-  "<"{splice}"<"  STRING_GROW;
-
-  <<EOF>>   unexpected_eof (code_start, "}");
-}
-
-<SC_BRACED_CODE>
-{
-  "}" {
-    obstack_1grow (&obstack_for_string, '}');
-
-    --nesting;
-    if (nesting < 0)
-      {
-        STRING_FINISH;
-        loc->start = code_start;
-        val->code = last_string;
-        BEGIN INITIAL;
-        return BRACED_CODE;
-      }
-  }
-}
-
-<SC_PREDICATE>
-{
-  "}" {
-    --nesting;
-    if (nesting < 0)
-      {
-        STRING_FINISH;
-        loc->start = code_start;
-        val->code = last_string;
-        BEGIN INITIAL;
-        return BRACED_PREDICATE;
-      }
-    else
-      obstack_1grow (&obstack_for_string, '}');
-  }
-}
-
-  /*--------------------------------------------------------------.
-  | Scanning some prologue: from "%{" (already scanned) to "%}".  |
-  `--------------------------------------------------------------*/
-
-<SC_PROLOGUE>
-{
-  "%}" {
-    STRING_FINISH;
-    loc->start = code_start;
-    val->code = last_string;
-    BEGIN INITIAL;
-    return PROLOGUE;
-  }
-
-  <<EOF>>   unexpected_eof (code_start, "%}");
-}
-
-
-  /*---------------------------------------------------------------.
-  | Scanning the epilogue (everything after the second "%%", which |
-  | has already been eaten).                                       |
-  `---------------------------------------------------------------*/
-
-<SC_EPILOGUE>
-{
-  <<EOF>> {
-    STRING_FINISH;
-    loc->start = code_start;
-    val->code = last_string;
-    BEGIN INITIAL;
-    return EPILOGUE;
-  }
-}
-
-
-  /*-----------------------------------------------------.
-  | By default, grow the string obstack with the input.  |
-  `-----------------------------------------------------*/
-
-<SC_COMMENT,SC_LINE_COMMENT,SC_BRACED_CODE,SC_PREDICATE,SC_PROLOGUE,SC_EPILOGUE,SC_STRING,SC_CHARACTER,SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>. |
-  <SC_COMMENT,SC_LINE_COMMENT,SC_BRACED_CODE,SC_PREDICATE,SC_PROLOGUE,SC_EPILOGUE>\n    STRING_GROW;
-
-%%
-
-/* Read bytes from FP into buffer BUF of size SIZE.  Return the
-   number of bytes read.  Remove '\r' from input, treating \r\n
-   and isolated \r as \n.  */
-
-static size_t
-no_cr_read (FILE *fp, char *buf, size_t size)
-{
-  size_t bytes_read = fread (buf, 1, size, fp);
-  if (bytes_read)
-    {
-      char *w = memchr (buf, '\r', bytes_read);
-      if (w)
-        {
-          char const *r = ++w;
-          char const *lim = buf + bytes_read;
-
-          for (;;)
-            {
-              /* Found an '\r'.  Treat it like '\n', but ignore any
-                 '\n' that immediately follows.  */
-              w[-1] = '\n';
-              if (r == lim)
-                {
-                  int ch = getc (fp);
-                  if (ch != '\n' && ungetc (ch, fp) != ch)
-                    break;
-                }
-              else if (*r == '\n')
-                r++;
-
-              /* Copy until the next '\r'.  */
-              do
-                {
-                  if (r == lim)
-                    return w - buf;
-                }
-              while ((*w++ = *r++) != '\r');
-            }
-
-          return w - buf;
-        }
-    }
-
-  return bytes_read;
-}
-
-
-
-/*------------------------------------------------------.
-| Scan NUMBER for a base-BASE integer at location LOC.  |
-`------------------------------------------------------*/
-
-static unsigned long int
-scan_integer (char const *number, int base, location loc)
-{
-  verify (INT_MAX < ULONG_MAX);
-  unsigned long int num = strtoul (number, NULL, base);
-
-  if (INT_MAX < num)
-    {
-      complain (&loc, complaint, _("integer out of range: %s"),
-                   quote (number));
-      num = INT_MAX;
-    }
-
-  return num;
-}
-
-
-/*------------------------------------------------------------------.
-| Convert universal character name UCN to a single-byte character,  |
-| and return that character.  Return -1 if UCN does not correspond  |
-| to a single-byte character.                                       |
-`------------------------------------------------------------------*/
-
-static int
-convert_ucn_to_byte (char const *ucn)
-{
-  verify (UCHAR_MAX <= INT_MAX);
-  unsigned long int code = strtoul (ucn + 2, NULL, 16);
-
-  /* FIXME: Currently we assume Unicode-compatible unibyte characters
-     on ASCII hosts (i.e., Latin-1 on hosts with 8-bit bytes).  On
-     non-ASCII hosts we support only the portable C character set.
-     These limitations should be removed once we add support for
-     multibyte characters.  */
-
-  if (UCHAR_MAX < code)
-    return -1;
-
-#if ! ('$' == 0x24 && '@' == 0x40 && '`' == 0x60 && '~' == 0x7e)
-  {
-    /* A non-ASCII host.  Use CODE to index into a table of the C
-       basic execution character set, which is guaranteed to exist on
-       all Standard C platforms.  This table also includes '$', '@',
-       and '`', which are not in the basic execution character set but
-       which are unibyte characters on all the platforms that we know
-       about.  */
-    static signed char const table[] =
-      {
-        '\0',   -1,   -1,   -1,   -1,   -1,   -1, '\a',
-        '\b', '\t', '\n', '\v', '\f', '\r',   -1,   -1,
-          -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-          -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-         ' ',  '!',  '"',  '#',  '$',  '%',  '&', '\'',
-         '(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
-         '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
-         '8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
-         '@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
-         'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
-         'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
-         'X',  'Y',  'Z',  '[', '\\',  ']',  '^',  '_',
-         '`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-         'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
-         'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
-         'x',  'y',  'z',  '{',  '|',  '}',  '~'
-      };
-
-    code = code < sizeof table ? table[code] : -1;
-  }
-#endif
-
-  return code;
-}
-
-
-/*---------------------------------------------------------------------.
-| Handle '#line INT( "FILE")?\n'.  ARGS has already skipped '#line '.  |
-`---------------------------------------------------------------------*/
-
-static void
-handle_syncline (char *args, location loc)
-{
-  char *file;
-  unsigned long int lineno = strtoul (args, &file, 10);
-  if (INT_MAX <= lineno)
-    {
-      complain (&loc, Wother, _("line number overflow"));
-      lineno = INT_MAX;
-    }
-
-  file = strchr (file, '"');
-  if (file)
-    {
-      *strchr (file + 1, '"') = '\0';
-      current_file = uniqstr_new (file + 1);
-    }
-  boundary_set (&scanner_cursor, current_file, lineno, 1);
-}
-
-
-/*----------------------------------------------------------------.
-| For a token or comment starting at START, report message MSGID, |
-| which should say that an end marker was found before the        |
-| expected TOKEN_END. Then, pretend that TOKEN_END was found.     |
-`----------------------------------------------------------------*/
-
-static void
-unexpected_end (boundary start, char const *msgid, char const *token_end)
-{
-  location loc;
-  loc.start = start;
-  loc.end = scanner_cursor;
-  size_t i = strlen (token_end);
-
-/* Adjust scanner cursor so that any later message does not count
-     the characters about to be inserted.  */
-  scanner_cursor.column -= i;
-
-  while (i != 0)
-    unput (token_end[--i]);
-
-  token_end = quote (token_end);
-  /* Instead of '\'', display "'".  */
-  if (STREQ (token_end, "'\\''"))
-    token_end = "\"'\"";
-  complain (&loc, complaint, _(msgid), token_end);
-}
-
-
-/*------------------------------------------------------------------------.
-| Report an unexpected EOF in a token or comment starting at START.       |
-| An end of file was encountered and the expected TOKEN_END was missing.  |
-| After reporting the problem, pretend that TOKEN_END was found.          |
-`------------------------------------------------------------------------*/
-
-static void
-unexpected_eof (boundary start, char const *token_end)
-{
-  unexpected_end (start, N_("missing %s at end of file"), token_end);
-}
-
-
-/*----------------------------------------.
-| Likewise, but for unexpected newlines.  |
-`----------------------------------------*/
-
-static void
-unexpected_newline (boundary start, char const *token_end)
-{
-  unexpected_end (start, N_("missing %s at end of line"), token_end);
-}
-
-
-/*-------------------------.
-| Initialize the scanner.  |
-`-------------------------*/
-
-void
-gram_scanner_initialize (void)
-{
-  obstack_init (&obstack_for_string);
-}
-
-
-/*-----------------------------------------------.
-| Free all the memory allocated to the scanner.  |
-`-----------------------------------------------*/
-
-void
-gram_scanner_free (void)
-{
-  obstack_free (&obstack_for_string, 0);
-  /* Reclaim Flex's buffers.  */
-  yylex_destroy ();
-}
diff --git a/contrib/tools/bison/bison/src/scan-skel.c.saved b/contrib/tools/bison/bison/src/scan-skel.c.saved
deleted file mode 100644
index 88c66c1778..0000000000
--- a/contrib/tools/bison/bison/src/scan-skel.c.saved
+++ /dev/null
@@ -1,2409 +0,0 @@
-#line 2 "src/scan-skel.c"
-
-#line 4 "src/scan-skel.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-/* %not-for-header */
-
-/* %if-c-only */
-/* %if-not-reentrant */
-#define yy_create_buffer skel__create_buffer
-#define yy_delete_buffer skel__delete_buffer
-#define yy_flex_debug skel__flex_debug
-#define yy_init_buffer skel__init_buffer
-#define yy_flush_buffer skel__flush_buffer
-#define yy_load_buffer_state skel__load_buffer_state
-#define yy_switch_to_buffer skel__switch_to_buffer
-#define yyin skel_in
-#define yyleng skel_leng
-#define yylex skel_lex
-#define yylineno skel_lineno
-#define yyout skel_out
-#define yyrestart skel_restart
-#define yytext skel_text
-#define yywrap skel_wrap
-#define yyalloc skel_alloc
-#define yyrealloc skel_realloc
-#define yyfree skel_free
-
-/* %endif */
-/* %endif */
-/* %ok-for-header */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* %if-c++-only */
-/* %endif */
-
-/* %if-c-only */
-    
-/* %endif */
-
-/* %if-c-only */
-
-/* %endif */
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-/* %if-c-only */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* %endif */
-
-/* %if-tables-serialization */
-/* %endif */
-/* end standard C headers. */
-
-/* %if-c-or-c++ */
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-/* %endif */
-
-/* %if-c++-only */
-/* %endif */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* %not-for-header */
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-/* %ok-for-header */
-
-/* %not-for-header */
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-/* %ok-for-header */
-
-/* %if-reentrant */
-/* %endif */
-
-/* %if-not-reentrant */
-
-/* %endif */
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE skel_restart(skel_in  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-/* %if-not-reentrant */
-extern yy_size_t skel_leng;
-/* %endif */
-
-/* %if-c-only */
-/* %if-not-reentrant */
-extern FILE *skel_in, *skel_out;
-/* %endif */
-/* %endif */
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up skel_text. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up skel_text again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-/* %if-c-only */
-	FILE *yy_input_file;
-/* %endif */
-
-/* %if-c++-only */
-/* %endif */
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	yy_size_t yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via skel_restart()), so that the user can continue scanning by
-	 * just pointing skel_in at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* %if-c-only Standard (non-C++) definition */
-/* %not-for-header */
-
-/* %if-not-reentrant */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-/* %endif */
-/* %ok-for-header */
-
-/* %endif */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* %if-c-only Standard (non-C++) definition */
-
-/* %if-not-reentrant */
-/* %not-for-header */
-
-/* yy_hold_char holds the character lost when skel_text is formed. */
-static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t skel_leng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow skel_wrap()'s to do buffer switches
- * instead of setting up a fresh skel_in.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-/* %ok-for-header */
-
-/* %endif */
-
-void skel_restart (FILE *input_file  );
-void skel__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE skel__create_buffer (FILE *file,int size  );
-void skel__delete_buffer (YY_BUFFER_STATE b  );
-void skel__flush_buffer (YY_BUFFER_STATE b  );
-void skel_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void skel_pop_buffer_state (void );
-
-static void skel_ensure_buffer_stack (void );
-static void skel__load_buffer_state (void );
-static void skel__init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER skel__flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE skel__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE skel__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE skel__scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-/* %endif */
-
-void *skel_alloc (yy_size_t  );
-void *skel_realloc (void *,yy_size_t  );
-void skel_free (void *  );
-
-#define yy_new_buffer skel__create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        skel_ensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            skel__create_buffer(skel_in,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        skel_ensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            skel__create_buffer(skel_in,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* %% [1.0] skel_text/skel_in/skel_out/yy_state_type/skel_lineno etc. def's & init go here */
-/* Begin user sect3 */
-
-#define skel_wrap() 1
-#define YY_SKIP_YYWRAP
-
-#define FLEX_DEBUG
-
-typedef unsigned char YY_CHAR;
-
-FILE *skel_in = (FILE *) 0, *skel_out = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int skel_lineno;
-
-int skel_lineno = 1;
-
-extern char *skel_text;
-#define yytext_ptr skel_text
-
-/* %if-c-only Standard (non-C++) definition */
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
-
-/* %endif */
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up skel_text.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-/* %% [2.0] code to fiddle skel_text and skel_leng for yymore() goes here \ */\
-	skel_leng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-/* %% [3.0] code to copy yytext_ptr to skel_text[] goes here, if %array \ */\
-	(yy_c_buf_p) = yy_cp;
-
-/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
-#define YY_NUM_RULES 24
-#define YY_END_OF_BUFFER 25
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[67] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   25,   13,   12,   11,
-       14,   21,   23,   22,   22,   13,   11,    5,    4,    1,
-       11,   11,   11,    2,    3,   14,   21,   19,   18,   20,
-       15,   16,   17,   11,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,   11,    7,    6,   11,   11,   11,
-       10,   11,   11,    8,    9,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    1,    1,    1,    1,    4,    5,
-        6,    1,    1,    6,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    7,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    8,    9,   10,    1,
-
-       11,   12,    1,    1,   13,    1,    1,   14,   15,   16,
-       17,   18,    1,    1,   19,   20,   21,    1,    1,    1,
-        1,    1,   22,    1,   23,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[24] =
-    {   0,
-        1,    1,    2,    1,    3,    1,    4,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1
-    } ;
-
-static yyconst flex_int16_t yy_base[74] =
-    {   0,
-        0,    1,   55,   54,    3,    7,   60,    0,  100,    8,
-        0,   29,  100,  100,  100,    0,   50,  100,  100,  100,
-       51,   41,    2,  100,  100,    0,  100,  100,  100,  100,
-      100,  100,  100,   37,   40,   37,   36,   28,   36,   28,
-       31,   28,   25,   26,   27,   29,   28,   17,   29,   26,
-       22,   21,    7,   11,   11,  100,  100,   17,   10,    4,
-      100,   14,    8,  100,  100,  100,   73,   77,   81,   85,
-       88,   92,   95
-    } ;
-
-static yyconst flex_int16_t yy_def[74] =
-    {   0,
-       67,   67,   68,   68,   69,   69,   66,   70,   66,   71,
-       72,   73,   66,   66,   66,   70,   71,   66,   66,   66,
-       17,   17,   17,   66,   66,   72,   66,   66,   66,   66,
-       66,   66,   66,   17,   17,   17,   17,   17,   17,   17,
-       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-       17,   17,   17,   17,   17,   66,   66,   17,   17,   17,
-       66,   17,   17,   66,   66,    0,   66,   66,   66,   66,
-       66,   66,   66
-    } ;
-
-static yyconst flex_int16_t yy_nxt[124] =
-    {   0,
-       66,   66,    9,    9,   14,   15,   10,   10,   14,   15,
-       18,   19,   65,   36,   20,   37,   21,   22,   64,   63,
-       62,   61,   38,   60,   23,   59,   58,   57,   56,   24,
-       25,   28,   29,   55,   30,   31,   54,   53,   52,   51,
-       50,   49,   48,   47,   46,   45,   44,   43,   42,   41,
-       32,   33,   66,   66,   40,   39,   66,   35,   34,   66,
-       12,   12,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   66,   66,    8,    8,    8,    8,   11,   11,   11,
-       11,   13,   13,   13,   13,   16,   66,   16,   17,   17,
-       66,   17,   26,   26,   26,   27,   27,   27,   27,    7,
-
-       66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   66,   66
-    } ;
-
-static yyconst flex_int16_t yy_chk[124] =
-    {   0,
-        0,    0,    1,    2,    5,    5,    1,    2,    6,    6,
-       10,   10,   63,   23,   10,   23,   10,   10,   62,   60,
-       59,   58,   23,   55,   10,   54,   53,   52,   51,   10,
-       10,   12,   12,   50,   12,   12,   49,   48,   47,   46,
-       45,   44,   43,   42,   41,   40,   39,   38,   37,   36,
-       12,   12,   17,   17,   35,   34,   17,   22,   21,    7,
-        4,    3,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   17,   17,   67,   67,   67,   67,   68,   68,   68,
-       68,   69,   69,   69,   69,   70,    0,   70,   71,   71,
-        0,   71,   72,   72,   72,   73,   73,   73,   73,   66,
-
-       66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-       66,   66,   66
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int skel__flex_debug;
-int skel__flex_debug = 1;
-
-static yyconst flex_int16_t yy_rule_linenum[24] =
-    {   0,
-       72,   73,   74,   75,   76,   78,   79,   81,   82,   83,
-       86,   87,   88,  101,  103,  104,  105,  106,  107,  109,
-      128,  133,  134
-    } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *skel_text;
-#line 1 "../../src/scan-skel.l"
-/* Scan Bison Skeletons.                                       -*- C -*-
-
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-#define YY_NO_INPUT 1
-#line 24 "../../src/scan-skel.l"
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef skel_wrap
-#define skel_wrap() 1
-
-#define FLEX_PREFIX(Id) skel_ ## Id
-#include <src/flex-scanner.h>
-
-#include <dirname.h>
-#include <error.h>
-#include <quotearg.h>
-
-#include <src/complain.h>
-#include <src/getargs.h>
-#include <src/files.h>
-#include <src/scan-skel.h>
-
-#include "uniqstr.h"
-
-#define YY_DECL static int skel_lex (void)
-YY_DECL;
-
-typedef void (*at_directive)(int, char**, char **, int*);
-static void at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun);
-static void at_basename (int argc, char *argv[], char**, int*);
-static void at_complain (int argc, char *argv[], char**, int*);
-static void at_output (int argc, char *argv[], char **name, int *lineno);
-static void fail_for_at_directive_too_many_args (char const *at_directive_name);
-static void fail_for_at_directive_too_few_args (char const *at_directive_name);
-static void fail_for_invalid_at (char const *at);
-
-
-#line 660 "src/scan-skel.c"
-
-#define INITIAL 0
-#define SC_AT_DIRECTIVE_ARGS 1
-#define SC_AT_DIRECTIVE_SKIP_WS 2
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-/* %if-c-only */
-#include <unistd.h>
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* %if-c-only Reentrant structure and macros (non-C++). */
-/* %if-reentrant */
-/* %if-c-only */
-
-static int yy_init_globals (void );
-
-/* %endif */
-/* %if-reentrant */
-/* %endif */
-/* %endif End reentrant structures and macros. */
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int skel_lex_destroy (void );
-
-int skel_get_debug (void );
-
-void skel_set_debug (int debug_flag  );
-
-YY_EXTRA_TYPE skel_get_extra (void );
-
-void skel_set_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *skel_get_in (void );
-
-void skel_set_in  (FILE * in_str  );
-
-FILE *skel_get_out (void );
-
-void skel_set_out  (FILE * out_str  );
-
-yy_size_t skel_get_leng (void );
-
-char *skel_get_text (void );
-
-int skel_get_lineno (void );
-
-void skel_set_lineno (int line_number  );
-
-/* %if-bison-bridge */
-/* %endif */
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int skel_wrap (void );
-#else
-extern int skel_wrap (void );
-#endif
-#endif
-
-/* %not-for-header */
-
-/* %ok-for-header */
-
-/* %endif */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-/* %if-c-only Standard (non-C++) definition */
-/* %not-for-header */
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-/* %ok-for-header */
-
-/* %endif */
-#endif
-
-/* %if-c-only */
-
-/* %endif */
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* %if-c-only Standard (non-C++) definition */
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( skel_text, skel_leng, 1, skel_out )) {} } while (0)
-/* %endif */
-/* %if-c++-only C++ definition */
-/* %endif */
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( skel_in )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( skel_in ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, skel_in))==0 && ferror(skel_in)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(skel_in); \
-			} \
-		}\
-\
-/* %if-c++-only C++ definition \ */\
-/* %endif */
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-/* %if-c-only */
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-#endif
-
-/* %if-tables-serialization structures and prototypes */
-/* %not-for-header */
-
-/* %ok-for-header */
-
-/* %not-for-header */
-
-/* %tables-yydmap generated elements */
-/* %endif */
-/* end tables serialization structures and prototypes */
-
-/* %ok-for-header */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-/* %if-c-only Standard (non-C++) definition */
-
-extern int skel_lex (void);
-
-#define YY_DECL int skel_lex (void)
-/* %endif */
-/* %if-c++-only C++ definition */
-/* %endif */
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after skel_text and skel_leng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-/* %% [6.0] YY_RULE_SETUP definition goes here */
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/* %not-for-header */
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    
-/* %% [7.0] user's declarations go here */
-#line 57 "../../src/scan-skel.l"
-
-
-
-  int out_lineno PACIFY_CC (= 0);
-  char *out_name = NULL;
-
-  /* Currently, only the @complain directive takes multiple arguments, and
-     never more than 7, with argv[0] being the directive name and argv[1]
-     being the type of complaint to dispatch. */
-#define ARGC_MAX 9
-  int argc = 0;
-  char *argv[ARGC_MAX];
-  at_directive at_ptr = NULL;
-
-
-#line 918 "src/scan-skel.c"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! skel_in )
-/* %if-c-only */
-			skel_in = stdin;
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-
-		if ( ! skel_out )
-/* %if-c-only */
-			skel_out = stdout;
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			skel_ensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				skel__create_buffer(skel_in,YY_BUF_SIZE );
-		}
-
-		skel__load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-/* %% [8.0] yymore()-related code goes here */
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of skel_text. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-/* %% [9.0] code to set up and find next match goes here */
-		yy_current_state = (yy_start);
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 67 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_current_state != 66 );
-		yy_cp = (yy_last_accepting_cpos);
-		yy_current_state = (yy_last_accepting_state);
-
-yy_find_action:
-/* %% [10.0] code to find the action number goes here */
-		yy_act = yy_accept[yy_current_state];
-
-		YY_DO_BEFORE_ACTION;
-
-/* %% [11.0] code for skel_lineno update goes here */
-
-do_action:	/* This label is used only to access EOF actions. */
-
-/* %% [12.0] debug code goes here */
-		if ( skel__flex_debug )
-			{
-			if ( yy_act == 0 )
-				fprintf( stderr, "--scanner backing up\n" );
-			else if ( yy_act < 24 )
-				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
-				         (long)yy_rule_linenum[yy_act], skel_text );
-			else if ( yy_act == 24 )
-				fprintf( stderr, "--accepting default rule (\"%s\")\n",
-				         skel_text );
-			else if ( yy_act == 25 )
-				fprintf( stderr, "--(end of buffer or a NUL)\n" );
-			else
-				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
-			}
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-/* %% [13.0] actions go here */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 72 "../../src/scan-skel.l"
-fputc ('@', skel_out);
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 73 "../../src/scan-skel.l"
-fputc ('[', skel_out);
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 74 "../../src/scan-skel.l"
-fputc (']', skel_out);
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 75 "../../src/scan-skel.l"
-continue;  /* Used by b4_cat in ../data/bison.m4.  */
-	YY_BREAK
-case 5:
-/* rule 5 can match eol */
-YY_RULE_SETUP
-#line 76 "../../src/scan-skel.l"
-continue;
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 78 "../../src/scan-skel.l"
-fprintf (skel_out, "%d", out_lineno + 1);
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 79 "../../src/scan-skel.l"
-fputs (quotearg_style (c_quoting_style, out_name), skel_out);
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 81 "../../src/scan-skel.l"
-at_init (&argc, argv, &at_ptr, &at_basename);
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 82 "../../src/scan-skel.l"
-at_init (&argc, argv, &at_ptr, &at_complain);
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 83 "../../src/scan-skel.l"
-at_init (&argc, argv, &at_ptr, &at_output);
-	YY_BREAK
-/* This pattern must not match more than the previous @ patterns. */
-case 11:
-YY_RULE_SETUP
-#line 86 "../../src/scan-skel.l"
-fail_for_invalid_at (skel_text);
-	YY_BREAK
-case 12:
-/* rule 12 can match eol */
-YY_RULE_SETUP
-#line 87 "../../src/scan-skel.l"
-out_lineno++; ECHO;
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 88 "../../src/scan-skel.l"
-ECHO;
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-#line 90 "../../src/scan-skel.l"
-{
-  if (out_name)
-    {
-      free (out_name);
-      xfclose (skel_out);
-    }
-  return EOF;
-}
-	YY_BREAK
-
-
-case 14:
-/* rule 14 can match eol */
-YY_RULE_SETUP
-#line 101 "../../src/scan-skel.l"
-STRING_GROW;
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 103 "../../src/scan-skel.l"
-obstack_1grow (&obstack_for_string, '@');
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 104 "../../src/scan-skel.l"
-obstack_1grow (&obstack_for_string, '[');
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 105 "../../src/scan-skel.l"
-obstack_1grow (&obstack_for_string, ']');
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 106 "../../src/scan-skel.l"
-continue; /* For starting an argument that begins with whitespace. */
-	YY_BREAK
-case 19:
-/* rule 19 can match eol */
-YY_RULE_SETUP
-#line 107 "../../src/scan-skel.l"
-continue;
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 109 "../../src/scan-skel.l"
-{
-    if (argc >= ARGC_MAX)
-      fail_for_at_directive_too_many_args (argv[0]);
-
-    argv[argc++] = obstack_finish0 (&obstack_for_string);
-
-    /* Like M4, skip whitespace after a comma.  */
-    if (skel_text[1] == ',')
-      BEGIN SC_AT_DIRECTIVE_SKIP_WS;
-    else
-      {
-        aver (at_ptr);
-        at_ptr (argc, argv, &out_name, &out_lineno);
-        obstack_free (&obstack_for_string, argv[0]);
-        argc = 0;
-        BEGIN INITIAL;
-      }
-  }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 128 "../../src/scan-skel.l"
-fail_for_invalid_at (skel_text);
-	YY_BREAK
-
-
-
-case 22:
-/* rule 22 can match eol */
-YY_RULE_SETUP
-#line 133 "../../src/scan-skel.l"
-continue;
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 134 "../../src/scan-skel.l"
-yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
-	YY_BREAK
-
-
-
-case YY_STATE_EOF(SC_AT_DIRECTIVE_ARGS):
-case YY_STATE_EOF(SC_AT_DIRECTIVE_SKIP_WS):
-#line 139 "../../src/scan-skel.l"
-complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);
-	YY_BREAK
-
-case 24:
-YY_RULE_SETUP
-#line 142 "../../src/scan-skel.l"
-YY_FATAL_ERROR( "flex scanner jammed" );
-	YY_BREAK
-#line 1196 "src/scan-skel.c"
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed skel_in at a new source and called
-			 * skel_lex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = skel_in;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
-				yy_cp = (yy_last_accepting_cpos);
-				yy_current_state = (yy_last_accepting_state);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( skel_wrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * skel_text, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of skel_lex */
-/* %ok-for-header */
-
-/* %if-c++-only */
-/* %not-for-header */
-
-/* %ok-for-header */
-
-/* %endif */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-/* %if-c-only */
-static int yy_get_next_buffer (void)
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			yy_size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				yy_size_t new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					skel_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			skel_restart(skel_in  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) skel_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-/* %if-c-only */
-/* %not-for-header */
-
-    static yy_state_type yy_get_previous_state (void)
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    
-/* %% [15.0] code to get the start state into yy_current_state goes here */
-	yy_current_state = (yy_start);
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-/* %% [16.0] code to find the next state goes here */
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 67 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-/* %if-c-only */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-	register int yy_is_jam;
-    /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
-	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 67 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 66);
-
-		return yy_is_jam ? 0 : yy_current_state;
-}
-
-/* %if-c-only */
-
-/* %endif */
-
-/* %if-c-only */
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					skel_restart(skel_in );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( skel_wrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve skel_text */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-/* %% [19.0] update BOL and skel_lineno */
-
-	return c;
-}
-/* %if-c-only */
-#endif	/* ifndef YY_NO_INPUT */
-/* %endif */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-/* %if-c-only */
-    void skel_restart  (FILE * input_file )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        skel_ensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            skel__create_buffer(skel_in,YY_BUF_SIZE );
-	}
-
-	skel__init_buffer(YY_CURRENT_BUFFER,input_file );
-	skel__load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-/* %if-c-only */
-    void skel__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		skel_pop_buffer_state();
-	 *		skel_push_buffer_state(new_buffer);
-     */
-	skel_ensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	skel__load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (skel_wrap()) processing, but the only time this flag
-	 * is looked at is after skel_wrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/* %if-c-only */
-static void skel__load_buffer_state  (void)
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	skel_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-/* %if-c-only */
-    YY_BUFFER_STATE skel__create_buffer  (FILE * file, int  size )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) skel_alloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in skel__create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) skel_alloc(b->yy_buf_size + 2  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in skel__create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	skel__init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with skel__create_buffer()
- * 
- */
-/* %if-c-only */
-    void skel__delete_buffer (YY_BUFFER_STATE  b )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		skel_free((void *) b->yy_ch_buf  );
-
-	skel_free((void *) b  );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a skel_restart() or at EOF.
- */
-/* %if-c-only */
-    static void skel__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-
-{
-	int oerrno = errno;
-    
-	skel__flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then skel__init_buffer was _probably_
-     * called from skel_restart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-/* %if-c-only */
-
-        b->yy_is_interactive = 0;
-    
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-/* %if-c-only */
-    void skel__flush_buffer (YY_BUFFER_STATE  b )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		skel__load_buffer_state( );
-}
-
-/* %if-c-or-c++ */
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-/* %if-c-only */
-void skel_push_buffer_state (YY_BUFFER_STATE new_buffer )
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    	if (new_buffer == NULL)
-		return;
-
-	skel_ensure_buffer_stack();
-
-	/* This block is copied from skel__switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from skel__switch_to_buffer. */
-	skel__load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-/* %endif */
-
-/* %if-c-or-c++ */
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-/* %if-c-only */
-void skel_pop_buffer_state (void)
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	skel__delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		skel__load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-/* %endif */
-
-/* %if-c-or-c++ */
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-/* %if-c-only */
-static void skel_ensure_buffer_stack (void)
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-{
-	yy_size_t num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)skel_alloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in skel_ensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)skel_realloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in skel_ensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-/* %endif */
-
-/* %if-c-only */
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE skel__scan_buffer  (char * base, yy_size_t  size )
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) skel_alloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in skel__scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	skel__switch_to_buffer(b  );
-
-	return b;
-}
-/* %endif */
-
-/* %if-c-only */
-/** Setup the input buffer state to scan a string. The next call to skel_lex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       skel__scan_bytes() instead.
- */
-YY_BUFFER_STATE skel__scan_string (yyconst char * yystr )
-{
-    
-	return skel__scan_bytes(yystr,strlen(yystr) );
-}
-/* %endif */
-
-/* %if-c-only */
-/** Setup the input buffer state to scan the given bytes. The next call to skel_lex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE skel__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) skel_alloc(n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in skel__scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = skel__scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in skel__scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-/* %endif */
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-/* %if-c-only */
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-/* %endif */
-/* %if-c++-only */
-/* %endif */
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up skel_text. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		skel_text[skel_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = skel_text + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		skel_leng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/* %if-c-only */
-/* %if-reentrant */
-/* %endif */
-
-/** Get the current line number.
- * 
- */
-int skel_get_lineno  (void)
-{
-        
-    return skel_lineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *skel_get_in  (void)
-{
-        return skel_in;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *skel_get_out  (void)
-{
-        return skel_out;
-}
-
-/** Get the length of the current token.
- * 
- */
-yy_size_t skel_get_leng  (void)
-{
-        return skel_leng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *skel_get_text  (void)
-{
-        return skel_text;
-}
-
-/* %if-reentrant */
-/* %endif */
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void skel_set_lineno (int  line_number )
-{
-    
-    skel_lineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see skel__switch_to_buffer
- */
-void skel_set_in (FILE *  in_str )
-{
-        skel_in = in_str ;
-}
-
-void skel_set_out (FILE *  out_str )
-{
-        skel_out = out_str ;
-}
-
-int skel_get_debug  (void)
-{
-        return skel__flex_debug;
-}
-
-void skel_set_debug (int  bdebug )
-{
-        skel__flex_debug = bdebug ;
-}
-
-/* %endif */
-
-/* %if-reentrant */
-/* %if-bison-bridge */
-/* %endif */
-/* %endif if-c-only */
-
-/* %if-c-only */
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from skel_lex_destroy(), so don't allocate here.
-     */
-
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    skel_in = stdin;
-    skel_out = stdout;
-#else
-    skel_in = (FILE *) 0;
-    skel_out = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * skel_lex_init()
-     */
-    return 0;
-}
-/* %endif */
-
-/* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
-/* skel_lex_destroy is for both reentrant and non-reentrant scanners. */
-int skel_lex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		skel__delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		skel_pop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	skel_free((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * skel_lex() is called, initialization will occur. */
-    yy_init_globals( );
-
-/* %if-reentrant */
-/* %endif */
-    return 0;
-}
-/* %endif */
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *skel_alloc (yy_size_t  size )
-{
-	return (void *) malloc( size );
-}
-
-void *skel_realloc  (void * ptr, yy_size_t  size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void skel_free (void * ptr )
-{
-	free( (char *) ptr );	/* see skel_realloc() for (char *) cast */
-}
-
-/* %if-tables-serialization definitions */
-/* %define-yytables   The name for this specific scanner's tables. */
-#define YYTABLES_NAME "yytables"
-/* %endif */
-
-/* %ok-for-header */
-
-#line 142 "../../src/scan-skel.l"
-
-
-
-static void
-at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun)
-{
-  *at_ptr = fun;
-  skel_text[skel_leng-1] = '\0';
-  obstack_grow (&obstack_for_string, skel_text, skel_leng);
-  argv[(*argc)++] = obstack_finish (&obstack_for_string);
-  BEGIN SC_AT_DIRECTIVE_ARGS;
-}
-
-/*------------------------.
-| Scan a Bison skeleton.  |
-`------------------------*/
-
-void
-scan_skel (FILE *in)
-{
-  static bool initialized = false;
-  if (!initialized)
-    {
-      initialized = true;
-      obstack_init (&obstack_for_string);
-    }
-  skel_in = in;
-  skel__flex_debug = trace_flag & trace_skeleton;
-  skel_lex ();
-}
-
-void
-skel_scanner_free (void)
-{
-  obstack_free (&obstack_for_string, 0);
-  /* Reclaim Flex's buffers.  */
-  skel_lex_destroy ();
-}
-
-static inline warnings
-flag (const char *arg)
-{
-  /* compare with values issued from b4_error */
-  if (STREQ (arg, "complain"))
-    return complaint;
-  else if (STREQ (arg, "deprecated"))
-    return Wdeprecated;
-  else if (STREQ (arg, "fatal"))
-    return fatal;
-  else if (STREQ (arg, "note"))
-    return silent | complaint | no_caret;
-  else if (STREQ (arg, "warn"))
-    return Wother;
-  else
-    aver (false);
-}
-
-static void
-at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  (void) out_namep;
-  (void) out_linenop;
-  if (2 < argc)
-    fail_for_at_directive_too_many_args (argv[0]);
-  fputs (last_component (argv[1]), skel_out);
-}
-
-static void
-at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  static unsigned indent;
-  warnings w = flag (argv[1]);
-  location loc;
-  location *locp = NULL;
-
-  (void) out_namep;
-  (void) out_linenop;
-
-  if (argc < 4)
-    fail_for_at_directive_too_few_args (argv[0]);
-  if (argv[2] && argv[2][0])
-    {
-      boundary_set_from_string (&loc.start, argv[2]);
-      boundary_set_from_string (&loc.end, argv[3]);
-      locp = &loc;
-    }
-  if (w & silent)
-    indent += SUB_INDENT;
-  else
-    indent = 0;
-  complain_args (locp, w, &indent, argc - 4, argv + 4);
-  if (w & silent)
-    indent -= SUB_INDENT;
-}
-
-static void
-at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  if (2 < argc)
-    fail_for_at_directive_too_many_args (argv[0]);
-  if (*out_namep)
-    {
-      free (*out_namep);
-      xfclose (skel_out);
-    }
-  *out_namep = xstrdup (argv[1]);
-  output_file_name_check (out_namep);
-  skel_out = xfopen (*out_namep, "w");
-  *out_linenop = 1;
-}
-
-static void
-fail_for_at_directive_too_few_args (char const *at_directive_name)
-{
-  complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),
-            at_directive_name);
-}
-
-static void
-fail_for_at_directive_too_many_args (char const *at_directive_name)
-{
-  complain (NULL, fatal, _("too many arguments for %s directive in skeleton"),
-            at_directive_name);
-}
-
-static void
-fail_for_invalid_at (char const *at)
-{
-  complain (NULL, fatal, "invalid @ in skeleton: %s", at);
-}
-
diff --git a/contrib/tools/bison/bison/src/scan-skel.l b/contrib/tools/bison/bison/src/scan-skel.l
deleted file mode 100644
index c7f58f8b28..0000000000
--- a/contrib/tools/bison/bison/src/scan-skel.l
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Scan Bison Skeletons.                                       -*- C -*-
-
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-%option nodefault noyywrap noinput nounput never-interactive debug
-%option prefix="skel_" outfile="lex.yy.c"
-
-%{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef skel_wrap
-#define skel_wrap() 1
-
-#define FLEX_PREFIX(Id) skel_ ## Id
-#include <src/flex-scanner.h>
-
-#include <dirname.h>
-#include <error.h>
-#include <quotearg.h>
-
-#include <src/complain.h>
-#include <src/getargs.h>
-#include <src/files.h>
-#include <src/scan-skel.h>
-
-#define YY_DECL static int skel_lex (void)
-YY_DECL;
-
-typedef void (*at_directive)(int, char**, char **, int*);
-static void at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun);
-static void at_basename (int argc, char *argv[], char**, int*);
-static void at_complain (int argc, char *argv[], char**, int*);
-static void at_output (int argc, char *argv[], char **name, int *lineno);
-static void fail_for_at_directive_too_many_args (char const *at_directive_name);
-static void fail_for_at_directive_too_few_args (char const *at_directive_name);
-static void fail_for_invalid_at (char const *at);
-%}
-
-%x SC_AT_DIRECTIVE_ARGS
-%x SC_AT_DIRECTIVE_SKIP_WS
-
-%%
-
-%{
-  int out_lineno PACIFY_CC (= 0);
-  char *out_name = NULL;
-
-  /* Currently, only the @complain directive takes multiple arguments, and
-     never more than 7, with argv[0] being the directive name and argv[1]
-     being the type of complaint to dispatch. */
-#define ARGC_MAX 9
-  int argc = 0;
-  char *argv[ARGC_MAX];
-  at_directive at_ptr = NULL;
-%}
-
-\r+  continue;
-"@@" fputc ('@', yyout);
-"@{" fputc ('[', yyout);
-"@}" fputc (']', yyout);
-"@'" continue;  /* Used by b4_cat in ../data/bison.m4.  */
-@\r*\n  continue;
-
-"@oline@"  fprintf (yyout, "%d", out_lineno + 1);
-"@ofile@"  fputs (quotearg_style (c_quoting_style, out_name), yyout);
-
-"@basename("    at_init (&argc, argv, &at_ptr, &at_basename);
-"@complain("    at_init (&argc, argv, &at_ptr, &at_complain);
-"@output("      at_init (&argc, argv, &at_ptr, &at_output);
-
-  /* This pattern must not match more than the previous @ patterns. */
-@[^@{}\'(\n]*   fail_for_invalid_at (yytext);
-\n              out_lineno++; ECHO;
-[^@\n]+         ECHO;
-
-<INITIAL><<EOF>> {
-  if (out_name)
-    {
-      free (out_name);
-      xfclose (yyout);
-    }
-  return EOF;
-}
-
-<SC_AT_DIRECTIVE_ARGS>
-{
-  [^@]+  STRING_GROW;
-
-  "@@"   obstack_1grow (&obstack_for_string, '@');
-  "@{"   obstack_1grow (&obstack_for_string, '[');
-  "@}"   obstack_1grow (&obstack_for_string, ']');
-  "@'"   continue; /* For starting an argument that begins with whitespace. */
-  @\r*\n    continue;
-
-  @[,)] {
-    if (argc >= ARGC_MAX)
-      fail_for_at_directive_too_many_args (argv[0]);
-
-    argv[argc++] = obstack_finish0 (&obstack_for_string);
-
-    /* Like M4, skip whitespace after a comma.  */
-    if (yytext[1] == ',')
-      BEGIN SC_AT_DIRECTIVE_SKIP_WS;
-    else
-      {
-        aver (at_ptr);
-        at_ptr (argc, argv, &out_name, &out_lineno);
-        obstack_free (&obstack_for_string, argv[0]);
-        argc = 0;
-        BEGIN INITIAL;
-      }
-  }
-
-  @.?  fail_for_invalid_at (yytext);
-}
-
-<SC_AT_DIRECTIVE_SKIP_WS>
-{
-  [ \t\r\n]    continue;
-  .            yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
-}
-
-<SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>
-{
-  <<EOF>>  complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);
-}
-
-%%
-
-static void
-at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun)
-{
-  *at_ptr = fun;
-  yytext[yyleng-1] = '\0';
-  obstack_grow (&obstack_for_string, yytext, yyleng);
-  argv[(*argc)++] = obstack_finish (&obstack_for_string);
-  BEGIN SC_AT_DIRECTIVE_ARGS;
-}
-
-/*------------------------.
-| Scan a Bison skeleton.  |
-`------------------------*/
-
-void
-scan_skel (FILE *in)
-{
-  static bool initialized = false;
-  if (!initialized)
-    {
-      initialized = true;
-      obstack_init (&obstack_for_string);
-    }
-  skel_in = in;
-  skel__flex_debug = trace_flag & trace_skeleton;
-  skel_lex ();
-}
-
-void
-skel_scanner_free (void)
-{
-  obstack_free (&obstack_for_string, 0);
-  /* Reclaim Flex's buffers.  */
-  yylex_destroy ();
-}
-
-static inline warnings
-flag (const char *arg)
-{
-  /* compare with values issued from b4_error */
-  if (STREQ (arg, "complain"))
-    return complaint;
-  else if (STREQ (arg, "deprecated"))
-    return Wdeprecated;
-  else if (STREQ (arg, "fatal"))
-    return fatal;
-  else if (STREQ (arg, "note"))
-    return silent | complaint | no_caret;
-  else if (STREQ (arg, "warn"))
-    return Wother;
-  else
-    aver (false);
-}
-
-static void
-at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  (void) out_namep;
-  (void) out_linenop;
-  if (2 < argc)
-    fail_for_at_directive_too_many_args (argv[0]);
-  fputs (last_component (argv[1]), yyout);
-}
-
-static void
-at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  static unsigned indent;
-  warnings w = flag (argv[1]);
-  location loc;
-  location *locp = NULL;
-
-  (void) out_namep;
-  (void) out_linenop;
-
-  if (argc < 4)
-    fail_for_at_directive_too_few_args (argv[0]);
-  if (argv[2] && argv[2][0])
-    {
-      boundary_set_from_string (&loc.start, argv[2]);
-      boundary_set_from_string (&loc.end, argv[3]);
-      locp = &loc;
-    }
-  if (w & silent)
-    indent += SUB_INDENT;
-  else
-    indent = 0;
-  complain_args (locp, w, &indent, argc - 4, argv + 4);
-  if (w & silent)
-    indent -= SUB_INDENT;
-}
-
-static void
-at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
-{
-  if (2 < argc)
-    fail_for_at_directive_too_many_args (argv[0]);
-  if (*out_namep)
-    {
-      free (*out_namep);
-      xfclose (yyout);
-    }
-  *out_namep = xstrdup (argv[1]);
-  output_file_name_check (out_namep);
-  yyout = xfopen (*out_namep, "wb");
-  *out_linenop = 1;
-}
-
-static void
-fail_for_at_directive_too_few_args (char const *at_directive_name)
-{
-  complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),
-            at_directive_name);
-}
-
-static void
-fail_for_at_directive_too_many_args (char const *at_directive_name)
-{
-  complain (NULL, fatal, _("too many arguments for %s directive in skeleton"),
-            at_directive_name);
-}
-
-static void
-fail_for_invalid_at (char const *at)
-{
-  complain (NULL, fatal, "invalid @ in skeleton: %s", at);
-}
diff --git a/contrib/tools/bison/bison/ya.make b/contrib/tools/bison/bison/ya.make
deleted file mode 100644
index 04f8ae3758..0000000000
--- a/contrib/tools/bison/bison/ya.make
+++ /dev/null
@@ -1,69 +0,0 @@
-OWNER(g:contrib)
-
-PROGRAM()
-
-LICENSE(
-    GPL-3.0-or-later AND
-    GPL-3.0-or-later WITH Bison-exception-2.2
-)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-IF (NOT MUSL)
-    NO_RUNTIME()
-ENDIF()
-
-NO_COMPILER_WARNINGS()
-
-ADDINCLSELF()
-
-SRCS(
-    src/AnnotationList.c
-    src/InadequacyList.c
-    src/LR0.c
-    src/Sbitset.c
-    src/assoc.c
-    src/closure.c
-    src/complain.c
-    src/conflicts.c
-    src/derives.c
-    src/files.c
-    src/getargs.c
-    src/gram.c
-    src/graphviz.c
-    src/ielr.c
-    src/lalr.c
-    src/location.c
-    src/main.c
-    src/muscle-tab.c
-    src/named-ref.c
-    src/nullable.c
-    src/output.c
-    src/parse-gram.c
-    src/print-xml.c
-    src/print.c
-    src/print_graph.c
-    src/reader.c
-    src/reduce.c
-    src/relation.c
-    src/scan-code-c.c
-    src/scan-gram-c.c
-    src/scan-skel-c.c
-    src/state.c
-    src/symlist.c
-    src/symtab.c
-    src/tables.c
-    src/uniqstr.c
-    arcadia_root.cpp.in
-)
-
-CFLAGS(
-    -Daccept=bison_accept
-    -DBISON_DATA_DIR="contrib/tools/bison/bison/data"
-)
-
-PEERDIR(
-    contrib/tools/bison/gnulib
-)
-
-END()
diff --git a/contrib/tools/bison/gnulib/.yandex_meta/licenses.list.txt b/contrib/tools/bison/gnulib/.yandex_meta/licenses.list.txt
deleted file mode 100644
index 8d30fca783..0000000000
--- a/contrib/tools/bison/gnulib/.yandex_meta/licenses.list.txt
+++ /dev/null
@@ -1,1054 +0,0 @@
-====================BSD-3-Clause====================
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-//
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-====================COPYRIGHT====================
-    Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation,
-    Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1988-1994, 1996-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990, 2001, 2003-2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990-1998, 2000-2007, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990-2000, 2002-2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1991, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1991-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2013 Free Software Foundation,
-   Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1996-1999, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1996-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1997-1998, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1997-2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-1999, 2001, 2003, 2009-2013 Free Software Foundation,
-   Inc.
-   Written by Jim Meyering <meyering@ascend.com>, 1998.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-2001, 2003, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-2002, 2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-2002, 2004-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1998-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002, 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2002-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999, 2004-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999-2000, 2002-2003, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1999-2002, 2005-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2002, 2004, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2002, 2004, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2003-2004, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2003, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU CHARSET Library.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2004, 2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2003, 2005, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2003, 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2003, 2006-2007, 2009-2013 Free Software Foundation,
-   Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2006.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2003-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2004, 2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2004-2006, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2002.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2006-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2002.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2003, 2008-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2001.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2004, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2004, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2001-2005, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2004, 2006, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2004, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2003, 2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2003, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003-2004, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006, 2011-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2006.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006-2007, 2010-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2007, 2010-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-
-====================COPYRIGHT====================
-   Copyright 2000-2003, 2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright 2002-2003, 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright 2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013
-   Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1991, 1994-2002, 2005, 2008-2013 Free Software Foundation,
-   Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1991, 1997, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1992, 1995-2002, 2005-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is derived from the one in the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1999, 2001-2002, 2006, 2009-2013 Free Software Foundation,
-   Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 2000, 2004, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Copyright (C) 2000, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-
-====================COPYRIGHT====================
-/* Sequential list data type implemented by a hash table with a linked list.
-   Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2006.
-
-
-====================COPYRIGHT====================
-/* Variable with FSF copyright information, for version-etc.
-   Copyright (C) 1999-2006, 2009-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-//  Copyright (c) 2006-2013 Alexander Chemeris
-
-
-====================COPYRIGHT====================
-Copyright d Free Software Foundation, Inc.
-
-====================File: gnulib/src/filenamecat-lgpl.c====================
-/* Concatenate two arbitrary file names.
-
-   Copyright (C) 1996-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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Jim Meyering.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "filenamecat.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "dirname.h"
-
-#if ! HAVE_MEMPCPY && ! defined mempcpy
-# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
-#endif
-
-/* Return the longest suffix of F that is a relative file name.
-   If it has no such suffix, return the empty string.  */
-
-static char const * _GL_ATTRIBUTE_PURE
-longest_relative_suffix (char const *f)
-{
-  for (f += FILE_SYSTEM_PREFIX_LEN (f); ISSLASH (*f); f++)
-    continue;
-  return f;
-}
-
-/* Concatenate two file name components, DIR and ABASE, in
-   newly-allocated storage and return the result.
-   The resulting file name F is such that the commands "ls F" and "(cd
-   DIR; ls BASE)" refer to the same file, where BASE is ABASE with any
-   file system prefixes and leading separators removed.
-   Arrange for a directory separator if necessary between DIR and BASE
-   in the result, removing any redundant separators.
-   In any case, if BASE_IN_RESULT is non-NULL, set
-   *BASE_IN_RESULT to point to the copy of ABASE in the returned
-   concatenation.  However, if ABASE begins with more than one slash,
-   set *BASE_IN_RESULT to point to the sole corresponding slash that
-   is copied into the result buffer.
-
-   Return NULL if malloc fails.  */
-
-char *
-mfile_name_concat (char const *dir, char const *abase, char **base_in_result)
-{
-  char const *dirbase = last_component (dir);
-  size_t dirbaselen = base_len (dirbase);
-  size_t dirlen = dirbase - dir + dirbaselen;
-  size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));
-
-  char const *base = longest_relative_suffix (abase);
-  size_t baselen = strlen (base);
-
-  char *p_concat = malloc (dirlen + needs_separator + baselen + 1);
-  char *p;
-
-  if (p_concat == NULL)
-    return NULL;
-
-  p = mempcpy (p_concat, dir, dirlen);
-  *p = DIRECTORY_SEPARATOR;
-  p += needs_separator;
-
-  if (base_in_result)
-    *base_in_result = p - IS_ABSOLUTE_FILE_NAME (abase);
-
-  p = mempcpy (p, base, baselen);
-  *p = '\0';
-
-  return p_concat;
-}
-
-
-====================GPL-3.0-or-later====================
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, see
-   <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n\
-
-
-====================GPL-3.0-or-later====================
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================GPL-3.0-or-later====================
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-
-====================LGPL-2.0-or-later====================
-/* Just like mfile_name_concat (filenamecat-lgpl.c), except, rather than
diff --git a/contrib/tools/bison/gnulib/platform/posix/time.h b/contrib/tools/bison/gnulib/platform/posix/time.h
deleted file mode 100644
index c472f89c7f..0000000000
--- a/contrib/tools/bison/gnulib/platform/posix/time.h
+++ /dev/null
@@ -1,560 +0,0 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-/* A more-standard <time.h>.
-
-   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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-
-/* Don't get in the way of glibc when it includes time.h merely to
-   declare a few standard symbols, rather than to declare all the
-   symbols.  Also, Solaris 8 <time.h> eventually includes itself
-   recursively; if that is happening, just include the system <time.h>
-   without adding our own declarations.  */
-#if (defined __need_time_t || defined __need_clock_t \
-     || defined __need_timespec \
-     || defined _GL_M4_TIME_H)
-
-# include_next <time.h>
-
-#else
-
-# define _GL_M4_TIME_H
-
-# include_next <time.h>
-
-/* NetBSD 5.0 mis-defines NULL.  */
-# include <stddef.h>
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-#ifndef _GL_CXXDEFS_H
-#define _GL_CXXDEFS_H
-
-/* The three most frequent use cases of these macros are:
-
-   * For providing a substitute for a function that is missing on some
-     platforms, but is declared and works fine on the platforms on which
-     it exists:
-
-       #if @GNULIB_FOO@
-       # if !@HAVE_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       # endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on all platforms,
-     but is broken/insufficient and needs to be replaced on some platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-
-   * For providing a replacement for a function that exists on some platforms
-     but is broken/insufficient and needs to be replaced on some of them and
-     is additionally either missing or undeclared on some other platforms:
-
-       #if @GNULIB_FOO@
-       # if @REPLACE_FOO@
-       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-       #   undef foo
-       #   define foo rpl_foo
-       #  endif
-       _GL_FUNCDECL_RPL (foo, ...);
-       _GL_CXXALIAS_RPL (foo, ...);
-       # else
-       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
-       _GL_FUNCDECL_SYS (foo, ...);
-       #  endif
-       _GL_CXXALIAS_SYS (foo, ...);
-       # endif
-       _GL_CXXALIASWARN (foo);
-       #elif defined GNULIB_POSIXCHECK
-       ...
-       #endif
-*/
-
-/* _GL_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#if defined __cplusplus
-# define _GL_EXTERN_C extern "C"
-#else
-# define _GL_EXTERN_C extern
-#endif
-
-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
-   declares a replacement function, named rpl_func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
-  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
-
-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
-   declares the system function, named func, with the given prototype,
-   consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
- */
-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype func parameters_and_attributes
-
-/* _GL_CXXALIAS_RPL (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
-   Example:
-     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
- */
-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
-  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                \
-    {                                                         \
-      rettype (*const func) parameters = ::rpl_func;          \
-    }                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
-   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
-   except that the C function rpl_func may have a slightly different
-   declaration.  A cast is used to silence the "invalid conversion" error
-   that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                                     \
-    {                                                              \
-      rettype (*const func) parameters =                           \
-        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
-    }                                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS (func, rettype, parameters);
-   declares a C++ alias called GNULIB_NAMESPACE::func
-   that redirects to the system provided function func, if GNULIB_NAMESPACE
-   is defined.
-   Example:
-     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
- */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* If we were to write
-       rettype (*const func) parameters = ::func;
-     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
-     better (remove an indirection through a 'static' pointer variable),
-     but then the _GL_CXXALIASWARN macro below would cause a warning not only
-     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                     \
-    {                                              \
-      static rettype (*func) parameters = ::func;  \
-    }                                              \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function func may have a slightly different declaration.
-   A cast is used to silence the "invalid conversion" error that would
-   otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    namespace GNULIB_NAMESPACE                          \
-    {                                                   \
-      static rettype (*func) parameters =               \
-        reinterpret_cast<rettype(*)parameters>(::func); \
-    }                                                   \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
-   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-   except that the C function is picked among a set of overloaded functions,
-   namely the one with rettype2 and parameters2.  Two consecutive casts
-   are used to silence the "cannot find a match" and "invalid conversion"
-   errors that would otherwise occur.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-  /* The outer cast must be a reinterpret_cast.
-     The inner cast: When the function is defined as a set of overloaded
-     functions, it works as a static_cast<>, choosing the designated variant.
-     When the function is defined as a single variant, it works as a
-     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    namespace GNULIB_NAMESPACE                                                \
-    {                                                                         \
-      static rettype (*func) parameters =                                     \
-        reinterpret_cast<rettype(*)parameters>(                               \
-          (rettype2(*)parameters2)(::func));                                  \
-    }                                                                         \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#else
-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN (func);
-   causes a warning to be emitted when ::func is used but not when
-   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
-   variants.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN(func) \
-   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN_1(func,namespace) \
-   _GL_CXXALIASWARN_2 (func, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-    _GL_WARN_ON_USE (func, \
-                     "The symbol ::" #func " refers to the system function. " \
-                     "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN_2(func,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN(func) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
-   causes a warning to be emitted when the given overloaded variant of ::func
-   is used but not when GNULIB_NAMESPACE::func is used.  */
-#if defined __cplusplus && defined GNULIB_NAMESPACE
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
-                        GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
-   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-   we enable the warning only when not optimizing.  */
-# if !__OPTIMIZE__
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
-                         "The symbol ::" #func " refers to the system function. " \
-                         "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     extern __typeof__ (func) func
-# else
-#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-     _GL_EXTERN_C int _gl_cxxalias_dummy
-# endif
-#else
-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-    _GL_EXTERN_C int _gl_cxxalias_dummy
-#endif
-
-#endif /* _GL_CXXDEFS_H */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-   that the values passed as arguments n, ..., m must be non-NULL pointers.
-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-#ifndef _GL_ARG_NONNULL
-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-# else
-#  define _GL_ARG_NONNULL(params)
-# endif
-#endif
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-#ifndef _GL_WARN_ON_USE
-
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE(function, message) \
-extern __typeof__ (function) function
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE(function, message) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
-   is like _GL_WARN_ON_USE (function, "string"), except that the function is
-   declared with the given prototype, consisting of return type, parameters,
-   and attributes.
-   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
-   not work in this case.  */
-#ifndef _GL_WARN_ON_USE_CXX
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes \
-     __attribute__ ((__warning__ (msg)))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-/* Verify the existence of the function.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-extern rettype function parameters_and_attributes
-# else /* Unsupported.  */
-#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-_GL_WARN_EXTERN_C int _gl_warn_on_use
-# endif
-#endif
-
-/* _GL_WARN_EXTERN_C declaration;
-   performs the declaration with C linkage.  */
-#ifndef _GL_WARN_EXTERN_C
-# if defined __cplusplus
-#  define _GL_WARN_EXTERN_C extern "C"
-# else
-#  define _GL_WARN_EXTERN_C extern
-# endif
-#endif
-
-/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
-   Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
-   pthreads-win32 library defines it in <pthread.h>.  */
-# if ! 1
-#  if 0
-#   include <sys/time.h>
-#  elif 0
-#   include <pthread.h>
-/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
-#   undef asctime_r
-#   undef ctime_r
-#   undef gmtime_r
-#   undef localtime_r
-#   undef rand_r
-#   undef strtok_r
-#  else
-
-#   ifdef __cplusplus
-extern "C" {
-#   endif
-
-#   if !GNULIB_defined_struct_timespec
-#    undef timespec
-#    define timespec rpl_timespec
-struct timespec
-{
-  time_t tv_sec;
-  long int tv_nsec;
-};
-#    define GNULIB_defined_struct_timespec 1
-#   endif
-
-#   ifdef __cplusplus
-}
-#   endif
-
-#  endif
-# endif
-
-# if !GNULIB_defined_struct_time_t_must_be_integral
-/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
-   time_t to be an integer type, even though C99 permits floating
-   point.  We don't know of any implementation that uses floating
-   point, and it is much easier to write code that doesn't have to
-   worry about that corner case, so we force the issue.  */
-struct __time_t_must_be_integral {
-  unsigned int __floating_time_t_unsupported : (time_t) 1;
-};
-#  define GNULIB_defined_struct_time_t_must_be_integral 1
-# endif
-
-/* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
-   return -1 and store the remaining time into RMTP.  See
-   <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
-# if 0
-#  if GNULIB_PORTCHECK
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define nanosleep rpl_nanosleep
-#   endif
-_GL_FUNCDECL_RPL (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp)
-                  _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp));
-#  else
-#   if ! 1
-_GL_FUNCDECL_SYS (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp)
-                  _GL_ARG_NONNULL ((1)));
-#   endif
-_GL_CXXALIAS_SYS (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp));
-#  endif
-_GL_CXXALIASWARN (nanosleep);
-# endif
-
-/* Return the 'time_t' representation of TP and normalize TP.  */
-# if 0
-#  if GNULIB_PORTCHECK
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    define mktime rpl_mktime
-#   endif
-_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp));
-#  else
-_GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp));
-#  endif
-_GL_CXXALIASWARN (mktime);
-# endif
-
-/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
-   <http://www.opengroup.org/susv3xsh/localtime_r.html> and
-   <http://www.opengroup.org/susv3xsh/gmtime_r.html>.  */
-# if 0
-#  if GNULIB_PORTCHECK
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef localtime_r
-#    define localtime_r rpl_localtime_r
-#   endif
-_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result)
-                                            _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result));
-#  else
-#   if ! 1
-_GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result)
-                                            _GL_ARG_NONNULL ((1, 2)));
-#   endif
-_GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result));
-#  endif
-#  if 1
-_GL_CXXALIASWARN (localtime_r);
-#  endif
-#  if GNULIB_PORTCHECK
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef gmtime_r
-#    define gmtime_r rpl_gmtime_r
-#   endif
-_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result)
-                                         _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result));
-#  else
-#   if ! 1
-_GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result)
-                                         _GL_ARG_NONNULL ((1, 2)));
-#   endif
-_GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result));
-#  endif
-#  if 1
-_GL_CXXALIASWARN (gmtime_r);
-#  endif
-# endif
-
-/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
-   the resulting broken-down time into TM.  See
-   <http://www.opengroup.org/susv3xsh/strptime.html>.  */
-# if 0
-#  if ! 1
-_GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf,
-                                     char const *restrict __format,
-                                     struct tm *restrict __tm)
-                                    _GL_ARG_NONNULL ((1, 2, 3)));
-#  endif
-_GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
-                                     char const *restrict __format,
-                                     struct tm *restrict __tm));
-_GL_CXXALIASWARN (strptime);
-# endif
-
-/* Convert TM to a time_t value, assuming UTC.  */
-# if 0
-#  if GNULIB_PORTCHECK
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef timegm
-#    define timegm rpl_timegm
-#   endif
-_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm));
-#  else
-#   if ! 1
-_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
-#   endif
-_GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
-#  endif
-_GL_CXXALIASWARN (timegm);
-# endif
-
-/* Encourage applications to avoid unsafe functions that can overrun
-   buffers when given outlandish struct tm values.  Portable
-   applications should use strftime (or even sprintf) instead.  */
-# if defined GNULIB_POSIXCHECK
-#  undef asctime
-_GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - "
-                 "better use strftime (or even sprintf) instead");
-# endif
-# if defined GNULIB_POSIXCHECK
-#  undef asctime_r
-_GL_WARN_ON_USE (asctime, "asctime_r can overrun buffers in some cases - "
-                 "better use strftime (or even sprintf) instead");
-# endif
-# if defined GNULIB_POSIXCHECK
-#  undef ctime
-_GL_WARN_ON_USE (asctime, "ctime can overrun buffers in some cases - "
-                 "better use strftime (or even sprintf) instead");
-# endif
-# if defined GNULIB_POSIXCHECK
-#  undef ctime_r
-_GL_WARN_ON_USE (asctime, "ctime_r can overrun buffers in some cases - "
-                 "better use strftime (or even sprintf) instead");
-# endif
-
-#endif
diff --git a/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled b/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled
deleted file mode 100644
index 35ff0479f4..0000000000
--- a/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled
+++ /dev/null
@@ -1,265 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-//  Copyright (c) 2006-2013 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-//
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-
-#ifndef _MSC_STDINT_H_
-
-#if _MSC_VER >= 1600
-#  ifndef __clang__
-#     include <../include/stdint.h>
-#  else
-#     include_next <stdint.h>
-#  endif
-#endif
-
-#ifndef _MSC_STDINT_H_
-#define _MSC_STDINT_H_
-
-#if _MSC_VER < 1600
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
-extern "C" {
-#endif
-#  include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_VER < 1600 ]
-
-#endif // _MSC_STDINT_H_ ]
-#endif // _MSC_STDINT_H_ ]
diff --git a/contrib/tools/bison/gnulib/src/btowc.c b/contrib/tools/bison/gnulib/src/btowc.c
deleted file mode 100644
index 6c7cbec9d4..0000000000
--- a/contrib/tools/bison/gnulib/src/btowc.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2008.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <wchar.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-wint_t
-btowc (int c)
-{
-  if (c != EOF)
-    {
-      char buf[1];
-      wchar_t wc;
-
-      buf[0] = c;
-      if (mbtowc (&wc, buf, 1) >= 0)
-        return wc;
-    }
-  return WEOF;
-}
diff --git a/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c b/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c
deleted file mode 100644
index 5cc9c5b4a0..0000000000
--- a/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBC
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-# define _GL_ARG_NONNULL(params)
-
-# define _GL_USE_STDLIB_ALLOC 1
-# include <config.h>
-#endif
-
-#if !HAVE_CANONICALIZE_FILE_NAME || !FUNC_REALPATH_WORKS || defined _LIBC
-
-/* Specification.  */
-#include <stdlib.h>
-
-#include "palloca.h"
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-#if HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-#include <stddef.h>
-
-#ifdef _LIBC
-# include <shlib-compat.h>
-#else
-# define SHLIB_COMPAT(lib, introduced, obsoleted) 0
-# define versioned_symbol(lib, local, symbol, version) extern int dummy
-# define compat_symbol(lib, local, symbol, version)
-# define weak_alias(local, symbol)
-# define __canonicalize_file_name canonicalize_file_name
-# define __realpath realpath
-# include "pathmax.h"
-# include "malloca.h"
-# include "dosname.h"
-# if HAVE_GETCWD
-#  if IN_RELOCWRAPPER
-    /* When building the relocatable program wrapper, use the system's getcwd
-       function, not the gnulib override, otherwise we would get a link error.
-     */
-#   undef getcwd
-#  endif
-#  ifdef VMS
-    /* We want the directory in Unix syntax, not in VMS syntax.  */
-#   define __getcwd(buf, max) getcwd (buf, max, 0)
-#  else
-#   define __getcwd getcwd
-#  endif
-# else
-#  define __getcwd(buf, max) getwd (buf)
-# endif
-# define __readlink readlink
-# define __set_errno(e) errno = (e)
-# ifndef MAXSYMLINKS
-#  ifdef SYMLOOP_MAX
-#   define MAXSYMLINKS SYMLOOP_MAX
-#  else
-#   define MAXSYMLINKS 20
-#  endif
-# endif
-#endif
-
-#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
-# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
-#endif
-
-#if !FUNC_REALPATH_WORKS || defined _LIBC
-/* Return the canonical absolute name of file NAME.  A canonical name
-   does not contain any ".", ".." components nor any repeated path
-   separators ('/') or symlinks.  All path components must exist.  If
-   RESOLVED is null, the result is malloc'd; otherwise, if the
-   canonical name is PATH_MAX chars or more, returns null with 'errno'
-   set to ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
-   returns the name in RESOLVED.  If the name cannot be resolved and
-   RESOLVED is non-NULL, it contains the path of the first component
-   that cannot be resolved.  If the path can be resolved, RESOLVED
-   holds the same value as the value returned.  */
-
-char *
-__realpath (const char *name, char *resolved)
-{
-  char *rpath, *dest, *extra_buf = NULL;
-  const char *start, *end, *rpath_limit;
-  long int path_max;
-  int num_links = 0;
-  size_t prefix_len;
-
-  if (name == NULL)
-    {
-      /* As per Single Unix Specification V2 we must return an error if
-         either parameter is a null pointer.  We extend this to allow
-         the RESOLVED parameter to be NULL in case the we are expected to
-         allocate the room for the return value.  */
-      __set_errno (EINVAL);
-      return NULL;
-    }
-
-  if (name[0] == '\0')
-    {
-      /* As per Single Unix Specification V2 we must return an error if
-         the name argument points to an empty string.  */
-      __set_errno (ENOENT);
-      return NULL;
-    }
-
-#ifdef PATH_MAX
-  path_max = PATH_MAX;
-#else
-  path_max = pathconf (name, _PC_PATH_MAX);
-  if (path_max <= 0)
-    path_max = 8192;
-#endif
-
-  if (resolved == NULL)
-    {
-      rpath = malloc (path_max);
-      if (rpath == NULL)
-        {
-          /* It's easier to set errno to ENOMEM than to rely on the
-             'malloc-posix' gnulib module.  */
-          errno = ENOMEM;
-          return NULL;
-        }
-    }
-  else
-    rpath = resolved;
-  rpath_limit = rpath + path_max;
-
-  /* This is always zero for Posix hosts, but can be 2 for MS-Windows
-     and MS-DOS X:/foo/bar file names.  */
-  prefix_len = FILE_SYSTEM_PREFIX_LEN (name);
-
-  if (!IS_ABSOLUTE_FILE_NAME (name))
-    {
-      if (!__getcwd (rpath, path_max))
-        {
-          rpath[0] = '\0';
-          goto error;
-        }
-      dest = strchr (rpath, '\0');
-      start = name;
-      prefix_len = FILE_SYSTEM_PREFIX_LEN (rpath);
-    }
-  else
-    {
-      dest = rpath;
-      if (prefix_len)
-        {
-          memcpy (rpath, name, prefix_len);
-          dest += prefix_len;
-        }
-      *dest++ = '/';
-      if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-        {
-          if (ISSLASH (name[1]) && !ISSLASH (name[2]) && !prefix_len)
-            *dest++ = '/';
-          *dest = '\0';
-        }
-      start = name + prefix_len;
-    }
-
-  for (end = start; *start; start = end)
-    {
-#ifdef _LIBC
-      struct stat64 st;
-#else
-      struct stat st;
-#endif
-      int n;
-
-      /* Skip sequence of multiple path-separators.  */
-      while (ISSLASH (*start))
-        ++start;
-
-      /* Find end of path component.  */
-      for (end = start; *end && !ISSLASH (*end); ++end)
-        /* Nothing.  */;
-
-      if (end - start == 0)
-        break;
-      else if (end - start == 1 && start[0] == '.')
-        /* nothing */;
-      else if (end - start == 2 && start[0] == '.' && start[1] == '.')
-        {
-          /* Back up to previous component, ignore if at root already.  */
-          if (dest > rpath + prefix_len + 1)
-            for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-              continue;
-          if (DOUBLE_SLASH_IS_DISTINCT_ROOT
-              && dest == rpath + 1 && !prefix_len
-              && ISSLASH (*dest) && !ISSLASH (dest[1]))
-            dest++;
-        }
-      else
-        {
-          size_t new_size;
-
-          if (!ISSLASH (dest[-1]))
-            *dest++ = '/';
-
-          if (dest + (end - start) >= rpath_limit)
-            {
-              ptrdiff_t dest_offset = dest - rpath;
-              char *new_rpath;
-
-              if (resolved)
-                {
-                  __set_errno (ENAMETOOLONG);
-                  if (dest > rpath + prefix_len + 1)
-                    dest--;
-                  *dest = '\0';
-                  goto error;
-                }
-              new_size = rpath_limit - rpath;
-              if (end - start + 1 > path_max)
-                new_size += end - start + 1;
-              else
-                new_size += path_max;
-              new_rpath = (char *) realloc (rpath, new_size);
-              if (new_rpath == NULL)
-                {
-                  /* It's easier to set errno to ENOMEM than to rely on the
-                     'realloc-posix' gnulib module.  */
-                  errno = ENOMEM;
-                  goto error;
-                }
-              rpath = new_rpath;
-              rpath_limit = rpath + new_size;
-
-              dest = rpath + dest_offset;
-            }
-
-#ifdef _LIBC
-          dest = __mempcpy (dest, start, end - start);
-#else
-          memcpy (dest, start, end - start);
-          dest += end - start;
-#endif
-          *dest = '\0';
-
-#ifdef _LIBC
-          if (__lxstat64 (_STAT_VER, rpath, &st) < 0)
-#else
-          if (lstat (rpath, &st) < 0)
-#endif
-            goto error;
-
-          if (S_ISLNK (st.st_mode))
-            {
-              char *buf;
-              size_t len;
-
-              if (++num_links > MAXSYMLINKS)
-                {
-                  __set_errno (ELOOP);
-                  goto error;
-                }
-
-              buf = malloca (path_max);
-              if (!buf)
-                {
-                  errno = ENOMEM;
-                  goto error;
-                }
-
-              n = __readlink (rpath, buf, path_max - 1);
-              if (n < 0)
-                {
-                  int saved_errno = errno;
-                  freea (buf);
-                  errno = saved_errno;
-                  goto error;
-                }
-              buf[n] = '\0';
-
-              if (!extra_buf)
-                {
-                  extra_buf = malloca (path_max);
-                  if (!extra_buf)
-                    {
-                      freea (buf);
-                      errno = ENOMEM;
-                      goto error;
-                    }
-                }
-
-              len = strlen (end);
-              if ((long int) (n + len) >= path_max)
-                {
-                  freea (buf);
-                  __set_errno (ENAMETOOLONG);
-                  goto error;
-                }
-
-              /* Careful here, end may be a pointer into extra_buf... */
-              memmove (&extra_buf[n], end, len + 1);
-              name = end = memcpy (extra_buf, buf, n);
-
-              if (IS_ABSOLUTE_FILE_NAME (buf))
-                {
-                  size_t pfxlen = FILE_SYSTEM_PREFIX_LEN (buf);
-
-                  if (pfxlen)
-                    memcpy (rpath, buf, pfxlen);
-                  dest = rpath + pfxlen;
-                  *dest++ = '/'; /* It's an absolute symlink */
-                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT)
-                    {
-                      if (ISSLASH (buf[1]) && !ISSLASH (buf[2]) && !pfxlen)
-                        *dest++ = '/';
-                      *dest = '\0';
-                    }
-                  /* Install the new prefix to be in effect hereafter.  */
-                  prefix_len = pfxlen;
-                }
-              else
-                {
-                  /* Back up to previous component, ignore if at root
-                     already: */
-                  if (dest > rpath + prefix_len + 1)
-                    for (--dest; dest > rpath && !ISSLASH (dest[-1]); --dest)
-                      continue;
-                  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
-                      && ISSLASH (*dest) && !ISSLASH (dest[1]) && !prefix_len)
-                    dest++;
-                }
-            }
-          else if (!S_ISDIR (st.st_mode) && *end != '\0')
-            {
-              __set_errno (ENOTDIR);
-              goto error;
-            }
-        }
-    }
-  if (dest > rpath + prefix_len + 1 && ISSLASH (dest[-1]))
-    --dest;
-  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && !prefix_len
-      && ISSLASH (*dest) && !ISSLASH (dest[1]))
-    dest++;
-  *dest = '\0';
-
-  if (extra_buf)
-    freea (extra_buf);
-
-  return rpath;
-
-error:
-  {
-    int saved_errno = errno;
-    if (extra_buf)
-      freea (extra_buf);
-    if (resolved == NULL)
-      free (rpath);
-    errno = saved_errno;
-  }
-  return NULL;
-}
-versioned_symbol (libc, __realpath, realpath, GLIBC_2_3);
-#endif /* !FUNC_REALPATH_WORKS || defined _LIBC */
-
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3)
-char *
-attribute_compat_text_section
-__old_realpath (const char *name, char *resolved)
-{
-  if (resolved == NULL)
-    {
-      __set_errno (EINVAL);
-      return NULL;
-    }
-
-  return __realpath (name, resolved);
-}
-compat_symbol (libc, __old_realpath, realpath, GLIBC_2_0);
-#endif
-
-
-char *
-__canonicalize_file_name (const char *name)
-{
-  return __realpath (name, NULL);
-}
-weak_alias (__canonicalize_file_name, canonicalize_file_name)
-
-#else
-
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
-
-#endif
diff --git a/contrib/tools/bison/gnulib/src/fprintf.c b/contrib/tools/bison/gnulib/src/fprintf.c
deleted file mode 100644
index 450d7f1ea8..0000000000
--- a/contrib/tools/bison/gnulib/src/fprintf.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Formatted output to a stream.
-   Copyright (C) 2004, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if 1
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "fseterr.h"
-#include "vasnprintf.h"
-
-/* Print formatted output to the stream FP.
-   Return string length of formatted string.  On error, return a negative
-   value.  */
-int
-fprintf (FILE *fp, const char *format, ...)
-{
-  char buf[2000];
-  char *output;
-  size_t len;
-  size_t lenbuf = sizeof (buf);
-  va_list args;
-
-  va_start (args, format);
-  output = vasnprintf (buf, &lenbuf, format, args);
-  len = lenbuf;
-  va_end (args);
-
-  if (!output)
-    {
-      fseterr (fp);
-      return -1;
-    }
-
-  if (fwrite (output, 1, len, fp) < len)
-    {
-      if (output != buf)
-        {
-          int saved_errno = errno;
-          free (output);
-          errno = saved_errno;
-        }
-      return -1;
-    }
-
-  if (output != buf)
-    free (output);
-
-  if (len > INT_MAX)
-    {
-      errno = EOVERFLOW;
-      fseterr (fp);
-      return -1;
-    }
-
-  return len;
-}
diff --git a/contrib/tools/bison/gnulib/src/fseek.c b/contrib/tools/bison/gnulib/src/fseek.c
deleted file mode 100644
index 4708287c30..0000000000
--- a/contrib/tools/bison/gnulib/src/fseek.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* An fseek() function that, together with fflush(), is POSIX compliant.
-   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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <stdio.h>
-
-/* Get off_t.  */
-#include <unistd.h>
-
-int
-fseek (FILE *fp, long offset, int whence)
-{
-  /* Use the replacement fseeko function with all its workarounds.  */
-  return fseeko (fp, (off_t)offset, whence);
-}
diff --git a/contrib/tools/bison/gnulib/src/glthread/lock.c b/contrib/tools/bison/gnulib/src/glthread/lock.c
deleted file mode 100644
index f62aa301fe..0000000000
--- a/contrib/tools/bison/gnulib/src/glthread/lock.c
+++ /dev/null
@@ -1,1057 +0,0 @@
-/* Locking in multithreaded situations.
-   Copyright (C) 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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2005.
-   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
-   gthr-win32.h.  */
-
-#include <config.h>
-
-#include "glthread/lock.h"
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if HAVE_PTHREAD_RWLOCK
-
-#  if !defined PTHREAD_RWLOCK_INITIALIZER
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_rwlock_init (&lock->rwlock, NULL);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_rdlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_rwlock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_rwlock_wrlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_rwlock_unlock (&lock->rwlock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_rwlock_destroy (&lock->rwlock);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->lock, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_readers, NULL);
-  if (err != 0)
-    return err;
-  err = pthread_cond_init (&lock->waiting_writers, NULL);
-  if (err != 0)
-    return err;
-  lock->waiting_writers_count = 0;
-  lock->runcount = 0;
-  return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  /* POSIX says: "It is implementation-defined whether the calling thread
-     acquires the lock when a writer does not hold the lock and there are
-     writers blocked on the lock."  Let's say, no: give the writers a higher
-     priority.  */
-  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      err = pthread_cond_wait (&lock->waiting_readers, &lock->lock);
-      if (err != 0)
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-    }
-  lock->runcount++;
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  /* Test whether no readers or writers are currently running.  */
-  while (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      lock->waiting_writers_count++;
-      err = pthread_cond_wait (&lock->waiting_writers, &lock->lock);
-      if (err != 0)
-        {
-          lock->waiting_writers_count--;
-          pthread_mutex_unlock (&lock->lock);
-          return err;
-        }
-      lock->waiting_writers_count--;
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_lock (&lock->lock);
-  if (err != 0)
-    return err;
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          pthread_mutex_unlock (&lock->lock);
-          return EINVAL;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers_count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          err = pthread_cond_signal (&lock->waiting_writers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          err = pthread_cond_broadcast (&lock->waiting_readers);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->lock);
-              return err;
-            }
-        }
-    }
-  return pthread_mutex_unlock (&lock->lock);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_destroy (&lock->lock);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_readers);
-  if (err != 0)
-    return err;
-  err = pthread_cond_destroy (&lock->waiting_writers);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-# if HAVE_PTHREAD_MUTEX_RECURSIVE
-
-#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (lock, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  return 0;
-}
-
-#  else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_mutexattr_t attributes;
-  int err;
-
-  err = pthread_mutexattr_init (&attributes);
-  if (err != 0)
-    return err;
-  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutex_init (&lock->recmutex, &attributes);
-  if (err != 0)
-    {
-      pthread_mutexattr_destroy (&attributes);
-      return err;
-    }
-  err = pthread_mutexattr_destroy (&attributes);
-  if (err != 0)
-    return err;
-  lock->initialized = 1;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->guard);
-      if (err != 0)
-        return err;
-      if (!lock->initialized)
-        {
-          err = glthread_recursive_lock_init_multithreaded (lock);
-          if (err != 0)
-            {
-              pthread_mutex_unlock (&lock->guard);
-              return err;
-            }
-        }
-      err = pthread_mutex_unlock (&lock->guard);
-      if (err != 0)
-        return err;
-    }
-  return pthread_mutex_lock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (!lock->initialized)
-    return EINVAL;
-  return pthread_mutex_unlock (&lock->recmutex);
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  if (!lock->initialized)
-    return EINVAL;
-  err = pthread_mutex_destroy (&lock->recmutex);
-  if (err != 0)
-    return err;
-  lock->initialized = 0;
-  return 0;
-}
-
-#  endif
-
-# else
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = pthread_mutex_init (&lock->mutex, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (pthread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  pthread_t self = pthread_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = pthread_mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != pthread_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (pthread_t) 0;
-      return pthread_mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (pthread_t) 0)
-    return EBUSY;
-  return pthread_mutex_destroy (&lock->mutex);
-}
-
-# endif
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
-
-int
-glthread_once_singlethreaded (pthread_once_t *once_control)
-{
-  /* We don't know whether pthread_once_t is an integer type, a floating-point
-     type, a pointer type, or a structure type.  */
-  char *firstbyte = (char *)once_control;
-  if (*firstbyte == *(const char *)&fresh_once)
-    {
-      /* First time use of once_control.  Invert the first byte.  */
-      *firstbyte = ~ *(const char *)&fresh_once;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static void
-glthread_once_call (void *arg)
-{
-  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
-  void (*initfunction) (void) = *gl_once_temp_addr;
-  initfunction ();
-}
-
-int
-glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void))
-{
-  void (*temp) (void) = initfunction;
-  return (!pth_once (once_control, glthread_once_call, &temp) ? errno : 0);
-}
-
-int
-glthread_once_singlethreaded (pth_once_t *once_control)
-{
-  /* We know that pth_once_t is an integer type.  */
-  if (*once_control == PTH_ONCE_INIT)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      *once_control = ~ PTH_ONCE_INIT;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
-  int err;
-
-  err = mutex_init (&lock->mutex, USYNC_THREAD, NULL);
-  if (err != 0)
-    return err;
-  lock->owner = (thread_t) 0;
-  lock->depth = 0;
-  return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
-  thread_t self = thr_self ();
-  if (lock->owner != self)
-    {
-      int err;
-
-      err = mutex_lock (&lock->mutex);
-      if (err != 0)
-        return err;
-      lock->owner = self;
-    }
-  if (++(lock->depth) == 0) /* wraparound? */
-    {
-      lock->depth--;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != thr_self ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = (thread_t) 0;
-      return mutex_unlock (&lock->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != (thread_t) 0)
-    return EBUSY;
-  return mutex_destroy (&lock->mutex);
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-int
-glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (!once_control->inited)
-    {
-      int err;
-
-      /* Use the mutex to guarantee that if another thread is already calling
-         the initfunction, this thread waits until it's finished.  */
-      err = mutex_lock (&once_control->mutex);
-      if (err != 0)
-        return err;
-      if (!once_control->inited)
-        {
-          once_control->inited = 1;
-          initfunction ();
-        }
-      return mutex_unlock (&once_control->mutex);
-    }
-  else
-    return 0;
-}
-
-int
-glthread_once_singlethreaded (gl_once_t *once_control)
-{
-  /* We know that gl_once_t contains an integer type.  */
-  if (!once_control->inited)
-    {
-      /* First time use of once_control.  Invert the marker.  */
-      once_control->inited = ~ 0;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-void
-glthread_lock_init_func (gl_lock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_lock_lock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_unlock_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_lock_destroy_func (gl_lock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* In this file, the waitqueues are implemented as circular arrays.  */
-#define gl_waitqueue_t gl_carray_waitqueue_t
-
-static void
-gl_waitqueue_init (gl_waitqueue_t *wq)
-{
-  wq->array = NULL;
-  wq->count = 0;
-  wq->alloc = 0;
-  wq->offset = 0;
-}
-
-/* Enqueues the current thread, represented by an event, in a wait queue.
-   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
-static HANDLE
-gl_waitqueue_add (gl_waitqueue_t *wq)
-{
-  HANDLE event;
-  unsigned int index;
-
-  if (wq->count == wq->alloc)
-    {
-      unsigned int new_alloc = 2 * wq->alloc + 1;
-      HANDLE *new_array =
-        (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
-      if (new_array == NULL)
-        /* No more memory.  */
-        return INVALID_HANDLE_VALUE;
-      /* Now is a good opportunity to rotate the array so that its contents
-         starts at offset 0.  */
-      if (wq->offset > 0)
-        {
-          unsigned int old_count = wq->count;
-          unsigned int old_alloc = wq->alloc;
-          unsigned int old_offset = wq->offset;
-          unsigned int i;
-          if (old_offset + old_count > old_alloc)
-            {
-              unsigned int limit = old_offset + old_count - old_alloc;
-              for (i = 0; i < limit; i++)
-                new_array[old_alloc + i] = new_array[i];
-            }
-          for (i = 0; i < old_count; i++)
-            new_array[i] = new_array[old_offset + i];
-          wq->offset = 0;
-        }
-      wq->array = new_array;
-      wq->alloc = new_alloc;
-    }
-  /* Whether the created event is a manual-reset one or an auto-reset one,
-     does not matter, since we will wait on it only once.  */
-  event = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (event == INVALID_HANDLE_VALUE)
-    /* No way to allocate an event.  */
-    return INVALID_HANDLE_VALUE;
-  index = wq->offset + wq->count;
-  if (index >= wq->alloc)
-    index -= wq->alloc;
-  wq->array[index] = event;
-  wq->count++;
-  return event;
-}
-
-/* Notifies the first thread from a wait queue and dequeues it.  */
-static void
-gl_waitqueue_notify_first (gl_waitqueue_t *wq)
-{
-  SetEvent (wq->array[wq->offset + 0]);
-  wq->offset++;
-  wq->count--;
-  if (wq->count == 0 || wq->offset == wq->alloc)
-    wq->offset = 0;
-}
-
-/* Notifies all threads from a wait queue and dequeues them all.  */
-static void
-gl_waitqueue_notify_all (gl_waitqueue_t *wq)
-{
-  unsigned int i;
-
-  for (i = 0; i < wq->count; i++)
-    {
-      unsigned int index = wq->offset + i;
-      if (index >= wq->alloc)
-        index -= wq->alloc;
-      SetEvent (wq->array[index]);
-    }
-  wq->count = 0;
-  wq->offset = 0;
-}
-
-void
-glthread_rwlock_init_func (gl_rwlock_t *lock)
-{
-  InitializeCriticalSection (&lock->lock);
-  gl_waitqueue_init (&lock->waiting_readers);
-  gl_waitqueue_init (&lock->waiting_writers);
-  lock->runcount = 0;
-  lock->guard.done = 1;
-}
-
-int
-glthread_rwlock_rdlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether only readers are currently running, and whether the runcount
-     field will not overflow.  */
-  if (!(lock->runcount + 1 > 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_readers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_readers, incremented lock->runcount.  */
-          if (!(lock->runcount > 0))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount + 1 > 0));
-        }
-    }
-  lock->runcount++;
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_wrlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_rwlock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  EnterCriticalSection (&lock->lock);
-  /* Test whether no readers or writers are currently running.  */
-  if (!(lock->runcount == 0))
-    {
-      /* This thread has to wait for a while.  Enqueue it among the
-         waiting_writers.  */
-      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
-      if (event != INVALID_HANDLE_VALUE)
-        {
-          DWORD result;
-          LeaveCriticalSection (&lock->lock);
-          /* Wait until another thread signals this event.  */
-          result = WaitForSingleObject (event, INFINITE);
-          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
-            abort ();
-          CloseHandle (event);
-          /* The thread which signalled the event already did the bookkeeping:
-             removed us from the waiting_writers, set lock->runcount = -1.  */
-          if (!(lock->runcount == -1))
-            abort ();
-          return 0;
-        }
-      else
-        {
-          /* Allocation failure.  Weird.  */
-          do
-            {
-              LeaveCriticalSection (&lock->lock);
-              Sleep (1);
-              EnterCriticalSection (&lock->lock);
-            }
-          while (!(lock->runcount == 0));
-        }
-    }
-  lock->runcount--; /* runcount becomes -1 */
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_unlock_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  EnterCriticalSection (&lock->lock);
-  if (lock->runcount < 0)
-    {
-      /* Drop a writer lock.  */
-      if (!(lock->runcount == -1))
-        abort ();
-      lock->runcount = 0;
-    }
-  else
-    {
-      /* Drop a reader lock.  */
-      if (!(lock->runcount > 0))
-        {
-          LeaveCriticalSection (&lock->lock);
-          return EPERM;
-        }
-      lock->runcount--;
-    }
-  if (lock->runcount == 0)
-    {
-      /* POSIX recommends that "write locks shall take precedence over read
-         locks", to avoid "writer starvation".  */
-      if (lock->waiting_writers.count > 0)
-        {
-          /* Wake up one of the waiting writers.  */
-          lock->runcount--;
-          gl_waitqueue_notify_first (&lock->waiting_writers);
-        }
-      else
-        {
-          /* Wake up all waiting readers.  */
-          lock->runcount += lock->waiting_readers.count;
-          gl_waitqueue_notify_all (&lock->waiting_readers);
-        }
-    }
-  LeaveCriticalSection (&lock->lock);
-  return 0;
-}
-
-int
-glthread_rwlock_destroy_func (gl_rwlock_t *lock)
-{
-  if (!lock->guard.done)
-    return EINVAL;
-  if (lock->runcount != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  if (lock->waiting_readers.array != NULL)
-    free (lock->waiting_readers.array);
-  if (lock->waiting_writers.array != NULL)
-    free (lock->waiting_writers.array);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init_func (gl_recursive_lock_t *lock)
-{
-  lock->owner = 0;
-  lock->depth = 0;
-  InitializeCriticalSection (&lock->lock);
-  lock->guard.done = 1;
-}
-
-int
-glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock)
-{
-  if (!lock->guard.done)
-    {
-      if (InterlockedIncrement (&lock->guard.started) == 0)
-        /* This thread is the first one to need this lock.  Initialize it.  */
-        glthread_recursive_lock_init (lock);
-      else
-        /* Yield the CPU while waiting for another thread to finish
-           initializing this lock.  */
-        while (!lock->guard.done)
-          Sleep (0);
-    }
-  {
-    DWORD self = GetCurrentThreadId ();
-    if (lock->owner != self)
-      {
-        EnterCriticalSection (&lock->lock);
-        lock->owner = self;
-      }
-    if (++(lock->depth) == 0) /* wraparound? */
-      {
-        lock->depth--;
-        return EAGAIN;
-      }
-  }
-  return 0;
-}
-
-int
-glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != GetCurrentThreadId ())
-    return EPERM;
-  if (lock->depth == 0)
-    return EINVAL;
-  if (--(lock->depth) == 0)
-    {
-      lock->owner = 0;
-      LeaveCriticalSection (&lock->lock);
-    }
-  return 0;
-}
-
-int
-glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock)
-{
-  if (lock->owner != 0)
-    return EBUSY;
-  DeleteCriticalSection (&lock->lock);
-  lock->guard.done = 0;
-  return 0;
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once_func (gl_once_t *once_control, void (*initfunction) (void))
-{
-  if (once_control->inited <= 0)
-    {
-      if (InterlockedIncrement (&once_control->started) == 0)
-        {
-          /* This thread is the first one to come to this once_control.  */
-          InitializeCriticalSection (&once_control->lock);
-          EnterCriticalSection (&once_control->lock);
-          once_control->inited = 0;
-          initfunction ();
-          once_control->inited = 1;
-          LeaveCriticalSection (&once_control->lock);
-        }
-      else
-        {
-          /* Undo last operation.  */
-          InterlockedDecrement (&once_control->started);
-          /* Some other thread has already started the initialization.
-             Yield the CPU while waiting for the other thread to finish
-             initializing and taking the lock.  */
-          while (once_control->inited < 0)
-            Sleep (0);
-          if (once_control->inited <= 0)
-            {
-              /* Take the lock.  This blocks until the other thread has
-                 finished calling the initfunction.  */
-              EnterCriticalSection (&once_control->lock);
-              LeaveCriticalSection (&once_control->lock);
-              if (!(once_control->inited > 0))
-                abort ();
-            }
-        }
-    }
-}
-
-#endif
-
-/* ========================================================================= */
diff --git a/contrib/tools/bison/gnulib/src/glthread/threadlib.c b/contrib/tools/bison/gnulib/src/glthread/threadlib.c
deleted file mode 100644
index b447657302..0000000000
--- a/contrib/tools/bison/gnulib/src/glthread/threadlib.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Multithreading primitives.
-   Copyright (C) 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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
-
-#include <config.h>
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-/* Use the POSIX threads library.  */
-
-# include <pthread.h>
-# include <stdlib.h>
-
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
-{
-  return arg;
-}
-
-int
-glthread_in_use (void)
-{
-  static int tested;
-  static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-  if (!tested)
-    {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
-        result = 0;
-      else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
-      tested = 1;
-    }
-  return result;
-}
-
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
diff --git a/contrib/tools/bison/gnulib/src/glthread/tls.c b/contrib/tools/bison/gnulib/src/glthread/tls.c
deleted file mode 100644
index bcd285c273..0000000000
--- a/contrib/tools/bison/gnulib/src/glthread/tls.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Thread-local storage in multithreaded situations.
-   Copyright (C) 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
-
-#include <config.h>
-
-#include "glthread/tls.h"
-
-/* ========================================================================= */
-
-#if USE_POSIX_THREADS
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_PTH_THREADS
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library.  */
-
-/* ------------------------- gl_tls_key_t datatype ------------------------- */
-
-void *
-glthread_tls_get_multithreaded (thread_key_t key)
-{
-  void *value;
-
-  if (thr_getspecific (key, &value) != 0)
-    abort ();
-  return value;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_WINDOWS_THREADS
-
-#endif
-
-/* ========================================================================= */
diff --git a/contrib/tools/bison/gnulib/src/intprops.h b/contrib/tools/bison/gnulib/src/intprops.h
deleted file mode 100644
index f57f9b4dda..0000000000
--- a/contrib/tools/bison/gnulib/src/intprops.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/* intprops.h -- properties of integer types
-
-   Copyright (C) 2001-2005, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Paul Eggert.  */
-
-#ifndef _GL_INTPROPS_H
-#define _GL_INTPROPS_H
-
-#include <limits.h>
-
-/* Return an integer value, converted to the same type as the integer
-   expression E after integer type promotion.  V is the unconverted value.  */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
-
-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
-
-/* The extra casts in the following macros work around compiler bugs,
-   e.g., in Cray C 5.0.3.0.  */
-
-/* True if the arithmetic type T is an integer type.  bool counts as
-   an integer.  */
-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
-
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement.  */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
-/* True if the arithmetic type T is signed.  */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-
-/* Return 1 if the integer expression E, after integer promotion, has
-   a signed type.  */
-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
-
-
-/* Minimum and maximum values for integer types and expressions.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-
-/* The maximum and minimum values for the integer type T.  */
-#define TYPE_MINIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) 0                                                         \
-        : TYPE_SIGNED_MAGNITUDE (t)                                     \
-        ? ~ (t) 0                                                       \
-        : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) -1                                                        \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-/* The maximum and minimum values for the type of the expression E,
-   after integer promotion.  E should not have side effects.  */
-#define _GL_INT_MINIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
-   : _GL_INT_CONVERT (e, 0))
-#define _GL_INT_MAXIMUM(e)                                              \
-  (_GL_INT_SIGNED (e)                                                   \
-   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-   : _GL_INT_NEGATE_CONVERT (e, 1))
-#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-
-
-/* Return 1 if the __typeof__ keyword works.  This could be done by
-   'configure', but for now it's easier to do it by hand.  */
-#if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C
-# define _GL_HAVE___TYPEOF__ 1
-#else
-# define _GL_HAVE___TYPEOF__ 0
-#endif
-
-/* Return 1 if the integer type or expression T might be signed.  Return 0
-   if it is definitely unsigned.  This macro does not evaluate its argument,
-   and expands to an integer constant expression.  */
-#if _GL_HAVE___TYPEOF__
-# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
-#else
-# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
-#endif
-
-/* Bound on length of the string representing an unsigned integer
-   value representable in B bits.  log10 (2.0) < 146/485.  The
-   smallest value of B where this bound is not tight is 2621.  */
-#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
-
-/* Bound on length of the string representing an integer type or expression T.
-   Subtract 1 for the sign bit if T is signed, and then add 1 more for
-   a minus sign if needed.
-
-   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
-   signed, this macro may overestimate the true bound by one byte when
-   applied to unsigned types of size 2, 4, 16, ... bytes.  */
-#define INT_STRLEN_BOUND(t)                                     \
-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-   + _GL_SIGNED_TYPE_OR_EXPR (t))
-
-/* Bound on buffer size needed to represent an integer type or expression T,
-   including the terminating null.  */
-#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
-
-
-/* Range overflow checks.
-
-   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
-   operators might not yield numerically correct answers due to
-   arithmetic overflow.  They do not rely on undefined or
-   implementation-defined behavior.  Their implementations are simple
-   and straightforward, but they are a bit harder to use than the
-   INT_<op>_OVERFLOW macros described below.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   Restrictions on *_RANGE_OVERFLOW macros:
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times,
-   so the arguments should not have side effects.  The arithmetic
-   arguments (including the MIN and MAX arguments) must be of the same
-   integer type after the usual arithmetic conversions, and the type
-   must have minimum value MIN and maximum MAX.  Unsigned types should
-   use a zero MIN of the proper type.
-
-   These macros are tuned for constant MIN and MAX.  For commutative
-   operations such as A + B, they are also tuned for constant B.  */
-
-/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
-  ((b) < 0                                              \
-   ? (a) < (min) - (b)                                  \
-   : (max) - (b) < (a))
-
-/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? (max) + (b) < (a)                                  \
-   : (a) < (min) + (b))
-
-/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  */
-#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
-  ((min) < 0                                            \
-   ? (a) < - (max)                                      \
-   : 0 < (a))
-
-/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Avoid && and || as they tickle
-   bugs in Sun C 5.11 2010/08/13 and other compilers; see
-   <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>.  */
-#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
-  ((b) < 0                                              \
-   ? ((a) < 0                                           \
-      ? (a) < (max) / (b)                               \
-      : (b) == -1                                       \
-      ? 0                                               \
-      : (min) / (b) < (a))                              \
-   : (b) == 0                                           \
-   ? 0                                                  \
-   : ((a) < 0                                           \
-      ? (a) < (min) / (b)                               \
-      : (max) / (b) < (a)))
-
-/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.  */
-#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
-  ((min) < 0 && (b) == -1 && (a) < - (max))
-
-/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Do not check for division by zero.
-   Mathematically, % should never overflow, but on x86-like hosts
-   INT_MIN % -1 traps, and the C standard permits this, so treat this
-   as an overflow too.  */
-#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
-  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
-
-/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
-   See above for restrictions.  Here, MIN and MAX are for A only, and B need
-   not be of the same type as the other arguments.  The C standard says that
-   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
-   A is negative then A << B has undefined behavior and A >> B has
-   implementation-defined behavior, but do not check these other
-   restrictions.  */
-#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
-  ((a) < 0                                              \
-   ? (a) < (min) >> (b)                                 \
-   : (max) >> (b) < (a))
-
-
-/* The _GL*_OVERFLOW macros have the same restrictions as the
-   *_RANGE_OVERFLOW macros, except that they do not assume that operands
-   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-   that the result (e.g., A + B) has that type.  */
-#define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-  ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-   : (a) < 0 ? (b) <= (a) + (b)                                         \
-   : (b) < 0 ? (a) <= (a) + (b)                                         \
-   : (a) + (b) < (b))
-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
-  ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
-   : (a) < 0 ? 1                                                        \
-   : (b) < 0 ? (a) - (b) <= (a)                                         \
-   : (a) < (b))
-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
-  (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
-   || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
-#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
-   : (b) < 0 && (a) + (b) <= (a))
-#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
-   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
-   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
-
-/* Return a nonzero value if A is a mathematical multiple of B, where
-   A is unsigned, B is negative, and MAX is the maximum value of A's
-   type.  A's type must be the same as (A % B)'s type.  Normally (A %
-   -B == 0) suffices, but things get tricky if -B would overflow.  */
-#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
-  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
-    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
-       ? (a)                                                            \
-       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
-    : (a) % - (b))                                                      \
-   == 0)
-
-
-/* Integer overflow checks.
-
-   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
-   might not yield numerically correct answers due to arithmetic overflow.
-   They work correctly on all known practical hosts, and do not rely
-   on undefined behavior due to signed arithmetic overflow.
-
-   Example usage:
-
-     long int i = ...;
-     long int j = ...;
-     if (INT_MULTIPLY_OVERFLOW (i, j))
-       printf ("multiply would overflow");
-     else
-       printf ("product is %ld", i * j);
-
-   These macros do not check for all possible numerical problems or
-   undefined or unspecified behavior: they do not check for division
-   by zero, for bad shift counts, or for shifting negative numbers.
-
-   These macros may evaluate their arguments zero or multiple times, so the
-   arguments should not have side effects.
-
-   These macros are tuned for their last argument being a constant.
-
-   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
-   A % B, and A << B would overflow, respectively.  */
-
-#define INT_ADD_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
-#define INT_SUBTRACT_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
-#define INT_NEGATE_OVERFLOW(a) \
-  INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-#define INT_MULTIPLY_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
-#define INT_DIVIDE_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
-#define INT_REMAINDER_OVERFLOW(a, b) \
-  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
-#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
-  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
-                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
-
-/* Return 1 if the expression A <op> B would overflow,
-   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
-   assuming MIN and MAX are the minimum and maximum for the result type.
-   Arguments should be free of side effects.  */
-#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
-  op_result_overflow (a, b,                                     \
-                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
-                      _GL_INT_MAXIMUM (0 * (b) + (a)))
-
-#endif /* _GL_INTPROPS_H */
diff --git a/contrib/tools/bison/gnulib/src/ldexpl.c b/contrib/tools/bison/gnulib/src/ldexpl.c
deleted file mode 100644
index f560053dca..0000000000
--- a/contrib/tools/bison/gnulib/src/ldexpl.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Emulation for ldexpl.
-   Contributed by Paolo Bonzini
-
-   Copyright 2002-2003, 2007-2013 Free Software Foundation, Inc.
-
-   This file is part of gnulib.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <math.h>
-
-#if HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
-
-long double
-ldexpl (long double x, int exp)
-{
-  return ldexp (x, exp);
-}
-
-#else
-
-# include <float.h>
-# include "fpucw.h"
-
-long double
-ldexpl (long double x, int exp)
-{
-  long double factor;
-  int bit;
-  DECL_LONG_DOUBLE_ROUNDING
-
-  BEGIN_LONG_DOUBLE_ROUNDING ();
-
-  /* Check for zero, nan and infinity. */
-  if (!(isnanl (x) || x + x == x))
-    {
-      if (exp < 0)
-        {
-          exp = -exp;
-          factor = 0.5L;
-        }
-      else
-        factor = 2.0L;
-
-      if (exp > 0)
-        for (bit = 1;;)
-          {
-            /* Invariant: Here bit = 2^i, factor = 2^-2^i or = 2^2^i,
-               and bit <= exp.  */
-            if (exp & bit)
-              x *= factor;
-            bit <<= 1;
-            if (bit > exp)
-              break;
-            factor = factor * factor;
-          }
-    }
-
-  END_LONG_DOUBLE_ROUNDING ();
-
-  return x;
-}
-
-#endif
-
-#if 0
-int
-main (void)
-{
-  long double x;
-  int y;
-  for (y = 0; y < 29; y++)
-    printf ("%5d %.16Lg %.16Lg\n", y, ldexpl (0.8L, y), ldexpl (0.8L, -y) * ldexpl (0.8L, y));
-}
-#endif
diff --git a/contrib/tools/bison/gnulib/src/math.c b/contrib/tools/bison/gnulib/src/math.c
deleted file mode 100644
index ddb2ded530..0000000000
--- a/contrib/tools/bison/gnulib/src/math.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <config.h>
-#define _GL_MATH_INLINE _GL_EXTERN_INLINE
-#include "math.h"
diff --git a/contrib/tools/bison/gnulib/src/mbtowc-impl.h b/contrib/tools/bison/gnulib/src/mbtowc-impl.h
deleted file mode 100644
index 767ab397ce..0000000000
--- a/contrib/tools/bison/gnulib/src/mbtowc-impl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* We don't need a static internal state, because the encoding is not state
-   dependent, and when mbrtowc returns (size_t)(-2). we throw the result
-   away. */
-
-int
-mbtowc (wchar_t *pwc, const char *s, size_t n)
-{
-  if (s == NULL)
-    return 0;
-  else
-    {
-      mbstate_t state;
-      wchar_t wc;
-      size_t result;
-
-      memset (&state, 0, sizeof (mbstate_t));
-      result = mbrtowc (&wc, s, n, &state);
-      if (result == (size_t)-1 || result == (size_t)-2)
-        {
-          errno = EILSEQ;
-          return -1;
-        }
-      if (pwc != NULL)
-        *pwc = wc;
-      return (wc == 0 ? 0 : result);
-    }
-}
diff --git a/contrib/tools/bison/gnulib/src/mbtowc.c b/contrib/tools/bison/gnulib/src/mbtowc.c
deleted file mode 100644
index 632f2e1db8..0000000000
--- a/contrib/tools/bison/gnulib/src/mbtowc.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Convert multibyte character to wide character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2011.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-#include <stdlib.h>
-
-#include <errno.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "mbtowc-impl.h"
diff --git a/contrib/tools/bison/gnulib/src/memchr.c b/contrib/tools/bison/gnulib/src/memchr.c
deleted file mode 100644
index 3db38a94cd..0000000000
--- a/contrib/tools/bison/gnulib/src/memchr.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013
-   Free Software Foundation, Inc.
-
-   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
-   with help from Dan Sahlin (dan@sics.se) and
-   commentary by Jim Blandy (jimb@ai.mit.edu);
-   adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
-   and implemented by Roland McGrath (roland@ai.mit.edu).
-
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBC
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#include <stddef.h>
-
-#if defined _LIBC
-# include <memcopy.h>
-#else
-# define reg_char char
-#endif
-
-#include <limits.h>
-
-#if HAVE_BP_SYM_H || defined _LIBC
-# include <bp-sym.h>
-#else
-# define BP_SYM(sym) sym
-#endif
-
-#undef __memchr
-#ifdef _LIBC
-# undef memchr
-#endif
-
-#ifndef weak_alias
-# define __memchr memchr
-#endif
-
-/* Search no more than N bytes of S for C.  */
-void *
-__memchr (void const *s, int c_in, size_t n)
-{
-  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
-     long instead of a 64-bit uintmax_t tends to give better
-     performance.  On 64-bit hardware, unsigned long is generally 64
-     bits already.  Change this typedef to experiment with
-     performance.  */
-  typedef unsigned long int longword;
-
-  const unsigned char *char_ptr;
-  const longword *longword_ptr;
-  longword repeated_one;
-  longword repeated_c;
-  unsigned reg_char c;
-
-  c = (unsigned char) c_in;
-
-  /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       n > 0 && (size_t) char_ptr % sizeof (longword) != 0;
-       --n, ++char_ptr)
-    if (*char_ptr == c)
-      return (void *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to any size longwords.  */
-
-  /* Compute auxiliary longword values:
-     repeated_one is a value which has a 1 in every byte.
-     repeated_c has c in every byte.  */
-  repeated_one = 0x01010101;
-  repeated_c = c | (c << 8);
-  repeated_c |= repeated_c << 16;
-  if (0xffffffffU < (longword) -1)
-    {
-      repeated_one |= repeated_one << 31 << 1;
-      repeated_c |= repeated_c << 31 << 1;
-      if (8 < sizeof (longword))
-        {
-          size_t i;
-
-          for (i = 64; i < sizeof (longword) * 8; i *= 2)
-            {
-              repeated_one |= repeated_one << i;
-              repeated_c |= repeated_c << i;
-            }
-        }
-    }
-
-  /* Instead of the traditional loop which tests each byte, we will test a
-     longword at a time.  The tricky part is testing if *any of the four*
-     bytes in the longword in question are equal to c.  We first use an xor
-     with repeated_c.  This reduces the task to testing whether *any of the
-     four* bytes in longword1 is zero.
-
-     We compute tmp =
-       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
-     That is, we perform the following operations:
-       1. Subtract repeated_one.
-       2. & ~longword1.
-       3. & a mask consisting of 0x80 in every byte.
-     Consider what happens in each byte:
-       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
-         and step 3 transforms it into 0x80.  A carry can also be propagated
-         to more significant bytes.
-       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
-         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
-         the byte ends in a single bit of value 0 and k bits of value 1.
-         After step 2, the result is just k bits of value 1: 2^k - 1.  After
-         step 3, the result is 0.  And no carry is produced.
-     So, if longword1 has only non-zero bytes, tmp is zero.
-     Whereas if longword1 has a zero byte, call j the position of the least
-     significant zero byte.  Then the result has a zero at positions 0, ...,
-     j-1 and a 0x80 at position j.  We cannot predict the result at the more
-     significant bytes (positions j+1..3), but it does not matter since we
-     already have a non-zero bit at position 8*j+7.
-
-     So, the test whether any byte in longword1 is zero is equivalent to
-     testing whether tmp is nonzero.  */
-
-  while (n >= sizeof (longword))
-    {
-      longword longword1 = *longword_ptr ^ repeated_c;
-
-      if ((((longword1 - repeated_one) & ~longword1)
-           & (repeated_one << 7)) != 0)
-        break;
-      longword_ptr++;
-      n -= sizeof (longword);
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  /* At this point, we know that either n < sizeof (longword), or one of the
-     sizeof (longword) bytes starting at char_ptr is == c.  On little-endian
-     machines, we could determine the first such byte without any further
-     memory accesses, just by looking at the tmp result from the last loop
-     iteration.  But this does not work on big-endian machines.  Choose code
-     that works in both cases.  */
-
-  for (; n > 0; --n, ++char_ptr)
-    {
-      if (*char_ptr == c)
-        return (void *) char_ptr;
-    }
-
-  return NULL;
-}
-#ifdef weak_alias
-weak_alias (__memchr, BP_SYM (memchr))
-#endif
diff --git a/contrib/tools/bison/gnulib/src/printf.c b/contrib/tools/bison/gnulib/src/printf.c
deleted file mode 100644
index 7f682497cc..0000000000
--- a/contrib/tools/bison/gnulib/src/printf.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Formatted output to a stream.
-   Copyright (C) 2007, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if 1
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <stdarg.h>
-
-/* Print formatted output to standard output.
-   Return string length of formatted string.  On error, return a negative
-   value.  */
-int
-printf (const char *format, ...)
-{
-  int retval;
-  va_list args;
-
-  va_start (args, format);
-  retval = vfprintf (stdout, format, args);
-  va_end (args);
-
-  return retval;
-}
diff --git a/contrib/tools/bison/gnulib/src/size_max.h b/contrib/tools/bison/gnulib/src/size_max.h
deleted file mode 100644
index 5f3312404b..0000000000
--- a/contrib/tools/bison/gnulib/src/size_max.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
-   Written by Simon Josefsson.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef GNULIB_SIZE_MAX_H
-#define GNULIB_SIZE_MAX_H
-
-/* Get SIZE_MAX declaration on systems like Solaris 7/8/9.  */
-# include <limits.h>
-/* Get SIZE_MAX declaration on systems like glibc 2.  */
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-/* On systems where these include files don't define it, SIZE_MAX is defined
-   in config.h.  */
-
-#endif /* GNULIB_SIZE_MAX_H */
diff --git a/contrib/tools/bison/gnulib/src/sprintf.c b/contrib/tools/bison/gnulib/src/sprintf.c
deleted file mode 100644
index 9f24cd7f7a..0000000000
--- a/contrib/tools/bison/gnulib/src/sprintf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Formatted output to strings.
-   Copyright (C) 2004, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if 1
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "vasnprintf.h"
-
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
-/* Print formatted output to string STR.
-   Return string length of formatted string.  On error, return a negative
-   value.  */
-int
-sprintf (char *str, const char *format, ...)
-{
-  char *output;
-  size_t len;
-  size_t lenbuf;
-  va_list args;
-
-  /* vasnprintf fails with EOVERFLOW when the buffer size argument is larger
-     than INT_MAX (if that fits into a 'size_t' at all).
-     Also note that glibc's iconv fails with E2BIG when we pass a length that
-     is so large that str + lenbuf wraps around, i.e.
-     (uintptr_t) (str + lenbuf) < (uintptr_t) str.
-     Therefore set lenbuf = min (SIZE_MAX, INT_MAX, - (uintptr_t) str - 1).  */
-  lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
-  if (lenbuf > ~ (uintptr_t) str)
-    lenbuf = ~ (uintptr_t) str;
-
-  va_start (args, format);
-  output = vasnprintf (str, &lenbuf, format, args);
-  len = lenbuf;
-  va_end (args);
-
-  if (!output)
-    return -1;
-
-  if (output != str)
-    {
-      /* len is near SIZE_MAX.  */
-      free (output);
-      errno = EOVERFLOW;
-      return -1;
-    }
-
-  if (len > INT_MAX)
-    {
-      errno = EOVERFLOW;
-      return -1;
-    }
-
-  return len;
-}
diff --git a/contrib/tools/bison/gnulib/src/strnlen.c b/contrib/tools/bison/gnulib/src/strnlen.c
deleted file mode 100644
index 57fdfe7700..0000000000
--- a/contrib/tools/bison/gnulib/src/strnlen.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
-   Written by Simon Josefsson.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-#include <string.h>
-
-/* Find the length of STRING, but scan at most MAXLEN characters.
-   If no '\0' terminator is found in that many characters, return MAXLEN.  */
-
-size_t
-strnlen (const char *string, size_t maxlen)
-{
-  const char *end = memchr (string, '\0', maxlen);
-  return end ? (size_t) (end - string) : maxlen;
-}
diff --git a/contrib/tools/bison/gnulib/src/strtol.c b/contrib/tools/bison/gnulib/src/strtol.c
deleted file mode 100644
index 2962505554..0000000000
--- a/contrib/tools/bison/gnulib/src/strtol.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/* Convert string representation of a number into an integer value.
-
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-   NOTE: The canonical source of this file is maintained with the GNU C
-   Library.  Bugs can be reported to bug-glibc@gnu.org.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifdef _LIBC
-# define USE_NUMBER_GROUPING
-#else
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef USE_NUMBER_GROUPING
-# include "../locale/localeinfo.h"
-#endif
-
-/* Nonzero if we are defining 'strtoul' or 'strtoull', operating on
-   unsigned integers.  */
-#ifndef UNSIGNED
-# define UNSIGNED 0
-# define INT LONG int
-#else
-# define INT unsigned LONG int
-#endif
-
-/* Determine the name.  */
-#ifdef USE_IN_EXTENDED_LOCALE_MODEL
-# if UNSIGNED
-#  ifdef USE_WIDE_CHAR
-#   ifdef QUAD
-#    define strtol __wcstoull_l
-#   else
-#    define strtol __wcstoul_l
-#   endif
-#  else
-#   ifdef QUAD
-#    define strtol __strtoull_l
-#   else
-#    define strtol __strtoul_l
-#   endif
-#  endif
-# else
-#  ifdef USE_WIDE_CHAR
-#   ifdef QUAD
-#    define strtol __wcstoll_l
-#   else
-#    define strtol __wcstol_l
-#   endif
-#  else
-#   ifdef QUAD
-#    define strtol __strtoll_l
-#   else
-#    define strtol __strtol_l
-#   endif
-#  endif
-# endif
-#else
-# if UNSIGNED
-#  ifdef USE_WIDE_CHAR
-#   ifdef QUAD
-#    define strtol wcstoull
-#   else
-#    define strtol wcstoul
-#   endif
-#  else
-#   ifdef QUAD
-#    define strtol strtoull
-#   else
-#    define strtol strtoul
-#   endif
-#  endif
-# else
-#  ifdef USE_WIDE_CHAR
-#   ifdef QUAD
-#    define strtol wcstoll
-#   else
-#    define strtol wcstol
-#   endif
-#  else
-#   ifdef QUAD
-#    define strtol strtoll
-#   endif
-#  endif
-# endif
-#endif
-
-/* If QUAD is defined, we are defining 'strtoll' or 'strtoull',
-   operating on 'long long int's.  */
-#ifdef QUAD
-# define LONG long long
-# define STRTOL_LONG_MIN LLONG_MIN
-# define STRTOL_LONG_MAX LLONG_MAX
-# define STRTOL_ULONG_MAX ULLONG_MAX
-
-/* The extra casts in the following macros work around compiler bugs,
-   e.g., in Cray C 5.0.3.0.  */
-
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the arithmetic type T is signed.  */
-# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-
-/* The maximum and minimum values for the integer type T.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-# define TYPE_MINIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) 0 \
-         : TYPE_SIGNED_MAGNITUDE (t) \
-         ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
-# define TYPE_MAXIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) -1 \
-         : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-# ifndef ULLONG_MAX
-#  define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
-# endif
-# ifndef LLONG_MAX
-#  define LLONG_MAX TYPE_MAXIMUM (long long int)
-# endif
-# ifndef LLONG_MIN
-#  define LLONG_MIN TYPE_MINIMUM (long long int)
-# endif
-
-# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
-   /* Work around gcc bug with using this constant.  */
-   static const unsigned long long int maxquad = ULLONG_MAX;
-#  undef STRTOL_ULONG_MAX
-#  define STRTOL_ULONG_MAX maxquad
-# endif
-#else
-# define LONG long
-# define STRTOL_LONG_MIN LONG_MIN
-# define STRTOL_LONG_MAX LONG_MAX
-# define STRTOL_ULONG_MAX ULONG_MAX
-#endif
-
-
-/* We use this code also for the extended locale handling where the
-   function gets as an additional argument the locale which has to be
-   used.  To access the values we have to redefine the _NL_CURRENT
-   macro.  */
-#ifdef USE_IN_EXTENDED_LOCALE_MODEL
-# undef _NL_CURRENT
-# define _NL_CURRENT(category, item) \
-  (current->values[_NL_ITEM_INDEX (item)].string)
-# define LOCALE_PARAM , loc
-# define LOCALE_PARAM_PROTO , __locale_t loc
-#else
-# define LOCALE_PARAM
-# define LOCALE_PARAM_PROTO
-#endif
-
-#ifdef USE_WIDE_CHAR
-# include <wchar.h>
-# include <wctype.h>
-# define L_(Ch) L##Ch
-# define UCHAR_TYPE wint_t
-# define STRING_TYPE wchar_t
-# ifdef USE_IN_EXTENDED_LOCALE_MODEL
-#  define ISSPACE(Ch) __iswspace_l ((Ch), loc)
-#  define ISALPHA(Ch) __iswalpha_l ((Ch), loc)
-#  define TOUPPER(Ch) __towupper_l ((Ch), loc)
-# else
-#  define ISSPACE(Ch) iswspace (Ch)
-#  define ISALPHA(Ch) iswalpha (Ch)
-#  define TOUPPER(Ch) towupper (Ch)
-# endif
-#else
-# define L_(Ch) Ch
-# define UCHAR_TYPE unsigned char
-# define STRING_TYPE char
-# ifdef USE_IN_EXTENDED_LOCALE_MODEL
-#  define ISSPACE(Ch) __isspace_l ((Ch), loc)
-#  define ISALPHA(Ch) __isalpha_l ((Ch), loc)
-#  define TOUPPER(Ch) __toupper_l ((Ch), loc)
-# else
-#  define ISSPACE(Ch) isspace (Ch)
-#  define ISALPHA(Ch) isalpha (Ch)
-#  define TOUPPER(Ch) toupper (Ch)
-# endif
-#endif
-
-#define INTERNAL(X) INTERNAL1(X)
-#define INTERNAL1(X) __##X##_internal
-#define WEAKNAME(X) WEAKNAME1(X)
-
-#ifdef USE_NUMBER_GROUPING
-/* This file defines a function to check for correct grouping.  */
-# include "grouping.h"
-#endif
-
-
-
-/* Convert NPTR to an 'unsigned long int' or 'long int' in base BASE.
-   If BASE is 0 the base is determined by the presence of a leading
-   zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
-   If BASE is < 2 or > 36, it is reset to 10.
-   If ENDPTR is not NULL, a pointer to the character after the last
-   one converted is stored in *ENDPTR.  */
-
-INT
-INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
-                   int base, int group LOCALE_PARAM_PROTO)
-{
-  int negative;
-  unsigned LONG int cutoff;
-  unsigned int cutlim;
-  unsigned LONG int i;
-  const STRING_TYPE *s;
-  UCHAR_TYPE c;
-  const STRING_TYPE *save, *end;
-  int overflow;
-
-#ifdef USE_NUMBER_GROUPING
-# ifdef USE_IN_EXTENDED_LOCALE_MODEL
-  struct locale_data *current = loc->__locales[LC_NUMERIC];
-# endif
-  /* The thousands character of the current locale.  */
-  wchar_t thousands = L'\0';
-  /* The numeric grouping specification of the current locale,
-     in the format described in <locale.h>.  */
-  const char *grouping;
-
-  if (group)
-    {
-      grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
-      if (*grouping <= 0 || *grouping == CHAR_MAX)
-        grouping = NULL;
-      else
-        {
-          /* Figure out the thousands separator character.  */
-# if defined _LIBC || defined _HAVE_BTOWC
-          thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP));
-          if (thousands == WEOF)
-            thousands = L'\0';
-# endif
-          if (thousands == L'\0')
-            grouping = NULL;
-        }
-    }
-  else
-    grouping = NULL;
-#endif
-
-  if (base < 0 || base == 1 || base > 36)
-    {
-      __set_errno (EINVAL);
-      return 0;
-    }
-
-  save = s = nptr;
-
-  /* Skip white space.  */
-  while (ISSPACE (*s))
-    ++s;
-  if (*s == L_('\0'))
-    goto noconv;
-
-  /* Check for a sign.  */
-  if (*s == L_('-'))
-    {
-      negative = 1;
-      ++s;
-    }
-  else if (*s == L_('+'))
-    {
-      negative = 0;
-      ++s;
-    }
-  else
-    negative = 0;
-
-  /* Recognize number prefix and if BASE is zero, figure it out ourselves.  */
-  if (*s == L_('0'))
-    {
-      if ((base == 0 || base == 16) && TOUPPER (s[1]) == L_('X'))
-        {
-          s += 2;
-          base = 16;
-        }
-      else if (base == 0)
-        base = 8;
-    }
-  else if (base == 0)
-    base = 10;
-
-  /* Save the pointer so we can check later if anything happened.  */
-  save = s;
-
-#ifdef USE_NUMBER_GROUPING
-  if (group)
-    {
-      /* Find the end of the digit string and check its grouping.  */
-      end = s;
-      for (c = *end; c != L_('\0'); c = *++end)
-        if ((wchar_t) c != thousands
-            && ((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
-            && (!ISALPHA (c) || (int) (TOUPPER (c) - L_('A') + 10) >= base))
-          break;
-      if (*s == thousands)
-        end = s;
-      else
-        end = correctly_grouped_prefix (s, end, thousands, grouping);
-    }
-  else
-#endif
-    end = NULL;
-
-  cutoff = STRTOL_ULONG_MAX / (unsigned LONG int) base;
-  cutlim = STRTOL_ULONG_MAX % (unsigned LONG int) base;
-
-  overflow = 0;
-  i = 0;
-  for (c = *s; c != L_('\0'); c = *++s)
-    {
-      if (s == end)
-        break;
-      if (c >= L_('0') && c <= L_('9'))
-        c -= L_('0');
-      else if (ISALPHA (c))
-        c = TOUPPER (c) - L_('A') + 10;
-      else
-        break;
-      if ((int) c >= base)
-        break;
-      /* Check for overflow.  */
-      if (i > cutoff || (i == cutoff && c > cutlim))
-        overflow = 1;
-      else
-        {
-          i *= (unsigned LONG int) base;
-          i += c;
-        }
-    }
-
-  /* Check if anything actually happened.  */
-  if (s == save)
-    goto noconv;
-
-  /* Store in ENDPTR the address of one character
-     past the last character we converted.  */
-  if (endptr != NULL)
-    *endptr = (STRING_TYPE *) s;
-
-#if !UNSIGNED
-  /* Check for a value that is within the range of
-     'unsigned LONG int', but outside the range of 'LONG int'.  */
-  if (overflow == 0
-      && i > (negative
-              ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
-              : (unsigned LONG int) STRTOL_LONG_MAX))
-    overflow = 1;
-#endif
-
-  if (overflow)
-    {
-      __set_errno (ERANGE);
-#if UNSIGNED
-      return STRTOL_ULONG_MAX;
-#else
-      return negative ? STRTOL_LONG_MIN : STRTOL_LONG_MAX;
-#endif
-    }
-
-  /* Return the result of the appropriate sign.  */
-  return negative ? -i : i;
-
-noconv:
-  /* We must handle a special case here: the base is 0 or 16 and the
-     first two characters are '0' and 'x', but the rest are no
-     hexadecimal digits.  This is no error case.  We return 0 and
-     ENDPTR points to the 'x'.  */
-  if (endptr != NULL)
-    {
-      if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
-          && save[-2] == L_('0'))
-        *endptr = (STRING_TYPE *) &save[-1];
-      else
-        /*  There was no number to convert.  */
-        *endptr = (STRING_TYPE *) nptr;
-    }
-
-  return 0L;
-}
-
-/* External user entry point.  */
-
-
-INT
-#ifdef weak_function
-weak_function
-#endif
-strtol (const STRING_TYPE *nptr, STRING_TYPE **endptr,
-        int base LOCALE_PARAM_PROTO)
-{
-  return INTERNAL (strtol) (nptr, endptr, base, 0 LOCALE_PARAM);
-}
diff --git a/contrib/tools/bison/gnulib/src/strtoul.c b/contrib/tools/bison/gnulib/src/strtoul.c
deleted file mode 100644
index a0ca376cda..0000000000
--- a/contrib/tools/bison/gnulib/src/strtoul.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 1991, 1997, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#define UNSIGNED        1
-
-#include "strtol.c"
diff --git a/contrib/tools/bison/gnulib/src/vfprintf.c b/contrib/tools/bison/gnulib/src/vfprintf.c
deleted file mode 100644
index 635e36eb59..0000000000
--- a/contrib/tools/bison/gnulib/src/vfprintf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Formatted output to a stream.
-   Copyright (C) 2004, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if 1
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "fseterr.h"
-#include "vasnprintf.h"
-
-/* Print formatted output to the stream FP.
-   Return string length of formatted string.  On error, return a negative
-   value.  */
-int
-vfprintf (FILE *fp, const char *format, va_list args)
-{
-  char buf[2000];
-  char *output;
-  size_t len;
-  size_t lenbuf = sizeof (buf);
-
-  output = vasnprintf (buf, &lenbuf, format, args);
-  len = lenbuf;
-
-  if (!output)
-    {
-      fseterr (fp);
-      return -1;
-    }
-
-  if (fwrite (output, 1, len, fp) < len)
-    {
-      if (output != buf)
-        {
-          int saved_errno = errno;
-          free (output);
-          errno = saved_errno;
-        }
-      return -1;
-    }
-
-  if (output != buf)
-    free (output);
-
-  if (len > INT_MAX)
-    {
-      errno = EOVERFLOW;
-      fseterr (fp);
-      return -1;
-    }
-
-  return len;
-}
diff --git a/contrib/tools/bison/gnulib/src/vsprintf.c b/contrib/tools/bison/gnulib/src/vsprintf.c
deleted file mode 100644
index 759b1f52fc..0000000000
--- a/contrib/tools/bison/gnulib/src/vsprintf.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Formatted output to strings.
-   Copyright (C) 2004, 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if 1
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include <stdio.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "vasnprintf.h"
-
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
-/* Print formatted output to string STR.
-   Return string length of formatted string.  On error, return a negative
-   value.  */
-int
-vsprintf (char *str, const char *format, va_list args)
-{
-  char *output;
-  size_t len;
-  size_t lenbuf;
-
-  /* vasnprintf fails with EOVERFLOW when the buffer size argument is larger
-     than INT_MAX (if that fits into a 'size_t' at all).
-     Also note that glibc's iconv fails with E2BIG when we pass a length that
-     is so large that str + lenbuf wraps around, i.e.
-     (uintptr_t) (str + lenbuf) < (uintptr_t) str.
-     Therefore set lenbuf = min (SIZE_MAX, INT_MAX, - (uintptr_t) str - 1).  */
-  lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
-  if (lenbuf > ~ (uintptr_t) str)
-    lenbuf = ~ (uintptr_t) str;
-
-  output = vasnprintf (str, &lenbuf, format, args);
-  len = lenbuf;
-
-  if (!output)
-    return -1;
-
-  if (output != str)
-    {
-      /* len is near SIZE_MAX.  */
-      free (output);
-      errno = EOVERFLOW;
-      return -1;
-    }
-
-  if (len > INT_MAX)
-    {
-      errno = EOVERFLOW;
-      return -1;
-    }
-
-  return len;
-}
diff --git a/contrib/tools/bison/gnulib/ya.make b/contrib/tools/bison/gnulib/ya.make
deleted file mode 100644
index b674fd9ada..0000000000
--- a/contrib/tools/bison/gnulib/ya.make
+++ /dev/null
@@ -1,246 +0,0 @@
-OWNER(g:contrib)
-
-LIBRARY()
-
-LICENSE(
-    BSD-3-Clause AND
-    GPL-3.0-or-later AND
-    LGPL-2.0-or-later
-)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-IF (NOT MUSL)
-    NO_RUNTIME()
-ENDIF()
-
-NO_COMPILER_WARNINGS()
-
-ADDINCL(
-    GLOBAL contrib/tools/bison/gnulib/src
-)
-
-IF (OS_WINDOWS)
-    ADDINCL(
-        GLOBAL contrib/tools/bison/gnulib/platform/win64
-    )
-ELSE()
-    ADDINCL(
-        GLOBAL contrib/tools/bison/gnulib/platform/posix
-    )
-ENDIF()
-
-IF (OS_DARWIN)
-    CFLAGS(
-        -D_XOPEN_SOURCE=600
-    )
-ENDIF()
-
-IF (NOT OS_WINDOWS)
-    CFLAGS(
-        GLOBAL -Dregcomp=gnu_regcomp
-        GLOBAL -Dregerror=gnu_regerror
-        GLOBAL -Dregfree=gnu_regfree
-        GLOBAL -Dregexec=gnu_regexec
-    )
-ENDIF()
-
-SRCS(
-    src/abitset.c
-    src/argmatch.c
-    src/asnprintf.c
-    src/basename-lgpl.c
-    src/basename.c
-    src/binary-io.c
-    src/bitrotate.c
-    src/bitset.c
-    src/bitset_stats.c
-    src/bitsetv-print.c
-    src/bitsetv.c
-    src/c-ctype.c
-    src/c-stack.c
-    src/c-strcasecmp.c
-    src/c-strncasecmp.c
-    src/calloc.c
-    src/clean-temp.c
-    src/cloexec.c
-    src/close-stream.c
-    src/close.c
-    src/closein.c
-    src/closeout.c
-    src/concat-filename.c
-    src/dirname-lgpl.c
-    src/dirname.c
-    src/dup-safer-flag.c
-    src/dup-safer.c
-    src/dup2.c
-    src/ebitset.c
-    src/error.c
-    src/execute.c
-    src/exitfail.c
-    src/fatal-signal.c
-    src/fclose.c
-    src/fcntl.c
-    src/fd-hook.c
-    src/fd-safer-flag.c
-    src/fd-safer.c
-    src/fflush.c
-    src/filenamecat-lgpl.c
-    src/filenamecat.c
-    src/float.c
-    src/fopen-safer.c
-    src/fpurge.c
-    src/freading.c
-    src/fstat.c
-    src/get-errno.c
-    src/getdtablesize.c
-    src/getopt.c
-    src/getopt1.c
-    src/gl_avltree_oset.c
-    src/gl_linkedhash_list.c
-    src/gl_list.c
-    src/gl_oset.c
-    src/gl_xlist.c
-    src/gl_xoset.c
-    src/hash.c
-    src/isnand.c
-    src/isnanf.c
-    src/isnanl.c
-    src/itold.c
-    src/lbitset.c
-    src/localcharset.c
-    src/lseek.c
-    src/lstat.c
-    src/malloc.c
-    src/malloca.c
-    src/mbrtowc.c
-    src/mbswidth.c
-    src/memchr2.c
-    src/mkstemp-safer.c
-    src/nl_langinfo.c
-    src/pipe-safer.c
-    src/pipe2-safer.c
-    src/printf-args.c
-    src/printf-frexp.c
-    src/printf-frexpl.c
-    src/printf-parse.c
-    src/progname.c
-    src/quotearg.c
-    src/raise.c
-    src/rawmemchr.c
-    src/readlink.c
-    src/realloc.c
-    src/regex.c
-    src/rename.c
-    src/rmdir.c
-    src/secure_getenv.c
-    src/sig-handler.c
-    src/signbitd.c
-    src/signbitf.c
-    src/signbitl.c
-    src/spawn-pipe.c
-    src/stat.c
-    src/stpcpy.c
-    src/strchrnul.c
-    src/strdup.c
-    src/stripslash.c
-    src/tempname.c
-    src/timevar.c
-    src/tmpdir.c
-    src/unistd.c
-    src/unsetenv.c
-    src/vasnprintf.c
-    src/vbitset.c
-    src/verror.c
-    src/version-etc-fsf.c
-    src/version-etc.c
-    src/wait-process.c
-    src/wctype-h.c
-    src/xalloc-die.c
-    src/xasprintf.c
-    src/xconcat-filename.c
-    src/xmalloc.c
-    src/xmalloca.c
-    src/xmemdup0.c
-    src/xprintf.c
-    src/xsize.c
-    src/xstrndup.c
-    src/xvasprintf.c
-)
-
-IF (NOT MUSL)
-    SRCS(
-        src/freadahead.c
-        src/fseterr.c
-        #        src/fseek.c
-    )
-ENDIF()
-
-IF (NOT OS_LINUX)
-    SRCS(
-        src/pipe2.c
-        src/strverscmp.c
-    )
-ENDIF()
-
-IF (NOT OS_WINDOWS)
-    SRCS(
-        src/stdio-write.c
-    )
-ENDIF()
-
-IF (OS_WINDOWS)
-    SRCS(
-        src/frexp.c
-        src/wcrtomb.c
-        src/perror.c
-        src/strstr.c
-        src/mkstemp.c
-        src/vasprintf.c
-        src/strsignal.c
-        src/mkdtemp.c
-        src/fseeko.c
-        src/fopen.c
-        src/ftello.c
-        src/gettimeofday.c
-        src/localeconv.c
-        src/msvc-inval.c
-        src/msvc-nothrow.c
-        src/open.c
-        src/sigaction.c
-        src/sigprocmask.c
-        src/snprintf.c
-        src/spawn_faction_addclose.c
-        src/spawn_faction_adddup2.c
-        src/spawn_faction_addopen.c
-        src/spawn_faction_destroy.c
-        src/spawn_faction_init.c
-        src/spawnattr_destroy.c
-        src/spawnattr_init.c
-        src/spawnattr_setflags.c
-        src/spawnattr_setsigmask.c
-        src/spawni.c
-        src/spawnp.c
-        src/strndup.c
-        src/waitpid.c
-        src/wcwidth.c
-        src/uniwidth/width.c
-    )
-ENDIF()
-
-IF (NOT OS_LINUX OR MUSL)
-    SRCS(
-        src/obstack.c
-        src/obstack_printf.c
-    )
-ENDIF()
-
-IF (OS_CYGWIN OR OS_LINUX)
-    #not need it
-ELSE()
-    SRCS(
-        src/fpending.c
-    )
-ENDIF()
-
-END()
diff --git a/contrib/tools/bison/m4/.yandex_meta/licenses.list.txt b/contrib/tools/bison/m4/.yandex_meta/licenses.list.txt
deleted file mode 100644
index c0c24001ed..0000000000
--- a/contrib/tools/bison/m4/.yandex_meta/licenses.list.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-====================COPYRIGHT====================
-   Copyright (C) 1989-1993, 2004, 2006-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 2000, 2004, 2006-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 2003, 2006-2013 Free Software Foundation,
-   Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 2004-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1989-1994, 2006-2013 Free Software Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2013 Free Software
-   Foundation, Inc.
-
-
-====================COPYRIGHT====================
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
-
-
-====================GPL-3.0-or-later====================
-   GNU M4 is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU M4 is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-====================GPL-3.0-or-later====================
-## GNU M4 is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## GNU M4 is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/contrib/tools/bison/m4/src/Makefile.am b/contrib/tools/bison/m4/src/Makefile.am
deleted file mode 100644
index 29e05c0def..0000000000
--- a/contrib/tools/bison/m4/src/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Makefile.am - template for generating Makefile via Automake
-##
-## Copyright (C) 2006-2013 Free Software Foundation, Inc.
-##
-## This file is part of GNU M4.
-##
-## GNU M4 is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## GNU M4 is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##
-## This file written by Eric Blake <ebb9@byu.net>
-
-AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-bin_PROGRAMS = m4
-noinst_HEADERS = m4.h
-m4_SOURCES = m4.c builtin.c debug.c eval.c format.c freeze.c input.c \
-macro.c output.c path.c symtab.c
-m4_LDADD = ../lib/libm4.a $(LIBM4_LIBDEPS) $(LIBCSTACK) $(LIBTHREAD)
diff --git a/contrib/tools/bison/m4/ya.make b/contrib/tools/bison/m4/ya.make
deleted file mode 100644
index 3a54fa2c8f..0000000000
--- a/contrib/tools/bison/m4/ya.make
+++ /dev/null
@@ -1,38 +0,0 @@
-OWNER(g:contrib)
-
-PROGRAM()
-
-LICENSE(GPL-3.0-or-later)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-NO_RUNTIME()
-
-NO_COMPILER_WARNINGS()
-
-IF (MUSL)
-    CFLAGS(
-        -DO_BINARY=0
-    )
-ENDIF()
-
-SRCS(
-    src/builtin.c
-    src/debug.c
-    src/eval.c
-    src/format.c
-    src/freeze.c
-    src/input.c
-    src/m4.c
-    src/macro.c
-    src/output.c
-    src/path.c
-    src/symtab.c
-    src/cpp.cpp
-)
-
-PEERDIR(
-    contrib/tools/bison/gnulib
-)
-
-END()
diff --git a/contrib/tools/bison/ya.make b/contrib/tools/bison/ya.make
deleted file mode 100644
index 26f5d96df1..0000000000
--- a/contrib/tools/bison/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-VERSION(3.0)
-
-RECURSE(
-    bison
-    gnulib
-    m4
-)
author	alexv-smirnov <alex@ydb.tech>	2023-03-28 22:25:04 +0300
committer	alexv-smirnov <alex@ydb.tech>	2023-03-28 22:25:04 +0300
commit	b8a17f9b1c166d2e9a26b99348a4c29d972caf55 (patch)
tree	1a2d881f1a9452b9c6103dbf69d73da7624e98e5 /contrib/tools/bison
parent	25659221f18577ea38430a8ec3349836f5626b6a (diff)
download	ydb-b8a17f9b1c166d2e9a26b99348a4c29d972caf55.tar.gz