Attempt to fix generation of CALL expressions on lhs of assignments and solved equations. (#592)

- Do not expand records when differentiating functions.
  - Try simplifying a RSUB expression before differentiating.
  - Print error when finding a CALL expression on the lhs.

Author: mahge

OMCompiler/Compiler/BackEnd/Differentiate.mo

@@ -704,21 +704,29 @@ algorithm
     // differentiate rsub
     case e1 as DAE.RSUB()
       algorithm
-        (res1, functionTree) := differentiateExp(e1.exp, inDiffwrtCref, inInputData, inDiffType, inFunctionTree, maxIter-1);
-        if not referenceEq(e1.exp, res1) then
-          try
-            (expl, strLst) := match res1
-              case DAE.RECORD(exps=expl,comp=strLst) then (expl, strLst);
-              case DAE.CALL(path=p1,expLst=expl,attr=DAE.CALL_ATTR(ty=DAE.T_COMPLEX(complexClassType=ClassInf.RECORD(path=p2), varLst=varLst)))
-              guard AbsynUtil.pathEqual(p1,p2)
-              then (expl, list(v.name for v in varLst));
-            end match;
-            res := listGet(expl, List.position1OnTrue(strLst, stringEq, e1.fieldName));
-          else
-            e1.exp := res1;
-            (res,_) := ExpressionSimplify.simplify1(e1);
-          end try;
-        end if;
+        // Try simplifying first.
+        (res, b) := ExpressionSimplify.simplify(e1);
+        if b then
+          (res, functionTree) := differentiateExp(res, inDiffwrtCref, inInputData, inDiffType, inFunctionTree, maxIter-1);
+        else
+	        (res1, functionTree) := differentiateExp(e1.exp, inDiffwrtCref, inInputData, inDiffType, inFunctionTree, maxIter-1);
+	        // This might not be needed anymore. If it is simplifiable
+	        // Then it would have been simplified above.
+	        if not referenceEq(e1.exp, res1) then
+	          try
+	            (expl, strLst) := match res1
+	              case DAE.RECORD(exps=expl,comp=strLst) then (expl, strLst);
+	              case DAE.CALL(path=p1,expLst=expl,attr=DAE.CALL_ATTR(ty=DAE.T_COMPLEX(complexClassType=ClassInf.RECORD(path=p2), varLst=varLst)))
+	              guard AbsynUtil.pathEqual(p1,p2)
+	              then (expl, list(v.name for v in varLst));
+	            end match;
+	            res := listGet(expl, List.position1OnTrue(strLst, stringEq, e1.fieldName));
+	          else
+	            e1.exp := res1;
+	            (res,_) := ExpressionSimplify.simplify1(e1);
+	          end try;
+	        end if;
+	      end if;
       then (res, functionTree);
 
     // differentiate tuple
@@ -1073,6 +1081,16 @@ algorithm
     // This part contains general rules for differentation crefs
     //
 
+    // case for records without expanding the record
+    case ((DAE.CREF(componentRef = cr,ty = tp as DAE.T_COMPLEX(varLst=varLst,complexClassType=ClassInf.RECORD(path)))), _, BackendDAE.DIFFINPUTDATA(matrixName=SOME(matrixName)), BackendDAE.DIFFERENTIATION_FUNCTION(), _)
+      equation
+        cr = ComponentReference.prependStringCref(BackendDAE.functionDerivativeNamePrefix, cr);
+        cr = ComponentReference.prependStringCref(matrixName, cr);
+
+        res = Expression.makeCrefExp(cr, tp);
+      then
+        (res, inFunctionTree);
+
     // case for Records
     case ((DAE.CREF(componentRef = cr,ty = tp as DAE.T_COMPLEX(varLst=varLst,complexClassType=ClassInf.RECORD(path)))), _, _, _, _)
       equation

OMCompiler/Compiler/Template/CodegenCFunctions.tpl

@@ -2847,14 +2847,22 @@ template algStmtAssignRecord(DAE.Statement stmt, Context context, Text &preExp,
     // The right hand side might be a call so we create a tmp var here and assign it. If the rhs is not
     // a call this is an uncessary copy. however, we can live with it since it is not a deep copy and the
     // c compiler should just be able to optimzie it away.
-    let tmp_rec = tempDecl(rec_typename,&varDecls)
-    let rhs = daeExp(rhs_exp, context, &preExp, &varDecls, &auxFunction)
-    let vars = args |> arg => ( ", &(" + daeExp(arg, context, &preExp, &varDecls, &auxFunction) + ")" )
-    <<
-    <%tmp_rec%> = <%rhs%>;
-    <%rec_typename%>_copy_to_vars(<%tmp_rec%><%vars%>);
-    >>
-    // <%error(sourceInfo(), 'Left hand side of an assignment is a call expression. <%ExpressionDumpTpl.dumpExp(exp1,"\"")%> = <%ExpressionDumpTpl.dumpExp(exp,"\"")%>')%>
+    // let tmp_rec = tempDecl(rec_typename,&varDecls)
+    // let rhs = daeExp(rhs_exp, context, &preExp, &varDecls, &auxFunction)
+    // let vars = args |> arg => ( ", &(" + daeExp(arg, context, &preExp, &varDecls, &auxFunction) + ")" )
+    // <<
+    // <%tmp_rec%> = <%rhs%>;
+    // <%rec_typename%>_copy_to_vars(<%tmp_rec%><%vars%>);
+    // >>
+    // let rhs_exp_str = daeExp(rhs_exp, context, &preExp, &varDecls, &auxFunction)
+    // let tmp_rec = tempDecl(rec_typename, &varDecls)
+    // let assigns = splitRhsForRecordAssignmentToMemberAssignments(args, ty, tmp_rec)
+    //   |> stmt => algStatement(stmt, context, &varDecls, &auxFunction)
+    // <<
+    // <%tmp_rec%> = <%rhs_exp_str%>;
+    // <%assigns%>
+    // >>
+    error(sourceInfo(), 'Left hand side of an assignment is a call expression. <%ExpressionDumpTpl.dumpExp(exp1,"\"")%> = <%ExpressionDumpTpl.dumpExp(exp,"\"")%>')
   case STMT_ASSIGN(exp1=RECORD(), type_ = ty as T_COMPLEX(complexClassType=RECORD(__))) then
     error(sourceInfo(), 'Left hand side of an assignment is a record expression. <%ExpressionDumpTpl.dumpExp(exp1,"\"")%>')
   case STMT_ASSIGN() then
@@ -2878,18 +2886,17 @@ template assignRhsExpToRecordCrefSimContext(ComponentRef lhs_cref, Exp rhs_exp,
 ::=
 let lhs = contextCref(lhs_cref, context, &auxFunction)
 let rec_typename = expTypeShort(rec_type)
-let &rhs_exp_str = buffer ""
 
 match rhs_exp
   case CREF(componentRef = cr) then
-    let &rhs_exp_str += contextCref(cr, context, auxFunction)
+    let rhs_exp_str = contextCref(cr, context, auxFunction)
     let assigns = splitRecordAssignmentToMemberAssignments(lhs_cref, rec_type, rhs_exp_str)
       |> stmt => algStatement(stmt, context, &varDecls, &auxFunction)
     <<
     <%assigns%>
     >>
   else
-    let &rhs_exp_str += daeExp(rhs_exp, context, &preExp, &varDecls, &auxFunction)
+    let rhs_exp_str = daeExp(rhs_exp, context, &preExp, &varDecls, &auxFunction)
     let tmp_rec = tempDecl(rec_typename, &varDecls)
     let assigns = splitRecordAssignmentToMemberAssignments(lhs_cref, rec_type, tmp_rec)
       |> stmt => algStatement(stmt, context, &varDecls, &auxFunction)