Perl5.26以降における "{", "}" の正規表現検査時のエスケープ対応。

diff --git a/lib/Wiki.pm b/lib/Wiki.pm
index 910c940..57fdd86 100644 (file)
--- a/lib/Wiki.pm
+++ b/lib/Wiki.pm
@@ -729,7 +729,7 @@ sub parse_inline_plugin {
        my $text = shift;
        my ($cmd, @args_tmp) = split(/ /,$text);
        my $args_txt = &Util::trim(join(" ",@args_tmp));
-       if($cmd =~ s/}}(.*?)$//){
+       if($cmd =~ s/\}\}(.*?)$//){
                return { command=>$cmd, args=>[], post=>"$1 $args_txt"};
        }
        

diff --git a/lib/Wiki/Parser.pm b/lib/Wiki/Parser.pm
index bbc3c2e..a582612 100644 (file)
--- a/lib/Wiki/Parser.pm
+++ b/lib/Wiki/Parser.pm
@@ -89,7 +89,7 @@ sub parse {
                }
                
                # ¥Ñ¥é¥°¥é¥Õ¥×¥é¥°¥¤¥ó
-               if($line =~ /^{{(.+}})$/){
+               if($line =~ /^\{\{(.+\}\})$/){
                        if(!$self->{block}){
                                my $plugin = $self->{wiki}->parse_inline_plugin($1);
                                my $info   = $self->{wiki}->get_plugin_info($plugin->{command});
@@ -101,7 +101,7 @@ sub parse {
                                }
                                next;
                        }
-               } elsif($line =~ /^{{(.+)$/){
+               } elsif($line =~ /^\{\{(.+)$/){
                        if ($self->{block}) {
                                my $plugin = $self->{wiki}->parse_inline_plugin($1);
                                my $info   = $self->{wiki}->get_plugin_info($plugin->{command});
@@ -282,7 +282,7 @@ sub parse_line {
        while ($source ne q{}) {
 
                # ¤É¤Î¥¤¥ó¥é¥¤¥ó Wiki ½ñ¼°¤ÎÀèƬ¤Ë¤â match ¤·¤Ê¤¤¾ì¹ç
-               if (!($source =~ /^(.*?)((?:{{|\[\[?|https?:|mailto:|f(?:tp:|ile:)|'''?|==|__|<<).*)$/)) {
+               if (!($source =~ /^(.*?)((?:\{\{|\[\[?|https?:|mailto:|f(?:tp:|ile:)|'''?|==|__|<<).*)$/)) {
                        # ¥­¡¼¥ï¡¼¥É¸¡º÷¡¦ÃÖ´¹½èÍý¤Î¤ß¼Â»Ü¤·¤Æ½ªÎ»¤¹¤ë
                        push @array, $self->_parse_line_keyword($pre . $source);
                        return @array;
@@ -293,7 +293,7 @@ sub parse_line {
                @parsed = ();
 
                # ¥×¥é¥°¥¤¥ó
-               if ($source =~ /^{{/) {
+               if ($source =~ /^\{\{/) {
                        $source = $';
                        my $plugin = $self->{wiki}->parse_inline_plugin($source);
                        unless($plugin){

diff --git a/plugin/bbs/BBSHandler.pm b/plugin/bbs/BBSHandler.pm
index 7a98c56..8485a5a 100644 (file)
--- a/plugin/bbs/BBSHandler.pm
+++ b/plugin/bbs/BBSHandler.pm
@@ -61,7 +61,7 @@ sub do_action {
        
        foreach(@lines){
                $content = $content.$_."\n";
-               if(/^{{bbs\s*.*}}$/ && $flag==0){
+               if(/^\{\{bbs\s*.*\}\}$/ && $flag==0){
                        if($form_count==$count){
                                $content .= "!!$subject - $name (".&Util::format_date(time()).")\n".
                                            "$message\n";

diff --git a/plugin/category/CategoryCache.pm b/plugin/category/CategoryCache.pm
index bbcc1a7..877792d 100644 (file)
--- a/plugin/category/CategoryCache.pm
+++ b/plugin/category/CategoryCache.pm
@@ -102,7 +102,7 @@ sub get_page_category {
        my @category;
        foreach my $line (split(/\n/,$source)){
                if(index($line," ")!=0 && index($line,"\t")!=0 && index($line,"//")!=0){
-                       while($line =~ /{{(category\s+(.+?)\s*}})/g){
+                       while($line =~ /\{\{(category\s+(.+?)\s*\}\})/g){
                                my $inline = $wiki->parse_inline_plugin($1);
                                if(@{$inline->{args}} > 1 and $inline->{args}->[-1] eq 'nolink'){
                                        pop @{$inline->{args}};

diff --git a/plugin/comment/CommentHandler.pm b/plugin/comment/CommentHandler.pm
index d2ac2a1..550c0a7 100644 (file)
--- a/plugin/comment/CommentHandler.pm
+++ b/plugin/comment/CommentHandler.pm
@@ -56,7 +56,7 @@ sub do_action {
                        # ¿·Ãå½ç¤Î¾ì¹ç
                        if($option eq "reverse"){
                                $content = $content.$_."\n";
-                               if(/^{{comment\s*.*}}$/ && $flag==0){
+                               if(/^\{\{comment\s*.*\}\}$/ && $flag==0){
                                        if($form_count==$count){
                                                $content = $content."*$message - $name (".Util::format_date(time()).")\n";
                                                $flag = 1;
@@ -70,7 +70,7 @@ sub do_action {
                                
                        # Åê¹Æ½ç¤Î¾ì¹ç
                        } else {
-                               if(/^{{comment\s*.*}}$/ && $flag==0){
+                               if(/^\{\{comment\s*.*\}\}$/ && $flag==0){
                                        if($form_count==$count){
                                                $content = $content."*$message - $name (".Util::format_date(time()).")\n";
                                                $flag = 1;
@@ -105,7 +105,7 @@ sub check_comment {
        my $page = shift;
        my @lines = split(/\n/,$wiki->get_page($page));
        foreach(@lines){
-               if(/^{{comment\s*.*}}$/){
+               if(/^\{\{comment\s*.*\}\}$/){
                        return 1;
                }
        }

diff --git a/plugin/format/FormatBase.pm b/plugin/format/FormatBase.pm
index 16c7bd0..b7eee15 100644 (file)
--- a/plugin/format/FormatBase.pm
+++ b/plugin/format/FormatBase.pm
@@ -25,15 +25,15 @@ sub convert_to_fswiki {
        
        $self->{block_level} = 0;
        foreach my $line (@lines){
-               if($line =~ /^{{.+}}$/){
+               if($line =~ /^\{\{.+\}\}$/){
                        $buf .= $line."\n";
                        next;
-               } elsif($line =~ /^{{.+$/){
+               } elsif($line =~ /^\{\{.+$/){
                        $self->{block_level}++;
                        $buf .= $line."\n";
                        next;
                } elsif($self->{block_level} > 0){
-                       if($line eq "}}"){
+                       if($line eq "\}\}"){
                                $self->{block_level}--;
                        }
                        $buf .= $line."\n";
@@ -57,10 +57,10 @@ sub convert_from_fswiki {
        
        $self->{block_level} = 0;
        foreach my $line (@lines){
-               if($line =~ /^{{.+}}$/){
+               if($line =~ /^\{\{.+\}\}$/){
                        $buf .= $line."\n";
                        next;
-               } elsif($line =~ /^{{.+$/){
+               } elsif($line =~ /^\{\{.+$/){
                        $self->{block_level}++;
                        $buf .= $line."\n";
                        next;