[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2765-g45b3635

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  45b363502f438604737f19b639f7dc1433a022f2 (commit)
       via  94ca7f779925580a8bbc5864316f1625a3317332 (commit)
      from  d94b010f4ff2a117cc5cad8219279b6bf820e29f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=45b363502f438604737f19b639f7dc1433a022f2

commit 45b363502f438604737f19b639f7dc1433a022f2
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Sep 13 21:50:12 2017 +0300

    Small fixes to doc for use with info command.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9afe6d5..03ab0c2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-13         David Kaspar          <address@hidden>
+
+       * gawktexi.in: Fix the dir entry.
+       * gawkinet.texi: Allow calling as `info awktexi'.
+
 2017-09-12         Arnold D. Robbins     <address@hidden>
 
        * gawktexi.in (Installation summary): Note OS/2 exists for PCs
diff --git a/doc/gawk.info b/doc/gawk.info
index b988084..3e8331c 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -25,7 +25,7 @@ END-INFO-DIR-ENTRY
 
 INFO-DIR-SECTION Individual utilities
 START-INFO-DIR-ENTRY
-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
+* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
 END-INFO-DIR-ENTRY
 
 
diff --git a/doc/gawk.texi b/doc/gawk.texi
index e2d2332..5512179 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -16,7 +16,7 @@
 @end direntry
 @dircategory Individual utilities
 @direntry
-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
+* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
 @end direntry
 
 @c Enable better indexing, requires texindex from Texinfo 6 or later.
diff --git a/doc/gawkinet.info b/doc/gawkinet.info
index d5a7abf..bb89265 100644
--- a/doc/gawkinet.info
+++ b/doc/gawkinet.info
@@ -24,7 +24,7 @@ texts being (a) (see below), and with the Back-Cover Texts 
being (b)
      software freedom."
 INFO-DIR-SECTION Network applications
 START-INFO-DIR-ENTRY
-* Gawkinet: (gawkinet).         TCP/IP Internetworking With 'gawk'.
+* awkinet: (gawkinet).          TCP/IP Internetworking With 'gawk'.
 END-INFO-DIR-ENTRY
 
    This file documents the networking features in GNU 'awk'.
diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
index 07b117d..143ec46 100644
--- a/doc/gawkinet.texi
+++ b/doc/gawkinet.texi
@@ -7,7 +7,7 @@
 
 @dircategory Network applications
 @direntry
-* Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
+* awkinet: (gawkinet).          TCP/IP Internetworking With `gawk'.
 @end direntry
 
 @c Enable better indexing, requires texindex from Texinfo 6 or later.
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index f2471cc..65d3cf4 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -11,7 +11,7 @@
 @end direntry
 @dircategory Individual utilities
 @direntry
-* awk: (gawk)Invoking gawk.                     Text scanning and processing.
+* awk: (gawk)Invoking Gawk.                     Text scanning and processing.
 @end direntry
 
 @c Enable better indexing, requires texindex from Texinfo 6 or later.

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=94ca7f779925580a8bbc5864316f1625a3317332

commit 94ca7f779925580a8bbc5864316f1625a3317332
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Sep 13 21:46:48 2017 +0300

    Revise build to use bison for both grammars in a parallel-safe way.

diff --git a/ChangeLog b/ChangeLog
index 533c549..a355842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-09-13         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (command.c): Don't need the dependency on awkgram.c
+       anymore.
+       * bisonfix.awk: Removed.
+       * README: Revised to describe use of Bison exclusively.
+
+2017-09-13         Andrew J. Schorr      <address@hidden>
+
+       * Makefile.am (awkgram.c): Use -o option to bison. Get rid of
+       messing with y.tab.h, that was obsolete.
+       (EXTRA_DIST): Don't need bisonfix.awk anymore.
+
 2017-09-12         Petr Ovtchenkov       <address@hidden>
                   Andrew J. Schorr      <address@hidden>
 
diff --git a/Makefile.am b/Makefile.am
index 1040a77..0089b86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ EXTRA_DIST = \
        NEWS.0 \
        POSIX.STD \
        README_d \
-       bisonfix.awk \
        config.guess \
        config.rpath  \
        config.sub \
@@ -183,17 +182,12 @@ dist-hook:
        cp "$(srcdir)"/pc/config.h "$(distdir)"/pc/config.h
 
 # Special rules for individual files
-# Use of awk instead of $(AWK) is deliberate, in case gawk doesn't build
-# or work correctly.
 
 awkgram.c: awkgram.y
-       $(YACC) $(AM_YFLAGS) $(YFLAGS) $<
-       sed 's/parse error/syntax error/g' < y.tab.c | awk -f 
"$(srcdir)"/bisonfix.awk awkgram > $*.c && rm y.tab.c
-       if test -f y.tab.h; then \
-       if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-       else :; fi
+       $(YACC) -o $@ $(AM_YFLAGS) $(YFLAGS) $<
+       sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
-command.c: command.y awkgram.c
+command.c: command.y
        $(YACC) -o $@ -p zz $<
        sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
diff --git a/Makefile.in b/Makefile.in
index e978a6e..ade9835 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -461,7 +461,6 @@ EXTRA_DIST = \
        NEWS.0 \
        POSIX.STD \
        README_d \
-       bisonfix.awk \
        config.guess \
        config.rpath  \
        config.sub \
@@ -1193,17 +1192,12 @@ dist-hook:
        cp "$(srcdir)"/pc/config.h "$(distdir)"/pc/config.h
 
 # Special rules for individual files
-# Use of awk instead of $(AWK) is deliberate, in case gawk doesn't build
-# or work correctly.
 
 awkgram.c: awkgram.y
-       $(YACC) $(AM_YFLAGS) $(YFLAGS) $<
-       sed 's/parse error/syntax error/g' < y.tab.c | awk -f 
"$(srcdir)"/bisonfix.awk awkgram > $*.c && rm y.tab.c
-       if test -f y.tab.h; then \
-       if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-       else :; fi
+       $(YACC) -o $@ $(AM_YFLAGS) $(YFLAGS) $<
+       sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
-command.c: command.y awkgram.c
+command.c: command.y
        $(YACC) -o $@ -p zz $<
        sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
diff --git a/README b/README
index 8c1916e..42b8953 100644
--- a/README
+++ b/README
@@ -34,14 +34,13 @@ have read and didn't, and you bug me about it, I'm going to 
yell at you.
 
 See the file INSTALL for installation instructions.
 
-If you have neither Bison nor yacc, use the awkgram.c file here.  It was
+If you don't have neither Bison, use the awkgram.c file here.  It was
 generated with Bison, and has no proprietary code in it.  (Note that
-modifying awkgram.y without Bison or yacc will be difficult, at best.
-You might want to get a copy of Bison from the FSF too.)
+modifying awkgram.y without Bison will be difficult, at best.  You might
+want to get a copy of Bison from the FSF too.)
 
-Since there are two parsers in gawk (one for the grammar, one for the
-debugger), there is a dependency on Bison's ability to rename the
-yacc internal variables.  So, you should really use Bison and not yacc.
+The build mechanics depend upon Bison. Also, gawk doesn't work correctly
+with some versions of yacc, so just use Bison.
 
 If you have an MS-DOS, MS-Windows, or OS/2 system, use the stuff in the `pc'
 directory.  Similarly, there is a separate directory for VMS.
diff --git a/bisonfix.awk b/bisonfix.awk
deleted file mode 100644
index 87fe9ee..0000000
--- a/bisonfix.awk
+++ /dev/null
@@ -1,43 +0,0 @@
-# bisonfix.awk --- tweak awkgram.c for stupid compilers.
-
-# Copyright (C) 2005, 2009, 2013 the Free Software Foundation, Inc.
-# 
-# This file is part of GAWK, the GNU implementation of the
-# AWK Programming Language.
-# 
-# GAWK 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.
-# 
-# GAWK 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA
-
-BEGIN { sfile = ARGV[1] ; ARGV[1] = "-" ; ARGC = 2 }
-
-# 2/2013: Comment this out to see if any system still needs it.
-# /^#if.*\\$/ {
-#      line = $0
-#      sub(/\\$/, "", line)
-#      getline line2
-#      while (line2 ~ /\\$/) {
-#              line = line line2
-#              sub(/\\$/, "", line)
-#              getline line2
-#      }
-#      line = line line2
-#      sub(/\\$/, "", line)
-#      print line
-#      next
-# }
-
-/^#line.*y\.tab\.c/    { sub(/y.tab/, sfile) }
-
-{ print }
-

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         | 13 +++++++++++++
 Makefile.am       | 12 +++---------
 Makefile.in       | 12 +++---------
 README            | 11 +++++------
 bisonfix.awk      | 43 -------------------------------------------
 doc/ChangeLog     |  5 +++++
 doc/gawk.info     |  2 +-
 doc/gawk.texi     |  2 +-
 doc/gawkinet.info |  2 +-
 doc/gawkinet.texi |  2 +-
 doc/gawktexi.in   |  2 +-
 11 files changed, 34 insertions(+), 72 deletions(-)
 delete mode 100644 bisonfix.awk


hooks/post-receive
-- 
gawk