- fixed more models concerning partial function evaluation

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

Author: Volker Waurich

Compiler/BackEnd/BackendDAEUtil.mo

@@ -2561,10 +2561,10 @@ algorithm outExp := matchcontinue(inExp)
             //print("subscript for cref "+&stringDelimitList(List.map(sublstcref,ExpressionDump.printSubscriptStr)," / ")+&"\n");
         subslst = dimensionsToRange(ad);
         subslst1 = rangesToSubscripts(subslst);
-            //print("subscript for arraytype "+&intString(listLength(subslst1))+&stringDelimitList(List.map(List.flatten(subslst1),ExpressionDump.printSubscriptStr)," ; ")+&"\n");
+            //print("subscript for arraytype "+&intString(listLength(subslst1))+&" :"+&stringDelimitList(List.map(List.flatten(subslst1),ExpressionDump.printSubscriptStr)," ; ")+&"\n");
         subslst = insertSubScripts(sublstcref,subslst1,{});
         subslst1 = subslst;
-            //print("subscript for new cref "+&intString(listLength(subslst1))+&stringDelimitList(List.map(List.flatten(subslst1),ExpressionDump.printSubscriptStr)," / ")+&"\n");
+            //print("subscript for new cref "+&intString(listLength(subslst1))+&" :"+&stringDelimitList(List.map(List.flatten(subslst1),ExpressionDump.printSubscriptStr)," / ")+&"\n");
         cr = ComponentReference.crefStripLastSubs(cr);
         crlst = List.map1r(subslst1,ComponentReference.subscriptCref,cr);
             //print(stringDelimitList(List.map(crlst,ComponentReference.debugPrintComponentRefTypeStr)," ; ")+&"\n");

Compiler/BackEnd/EvaluateFunctions.mo

@@ -412,7 +412,7 @@ algorithm
         outputExp = setRecordTypes(outputExp,FUNCINFO(repl,funcs,idx));
         //print("RHS EXP:\n");
         //ExpressionDump.dumpExp(exp);
-          Debug.bcall1(Flags.isSet(Flags.EVAL_FUNC_DUMP),print,"Finish evaluation in:\n"+&ExpressionDump.printExpStr(outputExp)+&" := "+&ExpressionDump.printExpStr(exp));
+          Debug.bcall1(Flags.isSet(Flags.EVAL_FUNC_DUMP),print,"Finish evaluation in:\n"+&ExpressionDump.printExpStr(outputExp)+&" := "+&ExpressionDump.printExpStr(exp)+&"\n");
           Debug.bcall2(Flags.isSet(Flags.EVAL_FUNC_DUMP) and List.isNotEmpty(constEqs),BackendDump.dumpEquationList,constEqs,"including the additional equations:\n");
       then
         ((exp,outputExp,constEqs,funcs,idx));
@@ -1466,7 +1466,7 @@ algorithm
         lhsExps = List.fold1(stmts1,getStatementLHSScalar,funcTree,{});
         lhsExps = List.unique(lhsExps);
         lhsExpLst = List.map(lhsExps,Expression.getComplexContents); //consider arrays
-        lhsExps = List.flatten(lhsExpLst);
+        lhsExps = listAppend(List.flatten(lhsExpLst),lhsExps);
         outputs = List.map(lhsExps,Expression.expCref);
         repl = Debug.bcallret3(true, BackendVarTransform.removeReplacements,replIn,outputs,NONE(),replIn);
 

Compiler/FrontEnd/Expression.mo

@@ -1576,6 +1576,7 @@ algorithm
       DAE.ComponentRef cref;
       DAE.Exp exp;
       list<DAE.Exp> expLst;
+      list<list<DAE.Exp>> expLstLst;
       list<DAE.ComponentRef> crefs;
     case(DAE.CREF(componentRef=cref,ty=_))
       equation
@@ -1587,14 +1588,17 @@ algorithm
       then
         expLst;
     case(DAE.CALL(path=_,expLst=expLst,attr=_))
-      then
+      equation
+         expLstLst = List.map(expLst,getComplexContentsInCall);
+         expLst = List.flatten(expLstLst);
+       then
         expLst;
     case(DAE.RECORD(path=_,exps=expLst, comp=_,ty=_))
       then
         expLst;
     case(DAE.ARRAY(ty=_,scalar=_,array=_))
       equation
-      expLst = arrayElements(e);
+        expLst = arrayElements(e);
       then
         expLst;
     case(DAE.TUPLE(PR=expLst))
@@ -1617,6 +1621,27 @@ algorithm
   end match;
 end getComplexContents;
 
+protected function getComplexContentsInCall"gets the scalars for the complex expressions inside a function call"
+  input DAE.Exp expIn;
+  output list<DAE.Exp> expsOut;
+algorithm
+  expsOut := matchcontinue(expIn)
+    local
+      list<DAE.Exp> expLst;
+    case(_)
+      equation
+         expLst = getComplexContents(expIn);
+         true = List.isEmpty(expLst);
+       then {expIn};
+    case(_)
+      equation
+         expLst = getComplexContents(expIn);
+         false = List.isEmpty(expLst);
+       then expLst;
+    else
+      then {};
+  end matchcontinue;
+end getComplexContentsInCall;
 
 public function getArrayOrRangeContents "returns the list of expressions in the array"
   input DAE.Exp e;

Compiler/FrontEnd/Types.mo

@@ -2107,7 +2107,7 @@ algorithm
         res = Absyn.pathString(ClassInf.getStateName(ci_state));
         st_str = ClassInf.printStateStr(ci_state);
         bc_tp_str = unparseType(bc_tp);
-        res = stringAppendList({"(",res," ",st_str," bc:",bc_tp_str,")"});
+        res = stringAppendList({"subType(",res," ",st_str," bc:",bc_tp_str,")"});
       then
         res;
 
@@ -2133,7 +2133,7 @@ algorithm
       equation
         tystrs = List.map(tys, unparseType);
         tystr = stringDelimitList(tystrs, ", ");
-        res = stringAppendList({"(",tystr,")"});
+        res = stringAppendList({"TUPLE(",tystr,")"});
       then
         res;