- fix some bugs from last commit

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6549 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 24, 2010 · aceedfd · aceedfd
1 parent 32c2df8
commit aceedfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Compiler/ConnectUtil.mo b/Compiler/ConnectUtil.mo
@@ -46,6 +46,7 @@ package ConnectUtil
   in DAEUtil.mo."
 
 public import Absyn;
+public import ComponentReference;
 public import Connect;
 public import DAE;
 public import Env;
@@ -1387,7 +1388,7 @@ algorithm
   res := matchcontinue(inElem1, inElem2)
     local
       DAE.ComponentRef cr1, cr2;
-    case ((cr1, _), (cr2, _)) then Exp.crefSortFunc(cr2, cr1);
+    case ((cr1, _), (cr2, _)) then ComponentReference.crefSortFunc(cr2, cr1);
   end matchcontinue;
 end equSetElementLess;
 

diff --git a/Compiler/InnerOuter.mo b/Compiler/InnerOuter.mo
@@ -2015,7 +2015,7 @@ algorithm
     case((k,v))
       equation
         str = "{" +&
-         Exp.crefStr(k) +&
+         ComponentReference.crefStr(k) +&
          " opaque InstInner for now, implement printing. " +& "}\n";
       then str;
   end matchcontinue;

diff --git a/Compiler/TaskGraph.mo b/Compiler/TaskGraph.mo
@@ -45,6 +45,7 @@ package TaskGraph
   The package uses TaskGraphExt for the task graph datastructure itself, which
   is implemented using Boost Graph Library in C++"
 
+public import ComponentReference;
 public import DAELow;
 public import SCode;
 
@@ -741,7 +742,7 @@ algorithm
         cr2 = Exp.getCrefFromExp(e2);
         crs = listAppend(cr1, cr2);
         crs_1 = Util.listDeleteMember(crs, cr);
-        crs_2 = Util.listMap(crs_1, Exp.crefStr);
+        crs_2 = Util.listMap(crs_1, ComponentReference.crefStr);
         crstr = ComponentReference.crefStr(cr);
         origname_str = Exp.printComponentRefStr(cr);
         TaskGraphExt.storeResult(crstr, tid, true, origname_str);