Changeset d84fc85e in OpenModelica for OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo

Timestamp:

2020-02-04T17:09:45+01:00 (4 years ago)

Author:

GitHub <noreply@…>

Branches:

Added-citation-metadata, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

8862d56, 92420d0

Parents:

6c78ddb

git-author:

Mahder Gebremedhin <mahge@…> (02/04/20 17:09:45)

git-committer:

GitHub <noreply@…> (02/04/20 17:09:45)

Message:

Improve record constructor creation. (#717)

• Make sure we do not remove bindings from derived record

declarations. This happens only for the old FrontEnd right now.

• Improve processing a bit. Instead of checking twice in the list of already visited records, create the unique name for the constructor and then check only once.

File:

• OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo (modified) (3 diffs)

OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo

@@ -1609 +1609 @@
       Integer varnum;
       SimCodeFunction.RecordDeclaration recDecl;
+      Boolean is_default;
 
     case (DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(path), varLst = varlst), accRecDecls, rt)
@@ -1615 +1616 @@
         rt_1 := rt;
 
-        if not listMember(name, rt_1) then
-          rt_1 := name :: rt_1;
-          (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);
+        (sname, is_default) := checkBindingsandGetConstructorName(name, varlst);
+        // is_default := stringEqual(sname,name);
+
+        if not listMember(sname, rt_1) then
+          rt_1 := sname :: rt_1;
+
+          if is_default then
+            (accRecDecls, rt_1) := elaborateNestedRecordDeclarations(varlst, accRecDecls, rt_1);
+
+            vars := List.map(varlst, typesVar);
+            recDecl := SimCodeFunction.RECORD_DECL_FULL(sname, NONE(), path, vars);
+          else
+            vars := List.map(varlst, typesVar);
+            recDecl := SimCodeFunction.RECORD_DECL_ADD_CONSTRCTOR(sname, name, vars);
+          end if;
+
           accRecDecls := List.appendElt(recDecl, accRecDecls);
         end if;
 
-        sname := name;
-        varnum := 1;
-        for var in varlst loop
-          if var.bind_from_outside then
-            sname := sname + "_" + intString(varnum);
-          end if;
-          varnum := intAdd(varnum,1);
-        end for;
-
-        if not listMember(sname, rt_1) then
-          rt_1 := sname :: rt_1;
-          vars := List.map(varlst, typesVar);
-          recDecl := SimCodeFunction.RECORD_DECL_ADD_CONSTRCTOR(sname, name, vars);
-          accRecDecls := List.appendElt(recDecl, accRecDecls);
-        end if;
       then (accRecDecls, rt_1);
 
@@ -1716 +1710 @@
 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 checkBindingsandGetConstructorName
+  input String rec_name;
+  input list<DAE.Var> vars;
+  output String ctor_name;
+  output Boolean is_default;
+protected
+  Integer varnum;
+algorithm
+  is_default := true;
+
+  ctor_name := rec_name;
+  varnum := 1;
+
+  for var in vars loop
+    if var.bind_from_outside and not isBindingFromDerivedRecordDeclaration(var.binding) then
+      is_default := false;
+      ctor_name := ctor_name + "_" + intString(varnum);
+    end if;
+
+    varnum := intAdd(varnum,1);
+  end for;
+end checkBindingsandGetConstructorName;
+
+protected function isBindingFromDerivedRecordDeclaration
+  input DAE.Binding bind;
+  output Boolean b;
+algorithm
+  b := match bind
+    case DAE.EQBOUND(source=DAE.BINDING_FROM_DERIVED_RECORD_DECL())  then true;
+    else false;
+  end match;
+end isBindingFromDerivedRecordDeclaration;
 
 protected function checkSourceAndGetBindingExp