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

Rackety

Browse Source 
bring down below 102 columns
This commit is contained in:
Robby Findler 2014-04-28 21:18:47 -05:00
parent 305340502c
commit a628bf4040
1 changed files with 101 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
racket/collects/racket/contract/private/struct-dc.rkt
View File

@ -10,7 +10,8 @@
"opt-guts.rkt" "opt-guts.rkt"
"top-sort.rkt" "top-sort.rkt"
(only-in "ds-helpers.rkt" defeat-inlining) (only-in "ds-helpers.rkt" defeat-inlining)
(rename-in syntax/private/boundmap (rename-in
syntax/private/boundmap
;; the private version of the library ;; the private version of the library
;; (the one without contracts) ;; (the one without contracts)
;; has these old, wrong names in it. ;; has these old, wrong names in it.
@ -158,7 +159,8 @@
(blame-add-context blame (format "the ~a field of" (subcontract-field-name subcontract))))) (blame-add-context blame (format "the ~a field of" (subcontract-field-name subcontract)))))
(define orig-mut-blames (define orig-mut-blames
(for/list ([subcontract (in-list (base-struct/dc-subcontracts ctc))]) (for/list ([subcontract (in-list (base-struct/dc-subcontracts ctc))])
(blame-add-context blame (format "the ~a field of" (subcontract-field-name subcontract)) #:swap? #t))) (define ctxt-string (format "the ~a field of" (subcontract-field-name subcontract)))
(blame-add-context blame ctxt-string #:swap? #t)))
(define orig-indy-blames (define orig-indy-blames
(for/list ([subcontract (in-list (base-struct/dc-subcontracts ctc))]) (for/list ([subcontract (in-list (base-struct/dc-subcontracts ctc))])
(blame-replace-negative (blame-replace-negative
@ -364,9 +366,9 @@
(build-dep-on-state-proj (base-struct/dc-subcontracts ctc) subcontract strct (build-dep-on-state-proj (base-struct/dc-subcontracts ctc) subcontract strct
orig-indy-projs orig-indy-blames blame val))) orig-indy-projs orig-indy-blames blame val)))
(define (set-chap-proc strct val) (define (set-chap-proc strct val)
(with-continuation-mark (with-continuation-mark contract-continuation-mark-key blame
contract-continuation-mark-key blame (build-dep-on-state-proj
(build-dep-on-state-proj (base-struct/dc-subcontracts ctc) subcontract strct (base-struct/dc-subcontracts ctc) subcontract strct
orig-mut-indy-projs orig-mut-indy-blames mut-blame val))) orig-mut-indy-projs orig-mut-indy-blames mut-blame val)))
(if (eq? (dep-type subcontract) '#:impersonator) (if (eq? (dep-type subcontract) '#:impersonator)
(values chaperone-args (values chaperone-args
@ -400,12 +402,15 @@
[dep-args '()]) [dep-args '()])
(cond (cond
[(null? subcontracts) [(null? subcontracts)
(error 'build-dep-on-state-proj "ran out of subcontracts ~s ~s ~s" orig-subcontracts this-subcontract strct)] (error 'build-dep-on-state-proj
"ran out of subcontracts ~s ~s ~s"
orig-subcontracts this-subcontract strct)]
[else [else
(define subcontract (car subcontracts)) (define subcontract (car subcontracts))
(cond (cond
[(eq? subcontract this-subcontract) [(eq? subcontract this-subcontract)
(define the-ctc (coerce-contract 'struct/dc (apply (dep-dep-proc this-subcontract) dep-args))) (define the-ctc
(coerce-contract 'struct/dc (apply (dep-dep-proc this-subcontract) dep-args)))
(check-flat/chaperone the-ctc subcontract) (check-flat/chaperone the-ctc subcontract)
(((contract-projection the-ctc) blame) val)] (((contract-projection the-ctc) blame) val)]
[else [else
@ -437,12 +442,14 @@
(case (dep-type subcontract) (case (dep-type subcontract)
[(#:flat) [(#:flat)
(unless (flat-contract? dep-ctc) (unless (flat-contract? dep-ctc)
(raise-argument-error 'struct/dc (raise-argument-error
'struct/dc
(format "a flat-contract? for field ~a" (subcontract-field-name subcontract)) (format "a flat-contract? for field ~a" (subcontract-field-name subcontract))
dep-ctc))] dep-ctc))]
[(#:chaperone) [(#:chaperone)
(unless (chaperone-contract? dep-ctc) (unless (chaperone-contract? dep-ctc)
(raise-argument-error 'struct/dc (raise-argument-error
'struct/dc
(format "a chaperone-contract? for field ~a" (subcontract-field-name subcontract)) (format "a chaperone-contract? for field ~a" (subcontract-field-name subcontract))
dep-ctc))])) dep-ctc))]))
@ -507,7 +514,8 @@
(when (and (indep? subcontract) (when (and (indep? subcontract)
(not (mutable? subcontract))) (not (mutable? subcontract)))
(unless (chaperone-contract? (indep-ctc subcontract)) (unless (chaperone-contract? (indep-ctc subcontract))
(raise-argument-error 'struct/dc (raise-argument-error
'struct/dc
(format "a chaperone-contract? for field ~a" (subcontract-field-name subcontract)) (format "a chaperone-contract? for field ~a" (subcontract-field-name subcontract))
(indep-ctc subcontract))))) (indep-ctc subcontract)))))
(define (flat-subcontract? subcontract) (define (flat-subcontract? subcontract)
@ -557,8 +565,11 @@
(define selector-candidate (name->sel-id #'id sel-name)) (define selector-candidate (name->sel-id #'id sel-name))
(unless (for/or ([selector (in-list (list-ref info 3))]) (unless (for/or ([selector (in-list (list-ref info 3))])
(and selector (free-identifier=? selector-candidate selector))) (and selector (free-identifier=? selector-candidate selector)))
(raise-syntax-error 'struct/dc (raise-syntax-error
"expected an identifier that names a field or a sequence with a field name, the #:parent keyword, and the parent struct" 'struct/dc
(string-append
"expected an identifier that names a field or a sequence with a field name,"
" the #:parent keyword, and the parent struct")
stx stx
sel-name))) sel-name)))
@ -586,12 +597,15 @@
#t] #t]
[_else #f])) [_else #f]))
(define not-field-name-str "expected a field-name (either an identifier or a sequence: (selector-id #:parent struct-id))") (define not-field-name-str
(string-append "expected a field-name (either an identifier or a sequence:"
" (selector-id #:parent struct-id))"))
(define parsed-clauses (define parsed-clauses
(for/list ([clause (in-list (syntax->list #'(clauses ...)))]) (for/list ([clause (in-list (syntax->list #'(clauses ...)))])
(syntax-case clause () (syntax-case clause ()
[(sel-name (dep-name ...) stuff1 . stuff) ;; need stuff1 here so that things like [a (>=/c x)] do not fall into this case [(sel-name (dep-name ...) stuff1 . stuff)
;; need stuff1 here so that things like [a (>=/c x)] do not fall into this case
(sel-name? #'sel-name) (sel-name? #'sel-name)
(let () (let ()
(for ([name (in-list (syntax->list #'(dep-name ...)))]) (for ([name (in-list (syntax->list #'(dep-name ...)))])
@ -670,8 +684,12 @@
(free-identifier-mapping-get (free-identifier-mapping-get
lazy-mapping lazy-mapping
id id
(λ () (raise-syntax-error 'struct/dc (λ () (raise-syntax-error
(format "the field: ~s is depended on (by the contract on the field: ~s), but it has no contract" 'struct/dc
(format
(string-append
"the field: ~s is depended on (by the contract on the field: ~s),"
" but it has no contract")
(syntax->datum dep-name) (syntax->datum dep-name)
(syntax->datum (clause-sel-name clause))) (syntax->datum (clause-sel-name clause)))
stx stx
@ -682,7 +700,10 @@
(eq? (dep-clause-type clause) '#:impersonator)) (eq? (dep-clause-type clause) '#:impersonator))
(unless mut (unless mut
(raise-syntax-error 'struct/dc (raise-syntax-error 'struct/dc
(format "the ~a field is immutable, so the contract cannot be an impersonator contract" (format
(string-append
"the ~a field is immutable, so the contract"
" cannot be an impersonator contract")
(syntax-e (clause-sel-name clause))) (syntax-e (clause-sel-name clause)))
stx stx
(clause-sel-name clause)))) (clause-sel-name clause))))
@ -811,7 +832,9 @@
(if (clause-lazy? clause) (if (clause-lazy? clause)
(raise-syntax-error (raise-syntax-error
#f #f
(format "the contract on field ~a depends on mutable state (possibly indirectly), so cannot be lazy" (format (string-append
"the contract on field ~a depends on mutable state"
" (possibly indirectly), so cannot be lazy")
(syntax->datum (clause-sel-name clause))) (syntax->datum (clause-sel-name clause)))
stx stx
(clause-sel-name clause)) (clause-sel-name clause))
@ -906,7 +929,8 @@
(define depended-on-fields (make-free-identifier-mapping)) (define depended-on-fields (make-free-identifier-mapping))
(define no-negative-blame-fields (make-free-identifier-mapping)) (define no-negative-blame-fields (make-free-identifier-mapping))
(define-values (s-fo-code s-chap-code s-lifts s-super-lifts (define-values (s-fo-code s-chap-code s-lifts s-super-lifts
s-partially-applied can-be-optimized? stronger-ribs chaperone? no-negative-blame) s-partially-applied can-be-optimized?
stronger-ribs chaperone? no-negative-blame)
(for/fold ([s-fo-code '()] (for/fold ([s-fo-code '()]
[s-chap-code '()] [s-chap-code '()]
[s-lifts '()] [s-lifts '()]
@ -945,7 +969,8 @@
(for ([dep-name (in-list (syntax->list dep-names))]) (for ([dep-name (in-list (syntax->list dep-names))])
(define dep-var (name->sel-id #'struct-id dep-name)) (define dep-var (name->sel-id #'struct-id dep-name))
(free-identifier-mapping-put! depended-on-fields dep-var sel-id))) (free-identifier-mapping-put! depended-on-fields dep-var sel-id)))
(free-identifier-mapping-put! no-negative-blame-fields sel-id (optres-no-negative-blame? this-optres)) (free-identifier-mapping-put! no-negative-blame-fields sel-id
(optres-no-negative-blame? this-optres))
(define this-body-code (define this-body-code
(cond (cond
@ -997,26 +1022,38 @@
(if this-chap-code (if this-chap-code
(list* this-chap-code sel-id s-chap-code) (list* this-chap-code sel-id s-chap-code)
s-chap-code) s-chap-code)
(if dep-names s-lifts (append (optres-lifts this-optres) s-lifts)) (if dep-names
(if dep-names s-super-lifts (append (optres-superlifts this-optres) s-super-lifts)) s-lifts
(if dep-names s-partially-applied (append (optres-partials this-optres) s-partially-applied)) (append (optres-lifts this-optres) s-lifts))
(if dep-names
s-super-lifts
(append (optres-superlifts this-optres) s-super-lifts))
(if dep-names
s-partially-applied
(append (optres-partials this-optres) s-partially-applied))
(and (optres-opt this-optres) can-be-optimized?) (and (optres-opt this-optres) can-be-optimized?)
(if dep-names stronger-ribs (append (optres-stronger-ribs this-optres) stronger-ribs)) (if dep-names
stronger-ribs
(append (optres-stronger-ribs this-optres) stronger-ribs))
(combine-two-chaperone?s chaperone? (optres-chaperone this-optres)) (combine-two-chaperone?s chaperone? (optres-chaperone this-optres))
(combine-two-no-negative-blame no-negative-blame (optres-no-negative-blame? this-optres))))) (combine-two-no-negative-blame no-negative-blame
(optres-no-negative-blame? this-optres)))))
;; to avoid having to deal with indy-ness, just give up if any ;; to avoid having to deal with indy-ness, just give up if any
;; of the fields that are depended on can possibly raise negative blame ;; of the fields that are depended on can possibly raise negative blame
(free-identifier-mapping-for-each (free-identifier-mapping-for-each
depended-on-fields depended-on-fields
(λ (depended-on-id field-doing-the-depending) (λ (depended-on-id field-doing-the-depending)
(define no-neg-blame (free-identifier-mapping-get no-negative-blame-fields depended-on-id)) (define no-neg-blame
(free-identifier-mapping-get no-negative-blame-fields depended-on-id))
(define dep-answer (cond (define dep-answer (cond
[(boolean? no-neg-blame) no-neg-blame] [(boolean? no-neg-blame) no-neg-blame]
[else (traverse-no-neg-blame-identifiers no-neg-blame)])) [else (traverse-no-neg-blame-identifiers no-neg-blame)]))
(unless no-neg-blame (unless no-neg-blame
(give-up (give-up
(format " because the contract on field: ~a depends on: ~a and its contract may have negative blame" (format
(string-append " because the contract on field: ~a depends on: ~a and"
" its contract may have negative blame")
(syntax-e field-doing-the-depending) (syntax-e field-doing-the-depending)
(syntax-e depended-on-id)))))) (syntax-e depended-on-id))))))
@ -1030,7 +1067,8 @@
(build-optres (build-optres
#:exp #:exp
(if (null? s-chap-code) ;; if this is #t, when we have to avoid putting the property on here. ;; if this is #t, when we have to avoid putting the property on here.
(if (null? s-chap-code)
#`(if (pred? #,(opt/info-val opt/info)) #`(if (pred? #,(opt/info-val opt/info))
(begin (begin
#,@s-fo-code #,@s-fo-code
@ -1119,10 +1157,14 @@
(free-identifier=? (datum->syntax stx x) (free-identifier=? (datum->syntax stx x)
sel))) sel)))
si-selectors) si-selectors)
(define strip-reg (regexp (format "^~a-" (regexp-quote (symbol->string (syntax-e struct-id)))))) (define strip-reg
(regexp (format "^~a-" (regexp-quote (symbol->string (syntax-e struct-id))))))
(define field-name (define field-name
(datum->syntax sel (datum->syntax
(string->symbol (regexp-replace strip-reg (symbol->string (syntax-e sel)) "")))) sel
(string->symbol (regexp-replace strip-reg
(symbol->string (syntax-e sel))
""))))
(cond (cond
[(free-identifier=? #'struct-name struct-id) [(free-identifier=? #'struct-name struct-id)
#`(#:selector #,sel)] #`(#:selector #,sel)]
@ -1132,7 +1174,10 @@
[else #f]))) [else #f])))
(unless candidate (unless candidate
(raise-syntax-error 'struct/c (raise-syntax-error 'struct/c
(format "could not find selector id for field ~a (counting from 0) in current scope" (format
(string-append
"could not find selector id for field ~a"
" (counting from 0) in current scope")
i) i)
stx stx
sel)) sel))