[gawk-diffs] [SCM] gawk branch, master, updated. 6a4f64d1b2972bdfb903e9248e709121f0139ca8

[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  6a4f64d1b2972bdfb903e9248e709121f0139ca8 (commit)
       via  f2435761c0550c8d1adf887b1f216c32e49af772 (commit)
       via  9c36f7bcdea295134a1800c68a9e90fd8ca821f2 (commit)
      from  fed9a3413cd653aae742452f9bfa83319802fb3c (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=6a4f64d1b2972bdfb903e9248e709121f0139ca8

commit 6a4f64d1b2972bdfb903e9248e709121f0139ca8
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Jun 5 21:47:58 2011 +0300

    Sync PC test suite.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index e411a5f..7f6b710 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  5 21:47:33 2011  Scott Deifik         <address@hidden>
+
+       * Makefile.tst: Sync with mainline version.
+
 Tue May 31 23:09:13 2011  Arnold D. Robbins  <address@hidden>
 
        * Makefile.tst: Sync with mainline version.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 825974e..09e3f0d 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -140,8 +140,8 @@ BASIC_TESTS = \
        ofmta ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup \
        paramres paramtyp parse1 parsefld parseme pcntplus posix2008sub \
        prdupval prec printf0 printf1 prmarscl prmreuse prt1eval prtoeval \
-       rand range1 rebt8b1 redfilnm regeq regrange reindops reparse resplit rs 
\
-       rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
+       rand range1 rebt8b1 redfilnm regeq regrange reindops reparse resplit \
+       rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
        rstest5 rswhite scalar sclforin sclifin sortempty splitargv \
        splitarr splitdef splitvar splitwht strcat1 strnum1 strtod subamp \
        subi18n subsepnm subslash substr swaplns synerr1 synerr2 tradanch \

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

commit f2435761c0550c8d1adf887b1f216c32e49af772
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Jun 5 21:46:13 2011 +0300

    Bug fix to FPAT and update test.

diff --git a/ChangeLog b/ChangeLog
index b9bd790..7c46fde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun  5 21:39:17 2011  Arnold D. Robbins  <address@hidden>
+
+       * field.c (fpat_parse_field): Bug fix.  Thanks to
+       "Radoulov, Dimitre" <address@hidden> for pointing
+       out the problem.
+
 Fri Jun  3 10:39:17 2011  Arnold D. Robbins  <address@hidden>
 
        * regcomp.c (build_range_exp): Make syntax the first argument,
diff --git a/field.c b/field.c
index 151fea6..0b9c100 100644
--- a/field.c
+++ b/field.c
@@ -892,7 +892,7 @@ get_field(long requested, Func_ptr *assign)
                        char *rec_end = fields_arr[0]->stptr + 
fields_arr[0]->stlen;
 
                        if (    parse_extent > rec_end
-                           || (parse_extent > rec_start && parse_extent < 
rec_end))
+                           || (parse_extent > rec_start && parse_extent < 
rec_end && requested == UNLIMITED-1))
                                NF = parse_high_water;
                        else if (parse_extent == rec_start) /* could be no 
match for FPAT */
                                NF = 0;
@@ -1601,7 +1601,6 @@ fpat_parse_field(long up_to,      /* parse only up to 
this field number */
        start = scan;
        while (research(rp, scan, 0, (end - scan), regex_flags) != -1
               && nf < up_to) {
-               regex_flags |= RE_NO_BOL;
 
                if (REEND(rp, scan) > RESTART(rp, scan)) { /* if (RLENGTH > 0) 
*/
                        non_empty = TRUE;
diff --git a/test/ChangeLog b/test/ChangeLog
index 764fd90..96962f3 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  5 21:45:27 2011  Arnold D. Robbins  <address@hidden>
+
+       * fpat1.ok, fpat1.in: Updated to test things better.
+
 Tue May 31 22:50:28 2011  Arnold D. Robbins  <address@hidden>
 
        * regrange.awk, regrange.ok: New files.
diff --git a/test/fpat1.awk b/test/fpat1.awk
index b091625..60c6bca 100644
--- a/test/fpat1.awk
+++ b/test/fpat1.awk
@@ -1,8 +1,19 @@
 BEGIN {
 #      if (t == 0)
-#              FPAT = "([^,]+)|(\"[^\"]+\")"
+               FPAT = "([^,]+)|(\"[^\"]+\")"
 #      else
-               FPAT = "([^,]*)|(\"[^\"]+\")"
+#              FPAT = "([^,]*)|(\"[^\"]+\")"
+}
+FNR == 1 {
+       # This part was added later
+       print $1
+       print $1, $3
+       for (i = 1; i <= NF; i++)
+               print i, $i
+
+       # Reset for original part of test
+       FPAT = "([^,]*)|(\"[^\"]+\")"
+       $0 = $0
 }
 {
        print "NF =", NF
diff --git a/test/fpat1.ok b/test/fpat1.ok
index e478aa5..c5888e3 100644
--- a/test/fpat1.ok
+++ b/test/fpat1.ok
@@ -1,3 +1,12 @@
+Robbins
+Robbins "1234 A Pretty Place, NE"
+1 Robbins
+2 Arnold
+3 "1234 A Pretty Place, NE"
+4 Sometown
+5 NY
+6 12345-6789
+7 USA
 NF = 7
 $1 = <Robbins>
 $2 = <Arnold>

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=9c36f7bcdea295134a1800c68a9e90fd8ca821f2

commit 9c36f7bcdea295134a1800c68a9e90fd8ca821f2
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Jun 5 21:39:00 2011 +0300

    Fix a typo in the ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 0bf4e49..b9bd790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1776,7 +1776,7 @@ Tue Apr 20 12:01:01 2010  Arnold D. Robbins  
<address@hidden>
        * dfa.h, dfa.c: Sync with GNU grep. The long-standing x{0} bug
        is now gone.  Matching UTF-8 with "." is now much faster.
        * re.c (avoid_dfa): Remove call to dfabroken() which is now gone.
-       * builtin.c (do_mktime): Simply check of values passed in to be
+       * builtin.c (do_mktime): Simplify check of values passed in to be
        more readable and to avoid a weird compiler warning from GCC.
 
 Fri Apr 16 15:02:26 2010  Arnold D. Robbins  <address@hidden>

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

Summary of changes:
 ChangeLog       |    8 +++++++-
 field.c         |    3 +--
 pc/ChangeLog    |    4 ++++
 pc/Makefile.tst |    4 ++--
 test/ChangeLog  |    4 ++++
 test/fpat1.awk  |   15 +++++++++++++--
 test/fpat1.ok   |    9 +++++++++
 7 files changed, 40 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
gawk