Changeset 21904 for src/perl6

Timestamp:

08/16/08 06:31:54 (3 months ago)

Author:

lwall

Message:

[STD] speed up parser by 33% by using P5 regex instead of TRE for ltm backoff matches

Files:

• src/perl6/Cursor.pmc (modified) (7 diffs)

src/perl6/Cursor.pmc

@@ -520 +520 @@
             for my $pat (@pats) {
                 $pat =~ s/\.\?$//;      # ltm backoff doesn't need tre workaround
+                $pat =~ s/\\>/\\b/g;    # perl regex doesn't use \>
             }
 
@@ -530 +531 @@
                 return unless $lexer;
 
-                pos($$buf) = $C->{_pos};
+                my $P = $C->{_pos};
+                pos($$buf) = $P;
 
                 if ($DEBUG & DEBUG::lexer) {
@@ -539 +541 @@
                 }
 
-                ##########################################
-                # No normal p5 match/subst below here!!! #
-                ##########################################
                 {
-                    use re::engine::TRE;
-
                     # if trystate is defined, the "obvious" LTM failed, so must back off
                     # a parallel nfa matcher might or might not do better here...
@@ -572 +569 @@
                                 if ($l == -1) {
                                     my $p = '^' . $pats[$px];
+                                    pos($$buf) = $P;
                                     if (($$buf =~ m/$p/xgc)) {
-                                        $$rxlens[$px] = $l = $+[0] - $-[0];
+                                        $$rxlens[$px] = $l = pos($$buf) - $P;
                                         if ($l == $$trylen) {
                                             push @result, $fates->[$px];
@@ -592 +590 @@
                                     else {
                                         my $p = '^' . $pats[$px];
+                                        pos($$buf) = $P;
                                         if ($$buf =~ m/$p/xgc) {
                                             push @result, $fates->[$px];
@@ -604 +603 @@
                         return @result;
                     }
+
+                    ##########################################
+                    # No normal p5 match/subst below here!!! #
+                    ##########################################
+                    use re::engine::TRE;
+
 
                     $self->deb("/ running tre match at @{[ pos($$buf) ]} /") if $DEBUG & DEBUG::lexer;
@@ -1441 +1446 @@
     pos($$buf) = $P;
     if ($$buf =~ /$qr/gc) {
-        my $len = $+[0] - $P;
+        my $len = pos($$buf) - $P;
         $self->deb("PATTERN $qr matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         my $r = $self->cursor($P+$len);