checkpoint

darcs-hash:20060708041537-5007d-df476b289b835b98e48527587b764f0f08fcc2a6.gz

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index 2372273..ca24fd0 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -198,8 +198,7 @@ public class MetaGrammarBindings {
             if (dropAll)     ret = Sequence.drop(els, false);
             else if (unwrap) ret = Sequence.unwrap(els, cx.rm.repeatTag(), drops);
             else {
             if (dropAll)     ret = Sequence.drop(els, false);
             else if (unwrap) ret = Sequence.unwrap(els, cx.rm.repeatTag(), drops);
             else {

-                if (tag != null) ret = cx.rm.resolveTag(tag, cx.cnt, els, labels, drops);
-                else ret = cx.rm.tryResolveTag(tag, cx.cnt, els, labels, drops);
+                ret = cx.rm.tryResolveTag(tag, cx.cnt, els, labels, 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++)