[NB] update event detection (#12427)

- fix detecting pre variables as conditions after swapping execution order of Events and DetectStates modules
OpenModelica · May 15, 2024 · 6ba1f8e · 6ba1f8e
1 parent 0afe158
commit 6ba1f8e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/NBackEnd/Modules/2_Pre/NBEvents.mo b/OMCompiler/Compiler/NBackEnd/Modules/2_Pre/NBEvents.mo
@@ -1029,6 +1029,13 @@ protected
         Pointer.update(bucket_ptr, bucket);
       then exp;
 
+      // replace $PRE variables with auxiliaries
+      // necessary if the $PRE variable is a when condition (cannot check the pre of a pre variable)
+      case Expression.CREF() guard(BVariable.isPrevious(BVariable.getVarPointer(exp.cref))) algorithm
+        (exp, bucket) := CompositeEvent.add(Condition.CONDITION(exp, iter), Pointer.access(bucket_ptr), true);
+        Pointer.update(bucket_ptr, bucket);
+      then exp;
+
       // ToDo: math events (check the call name in a function and merge with sample case?)
 
       else exp;