checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index ed95fe5..e39fd4b 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -126,15 +126,16 @@ public class MetaGrammar {
             if (t != null &&
                 (t.value().equals(p.tag)))
                 return buildSequence(p)!=null;
-            if (t != null &&
-                (t.value().equals(p.nonTerminal)))
-                return buildSequence(p)!=null;
 
             if (t != null &&
                 ((t.value().equals("") && getName().equals(p.tag))))
                 return buildSequence(p)!=null;
             if (b != null && getName().equals(p.tag))
                 return buildSequence(p)!=null;
+
+            if (t != null &&
+                (t.value().equals(p.nonTerminal)))
+                return buildSequence(p)!=null;
             if (t != null &&
                 ((t.value().equals("") && getName().equals(p.nonTerminal))))
                 return buildSequence(p)!=null;