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

reverted back to 1.6

Browse Source 
original commit: 919d9c695da75261d3880a7bfbd47ce42e98f7e0
This commit is contained in:
Robby Findler 2003-04-03 20:38:14 +00:00
parent ec48bdc0e9
commit f4d8112d90
1 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
collects/mzlib/contract.ss
View File

@ -14,12 +14,7 @@
;object-contract ;; not yet good enough
(rename -contract? contract?)
provide/contract
define/contract
none?
none-v
any-mb
none-mb)
define/contract)
(require-for-syntax mzscheme
"list.ss"
@ -434,41 +429,7 @@
;; flat-named-contract = (make-flat-named-contract string (any -> boolean))
;; this holds flat contracts that have names for error reporting
(define-struct flat-named-contract (type-name predicate))
(define (make-mb pos?)
(make-contract
(lambda (val pos neg src-loc)
(define (any-contract v)
(cond
[(procedure? v)
(lambda x
(call-with-values
(lambda ()
(apply v (map none-contract x)))
(lambda x
(apply values (map any-contract x)))))]
[else v]))
(define (none-contract v)
(make-none
(if (procedure? v)
(lambda x
(call-with-values
(lambda ()
(apply v (map any-contract x)))
(lambda x
(apply values (map none-contract x)))))
v)
(if pos? pos neg)))
(any-contract val))
(lambda (a b c d e) (error 'any-mb "subtyping unimplemented"))))
(define any-mb (make-mb #f))
(define none-mb (make-mb #t))
(define-struct none (v tbb))
(provide (rename build-flat-named-contract flat-named-contract)
flat-named-contract-type-name
flat-named-contract-predicate)
@ -537,34 +498,26 @@
(cond
[(contract? contract)
((contract-wrap contract) val pos neg src-info)]
[(flat-named-contract? contract)
(if ((flat-named-contract-predicate contract) val)
val
(raise-contract-error
src-info
pos
neg
"expected type <~a>, given: ~e"
(flat-named-contract-type-name contract)
val))]
[else
(let ([passed-test?
(if (flat-named-contract? contract)
((flat-named-contract-predicate contract) val)
(contract val))])
(if passed-test?
val
(let ([actual-pos (if (none? val)
(none-tbb val)
pos)]
[actual-neg (if (none? val)
(none-tbb val)
neg)])
(if (flat-named-contract? contract)
(raise-contract-error
src-info
actual-pos
actual-neg
"expected type <~a>, given: ~e"
(flat-named-contract-type-name contract)
val)
(raise-contract-error
src-info
actual-pos
actual-neg
"~agiven: ~e"
(predicate->expected-msg contract)
val)))))]))
(if (contract val)
val
(raise-contract-error
src-info
pos
neg
"~agiven: ~e"
(predicate->expected-msg contract)
val))]))
(define-syntax (contract-=> stx)
(syntax-case stx ()