[SCM] gawk branch, feature/minrx, updated. gawk-4.1.0-5727-gbb6c7134

[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, feature/minrx has been updated
       via  bb6c7134bf1fd19aa362e6c38b2ca3d68c0d3276 (commit)
       via  93048676b2c44d4107dc92327b66579aea0911b0 (commit)
      from  2606a9bc4342d5e7a94711458669a37b4b7bdd34 (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=bb6c7134bf1fd19aa362e6c38b2ca3d68c0d3276

commit bb6c7134bf1fd19aa362e6c38b2ca3d68c0d3276
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Wed Aug 28 07:51:11 2024 +0300

    Allow building with clang.

diff --git a/ChangeLog b/ChangeLog
index 9391554f..126de0da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-08-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * Makefile.am (CCLD): Set to $(CXX) so that builds with clang
+       can work too. Thanks to Nelson H.F. Beebe.
+
 2024-08-16         Arnold D. Robbins     <arnold@skeeve.com>
 
        * printf.c (zero_fill_to_precision): Fix calculation of buflen.
diff --git a/Makefile.am b/Makefile.am
index 89a5fb23..0677e7ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = @CFLAGS@
 AM_LDFLAGS = @LDFLAGS@
 
-CCLD = g++     # temporary, until minrx is rewritten in C
+CCLD = $(CXX)  # temporary, until minrx is rewritten in C
 
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
diff --git a/Makefile.in b/Makefile.in
index 80784ed2..17cc7ffd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -482,7 +482,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = @CFLAGS@
 AM_LDFLAGS = @LDFLAGS@
-CCLD = g++     # temporary, until minrx is rewritten in C
+CCLD = $(CXX)  # temporary, until minrx is rewritten in C
 
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files

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

commit 93048676b2c44d4107dc92327b66579aea0911b0
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Wed Aug 28 07:50:57 2024 +0300

    Update minrx.cpp.

diff --git a/support/ChangeLog b/support/ChangeLog
index 0119ad88..a537e8c5 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2024-08-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * minrx.cpp: Update from Mike.
+
 2024-08-16         Arnold D. Robbins     <arnold@skeeve.com>
 
        * cdefs.h, verify.h: Sync from GNULIB.
diff --git a/support/minrx.cpp b/support/minrx.cpp
index 9f57950d..27403b84 100644
--- a/support/minrx.cpp
+++ b/support/minrx.cpp
@@ -18,7 +18,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <cctype>
 #include <climits>
 #include <clocale>
 #include <cstddef>
@@ -548,7 +547,7 @@ struct Compile {
                                wconv.nextchr();
                                continue;
                        case L'{':
-                               if ((flags & MINRX_REG_BRACE_COMPAT) == 0 || 
std::isdigit(wconv.lookahead(&WConv::nextchr))) {
+                               if ((flags & MINRX_REG_BRACE_COMPAT) == 0 || 
std::iswdigit(wconv.lookahead(&WConv::nextchr))) {
                                        if (optional || infinite) {
                                                lh = mkrep(lh, optional, 
infinite, nstk);
                                                optional = infinite = false;
@@ -621,7 +620,7 @@ struct Compile {
                        wconv.nextchr();
                        break;
                case L'{':
-                       if ((flags & MINRX_REG_BRACE_COMPAT) != 0 && 
!std::isdigit(wconv.lookahead(&WConv::nextchr)))
+                       if ((flags & MINRX_REG_BRACE_COMPAT) != 0 && 
!std::iswdigit(wconv.lookahead(&WConv::nextchr)))
                                goto normal;
                        // fall through
                case L'*':
@@ -1038,7 +1037,7 @@ struct Execute {
                auto nodes = &r.nodes[0];
                wconv.nextchr();
                if ((flags & MINRX_REG_RESUME) != 0 && rm && rm[0].rm_eo > 0)
-                       while (wconv.look() != WConv::End && wconv.off() < 
rm[0].rm_eo)
+                       while (wconv.look() != WConv::End && (std::ptrdiff_t) 
wconv.off() < rm[0].rm_eo)
                                lookback = wconv.look(), wconv.nextchr();
                NState nsinit(allocator);
                nsinit.boff = wconv.off();
@@ -1054,7 +1053,7 @@ struct Execute {
                                auto [n, ns] = mcsvs[0].remove();
                                auto t = nodes[n].type;
                                if (t <= WCharMax) {
-                                       if (wc != t)
+                                       if (wc != (WChar) t)
                                                continue;
                                } else {
                                        if (!r.csets[nodes[n].args[0]].test(wc))
@@ -1078,7 +1077,7 @@ struct Execute {
                                auto [n, ns] = mcsvs[1].remove();
                                auto t = nodes[n].type;
                                if (t <= WCharMax) {
-                                       if (wc != t)
+                                       if (wc != (WChar) t)
                                                continue;
                                } else {
                                        if (!r.csets[nodes[n].args[0]].test(wc))

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

Summary of changes:
 ChangeLog         |  5 +++++
 Makefile.am       |  2 +-
 Makefile.in       |  2 +-
 support/ChangeLog |  4 ++++
 support/minrx.cpp | 11 +++++------
 5 files changed, 16 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
gawk