- Changed ExpressionSimplify to use traverseExp instead of its custom…

… traversal git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8515 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 6, 2011 · abaa599 · abaa599
1 parent a8f22b2
commit abaa599
Show file tree

Hide file tree

Showing 3 changed files with 177 additions and 317 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -2108,7 +2108,7 @@ protected function derivativeEquation
   output DAE.Exp de "der(cr)";
   output Boolean negate;
 algorithm
-  (cr,dcr,e,de,b) := match (eqn)
+  (cr,dcr,e,de,negate) := match (eqn)
       local
         DAE.Exp e,ne,ne1;
       // a = der(b);
@@ -2168,7 +2168,7 @@ protected function aliasEquation
   output DAE.Exp e2;
   output Boolean negate;
 algorithm
-  (cr1,cr2,e1,e2,b) := match (eqn)
+  (cr1,cr2,e1,e2,negate) := match (eqn)
       local
         DAE.Exp e,ne,ne1;
       // a = b;

diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -3489,6 +3489,8 @@ algorithm
       then res;
 
     case (e as DAE.CODE(code = _),rel,ext_arg) then ((e,ext_arg));
+
+    case (DAE.END(),_,ext_arg) then ((DAE.END(),ext_arg));
 
     case (e,rel,ext_arg)
       equation
@@ -3872,6 +3874,7 @@ algorithm
         ((DAE.BOX(e1_1),ext_arg_1));
 
     // ---------------------
+    case (DAE.END(),_,ext_arg) then ((DAE.END(),ext_arg));
 
     case (e,rel,ext_arg)
       equation