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

Cleanup some cases of cgen/seq.

Browse Source 
original commit: 2dba2363f6024497b38b8062cb0760c831a9b877
This commit is contained in:
Eric Dobson 2014-05-11 12:56:01 -07:00
parent 43ea5ddaf9
commit 804ef05ad5
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,12 +236,10 @@
#f
#:return-unless (<= (length ss) (length ts))
#f
(let* ([vars (var-store-take dbound dty (- (length ts) (length ss)))]
[new-tys (for/list ([var (in-list vars)])
(substitute (make-F var) dbound dty))]
[new-s-seq (seq (append ss new-tys) (null-end))]
[new-cset (cgen/seq V (append vars X) Y new-s-seq t-seq)])
(% move-vars-to-dmap new-cset dbound vars))]
(let* ([vars (var-store-take dbound dty (- (length ts) (length ss)))]
[new-tys (for/list ([var (in-list vars)])
(substitute (make-F var) dbound dty))])
(% move-vars-to-dmap (cgen/list V (append vars X) Y (append ss new-tys) ts) dbound vars))]
;; dotted above, nothing below
[((seq ss (null-end))
(seq ts (dotted-end dty dbound)))
@ -249,12 +247,10 @@
#f
#:return-unless (<= (length ts) (length ss))
#f
(let* ([vars (var-store-take dbound dty (- (length ss) (length ts)))]
[new-tys (for/list ([var (in-list vars)])
(substitute (make-F var) dbound dty))]
[new-t-seq (seq (append ts new-tys) (null-end))]
[new-cset (cgen/seq V (append vars X) Y s-seq new-t-seq)])
(% move-vars-to-dmap new-cset dbound vars))]
(let* ([vars (var-store-take dbound dty (- (length ss) (length ts)))]
[new-tys (for/list ([var (in-list vars)])
(substitute (make-F var) dbound dty))])
(% move-vars-to-dmap (cgen/list V (append vars X) Y ss (append ts new-tys)) dbound vars))]
;; this case is just for constrainting other variables, not dbound
[((seq ss (dotted-end s-dty dbound))
(seq ts (dotted-end t-dty dbound)))
@ -263,9 +259,9 @@
;; If we want to infer the dotted bound, then why is it in both types?
#:return-when (memq dbound Y)
#f
(let* ([arg-mapping (cgen/list V X Y ss ts)]
[darg-mapping (cgen V X Y s-dty t-dty)])
(% cset-meet arg-mapping darg-mapping))]
(% cset-meet
(cgen/list V X Y ss ts)
(cgen V X Y s-dty t-dty))]
;; bounds are different
[((seq ss (dotted-end s-dty (? (λ (db) (memq db Y)) dbound)))
(seq ts (dotted-end t-dty dbound*)))