gawk-diffs
[Top][All Lists]
Advanced

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

[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4200-g073460d


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4200-g073460d
Date: Sat, 9 Jan 2021 15:32:28 -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-5.1-stable has been updated
       via  073460dda1b24bcb872186a0818859a6ccba727d (commit)
       via  3aa6709272d6c74300b70d8371b135289a8d8c9d (commit)
      from  5b3ac78d72621697e717765d2d634d7fc271f3c9 (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=073460dda1b24bcb872186a0818859a6ccba727d

commit 073460dda1b24bcb872186a0818859a6ccba727d
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Jan 9 22:32:07 2021 +0200

    Update a bunch of copyright years.

diff --git a/ChangeLog b/ChangeLog
index 6801c20..ad39603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
        8 or 9 and have to restart as decimal.
        * mpfr.c (mpg_strtoui): For 8 or 9, set base to 10.
 
+       Unrelated:
+       * array.c, awk.h, awkgram., builtin.c, cmd.h, command.y, debug.c,
+       eval.c, gawk.api.c, gawkapi.h, interpret.h, io.c, main.c, mfpr.c,
+       node.c, profile.c, re.c: Update copyright year.
+
 2021-01-08         Arnold D. Robbins     <arnold@skeeve.com>
 
        General tightening up use of const and types. Thanks to
diff --git a/array.c b/array.c
index 29c0975..50efddb 100644
--- a/array.c
+++ b/array.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2014, 2016, 2018, 2019, 2020,
+ * Copyright (C) 1986, 1988, 1989, 1991-2014, 2016, 2018-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/awk.h b/awk.h
index 71facfa..2ab25bf 100644
--- a/awk.h
+++ b/awk.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2020 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/awkgram.y b/awkgram.y
index 0495f23..6dfbe7e 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2020 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/cmd.h b/cmd.h
index df6035f..7f68e21 100644
--- a/cmd.h
+++ b/cmd.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2004, 2010, 2011, 2013, 2014, 2017,
+ * Copyright (C) 2004, 2010, 2011, 2013, 2014, 2017, 2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/command.y b/command.y
index 8282cf6..9492e4f 100644
--- a/command.y
+++ b/command.y
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2004, 2010, 2011, 2014, 2016, 2017, 2019, 2020,
+ * Copyright (C) 2004, 2010, 2011, 2014, 2016, 2017, 2019-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/debug.c b/debug.c
index 4fe83fd..160996b 100644
--- a/debug.c
+++ b/debug.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2004, 2010-2013, 2016-2020 the Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2010-2013, 2016-2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/eval.c b/eval.c
index ea83b28..9e64452 100644
--- a/eval.c
+++ b/eval.c
@@ -3,7 +3,8 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2019 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2019, 2021,
+ * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/gawkapi.c b/gawkapi.c
index b764c56..a60549d 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012-2019 the Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019, 2021, the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/gawkapi.h b/gawkapi.h
index 4cbfc67..54130b1 100644
--- a/gawkapi.h
+++ b/gawkapi.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012-2019 the Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019, 2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/interpret.h b/interpret.h
index 56427ba..739f81e 100644
--- a/interpret.h
+++ b/interpret.h
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2020,
+ * Copyright (C) 1986, 1988, 1989, 1991-2021,
  * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
diff --git a/io.c b/io.c
index c2bf5d0..c100742 100644
--- a/io.c
+++ b/io.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2020,
+ * Copyright (C) 1986, 1988, 1989, 1991-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/main.c b/main.c
index 3fd091e..ea3b3a5 100644
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2020,
+ * Copyright (C) 1986, 1988, 1989, 1991-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/node.c b/node.c
index 0e7be20..12d7a04 100644
--- a/node.c
+++ b/node.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2001, 2003-2015, 2017, 2018, 2019,
+ * Copyright (C) 1986, 1988, 1989, 1991-2001, 2003-2015, 2017-2019, 2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/profile.c b/profile.c
index e4fd88d..b61d29c 100644
--- a/profile.c
+++ b/profile.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1999-2020 the Free Software Foundation, Inc.
+ * Copyright (C) 1999-2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/re.c b/re.c
index ee3a30a..929c317 100644
--- a/re.c
+++ b/re.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1991-2019 the Free Software Foundation, Inc.
+ * Copyright (C) 1991-2019, 2021 the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.

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

commit 3aa6709272d6c74300b70d8371b135289a8d8c9d
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Jan 9 22:24:07 2021 +0200

    Fix conversion of 018 to decimal. Add a test.

diff --git a/ChangeLog b/ChangeLog
index 60fe777..6801c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-01-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+       Fix problems turning something like 018 into decimal.
+       Thanks to Arkadiusz Drabczyk <arkadiusz@drabczyk.org> and to
+       Jean-Philippe Guérard <jean-philippe.guerard@xn--tigreray-i1a.org>
+       for the reports.
+
+       * builtin.c (nondec2awknum): Use a copy of len, in case we detect
+       8 or 9 and have to restart as decimal.
+       * mpfr.c (mpg_strtoui): For 8 or 9, set base to 10.
+
 2021-01-08         Arnold D. Robbins     <arnold@skeeve.com>
 
        General tightening up use of const and types. Thanks to
diff --git a/builtin.c b/builtin.c
index fc5dc31..e28c35e 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 1986, 1988, 1989, 1991-2020,
+ * Copyright (C) 1986, 1988, 1989, 1991-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
@@ -3684,7 +3684,9 @@ nondec2awknum(char *str, size_t len, char **endptr)
                if (endptr)
                        *endptr = str;
        } else if (len >= 1 && *str == '0') {
-               for (; len > 0; len--) {
+               int l;
+               // preserve len in case we go to decimal
+               for (l = len; l > 0; l--) {
                        if (! isdigit((unsigned char) *str)) {
                                if (endptr)
                                        *endptr = str;
diff --git a/mpfr.c b/mpfr.c
index cf53bbd..cabc391 100644
--- a/mpfr.c
+++ b/mpfr.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2015, 2017, 2018, 2019,
+ * Copyright (C) 2012, 2013, 2015, 2017, 2018, 2019, 2021
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
@@ -176,7 +176,7 @@ mpg_strtoui(mpz_ptr zi, char *str, size_t len, char **end, 
int base)
                case '8':
                case '9':
                        if (base == 8)
-                               goto done;
+                               base = 10;
                        break;
                case 'a':
                case 'b':
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 22870c9..bdf1149 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * Makefile.tst: Rebuilt.
+
 2021-01-08         Arnold D. Robbins     <arnold@skeeve.com>
 
        * gawkmisc.pc (quote): Make const char *.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 5dbfb65..24e9286 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -211,6 +211,7 @@ GAWK_EXT_TESTS = \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
        nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
        nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 
nsprof2 \
+       octdec \
        patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
        procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 
\
        profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
@@ -3064,6 +3065,11 @@ nsprof2:
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+octdec:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
+       @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 patsplit:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
diff --git a/test/ChangeLog b/test/ChangeLog
index 456af38..9cd3edb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * Makefile.am (EXTRA_DIST): octdec, new test.
+       * octdec.awk, octdec.ok: New files.
+
 2021-01-07         Arnold D. Robbins     <arnold@skeeve.com>
 
        * Makefile.am (EXTRA_DIST): modifiers, new test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 09efe0e..ce28345 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -865,6 +865,8 @@ EXTRA_DIST = \
        numsubstr.awk \
        numsubstr.in \
        numsubstr.ok \
+       octdec.awk \
+       octdec.ok \
        octsub.awk \
        octsub.ok \
        ofmt.awk \
@@ -1446,6 +1448,7 @@ GAWK_EXT_TESTS = \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
        nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
        nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 
nsprof2 \
+       octdec \
        patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
        procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 
\
        profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
diff --git a/test/Makefile.in b/test/Makefile.in
index 54d4a11..337a48f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1128,6 +1128,8 @@ EXTRA_DIST = \
        numsubstr.awk \
        numsubstr.in \
        numsubstr.ok \
+       octdec.awk \
+       octdec.ok \
        octsub.awk \
        octsub.ok \
        ofmt.awk \
@@ -1709,6 +1711,7 @@ GAWK_EXT_TESTS = \
        nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
        nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
        nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 
nsprof2 \
+       octdec \
        patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
        procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 
\
        profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
@@ -4723,6 +4726,11 @@ nsprof2:
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+octdec:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
+       @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 patsplit:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
diff --git a/test/Maketests b/test/Maketests
index 87b141b..20ed4a7 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1799,6 +1799,11 @@ nsprof2:
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+octdec:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
+       @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 patsplit:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
diff --git a/test/octdec.awk b/test/octdec.awk
new file mode 100644
index 0000000..cc14dda
--- /dev/null
+++ b/test/octdec.awk
@@ -0,0 +1 @@
+BEGIN { print 021, 018; print 00021, 00018 }
diff --git a/test/octdec.ok b/test/octdec.ok
new file mode 100644
index 0000000..226c02c
--- /dev/null
+++ b/test/octdec.ok
@@ -0,0 +1,2 @@
+17 18
+17 18

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

Summary of changes:
 ChangeLog        | 16 ++++++++++++++++
 array.c          |  2 +-
 awk.h            |  2 +-
 awkgram.y        |  2 +-
 builtin.c        |  6 ++++--
 cmd.h            |  2 +-
 command.y        |  2 +-
 debug.c          |  2 +-
 eval.c           |  3 ++-
 gawkapi.c        |  2 +-
 gawkapi.h        |  2 +-
 interpret.h      |  2 +-
 io.c             |  2 +-
 main.c           |  2 +-
 mpfr.c           |  4 ++--
 node.c           |  2 +-
 pc/ChangeLog     |  4 ++++
 pc/Makefile.tst  |  6 ++++++
 profile.c        |  2 +-
 re.c             |  2 +-
 test/ChangeLog   |  5 +++++
 test/Makefile.am |  3 +++
 test/Makefile.in |  8 ++++++++
 test/Maketests   |  5 +++++
 test/octdec.awk  |  1 +
 test/octdec.ok   |  2 ++
 26 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 test/octdec.awk
 create mode 100644 test/octdec.ok


hooks/post-receive
-- 
gawk



reply via email to

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