Changeset 38872 in project

Timestamp:

08/22/20 20:08:55 (5 weeks ago)

Author:

Kon Lovett

Message:

use ! on new cons, use type variable

Location:

release/5/slib-arraymap/trunk

Files:

• slib-arraymap.egg (modified) (2 diffs)
• slib-arraymap.scm (modified) (3 diffs)
• tests/slib-arraymap-test.scm (modified) (1 diff)

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

@@ -2 +2 @@
 ;;;; Kon Lovett, Mar '20
 
-((synopsis "The SLIB applicative routines for arrays library")
- (version "1.1.1")
+((synopsis "The SLIB applicative routines for the arrays library")
+ (version "1.2.1")
  (author "Aubrey Jaffer")
  (maintainer "[[kon lovett]]")
@@ -9 +9 @@
  (license "Artistic")
  (category data)
- (dependencies
-  (srfi-63 "0.5") )
+ (dependencies srfi-1 srfi-63)
  (test-dependencies test)
  (components
   (extension slib-arraymap
     (types-file)
-    (csc-options
-      "-O3" "-d1" "-local"
-      "-no-procedure-checks-for-toplevel-bindings") ) ) )
+    (csc-options "-O3" "-d1" "-strict-types" "-no-procedure-checks-for-toplevel-bindings") ) ) )

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

@@ -10 +10 @@
   array-index-for-each
   array-index-map!
-  array:copy!
+  array-copy!
   array-copy
-  array-fold)
+  array-fold
+  ;
+  array:copy!)
 
 (import scheme)
 (import (chicken module))
-(import (only (chicken base) include))
+(import (only (chicken base) include cut))
+(import (rename (chicken base) (sub1 1-) (add1 1+)))
 (import (chicken type))
+(import (only (srfi 1) reverse!))
 (import (srfi 63))
 
@@ -36 +40 @@
 (: array-index-map! (array (#!rest -> *) -> void))
 (: array:copy! (array array -> void))
+(: array-copy! (array array -> void))
 
 (: array-copy (array -> array))
-(: array-fold (procedure * #!rest array -> *))
+(: array-fold (('r #!rest -> 'r) 'r #!rest array -> 'r))
 
 (include "arraymap")
+
+(define array-copy! array:copy!)
 
 (define (array-copy src)
@@ -51 +58 @@
     (if (null? (cdr rdims))
       (let* (
-        (sdni (reverse (cons #f inds)))
+        (sdni (reverse! (cons #f inds)))
         (lastpair (last-pair sdni)) )
-        (do ((i 0 (+ 1 i)))
-            ((> i (+ -1 (car rdims))))
+        (do ((i 0 (1+ i)))
+            ((> i (1- (car rdims))))
           (set-car! lastpair i)
-          (set! seed (apply proc seed (map (lambda (x) (apply array-ref x sdni)) ras))) ) )
+          (set! seed (apply proc seed (map (cut apply array-ref <> sdni) ras))) ) )
       (let (
         (crdims (cdr rdims))
-        (ll (+ -1 (car rdims))) )
-        (do ((i 0 (+ 1 i)))
+        (ll (1- (car rdims))) )
+        (do ((i 0 (1+ i)))
             ((> i ll))
           (rafo crdims (cons i inds)) ) ) ) )

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

@@ -20 +20 @@
 (test-assert "TBD array-index-for-each" array-index-for-each)
 (test-assert "TBD array-index-map!" array-index-map!)
-(test-assert "TBD array:copy!" array:copy!)
+(test-assert "TBD array-copy!" array-copy!)
 
 (let* (