Add replace rules for clock expressions

ticket 3549
OpenModelica · Nov 9, 2015 · ea54626 · ea54626
1 parent d465e48
commit ea54626
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/Compiler/BackEnd/BackendVarTransform.mo b/Compiler/BackEnd/BackendVarTransform.mo
@@ -1065,6 +1065,9 @@ algorithm
       DAE.CallAttributes attr;
       DAE.Ident ident;
       HashTable2.HashTable derConst;
+      String solverMethod;
+      Integer resolution;
+      Real startInterval;
 
       // Note: Most of these functions check if a subexpression did a replacement.
       // If it did not, we do not create a new copy of the expression (to save some memory).
@@ -1157,6 +1160,30 @@ algorithm
         (expl_1,true) = replaceExpList(expl, repl, cond, {}, false);
       then
         (DAE.CALL(path,expl_1,attr),true);
+    // INTEGER_CLOCK
+    case (DAE.CLKCONST(DAE.INTEGER_CLOCK(intervalCounter=e, resolution=resolution)), repl, cond)
+      equation
+        e = replaceExp(e, repl, cond);
+      then
+        (DAE.CLKCONST(DAE.INTEGER_CLOCK(e, resolution)), true);
+    // REAL_CLOCK
+    case (DAE.CLKCONST(DAE.REAL_CLOCK(interval=e)), repl, cond)
+      equation
+        e = replaceExp(e, repl, cond);
+      then
+        (DAE.CLKCONST(DAE.REAL_CLOCK(e)), true);
+    // BOOLEAN_CLOCK
+    case (DAE.CLKCONST(DAE.BOOLEAN_CLOCK(condition=e, startInterval=startInterval)), repl, cond)
+      equation
+        e = replaceExp(e, repl, cond);
+      then
+        (DAE.CLKCONST(DAE.BOOLEAN_CLOCK(e, startInterval)), true);
+    // SOLVER_CLOCK
+    case (DAE.CLKCONST(DAE.SOLVER_CLOCK(c=e, solverMethod=solverMethod)), repl, cond)
+      equation
+        e = replaceExp(e, repl, cond);
+      then
+        (DAE.CLKCONST(DAE.SOLVER_CLOCK(e, solverMethod)), true);
     case ((e as DAE.PARTEVALFUNCTION(path,expl,tp,t)),repl,cond)
       equation
         true = replaceExpCond(cond, e);