Correctly calculate contains-the-follow-of

metaborg · Nov 4, 2019 · ddc6784 · ddc6784
1 parent 095c3f1
commit ddc6784
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/org.metaborg.sdf2table/src/main/java/org/metaborg/sdf2table/parsetable/ParseTable.java b/org.metaborg.sdf2table/src/main/java/org/metaborg/sdf2table/parsetable/ParseTable.java
@@ -235,7 +235,7 @@ private void calculateFollow() {
         for(ISymbol s : symbols) {
             for(IProduction p : symbolProductionsMapping.get(s)) {
                 List<ISymbol> rightHand = p.rightHand();
-                for(int i = 0, rightHandSize = rightHand.size(); i < rightHandSize; i++) {
+                i: for(int i = 0, rightHandSize = rightHand.size(); i < rightHandSize; i++) {
                     ISymbol symbolI = rightHand.get(i);
 
                     // If p is of the shape A = A0 ... Ai Ak ... Am Aj ... An
@@ -244,8 +244,9 @@ private void calculateFollow() {
                         ISymbol symbolJ = rightHand.get(j);
                         containsTheFirstOf.put(symbolI, symbolJ);
 
+                        // If Ak ... An are NOT all nullable, continue with next Ai
                         if(!symbolJ.isNullable())
-                            break;
+                            continue i;
                     }
 
                     // If Ak ... An are all nullable, FOLLOW(Ai) contains FOLLOW(A)