- use derivativeNamePrefix from DAE

- use function ComponentReference.crefPrefixDer git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8767 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 2, 2011 · 25b3338 · 25b3338
1 parent 5d15256
commit 25b3338
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
@@ -44,7 +44,7 @@ public import Values;
 public import HashTable2;
 public import HashTable4;
 
-public constant String derivativeNamePrefix="$DER";
+public constant String derivativeNamePrefix=DAE.derivativeNamePrefix;
 public constant String partialDerivativeNamePrefix="$pDER";
 
 public uniontype Type "

diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -4144,7 +4144,7 @@ algorithm
 
     case (((e as DAE.CALL(path = Absyn.IDENT(name = "der"),expLst = {DAE.CREF(componentRef = cr)}),(vars,pa))))
       equation
-        cr = ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, cr);
+        cr = ComponentReference.crefPrefixDer(cr);
         (varslst,p) = BackendVariable.getVar(cr, vars);
         res = incidenceRowExp1(varslst,p,pa,false);
       then

diff --git a/Compiler/BackEnd/Derive.mo b/Compiler/BackEnd/Derive.mo
@@ -1373,7 +1373,7 @@ algorithm
 
     case (DAE.CALL(path = Absyn.IDENT("der"), expLst = {DAE.CREF(componentRef = cr)}), crx, differentiateIfExp)
       equation
-        cr = ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, cr);
+        cr = ComponentReference.crefPrefixDer(cr);
         true = ComponentReference.crefEqual(cr, crx);
         rval = intReal(1);
       then