Changeset ab9d3836 in OpenModelica

Timestamp:

2012-11-16T15:55:55+01:00 (11 years ago)

Author:

Jens Frenkel <jens.frenkel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

f52e7dca

Parents:

88557076

Message:

• bugfix for last commit

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@13924 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• Compiler/BackEnd/BackendDAEOptimize.mo (modified) (8 diffs)

Compiler/BackEnd/BackendDAEOptimize.mo

@@ -2493 +2493 @@
         aliasVars = List.fold(varlst,fixAliasConstBindings,aliasVars);
         (knvars1,_) = BackendVariable.traverseBackendDAEVarsWithUpdate(knvars,replaceVarTraverser,repl);
+        (inieqns,_) = BackendEquation.traverseBackendDAEEqnsWithUpdate(inieqns,replaceEquationTraverser,repl);
         (remeqns1,_) = BackendEquation.traverseBackendDAEEqnsWithUpdate(remeqns,replaceEquationTraverser,repl);
         (whenClauseLst1,_) = BackendVarTransform.replaceWhenClauses(whenClauseLst, repl, SOME(BackendVarTransform.skipPreChangeEdgeOperator));
@@ -2631 +2632 @@
     case ((e,repl))
       equation
-        ({e1},_) = BackendVarTransform.replaceEquations({e},repl,NONE());
+        ({e1},_) = BackendVarTransform.replaceEquations({e},repl,SOME(BackendVarTransform.skipPreChangeEdgeOperator));
       then ((e1,repl));
   end match;
 end replaceEquationTraverser;
-
-
-protected function replaceWhenClauseTraverser "function: replaceWhenClauseTraverser
-  author: Frenkel TUD 2010-04
-  It is possible to change the when clause.
-"
-  input tuple<DAE.Exp,BackendVarTransform.VariableReplacements> inTpl;
-  output tuple<DAE.Exp,BackendVarTransform.VariableReplacements> outTpl;
-algorithm
-  outTpl:=
-  match (inTpl)
-    local 
-      DAE.Exp e,e1;
-      BackendVarTransform.VariableReplacements repl;
-    case ((e,repl))
-      equation
-        (e1,_) = BackendVarTransform.replaceExp(e, repl, NONE());
-      then
-        ((e1,repl));
-    case _ then inTpl;
-  end match;
-end replaceWhenClauseTraverser;
 
 protected function replacementsInEqns2
@@ -10187 +10166 @@
       then
         ((e,(knvars,aliasvars,true)));
+    case((DAE.CALL(path=Absyn.IDENT(name = "pre"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),(knvars,aliasvars,_)))
+      then
+        ((e,(knvars,aliasvars,true)));
     case((e as DAE.CALL(path=Absyn.IDENT(name = "pre"),expLst={DAE.CREF(componentRef=cr,ty=tp)},attr=attr),(knvars,aliasvars,_)))
       equation
@@ -10200 +10182 @@
       then 
         ((zero,(knvars,aliasvars,true)));
+    case((DAE.CALL(path=Absyn.IDENT(name = "change"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),(knvars,aliasvars,_)))
+      then
+        ((DAE.BCONST(false),(knvars,aliasvars,true)));
     case((DAE.CALL(path=Absyn.IDENT(name = "change"),expLst={e as DAE.CREF(componentRef=cr,ty=tp)},attr=attr),(knvars,aliasvars,_)))
       equation
@@ -10213 +10198 @@
       then
         ((zero,(knvars,aliasvars,true)));
+    case((DAE.CALL(path=Absyn.IDENT(name = "edge"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),(knvars,aliasvars,_)))
+      then
+        ((DAE.BCONST(false),(knvars,aliasvars,true)));
     case((DAE.CALL(path=Absyn.IDENT(name = "edge"),expLst={e as DAE.CREF(componentRef=cr,ty=tp)},attr=attr),(knvars,aliasvars,_)))
       equation
@@ -10239 +10227 @@
       then
         e;
+    case (DAE.CALL(path=Absyn.IDENT(name = "pre"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),_)
+      then
+        e;
     case(DAE.CALL(path=Absyn.IDENT(name = "change"),expLst={DAE.CREF(componentRef=cr,ty=tp)}),_)
       equation
@@ -10245 +10236 @@
       then 
         e;
+    case (DAE.CALL(path=Absyn.IDENT(name = "change"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),_)
+      then
+        DAE.BCONST(false);
     case(DAE.CALL(path=Absyn.IDENT(name = "edge"),expLst={DAE.CREF(componentRef=cr,ty=tp)}),_)
       equation
@@ -10251 +10245 @@
       then 
         e;
+    case (DAE.CALL(path=Absyn.IDENT(name = "edge"),expLst={e as DAE.CREF(componentRef=DAE.CREF_IDENT(ident="time"))}),_)
+      then
+        DAE.BCONST(false);
     else
       then