std/iter: use #f for default finalizer and check in iter-fini!

turns cross-module calls in the default construction into a boolean check.
adam-7 · Nov 12, 2019 · bea4bca · bea4bca
1 parent f1ab42e
commit bea4bca
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/std/iter.ss b/src/std/iter.ss
@@ -21,7 +21,7 @@
   constructor: :init! unchecked: #t final: #t)
 
 (defmethod {:init! iterator}
-  (lambda (self e next (fini void))
+  (lambda (self e next (fini #f))
     (struct-instance-init! self e next fini)))
 
 (defstruct :iter-end ())
@@ -218,10 +218,12 @@
 
 (def (iter-fini! it)
   (declare (not safe))
-  ((&iterator-fini it) it))
+  (@iter-fini! it))
 
 (defrules @iter-fini! ()
-  ((_ it) ((&iterator-fini it) it)))
+  ((_ it)
+   (cond
+    ((&iterator-fini it) => (cut <> it)))))
 
 (def (iter-filter pred it)
   (def (iterate)