Resolved bug: properties now tested in final state

nl-utwente-groove · Dec 3, 2024 · d992b74 · d992b74
1 parent 416b039
commit d992b74
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/nl/utwente/groove/control/template/TemplateBuilder.java b/src/main/java/nl/utwente/groove/control/template/TemplateBuilder.java
@@ -217,10 +217,9 @@ private void buildAttempt(TermKey termKey) {
             // property switches
             Set<NestedSwitch> switches = new LinkedHashSet<>();
             // see if we need a property test
-            // start states of procedures are exempt
-            boolean isProcStart = loc.isStart() && isProcedure();
-            if (hasProperties() && !isProcStart && locType != Type.FINAL
-                && termKey.isFirstSteady()) {
+            // start and final states of procedures are exempt
+            boolean isProcStartOrFinal = (loc.isStart() || locType == Type.FINAL) && isProcedure();
+            if (hasProperties() && !isProcStartOrFinal && termKey.isFirstSteady()) {
                 for (Action prop : getProperties()) {
                     assert prop.isProperty() && prop instanceof Rule;
                     if (((Rule) prop).getPolicy() != CheckPolicy.OFF) {