Changeset 31804 for lang/perl/Text-Darts/trunk

Timestamp:

04/02/09 06:05:25 (4 years ago)

Author:

dankogai

Message:

more optimization

Location:

lang/perl/Text-Darts/trunk

Files:

• Changes (modified) (1 diff)
• Darts.xs (modified) (3 diffs)
• lib/Text/Darts.pm (modified) (1 diff)
• t/benchmark.pl (modified) (2 diffs)

lang/perl/Text-Darts/trunk/Changes

@@ -4 +4 @@
 #
 $Revision: 0.6 $ $Date: 2009/03/30 12:57:33 $
+! Darts.xs lib/Text/Darts.pm
+  More optimization
+
+0.06 2009/03/30 12:57:33
 ! Darts.xs lib/Text/Darts.pm
   Optimized gsub($str, \%hashref);

lang/perl/Text-Darts/trunk/Darts.xs

@@ -70 +70 @@
 }
 
+
 static SV *da_gsub(int dpi, SV *src, SV *rep){
-    SV *result = newSV(0);
+    SV *result = newSV(SvCUR(src) * 2);
     Darts::DoubleArray *dp = INT2PTR(Darts::DoubleArray *, dpi);
     Darts::DoubleArray::result_pair_type  result_pair[MAX_NMATCH];
@@ -79 +80 @@
 
     while (head < tail) {
-        size_t size = 
-            dp->commonPrefixSearch(head,result_pair, sizeof(result_pair));
-        size_t seekto = 0;       
+        char *ohead = head;
+        size_t size, slen;
+        while(head < tail){
+            size = 
+                dp->commonPrefixSearch(head,result_pair, sizeof(result_pair));
+            if (size) break;
+            head++;
+        }
+        if (head != ohead){
+            sv_catpvn(result, ohead, (head - ohead));
+        }
         if (size) {
+            size_t seekto = 0;       
             for (size_t i = 0; i < size; ++i) {
                 if (seekto < result_pair[i].length)
@@ -94 +104 @@
                 head += seekto;
             }
-        }
-        if (seekto == 0) {
-            sv_catpvn(result, head, 1);
-            ++head; 
         }
     }

lang/perl/Text-Darts/trunk/lib/Text/Darts.pm

@@ -11 +11 @@
 sub new{
     my $pkg = shift;
-    my $dpi = xs_make([sort @_]);
+    my $dpi = xs_make([ grep { $_ } sort @_]);
     bless \$dpi, $pkg;
 }

lang/perl/Text-Darts/trunk/t/benchmark.pl

@@ -7 +7 @@
 
 my $str = do { open my $fh, __FILE__; local $/; my $s = <$fh>; close $fh; $s };
-my @words = do { my %h; $h{$_}++ for split /\W+/, $str; keys %h };
+my @words = do { my %h; $_ and $h{$_}++ for split /\W+/, $str; keys %h };
 
 my $td = Text::Darts->new(@words);
@@ -18 +18 @@
       {
           Darts => sub {
-              $td->gsub( $str, sub { "<$_[0]>" } );
-          },
+              $td->gsub( $str, sub { "<$_[0]>" } );
+          },
           'R::A' => sub {
               my $tmp = $str;