make use of precompiled regex objects

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bb7d46ccfb63f8de96a4246b49de1dea67d9b8ea..e5370f4a6577f736ca869c84f19d260caf518b6c 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2495,7 +2495,7 @@ sub match_glob ($$;@) {
        # cache the compiled regex to save time.
        if (!defined $glob_cache{$glob}) {
                my $re = IkiWiki::glob2re($glob);
        # cache the compiled regex to save time.
        if (!defined $glob_cache{$glob}) {
                my $re = IkiWiki::glob2re($glob);

-               $glob_cache{$glob} = qr/^$re$/i;
+               $glob_cache{$glob} = $re;

        }
        if ($page=~ $glob_cache{$glob}) {
                if (! IkiWiki::isinternal($page) || $params{internal}) {
        }
        if ($page=~ $glob_cache{$glob}) {
                if (! IkiWiki::isinternal($page) || $params{internal}) {


@@ -2667,7 +2667,7 @@ sub match_user ($$;@) {
                return IkiWiki::ErrorReason->new("no user specified");
        }
 
                return IkiWiki::ErrorReason->new("no user specified");
        }
 

-       if (defined $params{user} && $params{user}=~/^$regexp$/i) {
+       if (defined $params{user} && $params{user}=~$regexp) {

                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {
                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 3b0a7b3148d4edc2bb5bf1c8d11af474dc28a1c7..4f4e67489a41c51ecae344119362f0ea611d481a 100644 (file)
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -161,7 +161,7 @@ sub match_mimetype ($$;@) {
        }
 
        my $regexp=IkiWiki::glob2re($wanted);
        }
 
        my $regexp=IkiWiki::glob2re($wanted);

-       if ($mimetype!~/^$regexp$/i) {
+       if ($mimetype!~$regexp) {

                return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
        }
        else {
                return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
        }
        else {

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5cfa7283350885181b9e8e194e87a4448c235c10..47007afe286bd780eba392fde2fa2b20039ec73e 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -355,7 +355,7 @@ sub match {
        }
 
        if (defined $val) {
        }
 
        if (defined $val) {

-               if ($val=~/^$re$/i) {
+               if ($val=~$re) {

                        return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
                }
                else {
                        return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
                }
                else {

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a79e7d7f0ee56f579ff4e261cd97028533de3099..79142ed1fe62396f17cff88cbfe914acb40896f7 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1297,7 +1297,7 @@ sub match_lang ($$;@) {
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);

-       if ($lang !~ /^$regexp$/i) {
+       if ($lang !~ $regexp) {

                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {
                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {