[v6] Stop runaway backtracking in Cursor.lineof

sorear · Nov 16, 2010 · 9912342 · 9912342
1 parent 29ec560
commit 9912342
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/v6/tryfile b/v6/tryfile
@@ -22,13 +22,14 @@ augment class NAME {
 }
 
 augment class Regex {
+    sub first(\$x) { for $x -> $elt { return $elt }; Any }
     method ACCEPTS($st) {
         my $i = 0;
         my $str = $st.Str;
         my $mat;
         my $C = Cursor.new($str);
         while !$mat && ($i <= $str.chars) {
-            ($mat,) = (self)($C.cursor($i++));
+            $mat = first((self)($C.cursor($i++)));
         }
         $mat ?? unitem($mat) !! Any;
     }
@@ -295,8 +296,8 @@ my %terminator      = (:dba('terminator')      , :prec<a=>, :assoc<list>);
         my $line = @*MEMOS[$p]<L>;
         return $line if $line;
         $line = 1; my $pos = 0;
-        self.orig ~~ / [ \n { @*MEMOS[$pos++]<L> = $line++ } ||
-                         .  { @*MEMOS[$pos++]<L> = $line } ]* /;
+        self.orig ~~ / :r [ \n { @*MEMOS[$pos++]<L> = $line++ } ||
+                            .  { @*MEMOS[$pos++]<L> = $line } ]* /;
         @*MEMOS[$pos++]<L> = $line;
         return @*MEMOS[$p]<L> // 0;
     }