Imported Upstream version 20111219

diff --git a/CHANGES b/CHANGES
index 566fcf47934af094ab4f1d1621c8da80333692ab..b617d70a89eaa76318b0d7f780c339d3e3599924 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+2011-12-19  Thomas E. Dickey  <tom@invisible-island.net>
+
+       * package/debian/changelog, package/byacc.spec, VERSION: bump
+
+       * yacc.1, output.c, main.c, defs.h:
+       add "-s" option to suppress generating #define's based on string contents
+       in a %token statement.  For instance
+               %token EQLS "Equals"
+       would generate
+               #define EQLS 256
+               #define Equals 257
+       Simply suppressing the second #define makes the behavior closer to yacc.
+       (report by Paulo Andrade).
+
 2011-09-08  Thomas E. Dickey  <tom@invisible-island.net>
 
        * package/debian/changelog, package/byacc.spec, VERSION: bump

diff --git a/VERSION b/VERSION
index 95a374e34e66b5c0e72ebc50b2229d243e022321..59998ba84f3880199bca634852c49595c3d9d97e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20110908
+20111219

diff --git a/defs.h b/defs.h
index b4b9d4363537f87169947ab492907ca36db87d92..c774997a0c1d8de4d1fcbace2e75a1c22dea0951 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -1,4 +1,4 @@
-/* $Id: defs.h,v 1.35 2011/09/07 08:55:03 tom Exp $ */
+/* $Id: defs.h,v 1.36 2011/12/20 01:31:16 tom Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -230,6 +230,7 @@ extern char gflag;
 extern char iflag;
 extern char lflag;
 extern char rflag;
+extern char sflag;
 extern char tflag;
 extern char vflag;
 extern const char *symbol_prefix;

diff --git a/main.c b/main.c
index 4014595524ac268fe141ad74fb2afbd4a34bf374..7263d96bca006f60bbe39dfa06e662c72a256afe 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.36 2011/09/06 22:44:45 tom Exp $ */
+/* $Id: main.c,v 1.37 2011/12/20 01:37:40 tom Exp $ */
 
 #include <signal.h>
 #include <unistd.h>            /* for _exit() */
@@ -38,6 +38,7 @@ char iflag;
 char lflag;
 static char oflag;
 char rflag;
+char sflag;
 char tflag;
 char vflag;
 
@@ -244,6 +245,10 @@ setflag(int ch)
        rflag = 1;
        break;
 
+    case 's':
+       sflag = 1;
+       break;
+
     case 't':
        tflag = 1;
        break;

diff --git a/output.c b/output.c
index f87e6e50e76434619cb4cf59990ada6dae1f43a3..5b283c74ad2f1477d096e16dcd629b26a8af55f5 100644 (file)
--- a/output.c
+++ b/output.c
@@ -1,4 +1,4 @@
-/* $Id: output.c,v 1.41 2011/09/08 09:25:40 tom Exp $ */
+/* $Id: output.c,v 1.42 2011/12/20 01:38:18 tom Exp $ */
 
 #include "defs.h"
 
@@ -827,7 +827,7 @@ output_defines(FILE * fp)
     for (i = 2; i < ntokens; ++i)
     {
        s = symbol_name[i];
-       if (is_C_identifier(s))
+       if (is_C_identifier(s) && (!sflag || *s != '"'))
        {
            fprintf(fp, "#define ");
            c = *s;

diff --git a/package/byacc.spec b/package/byacc.spec
index 7d13982103f63be655b06175b7028f096223c986..39f859482397949a821fdbcd58fea60bd8aa7f7b 100644 (file)
--- a/package/byacc.spec
+++ b/package/byacc.spec
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20110908
+%define AppVersion 20111219
 %define UseProgram yacc
-# $XTermId: byacc.spec,v 1.10 2011/09/08 09:45:02 tom Exp $
+# $XTermId: byacc.spec,v 1.11 2011/12/20 01:53:34 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1

diff --git a/package/debian/changelog b/package/debian/changelog
index fc40d905aa69f887db361096e1147bbe5f83a1c8..0b6601fa5b3e8e100a9068e1b7800f25380580fb 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+byacc (20111219) unstable; urgency=low
+
+  * add "-s" option.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 19 Dec 2011 20:54:09 -0500
+
 byacc (20110908) unstable; urgency=low
 
   * add "-i" option.

diff --git a/yacc.1 b/yacc.1
index d180d8315d335276e06026a454f071b6a90fb569..5b2bbe151bd265103ec9651f3af0597b07b41417 100644 (file)
--- a/yacc.1
+++ b/yacc.1
@@ -1,4 +1,4 @@
-.\" $Id: yacc.1,v 1.12 2011/09/08 00:40:44 tom Exp $
+.\" $Id: yacc.1,v 1.13 2011/12/20 01:46:19 tom Exp $
 .\"
 .\" .TH YACC 1 "July\ 15,\ 1990"
 .\" .UC 6
@@ -105,6 +105,10 @@ and the tables file is named
 .IR y.tab.c.
 The prefix "\fIy.\fP" can be overridden using the \fB\-b\fP option.
 .TP
+.B \-s
+suppress "\fB#define\fP" statements generated for string literals in
+a "%token" statement, to more closely match original \fByacc\fP behavior.
+.TP
 .B \-t
 The
 .B \-t