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

Make inference work with lists under dotted lists.

Browse Source 
original commit: 7f400e7bdea2e4845fd3801226f8c9a943faf982
This commit is contained in:
Eric Dobson 2014-05-10 17:23:35 -07:00
parent a0336746b1
commit b054cf0cdb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt
View File

@ -585,6 +585,11 @@
(if (memq dbound Y)
(% move-rest-to-dmap (cgen V (cons dbound X) Y s-dty t-elem) dbound)
(cgen V X Y (substitute Univ dbound s-dty) t-elem))]
[((Listof: s-elem) (ListDots: t-dty dbound))
#:return-unless (memq dbound Y) #f
(define v (cgen V (cons dbound X) Y s-elem t-dty))
(and v (move-rest-to-dmap v dbound #:exact #t))]
;; two ListDots with the same bound, just check the element type
;; This is conservative because we don't try to infer a constraint on dbound.
[((ListDots: s-dty dbound) (ListDots: t-dty dbound))

2
pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
View File

@ -102,6 +102,7 @@
(infer-t (make-ListDots -Symbol 'b) (-lst -Symbol) #:indices '(b))
(infer-t (make-ListDots (-v a) 'b) (-lst -Symbol) #:vars '(a) #:indices '(b))
(infer-t (make-ListDots (-v b) 'b) (-lst -Symbol) #:indices '(b))
(infer-t (-lst -Symbol) (make-ListDots -Symbol 'b) #:indices '(b))
(infer-t (make-ListDots (-v b) 'b) (-lst Univ) #:indices '(b))
(infer-t (make-ListDots (-v a) 'b) (make-ListDots -Symbol 'b) #:vars '(a))
(infer-t (make-ListDots -Symbol 'b) (make-ListDots Univ 'b) #:indices '(b))
@ -130,7 +131,6 @@
[infer-t (-lst* -String) (make-ListDots -Symbol 'b) #:indices '(b) #:fail]
;; Currently Broken
;(infer-t (-lst -Symbol) (make-ListDots -Symbol 'b) #:indices '(b))
;(infer-t (make-ListDots (-v b) 'b) (make-ListDots -Symbol 'b) #:indices '(b))
;(infer-t (make-ListDots -Symbol 'b) (make-ListDots (-v b) 'b) #:indices '(b))
;(infer-t (make-ListDots -Symbol 'b) (-pair -Symbol (-lst -Symbol)) #:indices '(b))