Rename arrays.lisp to array.lisp

diff --git a/jscl.lisp b/jscl.lisp
index 0f0e6be..9231640 100644 (file)
--- a/jscl.lisp
+++ b/jscl.lisp
@@ -28,7 +28,7 @@
     ("utils"            :both)
     ("numbers"          :target)
     ("list"             :target)
-    ("arrays"           :target)
+    ("array"            :target)
     ("string"           :target)
     ("sequence"         :target)
     ("print"            :target)

diff --git a/src/array.lisp b/src/array.lisp
new file mode 100644 (file)
index 0000000..a90a4bc
--- /dev/null
+++ b/src/array.lisp
@@ -0,0 +1,84 @@
+;;; arrays.lisp
+
+;; JSCL is free software: you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+;;
+;; JSCL is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
+
+(defun upgraded-array-element-type (typespec &optional environment)
+  (declare (ignore environment))
+  (if (eq typespec 'character)
+      'character
+      t))
+
+(defun make-array (dimensions &key element-type initial-element adjustable fill-pointer)
+  (let* ((dimensions (ensure-list dimensions))
+         (size (!reduce #'* dimensions 1))
+         (array (make-storage-vector size)))
+    ;; Upgrade type
+    (if (eq element-type 'character)
+        (setf element-type 'character
+              initial-element (or initial-element #\space))
+        (setf element-type t))
+    ;; Initialize array
+    (dotimes (i size)
+      (storage-vector-set array i initial-element))
+    ;; Record and return the object
+    (oset array "type" element-type)
+    (oset array "dimensions" dimensions)
+    array))
+
+
+(defun arrayp (x)
+  (storage-vector-p x))
+
+(defun adjustable-array-p (array)
+  (unless (arrayp array)
+    (error "~S is not an array." array))
+  t)
+
+(defun array-element-type (array)
+  (unless (arrayp array)
+    (error "~S is not an array." array))
+  (oget array "type"))
+
+(defun array-dimensions (array)
+  (unless (arrayp array)
+    (error "~S is not an array." array))
+  (oget array "dimensions"))
+
+;; TODO: Error checking
+(defun array-dimension (array axis)
+  (nth axis (array-dimensions array)))
+
+(defun aref (array index)
+  (unless (arrayp array)
+    (error "~S is not an array." array))  
+  (storage-vector-ref array index))
+
+(defun aset (array index value)
+  (unless (arrayp array)
+    (error "~S is not an array." array))  
+  (storage-vector-set array index value))
+
+
+;;; Vectors
+
+(defun vectorp (x)
+  (and (arrayp x) (null (cdr (array-dimensions x)))))
+
+;;; FIXME: should take optional min-extension.
+;;; FIXME: should use fill-pointer instead of the absolute end of array
+(defun vector-push-extend (new vector)
+  (let ((size (storage-vector-size vector)))
+    (resize-storage-vector vector (1+ size))
+    (aset vector size new)
+    size))

diff --git a/src/arrays.lisp b/src/arrays.lisp
deleted file mode 100644 (file)
index a90a4bc..0000000
--- a/src/arrays.lisp
+++ /dev/null
@@ -1,84 +0,0 @@
-;;; arrays.lisp
-
-;; JSCL is free software: you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation, either version 3 of the
-;; License, or (at your option) any later version.
-;;
-;; JSCL is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
-
-(defun upgraded-array-element-type (typespec &optional environment)
-  (declare (ignore environment))
-  (if (eq typespec 'character)
-      'character
-      t))
-
-(defun make-array (dimensions &key element-type initial-element adjustable fill-pointer)
-  (let* ((dimensions (ensure-list dimensions))
-         (size (!reduce #'* dimensions 1))
-         (array (make-storage-vector size)))
-    ;; Upgrade type
-    (if (eq element-type 'character)
-        (setf element-type 'character
-              initial-element (or initial-element #\space))
-        (setf element-type t))
-    ;; Initialize array
-    (dotimes (i size)
-      (storage-vector-set array i initial-element))
-    ;; Record and return the object
-    (oset array "type" element-type)
-    (oset array "dimensions" dimensions)
-    array))
-
-
-(defun arrayp (x)
-  (storage-vector-p x))
-
-(defun adjustable-array-p (array)
-  (unless (arrayp array)
-    (error "~S is not an array." array))
-  t)
-
-(defun array-element-type (array)
-  (unless (arrayp array)
-    (error "~S is not an array." array))
-  (oget array "type"))
-
-(defun array-dimensions (array)
-  (unless (arrayp array)
-    (error "~S is not an array." array))
-  (oget array "dimensions"))
-
-;; TODO: Error checking
-(defun array-dimension (array axis)
-  (nth axis (array-dimensions array)))
-
-(defun aref (array index)
-  (unless (arrayp array)
-    (error "~S is not an array." array))  
-  (storage-vector-ref array index))
-
-(defun aset (array index value)
-  (unless (arrayp array)
-    (error "~S is not an array." array))  
-  (storage-vector-set array index value))
-
-
-;;; Vectors
-
-(defun vectorp (x)
-  (and (arrayp x) (null (cdr (array-dimensions x)))))
-
-;;; FIXME: should take optional min-extension.
-;;; FIXME: should use fill-pointer instead of the absolute end of array
-(defun vector-push-extend (new vector)
-  (let ((size (storage-vector-size vector)))
-    (resize-storage-vector vector (1+ size))
-    (aset vector size new)
-    size))