Browse files

Merge pull request #13 from nklein/updates-for-ccl

Applied patch previously sent for Clozure CL
  • Loading branch information...
2 parents 194a3fc + b236e3e commit b4c04819c01602318cf560f41fec850c1bc40b12 @tpapp committed Oct 4, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 src/array.lisp
  2. +1 −1 src/data-frame.lisp
@@ -347,10 +347,10 @@ ELEMENT-TYPE is deduced automatically, unless given."
(defgeneric map1 (function object &key element-type &allow-other-keys)
(:documentation "Map OBJECT elementwise using FUNCTION. Results in a
similar object, with specificed ELEMENT-TYPE where applicable.")
- (:method (function (array array) &key (element-type t))
+ (:method (function (array array) &key (element-type t) &allow-other-keys)
(aprog1 (make-array (array-dimensions array) :element-type element-type)
(map-into (flatten-array it) function (flatten-array array))))
- (:method (function (list list) &key)
+ (:method (function (list list) &key &allow-other-keys)
(mapcar function list)))
;;; subvector
@@ -376,7 +376,7 @@ ELEMENT-TYPE is deduced automatically, unless given."
which may nevertheless share structure with something. COPY? can be used to
avoid that. Other keyword arguments may make as-array return something
else (eg an array wrapped in a structure to indicate that it is special).")
- (:method ((array array) &key copy?)
+ (:method ((array array) &key copy? &allow-other-keys)
(maybe-copy-array array copy?)))
(defgeneric diagonal (object &key copy?)
@@ -525,7 +525,7 @@ of rows are established after the first function call, and are checked for
conformity after that -- when element-type is given, it is used instead. If
the function doesn't return a vector, the values are collected in a vector
instead of a matrix.")
- (:method (function (matrix array) &key element-type)
+ (:method (function (matrix array) &key element-type &allow-other-keys)
(let+ (((&ign ncol) (array-dimensions matrix))
@@ -553,7 +553,7 @@ instead of a matrix.")
(defgeneric map-rows (function object &key element-type &allow-other-keys)
(:documentation "Map rows of object (eg a matrix) using FUNCTION.")
- (:method (function (matrix array) &key (element-type t))
+ (:method (function (matrix array) &key (element-type t) &allow-other-keys)
(check-type matrix matrix)
;; FIXME: more efficient implementations should be possible
(combine (map 'vector function (subarrays 1 matrix)) element-type)))
@@ -33,7 +33,7 @@ Implementation notes:
(defmethod ncol ((data-frame data-frame))
(length (slot-value data-frame 'columns)))
-(defmethod as-array ((data-frame data-frame) &key)
+(defmethod as-array ((data-frame data-frame) &key &allow-other-keys)
(columns-to-matrix (slot-value data-frame 'columns)))
(defun copy-data-frame (data-frame &optional (map-columns #'identity))

0 comments on commit b4c0481

Please sign in to comment.