Add ability to smartmatch regex/token/rule (although anchoring is

currently incorrect).

build/Makefile.in

@@ -44,6 +44,7 @@ REGEX_SOURCES = \
   src/Regex/Cursor-builtins.pir \
   src/Regex/Cursor-protoregex-peek.pir \
   src/Regex/Match.pir \
+  src/Regex/Regex.pir \
   src/Regex/Dumper.pir \
   src/PAST/Regex.pir \
   src/PAST/Compiler-Regex.pir \

src/NQP/Actions.pm

@@ -56,6 +56,7 @@ method statementlist($/) {
     if $<statement> {
         for $<statement> {
             my $ast := $_.ast;
+            $ast := $ast<sink> if pir::defined($ast<sink>);
             if $ast.isa(PAST::Block) && !$ast.blocktype {
                 $ast := block_immediate($ast);
             }
@@ -521,9 +522,17 @@ method regex_declarator($/, $key?) {
             );
     }
     else {
+        my $regex := 
+            Regex::P6Regex::Actions::buildsub($<p6regex>.ast, @BLOCK.shift);
+        $regex.name($name);
         $past := 
-             Regex::P6Regex::Actions::buildsub($<p6regex>.ast, @BLOCK.shift);
-        $past.name($name);
+            PAST::Op.new(
+                :pasttype<callmethod>, :name<new>,
+                PAST::Var.new( :name('Regex'), :namespace(['Regex']), :scope<package> ),
+                $regex
+            );
+        # In sink context, we don't need the Regex::Regex object.
+        $past<sink> := $regex;
         @MODIFIERS.shift;
     }
     make $past;

src/Regex.pir

@@ -14,6 +14,7 @@ This file brings together the various Regex modules needed for Regex.pbc .
 .include 'src/Regex/Cursor-builtins.pir'
 .include 'src/Regex/Cursor-protoregex-peek.pir'
 .include 'src/Regex/Match.pir'
+.include 'src/Regex/Regex.pir'
 .include 'src/Regex/Dumper.pir'
 
 .include 'src/PAST/Regex.pir'

t/nqp/45-smartmatch.t

@@ -3,10 +3,17 @@
 P6metaclass.register('Integer');
 P6metaclass.register('ResizablePMCArray');
 
-plan(4);
+plan(8);
 ok(3 ~~ Integer, "smartmatch of Integer works");
 ok(!(4.5 ~~ Integer), "negative smartmatch of Integer works");
 
 ok(<a b c> ~~ ResizablePMCArray, "smartmatch of RPA works");
 ok(!(3 ~~ ResizablePMCArray), "negative smartmatch of RPA works");
 
+my $match := 'abcdef' ~~ regex abc { c(.)e };
+
+ok( $match, "simple smart match" );
+ok( $match.from == 2, "match has correct .from" );
+ok( $match.to == 5, "match has correct .to");
+ok( $match eq 'cde', "match has correct string value" );
+