fix upgraded-array-element-type tests - gcl.git - GNU Common Lisp

diff --git a/gcl/lsp/gcl_arraylib.lsp b/gcl/lsp/gcl_arraylib.lsp
index e223bc4e9..595969f90 100755
--- a/gcl/lsp/gcl_arraylib.lsp
+++ b/gcl/lsp/gcl_arraylib.lsp

@@ -269,7 +269,7 @@

; (fill-pointer-internal x)

(defun make-array (dimensions

- &key element-type

+ &key (element-type t)

initial-element

(initial-contents nil icsp)

adjustable fill-pointer

diff --git a/gcl/lsp/gcl_predlib.lsp b/gcl/lsp/gcl_predlib.lsp
index f17fcab9b..298053d6a 100755
--- a/gcl/lsp/gcl_predlib.lsp
+++ b/gcl/lsp/gcl_predlib.lsp

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

;; ARRAY TYPES

+(defconstant +array-types-but-t+ (lremove t +array-types+))

+

(defun expand-array-element-type (type)

- (cond

- ((car (member type +array-types+ :test 'subtypep1)))

- ((subtypep1 type 'float) 'long-float)

- (t)))

+ (or (car (member type +array-types-but-t+ :test 'subtypep)) t))

#.`(defun upgraded-array-element-type (type &optional environment)

(declare (ignore environment) (optimize (safety 1)))

(case type

- ((nil t) t)

+ ((nil t) type)

,@(mapcar (lambda (x) `(,x type)) (cons '* (lremove t +array-types+)))

(otherwise (expand-array-element-type type))))