Handle empty concat nodes in NFA builder; fixes tests we regressed in the protoregexes branch.

jnthn · jnthn · commit 0bbd9c1d4705 · 2011-11-16T23:10:44.000+01:00
diff --git a/src/QRegex/NFA.nqp b/src/QRegex/NFA.nqp
@@ -87,7 +87,7 @@ class QRegex::NFA {
             $from := self.regex_nfa($node[$i], $from, -1);
             $i := $i + 1;
         }
-        $from > 0 ?? self.regex_nfa($node[$i], $from, $to) !! $to;
+        $from > 0 && $n >= 0 ?? self.regex_nfa($node[$i], $from, $to) !! $to;
     }
 
     method enumcharlist($node, $from, $to) {
@@ -196,7 +196,6 @@ class QRegex::NFA {
                 @done[$st] := $gen;
                 for $!states[$st] -> $act, $arg, $to {
                     if $act == $EDGE_FATE {
-                        say("# crossing fate edge $arg at $offset");
                         @fatepos[$arg] := $offset;
                     }
                     elsif $act == $EDGE_EPSILON && @done[$to] != $gen {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class QRegex::NFA {`
`87`	`87`	`$from := self.regex_nfa($node[$i], $from, -1);`
`88`	`88`	`$i := $i + 1;`
`89`	`89`	`}`
`90`		`- $from > 0 ?? self.regex_nfa($node[$i], $from, $to) !! $to;`
	`90`	`+ $from > 0 && $n >= 0 ?? self.regex_nfa($node[$i], $from, $to) !! $to;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`method enumcharlist($node, $from, $to) {`
`@@ -196,7 +196,6 @@ class QRegex::NFA {`
`196`	`196`	`@done[$st] := $gen;`
`197`	`197`	`for $!states[$st] -> $act, $arg, $to {`
`198`	`198`	`if $act == $EDGE_FATE {`
`199`		`- say("# crossing fate edge $arg at $offset");`
`200`	`199`	`@fatepos[$arg] := $offset;`
`201`	`200`	`}`
`202`	`201`	`elsif $act == $EDGE_EPSILON && @done[$to] != $gen {`