More peekability for enumcharclass nodes.

perl6 · Oct 22, 2009 · 503d396 · 503d396
1 parent 40d3046
commit 503d396
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/PAST/Regex.pir b/src/PAST/Regex.pir
@@ -188,17 +188,13 @@ at this node.
 
     .local pmc negate
     negate = self.'negate'()
-    unless negate goto negate_done
-    .return (prefix)
-  negate_done:
-
-    .local string charlist
+    .local string subtype, charlist
+    subtype = self.'subtype'()
     charlist = self[0]
 
-    unless tail goto charlist_notail
+    if negate goto charlist_negate
 
-    .local string subtype
-    subtype = self.'subtype'()
+    unless tail goto charlist_notail
     if subtype == 'zerowidth' goto charlist_notail
 
     .local pmc result, head
@@ -223,6 +219,14 @@ at this node.
   charlist_notail:
     $P0 = split '', charlist
     .return ($P0 :flat)
+
+  charlist_negate:
+    if subtype == 'zerowidth' goto charlist_negate_0
+    unless tail goto charlist_negate_0
+    .return (prefix)
+  charlist_negate_0:
+    head = shift tail
+    .tailcall head.'prefix'(prefix, tail :flat)
 .end