- Algorithm.mo

  use Exp.makeCrefExp for crefToExp
- Convert.mo
  use Exp.unelabExp for fromExpExpToAbsynExp
  use ComponentReference.unelabCref for fromExpCrefToAbsynCref
- DAELow.mo
  use ComponentReference.crefAddPrefix for crefPrefixDer and delete makeDerCref because it has done the same as crefPrefixDer
- SimCode.mo
  use crefPrefixDer instead of crefPrefixDer

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6592 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/Algorithm.mo

@@ -827,11 +827,7 @@ protected function crefToExp "function: crefToExp
   input DAE.ComponentRef inComponentRef;
   output DAE.Exp outExp;
 algorithm
-  outExp:=
-  matchcontinue (inComponentRef)
-    local DAE.ComponentRef cref;
-    case cref then DAE.CREF(cref,DAE.ET_OTHER());
-  end matchcontinue;
+  outExp:= Exp.makeCrefExp(inComponentRef,DAE.ET_OTHER());
 end crefToExp;
 
 

Compiler/Convert.mo

@@ -40,7 +40,9 @@ package Convert
   RCS: $Id$"
 
 public import Absyn;
+public import ComponentReference;
 public import DAE;
+public import Exp;
 
 public function fromDAEEqsToAbsynAlg "function: fromDAEEqsToAbsynAlgElts"
   input DAE.DAElist ld;
@@ -98,71 +100,15 @@ public function fromExpExpToAbsynExp "function: fromExpExpToAbsynExp"
   input DAE.Exp exp1;
   output Absyn.Exp expOut;
 algorithm
-  expOut :=
-  matchcontinue (exp1)
-    case (DAE.ICONST(i)) local Integer i; equation then Absyn.INTEGER(i);
-    case (DAE.RCONST(r)) local Real r; equation then Absyn.REAL(r);
-    case (DAE.SCONST(s)) local String s; equation then Absyn.STRING(s);
-    case (DAE.BCONST(b)) local Boolean b; equation then Absyn.BOOL(b);
-    case (DAE.CREF(cr,_))
-      local
-        DAE.ComponentRef cr;
-        Absyn.ComponentRef c;
-      equation
-        c = fromExpCrefToAbsynCref(cr);
-      then Absyn.CREF(c);
-  end matchcontinue;
+  expOut := Exp.unelabExp(exp1);
 end fromExpExpToAbsynExp;
 
 public function fromExpCrefToAbsynCref
   input DAE.ComponentRef cIn;
   output Absyn.ComponentRef cOut;
 algorithm
-  cOut := matchcontinue (cIn)
-      local
-        DAE.Ident id;
-        list<DAE.Subscript> subScriptList;
-        list<Absyn.Subscript> subScriptList2;
-        DAE.ComponentRef cRef;
-        Absyn.ComponentRef elem,cRef2;
-    case (DAE.CREF_QUAL(id,_,subScriptList,cRef))
-      equation
-        cRef2 = fromExpCrefToAbsynCref(cRef);
-        subScriptList2 = fromExpSubsToAbsynSubs(subScriptList,{});
-        elem = Absyn.CREF_QUAL(id,subScriptList2,cRef2);
-      then elem;
-    case (DAE.CREF_IDENT(id,_,subScriptList))
-      equation
-        subScriptList2 = fromExpSubsToAbsynSubs(subScriptList,{});
-        elem = Absyn.CREF_IDENT(id,subScriptList2);
-      then elem;
-  end matchcontinue;
-  end fromExpCrefToAbsynCref;
-
-public function fromExpSubsToAbsynSubs
-  input list<DAE.Subscript> inList;
-  input list<Absyn.Subscript> accList;
-  output list<Absyn.Subscript> outList;
-algorithm
-  outList :=
-  matchcontinue (inList,accList)
-    local
-      list<Absyn.Subscript> localAccList;
-    case ({},localAccList) then localAccList;
-    case (DAE.INDEX(e) :: restList,localAccList)
-      local
-        DAE.Exp e;
-        Absyn.Exp e2;
-        Absyn.Subscript elem;
-        list<DAE.Subscript> restList;
-      equation
-        e2 = fromExpExpToAbsynExp(e);
-        elem = Absyn.SUBSCRIPT(e2);
-        localAccList = listAppend(localAccList,{elem});
-        localAccList = fromExpSubsToAbsynSubs(restList,localAccList);
-      then localAccList;
-  end matchcontinue;
-end fromExpSubsToAbsynSubs;
+  cOut := ComponentReference.unelabCref(cIn);
+end fromExpCrefToAbsynCref;
 
 end Convert;
 

Compiler/DAELow.mo

@@ -11423,17 +11423,9 @@ public function crefPrefixDer
   input DAE.ComponentRef inCref;
   output DAE.ComponentRef outCref;
 algorithm
-  outCref := ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, inCref);
+  outCref := ComponentReference.crefAddPrefix(derivativeNamePrefix,{},DAE.ET_REAL(), inCref);
 end crefPrefixDer;
 
-public function makeDerCref
-  "Appends $DER to a cref and constructs a DAE.CREF_QUAL from the resulting cref."
-  input DAE.ComponentRef inCref;
-  output DAE.ComponentRef outCref;
-algorithm
-  outCref := ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, inCref);
-end makeDerCref;
-
 public function equationSource "Retrieve the source from a BackendDAE.DAELow equation"
   input BackendDAE.Equation eq;
   output DAE.ElementSource source;
@@ -12073,7 +12065,7 @@ algorithm
     case(cref, x, stateVars) equation
       ({v1}, _) = getVar(cref, BackendDAEUtil.listVar(stateVars));
       true = isStateVar(v1);
-      cref = makeDerCref(cref);
+      cref = crefPrefixDer(cref);
       id = ComponentReference.printComponentRefStr(cref) +& BackendDAE.partialDerivativeNamePrefix +& ComponentReference.printComponentRefStr(x);
       id = Util.stringReplaceChar(id, ".", "$P");
       id = Util.stringReplaceChar(id, "[", "$pL");
@@ -12222,7 +12214,7 @@ algorithm
       equation
       Builtin.isDer(fname);
       cref = Exp.expCref(e1);
-      cref = makeDerCref(cref);
+      cref = crefPrefixDer(cref);
       //str = derivativeNamePrefix +& Exp.printExpStr(e1);
       //cref = ComponentReference.makeCrefIdent(str, DAE.ET_REAL(),{});
       e1_ = differentiateWithRespectToX(Exp.crefExp(cref), x, functions, inputVars, paramVars, stateVars);

Compiler/SimCode.mo

@@ -2877,7 +2877,7 @@ algorithm
       equation
         (BackendDAE.EQUATION(e1, e2,_), v as BackendDAE.VAR(varName = cr, varKind = BackendDAE.STATE()))
           = getEquationAndSolvedVar(eqNum, eqns, vars, ass2);
-        cr = DAELow.makeDerCref(cr);
+        cr = DAELow.crefPrefixDer(cr);
         exp_ = solve(e1, e2, DAE.CREF(cr,DAE.ET_REAL()));
       then
         SES_SIMPLE_ASSIGN(cr, exp_);
@@ -3883,7 +3883,7 @@ algorithm
                     expLst = {DAE.CREF(componentRef = cr)}),
            NONE()))
       equation
-        cr = DAELow.makeDerCref(cr);
+        cr = DAELow.crefPrefixDer(cr);
       then
         ((DAE.CREF(cr,DAE.ET_REAL()), NONE()));
     case (_) then inExp;