[Cpan-forum-commit] rev 48 - trunk

[svn at pti.co.il]

Author: gabor
Date: 2005-01-26 00:33:46 +0200 (Wed, 26 Jan 2005)
New Revision: 48

Modified:
   trunk/parse.pl
Log:
some code cleanup

Modified: trunk/parse.pl
===================================================================
--- trunk/parse.pl	2005-01-25 22:23:38 UTC (rev 47)
+++ trunk/parse.pl	2005-01-25 22:33:46 UTC (rev 48)
@@ -11,8 +11,9 @@
 
 my $grammar = q {
 	entry      : chunk(s) eodata                  { $item[1] }
-	chunk      : marked_html | code               { $item[1] }
-	marked_html: html(s)                          { '<div class="text">' . join("", @{$item[1]}) . '</div>'; }
+	chunk      : marked_html | marked_code        { $item[1] }
+
+	marked_html: html(s)                          { qq(<div class="text">) . join("", @{$item[1]}) . qq(</div>); }
 	html       : text                             { $item[1] } 
 	           | open_b text close_b              { join "", @item[1..$#item] }
 	           | open_i text close_i              { join "", @item[1..$#item] }
@@ -21,10 +22,12 @@
 	open_i     : m{<i>}
 	close_i    : m{</i>}
 	text       : m{[\t\n -;=?-~]+}                {$item[1] }
-	code       : code_open code_text code_close   {$item[2] }
-	code_open  : m{<code>}
-	code_text  : m{[\t\n -~]+?(?=</code>)}        { qq(<div class="code">) . CGI::escapeHTML($item[1]) . qq(</div>); }
-	code_close : m{</code>}
+
+	marked_code: open_code code close_code        { join("", @item[1..$#item]) }
+	open_code  : m{<code>}                        { qq(<div class="code">) }
+	close_code : m{</code>}                       { qq(</div>) }
+	code       : m{[\t\n -~]+?(?=</code>)}        { CGI::escapeHTML($item[1]) }
+
 	eodata     : m{^\Z}
 };
 
@@ -64,6 +67,8 @@
 	'Hello<code>'              => undef,
 	'<code extra><STD></code>' => undef,
 	'a<b>c</i>'                => undef,
+	'a<b>c'                    => undef,
+	'a<i>c'                    => undef,
 );
 use Data::Dumper;