Changeset 27051 for lang/perl/Text-MicroTemplate

Timestamp:

12/19/08 11:04:19 (4 years ago)

Author:

tokuhirom

Message:

raw expression was outdated. we have automatic escape & encoded_string() today.

Location:

lang/perl/Text-MicroTemplate/trunk

Files:

• lib/Text/MicroTemplate.pm (modified) (8 diffs)
• t/03-modes.t (modified) (2 diffs)
• t/04-multiline.t (modified) (3 diffs)

lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm

@@ -25 +25 @@
         comment_mark        => '#',
         expression_mark     => '=',
-        raw_expression_mark => '=r',
         line_start          => '?',
         template            => undef,
@@ -122 +121 @@
                 $lines[-1] .= "\$_MT_T = scalar $value; \$_MT .= ref \$_MT_T eq 'Text::MicroTemplate::EncodedString' ? \$\$_MT_T : $escape_func(\$_MT_T);";
             }
-
-            # Raw Expression
-            if ($type eq 'raw_expr') {
-                
-                $lines[-1] .= "\$_MT_T = $value; \$_MT .= ref \$_MT_T eq q(Text::MicroTemplate::EncodedString) ? \$\$_MT_T : \$_MT_T;";
-            }
         }
     }
@@ -160 +153 @@
     my $cmnt_mark     = quotemeta $self->{comment_mark};
     my $expr_mark     = quotemeta $self->{expression_mark};
-    my $raw_expr_mark = quotemeta $self->{raw_expression_mark};
 
     # Tokenize
@@ -191 +183 @@
         }
 
-        # Perl line with raw return value
-        if ($line =~ /^$line_start$raw_expr_mark\s+(.+)$/) {
-            push @{$self->{tree}}, [
-                'raw_expr', $1,
-                $newline ? ('text', "\n") : (),
-            ];
-            $multiline_expression = 0;
-            next;
-        }
-
         # Comment line, dummy token needed for line count
         if ($line =~ /^$line_start$cmnt_mark\s+$/) {
@@ -231 +213 @@
         for my $token (split /
             (
-                $tag_start$raw_expr_mark # Raw Expression
-            |
                 $tag_start$expr_mark     # Expression
             |
@@ -258 +238 @@
             elsif ($token =~ /^$tag_start$cmnt_mark$/) { $state = 'cmnt' }
 
-            # Raw Expression
-            elsif ($token =~ /^$tag_start$raw_expr_mark$/) {
-                $state = 'raw_expr';
-            }
-
             # Expression
             elsif ($token =~ /^$tag_start$expr_mark$/) {
@@ -278 +253 @@
                 $state = 'code' if $multiline_expression;
                 $multiline_expression = 1
-                    if $state eq 'expr' || $state eq 'raw_expr';
+                    if $state eq 'expr';
 
                 # Store value
@@ -487 +462 @@
     ?= $expr                 (per-line)
 
-    # output the result expression without escape (tag style)
-    <?=r $raw_str ?>
-    ?=r $raw_str
-
     # execute perl code (tag style)
     <? foo() ?>

lang/perl/Text-MicroTemplate/trunk/t/03-modes.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 8;
+use Test::More tests => 6;
 use Text::MicroTemplate qw(:all);
 
@@ -16 +16 @@
 do {
     is render_mt('<?= $_[0] ?>', 'foo<a')->as_string, 'foo&lt;a';
-    is render_mt('<?=r $_[0] ?>', 'foo<a')->as_string, 'foo<a';
     my $rs = encoded_string('foo<a');
     is render_mt('<?= $_[0] ?>', $rs)->as_string, 'foo<a';
-    is render_mt('<?=r $_[0] ?>', $rs)->as_string, 'foo<a';
 };
 do {

lang/perl/Text-MicroTemplate/trunk/t/04-multiline.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 7;
+use Test::More tests => 4;
 use Text::MicroTemplate qw(:all);
 
@@ -14 +14 @@
 };
 
-# raw expr (expected behaviour from code)
-do {
-    my $y;
-    is render_mt(<<'...', sub { $y = 1 })->as_string, "abc 1 def\n", 'multiline rawexpr';
-abc <?=r 1
- $_[0]->() ?> def
-...
-    ok $y;
-};
-
 # automatic semicolon insertion
 is render_mt(<<'...')->as_string, "abc\n1\n-1\ndef\n", 'expr auto-sci';
@@ -29 +19 @@
 ?= 1
 ?= -1
-def
-...
-is render_mt(<<'...')->as_string, "abc\n1\n-1\ndef\n", 'expr auto-sci';
-abc
-?=r 1
-?=r -1
 def
 ...