Changeset 38604 in project for release

Timestamp:

04/08/20 20:18:08 (10 months ago)

Author:

Kon Lovett

Message:

remove bitwise-utils dependency, strict types, fix real-number-hash & complex-number-hash type

Location:

release/5/hash-trie/trunk

Files:

• hash-trie.egg (modified) (1 diff)
• hash-trie.scm (modified) (2 diffs)

release/5/hash-trie/trunk/hash-trie.egg

@@ -5 +5 @@
 
 ((synopsis "hash-trie")
- (version "1.1.2")
+ (version "1.1.3")
  (category data)
  (author "Taylor R. Campbell, [[kon lovett]] for CHICKEN")
  (license "MIT")
- (dependencies
-  (bitwise-utils "1.0.0"))
+ (dependencies)
  (test-dependencies test)
  (components
   (extension hash-trie
     (types-file)
-    (csc-options "-O3" "-d1" "-local" "-no-procedure-checks-for-toplevel-bindings") ) ) )
+    (csc-options "-O3" "-d1" "-local" "-strict-types" "-no-procedure-checks-for-toplevel-bindings") ) ) )

release/5/hash-trie/trunk/hash-trie.scm

@@ -53 +53 @@
 (import (chicken foreign))
 (import (chicken bitwise))
-(import (only bitwise-utils bitwise-count))
 
 ;;
+
+;w/ cplxnum since type cannot check value!
+(define-type real (or integer float ratnum cplxnum))
 
 (define-type alist (list-of pair))
@@ -94 +96 @@
 (: string-hash (string -> fixnum))
 (: symbol-hash (symbol -> fixnum))
-(: exact-integer-hash (fixnum -> fixnum))
-(: real-number-hash (float -> fixnum))
-(: complex-number-hash (cplxnum -> fixnum))
+(: exact-integer-hash (integer -> fixnum))
+(: real-number-hash (real -> fixnum))
+(: complex-number-hash (real -> fixnum))
 
 ;;
 
-(define bit-count bitwise-count)
+;from srfi-60 example implementation - slib logical.scm
+
+(define lognot bitwise-not)
+
+;@
+(define bitwise-bit-count
+  (letrec ((logcnt (lambda (n tot)
+                     (if (zero? n)
+                          tot
+                          (logcnt (quotient n 16)
+                                  (+ (vector-ref
+                                      '#(0 1 1 2 1 2 2 3 1 2 2 3 2 3 3 4)
+                                      (modulo n 16))
+                                     tot))))))
+    (lambda (n)
+      (cond ((negative? n) (lognot (logcnt (lognot n) 0)))
+                  ((positive? n) (logcnt n 0))
+                  (else 0)))))
+;@
+(define (logcount n)
+  (cond ((negative? n) (bitwise-bit-count (lognot n)))
+              (else (bitwise-bit-count n))))
+
+(define bit-count logcount)
+
 (include "hash-trie.incl")