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

infer now compiles

Browse Source 
svn: r13949
This commit is contained in:
Sam Tobin-Hochstadt 2009-03-04 18:33:29 +00:00
parent 7847d35842
commit 84d13347d7
1 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
collects/typed-scheme/infer/infer-unit.ss
View File

@ -115,15 +115,13 @@
(define (cgen/arr V X t-arr s-arr) (define (cgen/arr V X t-arr s-arr)
(define (cg S T) (cgen V X S T)) (define (cg S T) (cgen V X S T))
(match* (t-arr s-arr) (match* (t-arr s-arr)
[((arr: ts t #f #f '() t-thn-eff t-els-eff) [((arr: ts t #f #f '())
(arr: ss s #f #f '() s-thn-eff s-els-eff)) (arr: ss s #f #f '()))
(cset-meet* (cset-meet*
(list (cgen/list V X ss ts) (list (cgen/list V X ss ts)
(cg t s) (cg t s)))]
(cgen/eff/list V X t-thn-eff s-thn-eff) [((arr: ts t t-rest #f '())
(cgen/eff/list V X t-els-eff s-els-eff)))] (arr: ss s s-rest #f '()))
[((arr: ts t t-rest #f '() t-thn-eff t-els-eff)
(arr: ss s s-rest #f '() s-thn-eff s-els-eff))
(let ([arg-mapping (let ([arg-mapping
(cond [(and t-rest s-rest (<= (length ts) (length ss))) (cond [(and t-rest s-rest (<= (length ts) (length ss)))
(cgen/list V X (cons s-rest ss) (cons t-rest (extend ss ts t-rest)))] (cgen/list V X (cons s-rest ss) (cons t-rest (extend ss ts t-rest)))]
@ -136,11 +134,9 @@
[else (fail! S T)])] [else (fail! S T)])]
[ret-mapping (cg t s)]) [ret-mapping (cg t s)])
(cset-meet* (cset-meet*
(list arg-mapping ret-mapping (list arg-mapping ret-mapping)))]
(cgen/eff/list V X t-thn-eff s-thn-eff) [((arr: ts t #f (cons dty dbound) '())
(cgen/eff/list V X t-els-eff s-els-eff))))] (arr: ss s #f #f '()))
[((arr: ts t #f (cons dty dbound) '() t-thn-eff t-els-eff)
(arr: ss s #f #f '() s-thn-eff s-els-eff))
(unless (memq dbound X) (unless (memq dbound X)
(fail! S T)) (fail! S T))
(unless (<= (length ts) (length ss)) (unless (<= (length ts) (length ss))
@ -150,10 +146,10 @@
(gensym dbound))] (gensym dbound))]
[new-tys (for/list ([var vars]) [new-tys (for/list ([var vars])
(substitute (make-F var) dbound dty))] (substitute (make-F var) dbound dty))]
[new-cset (cgen/arr V (append vars X) (make-arr (append ts new-tys) t #f #f null t-thn-eff t-els-eff) s-arr)]) [new-cset (cgen/arr V (append vars X) (make-arr (append ts new-tys) t #f #f null) s-arr)])
(move-vars-to-dmap new-cset dbound vars))] (move-vars-to-dmap new-cset dbound vars))]
[((arr: ts t #f #f '() t-thn-eff t-els-eff) [((arr: ts t #f #f '())
(arr: ss s #f (cons dty dbound) '() s-thn-eff s-els-eff)) (arr: ss s #f (cons dty dbound) '()))
(unless (memq dbound X) (unless (memq dbound X)
(fail! S T)) (fail! S T))
(unless (<= (length ss) (length ts)) (unless (<= (length ss) (length ts))
@ -163,10 +159,10 @@
(gensym dbound))] (gensym dbound))]
[new-tys (for/list ([var vars]) [new-tys (for/list ([var vars])
(substitute (make-F var) dbound dty))] (substitute (make-F var) dbound dty))]
[new-cset (cgen/arr V (append vars X) t-arr (make-arr (append ss new-tys) s #f #f null s-thn-eff s-els-eff))]) [new-cset (cgen/arr V (append vars X) t-arr (make-arr (append ss new-tys) s #f #f null))])
(move-vars-to-dmap new-cset dbound vars))] (move-vars-to-dmap new-cset dbound vars))]
[((arr: ts t #f (cons t-dty dbound) '() t-thn-eff t-els-eff) [((arr: ts t #f (cons t-dty dbound) '())
(arr: ss s #f (cons s-dty dbound) '() s-thn-eff s-els-eff)) (arr: ss s #f (cons s-dty dbound) '()))
(unless (= (length ts) (length ss)) (unless (= (length ts) (length ss))
(fail! S T)) (fail! S T))
;; If we want to infer the dotted bound, then why is it in both types? ;; If we want to infer the dotted bound, then why is it in both types?
@ -176,22 +172,18 @@
[darg-mapping (cgen V X s-dty t-dty)] [darg-mapping (cgen V X s-dty t-dty)]
[ret-mapping (cg t s)]) [ret-mapping (cg t s)])
(cset-meet* (cset-meet*
(list arg-mapping darg-mapping ret-mapping (list arg-mapping darg-mapping ret-mapping)))]
(cgen/eff/list V X t-thn-eff s-thn-eff) [((arr: ts t #f (cons t-dty dbound) '())
(cgen/eff/list V X t-els-eff s-els-eff))))] (arr: ss s #f (cons s-dty dbound*) '()))
[((arr: ts t #f (cons t-dty dbound) '() t-thn-eff t-els-eff)
(arr: ss s #f (cons s-dty dbound*) '() s-thn-eff s-els-eff))
(unless (= (length ts) (length ss)) (unless (= (length ts) (length ss))
(fail! S T)) (fail! S T))
(let* ([arg-mapping (cgen/list V X ss ts)] (let* ([arg-mapping (cgen/list V X ss ts)]
[darg-mapping (cgen V (cons dbound* X) s-dty t-dty)] [darg-mapping (cgen V (cons dbound* X) s-dty t-dty)]
[ret-mapping (cg t s)]) [ret-mapping (cg t s)])
(cset-meet* (cset-meet*
(list arg-mapping darg-mapping ret-mapping (list arg-mapping darg-mapping ret-mapping)))]
(cgen/eff/list V X t-thn-eff s-thn-eff) [((arr: ts t t-rest #f '())
(cgen/eff/list V X t-els-eff s-els-eff))))] (arr: ss s #f (cons s-dty dbound) '()))
[((arr: ts t t-rest #f '() t-thn-eff t-els-eff)
(arr: ss s #f (cons s-dty dbound) '() s-thn-eff s-els-eff))
(unless (memq dbound X) (unless (memq dbound X)
(fail! S T)) (fail! S T))
(if (<= (length ts) (length ss)) (if (<= (length ts) (length ss))
@ -199,9 +191,7 @@
(let* ([arg-mapping (cgen/list V X ss (extend ss ts t-rest))] (let* ([arg-mapping (cgen/list V X ss (extend ss ts t-rest))]
[darg-mapping (move-rest-to-dmap (cgen V X s-dty t-rest) dbound)] [darg-mapping (move-rest-to-dmap (cgen V X s-dty t-rest) dbound)]
[ret-mapping (cg t s)]) [ret-mapping (cg t s)])
(cset-meet* (list arg-mapping darg-mapping ret-mapping (cset-meet* (list arg-mapping darg-mapping ret-mapping)))
(cgen/eff/list V X t-thn-eff s-thn-eff)
(cgen/eff/list V X t-els-eff s-els-eff))))
;; the hard case ;; the hard case
(let* ([num-vars (- (length ts) (length ss))] (let* ([num-vars (- (length ts) (length ss))]
[vars (for/list ([n (in-range num-vars)]) [vars (for/list ([n (in-range num-vars)])
@ -209,11 +199,11 @@
[new-tys (for/list ([var vars]) [new-tys (for/list ([var vars])
(substitute (make-F var) dbound s-dty))] (substitute (make-F var) dbound s-dty))]
[new-cset (cgen/arr V (append vars X) t-arr [new-cset (cgen/arr V (append vars X) t-arr
(make-arr (append ss new-tys) s #f (cons s-dty dbound) null s-thn-eff s-els-eff))]) (make-arr (append ss new-tys) s #f (cons s-dty dbound) null))])
(move-vars+rest-to-dmap new-cset dbound vars)))] (move-vars+rest-to-dmap new-cset dbound vars)))]
;; If dotted <: starred is correct, add it below. Not sure it is. ;; If dotted <: starred is correct, add it below. Not sure it is.
[((arr: ts t #f (cons t-dty dbound) '() t-thn-eff t-els-eff) [((arr: ts t #f (cons t-dty dbound) '())
(arr: ss s s-rest #f '() s-thn-eff s-els-eff)) (arr: ss s s-rest #f '()))
(unless (memq dbound X) (unless (memq dbound X)
(fail! S T)) (fail! S T))
(cond [(< (length ts) (length ss)) (cond [(< (length ts) (length ss))
@ -227,18 +217,14 @@
[darg-mapping (cgen V X s-rest t-dty)] [darg-mapping (cgen V X s-rest t-dty)]
[ret-mapping (cg t s)] [ret-mapping (cg t s)]
[new-cset [new-cset
(cset-meet* (list arg-mapping darg-mapping ret-mapping (cset-meet* (list arg-mapping darg-mapping ret-mapping))])
(cgen/eff/list V X t-thn-eff s-thn-eff)
(cgen/eff/list V X t-els-eff s-els-eff)))])
(move-vars+rest-to-dmap new-cset dbound vars #:exact #t))] (move-vars+rest-to-dmap new-cset dbound vars #:exact #t))]
[else [else
;; the simple case ;; the simple case
(let* ([arg-mapping (cgen/list V X (extend ts ss s-rest) ts)] (let* ([arg-mapping (cgen/list V X (extend ts ss s-rest) ts)]
[darg-mapping (move-rest-to-dmap (cgen V X s-rest t-dty) dbound #:exact #t)] [darg-mapping (move-rest-to-dmap (cgen V X s-rest t-dty) dbound #:exact #t)]
[ret-mapping (cg t s)]) [ret-mapping (cg t s)])
(cset-meet* (list arg-mapping darg-mapping ret-mapping (cset-meet* (list arg-mapping darg-mapping ret-mapping)))])]
(cgen/eff/list V X t-thn-eff s-thn-eff)
(cgen/eff/list V X t-els-eff s-els-eff))))])]
[(_ _) (fail! S T)])) [(_ _) (fail! S T)]))
;; determine constraints on the variables in X that would make T a supertype of S ;; determine constraints on the variables in X that would make T a supertype of S