summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAkim Demaille <akim.demaille@gmail.com>2018-06-17 18:43:59 +0200
committerAkim Demaille <akim.demaille@gmail.com>2018-06-17 18:43:59 +0200
commitf462a08572ef5ff8d43513c6b866895d20cf018b (patch)
tree9d54ad8f92aa835c38029f92902cb9ff0fb11a42 /src
parentd6445ec10bf296f3652c2231167ced977b803f5d (diff)
parent0ac08d2d6c0558b375764f957d1fb367f91ab24f (diff)
downloadbison-f462a08572ef5ff8d43513c6b866895d20cf018b.tar.gz
Merge maint into master
* upstream/maint: (48 commits) THANKS: update an address tests: adjust syncline tests to GCC 7 glr: fix improperly placed synclines bison: be git grep friendly Replace ftp with https maint: post-release administrivia version 3.0.5 bison: style: indentation fixes regen bison: please address sanitizer C++: style: fix indentation NEWS: update C++: style: prefer `unsigned` to `unsigned int` C++: style: space before paren C++: fix -Wdeprecated warnings tests: fix -Wdeprecated warning maint: update syntax-check exclusions autoconf: update regen Update copyright years ...
Diffstat (limited to 'src')
-rw-r--r--src/AnnotationList.c2
-rw-r--r--src/AnnotationList.h2
-rw-r--r--src/InadequacyList.c2
-rw-r--r--src/InadequacyList.h2
-rw-r--r--src/LR0.c4
-rw-r--r--src/LR0.h4
-rw-r--r--src/Sbitset.c2
-rw-r--r--src/Sbitset.h2
-rw-r--r--src/assoc.c4
-rw-r--r--src/assoc.h3
-rw-r--r--src/closure.c4
-rw-r--r--src/closure.h4
-rw-r--r--src/complain.c2
-rw-r--r--src/complain.h4
-rw-r--r--src/conflicts.c4
-rw-r--r--src/conflicts.h2
-rw-r--r--src/derives.c4
-rw-r--r--src/derives.h2
-rw-r--r--src/files.c2
-rw-r--r--src/files.h2
-rw-r--r--src/flex-scanner.h2
-rw-r--r--src/getargs.c16
-rw-r--r--src/getargs.h2
-rw-r--r--src/gram.c4
-rw-r--r--src/gram.h2
-rw-r--r--src/graphviz.c3
-rw-r--r--src/graphviz.h2
-rw-r--r--src/ielr.c2
-rw-r--r--src/ielr.h2
-rw-r--r--src/lalr.c4
-rw-r--r--src/lalr.h2
-rw-r--r--src/local.mk2
-rw-r--r--src/location.c2
-rw-r--r--src/location.h2
-rw-r--r--src/main.c4
-rw-r--r--src/muscle-tab.c2
-rw-r--r--src/muscle-tab.h3
-rw-r--r--src/named-ref.c2
-rw-r--r--src/named-ref.h2
-rw-r--r--src/nullable.c2
-rw-r--r--src/nullable.h3
-rw-r--r--src/output.c6
-rw-r--r--src/output.h2
-rw-r--r--src/parse-gram.c389
-rw-r--r--src/parse-gram.h36
-rw-r--r--src/parse-gram.y12
-rw-r--r--src/print-xml.c2
-rw-r--r--src/print-xml.h2
-rw-r--r--src/print.c2
-rw-r--r--src/print.h2
-rw-r--r--src/print_graph.c3
-rw-r--r--src/print_graph.h3
-rw-r--r--src/reader.c2
-rw-r--r--src/reader.h2
-rw-r--r--src/reduce.c2
-rw-r--r--src/reduce.h4
-rw-r--r--src/relation.c4
-rw-r--r--src/relation.h3
-rw-r--r--src/scan-code.h3
-rw-r--r--src/scan-code.l2
-rw-r--r--src/scan-gram.h3
-rw-r--r--src/scan-gram.l2
-rw-r--r--src/scan-skel.h3
-rw-r--r--src/scan-skel.l2
-rw-r--r--src/state.c3
-rw-r--r--src/state.h4
-rw-r--r--src/symlist.c4
-rw-r--r--src/symlist.h4
-rw-r--r--src/symtab.c2
-rw-r--r--src/symtab.h4
-rw-r--r--src/system.h3
-rw-r--r--src/tables.c2
-rw-r--r--src/tables.h3
-rw-r--r--src/uniqstr.c3
-rw-r--r--src/uniqstr.h3
75 files changed, 332 insertions, 316 deletions
diff --git a/src/AnnotationList.c b/src/AnnotationList.c
index cf0b49cf..a5d015e4 100644
--- a/src/AnnotationList.c
+++ b/src/AnnotationList.c
@@ -1,6 +1,6 @@
/* IELR's inadequacy annotation list.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/AnnotationList.h b/src/AnnotationList.h
index 59e41d09..739f377f 100644
--- a/src/AnnotationList.h
+++ b/src/AnnotationList.h
@@ -1,6 +1,6 @@
/* IELR's inadequacy annotation list.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/InadequacyList.c b/src/InadequacyList.c
index f2e45f49..4d36533f 100644
--- a/src/InadequacyList.c
+++ b/src/InadequacyList.c
@@ -1,6 +1,6 @@
/* IELR's inadequacy list.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/InadequacyList.h b/src/InadequacyList.h
index d5da96b6..42f11fc4 100644
--- a/src/InadequacyList.h
+++ b/src/InadequacyList.h
@@ -1,6 +1,6 @@
/* IELR's inadequacy list.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/LR0.c b/src/LR0.c
index c8f0166b..35eaf563 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -1,7 +1,7 @@
/* Generate the LR(0) parser states for Bison.
- Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/LR0.h b/src/LR0.h
index b415b8f0..f7f6b63a 100644
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -1,7 +1,7 @@
/* Generate the LR(0) parser states for Bison.
- Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/Sbitset.c b/src/Sbitset.c
index 376cf2e2..b6ba379d 100644
--- a/src/Sbitset.c
+++ b/src/Sbitset.c
@@ -1,6 +1,6 @@
/* A simple, memory-efficient bitset implementation.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/Sbitset.h b/src/Sbitset.h
index 3589cddb..82acdc52 100644
--- a/src/Sbitset.h
+++ b/src/Sbitset.h
@@ -1,6 +1,6 @@
/* A simple, memory-efficient bitset implementation.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/assoc.c b/src/assoc.c
index c24c7036..38d24e34 100644
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,7 +1,7 @@
/* Associativity information.
- Copyright (C) 2002, 2005-2006, 2008-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2002, 2005-2006, 2008-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/assoc.h b/src/assoc.h
index bae019e5..661e1e54 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,6 +1,7 @@
/* Associativity information.
- Copyright (C) 2002, 2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006, 2008-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/closure.c b/src/closure.c
index 253b7cd8..db17e15f 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,7 +1,7 @@
/* Closures for Bison
- Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015 Free
- Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015, 2018
+ Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/closure.h b/src/closure.h
index 528d3b2a..d80eae5e 100644
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,7 +1,7 @@
/* Subroutines for bison
- Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/complain.c b/src/complain.c
index 22e18cb3..e39626a3 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,6 +1,6 @@
/* Declaration for error-reporting function for Bison.
- Copyright (C) 2000-2002, 2004-2006, 2009-2015 Free Software
+ Copyright (C) 2000-2002, 2004-2006, 2009-2015, 2018 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/src/complain.h b/src/complain.h
index 63347785..599afb97 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,7 +1,7 @@
/* Declaration for error-reporting function for Bison.
- Copyright (C) 2000-2002, 2006, 2009-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2000-2002, 2006, 2009-2015, 2018 Free Software
+ Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/conflicts.c b/src/conflicts.c
index 16cb44b7..2138e3bb 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
/* Find and resolve or report lookahead conflicts for bison,
- Copyright (C) 1984, 1989, 1992, 2000-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 1984, 1989, 1992, 2000-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/conflicts.h b/src/conflicts.h
index 0a705513..22a177cb 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,6 +1,6 @@
/* Find and resolve or report lookahead conflicts for bison,
- Copyright (C) 2000-2002, 2004, 2007, 2009-2015 Free Software
+ Copyright (C) 2000-2002, 2004, 2007, 2009-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/derives.c b/src/derives.c
index 75266491..7564b411 100644
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,7 +1,7 @@
/* Match rules with nonterminals for bison,
- Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/derives.h b/src/derives.h
index 4cccb434..c4a701c0 100644
--- a/src/derives.h
+++ b/src/derives.h
@@ -1,6 +1,6 @@
/* Match rules with nonterminals for bison,
- Copyright (C) 1984, 1989, 2000-2002, 2009-2015 Free Software
+ Copyright (C) 1984, 1989, 2000-2002, 2009-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/files.c b/src/files.c
index 3c913b6b..06e8ea3b 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,6 +1,6 @@
/* Open and close files for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/files.h b/src/files.h
index 52250aff..9970e88b 100644
--- a/src/files.h
+++ b/src/files.h
@@ -1,6 +1,6 @@
/* File names and variables for bison,
- Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015 Free
+ Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015, 2018 Free
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index 6c61418d..4dec7e1f 100644
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,6 +1,6 @@
/* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
- Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/getargs.c b/src/getargs.c
index fa9e3c1c..5696c35f 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,6 @@
/* Parse command line arguments for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -64,7 +64,7 @@ struct bison_language const *language = &valid_languages[0];
/** Decode an option's key.
*
- * \param option option being decoded.
+ * \param opt option being decoded.
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param all the all value.
@@ -79,11 +79,11 @@ struct bison_language const *language = &valid_languages[0];
* flags from \c all. Thus no-none = all and no-all = none.
*/
static void
-flag_argmatch (const char *option,
- const char * const keys[], const int values[],
+flag_argmatch (const char *opt,
+ const char *const keys[], const int values[],
int all, int *flags, char *arg, size_t no)
{
- int value = XARGMATCH (option, arg + no, keys, values);
+ int value = XARGMATCH (opt, arg + no, keys, values);
/* -rnone == -rno-all, and -rno-none == -rall. */
if (!value)
@@ -100,7 +100,7 @@ flag_argmatch (const char *option,
/** Decode an option's set of keys.
*
- * \param option option being decoded.
+ * \param opt option being decoded (e.g., --report).
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param all the all value.
@@ -109,7 +109,7 @@ flag_argmatch (const char *option,
* If 0, then activate all the flags.
*/
static void
-flags_argmatch (const char *option,
+flags_argmatch (const char *opt,
const char * const keys[], const int values[],
int all, int *flags, char *args)
{
@@ -117,7 +117,7 @@ flags_argmatch (const char *option,
for (args = strtok (args, ","); args; args = strtok (NULL, ","))
{
size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
- flag_argmatch (option, keys,
+ flag_argmatch (opt, keys,
values, all, flags, args, no);
}
else
diff --git a/src/getargs.h b/src/getargs.h
index d7c6d16b..5639f0f7 100644
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,6 +1,6 @@
/* Parse command line arguments for bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/gram.c b/src/gram.c
index 594d835f..fb2593e2 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
/* Allocate input grammar variables for Bison.
- Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/gram.h b/src/gram.h
index b4d5845f..a2b55ead 100644
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,6 +1,6 @@
/* Data definitions for internal representation of Bison's input.
- Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015 Free
+ Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015, 2018 Free
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/graphviz.c b/src/graphviz.c
index ac8070c4..d85b23de 100644
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -1,6 +1,7 @@
/* Output Graphviz specification of a state machine generated by Bison.
- Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/graphviz.h b/src/graphviz.h
index 40df1e9d..f2aaa91f 100644
--- a/src/graphviz.h
+++ b/src/graphviz.h
@@ -1,6 +1,6 @@
/* Output Graphviz specification of a state machine generated by Bison.
- Copyright (C) 2006, 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2010-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/ielr.c b/src/ielr.c
index 99228377..81a28de8 100644
--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,6 @@
/* IELR main implementation.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/ielr.h b/src/ielr.h
index bd31d601..c080fdf0 100644
--- a/src/ielr.h
+++ b/src/ielr.h
@@ -1,6 +1,6 @@
/* IELR main implementation.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/lalr.c b/src/lalr.c
index d971cc0a..109aa0f4 100644
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,7 +1,7 @@
/* Compute lookahead criteria for Bison.
- Copyright (C) 1984, 1986, 1989, 2000-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 1984, 1986, 1989, 2000-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/lalr.h b/src/lalr.h
index d8ba880a..898053f5 100644
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,7 +1,7 @@
/* Compute lookahead criteria for bison,
Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
- 2009-2015 Free Software Foundation, Inc.
+ 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/local.mk b/src/local.mk
index 573ad008..88d9e9d0 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015, 2018 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/location.c b/src/location.c
index 4fb55934..faceb5c9 100644
--- a/src/location.c
+++ b/src/location.c
@@ -1,6 +1,6 @@
/* Locations for Bison
- Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/location.h b/src/location.h
index 0477a936..25a9aa49 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,6 @@
/* Locations for Bison
- Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/main.c b/src/main.c
index 311ab8c9..29324600 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
/* Top level entry point of Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2015 Free
- Software Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2015,
+ 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index b38598b0..c14273f6 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,6 +1,6 @@
/* Muscle table manager for Bison.
- Copyright (C) 2001-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index 0267bc99..4ec1ae1b 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,6 +1,7 @@
/* Muscle table manager for Bison,
- Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2006-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/named-ref.c b/src/named-ref.c
index 26f7ba82..ac5af1c8 100644
--- a/src/named-ref.c
+++ b/src/named-ref.c
@@ -1,6 +1,6 @@
/* Named symbol references for Bison
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/named-ref.h b/src/named-ref.h
index 19ad65c9..f42036fa 100644
--- a/src/named-ref.h
+++ b/src/named-ref.h
@@ -1,6 +1,6 @@
/* Named symbol references for Bison
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/nullable.c b/src/nullable.c
index 118c0aa4..0dffd575 100644
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,6 +1,6 @@
/* Calculate which nonterminals can expand into the null string for Bison.
- Copyright (C) 1984, 1989, 2000-2006, 2009-2015 Free Software
+ Copyright (C) 1984, 1989, 2000-2006, 2009-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/nullable.h b/src/nullable.h
index 00cae665..8b6cfddd 100644
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,6 +1,7 @@
/* Part of the bison parser generator,
- Copyright (C) 2000, 2002, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/output.c b/src/output.c
index 007f24c3..b07d0f1e 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
/* Output the generated parsing program for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -358,8 +358,8 @@ user_actions_output (FILE *out)
for (r = 0; r < nrules; ++r)
if (rules[r].action)
{
- fprintf (out, "b4_%scase(%d, [b4_syncline(%d, ",
- rules[r].is_predicate ? "predicate_" : "",
+ fprintf (out, "%s(%d, [b4_syncline(%d, ",
+ rules[r].is_predicate ? "b4_predicate_case" : "b4_case",
r + 1, rules[r].action_location.start.line);
string_output (out, rules[r].action_location.start.file);
fprintf (out, ")\n[ %s]])\n\n", rules[r].action);
diff --git a/src/output.h b/src/output.h
index 2c6f1d02..ba47a89c 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,6 +1,6 @@
/* Output the generated parsing program for bison,
- Copyright (C) 2000-2003, 2006-2007, 2009-2015 Free Software
+ Copyright (C) 2000-2003, 2006-2007, 2009-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 43eeaeb5..4faf9772 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.29-9a91e. */
+/* A Bison parser, made by GNU Bison 3.0.4.38-1047-dirty. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018 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
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.0.2.29-9a91e"
+#define YYBISON_VERSION "3.0.4.38-1047-dirty"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -1669,6 +1669,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
case N: \
yyformat = S; \
break
+ default: /* Avoid compiler warnings. */
YYCASE_(0, YY_("syntax error"));
YYCASE_(1, YY_("syntax error, unexpected %s"));
YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1842,7 +1843,7 @@ YYLTYPE yylloc = yyloc_default;
yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */
-#line 108 "src/parse-gram.y" /* yacc.c:1429 */
+#line 108 "src/parse-gram.y" /* yacc.c:1430 */
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
@@ -1850,7 +1851,7 @@ YYLTYPE yylloc = yyloc_default;
boundary_set (&yylloc.end, current_file, 1, 1);
}
-#line 1854 "src/parse-gram.c" /* yacc.c:1429 */
+#line 1855 "src/parse-gram.c" /* yacc.c:1430 */
yylsp[0] = yylloc;
goto yysetstate;
@@ -2036,151 +2037,152 @@ yyreduce:
GCC warning that YYVAL may be used uninitialized. */
yyval = yyvsp[1-yylen];
- /* Default location. */
+ /* Default location. */
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+ yyerror_range[1] = yyloc;
YY_REDUCE_PRINT (yyn);
{
int yychar_backup = yychar;
switch (yyn)
{
case 6:
-#line 280 "src/parse-gram.y" /* yacc.c:1646 */
+#line 280 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2054 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2056 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 7:
-#line 286 "src/parse-gram.y" /* yacc.c:1646 */
+#line 286 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
}
-#line 2062 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2064 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 8:
-#line 290 "src/parse-gram.y" /* yacc.c:1646 */
+#line 290 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].value).kind, (yyvsp[0].value).chars,
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2071 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2073 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 9:
-#line 294 "src/parse-gram.y" /* yacc.c:1646 */
+#line 294 "src/parse-gram.y" /* yacc.c:1648 */
{ defines_flag = true; }
-#line 2077 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2079 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 10:
-#line 296 "src/parse-gram.y" /* yacc.c:1646 */
+#line 296 "src/parse-gram.y" /* yacc.c:1648 */
{
defines_flag = true;
spec_defines_file = xstrdup ((yyvsp[0].code));
}
-#line 2086 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2088 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 11:
-#line 301 "src/parse-gram.y" /* yacc.c:1646 */
+#line 301 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_percent_define_insert ("parse.error", (yylsp[0]), muscle_keyword,
"verbose",
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
-#line 2096 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2098 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 12:
-#line 306 "src/parse-gram.y" /* yacc.c:1646 */
+#line 306 "src/parse-gram.y" /* yacc.c:1648 */
{ expected_sr_conflicts = (yyvsp[0].integer); }
-#line 2102 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2104 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 13:
-#line 307 "src/parse-gram.y" /* yacc.c:1646 */
+#line 307 "src/parse-gram.y" /* yacc.c:1648 */
{ expected_rr_conflicts = (yyvsp[0].integer); }
-#line 2108 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2110 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 14:
-#line 308 "src/parse-gram.y" /* yacc.c:1646 */
+#line 308 "src/parse-gram.y" /* yacc.c:1648 */
{ spec_file_prefix = (yyvsp[0].code); }
-#line 2114 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2116 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 15:
-#line 310 "src/parse-gram.y" /* yacc.c:1646 */
+#line 310 "src/parse-gram.y" /* yacc.c:1648 */
{
nondeterministic_parser = true;
glr_parser = true;
}
-#line 2123 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2125 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 16:
-#line 315 "src/parse-gram.y" /* yacc.c:1646 */
+#line 315 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_code_grow ("initial_action", translate_code ((yyvsp[0].code), (yylsp[0]), false), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2132 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2134 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 17:
-#line 319 "src/parse-gram.y" /* yacc.c:1646 */
+#line 319 "src/parse-gram.y" /* yacc.c:1648 */
{ language_argmatch ((yyvsp[0].code), grammar_prio, (yylsp[-1])); }
-#line 2138 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2140 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 18:
-#line 320 "src/parse-gram.y" /* yacc.c:1646 */
+#line 320 "src/parse-gram.y" /* yacc.c:1648 */
{ spec_name_prefix = (yyvsp[0].code); }
-#line 2144 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2146 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 19:
-#line 321 "src/parse-gram.y" /* yacc.c:1646 */
+#line 321 "src/parse-gram.y" /* yacc.c:1648 */
{ no_lines_flag = true; }
-#line 2150 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2152 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 20:
-#line 322 "src/parse-gram.y" /* yacc.c:1646 */
+#line 322 "src/parse-gram.y" /* yacc.c:1648 */
{ nondeterministic_parser = true; }
-#line 2156 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2158 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 21:
-#line 323 "src/parse-gram.y" /* yacc.c:1646 */
+#line 323 "src/parse-gram.y" /* yacc.c:1648 */
{ spec_outfile = (yyvsp[0].code); }
-#line 2162 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2164 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 22:
-#line 324 "src/parse-gram.y" /* yacc.c:1646 */
+#line 324 "src/parse-gram.y" /* yacc.c:1648 */
{ current_param = (yyvsp[0].param); }
-#line 2168 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2170 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 23:
-#line 324 "src/parse-gram.y" /* yacc.c:1646 */
+#line 324 "src/parse-gram.y" /* yacc.c:1648 */
{ current_param = param_none; }
-#line 2174 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2176 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 24:
-#line 325 "src/parse-gram.y" /* yacc.c:1646 */
+#line 325 "src/parse-gram.y" /* yacc.c:1648 */
{ version_check (&(yylsp[0]), (yyvsp[0].code)); }
-#line 2180 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2182 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 25:
-#line 327 "src/parse-gram.y" /* yacc.c:1646 */
+#line 327 "src/parse-gram.y" /* yacc.c:1648 */
{
char const *skeleton_user = (yyvsp[0].code);
if (strchr (skeleton_user, '/'))
@@ -2204,49 +2206,49 @@ yyreduce:
}
skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
}
-#line 2208 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2210 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 26:
-#line 350 "src/parse-gram.y" /* yacc.c:1646 */
+#line 350 "src/parse-gram.y" /* yacc.c:1648 */
{ token_table_flag = true; }
-#line 2214 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2216 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 27:
-#line 351 "src/parse-gram.y" /* yacc.c:1646 */
+#line 351 "src/parse-gram.y" /* yacc.c:1648 */
{ report_flag |= report_states; }
-#line 2220 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2222 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 28:
-#line 352 "src/parse-gram.y" /* yacc.c:1646 */
+#line 352 "src/parse-gram.y" /* yacc.c:1648 */
{ yacc_flag = true; }
-#line 2226 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2228 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 30:
-#line 357 "src/parse-gram.y" /* yacc.c:1646 */
+#line 357 "src/parse-gram.y" /* yacc.c:1648 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2232 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2234 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 31:
-#line 358 "src/parse-gram.y" /* yacc.c:1646 */
+#line 358 "src/parse-gram.y" /* yacc.c:1648 */
{ add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-#line 2238 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2240 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 34:
-#line 370 "src/parse-gram.y" /* yacc.c:1646 */
+#line 370 "src/parse-gram.y" /* yacc.c:1648 */
{
grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
}
-#line 2246 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2248 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 35:
-#line 374 "src/parse-gram.y" /* yacc.c:1646 */
+#line 374 "src/parse-gram.y" /* yacc.c:1648 */
{
code_props code;
code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1]));
@@ -2258,27 +2260,27 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
}
}
-#line 2262 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2264 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 36:
-#line 386 "src/parse-gram.y" /* yacc.c:1646 */
+#line 386 "src/parse-gram.y" /* yacc.c:1648 */
{
default_prec = true;
}
-#line 2270 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2272 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 37:
-#line 390 "src/parse-gram.y" /* yacc.c:1646 */
+#line 390 "src/parse-gram.y" /* yacc.c:1648 */
{
default_prec = false;
}
-#line 2278 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2280 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 38:
-#line 394 "src/parse-gram.y" /* yacc.c:1646 */
+#line 394 "src/parse-gram.y" /* yacc.c:1648 */
{
/* Do not invoke muscle_percent_code_grow here since it invokes
muscle_user_name_list_grow. */
@@ -2286,86 +2288,86 @@ yyreduce:
translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2290 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2292 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 39:
-#line 402 "src/parse-gram.y" /* yacc.c:1646 */
+#line 402 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2299 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2301 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 40:
-#line 412 "src/parse-gram.y" /* yacc.c:1646 */
+#line 412 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.code_type) = destructor; }
-#line 2305 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2307 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 41:
-#line 413 "src/parse-gram.y" /* yacc.c:1646 */
+#line 413 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.code_type) = printer; }
-#line 2311 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2313 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 42:
-#line 423 "src/parse-gram.y" /* yacc.c:1646 */
+#line 423 "src/parse-gram.y" /* yacc.c:1648 */
{}
-#line 2317 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2319 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 43:
-#line 424 "src/parse-gram.y" /* yacc.c:1646 */
+#line 424 "src/parse-gram.y" /* yacc.c:1648 */
{ muscle_percent_define_insert ("api.value.union.name",
(yylsp[0]), muscle_keyword, (yyvsp[0].uniqstr),
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); }
-#line 2325 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2327 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 44:
-#line 431 "src/parse-gram.y" /* yacc.c:1646 */
+#line 431 "src/parse-gram.y" /* yacc.c:1648 */
{
union_seen = true;
muscle_code_grow ("union_members", translate_code_braceless ((yyvsp[0].code), (yylsp[0])), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2335 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2337 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 45:
-#line 442 "src/parse-gram.y" /* yacc.c:1646 */
+#line 442 "src/parse-gram.y" /* yacc.c:1648 */
{ current_class = nterm_sym; }
-#line 2341 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2343 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 46:
-#line 443 "src/parse-gram.y" /* yacc.c:1646 */
+#line 443 "src/parse-gram.y" /* yacc.c:1648 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2350 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2352 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 47:
-#line 447 "src/parse-gram.y" /* yacc.c:1646 */
+#line 447 "src/parse-gram.y" /* yacc.c:1648 */
{ current_class = token_sym; }
-#line 2356 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2358 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 48:
-#line 448 "src/parse-gram.y" /* yacc.c:1646 */
+#line 448 "src/parse-gram.y" /* yacc.c:1648 */
{
current_class = unknown_sym;
current_type = NULL;
}
-#line 2365 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2367 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 49:
-#line 453 "src/parse-gram.y" /* yacc.c:1646 */
+#line 453 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_list *list;
tag_seen = true;
@@ -2373,11 +2375,11 @@ yyreduce:
symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
symbol_list_free ((yyvsp[0].list));
}
-#line 2377 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2379 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 50:
-#line 464 "src/parse-gram.y" /* yacc.c:1646 */
+#line 464 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_list *list;
++current_prec;
@@ -2389,341 +2391,341 @@ yyreduce:
symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
-#line 2393 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2395 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 51:
-#line 478 "src/parse-gram.y" /* yacc.c:1646 */
+#line 478 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.assoc) = left_assoc; }
-#line 2399 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2401 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 52:
-#line 479 "src/parse-gram.y" /* yacc.c:1646 */
+#line 479 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.assoc) = right_assoc; }
-#line 2405 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2407 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 53:
-#line 480 "src/parse-gram.y" /* yacc.c:1646 */
+#line 480 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.assoc) = non_assoc; }
-#line 2411 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2413 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 54:
-#line 481 "src/parse-gram.y" /* yacc.c:1646 */
+#line 481 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.assoc) = precedence_assoc; }
-#line 2417 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2419 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 55:
-#line 485 "src/parse-gram.y" /* yacc.c:1646 */
+#line 485 "src/parse-gram.y" /* yacc.c:1648 */
{ current_type = NULL; }
-#line 2423 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2425 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 56:
-#line 486 "src/parse-gram.y" /* yacc.c:1646 */
+#line 486 "src/parse-gram.y" /* yacc.c:1648 */
{ current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-#line 2429 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2431 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 57:
-#line 492 "src/parse-gram.y" /* yacc.c:1646 */
+#line 492 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2435 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2437 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 58:
-#line 494 "src/parse-gram.y" /* yacc.c:1646 */
+#line 494 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2441 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2443 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 59:
-#line 499 "src/parse-gram.y" /* yacc.c:1646 */
+#line 499 "src/parse-gram.y" /* yacc.c:1648 */
{
(yyval.symbol) = (yyvsp[0].symbol);
symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
}
-#line 2450 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2452 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 60:
-#line 504 "src/parse-gram.y" /* yacc.c:1646 */
+#line 504 "src/parse-gram.y" /* yacc.c:1648 */
{
(yyval.symbol) = (yyvsp[-1].symbol);
symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
}
-#line 2460 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2462 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 61:
-#line 514 "src/parse-gram.y" /* yacc.c:1646 */
+#line 514 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2466 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2468 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 62:
-#line 516 "src/parse-gram.y" /* yacc.c:1646 */
+#line 516 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2472 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2474 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 63:
-#line 520 "src/parse-gram.y" /* yacc.c:1646 */
+#line 520 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = (yyvsp[0].list); }
-#line 2478 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2480 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 64:
-#line 521 "src/parse-gram.y" /* yacc.c:1646 */
+#line 521 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
-#line 2484 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2486 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 65:
-#line 525 "src/parse-gram.y" /* yacc.c:1646 */
+#line 525 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2490 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2492 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 66:
-#line 526 "src/parse-gram.y" /* yacc.c:1646 */
+#line 526 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2496 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2498 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 68:
-#line 531 "src/parse-gram.y" /* yacc.c:1646 */
+#line 531 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.uniqstr) = uniqstr_new ("*"); }
-#line 2502 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2504 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 69:
-#line 532 "src/parse-gram.y" /* yacc.c:1646 */
+#line 532 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.uniqstr) = uniqstr_new (""); }
-#line 2508 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2510 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 70:
-#line 538 "src/parse-gram.y" /* yacc.c:1646 */
+#line 538 "src/parse-gram.y" /* yacc.c:1648 */
{
current_type = (yyvsp[0].uniqstr);
tag_seen = true;
}
-#line 2517 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2519 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 71:
-#line 543 "src/parse-gram.y" /* yacc.c:1646 */
+#line 543 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
}
-#line 2526 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2528 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 72:
-#line 548 "src/parse-gram.y" /* yacc.c:1646 */
+#line 548 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
}
-#line 2536 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2538 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 73:
-#line 554 "src/parse-gram.y" /* yacc.c:1646 */
+#line 554 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2546 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2548 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 74:
-#line 560 "src/parse-gram.y" /* yacc.c:1646 */
+#line 560 "src/parse-gram.y" /* yacc.c:1648 */
{
symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2557 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2559 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 81:
-#line 590 "src/parse-gram.y" /* yacc.c:1646 */
+#line 590 "src/parse-gram.y" /* yacc.c:1648 */
{
yyerrok;
}
-#line 2565 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2567 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 82:
-#line 596 "src/parse-gram.y" /* yacc.c:1646 */
+#line 596 "src/parse-gram.y" /* yacc.c:1648 */
{ current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2571 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2573 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 83:
-#line 597 "src/parse-gram.y" /* yacc.c:1646 */
+#line 597 "src/parse-gram.y" /* yacc.c:1648 */
{
/* Free the current lhs. */
current_lhs (0, (yylsp[-3]), 0);
}
-#line 2580 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2582 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 84:
-#line 604 "src/parse-gram.y" /* yacc.c:1646 */
+#line 604 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2586 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2588 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 85:
-#line 605 "src/parse-gram.y" /* yacc.c:1646 */
+#line 605 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2592 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2594 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 87:
-#line 612 "src/parse-gram.y" /* yacc.c:1646 */
+#line 612 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
current_lhs_named_ref); }
-#line 2599 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2601 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 88:
-#line 615 "src/parse-gram.y" /* yacc.c:1646 */
+#line 615 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2605 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2607 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 89:
-#line 617 "src/parse-gram.y" /* yacc.c:1646 */
+#line 617 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-#line 2611 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2613 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 90:
-#line 619 "src/parse-gram.y" /* yacc.c:1646 */
+#line 619 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-#line 2617 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2619 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 91:
-#line 621 "src/parse-gram.y" /* yacc.c:1646 */
+#line 621 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_empty_set ((yylsp[0])); }
-#line 2623 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2625 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 92:
-#line 623 "src/parse-gram.y" /* yacc.c:1646 */
+#line 623 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2629 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2631 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 93:
-#line 625 "src/parse-gram.y" /* yacc.c:1646 */
+#line 625 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-#line 2635 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2637 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 94:
-#line 627 "src/parse-gram.y" /* yacc.c:1646 */
+#line 627 "src/parse-gram.y" /* yacc.c:1648 */
{ grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2641 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2643 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 95:
-#line 631 "src/parse-gram.y" /* yacc.c:1646 */
+#line 631 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.named_ref) = 0; }
-#line 2647 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2649 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 96:
-#line 632 "src/parse-gram.y" /* yacc.c:1646 */
+#line 632 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2653 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2655 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 98:
-#line 643 "src/parse-gram.y" /* yacc.c:1646 */
+#line 643 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); }
-#line 2659 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2661 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 99:
-#line 668 "src/parse-gram.y" /* yacc.c:1646 */
+#line 668 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
-#line 2665 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2667 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 100:
-#line 669 "src/parse-gram.y" /* yacc.c:1646 */
+#line 669 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].uniqstr); }
-#line 2671 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2673 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 101:
-#line 670 "src/parse-gram.y" /* yacc.c:1646 */
+#line 670 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.value).kind = muscle_string; (yyval.value).chars = (yyvsp[0].code); }
-#line 2677 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2679 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 102:
-#line 671 "src/parse-gram.y" /* yacc.c:1646 */
+#line 671 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces ((yyvsp[0].code)); }
-#line 2683 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2685 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 103:
-#line 684 "src/parse-gram.y" /* yacc.c:1646 */
+#line 684 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2689 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2691 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 104:
-#line 686 "src/parse-gram.y" /* yacc.c:1646 */
+#line 686 "src/parse-gram.y" /* yacc.c:1648 */
{
(yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
}
-#line 2699 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2701 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 105:
-#line 694 "src/parse-gram.y" /* yacc.c:1646 */
+#line 694 "src/parse-gram.y" /* yacc.c:1648 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2705 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2707 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 108:
-#line 706 "src/parse-gram.y" /* yacc.c:1646 */
+#line 706 "src/parse-gram.y" /* yacc.c:1648 */
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].code)), (yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
}
-#line 2714 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2716 "src/parse-gram.c" /* yacc.c:1648 */
break;
case 110:
-#line 715 "src/parse-gram.y" /* yacc.c:1646 */
+#line 715 "src/parse-gram.y" /* yacc.c:1648 */
{
muscle_code_grow ("epilogue", translate_code ((yyvsp[0].code), (yylsp[0]), true), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2723 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2725 "src/parse-gram.c" /* yacc.c:1648 */
break;
-#line 2727 "src/parse-gram.c" /* yacc.c:1646 */
+#line 2729 "src/parse-gram.c" /* yacc.c:1648 */
default: break;
}
if (yychar_backup != yychar)
@@ -2852,7 +2854,6 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- yyerror_range[1] = yylsp[1-yylen];
/* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -2970,7 +2971,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 721 "src/parse-gram.y" /* yacc.c:1906 */
+#line 721 "src/parse-gram.y" /* yacc.c:1907 */
/* Return the location of the left-hand side of a rule whose
@@ -3033,7 +3034,7 @@ translate_code_braceless (char *code, location loc)
static void
add_param (param_type type, char *decl, location loc)
{
- static char const alphanum[26 + 26 + 1 + 10] =
+ static char const alphanum[26 + 26 + 1 + 10 + 1] =
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"_"
@@ -3045,18 +3046,18 @@ add_param (param_type type, char *decl, location loc)
/* 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))
+ || ! memchr (alphanum, p[-1], sizeof alphanum - 1))
+ && memchr (alphanum, p[0], sizeof alphanum - 10 - 1))
name_start = p;
/* Strip the surrounding '{' and '}', and any blanks just inside
the braces. */
--p;
- while (c_isspace ((unsigned char) *p))
+ while (c_isspace ((unsigned char) *p))
--p;
p[1] = '\0';
++decl;
- while (c_isspace ((unsigned char) *decl))
+ while (c_isspace ((unsigned char) *decl))
++decl;
}
diff --git a/src/parse-gram.h b/src/parse-gram.h
index 26bb3c54..450a7682 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.29-9a91e. */
+/* A Bison parser, made by GNU Bison 3.0.4.38-1047-dirty. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018 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
@@ -48,11 +48,11 @@
extern int gram_debug;
#endif
/* "%code requires" blocks. */
-#line 21 "src/parse-gram.y" /* yacc.c:1909 */
+#line 21 "src/parse-gram.y" /* yacc.c:1910 */
#include "symlist.h"
#include "symtab.h"
-#line 221 "src/parse-gram.y" /* yacc.c:1909 */
+#line 221 "src/parse-gram.y" /* yacc.c:1910 */
typedef enum
{
@@ -61,10 +61,10 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-#line 647 "src/parse-gram.y" /* yacc.c:1909 */
+#line 647 "src/parse-gram.y" /* yacc.c:1910 */
#include "muscle-tab.h"
-#line 68 "src/parse-gram.h" /* yacc.c:1909 */
+#line 68 "src/parse-gram.h" /* yacc.c:1910 */
/* Token type. */
#ifndef GRAM_TOKENTYPE
@@ -135,27 +135,27 @@ extern int gram_debug;
union GRAM_STYPE
{
-#line 182 "src/parse-gram.y" /* yacc.c:1909 */
+#line 182 "src/parse-gram.y" /* yacc.c:1910 */
unsigned char character;
-#line 186 "src/parse-gram.y" /* yacc.c:1909 */
+#line 186 "src/parse-gram.y" /* yacc.c:1910 */
char *code;
-#line 191 "src/parse-gram.y" /* yacc.c:1909 */
+#line 191 "src/parse-gram.y" /* yacc.c:1910 */
uniqstr uniqstr;
-#line 199 "src/parse-gram.y" /* yacc.c:1909 */
+#line 199 "src/parse-gram.y" /* yacc.c:1910 */
int integer;
-#line 203 "src/parse-gram.y" /* yacc.c:1909 */
+#line 203 "src/parse-gram.y" /* yacc.c:1910 */
symbol *symbol;
-#line 208 "src/parse-gram.y" /* yacc.c:1909 */
+#line 208 "src/parse-gram.y" /* yacc.c:1910 */
assoc assoc;
-#line 211 "src/parse-gram.y" /* yacc.c:1909 */
+#line 211 "src/parse-gram.y" /* yacc.c:1910 */
symbol_list *list;
-#line 214 "src/parse-gram.y" /* yacc.c:1909 */
+#line 214 "src/parse-gram.y" /* yacc.c:1910 */
named_ref *named_ref;
-#line 241 "src/parse-gram.y" /* yacc.c:1909 */
+#line 241 "src/parse-gram.y" /* yacc.c:1910 */
param_type param;
-#line 409 "src/parse-gram.y" /* yacc.c:1909 */
+#line 409 "src/parse-gram.y" /* yacc.c:1910 */
code_props_type code_type;
-#line 649 "src/parse-gram.y" /* yacc.c:1909 */
+#line 649 "src/parse-gram.y" /* yacc.c:1910 */
struct
{
@@ -163,7 +163,7 @@ code_props_type code_type;
muscle_kind kind;
} value;
-#line 167 "src/parse-gram.h" /* yacc.c:1909 */
+#line 167 "src/parse-gram.h" /* yacc.c:1910 */
};
typedef union GRAM_STYPE GRAM_STYPE;
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 5a0b2006..39088cb0 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,6 +1,6 @@
/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -780,7 +780,7 @@ translate_code_braceless (char *code, location loc)
static void
add_param (param_type type, char *decl, location loc)
{
- static char const alphanum[26 + 26 + 1 + 10] =
+ static char const alphanum[26 + 26 + 1 + 10 + 1] =
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"_"
@@ -792,18 +792,18 @@ add_param (param_type type, char *decl, location loc)
/* 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))
+ || ! memchr (alphanum, p[-1], sizeof alphanum - 1))
+ && memchr (alphanum, p[0], sizeof alphanum - 10 - 1))
name_start = p;
/* Strip the surrounding '{' and '}', and any blanks just inside
the braces. */
--p;
- while (c_isspace ((unsigned char) *p))
+ while (c_isspace ((unsigned char) *p))
--p;
p[1] = '\0';
++decl;
- while (c_isspace ((unsigned char) *decl))
+ while (c_isspace ((unsigned char) *decl))
++decl;
}
diff --git a/src/print-xml.c b/src/print-xml.c
index f1564244..3f4bc5be 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -1,6 +1,6 @@
/* Print an xml on generated parser, for Bison,
- Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/print-xml.h b/src/print-xml.h
index dd09f8d5..abdb7635 100644
--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -1,6 +1,6 @@
/* Output an xml of the generated parser, for Bison.
- Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/print.c b/src/print.c
index 3fb8fbf0..affaa426 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
/* Print information on generated parser, for bison,
- Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015 Free
+ Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015, 2018 Free
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/print.h b/src/print.h
index 22b57ee7..61bc2055 100644
--- a/src/print.h
+++ b/src/print.h
@@ -1,6 +1,6 @@
/* Print information on generated parser, for bison,
- Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/print_graph.c b/src/print_graph.c
index d9181a46..15d6dd57 100644
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -1,6 +1,7 @@
/* Output a graph of the generated parser, for Bison.
- Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/print_graph.h b/src/print_graph.h
index 4e0c5b07..4081b63d 100644
--- a/src/print_graph.h
+++ b/src/print_graph.h
@@ -1,6 +1,7 @@
/* Output a graph of the generated parser, for Bison.
- Copyright (C) 2000, 2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2006, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/reader.c b/src/reader.c
index ae606920..c220d707 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
/* Input parser for Bison
Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
- 2009-2015 Free Software Foundation, Inc.
+ 2009-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/reader.h b/src/reader.h
index 5c99437e..14e35a94 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,6 +1,6 @@
/* Input parser for Bison
- Copyright (C) 2000-2003, 2005-2007, 2009-2015 Free Software
+ Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/reduce.c b/src/reduce.c
index 316833bb..c5013a9e 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,6 +1,6 @@
/* Grammar reduction for Bison.
- Copyright (C) 1988-1989, 2000-2003, 2005-2015 Free Software
+ Copyright (C) 1988-1989, 2000-2003, 2005-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/reduce.h b/src/reduce.h
index 254f7bc2..b1baa892 100644
--- a/src/reduce.h
+++ b/src/reduce.h
@@ -1,7 +1,7 @@
/* Grammar reduction for Bison.
- Copyright (C) 2000-2002, 2007, 2009-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2000-2002, 2007, 2009-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/relation.c b/src/relation.c
index f48c6621..71473278 100644
--- a/src/relation.c
+++ b/src/relation.c
@@ -1,7 +1,7 @@
/* Binary relations.
- Copyright (C) 2002, 2004-2005, 2009-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2002, 2004-2005, 2009-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/relation.h b/src/relation.h
index 4604cd68..cc940f93 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,6 +1,7 @@
/* Binary relations.
- Copyright (C) 2002, 2004, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-code.h b/src/scan-code.h
index 1e03a330..ed70d25b 100644
--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -1,6 +1,7 @@
/* Bison code properties structure and scanner.
- Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-code.l b/src/scan-code.l
index eeca1616..e79e8859 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,6 @@
/* Bison Action Scanner -*- C -*-
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-gram.h b/src/scan-gram.h
index 84f3b735..f135959e 100644
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -1,6 +1,7 @@
/* Bison Grammar Scanner
- Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-gram.l b/src/scan-gram.l
index a7e9bc4f..ff5c056e 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,6 +1,6 @@
/* Bison Grammar Scanner -*- C -*-
- Copyright (C) 2002-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-skel.h b/src/scan-skel.h
index 049637a5..f76abde1 100644
--- a/src/scan-skel.h
+++ b/src/scan-skel.h
@@ -1,6 +1,7 @@
/* Scan Bison Skeletons.
- Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/scan-skel.l b/src/scan-skel.l
index 22756267..096a07ae 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
/* Scan Bison Skeletons. -*- C -*-
- Copyright (C) 2001-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2015, 2018 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/state.c b/src/state.c
index 62b75291..7037b358 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,6 +1,7 @@
/* Type definitions for the finite state machine for Bison.
- Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/state.h b/src/state.h
index 3c65efd0..f8ef6d2a 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
/* Type definitions for the finite state machine for Bison.
- Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symlist.c b/src/symlist.c
index d3dc3118..201ddabd 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,7 +1,7 @@
/* Lists of symbols for Bison
- Copyright (C) 2002, 2005-2007, 2009-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2002, 2005-2007, 2009-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symlist.h b/src/symlist.h
index 45cb7963..3ade1704 100644
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -1,7 +1,7 @@
/* Lists of symbols for Bison
- Copyright (C) 2002, 2005-2007, 2009-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 2002, 2005-2007, 2009-2015, 2018 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symtab.c b/src/symtab.c
index f23b7961..eb4511aa 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,6 +1,6 @@
/* Symbol table manager for Bison.
- Copyright (C) 1984, 1989, 2000-2002, 2004-2015 Free Software
+ Copyright (C) 1984, 1989, 2000-2002, 2004-2015, 2018 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/symtab.h b/src/symtab.h
index d984070e..63b5fba2 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,7 +1,7 @@
/* Definitions for symtab.c and callers, part of Bison.
- Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015 Free Software
- Foundation, Inc.
+ Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015, 2018 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/system.h b/src/system.h
index 8ed08bb8..caca0442 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,7 @@
/* System-dependent definitions for Bison.
- Copyright (C) 2000-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2007, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/tables.c b/src/tables.c
index eb8572fc..3481ffb7 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,6 +1,6 @@
/* Output the generated parsing program for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015 Free
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015, 2018 Free
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/tables.h b/src/tables.h
index 271e0bf0..349078a0 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,6 +1,7 @@
/* Prepare the LALR and GLR parser tables.
- Copyright (C) 2002, 2004, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/uniqstr.c b/src/uniqstr.c
index a4e2db0e..bfe1d172 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,7 @@
/* Keep a unique copy of strings.
- Copyright (C) 2002-2005, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2005, 2009-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
diff --git a/src/uniqstr.h b/src/uniqstr.h
index 3f32d9d0..fe04cb79 100644
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,6 +1,7 @@
/* Keeping a unique copy of strings.
- Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2008-2015, 2018 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.