From 5fbd1d712d38b88153a824160322050da6c5e184 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 21 Dec 2005 20:55:56 -0500 Subject: [PATCH] checkpoint darcs-hash:20051222015556-5007d-74eb7f98e744313f5a88b09b2f809fb237be545e.gz --- src/edu/berkeley/sbp/misc/MetaGrammar.java | 51 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index 7b64f70..2751db7 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -71,32 +71,6 @@ public class MetaGrammar extends ReflectiveWalker { return n; } - public Object _leftbrace_(PreSequence p) { - return nonTerminal("braced"+(anon++), - new PreSequence[][] { - new PreSequence[] { - new PreSequence(new Element[] { leftBrace(), - p.buildUnion(), - rightBrace() - }) - } - }, - false, - false); - } - - public PreSequence ps2(Object[] o1, String s, Object[] o2) { - if (o1==null) o1 = new Object[0]; - if (o2==null) o2 = new Object[0]; - Object[] o3 = new Object[o1.length + o2.length + 1]; - System.arraycopy(o1, 0, o3, 0, o1.length); - o3[o1.length] = string(s); - System.arraycopy(o2, 0, o3, o1.length+1, o2.length); - PreSequence ret = new PreSequence(o3, s); - ret.drops[o1.length] = o3.length>1; - return ret; - } - public String string(Tree tree) { String ret = ""; if (tree.head()!=null) ret += tree.head(); @@ -135,6 +109,31 @@ public class MetaGrammar extends ReflectiveWalker { else if ("=>".equals(head)) { PreSequence p = (PreSequence)walk(tree, 0); p.tag = string(tree.child(1)); return p; } else if ("/".equals(head)) return ((PreSequence)walk(tree, 0)).sparse((Element)walk(tree, 1)); else if ("ps".equals(head)) return new PreSequence((Element[])walk(tree, 0)); + else if ("ps2".equals(head)) { + Object[] o1 = (Object[])walk(tree, 0); + String s = string(tree.child(1)); + Object[] o2 = (Object[])walk(tree, 2); + if (o1==null) o1 = new Object[0]; + if (o2==null) o2 = new Object[0]; + Object[] o3 = new Object[o1.length + o2.length + 1]; + System.arraycopy(o1, 0, o3, 0, o1.length); + o3[o1.length] = string(s); + System.arraycopy(o2, 0, o3, o1.length+1, o2.length); + PreSequence ret = new PreSequence(o3, s); + ret.drops[o1.length] = o3.length>1; + return ret; + } else if ("{".equals(head)) + return nonTerminal("braced"+(anon++), + new PreSequence[][] { + new PreSequence[] { + new PreSequence(new Element[] { leftBrace(), + ((PreSequence)walk(tree, 0)).buildUnion(), + rightBrace() + }) + } + }, + false, + false); else if ("[".equals(head) || "[~".equals(head)) { boolean positive = "[".equals(head); Range[] rr = (Range[])walk(tree, 0); -- 1.7.10.4