Remove typed regexps until they can be done correctly.

10 files changed, 67 insertions, 55 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index de57804a..17367572 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2016-08-03         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Remove typed regexes until they can be done correctly.
+
+	* typeof1.awk, typeof1.ok: Adjusted.
+	* typeof3.awk, typeof3.ok: Adjusted.
+	* gsubind.awk, gsubind.ok: Adjusted.
+	* Makefile.am (TYPED_RE_TESTS): New macro to hold typed regexp tests.
+	(dbugtypedre1, dbugtypedre2, typedregex1, typedregex2,
+	typedregex3): Moved into it.
+
 2016-08-01         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (ignrcas3): Adjust to check that the el_GR.xxx locale
diff --git a/test/Makefile.am b/test/Makefile.am
index 3ac9ee70..67485455 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1190,11 +1190,15 @@ UNIX_TESTS = \
 	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang \
 	rtlen rtlen01 space strftlng
 
+TYPED_RE_TESTS = \
+	dbugtypedre1 dbugtypedre2 \
+	typedregex1 typedregex2 typedregex3
+
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
 	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
 	colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 clos1way6 \
-	crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \
+	crlf dbugeval dbugeval2 delsub \
 	devfd devfd1 devfd2 dumpvars errno exit \
 	fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \
 	functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
@@ -1216,7 +1220,7 @@ GAWK_EXT_TESTS = \
 	splitarg4 strftime \
 	strtonum strtonum1 switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
 	symtab7 symtab8 symtab9 symtab10 \
-	typedregex1 typedregex2 typedregex3 typeof1 typeof2 typeof3 typeof4 \
+	typeof1 typeof2 typeof3 typeof4 \
 	timeout \
 	watchpoint1
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 07989791..8df786d2 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1446,11 +1446,15 @@ UNIX_TESTS = \
 	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang \
 	rtlen rtlen01 space strftlng
 
+TYPED_RE_TESTS = \
+	dbugtypedre1 dbugtypedre2 \
+	typedregex1 typedregex2 typedregex3
+
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
 	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
 	colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 clos1way6 \
-	crlf dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \
+	crlf dbugeval dbugeval2 delsub \
 	devfd devfd1 devfd2 dumpvars errno exit \
 	fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \
 	functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
@@ -1472,7 +1476,7 @@ GAWK_EXT_TESTS = \
 	splitarg4 strftime \
 	strtonum strtonum1 switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
 	symtab7 symtab8 symtab9 symtab10 \
-	typedregex1 typedregex2 typedregex3 typeof1 typeof2 typeof3 typeof4 \
+	typeof1 typeof2 typeof3 typeof4 \
 	timeout \
 	watchpoint1
 
@@ -3790,6 +3794,21 @@ getlnhd:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+typedregex1:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+typedregex2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+typedregex3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 aadelete1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -4240,21 +4259,6 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-typedregex1:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-typedregex2:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-typedregex3:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 typeof1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 951590ac..b28a32ab 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1017,6 +1017,21 @@ getlnhd:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+typedregex1:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+typedregex2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+typedregex3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 aadelete1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1467,21 +1482,6 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-typedregex1:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-typedregex2:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-typedregex3:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 typeof1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/gsubind.awk b/test/gsubind.awk
index fce0d818..fec6cbc6 100644
--- a/test/gsubind.awk
+++ b/test/gsubind.awk
@@ -1,9 +1,10 @@
 BEGIN {
 	f = "foo"
-	p = @/o/
+#	p = @/o/
+p = "o"
 	gsub(p, "q", f)
 	print f
-	fun = "gsub"
-	@fun(p, "q", f)
-	print f
+#	fun = "gsub"
+#	@fun(p, "q", f)
+#	print f
 }
diff --git a/test/gsubind.ok b/test/gsubind.ok
index d25f018a..ca6662e5 100644
--- a/test/gsubind.ok
+++ b/test/gsubind.ok
@@ -1,3 +1 @@
 fqq
-gawk: gsubind.awk:7: fatal: gsub: can be called indirectly only with two arguments
-EXIT CODE: 2
diff --git a/test/typeof1.awk b/test/typeof1.awk
index c301030e..9db64484 100644
--- a/test/typeof1.awk
+++ b/test/typeof1.awk
@@ -1,9 +1,9 @@
 BEGIN {
 	a = 5 ; print typeof(a)
 	print typeof(b)
-	print typeof(@/foo/)
+#	print typeof(@/foo/)
 	c = "foo" ; print typeof(c)
 	d[1] = 1 ; print typeof(d), typeof(d[1])
-	e = @/foo/ ; print typeof(e)
-	print typeof(@/bar/)
+#	e = @/foo/ ; print typeof(e)
+#	print typeof(@/bar/)
 }
diff --git a/test/typeof1.ok b/test/typeof1.ok
index 132cc24e..c172da5e 100644
--- a/test/typeof1.ok
+++ b/test/typeof1.ok
@@ -1,7 +1,4 @@
 number
 untyped
-regexp
 string
 array number
-regexp
-regexp
diff --git a/test/typeof3.awk b/test/typeof3.awk
index d148f373..e31bf602 100644
--- a/test/typeof3.awk
+++ b/test/typeof3.awk
@@ -1,13 +1,13 @@
-BEGIN {
-	x = @/xx/
-	print typeof(x)
-	print x
-}
+#BEGIN {
+#	x = @/xx/
+#	print typeof(x)
+#	print x
+#}
 
 # this set may not really be needed for the test
 BEGIN {
 	x = 4
-	print typeof(@/xxx/)
+#	print typeof(@/xxx/)
 	print typeof(3)
 	print x
 }
diff --git a/test/typeof3.ok b/test/typeof3.ok
index a6cd6c4a..9a897048 100644
--- a/test/typeof3.ok
+++ b/test/typeof3.ok
@@ -1,6 +1,3 @@
-regexp
-xx
-regexp
 number
 4
 number