- Changed HashTable implementations to use the new BaseHashTable.mo

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

Compiler/BaseHashTable.mo

@@ -1,4 +1,4 @@
-package BaseHashTable "
+encapsulated package BaseHashTable "
 	This file is an extension to OpenModelica.
 
   Copyright (c) 2007 MathCore Engineering AB
@@ -26,7 +26,6 @@ keyEqual 	- A comparison function between two keys, returns true if equal.
 
 /* HashTable instance specific code */
 
-protected import System;
 protected import Util;
 
 /* Generic hashtable code below!! */
@@ -40,8 +39,8 @@ public function emptyHashTableWork
   list<Option<tuple<Key,Value>>> lst;
   array<Option<tuple<Key,Value>>> emptyarr;
 
-  type Key = DAE.ComponentRef;
-  type Value = DAE.Value;
+  replaceable type Key subtypeof Any;
+  replaceable type Value subtypeof Any;
   type HashTable = tuple<HashVector, ValueArray, Integer, Integer, FuncsTuple>;
   type HashVector = array<list<tuple<Key,Integer>>>;
   type ValueArray = tuple<Integer,Integer,array<Option<tuple<Key,Value>>>>;

Compiler/ComponentReference.mo

@@ -1841,5 +1841,12 @@ algorithm
   end matchcontinue;
 end printComponentRef2;
 
+public function printComponentRefListStr
+  input list<DAE.ComponentRef> crs;
+  output String res;
+algorithm
+  res := "{" +& Util.stringDelimitList(Util.listMap(crs, printComponentRefStr), ",") +& "}";
+end printComponentRefListStr;
+
 end ComponentReference;
 

Compiler/ConnectionGraph.mo

@@ -325,6 +325,7 @@ end addConnection;
 // ********* protected section ********* //
 // ************************************* //
 
+protected import BaseHashTable;
 protected import Exp;
 protected import Debug;
 protected import DAEDump;
@@ -350,12 +351,12 @@ algorithm
 
     case (partition, ref)
       equation
-        parent = HashTableCG.get(ref, partition);
+        parent = BaseHashTable.get(ref, partition);
         parentCanonical = canonical(partition, parent);
         //Debug.fprintln("cgraph", 
         //  "- ConnectionGraph.canonical_case1(" +& ComponentReference.printComponentRefStr(ref) +& ") = " +&
         //  ComponentReference.printComponentRefStr(parentCanonical));        
-        //partition2 = HashTableCG.add((ref, parentCanonical), partition);
+        //partition2 = BaseHashTable.add((ref, parentCanonical), partition);
       then parentCanonical;
 
     case (partition,ref)
@@ -758,7 +759,7 @@ algorithm
     // not the same, add it 
     case(partition,ref1,ref2)
       equation
-        partition = HashTableCG.add((ref1,ref2), partition);
+        partition = BaseHashTable.add((ref1,ref2), partition);
       then (partition, true);
   end matchcontinue;
 end connectCanonicalComponents;
@@ -778,7 +779,7 @@ algorithm
 
     case(table, (root::tail), firstRoot)
       equation
-        table = HashTableCG.add((root,firstRoot), table);
+        table = BaseHashTable.add((root,firstRoot), table);
         table = addRootsToTable(table, tail, firstRoot);
       then table;
     case(table, {}, _) then table;

Compiler/DAELow.mo

@@ -76,7 +76,6 @@ protected import RTOpts;
 protected import System;
 protected import Util;
 protected import DAEDump;
-protected import Inline;
 protected import ValuesUtil;
 protected import VarTransform;
 protected import BackendDAEUtil;

Compiler/DAEUtil.mo

@@ -216,6 +216,7 @@ end matchcontinue;
 end getBoundStartEquation;
 
 protected import Algorithm;
+protected import BaseHashTable;
 protected import Ceval;
 protected import Debug;
 protected import Error;
@@ -5099,7 +5100,7 @@ algorithm
           DAE.BINARY(exp,DAE.SUB(DAE.ET_REAL()),DAE.CREF(cref_1,DAE.ET_REAL())),
           DAE.DIV(DAE.ET_REAL()),
           DAE.CREF(cref_2,DAE.ET_REAL()));
-        crs1 = HashTable.add((cr,0),crs0);
+        crs1 = BaseHashTable.add((cr,0),crs0);
       then (exp,crs1);
     case (exp,crs0) then (exp,crs0);
   end matchcontinue;