- Changed SimCode.SES_SIMPLE_ASSIGN.cref to a ComponentRef instead of Exp

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5927 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/DAELow.mo

@@ -16615,12 +16615,11 @@ algorithm
 end crefPrefixDer;
 
 public function makeDerCref
-  "Appends $DER to a cref and constructs a DAE.CREF from the resulting cref."
+  "Appends $DER to a cref and constructs a DAE.CREF_QUAL from the resulting cref."
   input DAE.ComponentRef inCref;
-  output DAE.Exp outCref;
+  output DAE.ComponentRef outCref;
 algorithm
-  outCref := DAE.CREF(DAE.CREF_QUAL("$DER", DAE.ET_REAL(), {}, inCref),
-      DAE.ET_REAL());
+  outCref := DAE.CREF_QUAL("$DER", DAE.ET_REAL(), {}, inCref);
 end makeDerCref;
 
 public function equationSource "Retrieve the source from a DAELow equation"

Compiler/SimCode.mo

@@ -303,7 +303,7 @@ uniontype SimEqSystem
     DAE.Exp exp;
   end SES_RESIDUAL;
   record SES_SIMPLE_ASSIGN
-    DAE.Exp cref;
+    DAE.ComponentRef cref;
     DAE.Exp exp;
   end SES_SIMPLE_ASSIGN;
   record SES_ARRAY_CALL_ASSIGN
@@ -2222,18 +2222,18 @@ algorithm
         varexp = DAE.CREF(cr,DAE.ET_REAL());
         exp_ = solve(e1, e2, varexp);
       then
-        SES_SIMPLE_ASSIGN(varexp, exp_);
+        SES_SIMPLE_ASSIGN(cr, exp_);
     /* single equation: state */
     case (eqNum,
           DAELow.DAELOW(orderedVars=vars, orderedEqs=eqns),
           ass1, ass2, helpVarInfo)
       equation
         (DAELow.EQUATION(e1, e2,_), v as DAELow.VAR(varName = cr, varKind = DAELow.STATE()))
           = getEquationAndSolvedVar(eqNum, eqns, vars, ass2);
-        varexp = DAELow.makeDerCref(cr);
-        exp_ = solve(e1, e2, varexp);
+        cr = DAELow.makeDerCref(cr);
+        exp_ = solve(e1, e2, DAE.CREF(cr,DAE.ET_REAL()));
       then
-        SES_SIMPLE_ASSIGN(varexp, exp_);
+        SES_SIMPLE_ASSIGN(cr, exp_);
     /* non-state non-linear */
     case (e,
           DAELow.DAELOW(orderedVars=vars,orderedEqs=eqns,arrayEqs=ae),
@@ -2765,7 +2765,7 @@ algorithm
         expr = solve(e1, e2, varexp);
         restEqs = extractDiscEqs(eqns, vs);
       then
-        SES_SIMPLE_ASSIGN(varexp, expr) :: restEqs;
+        SES_SIMPLE_ASSIGN(cr, expr) :: restEqs;
   end matchcontinue;
 end extractDiscEqs;
 
@@ -3041,9 +3041,9 @@ algorithm
                     expLst = {DAE.CREF(componentRef = cr)}),
            NONE()))
       equation
-        cref_exp = DAELow.makeDerCref(cr);
+        cr = DAELow.makeDerCref(cr);
       then
-        ((cref_exp, NONE()));
+        ((DAE.CREF(cr,DAE.ET_REAL()), NONE()));
     case (_) then inExp;
   end matchcontinue;
 end replaceDerOpInExpTraverser;
@@ -3939,7 +3939,7 @@ algorithm
       DAE.ComponentRef cr;
       DAE.Exp exp_;
     case (DAELow.SOLVED_EQUATION(cr, exp_, _))
-      then SES_SIMPLE_ASSIGN(DAE.CREF(cr, DAE.ET_REAL()), exp_);
+      then SES_SIMPLE_ASSIGN(cr, exp_);
     case (DAELow.RESIDUAL_EQUATION(exp_, _))
       then SES_RESIDUAL(exp_);
   end matchcontinue;
@@ -7204,11 +7204,11 @@ algorithm
         (e,divLst) = DAELow.addDivExpErrorMsgtoExp(e,inDlowMode);
       then
         (SES_RESIDUAL(e),divLst);      
-    case (SES_SIMPLE_ASSIGN(cref = e2, exp = e),inDlowMode)
+    case (SES_SIMPLE_ASSIGN(cref = cr, exp = e),inDlowMode)
       equation
         (e,divLst) = DAELow.addDivExpErrorMsgtoExp(e,inDlowMode);
       then
-        (SES_SIMPLE_ASSIGN(e2, e),divLst);      
+        (SES_SIMPLE_ASSIGN(cr, e),divLst);      
     case (SES_ARRAY_CALL_ASSIGN(componentRef = cr, exp = e),inDlowMode)
       equation
         (e,divLst) = DAELow.addDivExpErrorMsgtoExp(e,inDlowMode);

Compiler/SimCodeC.mo

@@ -3987,12 +3987,12 @@ algorithm
            SimCode.SES_SIMPLE_ASSIGN(cref = i_cref) :: rest )
       local
         list<SimCode.SimEqSystem> rest;
-        DAE.Exp i_cref;
+        DAE.ComponentRef i_cref;
       equation
         txt = Tpl.writeTok(txt, Tpl.ST_STRING("if (sim_verbose) { printf(\"Setting variable start value: %s(start=%f)\\n\", \""));
-        txt = expCref(txt, i_cref);
+        txt = cref(txt, i_cref);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING("\", "));
-        txt = expCref(txt, i_cref);
+        txt = cref(txt, i_cref);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING("); }"));
         txt = Tpl.nextIter(txt);
         txt = lm_99(txt, rest);
@@ -5053,7 +5053,7 @@ algorithm
            i_context,
            i_varDecls )
       local
-        DAE.Exp i_cref;
+        DAE.ComponentRef i_cref;
         DAE.Exp i_exp;
         Tpl.Text i_expPart;
         Tpl.Text i_preExp;
@@ -5062,7 +5062,7 @@ algorithm
         (i_expPart, i_preExp, i_varDecls) = daeExp(emptyTxt, i_exp, i_context, i_preExp, i_varDecls);
         txt = Tpl.writeText(txt, i_preExp);
         txt = Tpl.softNewLine(txt);
-        txt = expCref(txt, i_cref);
+        txt = cref(txt, i_cref);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING(" = "));
         txt = Tpl.writeText(txt, i_expPart);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING(";"));
@@ -5536,14 +5536,14 @@ algorithm
            i_context )
       local
         list<SimCode.SimEqSystem> rest;
-        DAE.Exp i_cref;
+        DAE.ComponentRef i_cref;
         DAE.Exp i_exp;
         Integer i_i0;
         Tpl.Text i_expPart;
       equation
         i_i0 = Tpl.getIteri_i0(txt);
         (i_expPart, i_preDisc, i_varDecls) = daeExp(emptyTxt, i_exp, i_context, i_preDisc, i_varDecls);
-        txt = expCref(txt, i_cref);
+        txt = cref(txt, i_cref);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING(" = "));
         txt = Tpl.writeText(txt, i_expPart);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING_LIST({
@@ -5552,7 +5552,7 @@ algorithm
                                 }, false));
         txt = Tpl.writeStr(txt, intString(i_i0));
         txt = Tpl.writeTok(txt, Tpl.ST_STRING("] = "));
-        txt = expCref(txt, i_cref);
+        txt = cref(txt, i_cref);
         txt = Tpl.writeTok(txt, Tpl.ST_STRING(";"));
         txt = Tpl.nextIter(txt);
         (txt, i_varDecls, i_preDisc) = lm_134(txt, rest, i_varDecls, i_preDisc, i_context);