X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fregexp.t;h=244ed4ab99460267a0b8ebd03a35125d24de6cbd;hb=e4d48cc9bddb8984cf12bdfbcbac9580d192b5a5;hp=af8a66610d44204759fd043f63f0daac02667829;hpb=79072805bf63abe5b5978b5928ab00d360ea3e7f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/regexp.t b/t/op/regexp.t
index af8a666..244ed4a 100755
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -1,35 +1,93 @@
 #!./perl
 
-# $RCSfile: regexp.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:20 $
+# The tests are in a separate file 't/op/re_tests'.
+# Each line in that file is a separate test.
+# There are five columns, separated by tabs.
+#
+# Column 1 contains the pattern, optionally enclosed in C<''>.
+# Modifiers can be put after the closing C<'>.
+#
+# Column 2 contains the string to be matched.
+#
+# Column 3 contains the expected result:
+# 	y	expect a match
+# 	n	expect no match
+# 	c	expect an error
+#
+# Columns 4 and 5 are used only if column 3 contains C<y> or C<c>.
+#
+# Column 4 contains a string, usually C<$&>.
+#
+# Column 5 contains the expected result of double-quote
+# interpolating that string after the match, or start of error message.
+#
+# \n in the tests are interpolated.
+#
+# If you want to add a regular expression test that can't be expressed
+# in this format, don't add it here: put it in op/pat.t instead.
+
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib' if -d '../lib';
+}
+
+use re 'eval';
+
+$iters = shift || 1;		# Poor man performance suite, 10000 is OK.
+
+open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests') ||
+	die "Can't open re_tests";
 
-open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests')
-    || die "Can't open re_tests";
 while (<TESTS>) { }
 $numtests = $.;
-close(TESTS);
+seek(TESTS,0,0);
+$. = 0;
 
-print "1..$numtests\n";
-open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests')
-    || die "Can't open re_tests";
 $| = 1;
+print "1..$numtests\n# $iters iterations\n";
+TEST:
 while (<TESTS>) {
-    ($pat, $subject, $result, $repl, $expect) = split(/[\t\n]/,$_);
+    chomp;
+    s/\\n/\n/g;
+    ($pat, $subject, $result, $repl, $expect) = split(/\t/,$_);
     $input = join(':',$pat,$subject,$result,$repl,$expect);
-    $pat = "'$pat'" unless $pat =~ /^'/;
-    eval "\$match = (\$subject =~ m$pat); \$got = \"$repl\";";
-    if ($result eq 'c') {
-	if ($@ ne '') {print "ok $.\n";} else {print "not ok $.\n";}
-    }
-    elsif ($result eq 'n') {
-	if (!$match) {print "ok $.\n";} else {print "not ok $. $input => $got\n";}
-    }
-    else {
-	if ($match && $got eq $expect) {
-	    print "ok $.\n";
+    infty_subst(\$pat);
+    infty_subst(\$expect);
+    $pat = "'$pat'" unless $pat =~ /^[:']/;
+    $pat =~ s/\\n/\n/g;
+    $subject =~ s/\\n/\n/g;
+    $expect =~ s/\\n/\n/g;
+    $expect = $repl = '-' if $skip_amp and $input =~ /\$[&\`\']/;
+    for $study ("", "study \$subject") {
+ 	$c = $iters;
+ 	eval "$study; \$match = (\$subject =~ m$pat) while \$c--; \$got = \"$repl\";";
+	chomp( $err = $@ );
+	if ($result eq 'c') {
+	    if ($err !~ m!^\Q$expect!) { print "not ok $. (compile) $input => `$err'\n"; next TEST }
+	    last;  # no need to study a syntax error
+	}
+	elsif ($@) {
+	    print "not ok $. $input => error `$err'\n"; next TEST;
+	}
+	elsif ($result eq 'n') {
+	    if ($match) { print "not ok $. ($study) $input => false positive\n"; next TEST }
 	}
 	else {
-	    print "not ok $. $input => $got\n";
+	    if (!$match || $got ne $expect) {
+ 		print "not ok $. ($study) $input => `$got', match=$match\n";
+		next TEST;
+	    }
 	}
     }
+    print "ok $.\n";
 }
+
 close(TESTS);
+
+sub infty_subst                             # Special-case substitution
+{                                           #  of $reg_infty and friends
+    my $tp = shift;
+    $$tp =~ s/,\$reg_infty_m}/,$reg_infty_m}/o;
+    $$tp =~ s/,\$reg_infty_p}/,$reg_infty_p}/o;
+    $$tp =~ s/,\$reg_infty}/,$reg_infty}/o;
+}