Changeset 12970

Timestamp:

10/10/10 09:15:49 (12 years ago)

Author:

ehuelsmann

Message:

Remove Remove now obsolete hash table specializations;
in order to be able to instantiate HashTable? directly
remove the 'abstract' modifier from the class; there are no
abstract methods anymore.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• EqHashTable.java (deleted)
• EqlHashTable.java (deleted)
• EqualHashTable.java (deleted)
• EqualpHashTable.java (deleted)
• HashTable.java (modified) (2 diffs)
• HashTableFunctions.java (modified) (1 diff)
• Pathname.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/HashTable.java

@@ -37 +37 @@
 import static org.armedbear.lisp.Lisp.*;
 
-public abstract class HashTable extends LispObject {
+public class HashTable extends LispObject {
 
     protected static final float loadFactor = 0.75f;
@@ -68 +68 @@
         }
         return capacity;
+    }
+
+    public static HashTable newEqHashTable(int size, LispObject rehashSize,
+            LispObject rehashThreshold) {
+        return new HashTable(new Comparator(), size, rehashSize, rehashThreshold);
+    }
+
+    public static HashTable newEqlHashTable(int size, LispObject rehashSize,
+            LispObject rehashThreshold) {
+        return new HashTable(new EqlComparator(), size, rehashSize, rehashThreshold);
+    }
+
+    public static HashTable newEqualHashTable(int size, LispObject rehashSize,
+            LispObject rehashThreshold) {
+        return new HashTable(new EqualComparator(), size, rehashSize, rehashThreshold);
+    }
+
+    public static LispObject newEqualpHashTable(int size, LispObject rehashSize,
+            LispObject rehashThreshold) {
+        return new HashTable(new EqualpComparator(), size, rehashSize, rehashThreshold);
     }
 

trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java

@@ -58 +58 @@
         final int n = Fixnum.getValue(size);
         if (test == FUNCTION_EQL || test == NIL)
-          return new EqlHashTable(n, rehashSize, rehashThreshold);
+          return HashTable.newEqlHashTable(n, rehashSize, rehashThreshold);
         if (test == FUNCTION_EQ)
-          return new EqHashTable(n, rehashSize, rehashThreshold);
+          return HashTable.newEqHashTable(n, rehashSize, rehashThreshold);
         if (test == FUNCTION_EQUAL)
-          return new EqualHashTable(n, rehashSize, rehashThreshold);
+          return HashTable.newEqualHashTable(n, rehashSize, rehashThreshold);
         if (test == FUNCTION_EQUALP)
-          return new EqualpHashTable(n, rehashSize, rehashThreshold);
+          return HashTable.newEqualpHashTable(n, rehashSize, rehashThreshold);
         return error(new LispError("Unsupported test for MAKE-HASH-TABLE: " +
                                     test.writeToString()));

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -926 +926 @@
     // A logical host is represented as the string that names it.
     // (defvar *logical-pathname-translations* (make-hash-table :test 'equal))
-    public static EqualHashTable LOGICAL_PATHNAME_TRANSLATIONS =
-      new EqualHashTable(64, NIL, NIL);
+    public static HashTable LOGICAL_PATHNAME_TRANSLATIONS =
+      HashTable.newEqualHashTable(64, NIL, NIL);
     private static final Symbol _LOGICAL_PATHNAME_TRANSLATIONS_ =
       exportSpecial("*LOGICAL-PATHNAME-TRANSLATIONS*", PACKAGE_SYS,