suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix again

Browse Source 
svn: r9520
This commit is contained in:
Sam Tobin-Hochstadt 2008-04-28 21:21:29 +00:00
parent 032a4eb7b9
commit 0255f00130
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
collects/typed-scheme/private/unit-utils.ss
View File

@ -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