Changeset 14032

Timestamp:

Jul 5, 2007, 4:27:32 PM (19 years ago)

Author:

jhoblitt

Message:

fix 'string' parsing

Location:

trunk/PS-IPP-Metadata-Config

Files:

• config_grammar.txt (modified) (2 diffs)
• t/08_strings.t (modified) (3 diffs)

trunk/PS-IPP-Metadata-Config/config_grammar.txt

@@ -1 +1 @@
 # Copyright (c) 2005  Joshua Hoblitt
 #
-# $Id: config_grammar.txt,v 1.12 2006-11-25 02:29:05 jhoblitt Exp $
+# $Id: config_grammar.txt,v 1.13 2007-07-06 02:27:32 jhoblitt Exp $
 
 {
@@ -302 +302 @@
 
 string:
-    /(?:\S[^#\n]*)?[^#\n ]/
+    /[^#\n\s]+[^#\n]*/
         # trim tailing the trailing white that's left when the string is
         # followed by a comment (#)

trunk/PS-IPP-Metadata-Config/t/08_strings.t

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 08_strings.t,v 1.2 2006-11-04 01:25:32 jhoblitt Exp $
+# $Id: 08_strings.t,v 1.3 2007-07-06 02:27:32 jhoblitt Exp $
 
 use strict;
@@ -12 +12 @@
 #$::RD_TRACE = 1;
 
-use Test::More tests => 4;
+use Test::More tests => 6;
 use PS::IPP::Metadata::Config;
 
@@ -74 +74 @@
     is_deeply( $config, $tree, "NULL str structure" );
 }
+
+{
+my $example =<<END;
+mystr   STR     # some comment
+END
+
+    my $config = $config_parser->parse( $example );
+    ok(!defined( $config ), "STR without value");
+
+    is_deeply( $config, undef, "NULL str structure" );
+}