Split constraints from the CONSTRAINTS section and predicates from the REQUIRES section

smeyer198 · smeyer198 · commit 2ebc859960ef · 2025-01-08T13:47:13.000+01:00
diff --git a/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java b/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java
@@ -235,9 +235,8 @@ private CrySLRule createRuleFromDomainModel(Domainmodel model) throws CrySLParse
         final Order order = orderBlock == null ? null : orderBlock.getOrder();
         this.smg = StateMachineGraphBuilder.buildSMG(order, events);
 
-        final Collection<ISLConstraint> constraints = new ArrayList<>();
-        constraints.addAll(getConstraints(model.getConstraints()));
-        constraints.addAll(getRequiredPredicates(model.getRequires()));
+        Collection<ISLConstraint> constraints = getConstraints(model.getConstraints());
+        Collection<ISLConstraint> requiredPredicates = getRequiredPredicates(model.getRequires());
 
         // Since 3.0.0: All sections are optional
         final Collection<CrySLMethod> eventMethods = new HashSet<>();
@@ -261,6 +260,7 @@ private CrySLRule createRuleFromDomainModel(Domainmodel model) throws CrySLParse
                 eventMethods,
                 this.smg,
                 constraints,
+                requiredPredicates,
                 predicates,
                 negatedPredicates);
     }
diff --git a/CrySLParser/src/main/java/crysl/rule/CrySLRule.java b/CrySLParser/src/main/java/crysl/rule/CrySLRule.java
@@ -1,7 +1,6 @@
 package crysl.rule;
 
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.Map;
 
 public class CrySLRule {
@@ -18,6 +17,8 @@ public class CrySLRule {
 
     private final Collection<ISLConstraint> constraints;
 
+    private final Collection<ISLConstraint> requiredPredicates;
+
     private final Collection<CrySLPredicate> predicates;
 
     private final Collection<CrySLPredicate> negatedPredicates;
@@ -29,6 +30,7 @@ public CrySLRule(
             Collection<CrySLMethod> events,
             StateMachineGraph usagePattern,
             Collection<ISLConstraint> constraints,
+            Collection<ISLConstraint> requiredPredicates,
             Collection<CrySLPredicate> predicates,
             Collection<CrySLPredicate> negatedPredicates) {
         this.className = className;
@@ -37,6 +39,7 @@ public CrySLRule(
         this.events = events;
         this.usagePattern = usagePattern;
         this.constraints = constraints;
+        this.requiredPredicates = requiredPredicates;
         this.predicates = predicates;
         this.negatedPredicates = negatedPredicates;
     }
@@ -113,14 +116,8 @@ public Collection<CrySLPredicate> getNegatedPredicates() {
     /**
      * @return the constraints
      */
-    public Collection<CrySLPredicate> getRequiredPredicates() {
-        Collection<CrySLPredicate> requires = new LinkedList<>();
-        for (ISLConstraint con : constraints) {
-            if (con instanceof CrySLPredicate) {
-                requires.add((CrySLPredicate) con);
-            }
-        }
-        return requires;
+    public Collection<ISLConstraint> getRequiredPredicates() {
+        return requiredPredicates;
     }
 
     @Override
