- rename DEALowUtil.mo into BackendDAEUtil.mo

- continue to copy all functions do something with a ComponentRef from Exp into ComponentReference git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6571 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 25, 2010 · af1d4ff · af1d4ff
1 parent ef2f45b
commit af1d4ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Compiler/DAELowUtil.mo → Compiler/BackendDAEUtil.mo b/Compiler/DAELowUtil.mo → Compiler/BackendDAEUtil.mo
diff --git a/Compiler/Makefile.common b/Compiler/Makefile.common
@@ -47,7 +47,7 @@ Convert.mo \
 DAE.mo \
 DAELow.mo \
 DAEUtil.mo \
-DAELowUtil.mo \
+BackendDAEUtil.mo \
 DAEDump.mo \
 Derive.mo \
 Debug.mo \

diff --git a/Compiler/SimCode.mo b/Compiler/SimCode.mo
@@ -573,7 +573,7 @@ algorithm
       DAE.ExpType tp;      
     case (cr,DAE.COMPLEX_VAR(name=name,tp=tp))
       equation
-        cr1 = ComponentReference.crefPrependIdent(cr,tp,name,{},tp);
+        cr1 = ComponentReference.crefPrependIdent(cr,name,{},tp);
         outExp = Exp.makeCrefExp(cr1,tp);
       then
         outExp;
@@ -6317,14 +6317,14 @@ algorithm
       equation
         ((crefs as (cr :: _))) = Util.listMap(expl, Exp.expCref); //Get all CRefs from exp1.
         crefs_1 = Util.listMap(crefs, ComponentReference.crefStripLastSubs); //Strip last subscripts
-        _ = Util.listReduce(crefs_1, Exp.crefEqualReturn); //Check if elements are equal, remove one
+        _ = Util.listReduce(crefs_1, ComponentReference.crefEqualReturn); //Check if elements are equal, remove one
       then
         cr;
     case (DAE.MATRIX(scalar = column))
       equation
         ((crefs as (cr :: _))) = Util.listMap(column, getVectorizedCrefFromExpMatrix);
         crefs_1 = Util.listMap(crefs, ComponentReference.crefStripLastSubs);
-        _ = Util.listReduce(crefs_1, Exp.crefEqualReturn);
+        _ = Util.listReduce(crefs_1, ComponentReference.crefEqualReturn);
       then
         cr;
   end matchcontinue;
@@ -6352,7 +6352,7 @@ algorithm
       equation
         ((crefs as (cr :: _))) = Util.listMap(col, Exp.expCrefTuple); //Get all CRefs from the list of tuples.
         crefs_1 = Util.listMap(crefs, ComponentReference.crefStripLastSubs); //Strip last subscripts
-        _ = Util.listReduce(crefs_1, Exp.crefEqualReturn); //Check if elements are equal, remove one
+        _ = Util.listReduce(crefs_1, ComponentReference.crefEqualReturn); //Check if elements are equal, remove one
       then
         cr;
 		case (_)

diff --git a/Compiler/Static.mo b/Compiler/Static.mo
@@ -12525,7 +12525,7 @@ algorithm
       DAE.ExpType ty2;
     case (cache,env,DAE.CREF_IDENT(ident = n,identType = ty2, subscriptLst = ss),prefixCr,impl) /* impl */
       equation
-        cr = Exp.joinCrefs(prefixCr,ComponentReference.makeCrefIdent(n,ty2,{}));
+        cr = ComponentReference.crefPrependIdent(prefixCr,n,{},ty2);
         (cache,_,t,_,_,_,_,_,_) = Lookup.lookupVar(cache,env, cr);
         sl = Types.getDimensionSizes(t);
         (cache,ss_1) = Ceval.cevalSubscripts(cache,env, ss, sl, impl, Ceval.MSG());