Fix for #2616:

- Handle DAE.DEFINE in InstUtil.moveBindings.


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

Author: perost

Compiler/FrontEnd/InstUtil.mo

@@ -3460,52 +3460,76 @@ algorithm
 end extractConstrainingComps;
 
 public function moveBindings
-"mahge:
-This function takes two daelists, the first variable declarations
-and the second with equations generated for the variables' bindings by InstBinding.instModEquation.
-Then it moves the equations back as bindings for the variables.
-used for fixing record bindings."
-  input DAE.DAElist inDae1;
-  input DAE.DAElist inDae2;
-  output DAE.DAElist outDae;
-algorithm
-  outDae := match(inDae1,inDae2)
-   local
-     DAE.ComponentRef cref;
-     DAE.VarKind kind;
-     DAE.VarDirection dir;
-     DAE.VarParallelism prl;
-     DAE.VarVisibility vis;
-     DAE.Type ty;
-     Option<DAE.Exp> bind;
-     DAE.InstDims dims;
-     DAE.ConnectorType ct;
-     DAE.ElementSource src;
-     Option<DAE.VariableAttributes> varAttOpt;
-     Option<SCode.Comment> commOpt;
-     Absyn.InnerOuter inOut;
-     list<DAE.Element> restDae1;
-     list<DAE.Element> restDae2;
-     DAE.Exp newBindExp;
-
-    case (_,DAE.DAE({})) then inDae1;
-    case (DAE.DAE({}),_) then inDae2;
-
-    case (DAE.DAE(DAE.EQUATION(scalar = newBindExp)::{}),DAE.DAE(DAE.VAR(cref, kind, dir, prl, vis, ty, bind, dims, ct, src, varAttOpt, commOpt, inOut)::{}))
-      then (DAE.DAE({DAE.VAR(cref, kind, dir, prl, vis, ty, SOME(newBindExp), dims, ct, src, varAttOpt, commOpt, inOut)}));
-
-    case (DAE.DAE(DAE.EQUATION(scalar = newBindExp)::restDae1),DAE.DAE(DAE.VAR(cref, kind, dir, prl, vis, ty, bind, dims, ct, src, varAttOpt, commOpt, inOut)::restDae2))
-      equation
-         DAE.DAE(restDae2) = moveBindings(DAE.DAE(restDae1),DAE.DAE(restDae2));
-      then (DAE.DAE(DAE.VAR(cref, kind, dir, prl, vis, ty, SOME(newBindExp), dims, ct, src, varAttOpt, commOpt, inOut)::restDae2));
-
-    case (DAE.DAE(restDae1),DAE.DAE(restDae2))
-      equation
-        Debug.fprintln(Flags.FAILTRACE, "- Inst.moveBindings failed:" +& DAEDump.dumpElementsStr(restDae1) +& " ### " +& DAEDump.dumpElementsStr(restDae2));
-      then fail();
-   end match;
+  "This function takes two DAElists, the first with equations generated by
+   InstBinding.instModEquation and the second the variables that bindings
+   belonged to. The function moves the equations back as bindings for the
+   variables, used for fixing record bindings."
+  input DAE.DAElist inEquations;
+  input DAE.DAElist inVariables;
+  output DAE.DAElist outVariables;
+protected
+  list<DAE.Element> eqs, vars;
+algorithm
+  DAE.DAE(elementLst = eqs) := inEquations;
+  DAE.DAE(elementLst = vars) := inVariables;
+  Error.assertion(intEq(listLength(eqs), listLength(vars)),
+      "- InstUtil.moveBindings: Mismatched number of equations and variables.", Absyn.dummyInfo);
+  vars := List.threadMap(eqs, vars, moveBindings2);
+  outVariables := DAE.DAE(vars);
 end moveBindings;
 
+protected function moveBindings2
+  input DAE.Element inEquation;
+  input DAE.Element inVariable;
+  output DAE.Element outVariable;
+algorithm
+  outVariable := matchcontinue(inEquation, inVariable)
+    local
+      DAE.ComponentRef cref;
+      DAE.VarKind kind; 
+      DAE.VarDirection dir;
+      DAE.VarParallelism prl;
+      DAE.VarVisibility vis;
+      DAE.Type ty;
+      DAE.InstDims dims;
+      DAE.ConnectorType ct;
+      DAE.ElementSource src;
+      Option<DAE.VariableAttributes> attr;
+      Option<SCode.Comment> cmt;
+      Absyn.InnerOuter io;
+      DAE.Exp bind_exp;
+
+    case (_, DAE.VAR(cref, kind, dir, prl, vis, ty, _, dims, ct, src, attr, cmt, io))
+      equation
+        bind_exp = moveBindings3(inEquation);
+      then
+        DAE.VAR(cref, kind, dir, prl, vis, ty, SOME(bind_exp), dims, ct, src, attr, cmt, io);
+
+    case (_, DAE.VAR(componentRef = cref))
+      equation
+        true = Flags.isSet(Flags.FAILTRACE);
+        Debug.traceln("- InstUtil.moveBindings failed on " +&
+            ComponentReference.printComponentRefStr(cref));
+      then
+        fail();
+        
+  end matchcontinue;
+end moveBindings2;
+
+protected function moveBindings3
+  input DAE.Element inEquation;
+  output DAE.Exp outBinding;
+algorithm
+  outBinding := match(inEquation)
+    local
+      DAE.Exp bind_exp;
+
+    case DAE.EQUATION(scalar = bind_exp) then bind_exp;
+    case DAE.DEFINE(exp = bind_exp) then bind_exp;
+
+  end match;
+end moveBindings3;
+
 public function checkModificationOnOuter
   input Env.Cache inCache;
   input Env.Env inEnv;