Changeset 13310

Timestamp:

06/07/11 18:07:33 (12 years ago)

Author:

Mark Evenson

Message:

SYS:HASH-TABLE-WEAKNESS provides the weakness property of a hashtable.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• HashTableFunctions.java (modified) (1 diff)
• Symbol.java (modified) (1 diff)
• WeakHashTable.java (modified) (4 diffs)

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

@@ -413 +413 @@
     };
 
+  @DocString(name="hash-table-weakness",
+             args="hash-table",
+             doc="Return weakness property of HASH-TABLE, or NIL if it has none.")
+  private static final Primitive HASH_TABLE_WEAKNESS
+    = new pf_hash_table_weakness();
+  private static final class pf_hash_table_weakness extends Primitive {
+      pf_hash_table_weakness() {
+          super(Symbol.HASH_TABLE_WEAKNESS, "hash-table");
+      }
+      @Override
+      public LispObject execute(LispObject first) 
+      {
+          if (first instanceof HashTable) {
+              return NIL;
+          } else if (first instanceof WeakHashTable) {
+              return ((WeakHashTable)first).getWeakness();
+          }
+          return error(new TypeError(first, Symbol.HASH_TABLE));
+      }
+  };
+
   protected static HashTable checkHashTable(LispObject ht) {
     if (ht instanceof HashTable) return (HashTable)ht;

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

@@ -3046 +3046 @@
   public static final Symbol PUTHASH =
     PACKAGE_SYS.addExternalSymbol("PUTHASH");
+  public static final Symbol HASH_TABLE_WEAKNESS =
+    PACKAGE_SYS.addExternalSymbol("HASH-TABLE-WEAKNESS");
   public static final Symbol UNDEFINED_FUNCTION_CALLED =
     PACKAGE_SYS.addExternalSymbol("UNDEFINED-FUNCTION-CALLED");

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

@@ -46 +46 @@
 import java.util.concurrent.locks.ReentrantLock;
 
-
-
-
-
 // ??? Replace standard Hashtable when this code is working; maybe not
 // because we have additional places for locking here.
@@ -79 +75 @@
     final private ReentrantLock lock = new ReentrantLock();
     HashEntry bucketType;
+    final LispObject weakness;
 
     private WeakHashTable(Comparator c, int size, LispObject rehashSize, 
@@ -86 +83 @@
         this.rehashThreshold = rehashThreshold;
         bucketType = null;
+        this.weakness = weakness;
         if (weakness.equals(Keyword.KEY)) {
             bucketType = this.new HashEntryWeakKey();
@@ -350 +348 @@
     public Symbol getTest() {
         return comparator.getTest();
+    }
+    
+    public LispObject getWeakness() {
+        return weakness;
     }