Commit b6efd932 authored by Frédéric Buclin's avatar Frédéric Buclin

Bug 602832: 008filter.t doesn't catch [%~ ~%] correctly

r/a=mkanat
parent f1973062
...@@ -110,7 +110,7 @@ foreach my $path (@Support::Templates::include_paths) { ...@@ -110,7 +110,7 @@ foreach my $path (@Support::Templates::include_paths) {
# /g means we execute this loop for every match # /g means we execute this loop for every match
# /s means we ignore linefeeds in the regexp matches # /s means we ignore linefeeds in the regexp matches
while ($slurp =~ /\[%(.*?)%\]/gs) { while ($slurp =~ /\[%(?:-|\+|~)?(.*?)(?:-|\+|~)?%\]/gs) {
my $directive = $1; my $directive = $1;
my @lineno = ($` =~ m/\n/gs); my @lineno = ($` =~ m/\n/gs);
...@@ -155,11 +155,11 @@ sub directive_ok { ...@@ -155,11 +155,11 @@ sub directive_ok {
my ($file, $directive) = @_; my ($file, $directive) = @_;
# Comments # Comments
return 1 if $directive =~ /^[+-]?#/; return 1 if $directive =~ /^#/;
# Remove any leading/trailing + or - and whitespace. # Remove any leading/trailing whitespace.
$directive =~ s/^[+-]?\s*//; $directive =~ s/^\s*//;
$directive =~ s/\s*[+-]?$//; $directive =~ s/\s*$//;
# Empty directives are ok; they are usually line break helpers # Empty directives are ok; they are usually line break helpers
return 1 if $directive eq ''; return 1 if $directive eq '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment