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

Improve object type printing

Browse Source 
Use the `Object` constructor style instead of `Instance`
in cases where it makes sense.
This commit is contained in:
Asumu Takikawa 2014-01-23 14:19:18 -05:00
parent 081cc4777a
commit 32f39ddff4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt
View File

@ -327,12 +327,12 @@
`(case-> ,@cover) `(case-> ,@cover)
(car cover))])])) (car cover))])]))
;; class->sexp : Class -> S-expression ;; class->sexp : Class [#:object? Boolean] -> S-expression
;; Convert a class type to an s-expression ;; Convert a class or object type to an s-expression
(define (class->sexp cls) (define (class->sexp cls #:object? [object? #f])
(match-define (Class: _ inits fields methods) cls) (match-define (Class: _ inits fields methods) cls)
(define inits* (define inits*
(if (null? inits) (if (or object? (null? inits))
null null
(list (list
(cons 'init (cons 'init
@ -353,7 +353,7 @@
(for/list ([name+type (in-list methods)]) (for/list ([name+type (in-list methods)])
(match-define (list name type) name+type) (match-define (list name type) name+type)
`(,name ,(type->sexp type)))) `(,name ,(type->sexp type))))
`(Class ,@inits* ,@fields* ,@methods*)) `(,(if object? 'Object 'Class) ,@inits* ,@fields* ,@methods*))
;; type->sexp : Type -> S-expression ;; type->sexp : Type -> S-expression
;; convert a type to an s-expression that can be printed ;; convert a type to an s-expression that can be printed
@ -488,7 +488,8 @@
[(Mu-name: name body) `(Rec ,name ,(t->s body))] [(Mu-name: name body) `(Rec ,name ,(t->s body))]
[(B: idx) `(B ,idx)] [(B: idx) `(B ,idx)]
[(Syntax: t) `(Syntaxof ,(t->s t))] [(Syntax: t) `(Syntaxof ,(t->s t))]
[(Instance: t) `(Instance ,(t->s t))] [(Instance: (and (? has-name?) cls)) `(Instance ,(t->s cls))]
[(Instance: (? Class? cls)) (class->sexp cls #:object? #t)]
[(? Class?) (class->sexp type)] [(? Class?) (class->sexp type)]
[(Result: t (FilterSet: (Top:) (Top:)) (Empty:)) (type->sexp t)] [(Result: t (FilterSet: (Top:) (Top:)) (Empty:)) (type->sexp t)]
[(Result: t fs (Empty:)) `(,(type->sexp t) : ,(filter->sexp fs))] [(Result: t fs (Empty:)) `(,(type->sexp t) : ,(filter->sexp fs))]