From 0c21cd345f373594d807e2fa2af03085d6f8d58c Mon Sep 17 00:00:00 2001 From: Liam Healy <liam@thinkpad.local> Date: Sat, 13 Mar 2010 22:03:12 -0500 Subject: [PATCH] Create marrays with grid:make-grid Creating marrays with grid:make-grid would fail because grid:make-grid-data incorrectly passed a NIL if :initial-element was not specified. --- data/marray.lisp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data/marray.lisp b/data/marray.lisp index 4c34e020..7829ff5e 100644 --- a/data/marray.lisp +++ b/data/marray.lisp @@ -1,6 +1,6 @@ ;; A "marray" is an array in both GSL and CL ;; Liam Healy 2008-04-06 21:23:41EDT -;; Time-stamp: <2010-03-13 19:44:21EST marray.lisp> +;; Time-stamp: <2010-03-13 21:35:46EST marray.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -157,11 +157,10 @@ (pushnew 'marray grid:*grid-data-superclasses*)) (defmethod grid:make-grid-data - ((type (eql 'marray)) dimensions rest-spec - &key initial-element) - (make-marray (grid:spec-scalar-p rest-spec) - :dimensions dimensions - :initial-element initial-element)) + ((type (eql 'marray)) dimensions rest-spec &rest keys) + (apply #'make-marray (grid:spec-scalar-p rest-spec) + :dimensions dimensions + keys)) ;;; The reader macro #m will read a list of arguments, evaluating the ;;; contents, and construct a marray from it. If the symbol ^ occurs -- GitLab