From 4c34c318c3ce3fbf70d443a18f60a825806fcc44 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 19 Aug 2015 21:59:50 -0400
Subject: [PATCH] Relocated any/every to base

---
 scheme/base.sld         | 20 ++++++++++++++++++++
 scheme/cyclone/util.sld | 19 -------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/scheme/base.sld b/scheme/base.sld
index 38d687b3..ab758b92 100644
--- a/scheme/base.sld
+++ b/scheme/base.sld
@@ -80,6 +80,8 @@
     flush-output-port
     read-line
     features
+    any
+    every
     and
     or
     begin
@@ -513,4 +515,22 @@
   ;    (if (null? *exception-handler-stack*)
   ;      Cyc-default-exception-handler
   ;      (car *exception-handler-stack*)))
+
+  ;; Simplified versions of every/any from SRFI-1
+  (define (any pred lst)
+    (let any* ((l (map pred lst)))
+        (cond
+          ((null? l) #f) ; Empty list
+          ((car l)   #t) ; Done
+          (else 
+             (any* (cdr l))))))
+  (define (every pred lst)
+    (let every* ((l (map pred lst)))
+        (cond
+          ((null? l) #t) ; Empty list
+          ((car l)
+             (every* (cdr l)))
+          (else 
+             #f))))
+
 ))
diff --git a/scheme/cyclone/util.sld b/scheme/cyclone/util.sld
index 39528aaa..4a5c1a0f 100644
--- a/scheme/cyclone/util.sld
+++ b/scheme/cyclone/util.sld
@@ -22,8 +22,6 @@
     delete
     delete-duplicates
     list-insert-at!
-    any
-    every
     filter)
   (begin
 
@@ -131,21 +129,4 @@
    ))
 ;; END name mangling section
 
-    ;; Simplified versions of every/any from SRFI-1
-    (define (any pred lst)
-      (let any* ((l (map pred lst)))
-          (cond
-            ((null? l) #f) ; Empty list
-            ((car l)   #t) ; Done
-            (else 
-               (any* (cdr l))))))
-    (define (every pred lst)
-      (let every* ((l (map pred lst)))
-          (cond
-            ((null? l) #t) ; Empty list
-            ((car l)
-               (every* (cdr l)))
-            (else 
-               #f))))
-
     ))