gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-288


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2888-g8c26b04
Date: Wed, 17 Jan 2018 11:22:32 -0500 (EST)

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.2-stable has been updated
       via  8c26b0480d3f83416e6791a0453e3548e139a00f (commit)
       via  f125b932361d91ee4a92806a62704d3279da6417 (commit)
      from  9fbc02b23f7843c3be03d12eaba2f154642217df (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=8c26b0480d3f83416e6791a0453e3548e139a00f

commit 8c26b0480d3f83416e6791a0453e3548e139a00f
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jan 17 18:22:05 2018 +0200

    Fix isarray to take unset variable.

diff --git a/ChangeLog b/ChangeLog
index 2578bc7..5238af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17         Arnold D. Robbins     <address@hidden>
+
+       * builtin.c (do_isarray): Check that tmp is Node_var
+       before calling DEREF. Thanks to Denis Shirokov
+       <address@hidden> for the report.
+
 2018-01-15         Arnold D. Robbins     <address@hidden>
 
        * NEWS: Small typo fix.
diff --git a/builtin.c b/builtin.c
index 54d202d..6927205 100644
--- a/builtin.c
+++ b/builtin.c
@@ -507,7 +507,9 @@ do_isarray(int nargs)
        tmp = POP();
        if (tmp->type != Node_var_array) {
                ret = 0;
-               DEREF(tmp);
+               // could be Node_var_new
+               if (tmp->type == Node_val)
+                       DEREF(tmp);
        }
        return make_number((AWKNUM) ret);
 }
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 15a3e38..a007290 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-17         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.tst: Sync against test/Makefile.in.
+
 2018-01-10         Arnold D. Robbins     <address@hidden>
 
        * Makefile.tst: Initial sync against test/Makefile.in.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index b7622df..982d1ce 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -202,7 +202,7 @@ GAWK_EXT_TESTS = \
        genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind 
\
        icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
        incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-       indirectbuiltin indirectcall indirectcall2 intarray \
+       indirectbuiltin indirectcall indirectcall2 intarray isarrayunset \
        lint lintexp lintindex lintint lintlength lintold lintset lintwarn \
        mixed1 mktime manyfiles match1 match2 match3 mbstr1 mbstr2 muldimposix \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
@@ -2755,6 +2755,11 @@ indirectcall2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+isarrayunset:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 lint:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/ChangeLog b/test/ChangeLog
index b20fff4..abff2dd 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -3,6 +3,8 @@
        * Makefile.am (charset-tests-all): Add punctuation in the message.
        (charset-msg-start): Add fr_FR.UTF-8 to list of desired locales,
        reformat the message.
+       (isarrayunset): New test.
+       * isarrayunset.awk, isarrayunset.ok: New files.
 
 2018-01-15         Arnold D. Robbins     <address@hidden>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 26996ad..34d9078 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -557,6 +557,8 @@ EXTRA_DIST = \
        intprec.ok \
        iobug1.awk \
        iobug1.ok \
+       isarrayunset.awk \
+       isarrayunset.ok \
        jarebug.awk \
        jarebug.in \
        jarebug.ok \
@@ -1271,7 +1273,7 @@ GAWK_EXT_TESTS = \
        genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind 
\
        icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
        incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-       indirectbuiltin indirectcall indirectcall2 intarray \
+       indirectbuiltin indirectcall indirectcall2 intarray isarrayunset \
        lint lintexp lintindex lintint lintlength lintold lintset lintwarn \
        mixed1 mktime manyfiles match1 match2 match3 mbstr1 mbstr2 muldimposix \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
diff --git a/test/Makefile.in b/test/Makefile.in
index e3e98da..f8b6e05 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -815,6 +815,8 @@ EXTRA_DIST = \
        intprec.ok \
        iobug1.awk \
        iobug1.ok \
+       isarrayunset.awk \
+       isarrayunset.ok \
        jarebug.awk \
        jarebug.in \
        jarebug.ok \
@@ -1528,7 +1530,7 @@ GAWK_EXT_TESTS = \
        genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind 
\
        icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
        incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-       indirectbuiltin indirectcall indirectcall2 intarray \
+       indirectbuiltin indirectcall indirectcall2 intarray isarrayunset \
        lint lintexp lintindex lintint lintlength lintold lintset lintwarn \
        mixed1 mktime manyfiles match1 match2 match3 mbstr1 mbstr2 muldimposix \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
@@ -4232,6 +4234,11 @@ indirectcall2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+isarrayunset:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 lint:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 6a68510..314aaae 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1327,6 +1327,11 @@ indirectcall2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+isarrayunset:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 lint:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/isarrayunset.awk b/test/isarrayunset.awk
new file mode 100644
index 0000000..8b54cdc
--- /dev/null
+++ b/test/isarrayunset.awk
@@ -0,0 +1 @@
+BEGIN { print isarray(a) }
diff --git a/test/isarrayunset.ok b/test/isarrayunset.ok
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/isarrayunset.ok
@@ -0,0 +1 @@
+0

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

commit f125b932361d91ee4a92806a62704d3279da6417
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jan 17 18:06:42 2018 +0200

    Improve messages in Makefile.am about French locale now needed.

diff --git a/test/ChangeLog b/test/ChangeLog
index eca4313..b20fff4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (charset-tests-all): Add punctuation in the message.
+       (charset-msg-start): Add fr_FR.UTF-8 to list of desired locales,
+       reformat the message.
+
 2018-01-15         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (nlstringtest): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 81b3606..26996ad 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1385,7 +1385,7 @@ charset-tests-all:
                $(MAKE) charset-msg-start charset-tests charset-msg-end; \
        else \
                echo %%%%%%%%%% Inadequate locale support: skipping charset 
tests. ; \
-               echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
+               echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
        fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1458,9 +1458,10 @@ charset-msg-start:
        @echo "======== Starting tests that can vary based on character set or 
locale support ========"
        @echo 
"**************************************************************************"
        @echo "* Some or all of these tests may fail if you have inadequate or 
missing  *"
-       @echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and 
ja_JP.UTF-8 are  *"
-       @echo "* needed. The el_GR.iso88597 is optional but helpful. However, 
if you    *"
-       @echo "* see this message, the Makefile thinks you have what you need 
...       *"
+       @echo "* locale support. At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and     *"
+       @echo "* ja_JP.UTF-8 are needed. The el_GR.iso88597 is optional but 
helpful.    *"
+       @echo "* However, if you see this message, the Makefile thinks you have 
what    *"
+       @echo "* you need ...                                                   
        *"
        @echo 
"**************************************************************************"
 
 charset-msg-end:
diff --git a/test/Makefile.in b/test/Makefile.in
index e5676b5..e3e98da 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -974,6 +974,7 @@ EXTRA_DIST = \
        nlstrina.ok \
        nlstringtest.awk \
        nlstringtest.ok \
+       nlstringtest.po \
        fr \
        noeffect.awk \
        noeffect.ok \
@@ -1825,7 +1826,7 @@ charset-tests-all:
                $(MAKE) charset-msg-start charset-tests charset-msg-end; \
        else \
                echo %%%%%%%%%% Inadequate locale support: skipping charset 
tests. ; \
-               echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
+               echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and ja_JP.UTF-8 are needed. ; \
        fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1898,9 +1899,10 @@ charset-msg-start:
        @echo "======== Starting tests that can vary based on character set or 
locale support ========"
        @echo 
"**************************************************************************"
        @echo "* Some or all of these tests may fail if you have inadequate or 
missing  *"
-       @echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and 
ja_JP.UTF-8 are  *"
-       @echo "* needed. The el_GR.iso88597 is optional but helpful. However, 
if you    *"
-       @echo "* see this message, the Makefile thinks you have what you need 
...       *"
+       @echo "* locale support. At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 
and     *"
+       @echo "* ja_JP.UTF-8 are needed. The el_GR.iso88597 is optional but 
helpful.    *"
+       @echo "* However, if you see this message, the Makefile thinks you have 
what    *"
+       @echo "* you need ...                                                   
        *"
        @echo 
"**************************************************************************"
 
 charset-msg-end:

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

Summary of changes:
 ChangeLog                              |  6 ++++++
 builtin.c                              |  4 +++-
 pc/ChangeLog                           |  4 ++++
 pc/Makefile.tst                        |  7 ++++++-
 test/ChangeLog                         |  8 ++++++++
 test/Makefile.am                       | 13 ++++++++-----
 test/Makefile.in                       | 19 ++++++++++++++-----
 test/Maketests                         |  5 +++++
 test/isarrayunset.awk                  |  1 +
 test/{dfastress.ok => isarrayunset.ok} |  0
 10 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 test/isarrayunset.awk
 copy test/{dfastress.ok => isarrayunset.ok} (100%)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]