Index: /trunk/PS-IPP-Metadata-Config/Changes
===================================================================
--- /trunk/PS-IPP-Metadata-Config/Changes	(revision 10189)
+++ /trunk/PS-IPP-Metadata-Config/Changes	(revision 10190)
@@ -9,4 +9,5 @@
     - merge empty metdata case into main metadata production
     - error check vector
+    - change type & vtype into regex alternations instead of rule alternations
 
 0.09 Thu Oct 26 16:16:28 HST 2006
Index: /trunk/PS-IPP-Metadata-Config/config_grammar.txt
===================================================================
--- /trunk/PS-IPP-Metadata-Config/config_grammar.txt	(revision 10189)
+++ /trunk/PS-IPP-Metadata-Config/config_grammar.txt	(revision 10190)
@@ -1,5 +1,5 @@
 # Copyright (c) 2005  Joshua Hoblitt
 #
-# $Id: config_grammar.txt,v 1.11 2006-11-25 01:53:26 jhoblitt Exp $
+# $Id: config_grammar.txt,v 1.12 2006-11-25 02:29:05 jhoblitt Exp $
 
 {
@@ -24,10 +24,10 @@
 statement:
     scalar
-    | vector
     | comment_line
+    | metadata
     | typedef
-    | metadata
     | typedef_declare
     | multi_declare
+    | vector
     | <error:unmatched statement: $text>
 
@@ -223,26 +223,26 @@
 # optimization.
 type: 
-    'STR'
-    | 'STRING'
-    | vtype
-    | 'UTC'
-    | 'UT1'
-    | 'TAI'
-    | 'TT'
+    vtype
+    | /(STR
+    | STRING
+    | UTC
+    | UT1
+    | TAI
+    | TT)/x
 
 vtype: 
-    'S8'
-    | 'S16'
-    | 'S32'
-    | 'S64'
-    | 'U8' 
-    | 'U16'
-    | 'U32'
-    | 'U64'
-    | 'F32'
-    | 'F64'
-    | 'C32'
-    | 'C64'
-    | 'BOOL'
+    /(S8
+    | S16
+    | S32
+    | S64
+    | U8 
+    | U16
+    | U32
+    | U64
+    | F32
+    | F64
+    | C32
+    | C64
+    | BOOL)/x
 
 S8: int