Nix compose-comparator syntax, rename composed to product comparator

1 files changed, 1 insertions, 23 deletions

diff --git a/composing-comparators.scm b/composing-comparators.scm
index c6b6c7d..3356797 100644
--- a/composing-comparators.scm
+++ b/composing-comparators.scm
@@ -16,7 +16,7 @@
         ((comparator-hash-function contents-comparator) x))
       #f)))
 
-(define (make-composed-comparator type-test . comparators)
+(define (make-product-comparator type-test . comparators)
   (make-comparator
    type-test
    (if (every comparator-equality-predicate comparators)
@@ -43,28 +43,6 @@
                                (list->generator comparators))))
        #f)))
 
-(define-syntax compose-comparator
-  (syntax-rules ()
-    ((_ type-test (unwrap . more) ...)
-     (make-composed-comparator
-      type-test
-      (let-values (((unwrap cmp) (compose-comparator-form unwrap . more)))
-        (make-wrapper-comparator
-         (comparator-type-test-predicate cmp)
-         unwrap
-         cmp)) ...))))
-
-(define-syntax compose-comparator-form
-  ;; Using this submacro enables enforcement of the correct form with
-  ;; moderately more useful syntax errors than doing it the SRFI 9
-  ;; way, at least within the limited bounds of what one can do for
-  ;; that in syntax-rules.
-  (syntax-rules ()
-    ((_ unwrap) (compose-comparator-form unwrap (make-default-comparator)))
-    ((_ unwrap cmp)
-     (values
-      unwrap cmp))))
-
 (define (comparison-procedures comparator)
   (values
    (lambda args (apply <? comparator args))