[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-684-g665ec92

[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, gawk-4.1-stable has been updated
       via  665ec924795675c32d7178613367ec9f7a7d08e1 (commit)
       via  7e6fcced8b12b2e6f0c04c9f36841a963a660b86 (commit)
       via  a7b3553c2c3aa362d28493d75691a8dc86f707ba (commit)
      from  ff9ab7fc13c4fb96477fa07d681bad2c24b78ade (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=665ec924795675c32d7178613367ec9f7a7d08e1

commit 665ec924795675c32d7178613367ec9f7a7d08e1
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 30 10:04:09 2015 +0300

    Fix brackets in regexps again. Let's hope this is really it.

diff --git a/ChangeLog b/ChangeLog
index 1565709..07dd5f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
        Thanks to Steffen Nurpmeso <address@hidden> for
        the report.
 
+       Unrelated:
+
+       * awkgram.y (yylex): Yet Another Fix for parsing bracket
+       expressions. Thanks again to Andrew Schorr.
+
 2015-04-29         Arnold D. Robbins     <address@hidden>
 
        * 4.1.2: Release tar ball made.
diff --git a/awkgram.c b/awkgram.c
index 14e29d9..3f64cb2 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -5364,7 +5364,7 @@ yylex(void)
                /*
                 * Here is what's ok with brackets:
                 *
-                * [[] [^[] []] [^]] [.../...]
+                * [..[..] []] [^]] [.../...]
                 * [...\[...] [...\]...] [...\/...]
                 * 
                 * (Remember that all of the above are inside /.../)
@@ -5372,7 +5372,7 @@ yylex(void)
                 * The code for \ handles \[, \] and \/.
                 *
                 * Otherwise, track the first open [ position, and if
-                * an embedded [ or ] occurs, allow it to pass through
+                * an embedded ] occurs, allow it to pass through
                 * if it's right after the first [ or after [^.
                 *
                 * Whew!
@@ -5383,19 +5383,21 @@ yylex(void)
                for (;;) {
                        c = nextc(false);
 
+                       cur_index = tok - tokstart;
                        if (gawk_mb_cur_max == 1 || nextc_is_1stbyte) switch 
(c) {
                        case '[':
+                               if (nextc(false) == ':' || in_brack == 0)
+                                       in_brack++;
+                               pushback();
+                               if (in_brack == 1)
+                                       b_index = tok - tokstart;
+                               break;
                        case ']':
-                               cur_index = tok - tokstart;
                                if (in_brack > 0
                                    && (cur_index == b_index + 1 
                                        || (cur_index == b_index + 2 && tok[-1] 
== '^')))
                                        ; /* do nothing */
-                               else if (c == '[') {
-                                       in_brack++;
-                                       if (in_brack == 1)
-                                               b_index = tok - tokstart;
-                               } else {
+                               else {
                                        in_brack--;
                                        if (in_brack == 0)
                                                b_index = -1;
diff --git a/awkgram.y b/awkgram.y
index beb85d5..8228307 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3025,7 +3025,7 @@ yylex(void)
                /*
                 * Here is what's ok with brackets:
                 *
-                * [[] [^[] []] [^]] [.../...]
+                * [..[..] []] [^]] [.../...]
                 * [...\[...] [...\]...] [...\/...]
                 * 
                 * (Remember that all of the above are inside /.../)
@@ -3033,7 +3033,7 @@ yylex(void)
                 * The code for \ handles \[, \] and \/.
                 *
                 * Otherwise, track the first open [ position, and if
-                * an embedded [ or ] occurs, allow it to pass through
+                * an embedded ] occurs, allow it to pass through
                 * if it's right after the first [ or after [^.
                 *
                 * Whew!
@@ -3044,19 +3044,21 @@ yylex(void)
                for (;;) {
                        c = nextc(false);
 
+                       cur_index = tok - tokstart;
                        if (gawk_mb_cur_max == 1 || nextc_is_1stbyte) switch 
(c) {
                        case '[':
+                               if (nextc(false) == ':' || in_brack == 0)
+                                       in_brack++;
+                               pushback();
+                               if (in_brack == 1)
+                                       b_index = tok - tokstart;
+                               break;
                        case ']':
-                               cur_index = tok - tokstart;
                                if (in_brack > 0
                                    && (cur_index == b_index + 1 
                                        || (cur_index == b_index + 2 && tok[-1] 
== '^')))
                                        ; /* do nothing */
-                               else if (c == '[') {
-                                       in_brack++;
-                                       if (in_brack == 1)
-                                               b_index = tok - tokstart;
-                               } else {
+                               else {
                                        in_brack--;
                                        if (in_brack == 0)
                                                b_index = -1;

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7e6fcced8b12b2e6f0c04c9f36841a963a660b86

commit 7e6fcced8b12b2e6f0c04c9f36841a963a660b86
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 30 10:01:29 2015 +0300

    Add some notes in Checklist.

diff --git a/Checklist b/Checklist
index e0e1ffe..cb9c4d2 100644
--- a/Checklist
+++ b/Checklist
@@ -1,4 +1,4 @@
-Fri Apr  4 11:43:29 IDT 2014
+Thu Apr 30 10:01:17 IDT 2015
 ============================
 
 A checklist for making releases
@@ -57,3 +57,12 @@ run the following command just before rolling a new release:
 
 Major releases:
 - Rotate the ChangeLog and NEWS files.
+
+========== For Releasing ============
+
+To upload:
+       gnupload --to ftp.gnu.org:gawk gawk-Whatever.gz
+
+For doc:
+       Use the perl makeinfo to create the files.
+       Use gendocs.sh and gendoc_template from gnulib.

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

commit a7b3553c2c3aa362d28493d75691a8dc86f707ba
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Apr 30 09:59:32 2015 +0300

    Take --program-prefix into account for the installation symlinks.

diff --git a/ChangeLog b/ChangeLog
index 7010c4a..1565709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-30         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am: Take --program-prefix into account when
+       installing/uninstalling the symlinks, especially 'awk'.
+       Thanks to Steffen Nurpmeso <address@hidden> for
+       the report.
+
 2015-04-29         Arnold D. Robbins     <address@hidden>
 
        * 4.1.2: Release tar ball made.
diff --git a/Makefile.am b/Makefile.am
index 2d8357d..c646fc3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,17 +154,21 @@ RM = rm -f
 # For GNU systems where gawk is awk, add a link to awk.
 # (This is done universally, which may not always be right, but
 # there's no easy way to distinguish GNU from non-GNU systems.)
+#
+# Use the transform, in case --program-prefix=XXX
 install-exec-hook:
        (cd $(DESTDIR)$(bindir); \
-       $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+       name=`echo gawk | sed '$(transform)'` ; \
+       $(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
        if [ ! -f awk$(EXEEXT) ]; \
-       then    $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
+       then    $(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \
        fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
        (cd $(DESTDIR)$(bindir); \
-       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; 
then rm -f awk$(EXEEXT); fi ; \
+       name=`echo gawk | sed '$(transform)'` ; \
+       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) $${name}$(EXEEXT) > 
/dev/null; then rm -f awk$(EXEEXT); fi ; \
        rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links
diff --git a/Makefile.in b/Makefile.in
index 79a5a2a..183d71c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1172,17 +1172,21 @@ uninstall-am: uninstall-binPROGRAMS 
uninstall-includeHEADERS
 # For GNU systems where gawk is awk, add a link to awk.
 # (This is done universally, which may not always be right, but
 # there's no easy way to distinguish GNU from non-GNU systems.)
+#
+# Use the transform, in case --program-prefix=XXX
 install-exec-hook:
        (cd $(DESTDIR)$(bindir); \
-       $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+       name=`echo gawk | sed '$(transform)'` ; \
+       $(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
        if [ ! -f awk$(EXEEXT) ]; \
-       then    $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
+       then    $(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \
        fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
        (cd $(DESTDIR)$(bindir); \
-       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; 
then rm -f awk$(EXEEXT); fi ; \
+       name=`echo gawk | sed '$(transform)'` ; \
+       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) $${name}$(EXEEXT) > 
/dev/null; then rm -f awk$(EXEEXT); fi ; \
        rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links

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

Summary of changes:
 ChangeLog   |   12 ++++++++++++
 Checklist   |   11 ++++++++++-
 Makefile.am |   10 +++++++---
 Makefile.in |   10 +++++++---
 awkgram.c   |   18 ++++++++++--------
 awkgram.y   |   18 ++++++++++--------
 6 files changed, 56 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
gawk