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

backed out of contract/class change

Browse Source 
svn: r7369
This commit is contained in:
Robby Findler 2007-09-17 17:33:35 +00:00
parent 6d5f3fb3b6
commit eca198d009
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/profj/libs/java/lang/Object-composite.ss
View File

@ -109,7 +109,7 @@
(if (string? obj) (if (string? obj)
(make-java-string string) (make-java-string string)
(begin (begin
(c:contract (object-contract (c:contract (c:object-contract
(clone (c:-> c:any/c)) (clone (c:-> c:any/c))
(equals-java.lang.Object (c:-> c:any/c c:any/c)) (equals-java.lang.Object (c:-> c:any/c c:any/c))
(finalize (c:-> c:any/c)) (finalize (c:-> c:any/c))
@ -1019,7 +1019,7 @@
guard-convert-Throwable static-Throwable/c) guard-convert-Throwable static-Throwable/c)
(define (wrap-convert-assert-Throwable obj p n s c) (define (wrap-convert-assert-Throwable obj p n s c)
(c:contract (object-contract (c:contract (c:object-contract
(init-cause (c:-> c:any/c c:any/c)) (init-cause (c:-> c:any/c c:any/c))
(get-message (c:-> c:any/c)) (get-message (c:-> c:any/c))
(get-cause (c:-> c:any/c)) (get-cause (c:-> c:any/c))

12
collects/profj/to-scheme.ss
View File

@ -992,7 +992,7 @@
;methods->contract: (list method-record) -> sexp ;methods->contract: (list method-record) -> sexp
(define (methods->contract methods) (define (methods->contract methods)
`(object-contract ,@(map (lambda (m) `(c:object-contract ,@(map (lambda (m)
`(,(build-identifier (mangle-method-name (method-record-name m) `(,(build-identifier (mangle-method-name (method-record-name m)
(method-record-atypes m))) (method-record-atypes m)))
(c:-> ,@(map (lambda (a) 'c:any/c) (method-record-atypes m)) c:any/c))) (c:-> ,@(map (lambda (a) 'c:any/c) (method-record-atypes m)) c:any/c)))
@ -2116,22 +2116,22 @@
((string String) ((string String)
(if from-dynamic? (if from-dynamic?
`string? `string?
`(is-a?/c ,(if (send (types) require-prefix? '("String" "java" "lang") (lambda () #f)) `(c:is-a?/c ,(if (send (types) require-prefix? '("String" "java" "lang") (lambda () #f))
'java.lang.String 'String)))) 'java.lang.String 'String))))
((dynamic void) 'c:any/c))) ((dynamic void) 'c:any/c)))
((ref-type? type) ((ref-type? type)
(if (equal? type string-type) (if (equal? type string-type)
(type->contract 'string from-dynamic?) (type->contract 'string from-dynamic?)
`(c:or/c (is-a?/c object%) string?))) `(c:or/c (c:is-a?/c object%) string?)))
((unknown-ref? type) ((unknown-ref? type)
(if (not (null? stop?)) (if (not (null? stop?))
`(c:or/c (is-a?/c object%) string?) `(c:or/c (c:is-a?/c object%) string?)
(cond (cond
((method-contract? (unknown-ref-access type)) ((method-contract? (unknown-ref-access type))
`(object-contract (,(string->symbol (java-name->scheme (method-contract-name (unknown-ref-access type)))) `(c:object-contract (,(string->symbol (java-name->scheme (method-contract-name (unknown-ref-access type))))
,(type->contract (unknown-ref-access type) from-dynamic?)))) ,(type->contract (unknown-ref-access type) from-dynamic?))))
((field-contract? (unknown-ref-access type)) ((field-contract? (unknown-ref-access type))
`(object-contract (field ,(build-identifier (string-append (field-contract-name (unknown-ref-access type)) "~f")) `(c:object-contract (field ,(build-identifier (string-append (field-contract-name (unknown-ref-access type)) "~f"))
,(type->contract (field-contract-type (unknown-ref-access type)) from-dynamic?))))))) ,(type->contract (field-contract-type (unknown-ref-access type)) from-dynamic?)))))))
((method-contract? type) ((method-contract? type)
`(c:-> ,@(map (lambda (a) (type->contract a from-dynamic?)) (method-contract-args type)) `(c:-> ,@(map (lambda (a) (type->contract a from-dynamic?)) (method-contract-args type))