From b6efd9328a1e888aec61e41f70ee1f53a6c85324 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 9 Oct 2010 13:17:30 +0200 Subject: Bug 602832: 008filter.t doesn't catch [%~ ~%] correctly r/a=mkanat --- t/008filter.t | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 't/008filter.t') diff --git a/t/008filter.t b/t/008filter.t index 0c38380df..c0ee3b131 100644 --- a/t/008filter.t +++ b/t/008filter.t @@ -110,7 +110,7 @@ foreach my $path (@Support::Templates::include_paths) { # /g means we execute this loop for every match # /s means we ignore linefeeds in the regexp matches - while ($slurp =~ /\[%(.*?)%\]/gs) { + while ($slurp =~ /\[%(?:-|\+|~)?(.*?)(?:-|\+|~)?%\]/gs) { my $directive = $1; my @lineno = ($` =~ m/\n/gs); @@ -155,11 +155,11 @@ sub directive_ok { my ($file, $directive) = @_; # Comments - return 1 if $directive =~ /^[+-]?#/; + return 1 if $directive =~ /^#/; - # Remove any leading/trailing + or - and whitespace. - $directive =~ s/^[+-]?\s*//; - $directive =~ s/\s*[+-]?$//; + # Remove any leading/trailing whitespace. + $directive =~ s/^\s*//; + $directive =~ s/\s*$//; # Empty directives are ok; they are usually line break helpers return 1 if $directive eq ''; -- cgit v1.2.3-24-g4f1b