Changeset 3485

Timestamp:

Mar 23, 2005, 11:30:37 AM (21 years ago)

Author:

jhoblitt

Message:

merge blank_line & comment_line into just comment_line

File:

• trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm (modified) (6 diffs)

trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2005  Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.10 2005-03-23 19:25:53 jhoblitt Exp $
+# $Id: Config.pm,v 1.11 2005-03-23 21:30:37 jhoblitt Exp $
 
 package PS::IPP::Metadata::Config;
@@ -69 +69 @@
         {
             $thisparser->{local} = pop @scope_stack;
-            [ grep $_->{class} !~ /(comment_line|blank_line)/, @{$item[1]} ];
+            [ grep $_->{class} !~ /comment_line/, @{$item[1]} ];
         }
 
@@ -78 +78 @@
     | comment_line
     | metadata
-    | blank_line
     | time
     | typedef_declare
@@ -116 +115 @@
     <skip:'[ \t\r]*'> name /MULTI/i comment(?) "\n"
         {{
-            class   => 'blank_line',
-        }}
-
-comment_line:
-    <skip:'[ \t\r]*'> comment "\n" 
-        {{
             class   => 'comment_line',
-            comment => $item{comment},
         }}
 
@@ -146 +138 @@
     | <error?:bad METADATA syntax: $text> <reject>
 
-blank_line:
-    <skip:'[ \t\r]*'> "\n"
-        {{
-            class   => 'blank_line',
-        }}
+comment_line:
+    <skip:'[ \t\r]*'> comment(?) "\n"
+        {{ class   => 'comment_line' }}
 
 time:
@@ -186 +176 @@
 
                 # don't return anything in the parse tree
-                $return = { class => 'blank_line' };
+                $return = { class => 'comment_line' };
             }
         }