Separate avhv_foo() key handling into avhv_keys(). Slightly tweaked

[p5sagit/p5-mst-13.2.git] / t / op / regexp.t

diff --git a/t/op/regexp.t b/t/op/regexp.t
index c696924..803f1d0 100755 (executable)
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -1,5 +1,26 @@
 #!./perl
 
+# 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.
+
 open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests')
     || die "Can't open re_tests";
 
@@ -14,11 +35,11 @@ TEST:
 while (<TESTS>) {
     ($pat, $subject, $result, $repl, $expect) = split(/[\t\n]/,$_);
     $input = join(':',$pat,$subject,$result,$repl,$expect);
-    $pat = "'$pat'" unless $pat =~ /^'/;
-    for $study ("", "study \$match") {
+    $pat = "'$pat'" unless $pat =~ /^[:']/;
+    for $study ("", "study \$subject") {
        eval "$study; \$match = (\$subject =~ m$pat); \$got = \"$repl\";";
        if ($result eq 'c') {
-           if ($@ eq '') { print "not ok $.\n"; next TEST }
+           if ($@ !~ m!^\Q$expect!) { print "not ok $.\n"; next TEST }
            last;  # no need to study a syntax error
        }
        elsif ($result eq 'n') {