Merge branch 'cursor-mem-opts' of github.com:perl6/nqp

Raku · Nov 26, 2013 · ef756d4 · ef756d4
2 parents 7f7d915 + 3b28064
commit ef756d4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/QRegex/Cursor.nqp b/src/QRegex/Cursor.nqp
@@ -85,7 +85,15 @@ role NQPCursorRole is export {
                 }
                 $csi++;
             }
-        } 
+        }
+
+        # Once we've produced the captures, and if we know we're finished and
+        # will never be backtracked into, we can release cstack and regexsub.
+        unless nqp::defined($!bstack) {
+            $!cstack   := nqp::null();
+            $!regexsub := nqp::null();
+        }
+
         $caps;
     }
 
@@ -212,8 +220,10 @@ role NQPCursorRole is export {
     }
 
     method !cursor_fail() {
-        $!match  := nqp::null();
-        $!bstack := nqp::null();
+        $!match    := nqp::null();
+        $!bstack   := nqp::null();
+        $!cstack   := nqp::null();
+        $!regexsub := nqp::null();
         $!pos    := -3;
     }
 

diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -729,6 +729,9 @@ class QRegex::P6Regex::Actions is HLL::Actions {
                                        ) 
                                    )
                               )));
+        if %*RX<r> {
+            $qast[2].backtrack('r');
+        }
         $block.push($qast);
 
         $block;