array-map! source args

array-map! source args

[Kevin Ryde]

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

I think the change in 1.6 to array-map! to check for no source args is
too strict, it rejects one source arg, eg.

	(array-map! #(1 2) noop #(3 4))
	=>
	<unnamed port>:1:7: In procedure array-map! in expression (array-map! #(1 2) noop ...):
	<unnamed port>:1:7: At least one source array is required.
	ABORT: (misc-error)

I'm thinking of

        * ramap.c (scm_array_map_x): Correction to sources list check, only
        need at least one source, not two.  And use SCM_WRONG_NUM_ARGS() for
        the error.

Likewise in the head (which hasn't had this check at all yet).


[-- Attachment #2: ramap.c.sources.diff --]
[-- Type: text/plain, Size: 416 bytes --]

--- ramap.c.~1.77.2.6.~	2004-11-26 08:44:37.000000000 +1100
+++ ramap.c	2004-12-14 10:20:16.000000000 +1100
@@ -1529,10 +1529,8 @@
 {
   SCM_VALIDATE_PROC (2,proc);
 
-  if (!(SCM_CONSP (sources) && SCM_CONSP (SCM_CDR (sources))))
-    {
-      SCM_MISC_ERROR ("At least one source array is required.", SCM_EOL);
-    }
+  if (!(SCM_CONSP (sources)))
+    SCM_WRONG_NUM_ARGS ();
 
   switch (SCM_TYP7 (proc))
     {

[-- Attachment #3: ramap.test --]
[-- Type: text/plain, Size: 2950 bytes --]

;;;; ramap.test --- test array mapping functions -*- scheme -*-
;;;; 
;;;; Copyright (C) 2004 Free Software Foundation, Inc.
;;;; 
;;;; This program 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 2, or (at your option)
;;;; any later version.
;;;; 
;;;; This program 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 this software; see the file COPYING.  If not, write to
;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
;;;; Boston, MA 02111-1307 USA
;;;;
;;;; As a special exception, the Free Software Foundation gives permission
;;;; for additional uses of the text contained in its release of GUILE.
;;;;
;;;; The exception is that, if you link the GUILE library with other files
;;;; to produce an executable, this does not by itself cause the
;;;; resulting executable to be covered by the GNU General Public License.
;;;; Your use of that executable is in no way restricted on account of
;;;; linking the GUILE library code into it.
;;;;
;;;; This exception does not however invalidate any other reasons why
;;;; the executable file might be covered by the GNU General Public License.
;;;;
;;;; This exception applies only to the code released by the
;;;; Free Software Foundation under the name GUILE.  If you copy
;;;; code from other Free Software Foundation releases into a copy of
;;;; GUILE, as the General Public License permits, the exception does
;;;; not apply to the code that you add in this way.  To avoid misleading
;;;; anyone as to the status of such modified files, you must delete
;;;; this exception notice from them.
;;;;
;;;; If you write modifications of your own for GUILE, it is your choice
;;;; whether to permit this exception to apply to your modifications.
;;;; If you do not wish that, delete this exception notice.  

(define-module (test-suite test-ramap)
  #:use-module (test-suite lib))

;;;
;;; array-map!
;;;

(with-test-prefix "array-map!"

  (pass-if-exception "no args" exception:wrong-num-args
    (array-map!))

  (pass-if-exception "one args" exception:wrong-num-args
    (array-map! (make-array #f 5)))

  ;; prior to Guile 1.6.5 this resulted in a segv
  (pass-if-exception "two args" '(misc-error . ".*")
    (array-map! (make-array #f 5) noop))

  ;; in Guile 1.6.5 and 1.6.6 this was an error
  (pass-if "two args"
    (let ((a (make-array #f 5)))
      (array-map! a 1+ (make-array 123 5))
      (equal? a (make-array 124 5))))

  (pass-if "three args"
    (let ((a (make-array #f 4)))
      (array-map! a + #(1 2 3 4) #(5 6 7 8))
      (equal? a #(6 8 10 12)))))

[-- Attachment #4: Type: text/plain, Size: 143 bytes --]

_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/guile-devel