- Changed simplify1 to a fixpoint algorithm

- No testcase changed result, but more cases in the backend are now covered git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8657 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 15, 2011 · 4cc96f2 · 4cc96f2
1 parent 769d813
commit 4cc96f2
Show file tree

Hide file tree

Showing 4 changed files with 234 additions and 209 deletions.
diff --git a/Compiler/FrontEnd/ExpressionDump.mo b/Compiler/FrontEnd/ExpressionDump.mo
@@ -274,12 +274,16 @@ algorithm
     case (DAE.POW(ty = t)) then " ^ ";
     case (DAE.ADD_ARR(ty = _)) then " + ";
     case (DAE.SUB_ARR(ty = _)) then " - ";
-    case (DAE.MUL_ARR(ty = _)) then " * ";
+    case (DAE.MUL_ARR(ty = _)) then " *<MUL_ARRAY> ";
     case (DAE.DIV_ARR(ty = _)) then " / ";
     case (DAE.POW_ARR(ty = _)) then " ^ ";
     case (DAE.POW_ARR2(ty = _)) then " ^ ";
-    case (DAE.MUL_SCALAR_ARRAY(ty = _)) then " * ";
-    case (DAE.MUL_ARRAY_SCALAR(ty = _)) then " * ";
+    case (DAE.MUL_SCALAR_ARRAY(ty = t))
+      equation
+        ts = typeString(t);
+        s = stringAppendList({" *<", ts, "> "});
+      then s;
+    case (DAE.MUL_ARRAY_SCALAR(ty = _)) then " *<MUL_ARRAY_SCALAR> ";
     case (DAE.ADD_SCALAR_ARRAY(ty = _)) then " + ";
     case (DAE.ADD_ARRAY_SCALAR(ty = _)) then " + ";
     case (DAE.SUB_SCALAR_ARRAY(ty = _)) then " - ";