env now compiles
svn: r13950
This commit is contained in:
parent
84d13347d7
commit
78fe918457
17
collects/typed-scheme/env/init-envs.ss
vendored
17
collects/typed-scheme/env/init-envs.ss
vendored
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
(require "type-env.ss"
|
(require "type-env.ss"
|
||||||
"type-name-env.ss"
|
"type-name-env.ss"
|
||||||
(rep type-rep effect-rep)
|
|
||||||
(for-template (rep type-rep effect-rep)
|
|
||||||
(private union)
|
|
||||||
mzlib/pconvert mzlib/shared scheme/base)
|
|
||||||
(private type-effect-convenience union)
|
|
||||||
"type-alias-env.ss"
|
"type-alias-env.ss"
|
||||||
|
(rep type-rep object-rep filter-rep)
|
||||||
|
(for-template (rep type-rep object-rep filter-rep)
|
||||||
|
(types union)
|
||||||
|
mzlib/pconvert mzlib/shared scheme/base)
|
||||||
|
(types union convenience)
|
||||||
mzlib/pconvert scheme/match mzlib/shared)
|
mzlib/pconvert scheme/match mzlib/shared)
|
||||||
|
|
||||||
(define (initialize-type-name-env initial-type-names)
|
(define (initialize-type-name-env initial-type-names)
|
||||||
|
@ -32,9 +32,10 @@
|
||||||
[(Mu-name: n b) `(make-Mu ,(sub n) ,(sub b))]
|
[(Mu-name: n b) `(make-Mu ,(sub n) ,(sub b))]
|
||||||
[(Poly-names: ns b) `(make-Poly (list ,@(map sub ns)) ,(sub b))]
|
[(Poly-names: ns b) `(make-Poly (list ,@(map sub ns)) ,(sub b))]
|
||||||
[(PolyDots-names: ns b) `(make-PolyDots (list ,@(map sub ns)) ,(sub b))]
|
[(PolyDots-names: ns b) `(make-PolyDots (list ,@(map sub ns)) ,(sub b))]
|
||||||
[(? Type? (app (lambda (v) (vector->list (struct->vector v))) (list-rest tag key seq vals)))
|
[(? (lambda (e) (or (Type? e)
|
||||||
`(,(gen-constructor tag) ,@(map sub vals))]
|
(LatentFilter? e)
|
||||||
[(? Effect? (app (lambda (v) (vector->list (struct->vector v))) (list-rest tag key seq vals)))
|
(LatentObject? e)))
|
||||||
|
(app (lambda (v) (vector->list (struct->vector v))) (list-rest tag key seq vals)))
|
||||||
`(,(gen-constructor tag) ,@(map sub vals))]
|
`(,(gen-constructor tag) ,@(map sub vals))]
|
||||||
[_ (basic v)]))
|
[_ (basic v)]))
|
||||||
|
|
||||||
|
|
6
collects/typed-scheme/env/lexical-env.ss
vendored
6
collects/typed-scheme/env/lexical-env.ss
vendored
|
@ -2,11 +2,9 @@
|
||||||
|
|
||||||
(require (except-in "../utils/utils.ss" extend))
|
(require (except-in "../utils/utils.ss" extend))
|
||||||
(require "type-environments.ss"
|
(require "type-environments.ss"
|
||||||
(utils tc-utils)
|
|
||||||
"type-env.ss"
|
"type-env.ss"
|
||||||
(private mutated-vars)
|
(utils tc-utils mutated-vars)
|
||||||
(private type-utils)
|
(types utils convenience))
|
||||||
(private type-effect-convenience))
|
|
||||||
|
|
||||||
(provide (all-defined-out))
|
(provide (all-defined-out))
|
||||||
|
|
||||||
|
|
2
collects/typed-scheme/env/type-env.ss
vendored
2
collects/typed-scheme/env/type-env.ss
vendored
|
@ -3,7 +3,7 @@
|
||||||
(require (except-in "../utils/utils.ss" extend))
|
(require (except-in "../utils/utils.ss" extend))
|
||||||
(require syntax/boundmap
|
(require syntax/boundmap
|
||||||
(utils tc-utils)
|
(utils tc-utils)
|
||||||
(private type-utils))
|
(types utils))
|
||||||
|
|
||||||
(provide register-type
|
(provide register-type
|
||||||
finish-register-type
|
finish-register-type
|
||||||
|
|
Loading…
Reference in New Issue
Block a user