From d1504e1e7993703832063cf6bff6ead434b2fd17 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 15 Jan 2006 03:53:09 -0500 Subject: [PATCH] checkpoint darcs-hash:20060115085309-5007d-fb0f9aafc5700eb46c7defd8e93c4dc228bb63b3.gz --- src/edu/berkeley/sbp/misc/CharToken.java | 7 ---- src/edu/berkeley/sbp/misc/MetaGrammar.java | 2 +- src/edu/berkeley/sbp/misc/RegressionTests.java | 11 +++---- src/edu/berkeley/sbp/tib/Braces.java | 41 ------------------------ src/edu/berkeley/sbp/tib/Tib.java | 31 ++++++++++++++++++ src/edu/berkeley/sbp/tib/TibDoc.java | 4 +-- 6 files changed, 39 insertions(+), 57 deletions(-) delete mode 100644 src/edu/berkeley/sbp/tib/Braces.java diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java index 5d897de..a8ebafc 100644 --- a/src/edu/berkeley/sbp/misc/CharToken.java +++ b/src/edu/berkeley/sbp/misc/CharToken.java @@ -10,13 +10,6 @@ import edu.berkeley.sbp.util.*; /** an implementation of Token for streams of Java char values */ public class CharToken implements IntegerMappable { - public static class CharToStringParser extends Parser { - public CharToStringParser(Union u) { super(u, new IntegerTopology()); } - public Forest shiftToken(CharToken ct, Location loc) { - return Forest.create(loc, ct.result(), null, false, false); - } - } - public static class CharRange extends Atom { private String esc(char c) { return StringUtil.escapify(c+"", "[]-~\\\"\'"); } private Topology t; diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index 810c10c..c8665fa 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -278,7 +278,7 @@ public class MetaGrammar extends StringWalker { } out.append("\n // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n"); - new CharToken.CharToStringParser(MetaGrammar.make()).parse(new CharToken.Stream(new InputStreamReader(new FileInputStream(args[0])))).expand1().toJava(out); + new CharToStringParser(MetaGrammar.make()).parse(new FileInputStream(args[0])).expand1().toJava(out); out.append("\n // DO NOT EDIT STUFF ABOVE: IT IS AUTOMATICALLY GENERATED\n"); for(String s = br.readLine(); s != null; s = br.readLine()) out.append(s+"\n"); diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index 5135c86..f093e43 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -22,16 +22,15 @@ public class RegressionTests { //MetaGrammar mg0 = new MetaGrammar(); //mg0.walk(MetaGrammar.meta); //System.out.println(mg0); - Tree res = new CharToken.CharToStringParser(MetaGrammar.make()).parse(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0])))).expand1(); + Tree res = new CharToStringParser(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 CharToken.CharToStringParser(meta).parse(new CharToken.Stream(new InputStreamReader(sis), "parsing " + s[1] + " using " + s[0])).expand1(); + res = new CharToStringParser(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 CharToken.CharToStringParser(testcasegrammar); + CharToStringParser parser = new CharToStringParser(testcasegrammar); if (profile) { System.out.println("\nready..."); @@ -39,7 +38,7 @@ public class RegressionTests { } System.gc(); long now = System.currentTimeMillis(); - Forest r2 = parser.parse(cs); + Forest r2 = parser.parse(new FileInputStream(s[2])); System.out.println(); System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms"); if (profile) { @@ -81,7 +80,7 @@ public class RegressionTests { Forest res = null; ParseFailed pfe = null; try { - res = new CharToken.CharToStringParser(grammar).parse(inp); + res = new CharToStringParser(grammar).parse(inp); } catch (ParseFailed pf) { pfe = pf; } diff --git a/src/edu/berkeley/sbp/tib/Braces.java b/src/edu/berkeley/sbp/tib/Braces.java deleted file mode 100644 index 74a3dab..0000000 --- a/src/edu/berkeley/sbp/tib/Braces.java +++ /dev/null @@ -1,41 +0,0 @@ -package edu.berkeley.sbp.tib; -import edu.berkeley.sbp.*; -import edu.berkeley.sbp.util.*; -import edu.berkeley.sbp.*; -import edu.berkeley.sbp.*; -import edu.berkeley.sbp.Sequence.Position; -import edu.berkeley.sbp.*; -import java.io.*; -import java.util.*; -import java.lang.reflect.*; -import java.lang.ref.*; - -public class Braces {}/*extends Union { - - private static final Element left = CharToken.string("{"); - private static final Element right = CharToken.string("}"); - - public static String join(Object[] e) { - StringBuffer ret = new StringBuffer(); - for(int i=0; i0) ret.append(" "); - ret.append(e[i]); - } - return ret.toString(); - } - - public Braces(Element[] e, Element sep) { - super("{"+join(e)+"}"); - Element[] e2 = new Element[sep == null ? e.length+2 : e.length + 4]; - e2[0] = left; - e2[e2.length-1] = right; - if (sep != null) { - e2[1] = sep; - e2[e2.length-2] = sep; - } - for(int i=0; i { } } + /* +public class Braces extends Union { + + private static final Element left = CharToken.string("{"); + private static final Element right = CharToken.string("}"); + + public static String join(Object[] e) { + StringBuffer ret = new StringBuffer(); + for(int i=0; i0) ret.append(" "); + ret.append(e[i]); + } + return ret.toString(); + } + + public Braces(Element[] e, Element sep) { + super("{"+join(e)+"}"); + Element[] e2 = new Element[sep == null ? e.length+2 : e.length + 4]; + e2[0] = left; + e2[e2.length-1] = right; + if (sep != null) { + e2[1] = sep; + e2[e2.length-2] = sep; + } + for(int i=0; i res = new CharToken.CharToStringParser(MetaGrammar.make()).parse(new CharToken.Stream(new FileInputStream(s[0]))).expand1(); + Tree res = new CharToStringParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1(); MetaGrammar gram = (MetaGrammar)new Tib.Grammar().walk(res); //System.out.println(gram); Union mg = gram.done(); System.out.println("\nparsing " + s[1]); - Forest f = new CharToken.CharToStringParser(mg).parse(new Tib(new FileInputStream(s[1]))); + Forest f = new CharToStringParser(mg).parse(new Tib(new FileInputStream(s[1]))); System.out.println(); System.out.println(f); -- 1.7.10.4