checkpoint

darcs-hash:20060708041518-5007d-5d68fa83e3848fb2ca90207db08211375b703215.gz

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index 2d06422..2372273 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -197,10 +197,9 @@ public class MetaGrammarBindings {
             Sequence ret = null;
             if (dropAll)     ret = Sequence.drop(els, false);
             else if (unwrap) ret = Sequence.unwrap(els, cx.rm.repeatTag(), drops);
             Sequence ret = null;
             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);
+            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);

                 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++)