Changeset 8483 for lang/perl/Text-MicroMason-SafeServerPages

Timestamp:

03/29/08 04:23:29 (5 years ago)

Author:

drry

Message:

lang/perl/Text-MicroMason?-SafeServerPages?/trunk/lib/Text/MicroMason/SafeServerPages.pm:

• SYNOPSIS を少し修正しました。
  
• text トークンの一致を少し減らしました。
  
• ほか、雑多。
  

Files:

• lang/perl/Text-MicroMason-SafeServerPages/trunk/lib/Text/MicroMason/SafeServerPages.pm (modified) (3 diffs)

lang/perl/Text-MicroMason-SafeServerPages/trunk/lib/Text/MicroMason/SafeServerPages.pm

@@ -6 +6 @@
 
 my %block_types = (
-        ''   => 'perl', # <% perl statements %>
-        '='  => 'expr', # <%= perl expression (HTML escaped) %>
+        ''     => 'perl', # <% perl statements %>
+        '='    => 'expr', # <%= perl expression (HTML escaped) %>
         'raw=' => 'expr', # <%= perl expression (raw) %>
-        '--' => 'doc',  # <%-- this text will not appear in the output --%>
-        '&'  => 'file', # <%& filename argument %>
+        '--'   => 'doc',  # <%-- this text will not appear in the output --%>
+        '&'    => 'file', # <%& filename argument %>
 );
 
-my $re_eol = "(?:\\r\\n|\\r|\\n|\\z)";
-my $re_tag = "perl|args|once|init|cleanup|doc|text|expr|file";
+my $re_eol = "(?:\\r?\\n|\\r|\\z)";
+my $re_tag = "args|cleanup|doc|expr|file|init|once|perl|text";
 
 sub lex_token {
-        # Blocks in <%word> ... <%word> tags.
-        /\G \<\%($re_tag)\> (.*?) \<\/\%\1\> $re_eol? /xcogs ? ( $1 => $2 ) :
+        # Blocks in <%word> ... </%word> tags.
+        /\G <% ($re_tag) \s*> (.*?) <\/% \1 \s*> $re_eol? /xcogs ? ( $1 => $2 ) :
 
         # Blocks in <% ... %> tags.
-        /\G \<\% (\=|\&|raw=)? ( .*? ) \%\> /gcxs ? ( $block_types{$1 || ''} => ($1 eq '=') ? "encode_entities(do { $2 })"  : $2 ) :
+        /\G <% ((?:(?:raw)?=|&)?) (.*?) %> /gcxs ? ( $block_types{$1} => ($1 eq '=') ? "encode_entities(do { $2 })" : $2 ) :
 
         # Blocks in <%-- ... --%> tags.
-        /\G \<\% \-\- ( .*? ) \-\- \%\> /gcxs ? ( 'doc' => $1 ) :
+        /\G <% -- (.*?) -- %> /gcxs ? ( 'doc' => $1 ) :
 
-        # Things that don't match the above
-        /\G ( (?: [^\<]+ | \<(?!\%) )? ) /gcxs ? ( 'text' => $1 ) :
+        # Things that don't match the above.
+        /\G ( (?: [^<] | <(?!\/?%) )+ ) /gcxs ? ( 'text' => $1 ) :
 
-        # Lexer error
+        # Lexer error.
         ()
 }
@@ -52 +52 @@
 =head1 SYNOPSIS
 
+  use Text::MicroMason;
   use Text::MicroMason::SafeServerPages;
 
@@ -69 +70 @@
   print $cr->(
     title => "Foo<bar>",
-    body  => "<div class='section'>aaaa</div>",
+    body  => qq{<div class="section">aaaa</div>},
   );