[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. a32faf6354086864b55755c968f72a90e7e8f0d1

[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, gawk-4.0-stable has been updated
       via  a32faf6354086864b55755c968f72a90e7e8f0d1 (commit)
       via  9229cd0e900ab31d1049eda623f2756670109399 (commit)
      from  d586094c7c4a9a412a7633a32d2b92a8e1cfea1c (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=a32faf6354086864b55755c968f72a90e7e8f0d1

commit a32faf6354086864b55755c968f72a90e7e8f0d1
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Dec 26 22:44:33 2011 +0200

    Update version.

diff --git a/configure b/configure
index ad85e05..859c252 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU Awk 4.0.0f.
+# Generated by GNU Autoconf 2.68 for GNU Awk 4.0.0g.
 #
 # Report bugs to <address@hidden>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Awk'
 PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='4.0.0f'
-PACKAGE_STRING='GNU Awk 4.0.0f'
+PACKAGE_VERSION='4.0.0g'
+PACKAGE_STRING='GNU Awk 4.0.0g'
 PACKAGE_BUGREPORT='address@hidden'
 PACKAGE_URL='http://www.gnu.org/software/gawk/'
 
@@ -1290,7 +1290,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Awk 4.0.0f to adapt to many kinds of systems.
+\`configure' configures GNU Awk 4.0.0g to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1360,7 +1360,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Awk 4.0.0f:";;
+     short | recursive ) echo "Configuration of GNU Awk 4.0.0g:";;
    esac
   cat <<\_ACEOF
 
@@ -1472,7 +1472,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Awk configure 4.0.0f
+GNU Awk configure 4.0.0g
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2176,7 +2176,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Awk $as_me 4.0.0f, which was
+It was created by GNU Awk $as_me 4.0.0g, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3011,7 +3011,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gawk'
- VERSION='4.0.0f'
+ VERSION='4.0.0g'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11221,7 +11221,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Awk $as_me 4.0.0f, which was
+This file was extended by GNU Awk $as_me 4.0.0g, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11289,7 +11289,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU Awk config.status 4.0.0f
+GNU Awk config.status 4.0.0g
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d338e95..545ad10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU Awk], 4.0.0f, address@hidden, gawk)
+AC_INIT([GNU Awk], 4.0.0g, address@hidden, gawk)
 
 # This is a hack. Different versions of install on different systems
 # are just too different. Chuck it and use install-sh.
diff --git a/version.c b/version.c
index d1bb50d..4e391bb 100644
--- a/version.c
+++ b/version.c
@@ -1,3 +1,3 @@
 #include "config.h"
 
-const char *version_string = "GNU Awk 4.0.0f";
+const char *version_string = "GNU Awk 4.0.0g";

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

commit 9229cd0e900ab31d1049eda623f2756670109399
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Dec 26 22:42:54 2011 +0200

    Finish RRI changes per points from Paolo Bonzini.

diff --git a/ChangeLog b/ChangeLog
index 660b719..075809d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-26         Arnold D. Robbins     <address@hidden>
+
+       Finish Rational Range Interpretation (!)
+
+       * dfa.c (match_mb_charset): Compare wide characters directly
+       instead of using wcscoll().
+       * regexec.c (check_node_accept_byte): Ditto.
+
+       Thanks to Paolo Bonzini for pointing these out.
+
 2011-12-06         John Haque      <address@hidden>
 
        * debug.c (source_find): Fix misplaced call to efree.
diff --git a/dfa.c b/dfa.c
index 37ddc1b..acd1a94 100644
--- a/dfa.c
+++ b/dfa.c
@@ -2887,7 +2887,6 @@ match_mb_charset (struct dfa *d, int s, position pos, int 
idx)
                            with which this operator match.  */
   int op_len;          /* Length of the operator.  */
   char buffer[128];
-  wchar_t wcbuf[6];
 
   /* Pointer to the structure to which we are currently refering.  */
   struct mb_char_classes *work_mbc;
@@ -2964,17 +2963,11 @@ match_mb_charset (struct dfa *d, int s, position pos, 
int idx)
         }
     }
 
-  wcbuf[0] = wc;
-  wcbuf[1] = wcbuf[3] = wcbuf[5] = '\0';
-
   /* match with a range?  */
   for (i = 0; i<work_mbc->nranges; i++)
     {
-      wcbuf[2] = work_mbc->range_sts[i];
-      wcbuf[4] = work_mbc->range_ends[i];
-
-      if (wcscoll(wcbuf, wcbuf+2) >= 0 &&
-          wcscoll(wcbuf+4, wcbuf) >= 0)
+      if (work_mbc->range_sts[i] <= wc &&
+          wc <= work_mbc->range_ends[i])
         goto charset_matched;
     }
 
diff --git a/regexec.c b/regexec.c
index 97fcba0..dcd325c 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3963,18 +3963,10 @@ check_node_accept_bytes (const re_dfa_t *dfa, int 
node_idx,
 # endif /* _LIBC */
        {
          /* match with range expression?  */
-#if __GNUC__ >= 2
-         wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'};
-#else
-         wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
-         cmp_buf[2] = wc;
-#endif
          for (i = 0; i < cset->nranges; ++i)
            {
-             cmp_buf[0] = cset->range_starts[i];
-             cmp_buf[4] = cset->range_ends[i];
-             if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
-                 && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
+              if (cset->range_starts[i] <= wc
+                  && wc <= cset->range_ends[i])
                {
                  match_len = char_len;
                  goto check_node_accept_bytes_match;
diff --git a/test/ChangeLog b/test/ChangeLog
index 1ceb5b3..711d8b2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-26         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (rri1): New test.
+       * rri1.awk, rri1.in, rri1.ok: New files.
+
 2011-12-06         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am: Rationalize the $(CMP) lines wherever possible.
diff --git a/test/Makefile.am b/test/Makefile.am
index aae3051..f7d50b2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -625,6 +625,9 @@ EXTRA_DIST = \
        resplit.awk \
        resplit.in \
        resplit.ok \
+       rri1.awk \
+       rri1.in \
+       rri1.ok \
        rs.awk \
        rs.in \
        rs.ok \
@@ -803,6 +806,7 @@ BASIC_TESTS = \
        paramres paramtyp parse1 parsefld parseme pcntplus posix2008sub \
        prdupval prec printf0 printf1 prmarscl prmreuse prt1eval prtoeval \
        rand range1 rebt8b1 redfilnm regeq regrange reindops reparse resplit \
+       rri1 \
        rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
        rstest5 rswhite scalar sclforin sclifin sortempty splitargv \
        splitarr splitdef splitvar splitwht strcat1 strnum1 strtod subamp \
@@ -1433,6 +1437,12 @@ exit:
        @-AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
+rri1::
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       AWKPATH=$(srcdir) $(AWK) -f address@hidden  < $(srcdir)/address@hidden 
>_$@ 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 800c55d..05946f3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -809,6 +809,9 @@ EXTRA_DIST = \
        resplit.awk \
        resplit.in \
        resplit.ok \
+       rri1.awk \
+       rri1.in \
+       rri1.ok \
        rs.awk \
        rs.in \
        rs.ok \
@@ -987,6 +990,7 @@ BASIC_TESTS = \
        paramres paramtyp parse1 parsefld parseme pcntplus posix2008sub \
        prdupval prec printf0 printf1 prmarscl prmreuse prt1eval prtoeval \
        rand range1 rebt8b1 redfilnm regeq regrange reindops reparse resplit \
+       rri1 \
        rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
        rstest5 rswhite scalar sclforin sclifin sortempty splitargv \
        splitarr splitdef splitvar splitwht strcat1 strnum1 strtod subamp \
@@ -1782,6 +1786,12 @@ exit:
        @echo $@
        @-AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
+rri1::
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       AWKPATH=$(srcdir) $(AWK) -f address@hidden  < $(srcdir)/address@hidden 
>_$@ 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/rri1.awk b/test/rri1.awk
new file mode 100644
index 0000000..889dbdc
--- /dev/null
+++ b/test/rri1.awk
@@ -0,0 +1 @@
+/[d-f]/
diff --git a/test/rri1.in b/test/rri1.in
new file mode 100644
index 0000000..28b6b40
--- /dev/null
+++ b/test/rri1.in
@@ -0,0 +1 @@
+no match: è
diff --git a/test/rri1.ok b/test/rri1.ok
new file mode 100644
index 0000000..e69de29

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

Summary of changes:
 ChangeLog                      |   10 ++++++++++
 configure                      |   20 ++++++++++----------
 configure.ac                   |    2 +-
 dfa.c                          |   11 ++---------
 regexec.c                      |   12 ++----------
 test/ChangeLog                 |    5 +++++
 test/Makefile.am               |   10 ++++++++++
 test/Makefile.in               |   10 ++++++++++
 test/rri1.awk                  |    1 +
 test/rri1.in                   |    1 +
 test/{arrayprm2.ok => rri1.ok} |    0
 version.c                      |    2 +-
 12 files changed, 53 insertions(+), 31 deletions(-)
 create mode 100644 test/rri1.awk
 create mode 100644 test/rri1.in
 copy test/{arrayprm2.ok => rri1.ok} (100%)


hooks/post-receive
-- 
gawk