[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, master, updated. 9cbb6d9e06dde65da909f15
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, master, updated. 9cbb6d9e06dde65da909f1548bedeab10a5dae44 |
|
Date: |
Thu, 26 May 2011 19:15:55 +0000 |
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 9cbb6d9e06dde65da909f1548bedeab10a5dae44 (commit)
via 008c07e4063122e1bc86ee38a4b43c6086d6da9b (commit)
from b81ed4f2e84faa7ca3032a1dfbca3b80a0787bd0 (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=9cbb6d9e06dde65da909f1548bedeab10a5dae44
commit 9cbb6d9e06dde65da909f1548bedeab10a5dae44
Author: Arnold D. Robbins <address@hidden>
Date: Thu May 26 22:15:27 2011 +0300
Include updated gawk.info.
diff --git a/doc/gawk.info b/doc/gawk.info
index b80cd67..a722ccb 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -20145,7 +20145,11 @@ Info file, in approximate chronological order:
* Fred Fish provided the port to Amiga systems and its documentation.
(With Fred's sad passing, this is no longer supported.)
- * Scott Deifik currently maintains the MS-DOS port.
+ * Scott Deifik currently maintains the MS-DOS / Windows port using
+ DJGPP.
+
+ * Eli Zaretskii currently maintains the MS-DOS / Windows port using
+ MinGW.
* Juan Grigera provided a port to Windows32 systems. (This is no
longer supported.)
@@ -21129,8 +21133,8 @@ considered authoritative if it conflicts with this Info
file.
The people maintaining the non-Unix ports of `gawk' are as follows:
-MS-Windows with MINGW and DJGPP Eli Zaretskii, <address@hidden>.
- Scott Deifik, <address@hidden>.
+MS-Windows with DJGPP Scott Deifik, <address@hidden>.
+MS-Windows with MINGW Eli Zaretskii, <address@hidden>.
OS/2 Andreas Buening, <address@hidden>.
VMS Pat Rankin, <address@hidden>.
z/OS (OS/390) Dave Pitts, <address@hidden>.
@@ -25056,7 +25060,7 @@ Index
* BEGINFILE pattern, Boolean patterns and: Expression Patterns.
(line 73)
* beginfile() user-defined function: Filetrans Function. (line 62)
-* Benzinger, Michael: Contributors. (line 95)
+* Benzinger, Michael: Contributors. (line 99)
* Berry, Karl: Acknowledgments. (line 33)
* binary input/output: User-modified. (line 10)
* bindtextdomain() function (C library): Explaining gettext. (line 49)
@@ -25101,12 +25105,12 @@ Index
* Brennan, Michael: Delete. (line 52)
* Brian Kernighan's awk, extensions <1>: Other Versions. (line 13)
* Brian Kernighan's awk, extensions: BTL. (line 6)
-* Broder, Alan J.: Contributors. (line 86)
-* Brown, Martin: Contributors. (line 80)
+* Broder, Alan J.: Contributors. (line 90)
+* Brown, Martin: Contributors. (line 84)
* BSD-based operating systems: Glossary. (line 611)
* bt debugger command (alias for backtrace): Dgawk Stack. (line 13)
* Buening, Andreas <1>: Bugs. (line 71)
-* Buening, Andreas <2>: Contributors. (line 90)
+* Buening, Andreas <2>: Contributors. (line 94)
* Buening, Andreas: Acknowledgments. (line 60)
* buffering, input/output <1>: Two-way I/O. (line 70)
* buffering, input/output: I/O Functions. (line 130)
@@ -25333,7 +25337,7 @@ Index
* dates, converting to timestamps: Time Functions. (line 74)
* dates, information related to, localization: Explaining gettext.
(line 115)
-* Davies, Stephen <1>: Contributors. (line 72)
+* Davies, Stephen <1>: Contributors. (line 76)
* Davies, Stephen: Acknowledgments. (line 60)
* dcgettext() function (gawk) <1>: Programmer i18n. (line 19)
* dcgettext() function (gawk): I18N Functions. (line 22)
@@ -26041,7 +26045,7 @@ Index
* GPL (General Public License): Manual History. (line 11)
* GPL (General Public License), printing: Options. (line 85)
* grcat program: Group Functions. (line 16)
-* Grigera, Juan: Contributors. (line 56)
+* Grigera, Juan: Contributors. (line 60)
* group database, reading: Group Functions. (line 6)
* group file: Group Functions. (line 6)
* groups, information about: Group Functions. (line 6)
@@ -26052,13 +26056,13 @@ Index
* gsub() function, escape processing: Gory Details. (line 6)
* h debugger command (alias for help): Miscellaneous Dgawk Commands.
(line 68)
-* Hankerson, Darrel <1>: Contributors. (line 59)
+* Hankerson, Darrel <1>: Contributors. (line 63)
* Hankerson, Darrel: Acknowledgments. (line 60)
-* Haque, John <1>: Contributors. (line 101)
+* Haque, John <1>: Contributors. (line 105)
* Haque, John: Acknowledgments. (line 60)
* Hartholz, Elaine: Acknowledgments. (line 38)
* Hartholz, Marshall: Acknowledgments. (line 38)
-* Hasegawa, Isamu: Contributors. (line 92)
+* Hasegawa, Isamu: Contributors. (line 96)
* help debugger command: Miscellaneous Dgawk Commands.
(line 68)
* hexadecimal numbers: Nondecimal-numbers. (line 6)
@@ -26204,7 +26208,7 @@ Index
* jawk: Other Versions. (line 96)
* Jedi knights: Undocumented. (line 6)
* join() user-defined function: Join Function. (line 18)
-* Kahrs, Ju"rgen <1>: Contributors. (line 68)
+* Kahrs, Ju"rgen <1>: Contributors. (line 72)
* Kahrs, Ju"rgen: Acknowledgments. (line 60)
* Kasal, Stepan: Acknowledgments. (line 60)
* Kenobi, Obi-Wan: Undocumented. (line 6)
@@ -26334,7 +26338,7 @@ Index
* matching, leftmost longest: Multiple Line. (line 26)
* matching, null strings: Gory Details. (line 96)
* mawk program: Other Versions. (line 35)
-* McPhee, Patrick: Contributors. (line 98)
+* McPhee, Patrick: Contributors. (line 102)
* memory, releasing: Internals. (line 101)
* message object files: Explaining gettext. (line 41)
* message object files, converting from portable object files: I18N Example.
@@ -26547,7 +26551,7 @@ Index
* percent sign (%), %= operator: Assignment Ops. (line 129)
* period (.): Regexp Operators. (line 43)
* Perl: Future Extensions. (line 6)
-* Peters, Arno: Contributors. (line 83)
+* Peters, Arno: Contributors. (line 87)
* Peterson, Hal: Contributors. (line 40)
* pgawk program: Profiling. (line 6)
* pgawk program, awkprof.out file: Profiling. (line 10)
@@ -26840,7 +26844,7 @@ Index
* RLENGTH variable, match() function and: String Functions. (line 223)
* Robbins, Arnold <1>: Future Extensions. (line 6)
* Robbins, Arnold <2>: Bugs. (line 32)
-* Robbins, Arnold <3>: Contributors. (line 106)
+* Robbins, Arnold <3>: Contributors. (line 110)
* Robbins, Arnold <4>: Alarm Program. (line 6)
* Robbins, Arnold <5>: Passwd Functions. (line 90)
* Robbins, Arnold <6>: Getline/Pipe. (line 36)
@@ -27258,7 +27262,7 @@ Index
* whitespace, functions, calling: Calling Built-in. (line 10)
* whitespace, newlines as: Options. (line 205)
* Williams, Kent: Contributors. (line 35)
-* Woehlke, Matthew: Contributors. (line 77)
+* Woehlke, Matthew: Contributors. (line 81)
* Woods, John: Contributors. (line 28)
* word boundaries, matching: GNU Regexp Operators.
(line 38)
@@ -27277,12 +27281,13 @@ Index
* XML (eXtensible Markup Language): Internals. (line 160)
* XOR bitwise operation: Bitwise Functions. (line 6)
* xor() function (gawk): Bitwise Functions. (line 54)
-* Yawitz, Efraim: Contributors. (line 104)
+* Yawitz, Efraim: Contributors. (line 108)
* Zaretskii, Eli <1>: Bugs. (line 70)
+* Zaretskii, Eli <2>: Contributors. (line 57)
* Zaretskii, Eli: Acknowledgments. (line 60)
* zero, negative vs. positive: Unexpected Results. (line 28)
* zerofile.awk program: Empty Files. (line 21)
-* Zoulas, Christos: Contributors. (line 65)
+* Zoulas, Christos: Contributors. (line 69)
* {} (braces), actions and: Action Overview. (line 19)
* {} (braces), pgawk program: Profiling. (line 137)
* {} (braces), statements, grouping: Statements. (line 10)
@@ -27663,59 +27668,59 @@ Node: BTL797305
Node: POSIX/GNU798039
Node: Common Extensions803190
Node: Contributors804291
-Node: Installation808467
-Node: Gawk Distribution809361
-Node: Getting809845
-Node: Extracting810671
-Node: Distribution contents812363
-Node: Unix Installation817585
-Node: Quick Installation818202
-Node: Additional Configuration Options820164
-Node: Configuration Philosophy821641
-Node: Non-Unix Installation823983
-Node: PC Installation824441
-Node: PC Binary Installation825740
-Node: PC Compiling827588
-Node: PC Testing830532
-Node: PC Using831708
-Node: Cygwin835893
-Node: MSYS836893
-Node: VMS Installation837407
-Node: VMS Compilation838010
-Ref: VMS Compilation-Footnote-1839017
-Node: VMS Installation Details839075
-Node: VMS Running840710
-Node: VMS Old Gawk842317
-Node: Bugs842791
-Node: Other Versions846701
-Node: Notes851980
-Node: Compatibility Mode852672
-Node: Additions853455
-Node: Accessing The Source854267
-Node: Adding Code855692
-Node: New Ports861659
-Node: Dynamic Extensions865772
-Node: Internals867148
-Node: Plugin License876251
-Node: Sample Library876885
-Node: Internal File Description877571
-Node: Internal File Ops881286
-Ref: Internal File Ops-Footnote-1886067
-Node: Using Internal File Ops886207
-Node: Future Extensions888584
-Node: Basic Concepts891088
-Node: Basic High Level891845
-Ref: Basic High Level-Footnote-1895880
-Node: Basic Data Typing896065
-Node: Floating Point Issues900590
-Node: String Conversion Precision901673
-Ref: String Conversion Precision-Footnote-1903373
-Node: Unexpected Results903482
-Node: POSIX Floating Point Problems905308
-Ref: POSIX Floating Point Problems-Footnote-1909013
-Node: Glossary909051
-Node: Copying934027
-Node: GNU Free Documentation License971584
-Node: Index996721
+Node: Installation808578
+Node: Gawk Distribution809472
+Node: Getting809956
+Node: Extracting810782
+Node: Distribution contents812474
+Node: Unix Installation817696
+Node: Quick Installation818313
+Node: Additional Configuration Options820275
+Node: Configuration Philosophy821752
+Node: Non-Unix Installation824094
+Node: PC Installation824552
+Node: PC Binary Installation825851
+Node: PC Compiling827699
+Node: PC Testing830643
+Node: PC Using831819
+Node: Cygwin836004
+Node: MSYS837004
+Node: VMS Installation837518
+Node: VMS Compilation838121
+Ref: VMS Compilation-Footnote-1839128
+Node: VMS Installation Details839186
+Node: VMS Running840821
+Node: VMS Old Gawk842428
+Node: Bugs842902
+Node: Other Versions846812
+Node: Notes852091
+Node: Compatibility Mode852783
+Node: Additions853566
+Node: Accessing The Source854378
+Node: Adding Code855803
+Node: New Ports861770
+Node: Dynamic Extensions865883
+Node: Internals867259
+Node: Plugin License876362
+Node: Sample Library876996
+Node: Internal File Description877682
+Node: Internal File Ops881397
+Ref: Internal File Ops-Footnote-1886178
+Node: Using Internal File Ops886318
+Node: Future Extensions888695
+Node: Basic Concepts891199
+Node: Basic High Level891956
+Ref: Basic High Level-Footnote-1895991
+Node: Basic Data Typing896176
+Node: Floating Point Issues900701
+Node: String Conversion Precision901784
+Ref: String Conversion Precision-Footnote-1903484
+Node: Unexpected Results903593
+Node: POSIX Floating Point Problems905419
+Ref: POSIX Floating Point Problems-Footnote-1909124
+Node: Glossary909162
+Node: Copying934138
+Node: GNU Free Documentation License971695
+Node: Index996832
End Tag Table
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=008c07e4063122e1bc86ee38a4b43c6086d6da9b
commit 008c07e4063122e1bc86ee38a4b43c6086d6da9b
Author: Arnold D. Robbins <address@hidden>
Date: Thu May 26 22:14:49 2011 +0300
Fix FPAT / NF interaction, update test suites.
diff --git a/ChangeLog b/ChangeLog
index 88443e2..4077526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 26 22:10:08 2011 Arnold D. Robbins <address@hidden>
+
+ * field.c (get_field): Enhance logic for setting NF if we're
+ using FPAT to parse fields. Can end up with weird cases. Thanks
+ to Pat Rankin for pointing them out.
+
Mon May 23 22:06:13 2011 Arnold D. Robbins <address@hidden>
* awkgram.y: Allow newline after comma in range patterns,
diff --git a/field.c b/field.c
index 8ede874..151fea6 100644
--- a/field.c
+++ b/field.c
@@ -884,8 +884,19 @@ get_field(long requested, Func_ptr *assign)
* reference to the field and NF only gets set if the field
* is assigned to -- this case is handled below
*/
- if (parse_extent >= fields_arr[0]->stptr + fields_arr[0]->stlen)
+ if (parse_extent == fields_arr[0]->stptr + fields_arr[0]->stlen)
NF = parse_high_water;
+ else if (parse_field == fpat_parse_field) {
+ /* FPAT parsing is wierd, isolate the special cases */
+ char *rec_start = fields_arr[0]->stptr;
+ char *rec_end = fields_arr[0]->stptr +
fields_arr[0]->stlen;
+
+ if ( parse_extent > rec_end
+ || (parse_extent > rec_start && parse_extent <
rec_end))
+ NF = parse_high_water;
+ else if (parse_extent == rec_start) /* could be no
match for FPAT */
+ NF = 0;
+ }
if (requested == UNLIMITED - 1) /* UNLIMITED-1 means set NF */
requested = parse_high_water;
}
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 8e255aa..c2ed1f0 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 26 22:12:28 2011 Arnold D. Robbins <address@hidden>
+
+ * Makefile.tst: Sync with mainline version.
+
Mon May 23 21:52:49 2011 Scott Deifik <address@hidden>
* Makefile.tst: Sync with mainline version.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index ce2e6d2..920fa1a 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -153,15 +153,16 @@ UNIX_TESTS = \
fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
GAWK_EXT_TESTS = \
- aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort backw \
- badargs beginfile1 binmode1 clos1way delsub devfd devfd1 devfd2 \
- dumpvars exit fieldwdth fpat1 fsfwfs funlen fwtest fwtest2 gensub \
- gensub2 getlndir gnuops2 gnuops3 gnureops icasefs icasers igncdym \
- igncfs ignrcas2 ignrcase indirectcall lint lintold lintwarn \
- manyfiles match1 match2 match3 mbstr1 nastyparm next nondec nondec2 \
- patsplit posix printfbad1 printfbad2 procinfs profile1 profile2 \
- profile3 rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
- rstest6 shadow sortfor sortu splitarg4 strftime strtonum switch2
+ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+ backw badargs beginfile1 binmode1 clos1way delsub devfd devfd1 \
+ devfd2 dumpvars exit fieldwdth fpat1 fpat2 fpatnull fsfwfs funlen \
+ fwtest fwtest2 gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+ icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall lint \
+ lintold lintwarn manyfiles match1 match2 match3 mbstr1 nastyparm \
+ next nondec nondec2 patsplit posix printfbad1 printfbad2 procinfs \
+ profile1 profile2 profile3 rebuf regx8bit reint reint2 rsstart1 \
+ rsstart2 rsstart3 rstest6 shadow sortfor sortu splitarg4 strftime \
+ strtonum switch2
EXTRA_TESTS = inftest regtest
INET_TESTS = inetdayu inetdayt inetechu inetecht
@@ -1660,6 +1661,16 @@ fpat1:
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+fpat2:
+ @echo fpat2
+ @AWKPATH=$(srcdir) $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT
CODE: $$? >>_$@
+ @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
+fpatnull:
+ @echo fpatnull
+ @AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
fsfwfs:
@echo fsfwfs
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/ChangeLog b/test/ChangeLog
index 0d4be5f..f28153a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 26 22:08:27 2011 Arnold D. Robbins <address@hidden>
+
+ * fpat2.awk, fpat2.ok: New files. Thanks to Pat Rankin for the cases.
+ * Makefile.am (fpat2): New test.
+
Mon May 23 14:03:15 2011 Arnold D. Robbins <address@hidden>
* fpatnull.awk, fpatnull.in, fpatnull.ok: New files.
diff --git a/test/Makefile.am b/test/Makefile.am
index fd34a05..065bff1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -226,6 +226,8 @@ EXTRA_DIST = \
fpat1.awk \
fpat1.in \
fpat1.ok \
+ fpat2.awk \
+ fpat2.ok \
fpatnull.awk \
fpatnull.in \
fpatnull.ok \
@@ -782,15 +784,16 @@ UNIX_TESTS = \
fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
GAWK_EXT_TESTS = \
- aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort backw \
- badargs beginfile1 binmode1 clos1way delsub devfd devfd1 devfd2 \
- dumpvars exit fieldwdth fpat1 fpatnull fsfwfs funlen fwtest fwtest2 \
- gensub gensub2 getlndir gnuops2 gnuops3 gnureops icasefs icasers \
- igncdym igncfs ignrcas2 ignrcase indirectcall lint lintold lintwarn \
- manyfiles match1 match2 match3 mbstr1 nastyparm next nondec nondec2 \
- patsplit posix printfbad1 printfbad2 procinfs profile1 profile2 \
- profile3 rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
- rstest6 shadow sortfor sortu splitarg4 strftime strtonum switch2
+ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+ backw badargs beginfile1 binmode1 clos1way delsub devfd devfd1 \
+ devfd2 dumpvars exit fieldwdth fpat1 fpat2 fpatnull fsfwfs funlen \
+ fwtest fwtest2 gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+ icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall lint \
+ lintold lintwarn manyfiles match1 match2 match3 mbstr1 nastyparm \
+ next nondec nondec2 patsplit posix printfbad1 printfbad2 procinfs \
+ profile1 profile2 profile3 rebuf regx8bit reint reint2 rsstart1 \
+ rsstart2 rsstart3 rstest6 shadow sortfor sortu splitarg4 strftime \
+ strtonum switch2
EXTRA_TESTS = inftest regtest
diff --git a/test/Makefile.in b/test/Makefile.in
index 734f97a..1fa42e3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -411,6 +411,8 @@ EXTRA_DIST = \
fpat1.awk \
fpat1.in \
fpat1.ok \
+ fpat2.awk \
+ fpat2.ok \
fpatnull.awk \
fpatnull.in \
fpatnull.ok \
@@ -967,15 +969,16 @@ UNIX_TESTS = \
fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
GAWK_EXT_TESTS = \
- aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort backw \
- badargs beginfile1 binmode1 clos1way delsub devfd devfd1 devfd2 \
- dumpvars exit fieldwdth fpat1 fpatnull fsfwfs funlen fwtest fwtest2 \
- gensub gensub2 getlndir gnuops2 gnuops3 gnureops icasefs icasers \
- igncdym igncfs ignrcas2 ignrcase indirectcall lint lintold lintwarn \
- manyfiles match1 match2 match3 mbstr1 nastyparm next nondec nondec2 \
- patsplit posix printfbad1 printfbad2 procinfs profile1 profile2 \
- profile3 rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
- rstest6 shadow sortfor sortu splitarg4 strftime strtonum switch2
+ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+ backw badargs beginfile1 binmode1 clos1way delsub devfd devfd1 \
+ devfd2 dumpvars exit fieldwdth fpat1 fpat2 fpatnull fsfwfs funlen \
+ fwtest fwtest2 gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+ icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall lint \
+ lintold lintwarn manyfiles match1 match2 match3 mbstr1 nastyparm \
+ next nondec nondec2 patsplit posix printfbad1 printfbad2 procinfs \
+ profile1 profile2 profile3 rebuf regx8bit reint reint2 rsstart1 \
+ rsstart2 rsstart3 rstest6 shadow sortfor sortu splitarg4 strftime \
+ strtonum switch2
EXTRA_TESTS = inftest regtest
INET_TESTS = inetdayu inetdayt inetechu inetecht
@@ -2624,6 +2627,11 @@ fpat1:
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+fpat2:
+ @echo fpat2
+ @AWKPATH=$(srcdir) $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT
CODE: $$? >>_$@
+ @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
fpatnull:
@echo fpatnull
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 4e419a5..7577b89 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -905,6 +905,11 @@ fpat1:
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+fpat2:
+ @echo fpat2
+ @AWKPATH=$(srcdir) $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT
CODE: $$? >>_$@
+ @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+
fpatnull:
@echo fpatnull
@AWKPATH=$(srcdir) $(AWK) -f address@hidden < $(srcdir)/address@hidden
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/fpat2.awk b/test/fpat2.awk
new file mode 100644
index 0000000..aa9e6be
--- /dev/null
+++ b/test/fpat2.awk
@@ -0,0 +1,11 @@
+BEGIN {
+ FPAT = " "
+ $0 = ""
+ print NF
+
+ $0 = "abc"
+ print NF
+
+ $0 = "a b c"
+ print NF
+}
diff --git a/test/fpat2.ok b/test/fpat2.ok
new file mode 100644
index 0000000..67bbf9c
--- /dev/null
+++ b/test/fpat2.ok
@@ -0,0 +1,3 @@
+0
+0
+2
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 960723c..e12be78 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 26 22:14:06 2011 Arnold D. Robbins <address@hidden>
+
+ * vmstest.com (fpat2): New test.
+
Wed May 25 01:31:50 2011 Pat Rankin <address@hidden>
* gawk.hlp: Substantial updates, for first time in 8 years!
diff --git a/vms/vmstest.com b/vms/vmstest.com
index f3efcb5..717f8b9 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -95,7 +95,7 @@ $gawk_ext: echo "gawk_ext... (gawk.extensions)"
$ list = "aadelete1 aadelete2 aarray1 aasort aasorti" -
+ " argtest arraysort backw badargs beginfile1 binmode1" -
+ " clos1way delsub devfd devfd1 devfd2 dumpvars exit" -
- + " fieldwdth fpat1 fpatnull funlen fsfwfs fwtest fwtest2" -
+ + " fieldwdth fpat1 fpat2 fpatnull funlen fsfwfs fwtest
fwtest2" -
+ " gensub gensub2 getlndir gnuops2 gnuops3 gnureops" -
+ " icasefs icasers igncdym igncfs ignrcase ignrcas2"
$ gosub list_of_tests
@@ -289,6 +289,7 @@ $!!double2:
$dynlj:
$fnarydel:
$fnparydl:
+$fpat2:
$forref:
$forsimp:
$funsemnl:
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++
doc/gawk.info | 151 ++++++++++++++++++++++---------------------
field.c | 13 ++++-
pc/ChangeLog | 4 +
pc/Makefile.tst | 29 ++++++---
test/ChangeLog | 5 ++
test/Makefile.am | 21 ++++---
test/Makefile.in | 26 +++++---
test/Maketests | 5 ++
test/fpat2.awk | 11 +++
test/{zero2.ok => fpat2.ok} | 2 +-
vms/ChangeLog | 4 +
vms/vmstest.com | 3 +-
13 files changed, 177 insertions(+), 103 deletions(-)
create mode 100644 test/fpat2.awk
copy test/{zero2.ok => fpat2.ok} (66%)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, master, updated. 9cbb6d9e06dde65da909f1548bedeab10a5dae44,
Arnold Robbins <=