[gawk-diffs] [SCM] gawk branch, master, updated. 0130721d02a7410c3291c4704be69ccc4078ff3e

[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, master has been updated
       via  0130721d02a7410c3291c4704be69ccc4078ff3e (commit)
       via  732ff4b46b76601ef63162fa06cff6d0a2028a62 (commit)
      from  c5da922b0486462028584e4568d6e00d1a4f2783 (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=0130721d02a7410c3291c4704be69ccc4078ff3e

commit 0130721d02a7410c3291c4704be69ccc4078ff3e
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Dec 12 10:17:07 2011 +0200

    Sync pc/makefile.tst with main test makefile.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 429a88e..5f287dd 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-12   Scott Deifik  <address@hidden>
+
+       * Makefile.tst: Sync with mainline version.
+
 2011-12-06   Scott Deifik  <address@hidden>
 
        * Makefile.tst: Sync with mainline version.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index db21434..f14341c 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -306,7 +306,7 @@ argarray::
        .)      : ;; \
        *)      rm -f ./argarray.in ;; \
        esac
-       @-$(CMP) $(srcdir)/argarray.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 regtest::
        @echo 'Some of the output from regtest is very system specific, do not'
@@ -321,44 +321,45 @@ manyfiles::
        @$(AWK) 'BEGIN { for (i = 1; i <= 1030; i++) print i, i}' >_$@
        @$(AWK) -f $(srcdir)/manyfiles.awk _$@ _$@
        @wc -l junk/* | $(AWK) '$$1 != 2' | wc -l | sed "s/  *//g" > _$@
-       @rm -rf junk ; $(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+       @rm -rf junk
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 compare::
        @echo $@
        @$(AWK) -f $(srcdir)/compare.awk 0 1 $(srcdir)/compare.in >_$@
-       @-$(CMP) $(srcdir)/compare.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 inftest::
        @echo $@
        @echo This test is very machine specific...
        @echo Expect inftest to fail with DJGPP.
        @$(AWK) -f $(srcdir)/inftest.awk | sed "s/inf/Inf/g" >_$@
-       @-$(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 getline2::
        @echo $@
        @$(AWK) -f $(srcdir)/getline2.awk $(srcdir)/getline2.awk 
$(srcdir)/getline2.awk >_$@
-       @-$(CMP) $(srcdir)/getline2.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 awkpath::
        @echo $@
        @AWKPATH="$(srcdir)$(PATH_SEPARATOR)$(srcdir)/lib" $(AWK) -f 
awkpath.awk >_$@
-       @-$(CMP) $(srcdir)/awkpath.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 argtest::
        @echo $@
        @$(AWK) -f $(srcdir)/argtest.awk -x -y abc >_$@
-       @-$(CMP) $(srcdir)/argtest.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 badargs::
        @echo $@
        @-$(AWK) -f 2>&1 | grep -v patchlevel >_$@
-       @-$(CMP) $(srcdir)/badargs.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 nonl::
        @echo $@
        @-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk /dev/null >_$@ 2>&1
-       @-$(CMP) $(srcdir)/nonl.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 strftime::
        @echo This test could fail on slow machines or on a minute boundary,
@@ -375,7 +376,7 @@ strftime::
 litoct::
        @echo $@
        @echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@
-       @-$(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 devfd::
        @echo $@
@@ -386,13 +387,13 @@ devfd::
 fflush::
        @echo $@
        @$(srcdir)/fflush.sh >_$@
-       @-$(CMP) $(srcdir)/fflush.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 tweakfld::
        @echo $@
        @$(AWK) -f $(srcdir)/tweakfld.awk $(srcdir)/tweakfld.in >_$@
        @rm -f errors.cleanup
-       @-$(CMP) $(srcdir)/tweakfld.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 mmap8k::
        @echo $@
@@ -402,7 +403,7 @@ mmap8k::
 tradanch::
        @echo $@
        @$(AWK) --traditional -f $(srcdir)/tradanch.awk $(srcdir)/tradanch.in 
>_$@
-       @-$(CMP) $(srcdir)/tradanch.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 # AIX /bin/sh exec's the last command in a list, therefore issue a ":"
 # command so that pid.sh is fork'ed as a child before being exec'ed.
@@ -418,12 +419,12 @@ strftlng::
        @if $(CMP) $(srcdir)/strftlng.ok _$@ >/dev/null 2>&1 ; then : ; else \
        TZ=UTC0; export TZ; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ; \
        fi
-       @-$(CMP) $(srcdir)/strftlng.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 nors::
        @echo $@
        @echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - 
$(srcdir)/nors.in > _$@
-       @-$(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 fmtspcl.ok: fmtspcl.tok
        @$(AWK) -v "sd=$(srcdir)" 'BEGIN {pnan = sprintf("%g",sqrt(-1)); nnan = 
sprintf("%g",-sqrt(-1)); pinf = sprintf("%g",-log(0)); ninf = 
sprintf("%g",log(0))} {sub(/positive_nan/,pnan); sub(/negative_nan/,nnan); 
sub(/positive_infinity/,pinf); sub(/negative_infinity/,ninf); 
sub(/fmtspcl/,(sd"/fmtspcl")); print}' < $(srcdir)/fmtspcl.tok > $@ 2>/dev/null
@@ -437,18 +438,18 @@ fmtspcl: fmtspcl.ok
 reint::
        @echo $@
        @$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@
-       @-$(CMP) $(srcdir)/reint.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 pipeio1::
        @echo $@
        @$(AWK) -f $(srcdir)/pipeio1.awk >_$@
        @rm -f test1 test2
-       @-$(CMP) $(srcdir)/pipeio1.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 pipeio2::
        @echo $@
        @$(AWK) -v SRCDIR=$(srcdir) -f $(srcdir)/pipeio2.awk >_$@
-       @-$(CMP) $(srcdir)/pipeio2.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 clobber::
        @echo $@
@@ -459,7 +460,7 @@ clobber::
 arynocls::
        @echo $@
        @-AWKPATH=$(srcdir) $(AWK) -v INPUT=$(srcdir)/arynocls.in -f 
arynocls.awk >_$@
-       @-$(CMP) $(srcdir)/arynocls.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 getlnbuf::
        @echo $@
@@ -503,12 +504,12 @@ inetdayt::
 redfilnm::
        @echo $@
        @$(AWK) -f $(srcdir)/redfilnm.awk srcdir=$(srcdir) 
$(srcdir)/redfilnm.in >_$@
-       @-$(CMP) $(srcdir)/redfilnm.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 leaddig::
        @echo $@
        @$(AWK) -v x=2E  -f $(srcdir)/leaddig.awk >_$@
-       @-$(CMP) $(srcdir)/leaddig.ok _$@ && rm -f _$@
+       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 gsubtst3::
        @echo $@

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

commit 732ff4b46b76601ef63162fa06cff6d0a2028a62
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Dec 12 10:16:42 2011 +0200

    Further the cause of RRI in dfa.c.

diff --git a/ChangeLog b/ChangeLog
index f3cc766..653b0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-12         Arnold D. Robbins     <address@hidden>
+
+       * match_mb_charset: Per Paolo Bonzini, modify range checking to
+       use simple comparison. Rational Range Interpretation rules!
+
 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..eeded08 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;
     }
 

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

Summary of changes:
 ChangeLog       |    5 +++++
 dfa.c           |   11 ++---------
 pc/ChangeLog    |    4 ++++
 pc/Makefile.tst |   43 ++++++++++++++++++++++---------------------
 4 files changed, 33 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
gawk