Changeset 18481

Timestamp:

2013-12-13T15:38:52+01:00 (10 years ago)

Author:

wbraun

Message:

• fix numArrayElement for temp array simVars.

File:

• trunk/Compiler/BackEnd/SimCodeUtil.mo (modified) (3 diffs)

trunk/Compiler/BackEnd/SimCodeUtil.mo

@@ -3335 +3335 @@
       list<DAE.Exp> rest, expl;
       DAE.Type ty;
-      DAE.ComponentRef cr, arraycr;
+      DAE.ComponentRef cr;
       SimCode.SimVar var;
       Option<DAE.ComponentRef> arrayCref;
       list<SimCode.SimVar> tempvars;
+      list<DAE.Subscript> inst_dims;
+      list<String> numArrayElement;
       
     case({}, _) then itempvars;
@@ -3357 +3359 @@
       equation
         arrayCref = getArrayCref(cr);
-        var = SimCode.SIMVAR(cr, BackendDAE.VARIABLE(), "", "", "", 0, NONE(), NONE(), NONE(), NONE(), false, ty, false, arrayCref, SimCode.NOALIAS(), DAE.emptyElementSource, SimCode.NONECAUS(), NONE(), {}, false);
+        inst_dims = getArraySubs(cr);
+        numArrayElement = List.map(inst_dims, ExpressionDump.subscriptString);
+        var = SimCode.SIMVAR(cr, BackendDAE.VARIABLE(), "", "", "", 0, NONE(), NONE(), NONE(), NONE(), false, ty, false, arrayCref, SimCode.NOALIAS(), DAE.emptyElementSource, SimCode.NONECAUS(), NONE(), numArrayElement, false);
       then
         greateTempVarsforCrefs(rest, var::itempvars);
@@ -8640 +8644 @@
   end matchcontinue;
 end getArrayCref;
+
+public function getArraySubs
+  input DAE.ComponentRef name;
+  output list<DAE.Subscript> arraySubs;
+algorithm
+  (arraySubs) :=
+  matchcontinue (name)
+    local
+      list<DAE.Subscript> arrayCrefSubs;
+    case (_)
+      equation
+        arrayCrefSubs = ComponentReference.crefSubs(name);
+      then arrayCrefSubs;
+    case (_)
+    then {};
+  end matchcontinue;
+end getArraySubs;
 
 protected function unparseCommentOptionNoAnnotationNoQuote