make the NFA work with () captures

Raku · Nov 18, 2011 · 9dd7eab · 9dd7eab
1 parent ec2f2a8
commit 9dd7eab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/QRegex/NFA.nqp b/src/QRegex/NFA.nqp
@@ -44,7 +44,6 @@ class QRegex::NFA {
 
     method regex_nfa($node, $from, $to) {
         my $method := ($node.rxtype // 'concat');
-        nqp::say("got method $method");
         self.HOW.can(self, $method) 
          ?? self."$method"($node, $from, $to)
          !! self.fate($node, $from, $to);
@@ -124,7 +123,9 @@ class QRegex::NFA {
             ?? ($node.negate 
                   ?? self.fate($node, $from, $to)
                   !! self.addedge($from, 0, $EDGE_SUBRULE, $node.name))
-            !! self.addedge($from, $to, $EDGE_SUBRULE, $node[0][0]);
+            !! $subtype eq 'capture' && $node[1]
+                  ?? self.regex_nfa($node[1], $from, $to)
+                  !! self.addedge($from, $to, $EDGE_SUBRULE, $node[0][0]);
     }
 
     method quant($node, $from, $to) {

diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -121,7 +121,7 @@ class QRegex::P6Regex::Actions is HLL::Actions {
 
     method metachar:sym<( )>($/) {
         my $subpast := PAST::Node.new(buildsub($<nibbler>.ast));
-        my $qast := QAST::Regex.new( $subpast, :rxtype('subrule'),
+        my $qast := QAST::Regex.new( $subpast, $<nibbler>.ast, :rxtype('subrule'),
                                      :subtype('capture'), :node($/) );
         make $qast;
     }