Fix bug when protoregex is called directly from Grammar.parse (Coke++)

perl6 · Dec 17, 2009 · 88757e9 · 88757e9
1 parent 503f76f
commit 88757e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Regex/Cursor-protoregex-peek.pir b/src/Regex/Cursor-protoregex-peek.pir
@@ -60,8 +60,8 @@ Perform a match for protoregex C<name>.
     if $I0 goto rx_array
     .local int rxaddr
     rxaddr = get_addr rx
-    result = mcalled[rxaddr]
-    unless null result goto token_next
+    $P0 = mcalled[rxaddr]
+    unless null $P0 goto token_next
     result = self.rx()
     mcalled[rxaddr] = mcalled
     if result goto done
@@ -73,8 +73,8 @@ Perform a match for protoregex C<name>.
     unless rx_it goto cand_done
     rx = shift rx_it
     rxaddr = get_addr rx
-    result = mcalled[rxaddr]
-    unless null result goto token_next
+    $P0 = mcalled[rxaddr]
+    unless null $P0 goto token_next
     result = self.rx()
     mcalled[rxaddr] = mcalled
     if result goto done
@@ -92,7 +92,11 @@ Perform a match for protoregex C<name>.
 
   fail:
     self.'!cursor_debug'('FAIL  ', name)
-    .return (0)
+    unless null result goto fail_1
+    result = self.'!cursor_start'()
+    result.'!cursor_fail'()
+  fail_1:
+    .return (result)
 .end
 
 

diff --git a/t/nqp/32-protoregex.t b/t/nqp/32-protoregex.t
@@ -2,7 +2,7 @@
 
 # test protoregexes in grammars
 
-plan(6);
+plan(7);
 
 grammar ABC {
 
@@ -29,4 +29,8 @@ ok( ?$/ ,           'successfully matched grammar' );
 $/ := ABC.parse('xxx');
 ok( !$/ ,           'successfully failed protoregex match' );
 
+$/ := ABC.parse('xxx', :rule<symbols>);
+ok( !$/ ,           'successfully failed protoregex match' );
+
+