Expand GLR acronym in summary of Bison.

Based on discussion with Akim Demaille starting at
<http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00087.html>.
* doc/bison.texinfo (Introduction): Here.
* src/getargs.c (usage): Here.
(cherry picked from commit 51c7ca01e2c9cfb5c7a274bed0e14899adbd005c)

diff --git a/ChangeLog b/ChangeLog
index 672f12f614e1a60f6dca4bcaecb2af4f0daf8ab6..549b084a4183ebc4133d00f309a4e2b466c95b67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-14  Joel E. Denny  <jdenny@clemson.edu>
+
+       Expand GLR acronym in summary of Bison.
+       Based on discussion with Akim Demaille starting at
+       <http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00087.html>.
+       * doc/bison.texinfo (Introduction): Here.
+       * src/getargs.c (usage): Here.
+
 2009-10-03  Alex Rozenman  <rozenman@gmail.com>
 
        Document named references.

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 8cb386102029c68659a6544786a166d5ab2c0a4c..2af89175af4825bd7a4cdfa330fe8fd7e80dfffd 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -353,9 +353,10 @@ Copying This Manual
 @cindex introduction
 
 @dfn{Bison} is a general-purpose parser generator that converts an
-annotated context-free grammar into a deterministic or @acronym{GLR}
-parser employing @acronym{LALR}(1), @acronym{IELR}(1), or canonical
-@acronym{LR}(1) parser tables.
+annotated context-free grammar into a deterministic @acronym{LR} or
+generalized @acronym{LR} (@acronym{GLR}) parser employing
+@acronym{LALR}(1), @acronym{IELR}(1), or canonical @acronym{LR}(1)
+parser tables.
 Once you are proficient with Bison, you can use it to develop a wide
 range of language parsers, from those used in simple desk calculators to
 complex programming languages.

diff --git a/src/getargs.c b/src/getargs.c
index 152b7eb8af9a5d0e1702283f2daf10d3c1678a79..bc8677f5095e0c591d1eafb14c0e04fa34e4398b 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -262,8 +262,8 @@ usage (int status)
 
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
-Generate a deterministic or GLR parser employing LALR(1), IELR(1), or\n\
-canonical LR(1) parser tables.\n\
+Generate a deterministic LR or generalized LR (GLR) parser employing\n\
+LALR(1), IELR(1), or canonical LR(1) parser tables.\n\
 \n\
 "), stdout);