X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FMetaGrammar.java;h=e39fd4bac79af0a63e3e1759426fb38bd639d243;hp=ed95fe5307641df91d678d3d8e2dd2b48bcf8aa4;hb=8129e3bcdf7df528a636daf66e0b35b1dceb153f;hpb=e9e8509741c9f1406defa18655315ad205faba1f

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index ed95fe5..e39fd4b 100644
--- 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;