Index: /trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm
===================================================================
--- /trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm	(revision 3452)
+++ /trunk/PS-IPP-Metadata-Config/lib/PS/IPP/Metadata/Config.pm	(revision 3453)
@@ -1,5 +1,5 @@
 # Copyright (c) 2005  Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.4 2005-03-15 04:44:01 jhoblitt Exp $
+# $Id: Config.pm,v 1.5 2005-03-18 22:12:45 jhoblitt Exp $
 
 package PS::IPP::Metadata::Config;
@@ -192,5 +192,5 @@
 grammar:
     statement(s)
-        { $item[1 .. -1] }
+        { $item[1] }
 
 statement:
@@ -255,5 +255,5 @@
 
 metadata:
-    metadata_name <commit> grammar metadata_end
+    metadata_name grammar metadata_end
         {{
             class   => 'metadata',
@@ -313,6 +313,5 @@
             if ( ! defined $thisparser->{local}{typedef}{ $item{name} } ) {
                 croak "missing TYPE defintion for $item{name}";
-            }
-
+            } 
             $return = $item{name};
         }
@@ -329,9 +328,17 @@
         { $item{to_end_of_line} }
 
+vname:
+    '@' name
+        { $item{name} }
+
 name:
     /[a-z][.\w-]*/i
-
-vname:
-    /\@[a-z][.\w]*/i
+        {
+            if ( $item[1] =~ /(METADATA|END|TYPE)/i ) {
+                $return = undef;
+            } else {
+                $return = $item[1];
+            }
+        }
 
 type: