Skip to content

Commit 2efbebb

Browse files
author
Jens Frenkel
committed
- bugfix for SimCodeUtil.calculateIndex, keep ComponentRef of Var and use not the one from call expression
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13305 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent daf6f0b commit 2efbebb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Compiler/BackEnd/BackendDAETransform.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3499,7 +3499,7 @@ algorithm
34993499

35003500
case ((DAE.CALL(path = Absyn.IDENT(name = "der"),expLst = {DAE.CREF(componentRef = cr)}),(vars,i)))
35013501
equation
3502-
((BackendDAE.VAR(_,BackendDAE.DUMMY_DER(),a,prl,b,c,d,lstSubs,source,dae_var_attr,comment,ct) :: _),_) = BackendVariable.getVar(cr, vars) "der(der_s)) der_s is dummy var => der_der_s" ;
3502+
((BackendDAE.VAR(cr,BackendDAE.DUMMY_DER(),a,prl,b,c,d,lstSubs,source,dae_var_attr,comment,ct) :: _),_) = BackendVariable.getVar(cr, vars) "der(der_s)) der_s is dummy var => der_der_s" ;
35033503
dummyder = ComponentReference.crefPrefixDer(cr);
35043504
vars_1 = BackendVariable.addVar(BackendDAE.VAR(dummyder, BackendDAE.DUMMY_DER(), a, prl, b, NONE(), NONE(), lstSubs, source, NONE(), comment, ct), vars);
35053505
e = Expression.makeCrefExp(dummyder,DAE.T_REAL_DEFAULT);
@@ -3508,7 +3508,7 @@ algorithm
35083508

35093509
case ((DAE.CALL(path = Absyn.IDENT(name = "der"),expLst = {DAE.CREF(componentRef = cr)}),(vars,i)))
35103510
equation
3511-
((BackendDAE.VAR(_,BackendDAE.VARIABLE(),a,prl,b,c,d,lstSubs,source,dae_var_attr,comment,ct) :: _),_) = BackendVariable.getVar(cr, vars) "der(v) v is alg var => der_v" ;
3511+
((BackendDAE.VAR(cr,BackendDAE.VARIABLE(),a,prl,b,c,d,lstSubs,source,dae_var_attr,comment,ct) :: _),_) = BackendVariable.getVar(cr, vars) "der(v) v is alg var => der_v" ;
35123512
dummyder = ComponentReference.crefPrefixDer(cr);
35133513
vars_1 = BackendVariable.addVar(BackendDAE.VAR(dummyder, BackendDAE.DUMMY_DER(), a, prl, b, NONE(), NONE(), lstSubs, source, NONE(), comment, ct), vars);
35143514
e = Expression.makeCrefExp(dummyder,DAE.T_REAL_DEFAULT);

0 commit comments

Comments
 (0)