]> Sergey Matveev's repositories - public-inbox.git/commitdiff
linkify: modify argument in place
authorEric Wong <e@80x24.org>
Sat, 24 Dec 2016 11:52:44 +0000 (11:52 +0000)
committerEric Wong <e@80x24.org>
Sat, 24 Dec 2016 19:41:03 +0000 (19:41 +0000)
This results in over 1% speedup doing $MESSAGE_ID/T/ HTML
generation for a 368-message thread.

lib/PublicInbox/Linkify.pm
lib/PublicInbox/View.pm

index acd2a47e8a78349e96ebe00d189e4d23a23bbe37..8e1728c71136c78de06af4d53603e54116496edb 100644 (file)
@@ -22,11 +22,10 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
                 (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
                 )}xi;
 
-sub new { bless {}, shift }
+sub new { bless {}, $_[0] }
 
 sub linkify_1 {
-       my ($self, $s) = @_;
-       $s =~ s!$LINK_RE!
+       $_[1] =~ s!$LINK_RE!
                my $beg = $1 || '';
                my $url = $2;
                my $end = '';
@@ -50,19 +49,17 @@ sub linkify_1 {
 
                # only escape ampersands, others do not match LINK_RE
                $url =~ s/&/&#38;/g;
-               $self->{$key} = $url;
+               $_[0]->{$key} = $url;
                $beg . 'PI-LINK-'. $key . $end;
        !ge;
-       $s;
+       $_[1];
 }
 
 sub linkify_2 {
-       my ($self, $s) = @_;
-
        # Added "PI-LINK-" prefix to avoid false-positives on git commits
-       $s =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+       $_[1] =~ s!\bPI-LINK-([a-f0-9]{40})\b!
                my $key = $1;
-               my $url = $self->{$key};
+               my $url = $_[0]->{$key};
                if (defined $url) {
                        "<a\nhref=\"$url\">$url</a>";
                } else {
@@ -70,7 +67,7 @@ sub linkify_2 {
                        $key;
                }
        !ge;
-       $s;
+       $_[1];
 }
 
 1;
index 39ca959c98e99875ab6656908d6ac428f53c3393..e4e9d7d2e30860fb168c0635329a71f41a61ad60 100644 (file)
@@ -482,9 +482,8 @@ sub add_text_body {
                        flush_quote(\$s, $l, \@quot) if @quot;
 
                        # regular line, OK
-                       $cur = $l->linkify_1($cur);
-                       $cur = ascii_html($cur);
-                       $s .= $l->linkify_2($cur);
+                       $l->linkify_1($cur);
+                       $s .= $l->linkify_2(ascii_html($cur));
                } else {
                        push @quot, $cur;
                }