checkpoint

darcs-hash:20051213063949-5007d-4bda027f539891d14cce598609079568664c9079.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 1b4f1d9..4d8bfc5 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -76,7 +76,9 @@ public class MetaGrammar extends ReflectiveWalker {
         if (o.length <= 1) return o;
         Object[] ret = new Object[o.length * 2 - 1];
         for(int i=0; i<o.length; i++) {
-            ret[i*2]   = o[i];
+            Object oi = o[i];
+            //if (oi instanceof Rep) oi = ((Rep)oi).build(new MyDrop(sep));
+            ret[i*2]   = oi;
             if (i*2+1<ret.length) ret[i*2+1] = new MyDrop(sep);
         }
         return ret;

diff --git a/tests/testcase.g b/tests/testcase.g
index 7245db8..8eb36f0 100644 (file)
--- a/tests/testcase.g
+++ b/tests/testcase.g
@@ -1,7 +1,7 @@
 ts       ::= ws Ts ws => ts
-Ts       ::= Test*
+Ts       ::= test*
 ws      !::= w*
-Test     ::= ^"testcase" "{" Input output+ Grammar "}"
-           | ^"testcase" "{" Input         Grammar "}"
-output   ::= "output" quoted ";" / w*
-Input    ::= "input"  quoted ";"
+test     ::= ^"testcase" "{" input output+/ws   Grammar "}" /ws
+           | ^"testcase" "{" input              Grammar "}" /ws
+output   ::= "output" quoted ";" / ws
+input    ::= "input"  quoted ";" / ws