[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2557-ge5b52db

[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  e5b52db52bdf2a8d04e6025946fa692a10187e00 (commit)
       via  d5491215cec13204eacfa517d81f5696c765c29c (commit)
      from  a3be85eec86d00c12e7f4b41a9e27794fbb479a6 (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=e5b52db52bdf2a8d04e6025946fa692a10187e00

commit e5b52db52bdf2a8d04e6025946fa692a10187e00
Merge: d549121 a3be85e
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 1 15:54:23 2017 +0300

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk

diff --cc ChangeLog
index 858a5fc,a2ab628..59fb425
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,15 +1,21 @@@
 +2017-05-01         Arnold D. Robbins     <address@hidden>
 +
 +      * awkgram.y (nextc): Fix to change of 2017-04-24 such that
 +      @include works in multibyte locales. Thanks to Hermann
 +      Peifer for the bug report.
 +
+ 2017-04-26         Andrew J. Schorr     <address@hidden>
+ 
+       * awkgram.y (make_regnode): Fix bug -- we should not set valref to 1
+       when creating a node of type Node_regex, since valref is appropriate
+       only for Node_val nodes. This fixes a bug introduced in commit
+       687e6594. Also, add an assert to make it clear that this function
+       supports only Node_regex and Node_dynregex.
+       * awk.h (NODE): Restore sref to the `val' subportion, since it is not
+       really needed for Node_regex, now that the bug in make_regnode has
+       been fixed.
+       (valref): Restore macro definition.
+ 
  2017-04-24         Arnold D. Robbins     <address@hidden>
  
        * awk.h (NODE): Additional cleanups. Removed `aq' and `param_list'

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

commit d5491215cec13204eacfa517d81f5696c765c29c
Author: Arnold D. Robbins <address@hidden>
Date:   Mon May 1 15:52:55 2017 +0300

    Additional fix for --source, and add test case.

diff --git a/ChangeLog b/ChangeLog
index eccda54..858a5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-01         Arnold D. Robbins     <address@hidden>
+
+       * awkgram.y (nextc): Fix to change of 2017-04-24 such that
+       @include works in multibyte locales. Thanks to Hermann
+       Peifer for the bug report.
+
 2017-04-24         Arnold D. Robbins     <address@hidden>
 
        * awk.h (NODE): Additional cleanups. Removed `aq' and `param_list'
diff --git a/awkgram.c b/awkgram.c
index aa7b4a4..b63a4ef 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -5526,12 +5526,8 @@ again:
                if (lexeof) {
                        if (sourcefile->next == srcfiles)
                                return END_FILE;
-                       else {
+                       else
                                next_sourcefile();
-                               if (get_src_buf())
-                                       goto again;
-                               return END_SRC;
-                       }
                }
 #endif
                if (lexptr == NULL || lexptr >= lexend) {
diff --git a/awkgram.y b/awkgram.y
index 6e4d6c3..d24565c 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3106,12 +3106,8 @@ again:
                if (lexeof) {
                        if (sourcefile->next == srcfiles)
                                return END_FILE;
-                       else {
+                       else
                                next_sourcefile();
-                               if (get_src_buf())
-                                       goto again;
-                               return END_SRC;
-                       }
                }
 #endif
                if (lexptr == NULL || lexptr >= lexend) {
diff --git a/test/ChangeLog b/test/ChangeLog
index ecac051..b013094 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-01         Aharon Robbins       <address@hidden>
+
+       * Makefile.am (sourcesplit): New test.
+       * sourcesplit.ok: New file.
+       Thanks to Hermann Peifer for the report.
+
 2017-04-12         Manuel Collado        <address@hidden>
 
        * Makefile.am (fpat6): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 7b1b494..161082e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1007,6 +1007,7 @@ EXTRA_DIST = \
        sortglos.ok \
        sortu.awk \
        sortu.ok \
+       sourcesplit.ok \
        space.ok \
        split_after_fpat.awk \
        split_after_fpat.in \
@@ -1246,7 +1247,7 @@ GAWK_EXT_TESTS = \
        profile8 profile9 profile10 pty1 \
        rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline 
rsglstdin rsstart1 \
        rsstart2 rsstart3 rstest6 shadow shadowbuiltin \
-       sortfor sortfor2 sortu split_after_fpat \
+       sortfor sortfor2 sortu sourcesplit split_after_fpat \
        splitarg4 strftime strftfld \
        strtonum strtonum1 switch2 symtab1 symtab2 symtab3 symtab4 symtab5 
symtab6 \
        symtab7 symtab8 symtab9 symtab10 \
@@ -2388,6 +2389,11 @@ fwtest3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < "$(srcdir)"/fwtest2.in 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+sourcesplit:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index bdfbdc8..52924b8 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1265,6 +1265,7 @@ EXTRA_DIST = \
        sortglos.ok \
        sortu.awk \
        sortu.ok \
+       sourcesplit.ok \
        space.ok \
        split_after_fpat.awk \
        split_after_fpat.in \
@@ -1503,7 +1504,7 @@ GAWK_EXT_TESTS = \
        profile8 profile9 profile10 pty1 \
        rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline 
rsglstdin rsstart1 \
        rsstart2 rsstart3 rstest6 shadow shadowbuiltin \
-       sortfor sortfor2 sortu split_after_fpat \
+       sortfor sortfor2 sortu sourcesplit split_after_fpat \
        splitarg4 strftime strftfld \
        strtonum strtonum1 switch2 symtab1 symtab2 symtab3 symtab4 symtab5 
symtab6 \
        symtab7 symtab8 symtab9 symtab10 \
@@ -2825,6 +2826,11 @@ fwtest3:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < "$(srcdir)"/fwtest2.in 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+sourcesplit:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
diff --git a/test/sourcesplit.ok b/test/sourcesplit.ok
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/test/sourcesplit.ok
@@ -0,0 +1 @@
+5

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

Summary of changes:
 ChangeLog                                 | 6 ++++++
 awkgram.c                                 | 6 +-----
 awkgram.y                                 | 6 +-----
 test/ChangeLog                            | 6 ++++++
 test/Makefile.am                          | 8 +++++++-
 test/Makefile.in                          | 8 +++++++-
 test/{shadowbuiltin.ok => sourcesplit.ok} | 1 -
 7 files changed, 28 insertions(+), 13 deletions(-)
 copy test/{shadowbuiltin.ok => sourcesplit.ok} (50%)


hooks/post-receive
-- 
gawk