adding test for chained labels

Author: maxkurze1

prism/src/simulator/LabelEvaluator.java

@@ -52,8 +52,8 @@ private int[] fixEvaluationOrder(LabelList labels) throws PrismLangException
         int numLabels = labels.size();
         BitSet done = new BitSet(numLabels);
         int[] order = new int[numLabels];
-        for (int l = done.nextClearBit(0); l < numLabels; l = done.nextClearBit(l)) {
-            traverseDfs(deps, l, order, -1, done);
+        for (int l = done.nextClearBit(0), last = -1; l < numLabels; l = done.nextClearBit(l)) {
+            last = traverseDfs(deps, l, order, last, done);
         }
         return order;
     }

prism/unit-tests/parser/ast/LabelTest.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import parser.State;
+import parser.type.TypeBool;
 import parser.type.TypeInt;
 import prism.PrismLangException;
 import simulator.LabelEvaluator;
@@ -12,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class LabelTest
 {
@@ -79,6 +81,18 @@ public void testGetLabelValues() throws PrismLangException
                 assertEquals(l2, actualValues.test("l2"));
             }
         }
+
+        @Test
+        public void testLabelChainEvaluation() throws PrismLangException
+        {
+            LabelList ll = createLabelListWithDependencyChain();
+            LabelEvaluator labelEvaluator = new LabelEvaluator(ll);
+
+            State state = new State(0);
+            assertTrue(labelEvaluator.getLabelValue(state, "l1"));
+            assertTrue(labelEvaluator.getLabelValue(state, "l2"));
+            assertTrue(labelEvaluator.getLabelValue(state, "l3"));
+        }
     }
 
     private LabelList createLabelListWithoutCycle()
@@ -119,4 +133,21 @@ private LabelList createLabelListWith2LabelCycle()
                 new ExpressionVar("d", TypeInt.getInstance()), new ExpressionLiteral(TypeInt.getInstance(), 5))));
         return ll;
     }
+
+    private LabelList createLabelListWithDependencyChain()
+    {
+        LabelList ll = new LabelList();
+        /*
+        label "l1" = "l2"
+        label "l2" = "l3"
+        label "l3" = true
+
+        "l3" must be evaluated as dependency for "l1"
+         */
+        ll.addLabel(new ExpressionIdent("l1"), new ExpressionLabel("l2"));
+        ll.addLabel(new ExpressionIdent("l2"), new ExpressionLabel("l3"));
+        ll.addLabel(new ExpressionIdent("l3"), new ExpressionLiteral(TypeBool.getInstance(), true));
+
+        return ll;
+    }
 }