Changeset 3840 for trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm

Timestamp:

May 4, 2005, 11:48:53 AM (21 years ago)

Author:

jhoblitt

Message:

change typedef to match 'word(s)' as element values

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2005  Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.14 2005-05-04 21:46:13 jhoblitt Exp $
+# $Id: Config.pm,v 1.15 2005-05-04 21:48:53 jhoblitt Exp $
 
 package PS::IPP::Metadata::Config;
@@ -256 +256 @@
 
 typedef:
-    <skip:'[ \t\r]*'> name typedef_type <commit> name(s) comment(?) "\n"
+    <skip:'[ \t\r]*'> name typedef_type <commit> word(s) comment(?) "\n"
         {
             my $type = $thisparser->{local}{typedef}{ $item{typedef_type} };
 
-            unless ( scalar @{ $item{'name(s)'} } == $type->{length} ) {
+            unless ( scalar @{ $item{'word(s)'} } == $type->{length} ) {
+                my $expect = $type->{length};
+                my $got = scalar @{ $item{'word(s)'} };
                 carp "\"$item{name} $item{typedef_type}\""
-                    . " does not have enough fields";
+                    . " does not have enough fields, epected: $expect, got: $got";
                 $return = undef;
             } else {
@@ -272 +274 @@
                         class   => 'scalar',
                         type    => 'STR',
-                        value   => $item{'name(s)'}[$i],
+                        value   => $item{'word(s)'}[$i],
                     };
 
@@ -397 +399 @@
     /(?:\S[^#\n]*)?[^#\n ]/
 
+word:
+    /(?:[^#\s\n]+)/
+
 to_end_of_line:
     /[^\n]*/