Remove bind from outside markings for default constructors. (#705)

*  Remove bind from outside markings for default constructors of non derived records.

  - The default constructor should not use outside bindings. 
    Unless it is for a derived record which has bindings on declaration. Unfortunately 
    the old FrontEnd creates additional record types even when the modification 
     on a record variable declaration are not declarations. 
  - Therefore, we now remove the outside binding markings from the types_vars
    even for the default constructor so that they are not picked
    by the codegen function when generating the body for the default
    constructors.
  - Constructors with outside inputs are generated explicitly
    with a name that contains the index of the variable.

Author: mahge

OMCompiler/Compiler/FrontEnd/DAE.mo

@@ -836,7 +836,8 @@ constant Attributes dummyAttrInput = ATTR(NON_CONNECTOR(), SCode.NON_PARALLEL(),
 public uniontype BindingSource "where this binding came from: either default binding or start value"
   record BINDING_FROM_DEFAULT_VALUE "the binding came from the default value" end BINDING_FROM_DEFAULT_VALUE;
   record BINDING_FROM_START_VALUE "the binding came from the start value" end BINDING_FROM_START_VALUE;
-  record BINDING_FROM_RECORD_SUBMODS "the EQ binding is created from the submods of a record declration" end BINDING_FROM_RECORD_SUBMODS;
+  record BINDING_FROM_RECORD_SUBMODS "the EQ binding is created from the submods of a record VARIABLE declration e.g. 'R r(i=2)' tranformed by instantiation to 'R r = R(i=2)' " end BINDING_FROM_RECORD_SUBMODS;
+  record BINDING_FROM_DERIVED_RECORD_DECL "the binding is created from the submods of a DERIVED record DECLARATION e.g. 'record K = R(i=3)'" end BINDING_FROM_DERIVED_RECORD_DECL;
 end BindingSource;
 
 public

OMCompiler/Compiler/FrontEnd/Inst.mo

@@ -990,6 +990,7 @@ algorithm
         for submod in submods loop
           if varIsModifiedInDerivedMod(var.name, submod) then
             var.bind_from_outside := true;
+            var.binding := markBindingFromDerivedRecordMods(var.binding);
             break;
           end if;
         end for;
@@ -1003,6 +1004,18 @@ algorithm
 
 end markDerivedRecordOutsideBindings;
 
+function markBindingFromDerivedRecordMods
+  input output DAE.Binding bind;
+algorithm
+  _ := match bind
+    case DAE.EQBOUND() algorithm
+      bind.source := DAE.BINDING_FROM_DERIVED_RECORD_DECL();
+    then ();
+
+    else ();
+  end match;
+end markBindingFromDerivedRecordMods;
+
 function varIsModifiedInDerivedMod
   input String inName;
   input SCode.SubMod inSubmod;

OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo

@@ -1616,8 +1616,11 @@ algorithm
 
         if not listMember(name, rt_1) then
           rt_1 := name :: rt_1;
-          vars := List.map(varlst, typesVar);
           (accRecDecls, rt_1) := elaborateNestedRecordDeclarations(varlst, accRecDecls, rt_1);
+
+          varlst := List.map(varlst, simCodeVarRemoveBindFromOutside);
+          vars := List.map(varlst, typesVar);
+          // vars := List.map(vars, simCodeVarRemoveBindFromOutside);
           recDecl := SimCodeFunction.RECORD_DECL_FULL(name, NONE(), path, vars);
           accRecDecls := List.appendElt(recDecl, accRecDecls);
         end if;
@@ -1712,6 +1715,19 @@ algorithm
   end match;
 end typesVar;
 
+protected function simCodeVarRemoveBindFromOutside
+  input output DAE.Var var;
+algorithm
+  _ := match (var)
+    case DAE.TYPES_VAR(binding = DAE.EQBOUND(source=DAE.BINDING_FROM_DERIVED_RECORD_DECL()))
+      then ();
+    case DAE.TYPES_VAR()
+      algorithm
+        var.bind_from_outside := false;
+      then ();
+  end match;
+end simCodeVarRemoveBindFromOutside;
+
 protected function checkSourceAndGetBindingExp
   input DAE.Binding inBinding;
   output Option<DAE.Exp> bindExp;