From 0255f00130ec31a0b9b3ddaa0ce42ee1df5d9db8 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Mon, 28 Apr 2008 21:21:29 +0000 Subject: [PATCH] fix again svn: r9520 --- collects/typed-scheme/private/unit-utils.ss | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/collects/typed-scheme/private/unit-utils.ss b/collects/typed-scheme/private/unit-utils.ss index 3389f464c1..b802c60025 100644 --- a/collects/typed-scheme/private/unit-utils.ss +++ b/collects/typed-scheme/private/unit-utils.ss @@ -59,17 +59,11 @@ [imps* (map datum->sig-elem (filter (lambda (imp) (not (sig-in-sigs? imp exps))) imps))]) (values imps* exps*)))) -<<<<<<< HEAD:collects/typed-scheme/private/unit-utils.ss (define (duplicates? sigs) (for/or ([s sigs] #:when - (> 1 (length (for/list ([s* sigs]) (free-identifier=? s s*))))) + (> 1 (length (for/list ([s* sigs] #:when (free-identifier=? s s*)) s*)))) s)) -======= - (define (duplicates sigs) - (= (length sigs) - (length (s:delete-duplicates sigs sig=?)))) ->>>>>>> check for dups:collects/typed-scheme/private/unit-utils.ss (syntax-case stx (import export) ;; here the exports are specified - they ought to be a subset of the allowable exports @@ -82,18 +76,12 @@ (andmap identifier? (syntax->list #'units)) (let*-values ([(units) (syntax->list #'units)] [(imps exps) (imps/exps-from-units units)]) -<<<<<<< HEAD:collects/typed-scheme/private/unit-utils.ss (cond [(duplicates? exps) => (lambda (d) (raise-syntax-error #f (format "multiple units export the signature ~a" d) stx))] [else (mk (delete-duplicates imps) exps units stx)]))])) -======= - (when (duplicates? exps) - (raise-syntax-error #f "multiple units export the same signature" stx)) - (mk imps exps units stx))])) ->>>>>>> check for dups:collects/typed-scheme/private/unit-utils.ss ;; Tests