scheme -> racket

This commit is contained in:
Sam Tobin-Hochstadt 2012-06-20 17:23:33 -04:00
parent 972df7c89e
commit ccb724155a
55 changed files with 130 additions and 130 deletions

View File

@ -1,8 +1,8 @@
#lang racket/base #lang racket/base
(require "test-utils.rkt" (require "test-utils.rkt"
(for-syntax scheme/base) (for-syntax racket/base)
(for-template scheme/base)) (for-template racket/base))
(require (private type-annotation parse-type) (require (private type-annotation parse-type)
(except-in (except-in
(base-env prims (base-env prims

View File

@ -1812,7 +1812,7 @@
(varop (Un -PosReal -NegReal) -PosReal) (varop (Un -PosReal -NegReal) -PosReal)
(varop -Real -NonNegReal))] (varop -Real -NonNegReal))]
;; scheme/math ;; racket/math
[sgn (cl->* (-Zero . -> . -Zero) [sgn (cl->* (-Zero . -> . -Zero)
(-PosRat . -> . -One) (-PosRat . -> . -One)
@ -1937,7 +1937,7 @@
(-val #f)) (-val #f))
(-> -Real B))] (-> -Real B))]
;; scheme/fixnum ;; racket/fixnum
[fx+ (fx+-type)] [fx+ (fx+-type)]
[fx- (fx--type)] [fx- (fx--type)]
[fx* (fx*-type)] [fx* (fx*-type)]

View File

@ -13,7 +13,7 @@
(only-in '#%kernel [apply kernel:apply] [reverse kernel:reverse] (only-in '#%kernel [apply kernel:apply] [reverse kernel:reverse]
[memq kernel:memq] [memv kernel:memv] [member kernel:member]) [memq kernel:memq] [memv kernel:memv] [member kernel:member])
(only-in racket/private/pre-base new-apply-proc) (only-in racket/private/pre-base new-apply-proc)
scheme/promise scheme/system racket/promise racket/system
racket/function racket/function
racket/mpair racket/mpair
racket/base racket/base
@ -235,7 +235,7 @@
[prop:equal+hash -Struct-Type-Property] [prop:equal+hash -Struct-Type-Property]
;; scheme/bool ;; racket/bool
[true (-val #t)] [true (-val #t)]
[false (-val #f)] [false (-val #f)]
[boolean=? (B B . -> . B)] [boolean=? (B B . -> . B)]
@ -1353,7 +1353,7 @@
|# |#
;; scheme/function ;; racket/function
[identity (-poly (a) (->acc (list a) a null))] [identity (-poly (a) (->acc (list a) a null))]
[const (-poly (a) (-> a (->* '() Univ a)))] [const (-poly (a) (-> a (->* '() Univ a)))]
[negate (-polydots (b) (-> ((list) [b b] . ->... . Univ) [negate (-polydots (b) (-> ((list) [b b] . ->... . Univ)
@ -1362,7 +1362,7 @@
(primitive-closure? (-> Univ B)) (primitive-closure? (-> Univ B))
;; scheme/cmdline ;; racket/cmdline
[parse-command-line [parse-command-line
(let ([mode-sym (one-of/c 'once-each 'once-any 'multi 'final 'help-labels)]) (let ([mode-sym (one-of/c 'once-each 'once-any 'multi 'final 'help-labels)])
@ -1374,7 +1374,7 @@
(-lst -String) (-lst -String)
. -> . b))))] . -> . b))))]
;; scheme/list ;; racket/list
[filter-map (-polydots (c a b) [filter-map (-polydots (c a b)
((list ((list
((list a) (b b) . ->... . (-opt c)) ((list a) (b b) . ->... . (-opt c))
@ -1463,7 +1463,7 @@
;; scheme/path ;; racket/path
[explode-path (-SomeSystemPathlike . -> . (-lst (Un -SomeSystemPath (one-of/c 'up 'same))))] [explode-path (-SomeSystemPathlike . -> . (-lst (Un -SomeSystemPath (one-of/c 'up 'same))))]
[simple-form-path (-Pathlike . -> . -Path)] [simple-form-path (-Pathlike . -> . -Path)]
@ -1492,7 +1492,7 @@
(->* (list (-lst a)) (-lst a))))] (->* (list (-lst a)) (-lst a))))]
;; scheme/vector ;; racket/vector
[vector-count (-polydots (a b) [vector-count (-polydots (a b)
((list ((list
((list a) (b b) . ->... . Univ) ((list a) (b b) . ->... . Univ)

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require (for-syntax scheme/base syntax/parse "internal.rkt" "../utils/tc-utils.rkt") (require (for-syntax racket/base syntax/parse "internal.rkt" "../utils/tc-utils.rkt")
"../typecheck/internal-forms.rkt" "../typecheck/internal-forms.rkt"
(prefix-in t: "base-types-extra.rkt")) (prefix-in t: "base-types-extra.rkt"))

View File

@ -2,7 +2,7 @@
(require (rename-in "../utils/utils.rkt" [infer r:infer])) (require (rename-in "../utils/utils.rkt" [infer r:infer]))
(require (for-syntax scheme/base syntax/parse) (require (for-syntax racket/base syntax/parse)
(utils tc-utils) (utils tc-utils)
(env init-envs) (env init-envs)
(r:infer infer) (r:infer infer)

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require (for-template scheme/base)) (require (for-template racket/base))
(provide internal) (provide internal)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
;; Top-level type environment ;; Top-level type environment
;; maps identifiers to their types, updated by mutation ;; maps identifiers to their types, updated by mutation

View File

@ -1,9 +1,9 @@
#lang scheme/base #lang racket/base
;; this environment maps *lexical* variables to types ;; this environment maps *lexical* variables to types
;; it also contains the proposition environment ;; it also contains the proposition environment
;; these environments are unified in "Logical Types for Scheme" ;; these environments are unified in "Logical Types for Untyped Languages"
;; but split here for performance ;; but split here for performance
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
@ -13,7 +13,7 @@
syntax/id-table syntax/id-table
racket/keyword-transform racket/list racket/keyword-transform racket/list
(for-syntax syntax/parse syntax/parse/experimental/contract racket/base) (for-syntax syntax/parse syntax/parse/experimental/contract racket/base)
(only-in scheme/contract ->* -> or/c any/c listof cons/c) (only-in racket/contract ->* -> or/c any/c listof cons/c)
(utils tc-utils mutated-vars) (utils tc-utils mutated-vars)
(only-in (rep type-rep) Type/c) (only-in (rep type-rep) Type/c)
(typecheck tc-metafunctions) (typecheck tc-metafunctions)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
syntax/boundmap syntax/boundmap

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require scheme/contract unstable/sequence racket/dict syntax/id-table (require racket/contract unstable/sequence racket/dict syntax/id-table
(prefix-in r: "../utils/utils.rkt") (prefix-in r: "../utils/utils.rkt")
racket/match (r:rep filter-rep rep-utils type-rep) unstable/struct racket/match (r:rep filter-rep rep-utils type-rep) unstable/struct
(except-in (r:utils tc-utils) make-env)) (except-in (r:utils tc-utils) make-env))

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require syntax/boundmap (require syntax/boundmap

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (rep type-rep) scheme/contract racket/match (for-syntax scheme/base syntax/parse)) (require "../utils/utils.rkt" (rep type-rep) racket/contract racket/match (for-syntax racket/base syntax/parse))
;; S, T types ;; S, T types
;; X a var ;; X a var

View File

@ -1,4 +1,4 @@
#lang scheme/unit #lang racket/unit
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(types convenience utils union subtype) (types convenience utils union subtype)

View File

@ -1,4 +1,4 @@
#lang scheme/unit #lang racket/unit
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
"signatures.rkt" "constraint-structs.rkt" "signatures.rkt" "constraint-structs.rkt"

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rep type-rep) (utils tc-utils) mzlib/trace) (require (rep type-rep) (utils tc-utils) mzlib/trace)

View File

@ -1,10 +1,10 @@
#lang scheme/unit #lang racket/unit
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rep type-rep rep-utils) (require (rep type-rep rep-utils)
(types convenience union utils) (types convenience union utils)
"signatures.rkt" "signatures.rkt"
scheme/list racket/match) racket/list racket/match)
(import) (import)
(export promote-demote^) (export promote-demote^)

View File

@ -1,4 +1,4 @@
#lang scheme/unit #lang racket/unit
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rep type-rep) (require (rep type-rep)

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
(for-template scheme/unsafe/ops racket/base (prefix-in k: '#%kernel)) (for-template racket/unsafe/ops racket/base (prefix-in k: '#%kernel))
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(optimizer utils logging)) (optimizer utils logging))

View File

@ -1,9 +1,9 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
racket/match racket/match
"../utils/utils.rkt" "../utils/utils.rkt"
(for-template scheme/base scheme/unsafe/ops) (for-template racket/base racket/unsafe/ops)
(utils tc-utils) (utils tc-utils)
(rep type-rep) (rep type-rep)
(types type-table utils) (types type-table utils)

View File

@ -1,7 +1,7 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
(for-template scheme/base racket/flonum racket/fixnum) (for-template racket/base racket/flonum racket/fixnum)
"../utils/utils.rkt" "../utils/utils.rkt"
(types type-table) (types type-table)
(utils tc-utils) (utils tc-utils)

View File

@ -1,8 +1,8 @@
#lang scheme #lang racket/base
(require syntax/parse (require syntax/parse racket/dict
"../utils/utils.rkt" "../utils/utils.rkt"
(for-template scheme/base scheme/fixnum scheme/unsafe/ops) (for-template racket/base racket/fixnum racket/unsafe/ops)
(utils tc-utils) (utils tc-utils)
(types numeric-tower) (types numeric-tower)
(optimizer utils logging)) (optimizer utils logging))

View File

@ -1,8 +1,8 @@
#lang scheme/base #lang racket/base
(require syntax/parse syntax/id-table scheme/dict unstable/syntax (require syntax/parse syntax/id-table racket/dict unstable/syntax
"../utils/utils.rkt" racket/unsafe/ops "../utils/utils.rkt" racket/unsafe/ops
(for-template scheme/base scheme/math racket/flonum scheme/unsafe/ops) (for-template racket/base racket/math racket/flonum racket/unsafe/ops)
(utils tc-utils) (utils tc-utils)
(types numeric-tower) (types numeric-tower)
(optimizer utils numeric-utils logging float)) (optimizer utils numeric-utils logging float))

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
racket/dict racket/flonum racket/dict racket/flonum

View File

@ -1,7 +1,7 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
(for-template scheme/base) (for-template racket/base)
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(optimizer utils logging)) (optimizer utils logging))

View File

@ -1,8 +1,8 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
racket/pretty racket/pretty
(for-template scheme/base) (for-template racket/base)
"../utils/utils.rkt" "../utils/utils.rkt"
(optimizer utils logging (optimizer utils logging
number fixnum float float-complex vector string list pair number fixnum float float-complex vector string list pair

View File

@ -1,8 +1,8 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
racket/match racket/match
(for-template scheme/base scheme/unsafe/ops racket/list) (for-template racket/base racket/unsafe/ops racket/list)
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(rep type-rep) (rep type-rep)

View File

@ -1,8 +1,8 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
racket/match racket/match
(for-template scheme/base scheme/unsafe/ops) (for-template racket/base racket/unsafe/ops)
"../utils/utils.rkt" "../utils/tc-utils.rkt" "../utils/utils.rkt" "../utils/tc-utils.rkt"
(rep type-rep) (rep type-rep)
(types abbrev type-table utils) (types abbrev type-table utils)

View File

@ -1,7 +1,7 @@
#lang scheme/base #lang racket/base
(require syntax/parse (require syntax/parse
(for-template scheme/base scheme/unsafe/ops) (for-template racket/base racket/unsafe/ops)
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(types abbrev) (types abbrev)

View File

@ -1,7 +1,7 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
(for-template scheme/base scheme/unsafe/ops) (for-template racket/base racket/unsafe/ops)
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(types type-table) (types type-table)

View File

@ -1,10 +1,10 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
scheme/list scheme/dict racket/match racket/list racket/dict racket/match
"../utils/utils.rkt" "../utils/utils.rkt"
"../utils/tc-utils.rkt" "../utils/tc-utils.rkt"
(for-template scheme/base) (for-template racket/base)
(types numeric-tower utils type-table) (types numeric-tower utils type-table)
(rep type-rep) (rep type-rep)
(optimizer utils logging float-complex)) (optimizer utils logging float-complex))

View File

@ -1,8 +1,8 @@
#lang scheme/base #lang racket/base
(require syntax/parse unstable/syntax (require syntax/parse unstable/syntax
racket/match racket/flonum racket/match racket/flonum
(for-template scheme/base racket/flonum scheme/unsafe/ops) (for-template racket/base racket/flonum racket/unsafe/ops)
"../utils/utils.rkt" "../utils/utils.rkt"
(utils tc-utils) (utils tc-utils)
(rep type-rep) (rep type-rep)

View File

@ -1,15 +1,15 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(except-in (rep type-rep) make-arr) (except-in (rep type-rep) make-arr)
(rename-in (types convenience union utils printer filter-ops) [make-arr* make-arr]) (rename-in (types convenience union utils printer filter-ops) [make-arr* make-arr])
(utils tc-utils stxclass-util) (utils tc-utils stxclass-util)
syntax/stx (prefix-in c: scheme/contract) syntax/stx (prefix-in c: racket/contract)
syntax/parse syntax/parse
(env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env) (env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env)
racket/match racket/match
"parse-classes.rkt" "parse-classes.rkt"
(for-template scheme/base "../base-env/colon.rkt") (for-template racket/base "../base-env/colon.rkt")
;; needed at this phase for tests ;; needed at this phase for tests
(combine-in (prefix-in t: "../base-env/base-types-extra.rkt") "../base-env/colon.rkt") (combine-in (prefix-in t: "../base-env/base-types-extra.rkt") "../base-env/colon.rkt")
(for-template (prefix-in t: "../base-env/base-types-extra.rkt"))) (for-template (prefix-in t: "../base-env/base-types-extra.rkt")))

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(provide type->contract define/fixup-contract? change-contract-fixups) (provide type->contract define/fixup-contract? change-contract-fixups)
@ -12,12 +12,12 @@
(types resolve utils) (types resolve utils)
(prefix-in t: (types convenience abbrev)) (prefix-in t: (types convenience abbrev))
(private parse-type) (private parse-type)
racket/match unstable/match syntax/struct syntax/stx mzlib/trace racket/syntax scheme/list racket/match unstable/match syntax/struct syntax/stx mzlib/trace racket/syntax racket/list
(only-in scheme/contract -> ->* case-> cons/c flat-rec-contract provide/contract any/c) (only-in racket/contract -> ->* case-> cons/c flat-rec-contract provide/contract any/c)
(for-template scheme/base racket/contract racket/set (utils any-wrap) (for-template racket/base racket/contract racket/set (utils any-wrap)
(prefix-in t: (types numeric-predicates)) (prefix-in t: (types numeric-predicates))
(only-in unstable/contract sequence/c) (only-in unstable/contract sequence/c)
(only-in scheme/class object% is-a?/c subclass?/c object-contract class/c init object/c class?))) (only-in racket/class object% is-a?/c subclass?/c object-contract class/c init object/c class?)))
(define (define/fixup-contract? stx) (define (define/fixup-contract? stx)
(or (syntax-property stx 'typechecker:contract-def) (or (syntax-property stx 'typechecker:contract-def)

View File

@ -1,11 +1,11 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (utils tc-utils) (require (utils tc-utils)
"rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt" "rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt"
mzlib/trace racket/match mzlib/etc mzlib/trace racket/match mzlib/etc
scheme/contract racket/contract
(for-syntax scheme/base syntax/parse)) (for-syntax racket/base syntax/parse))
(define name-table (make-weak-hasheq)) (define name-table (make-weak-hasheq))
@ -334,7 +334,7 @@
(def-type StructTop ([name Struct?]) [#:key 'struct]) (def-type StructTop ([name Struct?]) [#:key 'struct])
(def-type ThreadCellTop () [#:fold-rhs #:base] [#:key 'thread-cell]) (def-type ThreadCellTop () [#:fold-rhs #:base] [#:key 'thread-cell])
;; v : Scheme Value ;; v : Racket Value
(def-type Value (v) [#:frees #f] [#:fold-rhs #:base] [#:key (cond [(number? v) 'number] (def-type Value (v) [#:frees #f] [#:fold-rhs #:base] [#:key (cond [(number? v) 'number]
[(boolean? v) 'boolean] [(boolean? v) 'boolean]
[(null? v) 'null] [(null? v) 'null]

View File

@ -1,4 +1,4 @@
#lang scheme/unit #lang racket/unit
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
syntax/kerncase syntax/kerncase

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require scheme/contract "../utils/utils.rkt" scheme/struct-info) (require racket/contract "../utils/utils.rkt" racket/struct-info)
(define-struct binding (name) #:transparent) (define-struct binding (name) #:transparent)
(define-struct (def-binding binding) (ty) #:transparent) (define-struct (def-binding binding) (ty) #:transparent)

View File

@ -1,11 +1,11 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" syntax/parse (require "../utils/utils.rkt" syntax/parse
scheme/contract racket/contract
(rep type-rep) (rep type-rep)
(env lexical-env) (env lexical-env)
(private type-annotation) (private type-annotation)
(for-template scheme/base)) (for-template racket/base))
(provide/cond-contract [find-annotation (syntax? identifier? . -> . (or/c #f Type/c))]) (provide/cond-contract [find-annotation (syntax? identifier? . -> . (or/c #f Type/c))])

View File

@ -1,6 +1,6 @@
#lang scheme/base #lang racket/base
(require (for-syntax scheme/base) (require (for-syntax racket/base)
syntax/parse) syntax/parse)
(define-syntax-rule (internal-forms set-name nms ...) (define-syntax-rule (internal-forms set-name nms ...)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(only-in srfi/1/list s:member) (only-in srfi/1/list s:member)
@ -12,9 +12,9 @@
(for-syntax syntax/parse racket/base) (for-syntax syntax/parse racket/base)
racket/contract/private/provide unstable/list racket/contract/private/provide unstable/list
syntax/id-table racket/dict syntax/id-table racket/dict
racket/syntax scheme/struct-info racket/match racket/syntax racket/struct-info racket/match
"def-binding.rkt" syntax/parse "def-binding.rkt" syntax/parse
(for-template scheme/base "def-export.rkt" scheme/contract)) (for-template racket/base "def-export.rkt" racket/contract))
(provide remove-provides provide? generate-prov get-alternate) (provide remove-provides provide? generate-prov get-alternate)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" racket/match unstable/list unstable/sequence (require "../utils/utils.rkt" racket/match unstable/list unstable/sequence
(only-in srfi/1 unzip4) (only-in racket/list make-list) (only-in srfi/1 unzip4) (only-in racket/list make-list)

View File

@ -4,16 +4,16 @@
"signatures.rkt" "tc-metafunctions.rkt" "check-below.rkt" "signatures.rkt" "tc-metafunctions.rkt" "check-below.rkt"
"tc-app-helper.rkt" "find-annotation.rkt" "tc-funapp.rkt" "tc-app-helper.rkt" "find-annotation.rkt" "tc-funapp.rkt"
"tc-subst.rkt" (prefix-in c: racket/contract) "tc-subst.rkt" (prefix-in c: racket/contract)
syntax/parse racket/match racket/trace scheme/list syntax/parse racket/match racket/trace racket/list
unstable/sequence unstable/list unstable/sequence unstable/list
;; fixme - don't need to be bound in this phase - only to make tests work ;; fixme - don't need to be bound in this phase - only to make tests work
scheme/bool racket/bool
racket/unsafe/ops racket/unsafe/ops
(only-in racket/private/class-internal do-make-object) (only-in racket/private/class-internal do-make-object)
(only-in syntax/location module-name-fixup) (only-in syntax/location module-name-fixup)
(only-in '#%kernel [apply k:apply] [reverse k:reverse]) (only-in '#%kernel [apply k:apply] [reverse k:reverse])
;; end fixme ;; end fixme
(for-syntax syntax/parse scheme/base (utils tc-utils)) (for-syntax syntax/parse racket/base (utils tc-utils))
(private type-annotation) (private type-annotation)
(types utils abbrev union subtype resolve convenience type-table substitute) (types utils abbrev union subtype resolve convenience type-table substitute)
(utils tc-utils) (utils tc-utils)
@ -25,7 +25,7 @@
(for-template (for-template
racket/unsafe/ops racket/fixnum racket/flonum racket/unsafe/ops racket/fixnum racket/flonum
(only-in '#%kernel [apply k:apply] [reverse k:reverse]) (only-in '#%kernel [apply k:apply] [reverse k:reverse])
"internal-forms.rkt" scheme/base scheme/bool '#%paramz "internal-forms.rkt" racket/base racket/bool '#%paramz
(only-in racket/private/class-internal do-make-object) (only-in racket/private/class-internal do-make-object)
(only-in syntax/location module-name-fixup))) (only-in syntax/location module-name-fixup)))
@ -690,8 +690,8 @@
mp1 mp1
(#%plain-lambda () (#%plain-lambda ()
(#%plain-app mp2 (#%plain-app call-with-values (#%plain-lambda () e) list)))) (#%plain-app mp2 (#%plain-app call-with-values (#%plain-lambda () e) list))))
#:declare mp1 (id-from 'make-promise 'scheme/promise) #:declare mp1 (id-from 'make-promise 'racket/promise)
#:declare mp2 (id-from 'make-promise 'scheme/promise) #:declare mp2 (id-from 'make-promise 'racket/promise)
(ret (-Promise (tc-expr/t #'e)))] (ret (-Promise (tc-expr/t #'e)))]
;; special case for `list' ;; special case for `list'
[(#%plain-app list . args) [(#%plain-app list . args)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require (rename-in "../utils/utils.rkt" [infer infer-in])) (require (rename-in "../utils/utils.rkt" [infer infer-in]))
(require (rename-in (types subtype convenience remove-intersect union) (require (rename-in (types subtype convenience remove-intersect union)
@ -11,10 +11,10 @@
(types resolve) (types resolve)
(only-in (env type-env-structs lexical-env) (only-in (env type-env-structs lexical-env)
env? update-type/lexical env-map env-props replace-props) env? update-type/lexical env-map env-props replace-props)
scheme/contract racket/match racket/contract racket/match
mzlib/trace unstable/struct mzlib/trace unstable/struct
"tc-metafunctions.rkt" "tc-metafunctions.rkt"
(for-syntax scheme/base)) (for-syntax racket/base))
;(trace replace-nth) ;(trace replace-nth)

View File

@ -1,8 +1,8 @@
#lang scheme/unit #lang racket/unit
(require (rename-in "../utils/utils.rkt" [private private-in]) (require (rename-in "../utils/utils.rkt" [private private-in])
racket/match (prefix-in - scheme/contract) racket/match (prefix-in - racket/contract)
"signatures.rkt" "tc-envops.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" "signatures.rkt" "tc-envops.rkt" "tc-metafunctions.rkt" "tc-subst.rkt"
"check-below.rkt" "tc-funapp.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt" "check-below.rkt" "tc-funapp.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt"
(types utils convenience union subtype remove-intersect type-table filter-ops) (types utils convenience union subtype remove-intersect type-table filter-ops)
@ -17,13 +17,13 @@
(only-in srfi/1 split-at) (only-in srfi/1 split-at)
(for-template "internal-forms.rkt")) (for-template "internal-forms.rkt"))
(require (for-template scheme/base racket/private/class-internal)) (require (for-template racket/base racket/private/class-internal))
(import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^) (import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^)
(export tc-expr^) (export tc-expr^)
;; return the type of a literal value ;; return the type of a literal value
;; scheme-value [type] -> type ;; racket-value [type] -> type
(define (tc-literal v-stx [expected #f]) (define (tc-literal v-stx [expected #f])
(define-syntax-class exp (define-syntax-class exp
(pattern (~and i (~or :number :str :bytes)) (pattern (~and i (~or :number :str :bytes))

View File

@ -1,13 +1,13 @@
#lang scheme/unit #lang racket/unit
(require (rename-in "../utils/utils.rkt" [infer r:infer]) (require (rename-in "../utils/utils.rkt" [infer r:infer])
"signatures.rkt" "signatures.rkt"
"tc-metafunctions.rkt" "tc-metafunctions.rkt"
"tc-subst.rkt" "check-below.rkt" "tc-subst.rkt" "check-below.rkt"
mzlib/trace racket/dict mzlib/trace racket/dict
scheme/list syntax/parse "parse-cl.rkt" racket/list syntax/parse "parse-cl.rkt"
racket/syntax unstable/struct syntax/stx racket/syntax unstable/struct syntax/stx
(rename-in scheme/contract [-> -->] [->* -->*] [one-of/c -one-of/c]) (rename-in racket/contract [-> -->] [->* -->*] [one-of/c -one-of/c])
(except-in (rep type-rep) make-arr) (except-in (rep type-rep) make-arr)
(rename-in (types convenience utils union) (rename-in (types convenience utils union)
[make-arr* make-arr]) [make-arr* make-arr])
@ -17,7 +17,7 @@
(utils tc-utils) (utils tc-utils)
racket/match) racket/match)
(require (for-template scheme/base "internal-forms.rkt")) (require (for-template racket/base "internal-forms.rkt"))
(import tc-expr^) (import tc-expr^)
(export tc-lambda^) (export tc-lambda^)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(except-in (rep type-rep free-variance) Dotted) (except-in (rep type-rep free-variance) Dotted)
@ -19,10 +19,10 @@
[-> c->]) [-> c->])
(for-syntax (for-syntax
syntax/parse syntax/parse
scheme/base)) racket/base))
(require (for-template scheme/base (require (for-template racket/base
"internal-forms.rkt")) "internal-forms.rkt"))
(provide tc/struct tc/poly-struct names-of-struct d-s) (provide tc/struct tc/poly-struct names-of-struct d-s)

View File

@ -1,13 +1,13 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rename-in (types subtype convenience remove-intersect union utils filter-ops) (require (rename-in (types subtype convenience remove-intersect union utils filter-ops)
[-> -->] [-> -->]
[->* -->*] [->* -->*]
[one-of/c -one-of/c]) [one-of/c -one-of/c])
(rep type-rep filter-rep rep-utils) scheme/list (rep type-rep filter-rep rep-utils) racket/list
scheme/contract racket/match unstable/match racket/contract racket/match unstable/match
(for-syntax scheme/base) (for-syntax racket/base)
"tc-metafunctions.rkt") "tc-metafunctions.rkt")
(provide (all-defined-out)) (provide (all-defined-out))

View File

@ -24,7 +24,7 @@
"internal-forms.rkt" "internal-forms.rkt"
syntax/location syntax/location
mzlib/contract mzlib/contract
scheme/base)) racket/base))
(c:provide/contract (c:provide/contract
[type-check (syntax? . c:-> . syntax?)] [type-check (syntax? . c:-> . syntax?)]

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
;; Provides raise-read-error and raise-read-eof-error ;; Provides raise-read-error and raise-read-eof-error
(require syntax/readerr) (require syntax/readerr)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rep type-rep) (types utils)) (require (rep type-rep) (types utils))
(provide type-equal? tc-result-equal? type<? type-compare effects-equal?) (provide type-equal? tc-result-equal? type<? type-compare effects-equal?)

View File

@ -1,14 +1,14 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(rep type-rep filter-rep object-rep rep-utils) (rep type-rep filter-rep object-rep rep-utils)
(utils tc-utils) (utils tc-utils)
"abbrev.rkt" "numeric-tower.rkt" (only-in scheme/contract current-blame-format) "abbrev.rkt" "numeric-tower.rkt" (only-in racket/contract current-blame-format)
(types comparison printer union subtype utils substitute) (types comparison printer union subtype utils substitute)
scheme/list racket/match racket/list racket/match
(for-syntax syntax/parse scheme/base) (for-syntax syntax/parse racket/base)
syntax/id-table scheme/dict syntax/id-table racket/dict
racket/trace racket/trace
(for-template scheme/base)) (for-template racket/base))
(provide (all-defined-out) (provide (all-defined-out)
(all-from-out "abbrev.rkt" "numeric-tower.rkt") (all-from-out "abbrev.rkt" "numeric-tower.rkt")

View File

@ -1,15 +1,15 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(rep type-rep filter-rep object-rep rep-utils) (rep type-rep filter-rep object-rep rep-utils)
(utils tc-utils) (only-in (infer infer) restrict) (utils tc-utils) (only-in (infer infer) restrict)
"abbrev.rkt" (only-in scheme/contract current-blame-format [-> -->] listof) "abbrev.rkt" (only-in racket/contract current-blame-format [-> -->] listof)
(types comparison printer union subtype utils remove-intersect) (types comparison printer union subtype utils remove-intersect)
scheme/list racket/match racket/list racket/match
(for-syntax syntax/parse scheme/base) (for-syntax syntax/parse racket/base)
syntax/id-table scheme/dict syntax/id-table racket/dict
racket/trace racket/trace
(for-template scheme/base)) (for-template racket/base))
(provide (all-defined-out)) (provide (all-defined-out))

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(rep type-rep rep-utils) (rep type-rep rep-utils)

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require "../utils/utils.rkt") (require "../utils/utils.rkt")
(require (rep type-rep rep-utils) (require (rep type-rep rep-utils)
@ -6,7 +6,7 @@
(utils tc-utils) (utils tc-utils)
(types utils) (types utils)
racket/match racket/match
scheme/contract) racket/contract)
(provide resolve-name resolve-app needs-resolving? resolve) (provide resolve-name resolve-app needs-resolving? resolve)
(provide/cond-contract [resolve-once (Type/c . -> . (or/c Type/c #f))]) (provide/cond-contract [resolve-once (Type/c . -> . (or/c Type/c #f))])

View File

@ -6,7 +6,7 @@
(only-in (rep free-variance) combine-frees) (only-in (rep free-variance) combine-frees)
(env index-env tvar-env) (env index-env tvar-env)
racket/match racket/match
scheme/contract) racket/contract)
(provide subst-all substitute substitute-dots substitute-dotted subst (provide subst-all substitute substitute-dots substitute-dotted subst
(struct-out t-subst) (struct-out i-subst) (struct-out i-subst/starred) (struct-out i-subst/dotted) (struct-out t-subst) (struct-out i-subst) (struct-out i-subst/starred) (struct-out i-subst/dotted)

View File

@ -205,7 +205,7 @@ don't depend on any other portion of the system
;; id: identifier ;; id: identifier
;; sym: a symbol ;; sym: a symbol
;; mod: a quoted require spec like 'scheme/base ;; mod: a quoted require spec like 'racket/base
;; is id the name sym defined in mod? ;; is id the name sym defined in mod?
(define (id-from? id sym mod) (define (id-from? id sym mod)
(and (eq? (syntax-e id) sym) (and (eq? (syntax-e id) sym)