[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, master, updated. gawk-4.1.0-5333-g2b09956d
From: |
Arnold Robbins |
Subject: |
[SCM] gawk branch, master, updated. gawk-4.1.0-5333-g2b09956d |
Date: |
Fri, 1 Sep 2023 19:32:42 -0400 (EDT) |
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 2b09956d8f7e7bb7787e89bfd1de4104d2de7ac8 (commit)
via c85749daba596ba2b827bcea239db74fc5321665 (commit)
via ad7676fdff9574336ea7cc0763d4beb33ac1be55 (commit)
from 5e4e756ffb4754911fa70fea0768933f52324625 (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=2b09956d8f7e7bb7787e89bfd1de4104d2de7ac8
commit 2b09956d8f7e7bb7787e89bfd1de4104d2de7ac8
Merge: ad7676fd c85749da
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Fri Sep 1 16:31:17 2023 -0700
Merge branch 'gawk-5.2-stable'
diff --cc ChangeLog
index 2fb55e19,bbdc869b..b484d179
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,72 -1,16 +1,85 @@@
+ 2023-09-01 Miguel Pineiro Jr <mpj@pineiro.cc>
+
+ Fix the handling of zero-length matches in multibyte locales.
+ Thanks to Ed Morton <mortoneccc@comcast.net> for the report.
+
+ * builtin.c (do_match): Translate rstart (byte idx to char idx)
+ even when rlength is zero. For this we tweak the conversion of
+ rlength to keep it in bounds when rstart and rlength are both 0.
+ * node.c (str2wstr): Add an entry to the indices array for the
+ terminating null. It facilitates the tweak above and is needed
+ to translate the idx of a zero-width match at the end of the
+ string.
+
+2023-08-27 Arnold D. Robbins <arnold@skeeve.com>
+
+ * re.c (make_regexp): When do_traditional and looking to see
+ if an escape created a metacharacter, use `metas' instead of
+ a separate string, since BWK awk now also handles interval
+ expressions. Found by inspection.
+
+2023-08-25 Miguel Pineiro Jr <mpj@pineiro.cc>
+
+ * awk.h (enum escape_results): Fix ESCAPE_LINE_CONINUATION typo.
+ * node.c (make_str_node): Ditto.
+ * (parse_escape): Ditto.
+ * re.c (make_regexp): Ditto.
+
+ Unrelated: Use size_t for multibyte character lengths (aside
+ from it being the type which the interfaces return, using it
+ avoids implementation-defined behavior when -1 or -2 is cast
+ to size_t then stored in an int).
+
+ * node.c (make_str_node): Change mblen from int to size_t.
+
+ Unrelated: Change the length of a translated escape sequence
+ from int to size_t (to match the underlying interfaces).
+
+ * awk.h (parse_escape): Change prototype.
+ * node.c (make_str_node): Adjust to accomodate new type.
+ * (parse_escape): Ditto.
+ * re.c (make_regexp): Ditto.
+
+ Unrelated: Clarify make_regexp, inspired by make_str_node.
+
+ * re.c (make_regexp): Copy multibyte characters at once, move
+ the escape sequence post-processing into the switch statement
+ to explicitly connect a return value with its handling, add a
+ default case to catch unrecognized values, and move ok_to_escape
+ next to where it's used (and only set it once).
+
+2023-08-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * node.c (make_str_node): Don't use N_() in cant_happen message.
+ * re.c (make_regexp): Ditto.
+
+2023-08-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ Change parse_escape() to return an enum instead of relying
+ on manifest constants.
+
+ * awk.h (enum escape_results): New enum.
+ (parse_escape): Now returns a value from it, add nbytes pointer
+ parameter.
+ * node.c (make_str_node): Revised to use switch/case on
+ parse_escape return value.
+ (parse_escape): Update code.
+ * re.c (make_regexp): Revised to use switch/case on parse_escape
+ return value.
+
+2023-08-20 Miguel Pineiro Jr <mpj@pineiro.cc>
+
+ * awk.h (ELIDE_BACK_NL): Removed.
+ (parse_escape): Update declaration.
+ * main.c (cmdline_fs): Don't use ELIDE_BACK_NL.
+ (arg_assign): Ditto.
+ * node.c (make_str_node): Rework handling of return value
+ from parse_escape.
+ (parse_escape): Change return code to convey more info,
+ fully parse escapes and handle conversion from unicode to
+ UTF-8.
+ * re.c (make_regexp): Rework for new interface to parse_escape.
+
2023-07-09 Arnold D. Robbins <arnold@skeeve.com>
* re.c (make_regexp): In error message, use the original text
diff --cc pc/ChangeLog
index da989e60,2eea265d..4e9904d3
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 2023-09-01 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst: Regenerated.
+
+2023-08-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst: Regenerated.
+
2023-07-09 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.tst: Regenerated.
diff --cc pc/Makefile.tst
index 4f356acc,d1d7c856..79fa1a68
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@@ -315,9 -311,10 +315,10 @@@ NEED_LOCALE_C =
NEED_LOCALE_EN = \
backbigs1 backsmalls1 backsmalls2 commas concat4 dfamb1 ignrcas2
lc_num1 \
- mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 posix_compare \
+ mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 \
+ mtchi18n2 posix_compare \
printhuge reint2 rri1 subamp subi18n wideidx wideidx2 \
- widesub widesub2 widesub3 widesub4
+ widesub widesub2 widesub3 widesub4 unicode1
# Unused at the moment, since nlstringtest has additional stuff it does
diff --cc test/ChangeLog
index be048dba,7ed0832b..0d306996
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
+ 2023-09-01 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRA_DIST): New test, mtchi18n2.
+ * mtchi18n2.sh, mtchi18n2.ok: New files.
+ Thanks to Miguel Pineiro Jr <mpj@pineiro.cc> for the tests.
+
+2023-08-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRA_DIST): New test, cmdlinefsbacknl2.
+ * cmdlinefsbacknl2.sh, cmdlinefsbacknl2.ok: New files.
+ Thanks to Miguel Pineiro Jr <mpj@pineiro.cc> for the test.
+
2023-07-09 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXTRA_DIST): New test, regexpbad.
diff --cc test/Makefile.am
index d1e8eeb5,fe37d58f..4876ce55
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -1651,9 -1634,10 +1653,10 @@@ NEED_LOCALE_C =
NEED_LOCALE_EN = \
backbigs1 backsmalls1 backsmalls2 commas concat4 dfamb1 ignrcas2
lc_num1 \
- mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 posix_compare \
+ mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 \
+ mtchi18n2 posix_compare \
printhuge reint2 rri1 subamp subi18n wideidx wideidx2 \
- widesub widesub2 widesub3 widesub4
+ widesub widesub2 widesub3 widesub4 unicode1
# Unused at the moment, since nlstringtest has additional stuff it does
# NEED_LOCALE_FR =
diff --cc test/Makefile.in
index 7669b391,7fe4e7a1..ed83c6ef
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -1916,9 -1903,10 +1918,10 @@@ NEED_LOCALE_C =
NEED_LOCALE_EN = \
backbigs1 backsmalls1 backsmalls2 commas concat4 dfamb1 ignrcas2
lc_num1 \
- mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 posix_compare \
+ mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 \
+ mtchi18n2 posix_compare \
printhuge reint2 rri1 subamp subi18n wideidx wideidx2 \
- widesub widesub2 widesub3 widesub4
+ widesub widesub2 widesub3 widesub4 unicode1
# Unused at the moment, since nlstringtest has additional stuff it does
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 ++
builtin.c | 8 +-
doc/it/ChangeLog | 4 +
doc/it/texinfo.tex | 489 +++++++++++++++++++++++++++++++++--------------------
node.c | 7 +-
pc/ChangeLog | 4 +
pc/Makefile.tst | 11 +-
test/ChangeLog | 6 +
test/Makefile.am | 7 +-
test/Makefile.in | 13 +-
test/Maketests | 6 +
test/mtchi18n2.awk | 14 ++
test/mtchi18n2.ok | 4 +
13 files changed, 396 insertions(+), 190 deletions(-)
create mode 100755 test/mtchi18n2.awk
create mode 100755 test/mtchi18n2.ok
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, master, updated. gawk-4.1.0-5333-g2b09956d,
Arnold Robbins <=