fix remhash, extend-hashtable and '(array * nil) types - gcl.git - GNU Common Lisp

diff --git a/gcl/lsp/gcl_hash.lsp b/gcl/lsp/gcl_hash.lsp
index e53fd77f5..00226f90f 100644
--- a/gcl/lsp/gcl_hash.lsp
+++ b/gcl/lsp/gcl_hash.lsp

@@ -40,7 +40,6 @@

(let ((e (gethash-int x y)))

(unless (eql +objnull+ (htent-key e))

(set-htent-key e +objnull+)

- (set-htent-value e (nani +objnull+))

(c-set-hashtable-nent y (1- (c-hashtable-nent y)))

t)))

diff --git a/gcl/lsp/gcl_typep.lsp b/gcl/lsp/gcl_typep.lsp
index 4471bc7c6..5af526cde 100644
--- a/gcl/lsp/gcl_typep.lsp
+++ b/gcl/lsp/gcl_typep.lsp

@@ -16,15 +16,15 @@

(defun db (o tp)

(let* ((b (car tp))(i -1))

- (cond ((not b))

+ (cond ((not tp))

((eq b '*))

((not (listp b)) (eql (c-array-rank o) b))

- ((eql (length b) (c-array-rank o))(not (member-if-not (lambda (x) (incf i) (or (eq x '*) (eql x (array-dims o i)))) b))))))

+ ((eql (length b) (c-array-rank o)) (not (member-if-not (lambda (x) (incf i) (or (eq x '*) (eql x (array-dims o i)))) b))))))

(defun dbv (o tp)

(let* ((b (car tp))(b (if (listp b) (car b) b)))

- (cond ((not b))

+ (cond ((not tp))

((eq b '*))

((eql (c-array-dim o) b)))))

(setf (get 'db 'compiler::cmp-inline) t)

diff --git a/gcl/o/hash.d b/gcl/o/hash.d
index 140c0d2e9..abdfa775d 100755
--- a/gcl/o/hash.d
+++ b/gcl/o/hash.d

@@ -912,7 +912,7 @@ DEFUN("HASH-TABLE-REHASH-SIZE",object,fLhash_table_rehash_size,LISP,1,1,NONE,OO,

RETURN1(table->ht.ht_rhsize);

}

-DEFUN("EXTEND-HASHTABLE",fixnum,fSextent_hashtable,SI,1,1,NONE,OO,OO,OO,OO,(object table),"") {

+DEFUN("EXTEND-HASHTABLE",fixnum,fSextent_hashtable,SI,1,1,NONE,IO,OO,OO,OO,(object table),"") {

extend_hashtable(table);

return table->ht.ht_size;

}