Changeset d628e4c in OpenModelica

Timestamp:

2017-03-20T18:15:12+01:00 (7 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, 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:

f159b761

Parents:

59a2173e

git-author:

Willi Braun <wbraun@…> (03/20/17 18:15:12)

git-committer:

hudson <openmodelica@…> (03/20/17 18:15:12)

Message:

fix codegeneration for records

File:

• Compiler/SimCode/SimCodeUtil.mo (modified) (3 diffs)

Compiler/SimCode/SimCodeUtil.mo

@@ -5768 +5768 @@
 
     /* Record() = f()  */
-    case (_, DAE.CALL(path=path, expLst=e1lst, attr=DAE.CALL_ATTR(ty= tp as DAE.T_COMPLEX(complexClassType=ClassInf.RECORD(path=rpath), varLst=varLst))), e2, _, _, _)
+    case (_, DAE.CALL(path=path, expLst=expLst, attr=DAE.CALL_ATTR(ty= tp as DAE.T_COMPLEX(complexClassType=ClassInf.RECORD(path=rpath), varLst=varLst))), e2, _, _, _)
       equation
 
         true = Absyn.pathEqual(path, rpath);
+        // check all crefs are on the lhs
+        ht = HashSet.emptyHashSet();
+        ht = List.fold(crefs, BaseHashSet.add, ht);
+        List.foldAllValue(expLst, createSingleComplexEqnCode3, true, ht);
         (e2_1, _) = Expression.extendArrExp(e2, false);
 
@@ -5783 +5787 @@
 
         /* Expand the varLst. Each var might be an array or record. */
-        e1lst = List.mapFlat(e1lst, Expression.expandExpression);
-        /* Expand the tmp record and any arrays */
-        e2lst = Expression.expandExpression(e1_1);
+        crexplst = List.map1(varLst, Expression.generateCrefsExpFromExpVar, cr1);
         /* pair each of the expanded expressions to coressponding one*/
-        exptl = List.threadTuple(e1lst, e2lst);
+        exptl = List.threadTuple(expLst, crexplst);
         /* Create residual equations for each pair*/
         (eqSystlst, uniqueEqIndex) = List.map1Fold(exptl, makeSES_SIMPLE_ASSIGN, source, uniqueEqIndex);
@@ -5800 +5802 @@
       equation
         true = Absyn.pathEqual(path, rpath);
+        // check all crefs are on the rhs => turn
         ht = HashSet.emptyHashSet();
         ht = List.fold(crefs, BaseHashSet.add, ht);