vitalif
/
VMXTemplate
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix wrapper and whitespace regexps

databind
vitalif 2009-02-07 13:16:04 +00:00 committed by Vitaliy Filippov
parent c999ed3288
commit 59ef6cbe8d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VMX/Template.pm
View File

@ -161,7 +161,7 @@ sub parse
my $sub = $self->compile($textref, $handle, $fn);
my $str = eval { &$sub($self) };
die "[Template] error running '$handle': $@" if $@;
$str = &$self->{wrapper} ($str) if $self->{wrapper};
&{$self->{wrapper}} ($str) if $self->{wrapper};
return $str;
}
@ -407,9 +407,9 @@ sub compile
# комментарии <!--# ... #-->
$code =~ s/\s*<!--#.*?#-->//gos;
# форматирование кода для красоты
$code =~ s/(?:^|\n)\s*(<!--\s*(?:BEGIN|END|IF\S*|ELSE|INCLUDE|SET|ENDSET)\s+.*?-->)\s*(?:$|\n)/\x01$1\x01\n/gos;
1 while $code =~ s/(?<!\x01)<!--\s*(?:BEGIN|END|IF\S*|ELSE|INCLUDE|SET|ENDSET)\s+.*?-->/\x01$&/gom;
1 while $code =~ s/<!--\s*(?:BEGIN|END|IF\S*|ELSE|INCLUDE|SET|ENDSET)\s+.*?-->(?!\x01)/$&\x01/gom;
$code =~ s/(?:^|\n)\s*(<!--\s*(?:BEGIN|END|IF\S*|ELSE\S*|INCLUDE|SET|ENDSET)\s+.*?-->)\s*(?:$|\n)/\x01$1\x01\n/gos;
1 while $code =~ s/(?<!\x01)<!--\s*(?:BEGIN|END|IF\S*|ELSE\S*|INCLUDE|SET|ENDSET)\s+.*?-->/\x01$&/gom;
1 while $code =~ s/<!--\s*(?:BEGIN|END|IF\S*|ELSE\S*|INCLUDE|SET|ENDSET)\s+.*?-->(?!\x01)/$&\x01/gom;
# ' и \ -> \' и \\
$code =~ s/\'|\\/\\$&/gos;