clean up array type property

Author: kchanqvq

src/array.lisp

@@ -31,9 +31,10 @@
 
 (defun upgraded-array-element-type (typespec &optional environment)
   (declare (ignore environment))
-  (if (eq typespec 'character)
-      'character
-      t))
+  (case typespec
+    (character 'character)
+    ((nil) (error "NIL array element type unimplemented"))
+    (t t)))
 
 (defun %array-to-lists (array)
   (let ((index 0))
@@ -65,7 +66,7 @@ in which case ARRAY might be partially filled from CONTENTS."
       (process (array-dimensions array) contents)
       array)))
 
-(defun make-array (dimensions &key element-type
+(defun make-array (dimensions &key (element-type t)
                                 (initial-element nil initial-element-p)
                                 (initial-contents nil initial-contents-p)
                                 adjustable
@@ -80,21 +81,20 @@ in which case ARRAY might be partially filled from CONTENTS."
                (error "make-array - invalid FILL-POINTER ~a." fill-pointer)))
           (t (error "make-array - bad FILL-POINTER ~s type ~a." fill-pointer (type-of fill-pointer))))
     ;; Upgrade type
-    (if (eq element-type 'character)
-        (progn
-          (oset 1 array "stringp")
-          (setf element-type 'character
-                initial-element (or initial-element #\space)))
-        (setf element-type t))
+    (setq element-type (upgraded-array-element-type element-type))
+    (case element-type
+      (character
+       (oset 1 array "stringp")
+       (unless initial-element-p
+         (setq initial-element #\space))))
     (when (and (listp dimensions)
                (not (null (cdr dimensions)))
                fill-pointer)
       (error "make-array - FILL-POINTER cannot be specified on multidimensional arrays."))
     ;; Record metadata
     (when (or (null dimensions) (cdr dimensions))
       (setf (oget array "dimensions") dimensions))
-    (setf (oget array "type") element-type
-          (oget array "fillpointer") fill-pointer)
+    (setf (oget array "fillpointer") fill-pointer)
     ;; Initialize array
     (when (and initial-element-p initial-contents-p)
       (error "make-array - INITIAL-ELEMENT and INITIAL-CONTENTS cannot both be provided"))
@@ -114,9 +114,8 @@ in which case ARRAY might be partially filled from CONTENTS."
 (defun array-element-type (array)
   (unless (arrayp array)
     (error "~S is not an array." array))
-  (if (eq (oget array "stringp") 1)
-      'character
-      (oget array "type")))
+  (cond ((eq (oget array "stringp") 1) 'character)
+        (t t)))
 
 (defun array-dimensions (array)
   (unless (arrayp array)

src/compiler/compiler.lisp

@@ -586,8 +586,6 @@
         (var (gvarname 'array)))
     `(selfcall
       (var (,var ,(list-to-vector (mapcar #'literal elements))))
-      (= (get ,var "type")
-         (call-internal |lisp_to_js| ,(literal (array-element-type array))))
       ,(unless (vectorp array)
          `(= (get ,var "dimensions")
              (call-internal |lisp_to_js| ,(literal (array-dimensions array)))))
@@ -1385,7 +1383,6 @@
   `(selfcall
      (var (sv1 ,sv1))
      (var (r (method-call sv1 "concat" ,sv2)))
-     (= (get r "type") (get sv1 "type"))
      (= (get r "stringp") (get sv1 "stringp"))
      (return r)))