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

Basically write begin-with-definitions here by hand, which _does_ work.

Browse Source 
So that should pretty much give us unit contracts, modulo whether we can
separate out the projections so that contracts aren't checked twice
inappropriately.

svn: r13047

original commit: bae2c7b5e121448891289fde194ffbaaced33a24
This commit is contained in:
Stevie Strickland 2009-01-09 19:08:03 +00:00
parent 81e4bee047
commit ea41bc867d
1 changed files with 79 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
collects/mzlib/unit.ss
View File

@ -10,7 +10,6 @@
"private/unit-syntax.ss") "private/unit-syntax.ss")
(require mzlib/contract (require mzlib/contract
mzlib/etc
"private/unit-keywords.ss" "private/unit-keywords.ss"
"private/unit-runtime.ss") "private/unit-runtime.ss")
@ -695,18 +694,24 @@
(var-info-id defid))))) (var-info-id defid)))))
(syntax->list (localify #'ivars def-ctx))) (syntax->list (localify #'ivars def-ctx)))
(with-syntax ([(defn&expr ...) (let-values ([(stx-defns val-defns exprs)
(apply (let sort-clauses ([remaining expanded-body]
append [stx-clauses null]
(map (lambda (defn-or-expr) [val-clauses null]
[exprs null])
(if (null? remaining)
(values (reverse stx-clauses)
(reverse val-clauses)
(if (null? exprs)
(list #'(void))
(reverse exprs)))
(let ([defn-or-expr (car remaining)])
(syntax-case defn-or-expr (define-values define-syntaxes) (syntax-case defn-or-expr (define-values define-syntaxes)
[(define-values () expr) [(define-values (id ...) expr)
defn-or-expr] (let*-values ([(ids) (syntax->list #'(id ...))]
[(define-values ids expr) [(tmps) (generate-temporaries ids)]
(let* ([ids (syntax->list #'ids)] [(new-val-clause) (quasisyntax/loc defn-or-expr
[tmps (generate-temporaries ids)] (#,(map (λ (id tmp)
[new-defn (quasisyntax/loc defn-or-expr
(define-values #,(map (lambda (id tmp)
(if (var-info-exported? (if (var-info-exported?
(bound-identifier-mapping-get (bound-identifier-mapping-get
defined-names-table defined-names-table
@ -714,9 +719,16 @@
tmp tmp
id)) id))
ids tmps) expr))] ids tmps) expr))]
[do-one [(extra-stx-clauses extra-exprs)
(lambda (id tmp) (let loop ([ids ids]
(let ([unit-name [tmps tmps]
[stx-clauses null]
[exprs null])
(if (null? ids)
(values stx-clauses exprs)
(let* ([id (car ids)]
[tmp (car tmps)]
[unit-name
(syntax-local-infer-name (error-syntax))] (syntax-local-infer-name (error-syntax))]
[export-loc [export-loc
(var-info-exported? (var-info-exported?
@ -729,24 +741,45 @@
defined-names-table defined-names-table
id))]) id))])
(cond (cond
(export-loc [export-loc
;; set! exported id: ;; set! exported id:
(list (loop (cdr ids)
(quasisyntax/loc defn-or-expr (cdr tmps)
(cons (quasisyntax/loc defn-or-expr
((#,id) (make-id-mapper (quote-syntax #,tmp))))
stx-clauses)
(cons (quasisyntax/loc defn-or-expr
(set-box! #,export-loc (set-box! #,export-loc
(let ([#,id #,(if add-ctc (add-ctc tmp) tmp)]) (let ([#,id #,(if add-ctc (add-ctc tmp) tmp)])
#,id))) #,id)))
(quasisyntax/loc defn-or-expr exprs))]
(define-syntax #,id [else
(make-id-mapper (quote-syntax #,tmp))))))
(else
;; not an exported id ;; not an exported id
null))))]) (loop (cdr ids)
(cons new-defn (apply append (map do-one ids tmps))))] (cdr tmps)
[else (list defn-or-expr)])) stx-clauses
expanded-body))]) exprs)]))))])
#'(begin-with-definitions (sort-clauses (cdr remaining)
defn&expr ...))))))) (append extra-stx-clauses stx-clauses)
(cons new-val-clause
(append (map (λ (s) #`(() (begin #,s (values)))) exprs)
val-clauses))
extra-exprs))]
[(define-syntaxes (id ...) expr)
(sort-clauses (cdr remaining)
(cons (cdr (syntax->list defn-or-expr))
stx-clauses)
val-clauses
exprs)]
[else
(sort-clauses (cdr remaining)
stx-clauses
val-clauses
(cons defn-or-expr exprs))]))))])
(with-syntax ([(stx-clause ...) stx-defns]
[(val-clause ...) val-defns]
[(expr ...) exprs])
#'(letrec-syntaxes+values (stx-clause ...) (val-clause ...) expr ...))))))))
(define-for-syntax (redirect-imports/exports import?) (define-for-syntax (redirect-imports/exports import?)
(lambda (table-stx (lambda (table-stx