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

Export type-mismatch and use pretty-printing

Browse Source 
Previously, the internal `expected-but-got` handled the
pretty-printing but it makes more sense to do it in
`type-mismatch` since it's useful for other modules.
This commit is contained in:
Asumu Takikawa 2014-01-21 19:25:41 -05:00
parent a1b79f0bd2
commit 00387001dc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-below.rkt
View File

@ -11,7 +11,10 @@
[check-below (-->d ([s (-or/c Type/c tc-results/c)] [t (-or/c Type/c tc-results/c)]) () [check-below (-->d ([s (-or/c Type/c tc-results/c)] [t (-or/c Type/c tc-results/c)]) ()
[_ (if (Type/c? s) Type/c tc-results/c)])] [_ (if (Type/c? s) Type/c tc-results/c)])]
[cond-check-below (-->d ([s (-or/c Type/c tc-results/c)] [t (-or/c #f Type/c tc-results/c)]) () [cond-check-below (-->d ([s (-or/c Type/c tc-results/c)] [t (-or/c #f Type/c tc-results/c)]) ()
[_ (if (Type/c? s) Type/c tc-results/c)])]) [_ (if (Type/c? s) Type/c tc-results/c)])]
[type-mismatch (-->* ((-or/c Type/c string?) (-or/c Type/c string?))
((-or/c string? #f))
-any)])
(define (print-object o) (define (print-object o)
(match o (match o
@ -27,7 +30,10 @@
;; Type errors with "type mismatch", arguments may be types or other things ;; Type errors with "type mismatch", arguments may be types or other things
;; like the length of a list of types ;; like the length of a list of types
(define (type-mismatch t1 t2 [more #f]) (define (type-mismatch t1 t2 [more #f])
(tc-error/expr/fields "type mismatch" #:more more "expected" t1 "given" t2)) (define t1* (if (Type/c? t1) (pretty-format-type t1 #:indent 12) t1))
(define t2* (if (Type/c? t2) (pretty-format-type t2 #:indent 9) t2))
(tc-error/expr/fields "type mismatch" #:more more
"expected" t1* "given" t2*))
;; expected-but-got : (U Type String) (U Type String) -> Void ;; expected-but-got : (U Type String) (U Type String) -> Void
;; ;;
@ -46,10 +52,7 @@
;; prints the binding locations of each type variable. ;; prints the binding locations of each type variable.
(type-mismatch (format "`~a'" t1) (format "a different `~a'" t2) (type-mismatch (format "`~a'" t1) (format "a different `~a'" t2)
"type variables bound in different scopes")] "type variables bound in different scopes")]
[(_ _) [(_ _) (type-mismatch t1 t2)]))
(type-mismatch
(if (Type/c? t1) (pretty-format-type t1 #:indent 12) t1)
(if (Type/c? t2) (pretty-format-type t2 #:indent 9) t2))]))
;; check-below : (/\ (Results Type -> Result) ;; check-below : (/\ (Results Type -> Result)
;; (Results Results -> Result) ;; (Results Results -> Result)