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
..
401536f
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/
src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@
-197,11
+197,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
+208,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++)