move TestCase junk out of GrammarAST

darcs-hash:20070527230041-5007d-5458419acf8be09d8ad12958921f0a690eef9a03.gz

diff --git a/src/edu/berkeley/sbp/meta/GrammarAST.java b/src/edu/berkeley/sbp/meta/GrammarAST.java
index 0ea8ae3..b52335e 100644 (file)
--- a/src/edu/berkeley/sbp/meta/GrammarAST.java
+++ b/src/edu/berkeley/sbp/meta/GrammarAST.java
@@ -42,19 +42,18 @@ public class GrammarAST {
     // Methods //////////////////////////////////////////////////////////////////////////////
 
     private Union buildGrammar(Tree t, String rootNonTerminal) {
-        return ((GrammarAST.GrammarNode)walk(t)).build(rootNonTerminal);
+        Object o = walk(t);
+        if (o instanceof Union) return (Union)o;
+        return ((GrammarAST.GrammarNode)o).build(rootNonTerminal);
     }
 
-    public Object[] walkChildren(Tree t) {
+    private Object[] walkChildren(Tree t) {
         Object[] ret = new Object[t.size()];
-        for(int i=0; i<ret.length; i++) {
+        for(int i=0; i<ret.length; i++)
             ret[i] = walk(t.child(i));
-            if (ret[i] instanceof Object[])
-                ret[i] = Reflection.lub((Object[])ret[i]);
-        }
         return Reflection.lub(ret);
     }
-    private String stringifyChildren(Tree t) {
+    private static String stringifyChildren(Tree t) {
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<t.size(); i++) {
             sb.append(t.child(i).head());
@@ -62,7 +61,7 @@ public class GrammarAST {
         }
         return sb.toString();
     }
-    private String unescape(Tree t) {
+    private static String unescape(Tree t) {
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<t.size(); i++)
             sb.append(t.child(i).head()+stringifyChildren(t.child(i)));
@@ -119,16 +118,15 @@ public class GrammarAST {
         if (head.equals("<<"))  return new DropNode(new AtomNode(new char[] { CharAtom.right, CharAtom.right }));
         if (head.equals("~"))   return new TildeNode(walkElement(t.child(0)));
         if (head.equals("~~"))  return new Seq(new RepeatNode(new TildeNode(new AtomNode()), null, true,  true,  false)).andnot(walkSeq(t.child(0)));
-        if (head.equals("Range") && t.size()==2 && ">".equals(t.child(0).head()))
-            return new char[] { CharAtom.left, CharAtom.left };
-        if (head.equals("Range") && t.size()==2 && "<".equals(t.child(0).head()))
-            return new char[] { CharAtom.right, CharAtom.right };
-        if (head.equals("Range") && t.size()==1) return new char[] { unescape(t).charAt(0), unescape(t).charAt(0) };
-        if (head.equals("Range")) return new char[] { unescape(t).charAt(0), unescape(t).charAt(1) };
+        if (head.equals("Range")) {
+            if (t.size()==2 && ">".equals(t.child(0).head())) return new char[] { CharAtom.left, CharAtom.left };
+            if (t.size()==2 && "<".equals(t.child(0).head())) return new char[] { CharAtom.right, CharAtom.right };
+            if (t.size()==1) return new char[] { unescape(t).charAt(0), unescape(t).charAt(0) };
+            return new char[] { unescape(t).charAt(0), unescape(t).charAt(1) };
+        }
         if (head.equals("\"\"")) return "";
-        if (head.equals("\n")) return "\n";
-        if (head.equals("\r")) return "\r";
-        if (head.equals("grammar.Grammar")) return walkChildren(t);
+        if (head.equals("\n"))   return "\n";
+        if (head.equals("\r"))   return "\r";
         if (head.equals("SubGrammar")) return GrammarAST.buildFromAST(t.child(0), "s", includes);
         if (head.equals("NonTerminal"))
             return new NonTerminalNode(walkString(t.child(0)),
@@ -141,13 +139,6 @@ public class GrammarAST {
                     seq[i] = seq[i].tag(tag);
             return new NonTerminalNode(tag, seqs, false, null, false);
         }
-        if (head.equals("TestCase"))
-            return new RegressionTests.TestCase(walkString(t.child(0)),
-                                                walkString(t.child(1)),
-                                                (String[])Reflection.coerce(walkChildren(t.child(2)), String[].class),
-                                                (Union)walk(t.child(3)),
-                                                false,
-                                                false);
         if (head.equals("#import")) {
             String fileName = (String)stringifyChildren(t.child(0));
             for(File f : includes) {

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index 07de45b..bfa5fba 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -163,6 +163,18 @@ public class MetaGrammar {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
         // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED
 new edu.berkeley.sbp.Tree(null, "Grammar", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "NonTerminal", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "Word", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "s", new edu.berkeley.sbp.Tree[] { })}),
         new edu.berkeley.sbp.Tree(null, "RHS", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "|", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "Elements", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "NonTerminalReference", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "Word", new edu.berkeley.sbp.Tree[] { new edu.berkeley.sbp.Tree(null, "w", new edu.berkeley.sbp.Tree[] { }),
@@ -940,3 +952,15 @@ new edu.berkeley.sbp.Tree(null, "Grammar", new edu.berkeley.sbp.Tree[] { new edu
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index aa12c2a..0848ce8 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -66,7 +66,24 @@ public class RegressionTests {
             }
             System.err.println("expanding...");
 
-            TestCase[] expanded = (TestCase[])new GrammarAST(includes, "").walkChildren(r2.expand1());
+            ArrayList<TestCase> cases = new ArrayList<TestCase>();
+            Tree tt = r2.expand1();
+            for(int i=0; i<tt.size(); i++) {
+                Tree t = tt.child(i);
+                String[] expect = new String[t.child(2).size()];
+                for(int j=0; j<t.child(2).size(); j++)
+                    expect[j] = stringifyChildren(t.child(2).child(j));
+                cases.add(new TestCase(stringifyChildren(t.child(0)),
+                                       stringifyChildren(t.child(1)),
+                                       expect,
+                                       GrammarAST.buildFromAST(t.child(3), "s", includes),
+                                       false,
+                                       false));
+                
+            }
+            TestCase[] expanded = new TestCase[cases.size()];
+            for(int i=0; i<expanded.length; i++)
+                expanded[i] = cases.get(i);
             for(TestCase tc : expanded)
                 tc.execute();
 
@@ -79,8 +96,16 @@ public class RegressionTests {
         }
     }
 
+    private static String stringifyChildren(Tree t) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<t.size(); i++) {
+            sb.append(t.child(i).head());
+            sb.append(stringifyChildren(t.child(i)));
+        }
+        return sb.toString();
+    }
+
     public static class TestCase {
-        private final boolean tib;
         private final boolean jav;
         public /*final*/ String input;        
         public final String[] output;
@@ -89,7 +114,6 @@ public class RegressionTests {
 
         public TestCase(String name, String input, String[] output,
                         Union grammar, boolean tib, boolean jav) {
-            this.tib = tib;
             this.name = name;
             this.jav = jav;
             this.input = input;
@@ -107,15 +131,9 @@ public class RegressionTests {
             ParseFailed pfe = null;
             CharParser parser = new CharParser(grammar);
             System.out.print("     "+name+"\r");
-            //parser.helpgc = false;
             try {
-                res = tib 
-                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
-                : parser.parse(new StringReader(input));
-            } catch (ParseFailed pf) {
-                pfe = pf;
-            }
-            //ystem.out.println("res=="+res);
+                res = parser.parse(new StringReader(input));
+            } catch (ParseFailed pf) { pfe = pf; }
 
             if (graph) {
                 FileOutputStream fos = new FileOutputStream("out.dot");