From 459a675b90443b59e46bccae476a6f040fa8434d Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 30 Apr 2010 09:51:32 -0400 Subject: [PATCH] rename to rkt --- collects/typed-scheme/env/init-envs.rkt | 8 +++---- collects/typed-scheme/env/lexical-env.rkt | 6 ++--- collects/typed-scheme/env/type-alias-env.rkt | 2 +- collects/typed-scheme/env/type-env.rkt | 2 +- .../typed-scheme/env/type-environments.rkt | 2 +- collects/typed-scheme/env/type-name-env.rkt | 2 +- .../typed-scheme/infer/constraint-structs.rkt | 4 ++-- collects/typed-scheme/infer/constraints.rkt | 4 ++-- collects/typed-scheme/infer/dmap.rkt | 4 ++-- collects/typed-scheme/infer/infer-dummy.rkt | 2 +- collects/typed-scheme/infer/infer-unit.rkt | 16 +++++++------- collects/typed-scheme/infer/infer.rkt | 6 ++--- .../typed-scheme/infer/promote-demote.rkt | 4 ++-- collects/typed-scheme/infer/restrict.rkt | 4 ++-- collects/typed-scheme/infer/signatures.rkt | 2 +- collects/typed-scheme/lang/reader.rkt | 2 +- collects/typed-scheme/main.rkt | 22 +++++++++---------- collects/typed-scheme/no-check.rkt | 4 ++-- .../typed-scheme/private/annotate-classes.rkt | 2 +- .../private/base-env-indexing-abs.rkt | 6 ++--- .../private/base-env-indexing-old.rkt | 4 ++-- .../private/base-env-indexing.rkt | 4 ++-- .../typed-scheme/private/base-env-numeric.rkt | 4 ++-- collects/typed-scheme/private/base-env.rkt | 6 ++--- .../typed-scheme/private/base-special-env.rkt | 4 ++-- .../typed-scheme/private/base-types-new.rkt | 2 +- collects/typed-scheme/private/base-types.rkt | 2 +- collects/typed-scheme/private/colon.rkt | 10 ++++----- collects/typed-scheme/private/env-lang.rkt | 2 +- collects/typed-scheme/private/optimize.rkt | 2 +- collects/typed-scheme/private/parse-type.rkt | 8 +++---- collects/typed-scheme/private/prims.rkt | 12 +++++----- .../typed-scheme/private/type-annotation.rkt | 2 +- .../typed-scheme/private/type-contract.rkt | 2 +- .../typed-scheme/private/type-env-lang.rkt | 2 +- collects/typed-scheme/rep/filter-rep.rkt | 2 +- collects/typed-scheme/rep/free-variance.rkt | 4 ++-- collects/typed-scheme/rep/object-rep.rkt | 2 +- collects/typed-scheme/rep/rep-utils.rkt | 6 ++--- collects/typed-scheme/rep/type-rep.rkt | 6 ++--- collects/typed-scheme/scribblings/begin.scrbl | 2 +- collects/typed-scheme/scribblings/more.scrbl | 2 +- collects/typed-scheme/scribblings/quick.scrbl | 2 +- .../typed-scheme/scribblings/ts-guide.scrbl | 2 +- .../scribblings/ts-reference.scrbl | 2 +- collects/typed-scheme/scribblings/types.scrbl | 2 +- .../typed-scheme/scribblings/varargs.scrbl | 2 +- .../typecheck/check-subforms-unit.rkt | 4 ++-- .../typed-scheme/typecheck/def-binding.rkt | 2 +- .../typecheck/find-annotation.rkt | 2 +- .../typecheck/provide-handling.rkt | 4 ++-- .../typed-scheme/typecheck/signatures.rkt | 2 +- .../typed-scheme/typecheck/tc-app-helper.rkt | 2 +- collects/typed-scheme/typecheck/tc-app.rkt | 10 ++++----- .../typed-scheme/typecheck/tc-dots-unit.rkt | 4 ++-- collects/typed-scheme/typecheck/tc-envops.rkt | 2 +- .../typed-scheme/typecheck/tc-expr-unit.rkt | 4 ++-- collects/typed-scheme/typecheck/tc-if.rkt | 4 ++-- .../typed-scheme/typecheck/tc-lambda-unit.rkt | 10 ++++----- .../typed-scheme/typecheck/tc-let-unit.rkt | 6 ++--- .../typecheck/tc-metafunctions.rkt | 2 +- .../typed-scheme/typecheck/tc-structs.rkt | 6 ++--- .../typecheck/{tc-subst.ss => tc-subst.rkt} | 4 ++-- .../typed-scheme/typecheck/tc-toplevel.rkt | 14 ++++++------ .../typed-scheme/typecheck/typechecker.rkt | 10 ++++----- collects/typed-scheme/typed-scheme.rkt | 2 +- collects/typed-scheme/types/abbrev.rkt | 4 ++-- collects/typed-scheme/types/comparison.rkt | 2 +- collects/typed-scheme/types/convenience.rkt | 6 ++--- .../types/{filter-ops.ss => filter-ops.rkt} | 4 ++-- collects/typed-scheme/types/printer.rkt | 2 +- .../typed-scheme/types/remove-intersect.rkt | 2 +- collects/typed-scheme/types/resolve.rkt | 2 +- collects/typed-scheme/types/subtype.rkt | 2 +- collects/typed-scheme/types/type-table.rkt | 2 +- collects/typed-scheme/types/union.rkt | 2 +- collects/typed-scheme/types/utils.rkt | 2 +- .../typed-scheme/utils/require-contract.rkt | 4 ++-- collects/typed-scheme/utils/tc-utils.rkt | 4 ++-- collects/typed-scheme/utils/utils.rkt | 4 ++-- 80 files changed, 170 insertions(+), 170 deletions(-) rename collects/typed-scheme/typecheck/{tc-subst.ss => tc-subst.rkt} (98%) rename collects/typed-scheme/types/{filter-ops.ss => filter-ops.rkt} (98%) diff --git a/collects/typed-scheme/env/init-envs.rkt b/collects/typed-scheme/env/init-envs.rkt index 91a7ddef0e..9fbf1a51e7 100644 --- a/collects/typed-scheme/env/init-envs.rkt +++ b/collects/typed-scheme/env/init-envs.rkt @@ -1,9 +1,9 @@ #lang scheme/base (provide (all-defined-out)) -(require "../utils/utils.ss" - "type-env.ss" - "type-name-env.ss" - "type-alias-env.ss" +(require "../utils/utils.rkt" + "type-env.rkt" + "type-name-env.rkt" + "type-alias-env.rkt" unstable/struct (rep type-rep object-rep filter-rep rep-utils) (for-template (rep type-rep object-rep filter-rep) diff --git a/collects/typed-scheme/env/lexical-env.rkt b/collects/typed-scheme/env/lexical-env.rkt index a48332d665..15f9e25b1c 100644 --- a/collects/typed-scheme/env/lexical-env.rkt +++ b/collects/typed-scheme/env/lexical-env.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require "../utils/utils.ss" - "type-environments.ss" - "type-env.ss" +(require "../utils/utils.rkt" + "type-environments.rkt" + "type-env.rkt" unstable/mutated-vars (only-in scheme/contract ->* -> or/c any/c listof cons/c) (utils tc-utils) diff --git a/collects/typed-scheme/env/type-alias-env.rkt b/collects/typed-scheme/env/type-alias-env.rkt index ece991cb3b..0d1b629872 100644 --- a/collects/typed-scheme/env/type-alias-env.rkt +++ b/collects/typed-scheme/env/type-alias-env.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" syntax/boundmap (utils tc-utils) mzlib/trace diff --git a/collects/typed-scheme/env/type-env.rkt b/collects/typed-scheme/env/type-env.rkt index 8521f8ecd6..300220b874 100644 --- a/collects/typed-scheme/env/type-env.rkt +++ b/collects/typed-scheme/env/type-env.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" syntax/id-table (utils tc-utils) (types utils)) diff --git a/collects/typed-scheme/env/type-environments.rkt b/collects/typed-scheme/env/type-environments.rkt index 00ceb443ff..2254d9482b 100644 --- a/collects/typed-scheme/env/type-environments.rkt +++ b/collects/typed-scheme/env/type-environments.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/contract - (prefix-in r: "../utils/utils.ss") + (prefix-in r: "../utils/utils.rkt") scheme/match (r:rep filter-rep rep-utils type-rep) unstable/struct (except-in (r:utils tc-utils) make-env) #;(r:typecheck tc-metafunctions)) diff --git a/collects/typed-scheme/env/type-name-env.rkt b/collects/typed-scheme/env/type-name-env.rkt index 6b035daa82..c741b55231 100644 --- a/collects/typed-scheme/env/type-name-env.rkt +++ b/collects/typed-scheme/env/type-name-env.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require syntax/boundmap mzlib/trace diff --git a/collects/typed-scheme/infer/constraint-structs.rkt b/collects/typed-scheme/infer/constraint-structs.rkt index 1fbf974271..ea946d98f9 100644 --- a/collects/typed-scheme/infer/constraint-structs.rkt +++ b/collects/typed-scheme/infer/constraint-structs.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" (rep type-rep) scheme/contract scheme/match (for-syntax scheme/base syntax/parse)) +(require "../utils/utils.rkt" (rep type-rep) scheme/contract scheme/match (for-syntax scheme/base syntax/parse)) ;; S, T types ;; X a var @@ -23,7 +23,7 @@ ;; maps is a list of pairs of ;; - functional maps from vars to c's -;; - dmaps (see dmap.ss) +;; - dmaps (see dmap.rkt) ;; we need a bunch of mappings for each cset to handle case-lambda ;; because case-lambda can generate multiple possible solutions, and we ;; don't want to rule them out too early diff --git a/collects/typed-scheme/infer/constraints.rkt b/collects/typed-scheme/infer/constraints.rkt index b08341d4b5..d49691976c 100644 --- a/collects/typed-scheme/infer/constraints.rkt +++ b/collects/typed-scheme/infer/constraints.rkt @@ -1,11 +1,11 @@ #lang scheme/unit -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (types convenience utils union subtype) (rep type-rep) (utils tc-utils) unstable/sequence unstable/hash - "signatures.ss" "constraint-structs.ss" + "signatures.rkt" "constraint-structs.rkt" scheme/match) (import restrict^ dmap^) diff --git a/collects/typed-scheme/infer/dmap.rkt b/collects/typed-scheme/infer/dmap.rkt index 1a3a9baa42..c8857c91be 100644 --- a/collects/typed-scheme/infer/dmap.rkt +++ b/collects/typed-scheme/infer/dmap.rkt @@ -1,7 +1,7 @@ #lang scheme/unit -(require "../utils/utils.ss" - "signatures.ss" "constraint-structs.ss" +(require "../utils/utils.rkt" + "signatures.rkt" "constraint-structs.rkt" (utils tc-utils) unstable/sequence unstable/hash scheme/match) diff --git a/collects/typed-scheme/infer/infer-dummy.rkt b/collects/typed-scheme/infer/infer-dummy.rkt index 1088e741bc..7fa5802bee 100644 --- a/collects/typed-scheme/infer/infer-dummy.rkt +++ b/collects/typed-scheme/infer/infer-dummy.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep) (utils tc-utils) mzlib/trace) diff --git a/collects/typed-scheme/infer/infer-unit.rkt b/collects/typed-scheme/infer/infer-unit.rkt index 902ca77122..07bdec74cc 100644 --- a/collects/typed-scheme/infer/infer-unit.rkt +++ b/collects/typed-scheme/infer/infer-unit.rkt @@ -3,15 +3,15 @@ (require scheme/require (except-in (path-up - "utils/utils.ss" "utils/tc-utils.ss" - "rep/free-variance.ss" "rep/type-rep.ss" "rep/filter-rep.ss" "rep/rep-utils.ss" - "types/convenience.ss" "types/union.ss" "types/subtype.ss" "types/remove-intersect.ss" "types/resolve.ss" - "env/type-name-env.ss") + "utils/utils.rkt" "utils/tc-utils.rkt" + "rep/free-variance.rkt" "rep/type-rep.rkt" "rep/filter-rep.rkt" "rep/rep-utils.rkt" + "types/convenience.rkt" "types/union.rkt" "types/subtype.rkt" "types/remove-intersect.rkt" "types/resolve.rkt" + "env/type-name-env.rkt") make-env) - (except-in (path-up "types/utils.ss") Dotted) - (only-in (path-up "env/type-environments.ss") lookup current-tvars) - "constraint-structs.ss" - "signatures.ss" + (except-in (path-up "types/utils.rkt") Dotted) + (only-in (path-up "env/type-environments.rkt") lookup current-tvars) + "constraint-structs.rkt" + "signatures.rkt" scheme/match mzlib/etc mzlib/trace diff --git a/collects/typed-scheme/infer/infer.rkt b/collects/typed-scheme/infer/infer.rkt index 8222f69f43..487c50324d 100644 --- a/collects/typed-scheme/infer/infer.rkt +++ b/collects/typed-scheme/infer/infer.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require (except-in "../utils/utils.ss" infer)) -(require "infer-unit.ss" "constraints.ss" "dmap.ss" "signatures.ss" - "restrict.ss" "promote-demote.ss" +(require (except-in "../utils/utils.rkt" infer)) +(require "infer-unit.rkt" "constraints.rkt" "dmap.rkt" "signatures.rkt" + "restrict.rkt" "promote-demote.rkt" mzlib/trace (only-in scheme/unit provide-signature-elements define-values/invoke-unit/infer link) diff --git a/collects/typed-scheme/infer/promote-demote.rkt b/collects/typed-scheme/infer/promote-demote.rkt index fba47ba627..5d2daef8f2 100644 --- a/collects/typed-scheme/infer/promote-demote.rkt +++ b/collects/typed-scheme/infer/promote-demote.rkt @@ -1,9 +1,9 @@ #lang scheme/unit -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep rep-utils) (types convenience union utils) - "signatures.ss" + "signatures.rkt" scheme/list scheme/match) (import) diff --git a/collects/typed-scheme/infer/restrict.rkt b/collects/typed-scheme/infer/restrict.rkt index d4ef3cd463..6e45ac597c 100644 --- a/collects/typed-scheme/infer/restrict.rkt +++ b/collects/typed-scheme/infer/restrict.rkt @@ -1,9 +1,9 @@ #lang scheme/unit -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep) (types utils union subtype remove-intersect resolve) - "signatures.ss" + "signatures.rkt" scheme/match mzlib/trace) (import infer^) diff --git a/collects/typed-scheme/infer/signatures.rkt b/collects/typed-scheme/infer/signatures.rkt index b9b9be1286..4dcf72abf8 100644 --- a/collects/typed-scheme/infer/signatures.rkt +++ b/collects/typed-scheme/infer/signatures.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require scheme/unit scheme/contract "constraint-structs.ss" "../utils/utils.ss") +(require scheme/unit scheme/contract "constraint-structs.rkt" "../utils/utils.rkt") (require (rep type-rep) (utils unit-utils)) (provide (all-defined-out)) diff --git a/collects/typed-scheme/lang/reader.rkt b/collects/typed-scheme/lang/reader.rkt index 0a919940e8..ef2e9ce68c 100644 --- a/collects/typed-scheme/lang/reader.rkt +++ b/collects/typed-scheme/lang/reader.rkt @@ -5,4 +5,4 @@ typed-scheme #:read r:read #:read-syntax r:read-syntax -(require (prefix-in r: "../typed-reader.ss")) +(require (prefix-in r: "../typed-reader.rkt")) diff --git a/collects/typed-scheme/main.rkt b/collects/typed-scheme/main.rkt index 1ce6926eac..a997a7a91a 100644 --- a/collects/typed-scheme/main.rkt +++ b/collects/typed-scheme/main.rkt @@ -1,21 +1,21 @@ -#lang s-exp "minimal.ss" +#lang s-exp "minimal.rkt" (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers number? lambda #%app) - (except "private/prims.ss") - (except "private/base-types.ss") - (except "private/base-types-extra.ss")) + (except "private/prims.rkt") + (except "private/base-types.rkt") + (except "private/base-types-extra.rkt")) (basics #%module-begin #%top-interaction lambda #%app)) -(require "private/base-env.ss" - "private/base-special-env.ss" - "private/base-env-numeric.ss" - "private/base-env-indexing-old.ss" - "private/extra-procs.ss" - (for-syntax "private/base-types-extra.ss")) +(require "private/base-env.rkt" + "private/base-special-env.rkt" + "private/base-env-numeric.rkt" + "private/base-env-indexing-old.rkt" + "private/extra-procs.rkt" + (for-syntax "private/base-types-extra.rkt")) (provide (rename-out [with-handlers: with-handlers] [real? number?]) - (for-syntax (all-from-out "private/base-types-extra.ss")) + (for-syntax (all-from-out "private/base-types-extra.rkt")) assert with-type) diff --git a/collects/typed-scheme/no-check.rkt b/collects/typed-scheme/no-check.rkt index 2d4bf8d0ef..ed542f858a 100644 --- a/collects/typed-scheme/no-check.rkt +++ b/collects/typed-scheme/no-check.rkt @@ -1,12 +1,12 @@ #lang scheme/base (require - (except-in "private/prims.ss" + (except-in "private/prims.rkt" require/typed require/opaque-type require-typed-struct) (for-syntax scheme/base syntax/parse syntax/struct)) (provide (all-from-out scheme/base) (all-defined-out) - (all-from-out "private/prims.ss")) + (all-from-out "private/prims.rkt")) (define-syntax (require/typed stx) diff --git a/collects/typed-scheme/private/annotate-classes.rkt b/collects/typed-scheme/private/annotate-classes.rkt index 0264868d9c..e9d65a8151 100644 --- a/collects/typed-scheme/private/annotate-classes.rkt +++ b/collects/typed-scheme/private/annotate-classes.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require syntax/parse "colon.ss" (for-template "colon.ss") "parse-type.ss") +(require syntax/parse "colon.rkt" (for-template "colon.rkt") "parse-type.rkt") (provide (all-defined-out)) (define-splicing-syntax-class annotated-name diff --git a/collects/typed-scheme/private/base-env-indexing-abs.rkt b/collects/typed-scheme/private/base-env-indexing-abs.rkt index 44587b1cf6..3fae1971a0 100644 --- a/collects/typed-scheme/private/base-env-indexing-abs.rkt +++ b/collects/typed-scheme/private/base-env-indexing-abs.rkt @@ -1,12 +1,12 @@ #lang scheme (require - "../utils/utils.ss" + "../utils/utils.rkt" scheme/tcp scheme/unsafe/ops (only-in rnrs/lists-6 fold-left) '#%paramz - "extra-procs.ss" + "extra-procs.rkt" (utils tc-utils ) (types union convenience) (only-in '#%kernel [apply kernel:apply]) @@ -112,7 +112,7 @@ [peek-byte (cl->* [->opt [-Input-Port -Nat] (Un -Byte (-val eof))])] - ;; string.ss + ;; string.rkt [real->decimal-string (N [-Nat] . ->opt . -String)] [random (cl-> [(-Nat) -Nat*] [() -Real])] diff --git a/collects/typed-scheme/private/base-env-indexing-old.rkt b/collects/typed-scheme/private/base-env-indexing-old.rkt index 26be266b1e..23b72c05ca 100644 --- a/collects/typed-scheme/private/base-env-indexing-old.rkt +++ b/collects/typed-scheme/private/base-env-indexing-old.rkt @@ -1,9 +1,9 @@ #lang scheme (require - (rename-in "../utils/utils.ss" [infer r:infer]) + (rename-in "../utils/utils.rkt" [infer r:infer]) (for-syntax (types abbrev) (env init-envs) (r:infer infer-dummy infer) - "base-env-indexing-abs.ss")) + "base-env-indexing-abs.rkt")) (define-for-syntax e (parameterize ([infer-param infer]) (indexing -Integer))) (begin-for-syntax (initialize-type-env e)) diff --git a/collects/typed-scheme/private/base-env-indexing.rkt b/collects/typed-scheme/private/base-env-indexing.rkt index 57e74fc6a7..e345ab7e5c 100644 --- a/collects/typed-scheme/private/base-env-indexing.rkt +++ b/collects/typed-scheme/private/base-env-indexing.rkt @@ -1,9 +1,9 @@ #lang scheme (require - (rename-in "../utils/utils.ss" [infer r:infer]) + (rename-in "../utils/utils.rkt" [infer r:infer]) (for-syntax (types abbrev) (env init-envs) (r:infer infer-dummy infer) - "base-env-indexing-abs.ss")) + "base-env-indexing-abs.rkt")) (define-for-syntax e (parameterize ([infer-param infer]) (indexing -Nat))) (begin-for-syntax (initialize-type-env e)) diff --git a/collects/typed-scheme/private/base-env-numeric.rkt b/collects/typed-scheme/private/base-env-numeric.rkt index 0b58ba23cf..9274bdfbf3 100644 --- a/collects/typed-scheme/private/base-env-numeric.rkt +++ b/collects/typed-scheme/private/base-env-numeric.rkt @@ -1,4 +1,4 @@ -#lang s-exp "env-lang.ss" +#lang s-exp "env-lang.rkt" (begin (require @@ -7,7 +7,7 @@ scheme/unsafe/ops (only-in rnrs/lists-6 fold-left) '#%paramz - "extra-procs.ss" + "extra-procs.rkt" (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) diff --git a/collects/typed-scheme/private/base-env.rkt b/collects/typed-scheme/private/base-env.rkt index 231f6ea821..7c29a3f380 100644 --- a/collects/typed-scheme/private/base-env.rkt +++ b/collects/typed-scheme/private/base-env.rkt @@ -1,4 +1,4 @@ -#lang s-exp "env-lang.ss" +#lang s-exp "env-lang.rkt" (require scheme/tcp @@ -7,7 +7,7 @@ scheme/fixnum (only-in rnrs/lists-6 fold-left) '#%paramz - "extra-procs.ss" + "extra-procs.rkt" (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) @@ -605,7 +605,7 @@ [symbol=? (Sym Sym . -> . B)] [false? (make-pred-ty (-val #f))] -;; with-stx.ss +;; with-stx.rkt [generate-temporaries ((Un (-Syntax Univ) (-lst Univ)) . -> . (-lst (-Syntax Sym)))] [check-duplicate-identifier ((-lst (-Syntax Sym)) . -> . (-opt (-Syntax Sym)))] diff --git a/collects/typed-scheme/private/base-special-env.rkt b/collects/typed-scheme/private/base-special-env.rkt index 4ead72b0b9..6575c55f0b 100644 --- a/collects/typed-scheme/private/base-special-env.rkt +++ b/collects/typed-scheme/private/base-special-env.rkt @@ -2,8 +2,8 @@ ;; these are libraries providing functions we add types to that are not in scheme/base (require - "extra-procs.ss" - "../utils/utils.ss" + "extra-procs.rkt" + "../utils/utils.rkt" (only-in scheme/list cons? take drop add-between last filter-map) (only-in rnrs/lists-6 fold-left) '#%paramz diff --git a/collects/typed-scheme/private/base-types-new.rkt b/collects/typed-scheme/private/base-types-new.rkt index 7e52866ca6..98d22dec3f 100644 --- a/collects/typed-scheme/private/base-types-new.rkt +++ b/collects/typed-scheme/private/base-types-new.rkt @@ -1,4 +1,4 @@ -#lang s-exp "type-env-lang.ss" +#lang s-exp "type-env-lang.rkt" [Complex -Number] [Number -Number] diff --git a/collects/typed-scheme/private/base-types.rkt b/collects/typed-scheme/private/base-types.rkt index eb723e41e8..296f03807e 100644 --- a/collects/typed-scheme/private/base-types.rkt +++ b/collects/typed-scheme/private/base-types.rkt @@ -1,4 +1,4 @@ -#lang s-exp "type-env-lang.ss" +#lang s-exp "type-env-lang.rkt" [Number -Real] [Real -Real] diff --git a/collects/typed-scheme/private/colon.rkt b/collects/typed-scheme/private/colon.rkt index 833d9fd366..fb84c1795c 100644 --- a/collects/typed-scheme/private/colon.rkt +++ b/collects/typed-scheme/private/colon.rkt @@ -1,10 +1,10 @@ #lang scheme/base -(require (for-syntax scheme/base syntax/parse "internal.ss") - "../typecheck/internal-forms.ss" - (prefix-in t: "base-types-extra.ss") - (for-template (prefix-in t: "base-types-extra.ss")) - (for-syntax (prefix-in t: "base-types-extra.ss"))) +(require (for-syntax scheme/base syntax/parse "internal.rkt") + "../typecheck/internal-forms.rkt" + (prefix-in t: "base-types-extra.rkt") + (for-template (prefix-in t: "base-types-extra.rkt")) + (for-syntax (prefix-in t: "base-types-extra.rkt"))) (provide :) diff --git a/collects/typed-scheme/private/env-lang.rkt b/collects/typed-scheme/private/env-lang.rkt index c1cd3f3b20..1f306b174c 100644 --- a/collects/typed-scheme/private/env-lang.rkt +++ b/collects/typed-scheme/private/env-lang.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require (rename-in "../utils/utils.ss" [infer r:infer])) +(require (rename-in "../utils/utils.rkt" [infer r:infer])) (require (for-syntax (utils tc-utils) (env init-envs) diff --git a/collects/typed-scheme/private/optimize.rkt b/collects/typed-scheme/private/optimize.rkt index ca7db62aa5..b47064a49e 100644 --- a/collects/typed-scheme/private/optimize.rkt +++ b/collects/typed-scheme/private/optimize.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require syntax/parse (for-template scheme/base scheme/unsafe/ops) - "../utils/utils.ss" unstable/match scheme/match unstable/syntax + "../utils/utils.rkt" unstable/match scheme/match unstable/syntax (rep type-rep) (types abbrev type-table utils)) (provide optimize) diff --git a/collects/typed-scheme/private/parse-type.rkt b/collects/typed-scheme/private/parse-type.rkt index e11a5afc4e..2553d35313 100644 --- a/collects/typed-scheme/private/parse-type.rkt +++ b/collects/typed-scheme/private/parse-type.rkt @@ -1,16 +1,16 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (except-in (rep type-rep) make-arr) (rename-in (types convenience union utils) [make-arr* make-arr]) (utils tc-utils stxclass-util) syntax/stx (prefix-in c: scheme/contract) syntax/parse (env type-environments type-name-env type-alias-env lexical-env) - (prefix-in t: (combine-in "base-types-extra.ss" "base-types.ss")) (only-in "colon.ss" :) + (prefix-in t: (combine-in "base-types-extra.rkt" "base-types.rkt")) (only-in "colon.rkt" :) scheme/match - (for-template scheme/base "base-types-extra.ss" "colon.ss") - (for-template (prefix-in t: "base-types-extra.ss"))) + (for-template scheme/base "base-types-extra.rkt" "colon.rkt") + (for-template (prefix-in t: "base-types-extra.rkt"))) (define-struct poly (name vars) #:prefab) diff --git a/collects/typed-scheme/private/prims.rkt b/collects/typed-scheme/private/prims.rkt index 674dce39ea..2343c4dc9a 100644 --- a/collects/typed-scheme/private/prims.rkt +++ b/collects/typed-scheme/private/prims.rkt @@ -25,30 +25,30 @@ This file defines two sorts of primitives. All of them are provided into any mod [lambda: λ:] [define-typed-struct/exec define-struct/exec:])) -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (for-syntax syntax/parse syntax/private/util scheme/base (rep type-rep) mzlib/match - "parse-type.ss" "annotate-classes.ss" + "parse-type.rkt" "annotate-classes.rkt" syntax/struct syntax/stx scheme/struct-info (private internal) (except-in (utils utils tc-utils)) (env type-name-env) - "type-contract.ss")) + "type-contract.rkt")) (require (utils require-contract) - "colon.ss" + "colon.rkt" (typecheck internal-forms) (except-in mzlib/contract ->) (only-in mzlib/contract [-> c->]) mzlib/struct - "base-types.ss" - "base-types-extra.ss") + "base-types.rkt" + "base-types-extra.rkt") (define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t)) diff --git a/collects/typed-scheme/private/type-annotation.rkt b/collects/typed-scheme/private/type-annotation.rkt index 0564ca5ba6..fd0b897bb1 100644 --- a/collects/typed-scheme/private/type-annotation.rkt +++ b/collects/typed-scheme/private/type-annotation.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (rep type-rep) (utils tc-utils) (env type-env) diff --git a/collects/typed-scheme/private/type-contract.rkt b/collects/typed-scheme/private/type-contract.rkt index 8c56828486..a8f395b5e5 100644 --- a/collects/typed-scheme/private/type-contract.rkt +++ b/collects/typed-scheme/private/type-contract.rkt @@ -3,7 +3,7 @@ (provide type->contract define/fixup-contract? change-contract-fixups) (require - "../utils/utils.ss" + "../utils/utils.rkt" syntax/parse (rep type-rep filter-rep object-rep) (typecheck internal-forms) diff --git a/collects/typed-scheme/private/type-env-lang.rkt b/collects/typed-scheme/private/type-env-lang.rkt index 4d74faf309..3892a58338 100644 --- a/collects/typed-scheme/private/type-env-lang.rkt +++ b/collects/typed-scheme/private/type-env-lang.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (for-syntax (env init-envs) scheme/base diff --git a/collects/typed-scheme/rep/filter-rep.rkt b/collects/typed-scheme/rep/filter-rep.rkt index 0ac34fc4f3..0040f4141a 100644 --- a/collects/typed-scheme/rep/filter-rep.rkt +++ b/collects/typed-scheme/rep/filter-rep.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/match scheme/contract) -(require "rep-utils.ss" "free-variance.ss") +(require "rep-utils.rkt" "free-variance.rkt") (define Filter/c (flat-named-contract diff --git a/collects/typed-scheme/rep/free-variance.rkt b/collects/typed-scheme/rep/free-variance.rkt index c42f9c6bb1..41fc238cc2 100644 --- a/collects/typed-scheme/rep/free-variance.rkt +++ b/collects/typed-scheme/rep/free-variance.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (for-syntax scheme/base) (utils tc-utils) scheme/list mzlib/etc scheme/contract) @@ -9,7 +9,7 @@ fix-bound make-invariant variance?) ;; this file contains support for calculating the free variables/indexes of types -;; actual computation is done in rep-utils.ss and type-rep.ss +;; actual computation is done in rep-utils.rkt and type-rep.rkt (define-values (Covariant Contravariant Invariant Constant Dotted) (let () (define-struct Variance () #:inspector #f) diff --git a/collects/typed-scheme/rep/object-rep.rkt b/collects/typed-scheme/rep/object-rep.rkt index 121b4a845f..e36c3a5ab7 100644 --- a/collects/typed-scheme/rep/object-rep.rkt +++ b/collects/typed-scheme/rep/object-rep.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require scheme/match scheme/contract "rep-utils.ss" "free-variance.ss" "filter-rep.ss") +(require scheme/match scheme/contract "rep-utils.rkt" "free-variance.rkt" "filter-rep.rkt") (provide object-equal?) (dpe CarPE () [#:fold-rhs #:base]) diff --git a/collects/typed-scheme/rep/rep-utils.rkt b/collects/typed-scheme/rep/rep-utils.rkt index 371d03bf2c..3e3cc464a3 100644 --- a/collects/typed-scheme/rep/rep-utils.rkt +++ b/collects/typed-scheme/rep/rep-utils.rkt @@ -1,11 +1,11 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require mzlib/struct scheme/match syntax/boundmap - "free-variance.ss" - "interning.ss" + "free-variance.rkt" + "interning.rkt" unstable/syntax unstable/match mzlib/etc scheme/contract diff --git a/collects/typed-scheme/rep/type-rep.rkt b/collects/typed-scheme/rep/type-rep.rkt index fb1e45c882..51474cbf49 100644 --- a/collects/typed-scheme/rep/type-rep.rkt +++ b/collects/typed-scheme/rep/type-rep.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (utils tc-utils) - "rep-utils.ss" "object-rep.ss" "filter-rep.ss" "free-variance.ss" + "rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt" mzlib/trace scheme/match scheme/contract unstable/debug (for-syntax scheme/base syntax/parse)) @@ -23,7 +23,7 @@ ;; Name = Symbol -;; Type is defined in rep-utils.ss +;; Type is defined in rep-utils.rkt ;; t must be a Type (dt Scope ([t (or/c Type/c Scope?)]) [#:key (Type-key t)]) diff --git a/collects/typed-scheme/scribblings/begin.scrbl b/collects/typed-scheme/scribblings/begin.scrbl index 011f28aad1..053b91d2ae 100644 --- a/collects/typed-scheme/scribblings/begin.scrbl +++ b/collects/typed-scheme/scribblings/begin.scrbl @@ -1,7 +1,7 @@ #lang scribble/manual @begin[(require (for-label (only-meta-in 0 typed/scheme)) scribble/eval - "utils.ss" (only-in "quick.scrbl" typed-mod))] + "utils.rkt" (only-in "quick.scrbl" typed-mod))] @(define the-eval (make-base-eval)) @(the-eval '(require typed/scheme)) diff --git a/collects/typed-scheme/scribblings/more.scrbl b/collects/typed-scheme/scribblings/more.scrbl index 77eebf1c4b..b37d045c95 100644 --- a/collects/typed-scheme/scribblings/more.scrbl +++ b/collects/typed-scheme/scribblings/more.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@begin[(require "utils.ss" +@begin[(require "utils.rkt" scribble/core scribble/eval (for-label (only-meta-in 0 typed/scheme) mzlib/etc))] diff --git a/collects/typed-scheme/scribblings/quick.scrbl b/collects/typed-scheme/scribblings/quick.scrbl index b0b7c25c5e..46cc16097e 100644 --- a/collects/typed-scheme/scribblings/quick.scrbl +++ b/collects/typed-scheme/scribblings/quick.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@(require "utils.ss" (for-label (only-meta-in 0 typed/scheme))) +@(require "utils.rkt" (for-label (only-meta-in 0 typed/scheme))) @(provide typed-mod) @title[#:tag "quick"]{Quick Start} diff --git a/collects/typed-scheme/scribblings/ts-guide.scrbl b/collects/typed-scheme/scribblings/ts-guide.scrbl index 0d69e20ced..7425104a1e 100644 --- a/collects/typed-scheme/scribblings/ts-guide.scrbl +++ b/collects/typed-scheme/scribblings/ts-guide.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@begin[(require "utils.ss" (for-label (only-meta-in 0 typed/scheme)))] +@begin[(require "utils.rkt" (for-label (only-meta-in 0 typed/scheme)))] @title[#:tag "top"]{@bold{Typed Scheme}: Scheme with Static Types} diff --git a/collects/typed-scheme/scribblings/ts-reference.scrbl b/collects/typed-scheme/scribblings/ts-reference.scrbl index 802a614adf..b626233b09 100644 --- a/collects/typed-scheme/scribblings/ts-reference.scrbl +++ b/collects/typed-scheme/scribblings/ts-reference.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@begin[(require "utils.ss" scribble/eval +@begin[(require "utils.rkt" scribble/eval scheme/sandbox) (require (for-label (only-meta-in 0 typed/scheme) scheme/list srfi/14 diff --git a/collects/typed-scheme/scribblings/types.scrbl b/collects/typed-scheme/scribblings/types.scrbl index 240055071b..8f530f5742 100644 --- a/collects/typed-scheme/scribblings/types.scrbl +++ b/collects/typed-scheme/scribblings/types.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@begin[(require "utils.ss" +@begin[(require "utils.rkt" scribble/core scribble/eval (for-label (only-meta-in 0 typed/scheme) mzlib/etc))] diff --git a/collects/typed-scheme/scribblings/varargs.scrbl b/collects/typed-scheme/scribblings/varargs.scrbl index 61b52b65de..a893a2f8bf 100644 --- a/collects/typed-scheme/scribblings/varargs.scrbl +++ b/collects/typed-scheme/scribblings/varargs.scrbl @@ -1,6 +1,6 @@ #lang scribble/manual -@begin[(require "utils.ss" (for-label typed/scheme/base))] +@begin[(require "utils.rkt" (for-label typed/scheme/base))] @title[#:tag "varargs"]{Variable-Arity Functions: Programming with Rest Arguments} diff --git a/collects/typed-scheme/typecheck/check-subforms-unit.rkt b/collects/typed-scheme/typecheck/check-subforms-unit.rkt index 945df04d88..6196c0b9b8 100644 --- a/collects/typed-scheme/typecheck/check-subforms-unit.rkt +++ b/collects/typed-scheme/typecheck/check-subforms-unit.rkt @@ -1,10 +1,10 @@ #lang scheme/unit -(require "../utils/utils.ss" +(require "../utils/utils.rkt" syntax/kerncase syntax/parse scheme/match unstable/debug - "signatures.ss" "tc-metafunctions.ss" + "signatures.rkt" "tc-metafunctions.rkt" (types utils convenience union subtype) (utils tc-utils) (rep type-rep)) diff --git a/collects/typed-scheme/typecheck/def-binding.rkt b/collects/typed-scheme/typecheck/def-binding.rkt index e8c976e0fa..f39124ded9 100644 --- a/collects/typed-scheme/typecheck/def-binding.rkt +++ b/collects/typed-scheme/typecheck/def-binding.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require scheme/contract "../utils/utils.ss" scheme/struct-info) +(require scheme/contract "../utils/utils.rkt" scheme/struct-info) (define-struct binding (name) #:transparent) (define-struct (def-binding binding) (ty) #:transparent) diff --git a/collects/typed-scheme/typecheck/find-annotation.rkt b/collects/typed-scheme/typecheck/find-annotation.rkt index 0c85a81abd..ceb9b79a9c 100644 --- a/collects/typed-scheme/typecheck/find-annotation.rkt +++ b/collects/typed-scheme/typecheck/find-annotation.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" syntax/parse +(require "../utils/utils.rkt" syntax/parse scheme/contract (rep type-rep) (env lexical-env) diff --git a/collects/typed-scheme/typecheck/provide-handling.rkt b/collects/typed-scheme/typecheck/provide-handling.rkt index 88eb112698..504cfb1cef 100644 --- a/collects/typed-scheme/typecheck/provide-handling.rkt +++ b/collects/typed-scheme/typecheck/provide-handling.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (only-in srfi/1/list s:member) syntax/kerncase syntax/boundmap (env type-name-env type-alias-env) @@ -12,7 +12,7 @@ racket/contract/private/provide unstable/list unstable/debug unstable/syntax scheme/struct-info scheme/match - "def-binding.ss" syntax/parse) + "def-binding.rkt" syntax/parse) (require (for-template scheme/base scheme/contract)) diff --git a/collects/typed-scheme/typecheck/signatures.rkt b/collects/typed-scheme/typecheck/signatures.rkt index a1031cf6f9..15ff49bec5 100644 --- a/collects/typed-scheme/typecheck/signatures.rkt +++ b/collects/typed-scheme/typecheck/signatures.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/unit scheme/contract - "../utils/utils.ss" + "../utils/utils.rkt" (rep type-rep) (utils unit-utils) (types utils)) diff --git a/collects/typed-scheme/typecheck/tc-app-helper.rkt b/collects/typed-scheme/typecheck/tc-app-helper.rkt index 32efdc7da6..a2c7457cc2 100644 --- a/collects/typed-scheme/typecheck/tc-app-helper.rkt +++ b/collects/typed-scheme/typecheck/tc-app-helper.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" scheme/match unstable/list +(require "../utils/utils.rkt" scheme/match unstable/list (utils tc-utils) (rep type-rep) (types utils union)) (provide (all-defined-out)) diff --git a/collects/typed-scheme/typecheck/tc-app.rkt b/collects/typed-scheme/typecheck/tc-app.rkt index 32081060ee..47c7b2c26b 100644 --- a/collects/typed-scheme/typecheck/tc-app.rkt +++ b/collects/typed-scheme/typecheck/tc-app.rkt @@ -1,9 +1,9 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [infer r:infer]) - "signatures.ss" "tc-metafunctions.ss" - "tc-app-helper.ss" "find-annotation.ss" - "tc-subst.ss" +(require (rename-in "../utils/utils.rkt" [infer r:infer]) + "signatures.rkt" "tc-metafunctions.rkt" + "tc-app-helper.rkt" "find-annotation.rkt" + "tc-subst.rkt" syntax/parse scheme/match mzlib/trace scheme/list unstable/sequence ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy @@ -21,7 +21,7 @@ (r:infer infer) (for-template (only-in '#%kernel [apply k:apply]) - "internal-forms.ss" scheme/base scheme/bool + "internal-forms.rkt" scheme/base scheme/bool (only-in racket/private/class-internal make-object do-make-object))) (import tc-expr^ tc-lambda^ tc-dots^ tc-let^) diff --git a/collects/typed-scheme/typecheck/tc-dots-unit.rkt b/collects/typed-scheme/typecheck/tc-dots-unit.rkt index e9a6d9d251..2f2bf50697 100644 --- a/collects/typed-scheme/typecheck/tc-dots-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-dots-unit.rkt @@ -1,7 +1,7 @@ #lang scheme/unit -(require "../utils/utils.ss" - "signatures.ss" +(require "../utils/utils.rkt" + "signatures.rkt" (utils tc-utils) (env type-environments) (types utils) diff --git a/collects/typed-scheme/typecheck/tc-envops.rkt b/collects/typed-scheme/typecheck/tc-envops.rkt index b624179ef6..66a3177963 100644 --- a/collects/typed-scheme/typecheck/tc-envops.rkt +++ b/collects/typed-scheme/typecheck/tc-envops.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require (rename-in "../utils/utils.ss" [infer infer-in])) +(require (rename-in "../utils/utils.rkt" [infer infer-in])) (require (rename-in (types subtype convenience remove-intersect union) [-> -->] [->* -->*] diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.rkt b/collects/typed-scheme/typecheck/tc-expr-unit.rkt index bf0f3c4020..975c2e7ba2 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-expr-unit.rkt @@ -1,10 +1,10 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [private private-in])) +(require (rename-in "../utils/utils.rkt" [private private-in])) (require syntax/kerncase mzlib/trace scheme/match (prefix-in - scheme/contract) - "signatures.ss" "tc-envops.ss" "tc-metafunctions.ss" "tc-subst.ss" + "signatures.rkt" "tc-envops.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" (types utils convenience union subtype remove-intersect type-table) (private-in parse-type type-annotation) (rep type-rep) diff --git a/collects/typed-scheme/typecheck/tc-if.rkt b/collects/typed-scheme/typecheck/tc-if.rkt index 962631f44a..5fedc8e298 100644 --- a/collects/typed-scheme/typecheck/tc-if.rkt +++ b/collects/typed-scheme/typecheck/tc-if.rkt @@ -1,8 +1,8 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [infer r:infer])) -(require "signatures.ss" +(require (rename-in "../utils/utils.rkt" [infer r:infer])) +(require "signatures.rkt" (rep type-rep filter-rep object-rep) (rename-in (types convenience subtype union utils comparison remove-intersect abbrev filter-ops) [remove *remove]) diff --git a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt index 723a7fa6d5..27763ea6c7 100644 --- a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt @@ -1,9 +1,9 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [infer r:infer]) - "signatures.ss" - "tc-metafunctions.ss" - "tc-subst.ss" +(require (rename-in "../utils/utils.rkt" [infer r:infer]) + "signatures.rkt" + "tc-metafunctions.rkt" + "tc-subst.rkt" mzlib/trace scheme/list syntax/private/util syntax/stx @@ -17,7 +17,7 @@ (utils tc-utils) unstable/debug scheme/match) -(require (for-template scheme/base "internal-forms.ss")) +(require (for-template scheme/base "internal-forms.rkt")) (import tc-expr^) (export tc-lambda^) diff --git a/collects/typed-scheme/typecheck/tc-let-unit.rkt b/collects/typed-scheme/typecheck/tc-let-unit.rkt index dfc3211bda..2dfc488ae6 100644 --- a/collects/typed-scheme/typecheck/tc-let-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-let-unit.rkt @@ -1,7 +1,7 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [infer r:infer])) -(require "signatures.ss" "tc-metafunctions.ss" "tc-subst.ss" +(require (rename-in "../utils/utils.rkt" [infer r:infer])) +(require "signatures.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" (types utils convenience) (private type-annotation parse-type) (env lexical-env type-alias-env type-env type-environments) @@ -13,7 +13,7 @@ syntax/kerncase syntax/parse (for-template scheme/base - "internal-forms.ss")) + "internal-forms.rkt")) (require (only-in srfi/1/list s:member)) diff --git a/collects/typed-scheme/typecheck/tc-metafunctions.rkt b/collects/typed-scheme/typecheck/tc-metafunctions.rkt index 5eef569111..88af47f46c 100644 --- a/collects/typed-scheme/typecheck/tc-metafunctions.rkt +++ b/collects/typed-scheme/typecheck/tc-metafunctions.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rename-in (types subtype convenience remove-intersect union utils filter-ops) [-> -->] [->* -->*] diff --git a/collects/typed-scheme/typecheck/tc-structs.rkt b/collects/typed-scheme/typecheck/tc-structs.rkt index 17713d0e44..ee54fdc3a6 100644 --- a/collects/typed-scheme/typecheck/tc-structs.rkt +++ b/collects/typed-scheme/typecheck/tc-structs.rkt @@ -1,12 +1,12 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (rep type-rep) (private parse-type) (types convenience utils union resolve abbrev) (env type-env type-environments type-name-env) (utils tc-utils) - "def-binding.ss" + "def-binding.rkt" syntax/kerncase syntax/struct mzlib/trace @@ -15,7 +15,7 @@ (require (for-template scheme/base - "internal-forms.ss")) + "internal-forms.rkt")) (provide tc/struct tc/poly-struct names-of-struct tc/builtin-struct d-s) diff --git a/collects/typed-scheme/typecheck/tc-subst.ss b/collects/typed-scheme/typecheck/tc-subst.rkt similarity index 98% rename from collects/typed-scheme/typecheck/tc-subst.ss rename to collects/typed-scheme/typecheck/tc-subst.rkt index 0613dda229..229478839d 100644 --- a/collects/typed-scheme/typecheck/tc-subst.ss +++ b/collects/typed-scheme/typecheck/tc-subst.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rename-in (types subtype convenience remove-intersect union utils filter-ops) [-> -->] [->* -->*] @@ -8,7 +8,7 @@ (rep type-rep filter-rep rep-utils) scheme/list scheme/contract scheme/match unstable/match unstable/debug (for-syntax scheme/base) - "tc-metafunctions.ss") + "tc-metafunctions.rkt") ;(provide (all-defined-out)) diff --git a/collects/typed-scheme/typecheck/tc-toplevel.rkt b/collects/typed-scheme/typecheck/tc-toplevel.rkt index fac22e91ea..169f118ed9 100644 --- a/collects/typed-scheme/typecheck/tc-toplevel.rkt +++ b/collects/typed-scheme/typecheck/tc-toplevel.rkt @@ -1,25 +1,25 @@ #lang scheme/unit -(require (rename-in "../utils/utils.ss" [infer r:infer])) +(require (rename-in "../utils/utils.rkt" [infer r:infer])) (require syntax/kerncase unstable/list unstable/syntax syntax/parse mzlib/etc scheme/match - "signatures.ss" - "tc-structs.ss" + "signatures.rkt" + "tc-structs.rkt" ;; to appease syntax-parse - "internal-forms.ss" + "internal-forms.rkt" (rep type-rep) (types utils convenience) (private parse-type type-annotation type-contract) (env type-env init-envs type-name-env type-alias-env lexical-env) unstable/mutated-vars (utils tc-utils) - "provide-handling.ss" - "def-binding.ss" + "provide-handling.rkt" + "def-binding.rkt" (for-template - "internal-forms.ss" + "internal-forms.rkt" unstable/location mzlib/contract scheme/base)) diff --git a/collects/typed-scheme/typecheck/typechecker.rkt b/collects/typed-scheme/typecheck/typechecker.rkt index 4c186cd5a2..13da5f36cd 100644 --- a/collects/typed-scheme/typecheck/typechecker.rkt +++ b/collects/typed-scheme/typecheck/typechecker.rkt @@ -1,15 +1,15 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (utils unit-utils) mzlib/trace (only-in scheme/unit provide-signature-elements define-values/invoke-unit/infer link) - "signatures.ss" "tc-toplevel.ss" - "tc-if.ss" "tc-lambda-unit.ss" "tc-app.ss" - "tc-let-unit.ss" "tc-dots-unit.ss" - "tc-expr-unit.ss" "check-subforms-unit.ss") + "signatures.rkt" "tc-toplevel.rkt" + "tc-if.rkt" "tc-lambda-unit.rkt" "tc-app.rkt" + "tc-let-unit.rkt" "tc-dots-unit.rkt" + "tc-expr-unit.rkt" "check-subforms-unit.rkt") (provide-signature-elements typechecker^ tc-expr^) diff --git a/collects/typed-scheme/typed-scheme.rkt b/collects/typed-scheme/typed-scheme.rkt index 70c53def3a..ec55853ed2 100644 --- a/collects/typed-scheme/typed-scheme.rkt +++ b/collects/typed-scheme/typed-scheme.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require (rename-in "utils/utils.ss" [infer r:infer])) +(require (rename-in "utils/utils.rkt" [infer r:infer])) (require (private base-types with-types) (for-syntax diff --git a/collects/typed-scheme/types/abbrev.rkt b/collects/typed-scheme/types/abbrev.rkt index 06de85c364..7797a0fc9f 100644 --- a/collects/typed-scheme/types/abbrev.rkt +++ b/collects/typed-scheme/types/abbrev.rkt @@ -1,9 +1,9 @@ #lang scheme -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep object-rep filter-rep rep-utils) - "printer.ss" "utils.ss" + "printer.rkt" "utils.rkt" (utils tc-utils) scheme/list scheme/match diff --git a/collects/typed-scheme/types/comparison.rkt b/collects/typed-scheme/types/comparison.rkt index 0ca075439e..4a906d00d7 100644 --- a/collects/typed-scheme/types/comparison.rkt +++ b/collects/typed-scheme/types/comparison.rkt @@ -1,4 +1,4 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep) (types utils)) (provide type-equal? tc-result-equal? type -->] listof) + "abbrev.rkt" (only-in scheme/contract current-blame-format [-> -->] listof) (types comparison printer union subtype utils remove-intersect) scheme/list scheme/match scheme/promise (for-syntax syntax/parse scheme/base) diff --git a/collects/typed-scheme/types/printer.rkt b/collects/typed-scheme/types/printer.rkt index dbc9b84352..6982be45d1 100644 --- a/collects/typed-scheme/types/printer.rkt +++ b/collects/typed-scheme/types/printer.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep filter-rep object-rep rep-utils) (utils tc-utils) scheme/match) diff --git a/collects/typed-scheme/types/remove-intersect.rkt b/collects/typed-scheme/types/remove-intersect.rkt index cbb0e55bf4..6f21b58e65 100644 --- a/collects/typed-scheme/types/remove-intersect.rkt +++ b/collects/typed-scheme/types/remove-intersect.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (rep type-rep rep-utils) (types union subtype resolve convenience utils) scheme/match mzlib/trace unstable/debug) diff --git a/collects/typed-scheme/types/resolve.rkt b/collects/typed-scheme/types/resolve.rkt index d2baa70546..4a30c8138e 100644 --- a/collects/typed-scheme/types/resolve.rkt +++ b/collects/typed-scheme/types/resolve.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep) (env type-name-env) diff --git a/collects/typed-scheme/types/subtype.rkt b/collects/typed-scheme/types/subtype.rkt index a5d084f27f..c38cf3f83e 100644 --- a/collects/typed-scheme/types/subtype.rkt +++ b/collects/typed-scheme/types/subtype.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../utils/utils.ss" +(require "../utils/utils.rkt" (rep type-rep filter-rep object-rep rep-utils) (utils tc-utils) (types utils comparison resolve abbrev) diff --git a/collects/typed-scheme/types/type-table.rkt b/collects/typed-scheme/types/type-table.rkt index 356e7a5c53..a8c17fbf89 100644 --- a/collects/typed-scheme/types/type-table.rkt +++ b/collects/typed-scheme/types/type-table.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require unstable/debug "../utils/utils.ss" (rep type-rep) (only-in (types abbrev utils) tc-results?) scheme/contract) +(require unstable/debug "../utils/utils.rkt" (rep type-rep) (only-in (types abbrev utils) tc-results?) scheme/contract) (define table (make-hasheq)) diff --git a/collects/typed-scheme/types/union.rkt b/collects/typed-scheme/types/union.rkt index 488d715ffb..4452a8ec24 100644 --- a/collects/typed-scheme/types/union.rkt +++ b/collects/typed-scheme/types/union.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep rep-utils) (utils tc-utils) diff --git a/collects/typed-scheme/types/utils.rkt b/collects/typed-scheme/types/utils.rkt index 95c07978da..68d6452c2c 100644 --- a/collects/typed-scheme/types/utils.rkt +++ b/collects/typed-scheme/types/utils.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "../utils/utils.ss") +(require "../utils/utils.rkt") (require (rep type-rep filter-rep object-rep rep-utils) (utils tc-utils) diff --git a/collects/typed-scheme/utils/require-contract.rkt b/collects/typed-scheme/utils/require-contract.rkt index f2bc255bf2..3c43b7e764 100644 --- a/collects/typed-scheme/utils/require-contract.rkt +++ b/collects/typed-scheme/utils/require-contract.rkt @@ -5,8 +5,8 @@ (for-syntax scheme/base syntax/kerncase syntax/parse - "../utils/tc-utils.ss" - (prefix-in tr: "../private/typed-renaming.ss"))) + "../utils/tc-utils.rkt" + (prefix-in tr: "../private/typed-renaming.rkt"))) (provide require/contract define-ignored) diff --git a/collects/typed-scheme/utils/tc-utils.rkt b/collects/typed-scheme/utils/tc-utils.rkt index 2ee3352333..ed8da21115 100644 --- a/collects/typed-scheme/utils/tc-utils.rkt +++ b/collects/typed-scheme/utils/tc-utils.rkt @@ -6,8 +6,8 @@ don't depend on any other portion of the system |# (provide (all-defined-out)) -(require "syntax-traversal.ss" - "utils.ss" +(require "syntax-traversal.rkt" + "utils.rkt" syntax/parse (for-syntax scheme/base syntax/parse) scheme/match unstable/debug (for-syntax unstable/syntax)) diff --git a/collects/typed-scheme/utils/utils.rkt b/collects/typed-scheme/utils/utils.rkt index 376bc95498..d0df18dd2e 100644 --- a/collects/typed-scheme/utils/utils.rkt +++ b/collects/typed-scheme/utils/utils.rkt @@ -46,7 +46,7 @@ at least theoretically. (string-join (list "typed-scheme" (symbol->string (syntax-e #'nm)) - (string-append (symbol->string (syntax-e id)) ".ss")) + (string-append (symbol->string (syntax-e id)) ".rkt")) "/") id id)) id id)) @@ -67,7 +67,7 @@ at least theoretically. (string-join (list "typed-scheme" (symbol->string (syntax-e #'nm)) - (string-append (symbol->string (syntax-e id)) ".ss")) + (string-append (symbol->string (syntax-e id)) ".rkt")) "/") id id)))) (syntax->list #'(id ...)))])