Use eval-when instead of eval-when-compile

[jscl.git] / src / array.lisp

diff --git a/src/array.lisp b/src/array.lisp
index b66d87c..a15b4eb 100644 (file)
--- a/src/array.lisp
+++ b/src/array.lisp
@@ -13,6 +13,8 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
 
+(/debug "loading array.lisp!")
+
 (defun upgraded-array-element-type (typespec &optional environment)
   (declare (ignore environment))
   (if (eq typespec 'character)
@@ -73,6 +75,16 @@
     (error "~S is not an array." array))  
   (storage-vector-set array index value))
 
+(define-setf-expander aref (array index)
+  (let ((g!array (gensym))
+        (g!index (gensym))
+        (g!value (gensym)))
+    (values (list g!array g!index)
+            (list array index)
+            (list g!value)
+            `(aset ,g!array ,g!index ,g!value)
+            `(aref ,g!array ,g!index))))
+
 
 ;;; Vectors
 
@@ -80,12 +92,7 @@
   (and (arrayp x) (null (cdr (array-dimensions x)))))
 
 (defun vector (&rest objects)
-  (let* ((length (length objects))
-        (array (make-array length :element-type t))
-        (i 0))
-    (dolist (element objects array)  ;; poor-man's :initial-contents
-      (aset array i element)
-      (incf i))))
+  (list-to-vector objects))
 
 ;;; FIXME: should take optional min-extension.
 ;;; FIXME: should use fill-pointer instead of the absolute end of array