~ chicken-core (chicken-5) dede8e271247b38f93dadcd0cf112da5d6b61e74
commit dede8e271247b38f93dadcd0cf112da5d6b61e74
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Jan 28 11:53:39 2015 +0100
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Wed Jan 28 11:53:39 2015 +0100
Removed srfi-1 from tests.
diff --git a/tests/apply-test.scm b/tests/apply-test.scm
index 155aa70a..568b9678 100644
--- a/tests/apply-test.scm
+++ b/tests/apply-test.scm
@@ -1,4 +1,12 @@
-(require-extension srfi-1 extras)
+(require-extension extras)
+
+(define (list-tabulate n proc)
+ (let loop ((i 0))
+ (if (fx>= i n)
+ '()
+ (cons (proc i) (loop (fx+ i 1))))))
+
+(define (iota n) (list-tabulate n (lambda (i) i)))
(define max-argcount ##sys#apply-argument-limit)
diff --git a/tests/breadth-first.scm b/tests/breadth-first.scm
index 0b8bac2f..ad144bd2 100644
--- a/tests/breadth-first.scm
+++ b/tests/breadth-first.scm
@@ -6,10 +6,9 @@
(functor (breadth-first (Q QUEUE)) (search)
(import scheme chicken Q)
- (use srfi-1)
(define (enqlist q xs)
- (fold (lambda (x q) (enqueue q x)) q xs))
+ (foldl (lambda (q x) (enqueue q x)) q xs))
(define (search next x)
(define (bfs q)
diff --git a/tests/environment-tests.scm b/tests/environment-tests.scm
index 2d7c081b..86cb598b 100644
--- a/tests/environment-tests.scm
+++ b/tests/environment-tests.scm
@@ -40,13 +40,11 @@
(define (bar) 99))
(define foo-env (module-environment 'foo))
-(define srfi-1-env (module-environment 'srfi-1))
-
-(require-library srfi-1)
+(define srfi-4-env (module-environment 'srfi-4))
(test-equal (eval '(bar) foo-env) 99)
(test-error (eval 'baz foo-env))
-(test-equal (eval '(xcons 1 2) srfi-1-env) '(2 . 1))
-(test-error (eval 'baz srf-1-env))
+(test-equal (eval '(u8vector 1 2) srfi-4-env) '#u8(1 2))
+(test-error (eval 'baz srf-4-env))
(test-end)
diff --git a/tests/functor-tests.scm b/tests/functor-tests.scm
index 1a05266c..b7975849 100644
--- a/tests/functor-tests.scm
+++ b/tests/functor-tests.scm
@@ -1,7 +1,7 @@
;;;; functor-tests.scm
-(use srfi-1 data-structures extras)
+(use data-structures extras)
(include "test.scm")
@@ -69,6 +69,12 @@
(import (rename test-q2 (list->queue l2q2) (queue->list q2l2)))
(import (rename test-q3 (list->queue l2q3) (queue->list q2l3)))
+(define (list-tabulate n proc)
+ (let loop ((i 0))
+ (if (fx>= i n)
+ '()
+ (cons (proc i) (loop (fx+ i 1))))))
+
(define long-list (list-tabulate (cond-expand (csi 500) (else 1000)) identity))
(print "Queue representation #1:")
diff --git a/tests/library-tests.scm b/tests/library-tests.scm
index bbe27191..0a20acd4 100644
--- a/tests/library-tests.scm
+++ b/tests/library-tests.scm
@@ -1,6 +1,6 @@
;;;; library-tests.scm
-(use srfi-1 extras ports)
+(use extras ports)
(define-syntax assert-fail
(syntax-rules ()
diff --git a/tests/locative-stress-test.scm b/tests/locative-stress-test.scm
index 9d36ea0d..eb53a971 100644
--- a/tests/locative-stress-test.scm
+++ b/tests/locative-stress-test.scm
@@ -4,7 +4,6 @@
;(set-gc-report! #t)
-(require-extension srfi-1)
#>
long *ptrs[10];
@@ -36,6 +35,15 @@ long fill_10(long i, long *o0, long *o1, long *o2, long *o3, long *o4,
(c-pointer long) (c-pointer long) (c-pointer long)
(c-pointer long)))
+(define (make-list n x)
+ (list-tabulate n (lambda _ x)))
+
+(define (list-tabulate n proc)
+ (let loop ((i 0))
+ (if (fx>= i n)
+ '()
+ (cons (proc i) (loop (fx+ i 1))))))
+
(let* ((el 1)
(expected (make-list 10 el)))
(let loop
diff --git a/tests/module-tests.scm b/tests/module-tests.scm
index 45b0cd7d..df782a98 100644
--- a/tests/module-tests.scm
+++ b/tests/module-tests.scm
@@ -160,8 +160,8 @@
(module m15 ()
(import scheme chicken)
- (use (prefix (rename srfi-1 (filter f)) 99:))
- (print 99:f))
+ (use (prefix (rename srfi-4 (u8vector u)) 99:))
+ (print 99:u))
;;; expansion of macros into modules:
diff --git a/tests/numbers-string-conversion-tests.scm b/tests/numbers-string-conversion-tests.scm
index 3c19c24d..885a1d20 100644
--- a/tests/numbers-string-conversion-tests.scm
+++ b/tests/numbers-string-conversion-tests.scm
@@ -12,13 +12,19 @@
;;; It also doesn't try to support Schemes which support *only* integers or
;;; *only* flonums (which is also allowed by R5RS).
;;;
-(use srfi-1 ports)
+(use ports)
(define the-nan (fp/ 0.0 0.0))
(define pos-inf (fp/ 1.0 0.0))
(define neg-inf (fp/ -1.0 0.0))
(define neg-zero (/ -1.0 +inf.0))
+(define (any pred lst)
+ (let loop ((lst lst))
+ (cond ((null? lst) #f)
+ ((pred (car lst)))
+ (else (loop (cdr lst))))))
+
(define (nan? x) (and (number? x) (not (= x x))))
(define total-errors 0)
diff --git a/tests/port-tests.scm b/tests/port-tests.scm
index 35777946..2f70ecf5 100644
--- a/tests/port-tests.scm
+++ b/tests/port-tests.scm
@@ -1,4 +1,4 @@
-(require-extension srfi-1 ports utils srfi-4 extras tcp posix)
+(require-extension ports utils srfi-4 extras tcp posix)
(include "test.scm")
(test-begin)
diff --git a/tests/reexport-m1.scm b/tests/reexport-m1.scm
index ae186199..2df1e4da 100644
--- a/tests/reexport-m1.scm
+++ b/tests/reexport-m1.scm
@@ -2,5 +2,5 @@
(module reexport-m1 ()
(import scheme chicken)
- (require-library srfi-1)
- (reexport (only srfi-1 cons*)))
+ (require-library srfi-4)
+ (reexport (only srfi-4 u8vector)))
diff --git a/tests/rev-app.scm b/tests/rev-app.scm
index ce1aacad..a044ee0a 100644
--- a/tests/rev-app.scm
+++ b/tests/rev-app.scm
@@ -1,4 +1,11 @@
-(use reverser srfi-1)
+(use reverser)
+
+(define (last lst)
+ (let loop ((lst lst))
+ (if (null? (cdr lst))
+ (car lst)
+ (loop (cdr lst)))))
+
(assert (equal? "oof" (rev "foo")))
(assert (equal? '(a b c) (rev '(c b a))))
(assert (= rev-version (string->number (last (command-line-arguments)))))
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 5e970a61..7bf282ef 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -37,7 +37,7 @@ mkdir -p test-repository
for x in setup-api.so setup-api.import.so setup-download.so \
setup-download.import.so chicken.import.so lolevel.import.so \
- srfi-1.import.so srfi-4.import.so data-structures.import.so \
+ srfi-4.import.so data-structures.import.so \
ports.import.so files.import.so posix.import.so \
extras.import.so \
irregex.import.so tcp.import.so \
diff --git a/tests/sgrep.scm b/tests/sgrep.scm
index ad3548f4..ebd8c51a 100644
--- a/tests/sgrep.scm
+++ b/tests/sgrep.scm
@@ -1,7 +1,7 @@
;;;; sgrep.scm - grepping benchmark
-(use irregex extras utils posix srfi-1)
+(use irregex extras utils posix)
(define big-string
diff --git a/tests/srfi-4-tests.scm b/tests/srfi-4-tests.scm
index 8b781403..59e265d7 100644
--- a/tests/srfi-4-tests.scm
+++ b/tests/srfi-4-tests.scm
@@ -1,7 +1,7 @@
;;;; srfi-4-tests.scm
-(use srfi-1 srfi-4 ports)
+(use srfi-4 ports)
(define-syntax test1
diff --git a/tests/syntax-tests.scm b/tests/syntax-tests.scm
index ba9b3fcd..8839427f 100644
--- a/tests/syntax-tests.scm
+++ b/tests/syntax-tests.scm
@@ -1060,8 +1060,8 @@
;; #578: "use" with import-specifier has no effect for internal modules on csi's top-level
-(use (prefix srfi-1 list-))
-take
+(use (prefix srfi-4 u8v-))
+u8vector
;; #805: case-lambda is unhygienic (as well as ensure, see 4706afb4 and bc5cc698)
diff --git a/tests/test-finalizers-2.scm b/tests/test-finalizers-2.scm
index 1bdc1153..156d3a5a 100644
--- a/tests/test-finalizers-2.scm
+++ b/tests/test-finalizers-2.scm
@@ -1,7 +1,11 @@
;;;; test-finalizers-2.scm - test finalizers + GC roots
-(use srfi-1)
+(define (list-tabulate n proc)
+ (let loop ((i 0))
+ (if (fx>= i n)
+ '()
+ (cons (proc i) (loop (fx+ i 1))))))
(define *n* 1000)
(define *count* 0)
diff --git a/tests/typematch-tests.scm b/tests/typematch-tests.scm
index 930362fa..71fe84fa 100644
--- a/tests/typematch-tests.scm
+++ b/tests/typematch-tests.scm
@@ -1,9 +1,18 @@
;;;; typematch-tests.scm
-(use srfi-1 lolevel data-structures)
+(use lolevel data-structures)
+(define (make-list n x)
+ (list-tabulate n (lambda _ x)))
+
+(define (list-tabulate n proc)
+ (let loop ((i 0))
+ (if (fx>= i n)
+ '()
+ (cons (proc i) (loop (fx+ i 1))))))
+
(define-syntax check
(syntax-rules ()
((_ x not-x t)
Trap