From a3fc738f1e78985f1057370c109502b588dbd48f Mon Sep 17 00:00:00 2001 From: ram <ram> Date: Thu, 29 Sep 1994 14:41:07 +0000 Subject: [PATCH] Fixed adjust-array to not flame out on arrays containing a zero-length dimension (hence having no elements whatsoever.) --- code/array.lisp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/array.lisp b/code/array.lisp index fb3e7dc62..af16dac79 100644 --- a/code/array.lisp +++ b/code/array.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.18 1993/08/06 13:06:05 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.19 1994/09/29 14:41:07 ram Exp $") ;;; ;;; ********************************************************************** ;;; @@ -718,9 +718,13 @@ element-type () initial-element initial-element-p) old-data))) - (zap-array-data old-data (array-dimensions array) old-start - new-data dimensions new-length element-type - initial-element initial-element-p) + (if (or (zerop old-length) (zerop new-length)) + (when initial-element-p (fill new-data initial-element)) + (zap-array-data old-data (array-dimensions array) + old-start + new-data dimensions new-length + element-type initial-element + initial-element-p)) (set-array-header array new-data new-length new-length 0 dimensions nil))))))))) -- GitLab