経過保存

sile · Sep 24, 2011 · 0be28a3 · 0be28a3
1 parent 5fae2ec
commit 0be28a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/package.lisp b/package.lisp
@@ -14,6 +14,8 @@
 (deftype hashcode () '(unsigned-byte 32))
 (deftype hash-fn () '(function (t) hashcode))
 (deftype test-fn () '(function (t t) boolean))
+(deftype bucket () '(or null node))
+(deftype buckets () '(simple-array bucket))
 
 (eval-when (:compile-toplevel :load-toplevel)
   (defparameter *fastest* '(optimize (speed 3) (safety 0) (debug 0)))

diff --git a/sol-hash.lisp b/sol-hash.lisp
@@ -21,7 +21,7 @@
   (value  t :type t))
 
 (defstruct map
-  (buckets    #() :type (simple-array (or null node)))
+  (buckets    #() :type buckets)
   (bucket-size  0 :type positive-fixnum)
   (bitlen       0 :type positive-fixnum)
   (count        0 :type positive-fixnum)
@@ -93,7 +93,7 @@
     (recur nil head)))
 
 (defun set-pred-next (pred-node buckets bucket-id &key next)
-  (declare ((simple-array (or null node)) buckets)
+  (declare (buckets buckets)
            (positive-fixnum bucket-id)
            ((or null node) pred-node next))
   (if pred-node