Fix gsub and getline pass by reference. Add tests.

10 files changed, 56 insertions, 4 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 60c4f525..e4ad2f33 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (getline4, gsubtst8): New tests.
+	* getline4.awk, getline4.in, getline4.ok: New files.
+	* gsubtst8.awk, gsubtst8.in, gsubtst8.ok: New files.
+
 2011-07-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (gsubtst7): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 12f64a62..82e08343 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -283,6 +283,9 @@ EXTRA_DIST = \
 	getline2.ok \
 	getline3.awk \
 	getline3.ok \
+	getline4.awk \
+	getline4.in \
+	getline4.ok \
 	getlnbuf.awk \
 	getlnbuf.in \
 	getlnbuf.ok \
@@ -321,6 +324,9 @@ EXTRA_DIST = \
 	gsubtst7.awk \
 	gsubtst7.in \
 	gsubtst7.ok \
+	gsubtst8.awk \
+	gsubtst8.in \
+	gsubtst8.ok \
 	gtlnbufv.awk \
 	hex.awk \
 	hex.ok \
@@ -769,9 +775,10 @@ BASIC_TESTS = \
 	dfastress dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 \
 	fldchg fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc \
 	fordel forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
-	funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
+	funstack getline getline2 getline3 getline4 \
+	getlnbuf getnr2tb getnr2tm \
 	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
-	gsubtst7 \
+	gsubtst7 gsubtst8 \
 	hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
 	longsub longwrds manglprm math membug1 messages minusstr mmap8k \
 	mtchi18n nasty nasty2 negexp negrange nested nfldstr nfneg \
diff --git a/test/Makefile.in b/test/Makefile.in
index eee32eba..fab7dd36 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -468,6 +468,9 @@ EXTRA_DIST = \
 	getline2.ok \
 	getline3.awk \
 	getline3.ok \
+	getline4.awk \
+	getline4.in \
+	getline4.ok \
 	getlnbuf.awk \
 	getlnbuf.in \
 	getlnbuf.ok \
@@ -506,6 +509,9 @@ EXTRA_DIST = \
 	gsubtst7.awk \
 	gsubtst7.in \
 	gsubtst7.ok \
+	gsubtst8.awk \
+	gsubtst8.in \
+	gsubtst8.ok \
 	gtlnbufv.awk \
 	hex.awk \
 	hex.ok \
@@ -954,9 +960,10 @@ BASIC_TESTS = \
 	dfastress dynlj eofsplit exitval1 exitval2 fcall_exit fcall_exit2 \
 	fldchg fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc \
 	fordel forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
-	funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
+	funstack getline getline2 getline3 getline4 \
+	getlnbuf getnr2tb getnr2tm \
 	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
-	gsubtst7 \
+	gsubtst7 gsubtst8 \
 	hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
 	longsub longwrds manglprm math membug1 messages minusstr mmap8k \
 	mtchi18n nasty nasty2 negexp negrange nested nfldstr nfneg \
@@ -2046,6 +2053,11 @@ getline3:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+getline4:
+	@echo getline4
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getnr2tb:
 	@echo getnr2tb
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2086,6 +2098,11 @@ gsubtst7:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+gsubtst8:
+	@echo gsubtst8
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 hex:
 	@echo hex
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 9f364038..d11cd6f4 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -315,6 +315,11 @@ getline3:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+getline4:
+	@echo getline4
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 getnr2tb:
 	@echo getnr2tb
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -355,6 +360,11 @@ gsubtst7:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+gsubtst8:
+	@echo gsubtst8
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 hex:
 	@echo hex
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/getline4.awk b/test/getline4.awk
new file mode 100644
index 00000000..275faaab
--- /dev/null
+++ b/test/getline4.awk
@@ -0,0 +1 @@
+END { getline $2; print}
diff --git a/test/getline4.in b/test/getline4.in
new file mode 100644
index 00000000..42771a3c
--- /dev/null
+++ b/test/getline4.in
@@ -0,0 +1 @@
+ aaa bbb
diff --git a/test/getline4.ok b/test/getline4.ok
new file mode 100644
index 00000000..42771a3c
--- /dev/null
+++ b/test/getline4.ok
@@ -0,0 +1 @@
+ aaa bbb
diff --git a/test/gsubtst8.awk b/test/gsubtst8.awk
new file mode 100644
index 00000000..818b0ea3
--- /dev/null
+++ b/test/gsubtst8.awk
@@ -0,0 +1,5 @@
+{
+        OFS = " " $2 " "
+        gsub("foo", "_", OFS)
+        print $1, $2
+}
diff --git a/test/gsubtst8.in b/test/gsubtst8.in
new file mode 100644
index 00000000..f2b45c7d
--- /dev/null
+++ b/test/gsubtst8.in
@@ -0,0 +1,2 @@
+a bar b
+c foo d
diff --git a/test/gsubtst8.ok b/test/gsubtst8.ok
new file mode 100644
index 00000000..d3b28cc0
--- /dev/null
+++ b/test/gsubtst8.ok
@@ -0,0 +1,2 @@
+a bar bar
+c _ foo