Changeset 3638

Timestamp:

09/09/03 23:17:27 (20 years ago)

Author:

piso

Message:

HASH-TABLE-ENTRIES

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (2 diffs)
• HashTable.java (modified) (8 diffs)

trunk/j/src/org/armedbear/lisp/Autoload.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.51 2003-09-08 02:25:23 piso Exp $
+ * $Id: Autoload.java,v 1.52 2003-09-09 23:17:27 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -228 +228 @@
         autoload(PACKAGE_SYS, "%structure-set-2", "StructureObject");
         autoload(PACKAGE_SYS, "%time", "Time");
+        autoload(PACKAGE_SYS, "hash-table-entries", "HashTable");
         autoload(PACKAGE_SYS, "make-fill-pointer-output-stream", "FillPointerOutputStream");
         autoload(PACKAGE_SYS, "puthash", "HashTable");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: HashTable.java,v 1.15 2003-08-25 19:15:29 piso Exp $
+ * $Id: HashTable.java,v 1.16 2003-09-09 23:16:37 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -44 +44 @@
 
     private HashTable(LispObject test, int size, LispObject rehashSize,
-        LispObject rehashThreshold) throws LispError
+                      LispObject rehashThreshold)
+        throws LispError
     {
         if (test == NIL || test == Symbol.EQ.getSymbolFunction())
@@ -63 +64 @@
     // gethash key hash-table &optional default => value, present-p
     public synchronized LispObject gethash(LispObject key,
-        LispObject defaultValue) throws LispError
+                                           LispObject defaultValue)
+        throws LispError
     {
         LispObject[] values = new LispObject[2];
@@ -226 +228 @@
     }
 
+    // Returns a list of (key . value) pairs.
+    private LispObject ENTRIES()
+    {
+        LispObject list = NIL;
+        for (int i = buckets.length; i-- > 0;) {
+            HashEntry e = buckets[i];
+            while (e != null) {
+                list = new Cons(new Cons(e.key, e.value), list);
+                e = e.next;
+            }
+        }
+        return list;
+    }
+
     private static class HashEntry
     {
@@ -269 +285 @@
                 return ht.gethash(key, defaultValue);
             }
-            throw new TypeError(args[1], "hash table");
+            throw new TypeError(args[1], "hash-table");
         }
     };
@@ -294 +310 @@
                 return ht.puthash(key, value);
             }
-            throw new TypeError(args[1], "hash table");
+            throw new TypeError(args[1], "hash-table");
         }
     };
@@ -308 +324 @@
                 return ht.remhash(key);
             }
-            throw new TypeError(second, "hash table");
+            throw new TypeError(second, "hash-table");
         }
     };
@@ -329 +345 @@
         }
     };
+
+    // ### hash-table-entries
+    private static final Primitive1 HASH_TABLE_ENTRIES =
+        new Primitive1("hash-table-entries", PACKAGE_SYS, false) {
+        public LispObject execute(LispObject arg) throws LispError
+        {
+            if (arg instanceof HashTable)
+                return ((HashTable)arg).ENTRIES();
+            throw new TypeError(arg, "hash-table");
+        }
+    };
 }