- maybe_regex() now handles undef gracefully.

    - maybe_regex() now handles 'm,foo,' style regexes.

Need this for Test::Legacy.

Changes

@@ -1,3 +1,7 @@
+0.55
+    - maybe_regex() now handles undef gracefully.
+    - maybe_regex() now handles 'm,foo,' style regexes.
+
 0.54
     - sort_bug.t wasn't checking for threads properly.  Would fail on
       5.6 that had ithreads compiled in. [rt.cpan.org 8765]

lib/Test/Builder.pm

@@ -8,7 +8,7 @@ $^C ||= 0;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.21';
+$VERSION = '0.21_01';
 $VERSION = eval $VERSION;    # make the alpha version come out as a number
 
 # Make Test::Builder thread-safe for ithreads.
@@ -637,16 +637,26 @@ could be written as:
 
 
 sub maybe_regex {
-	my ($self, $regex) = @_;
+    my ($self, $regex) = @_;
     my $usable_regex = undef;
+
+    return $usable_regex unless defined $regex;
+
+    my($re, $opts);
+
+    # Check for qr/foo/
     if( ref $regex eq 'Regexp' ) {
         $usable_regex = $regex;
     }
-    # Check if it looks like '/foo/'
-    elsif( my($re, $opts) = $regex =~ m{^ /(.*)/ (\w*) $ }sx ) {
+    # Check for '/foo/' or 'm,foo,'
+    elsif( ($re, $opts)        = $regex =~ m{^ /(.*)/ (\w*) $ }sx           or
+           (undef, $re, $opts) = $regex =~ m,^ m([^\w\s]) (.+) \1 (\w*) $,sx
+         )
+    {
         $usable_regex = length $opts ? "(?$opts)$re" : $re;
-    };
-    return($usable_regex)
+    }
+
+    return $usable_regex;
 };
 
 sub _regex_ok {

t/maybe_regex.t

@@ -11,7 +11,7 @@ BEGIN {
 }
 
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 13;
 
 use Test::Builder;
 my $Test = Test::Builder->new;
@@ -48,3 +48,11 @@ SKIP: {
 	ok(('f00' =~ m/$r/), '"//" good match');
 	ok(('b4r' !~ m/$r/), '"//" bad match');
 };
+
+
+{
+	my $r = $Test->maybe_regex('m,foo,i');
+	ok(defined $r, 'm,, detected');
+	ok(('fOO' =~ m/$r/), '"//" good match');
+	ok(('bar' !~ m/$r/), '"//" bad match');
+};

t/undef.t

@@ -11,7 +11,7 @@ BEGIN {
 }
 
 use strict;
-use Test::More tests => 14;
+use Test::More tests => 16;
 use TieOut;
 
 BEGIN { $^W = 1; }
@@ -58,3 +58,8 @@ $tb->failure_output($old_fail);
 
 is( $caught->read, "# undef\n" );
 is( $warnings, '',          'diag(undef)  no warnings' );
+
+
+$tb->maybe_regex(undef);
+is( $caught->read, '' );
+is( $warnings, '',          'maybe_regex(undef) no warnings' );