X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=cf0b4e303222c22d5fab094cdc4e912182b5acdd;hb=017b5ed533ca298fe5ae1078e2a59da1d2d95ea2;hp=a88c8a4c0113beba388d7117032e88b8e171eb8a;hpb=296d90edb29f5e6e639e055388edb514836c8d62;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index a88c8a4..cf0b4e3 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -4,6 +4,7 @@ import java.util.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
 import edu.berkeley.sbp.tib.*;
+import edu.berkeley.sbp.chr.*;
 
 public class RegressionTests {
 
@@ -22,22 +23,25 @@ public class RegressionTests {
             //MetaGrammar mg0 = new MetaGrammar();
             //mg0.walk(MetaGrammar.meta);
             //System.out.println(mg0);
-            Tree<String> res = new Parser(MetaGrammar.make(), CharToken.top()).parse1(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0]))));
+            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
             MetaGrammar mg = (MetaGrammar)new MetaGrammar().walk(res);
             //System.out.println(mg);
             Union meta = mg.done();
             SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
-            res = new Parser(meta, CharToken.top()).parse1(new CharToken.Stream(new InputStreamReader(sis), "parsing " + s[1] + " using " + s[0]));
+            res = new CharParser(meta).parse(sis).expand1();
             Union testcasegrammar = ((MetaGrammar)new MetaGrammar("ts").walk(res)).done("ts");
             if (testcasegrammar==null) return;
-            CharToken.Stream cs = new CharToken.Stream(new InputStreamReader(new FileInputStream(s[2])), "parsing " + s[2] + " using " + s[1]);
-            Parser parser = new Parser(testcasegrammar, CharToken.top());
+            CharParser parser = new CharParser(testcasegrammar);
 
             if (profile) {
                 System.out.println("\nready...");
                 System.in.read();
             }
-            Forest<String> r2 = parser.parse(cs);
+            System.gc();
+            long now = System.currentTimeMillis();
+            Forest<String> r2 = parser.parse(new FileInputStream(s[2]));
+            System.out.println();
+            System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms");
             if (profile) {
                 System.out.println("\ndone");
                 System.in.read();
@@ -55,14 +59,12 @@ public class RegressionTests {
     }
 
     public static class TestCase {
-        private final Token.Stream inp;
-        public final String input;
+        private final boolean tib;
+        public final String input;        
         public final String[] output;
         public final Union grammar;
         public TestCase(String input, String[] output, Union grammar, boolean tib) throws IOException {
-            this.inp = tib
-                ? new Tib(input)
-                : new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"");
+            this.tib = tib;
             this.input = input;
             this.output = output;
             this.grammar = grammar;
@@ -74,15 +76,25 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            Forest<String> res = new Parser(grammar, CharToken.top()).parse(inp);
+            Forest<String> res = null;
+            ParseFailed pfe = null;
+            try {
+                res = tib 
+                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
+                : new CharParser(grammar).parse(new StringReader(input));
+            } catch (ParseFailed pf) {
+                pfe = pf;
+            }
+            //ystem.out.println("res=="+res);
             Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
             System.out.print("\r");
             if (results.size() == 0 && output.length > 0) {
                 System.out.print("\033[31m");
                 System.out.println("PARSE FAILED");
                 System.out.print("\033[0m");
+                if (pfe != null) pfe.printStackTrace();
             } else {
-                System.out.println("\r                                                                                                              \r");
+                System.out.print("\r                                                                                                              \r");
             }
             HashSet<String> outs = new HashSet<String>();
             if (output != null) for(String s : output) outs.add(s.trim());
@@ -90,20 +102,22 @@ public class RegressionTests {
             for (Tree<String> r : results) {
                 String s = r.toString().trim();
                 if (outs.contains(s)) { outs.remove(s); continue; }
+                if (!bad) System.out.println(input);
                 System.out.print("\033[33m");
                 System.out.println("     GOT: " + s);
                 bad = true;
             }
             for(String s : outs) {
+                if (!bad) System.out.println(input);
                 System.out.print("\033[31m");
                 System.out.println("EXPECTED: " + s);
                 bad = true;
             }
             if (bad) {
-                System.out.print("\033[0m");
+                System.out.println("\033[0m");
                 return true;
             }             
-            System.out.println("\033[32mPASS\033[0m");
+            System.out.println("\r\033[32mPASS\033[0m                                                                              ");
             return false;
         }
     }