Skip to content

Commit 3b84ccf

Browse files
author
Jens Frenkel
committed
- fix compilation
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12219 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent e58222a commit 3b84ccf

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

Compiler/FrontEnd/Expression.mo

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,7 @@ algorithm
15991599
Integer nr;
16001600
list<Integer> lstInt;
16011601
list<Var> varLst;
1602+
list<DAE.Type> typs;
16021603

16031604
// count the variables in array
16041605
case DAE.T_ARRAY(dims = ad)
@@ -1614,6 +1615,14 @@ algorithm
16141615
nr = List.reduce(lstInt, intAdd);
16151616
then
16161617
nr;
1618+
1619+
case DAE.T_TUPLE(tupleType=typs)
1620+
equation
1621+
lstInt = List.map(typs,sizeOf);
1622+
nr = List.reduce(lstInt, intAdd);
1623+
then
1624+
nr;
1625+
16171626

16181627
// for all other consider it just 1 variable
16191628
case _ then 1;
@@ -3267,21 +3276,9 @@ algorithm
32673276
outExps := (exp,exp::acc);
32683277
end expressionCollector;
32693278

3270-
32713279
public function replaceCref
32723280
"function: replaceCref
32733281
Replace a componentref with a expression"
3274-
input tuple<DAE.Exp,tuple<DAE.ComponentRef,DAE.Exp>> inTpl;
3275-
input tuple<DAE.Exp,tuple<DAE.ComponentRef,DAE.Exp>> outTpl;
3276-
protected
3277-
DAE.Exp exp;
3278-
tuple<DAE.ComponentRef,DAE.Exp> tpl;
3279-
algorithm
3280-
(exp,tpl) := inTpl;
3281-
outTpl := traverseExp(exp,replaceCrefWork,tpl);
3282-
end replaceCref;
3283-
3284-
protected function replaceCrefWork
32853282
input tuple<DAE.Exp,tuple<DAE.ComponentRef,DAE.Exp>> inTpl;
32863283
output tuple<DAE.Exp,tuple<DAE.ComponentRef,DAE.Exp>> otpl;
32873284
algorithm
@@ -3296,7 +3293,7 @@ algorithm
32963293
((target,(cr1,target)));
32973294
else then inTpl;
32983295
end matchcontinue;
3299-
end replaceCrefWork;
3296+
end replaceCref;
33003297

33013298
/***************************************************/
33023299
/* traverse DAE.Exp */

0 commit comments

Comments
 (0)