projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
meta
/
MetaGrammarBindings.java
diff --git
a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index
9dc7ab3
..
d33758c
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@
-15,7
+15,13
@@
public class MetaGrammarBindings {
/** A grammar (a set of nonterminals) */
public static class GrammarNode extends HashMap<String,NonTerminalNode> {
public @bind.as("Grammar") GrammarNode(NonTerminalNode[] nonterminals) {
/** A grammar (a set of nonterminals) */
public static class GrammarNode extends HashMap<String,NonTerminalNode> {
public @bind.as("Grammar") GrammarNode(NonTerminalNode[] nonterminals) {
- for(NonTerminalNode nt : nonterminals) this.put(nt.name, nt); }
+ for(NonTerminalNode nt : nonterminals) {
+ if (nt==null) continue;
+ if (this.get(nt.name)!=null)
+ throw new RuntimeException("duplicate definition of nonterminal \""+nt.name+"\"");
+ this.put(nt.name, nt);
+ }
+ }
public String toString() {
String ret = "[ ";
for(NonTerminalNode nt : values()) ret += nt + ", ";
public String toString() {
String ret = "[ ";
for(NonTerminalNode nt : values()) ret += nt + ", ";
@@
-57,6
+63,11
@@
public class MetaGrammarBindings {
}
}
}
}
+ public static @bind.as("#import") NonTerminalNode poundimport(String fileName) {
+ System.err.println("#import " + fileName);
+ return null;
+ }
+
public static class NonTerminalNode extends UnionNode {
public boolean rep;
public String name = null;
public static class NonTerminalNode extends UnionNode {
public boolean rep;
public String name = null;
@@
-197,11
+208,9
@@
public class MetaGrammarBindings {
public Sequence build0(Context cx, boolean lame, NonTerminalNode cnt) {
boolean dropAll = lame;
if (tag!=null && "()".equals(tag)) dropAll = true;
public Sequence build0(Context cx, boolean lame, NonTerminalNode cnt) {
boolean dropAll = lame;
if (tag!=null && "()".equals(tag)) dropAll = true;
- Object[] labels = new Object[elements.length];
boolean[] drops = new boolean[elements.length];
Element[] els = new Element[elements.length];
for(int i=0; i<elements.length; i++) {
boolean[] drops = new boolean[elements.length];
Element[] els = new Element[elements.length];
for(int i=0; i<elements.length; i++) {
- labels[i] = elements[i].getLabel();
drops[i] = elements[i].drop();
els[i] = elements[i].build(cx, cnt);
if (elements[i].getOwnerTag() != null)
drops[i] = elements[i].drop();
els[i] = elements[i].build(cx, cnt);
if (elements[i].getOwnerTag() != null)
@@
-210,7
+219,7
@@
public class MetaGrammarBindings {
Sequence ret = null;
if (dropAll) ret = Sequence.drop(els, false);
else {
Sequence ret = null;
if (dropAll) ret = Sequence.drop(els, false);
else {
- ret = cx.rm.tryResolveTag(tag, cnt==null?null:cnt.name, els, labels, drops);
+ ret = cx.rm.tryResolveTag(tag, cnt==null?null:cnt.name, els, drops);
if (ret == null) {
int idx = -1;
for(int i=0; i<els.length; i++)
if (ret == null) {
int idx = -1;
for(int i=0; i<els.length; i++)
@@
-329,7
+338,7
@@
public class MetaGrammarBindings {
public static @bind.as("~") ElementNode tilde(final ElementNode e) {
return new PostProcess(e) {
public Element postProcess(Element e) {
public static @bind.as("~") ElementNode tilde(final ElementNode e) {
return new PostProcess(e) {
public Element postProcess(Element e) {
- return infer((Topology<Character>)Atom.toAtom(e).complement());
+ return infer((Topology<Character>)Atom.toAtom(e).complement().minus(CharRange.braces));
} }; }
public static @bind.as("Word") String word(String s) { return s; }
} }; }
public static @bind.as("Word") String word(String s) { return s; }
@@
-363,7
+372,7
@@
public class MetaGrammarBindings {
public Context(Tree t, GrammarBindingResolver rm) {
this.rm = rm;
Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
public Context(Tree t, GrammarBindingResolver rm) {
this.rm = rm;
Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
- this.grammar = (GrammarNode)red.invoke(t.children());
+ this.grammar = (GrammarNode)red.invoke(t);
}
public Union peek(String name) { return map.get(name); }
public void put(String name, Union u) { map.put(name, u); }
}
public Union peek(String name) { return map.get(name); }
public void put(String name, Union u) { map.put(name, u); }