From 52a3b053b79694ac0b714c4853c870cfe33a1ed1 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 13 Jul 2006 23:03:32 -0400 Subject: [PATCH] checkpoint darcs-hash:20060714030332-5007d-898e2be1e52783536fe72c11c66506c5f79b1668.gz --- src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java | 2 +- src/edu/berkeley/sbp/meta/Grammar.java | 2 +- src/edu/berkeley/sbp/meta/MetaGrammar.java | 4 +--- src/edu/berkeley/sbp/meta/MetaGrammarBindings.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java index b7d89a3..adbdff7 100644 --- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java +++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java @@ -42,7 +42,7 @@ public class AnnotationGrammarBindings extends Grammar.Bindings { public Object repeatTag() { return new Tree.ArrayBuildingTreeFunctor(); } - public Sequence tryResolveTag(Production p) { + public Sequence createSequence(Production p) { String key = p.tag==null?p.nonTerminal:p.tag; if (key==null) return null; diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java index 35429d3..d9462e0 100644 --- a/src/edu/berkeley/sbp/meta/Grammar.java +++ b/src/edu/berkeley/sbp/meta/Grammar.java @@ -26,7 +26,7 @@ public class Grammar { public static class Bindings { public Object repeatTag() { return null; } - public Sequence tryResolveTag(Production p) { + public Sequence createSequence(Production p) { if (p.tag==null) return null; return Sequence.rewritingSequence(p.tag, p.elements, p.drops); } diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java index d5e3036..45ab195 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammar.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java @@ -13,9 +13,7 @@ public class MetaGrammar { /** create a grammar corresponding to the SBP metagrammar (meta.g) */ public static Union newInstance() { - return Grammar.create(MetaGrammar.meta, - "s", - new MetaGrammarBindings()); + return Grammar.create(MetaGrammar.meta, "s", new MetaGrammarBindings()); } /** Used to rebuild MetaGrammar.java, and not for much else */ diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java index ca0a2eb..667b6a6 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java @@ -240,7 +240,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings { if (dropAll) ret = Sequence.drop(els, false); else { Production prod = new Production(tag, (cnt==null?null:cnt.name), els, drops); - ret = cx.rm.tryResolveTag(prod); + ret = cx.rm.createSequence(prod); if (ret == null) { int idx = -1; for(int i=0; i