checkpoint

darcs-hash:20051222012019-5007d-7e4d2018e9acfa528d84a12de7ed99dcebb0c56d.gz

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index ca889b7..1cf8d8c 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -124,7 +124,7 @@ public class MetaGrammar extends ReflectiveWalker {
         if (tree.numChildren()==0) return super.walk(tree);
         if      ("\\n".equals(head)) return new Character('\n');
         else if ("\\r".equals(head)) return new Character('\r');
-        //else if ("grammar".equals(head)) { for(Tree<String> t : tree.children()) walk(t); return this; }
+        else if ("grammar".equals(head)) { for(Tree<String> t : tree.children()) walk(t); return this; }
         else return super.walk(tree);
     }
 

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 75f2368..7acb66a 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -134,16 +134,18 @@ public class RegressionTests {
         public TestCase  tibcase(String input,                  Union grammar) throws IOException {
             return new TestCase(input, new String[0], grammar, true); }
         public MetaGrammar grammar(Object[] o) { return this; }
-        /*
+        
         public Object walk(Tree<String> tree) {
-            if ("grammar".equals(tree.head())) return done("s");
+            if ("grammar".equals(tree.head())) { for(Tree<String> t : tree.children()) walk(t); return done("s"); }
+            //if ("grammar".equals(tree.head())) return done("s");
             else return super.walk(tree);
         }
-        */
+        /*        
         public Object walk(String head, Object[] args) {
             if ("grammar".equals(head)) return done("s");
             else return super.walk(head, args);
         }
+        */
     }
 
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }