Changeset 38722 in project for release

Timestamp:

05/31/20 02:13:11 (8 months ago)

Author:

Kon Lovett

Message:

add types for -copy & -fold

File:

• release/5/slib-arraymap/trunk/slib-arraymap.scm (modified) (3 diffs)

release/5/slib-arraymap/trunk/slib-arraymap.scm

@@ -36 +36 @@
 (: array-index-map! (array (#!rest -> *) -> void))
 (: array:copy! (array array -> void))
+
 (: array-copy (array -> array))
+(: array-fold (procedure * #!rest array -> *))
 
 (include "arraymap")
@@ -46 +48 @@
 
 (define (array-fold proc seed . ras)
-  (import (only (chicken base) sub1 add1 cut))
   (let rafo ((rdims (array-dimensions (car ras))) (inds '()))
     (if (null? (cdr rdims))
@@ -52 +53 @@
         (sdni (reverse (cons #f inds)))
         (lastpair (last-pair sdni)) )
-        (do ((i 0 (add1 i)))
-            ((> i (sub1 (car rdims))))
+        (do ((i 0 (+ 1 i)))
+            ((> i (+ -1 (car rdims))))
           (set-car! lastpair i)
-          (set! seed (apply proc seed (map (cut apply array-ref <> sdni) ras))) ) )
+          (set! seed (apply proc seed (map (lambda (x) (apply array-ref x sdni)) ras))) ) )
       (let (
         (crdims (cdr rdims))
-        (ll (sub1 (car rdims))) )
-        (do ((i 0 (add1 i)))
+        (ll (+ -1 (car rdims))) )
+        (do ((i 0 (+ 1 i)))
             ((> i ll))
           (rafo crdims (cons i inds)) ) ) ) )