From 6ebf3ab32d666e9d1e56cd546fea29d18c42dfff Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 4 Sep 2011 10:27:58 -0400 Subject: [PATCH] Revert "Abolish "typed-scheme"." This reverts commit 49a89da81860e09955f1678bab6106ce8eae8376. (Will be redone later today.) --- collects/drracket/private/auto-language.rkt | 6 +- collects/honu/core/main.rkt | 6 +- collects/honu/core/private/canonical.rkt | 2 +- ...typed-racket.rkt => honu-typed-scheme.rkt} | 2 +- collects/honu/core/private/macro.rkt | 4 +- collects/honu/core/private/more.rkt | 4 +- .../analysis/check-requires.rkt | 2 +- collects/tests/honu/test.rkt | 2 +- .../tests/macro-debugger/tests/collects.rkt | 112 +++++++++--------- .../tests/macro-debugger/tests/regression.rkt | 2 +- .../typed-racket/fail/all-bad-syntax.rkt | 2 +- .../tests/typed-racket/fail/ann-map-funcs.rkt | 2 +- .../tests/typed-racket/fail/apply-dots.rkt | 2 +- collects/tests/typed-racket/fail/bad-any.rkt | 2 +- .../tests/typed-racket/fail/bad-first.rkt | 2 +- .../tests/typed-racket/fail/set-tests.rkt | 3 +- .../typed-racket/succeed/dotted-identity2.rkt | 5 +- .../typed-racket/succeed/let-values-tests.rkt | 6 +- collects/typed-racket/scribblings/utils.rkt | 2 +- collects/typed/file/gif.rkt | 2 +- collects/typed/file/md5.rkt | 2 +- collects/typed/file/tar.rkt | 4 +- collects/typed/framework/framework.rkt | 2 +- collects/typed/net/base64.rkt | 2 +- collects/typed/net/cgi.rkt | 2 +- collects/typed/net/cookie.rkt | 2 +- collects/typed/net/dns.rkt | 3 +- collects/typed/net/ftp.rkt | 2 +- collects/typed/net/gifwrite.rkt | 2 +- collects/typed/net/head.rkt | 2 +- collects/typed/net/imap.rkt | 2 +- collects/typed/net/mime.rkt | 2 +- collects/typed/net/nntp.rkt | 2 +- collects/typed/net/pop3.rkt | 2 +- collects/typed/net/qp.rkt | 2 +- collects/typed/net/sendmail.rkt | 2 +- collects/typed/net/sendurl.rkt | 2 +- collects/typed/net/smtp.rkt | 2 +- collects/typed/net/uri-codec.rkt | 2 +- collects/typed/net/url.rkt | 2 +- collects/typed/private/utils.rkt | 2 +- collects/typed/racket/base/no-check.rkt | 5 +- collects/typed/racket/no-check.rkt | 5 +- collects/typed/srfi/14.rkt | 2 +- collects/typed/tests/test-docs-complete.rkt | 2 +- 45 files changed, 114 insertions(+), 115 deletions(-) rename collects/honu/core/private/{honu-typed-racket.rkt => honu-typed-scheme.rkt} (99%) diff --git a/collects/drracket/private/auto-language.rkt b/collects/drracket/private/auto-language.rkt index 2d887fa41c..35088ef977 100644 --- a/collects/drracket/private/auto-language.rkt +++ b/collects/drracket/private/auto-language.rkt @@ -1,7 +1,7 @@ -#lang typed-racket +#lang typed-scheme -(require typed/framework/framework - typed/mred/mred +(require typed/framework/framework + typed/mred/mred racket/class) (provide pick-new-language looks-like-module?) diff --git a/collects/honu/core/main.rkt b/collects/honu/core/main.rkt index 7ff950a1b9..625f4a7a92 100644 --- a/collects/honu/core/main.rkt +++ b/collects/honu/core/main.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "private/honu-typed-racket.rkt" +(require "private/honu-typed-scheme.rkt" "private/honu2.rkt" "private/macro2.rkt" (for-syntax (only-in "private/parse2.rkt" honu-expression)) @@ -51,10 +51,10 @@ (require (for-meta 2 racket/base)) (require racket/class) -(require "private/honu-typed-racket.rkt" +(require "private/honu-typed-scheme.rkt" "private/parse.rkt" (for-syntax "private/literals.rkt") - (for-syntax "private/honu-typed-racket.rkt") + (for-syntax "private/honu-typed-scheme.rkt") (for-syntax "private/parse.rkt") (for-syntax "private/canonical.rkt") syntax/parse diff --git a/collects/honu/core/private/canonical.rkt b/collects/honu/core/private/canonical.rkt index d13376021a..e06472e6f0 100644 --- a/collects/honu/core/private/canonical.rkt +++ b/collects/honu/core/private/canonical.rkt @@ -3,7 +3,7 @@ (provide (all-defined-out)) (require "literals.rkt" - (for-template "honu-typed-racket.rkt") + (for-template "honu-typed-scheme.rkt") syntax/parse) ;; syntax -> string diff --git a/collects/honu/core/private/honu-typed-racket.rkt b/collects/honu/core/private/honu-typed-scheme.rkt similarity index 99% rename from collects/honu/core/private/honu-typed-racket.rkt rename to collects/honu/core/private/honu-typed-scheme.rkt index 63e72eb4be..8e4b1fcb98 100644 --- a/collects/honu/core/private/honu-typed-racket.rkt +++ b/collects/honu/core/private/honu-typed-scheme.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require (rename-in typed-racket (#%module-begin #%module-begin-typed-racket))) +(require (rename-in typed-scheme (#%module-begin #%module-begin-typed-scheme))) (require (for-syntax scheme/base syntax/stx syntax/name diff --git a/collects/honu/core/private/macro.rkt b/collects/honu/core/private/macro.rkt index d26a8cf082..ef621711e2 100644 --- a/collects/honu/core/private/macro.rkt +++ b/collects/honu/core/private/macro.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "honu-typed-racket.rkt" +(require "honu-typed-scheme.rkt" "literals.rkt" "parse.ss" "syntax.ss" @@ -16,7 +16,7 @@ "parse.rkt" "syntax.rkt" "literals.rkt" - "honu-typed-racket.rkt" + "honu-typed-scheme.rkt" racket/base syntax/parse syntax/stx diff --git a/collects/honu/core/private/more.rkt b/collects/honu/core/private/more.rkt index 5f6dd2a5dd..4ef6f15779 100644 --- a/collects/honu/core/private/more.rkt +++ b/collects/honu/core/private/more.rkt @@ -2,7 +2,7 @@ #| -(require "honu-typed-racket.rkt" +(require "honu-typed-scheme.rkt" "literals.rkt" syntax/parse mzlib/trace @@ -16,7 +16,7 @@ "syntax.rkt" (only-in racket (... scheme-ellipses)) "literals.rkt") - (for-template "honu-typed-racket.rkt" + (for-template "honu-typed-scheme.rkt" "literals.rkt" "syntax.rkt" (only-in racket ...) diff --git a/collects/macro-debugger/analysis/check-requires.rkt b/collects/macro-debugger/analysis/check-requires.rkt index cfe2527a8f..95d223299e 100644 --- a/collects/macro-debugger/analysis/check-requires.rkt +++ b/collects/macro-debugger/analysis/check-requires.rkt @@ -26,7 +26,7 @@ Usage: Examples: - (check-requires 'typed-racket) + (check-requires 'typed-scheme) (check-requires 'unstable/markparam) (check-requires 'macro-debugger/syntax-browser/widget) diff --git a/collects/tests/honu/test.rkt b/collects/tests/honu/test.rkt index 82440f6daa..0b53bd27ce 100644 --- a/collects/tests/honu/test.rkt +++ b/collects/tests/honu/test.rkt @@ -12,7 +12,7 @@ (rename-in honu/core/private/literals [honu-= =] [semicolon |;|]) - (rename-in (only-in honu/core/private/honu-typed-racket honu-var) + (rename-in (only-in honu/core/private/honu-typed-scheme honu-var) [honu-var var]) (for-syntax racket/base honu/core/private/macro2 diff --git a/collects/tests/macro-debugger/tests/collects.rkt b/collects/tests/macro-debugger/tests/collects.rkt index a29701fd87..ca882ecbac 100644 --- a/collects/tests/macro-debugger/tests/collects.rkt +++ b/collects/tests/macro-debugger/tests/collects.rkt @@ -140,8 +140,8 @@ #:cache-keys? #t)))) (define modules-from-framework (trace-modules '(framework))) -(define modules-from-typed-racket - #;(trace-modules '(typed-racket)) +(define modules-from-typed-scheme + #;(trace-modules '(typed-scheme)) '(#| mzlib/contract mzlib/etc @@ -267,59 +267,59 @@ syntax/stx mzlib/trace |# - typed-racket - typed-racket/minimal - typed-racket/private/base-env - typed-racket/private/base-types - typed-racket/private/check-subforms-unit - typed-racket/private/def-binding - typed-racket/private/effect-rep - typed-racket/private/extra-procs - typed-racket/private/free-variance - typed-racket/private/infer - typed-racket/private/infer-ops - typed-racket/private/init-envs - typed-racket/private/internal-forms - typed-racket/private/interning - typed-racket/private/lexical-env - typed-racket/private/mutated-vars - typed-racket/private/parse-type - typed-racket/private/planet-requires - typed-racket/private/prims - typed-racket/private/provide-handling - typed-racket/private/remove-intersect - typed-racket/private/rep-utils - typed-racket/private/require-contract - typed-racket/private/resolve-type - typed-racket/private/signatures - typed-racket/private/subtype - typed-racket/private/syntax-traversal - typed-racket/private/tables - typed-racket/private/tc-app-unit - typed-racket/private/tc-expr-unit - typed-racket/private/tc-if-unit - typed-racket/private/tc-lambda-unit - typed-racket/private/tc-let-unit - typed-racket/private/tc-structs - typed-racket/private/tc-toplevel - typed-racket/private/tc-utils - typed-racket/private/type-alias-env - typed-racket/private/type-annotation - typed-racket/private/type-comparison - typed-racket/private/type-contract - typed-racket/private/type-effect-convenience - typed-racket/private/type-effect-printer - typed-racket/private/type-env - typed-racket/private/type-environments - typed-racket/private/type-name-env - typed-racket/private/type-rep - typed-racket/private/type-utils - typed-racket/private/typechecker - typed-racket/private/unify - typed-racket/private/union - typed-racket/private/unit-utils - typed-racket/private/utils - typed-racket/typed-racket)) + typed-scheme + typed-scheme/minimal + typed-scheme/private/base-env + typed-scheme/private/base-types + typed-scheme/private/check-subforms-unit + typed-scheme/private/def-binding + typed-scheme/private/effect-rep + typed-scheme/private/extra-procs + typed-scheme/private/free-variance + typed-scheme/private/infer + typed-scheme/private/infer-ops + typed-scheme/private/init-envs + typed-scheme/private/internal-forms + typed-scheme/private/interning + typed-scheme/private/lexical-env + typed-scheme/private/mutated-vars + typed-scheme/private/parse-type + typed-scheme/private/planet-requires + typed-scheme/private/prims + typed-scheme/private/provide-handling + typed-scheme/private/remove-intersect + typed-scheme/private/rep-utils + typed-scheme/private/require-contract + typed-scheme/private/resolve-type + typed-scheme/private/signatures + typed-scheme/private/subtype + typed-scheme/private/syntax-traversal + typed-scheme/private/tables + typed-scheme/private/tc-app-unit + typed-scheme/private/tc-expr-unit + typed-scheme/private/tc-if-unit + typed-scheme/private/tc-lambda-unit + typed-scheme/private/tc-let-unit + typed-scheme/private/tc-structs + typed-scheme/private/tc-toplevel + typed-scheme/private/tc-utils + typed-scheme/private/type-alias-env + typed-scheme/private/type-annotation + typed-scheme/private/type-comparison + typed-scheme/private/type-contract + typed-scheme/private/type-effect-convenience + typed-scheme/private/type-effect-printer + typed-scheme/private/type-env + typed-scheme/private/type-environments + typed-scheme/private/type-name-env + typed-scheme/private/type-rep + typed-scheme/private/type-utils + typed-scheme/private/typechecker + typed-scheme/private/unify + typed-scheme/private/union + typed-scheme/private/unit-utils + typed-scheme/private/utils + typed-scheme/typed-scheme)) (define big-libs-tests - (test-libs "Collections" modules-from-typed-racket)) + (test-libs "Collections" modules-from-typed-scheme)) diff --git a/collects/tests/macro-debugger/tests/regression.rkt b/collects/tests/macro-debugger/tests/regression.rkt index 018936260c..c74545951d 100644 --- a/collects/tests/macro-debugger/tests/regression.rkt +++ b/collects/tests/macro-debugger/tests/regression.rkt @@ -144,7 +144,7 @@ (local [(define x 1)] x))))]) (check-pred list? rs))) - ;; Distilled from Sam/typed-racket (8/24/2007) + ;; Distilled from Sam/typed-scheme (8/24/2007) (test-case "transformer calls 'expand'" (check-pred deriv? (trace '(let-syntax ([m (lambda (stx) diff --git a/collects/tests/typed-racket/fail/all-bad-syntax.rkt b/collects/tests/typed-racket/fail/all-bad-syntax.rkt index f07efdc753..daf10f545b 100644 --- a/collects/tests/typed-racket/fail/all-bad-syntax.rkt +++ b/collects/tests/typed-racket/fail/all-bad-syntax.rkt @@ -1,6 +1,6 @@ #; (exn-pred 2) -#lang typed-racket +#lang typed-scheme (require scheme/list) diff --git a/collects/tests/typed-racket/fail/ann-map-funcs.rkt b/collects/tests/typed-racket/fail/ann-map-funcs.rkt index a1598f70bc..f8ba9fb486 100644 --- a/collects/tests/typed-racket/fail/ann-map-funcs.rkt +++ b/collects/tests/typed-racket/fail/ann-map-funcs.rkt @@ -1,6 +1,6 @@ #; (exn-pred 3) -#lang typed-racket +#lang typed-scheme (: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b))))) diff --git a/collects/tests/typed-racket/fail/apply-dots.rkt b/collects/tests/typed-racket/fail/apply-dots.rkt index df0a2952e4..fd2b031378 100644 --- a/collects/tests/typed-racket/fail/apply-dots.rkt +++ b/collects/tests/typed-racket/fail/apply-dots.rkt @@ -1,6 +1,6 @@ #; (exn-pred 2) -#lang typed-racket +#lang typed-scheme (plambda: (a ...) ([z : String] . [w : Number *]) (apply (case-lambda: (([x : Number] . [y : Number ... a]) x)) diff --git a/collects/tests/typed-racket/fail/bad-any.rkt b/collects/tests/typed-racket/fail/bad-any.rkt index 0625a5f8ab..3fc5acc832 100644 --- a/collects/tests/typed-racket/fail/bad-any.rkt +++ b/collects/tests/typed-racket/fail/bad-any.rkt @@ -2,7 +2,7 @@ (exn-pred exn:fail:contract?) #lang scheme/load -(module m typed-racket +(module m typed-scheme (: f Any) (define f (lambda: ([x : Number]) (add1 x))) (provide f)) diff --git a/collects/tests/typed-racket/fail/bad-first.rkt b/collects/tests/typed-racket/fail/bad-first.rkt index 223645b516..eb0fd623d3 100644 --- a/collects/tests/typed-racket/fail/bad-first.rkt +++ b/collects/tests/typed-racket/fail/bad-first.rkt @@ -1,3 +1,3 @@ -#lang typed-racket +#lang typed-scheme (require scheme/list) (first (cons 1 2)) diff --git a/collects/tests/typed-racket/fail/set-tests.rkt b/collects/tests/typed-racket/fail/set-tests.rkt index 45d022a1c4..fad4d5f408 100644 --- a/collects/tests/typed-racket/fail/set-tests.rkt +++ b/collects/tests/typed-racket/fail/set-tests.rkt @@ -1,7 +1,8 @@ ;; should FAIL! -#lang typed-racket +#lang typed-scheme (let*: ((x : Any 1) (f : (-> Void) (lambda () (set! x (quote foo))))) (if (number? x) (begin (f) (add1 x)) 12)) + diff --git a/collects/tests/typed-racket/succeed/dotted-identity2.rkt b/collects/tests/typed-racket/succeed/dotted-identity2.rkt index af5ca156cc..c00f16b91a 100644 --- a/collects/tests/typed-racket/succeed/dotted-identity2.rkt +++ b/collects/tests/typed-racket/succeed/dotted-identity2.rkt @@ -1,7 +1,6 @@ -#lang typed-racket +#lang typed-scheme -;; I don't believe the below should work, but it points out where that -;; internal error is coming from. +;; I don't believe the below should work, but it points out where that internal error is coming from. (: f (All (a ...) ((a ... a -> Integer) -> (a ... a -> Integer)))) (define (f x) x) diff --git a/collects/tests/typed-racket/succeed/let-values-tests.rkt b/collects/tests/typed-racket/succeed/let-values-tests.rkt index 124619cded..fe16662bc6 100644 --- a/collects/tests/typed-racket/succeed/let-values-tests.rkt +++ b/collects/tests/typed-racket/succeed/let-values-tests.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (define-type-alias number Number) (define-type-alias boolean Boolean) (define-type-alias symbol Symbol) @@ -7,8 +7,8 @@ (let-values ([(#{x : number} #{y : number}) (values 3 4)] [(#{z : number}) (values 3)] #;[(#{fact : (number -> number)}) - (lambda: ([x : number]) - (if (zero? x) 1 (* x (fact (- x 1)))))] + (lambda: ([x : number]) + (if (zero? x) 1 (* x (fact (- x 1)))))] #;[(#{z : number}) (- x y)]) (+ x y)) diff --git a/collects/typed-racket/scribblings/utils.rkt b/collects/typed-racket/scribblings/utils.rkt index a807621488..ab158a8c18 100644 --- a/collects/typed-racket/scribblings/utils.rkt +++ b/collects/typed-racket/scribblings/utils.rkt @@ -4,7 +4,7 @@ (provide (all-defined-out)) (define (item* header . args) (apply item @bold[header]{: } args)) -(define-syntax-rule (tmod forms ...) (racketmod typed-racket forms ...)) +(define-syntax-rule (tmod forms ...) (racketmod typed-scheme forms ...)) (define (gtech . x) (apply tech x #:doc '(lib "scribblings/guide/guide.scrbl"))) (define (rtech . x) diff --git a/collects/typed/file/gif.rkt b/collects/typed/file/gif.rkt index abbccbc840..6f96c976d8 100644 --- a/collects/typed/file/gif.rkt +++ b/collects/typed/file/gif.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/file/md5.rkt b/collects/typed/file/md5.rkt index 74dce83a3a..0cab46d7ba 100644 --- a/collects/typed/file/md5.rkt +++ b/collects/typed/file/md5.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require/typed file/md5 [md5 ((U Bytes Input-Port) -> Bytes)]) (provide md5) diff --git a/collects/typed/file/tar.rkt b/collects/typed/file/tar.rkt index 5ec7086bde..0497d8c9fc 100644 --- a/collects/typed/file/tar.rkt +++ b/collects/typed/file/tar.rkt @@ -1,5 +1,5 @@ -#lang typed-racket -;; typed-racket wrapper on file/tar +#lang typed-scheme +;; typed-scheme wrapper on file/tar ;; yc 2009/2/25 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/typed/framework/framework.rkt b/collects/typed/framework/framework.rkt index fa7a2f9ac7..23f267e67b 100644 --- a/collects/typed/framework/framework.rkt +++ b/collects/typed/framework/framework.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils typed/mred/mred) diff --git a/collects/typed/net/base64.rkt b/collects/typed/net/base64.rkt index c1090e1e18..0745794516 100644 --- a/collects/typed/net/base64.rkt +++ b/collects/typed/net/base64.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/cgi.rkt b/collects/typed/net/cgi.rkt index c670549f7a..80c3b0de55 100644 --- a/collects/typed/net/cgi.rkt +++ b/collects/typed/net/cgi.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/cookie.rkt b/collects/typed/net/cookie.rkt index 6eb59fe922..3eb8092adf 100644 --- a/collects/typed/net/cookie.rkt +++ b/collects/typed/net/cookie.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/dns.rkt b/collects/typed/net/dns.rkt index d29ae084bd..24ef679f81 100644 --- a/collects/typed/net/dns.rkt +++ b/collects/typed/net/dns.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) @@ -7,3 +7,4 @@ [dns-get-name (String String -> String)] [dns-get-mail-exchanger (String String -> String )] [dns-find-nameserver (-> (Option String))]) + diff --git a/collects/typed/net/ftp.rkt b/collects/typed/net/ftp.rkt index d4e6e7e48f..041befc0d5 100644 --- a/collects/typed/net/ftp.rkt +++ b/collects/typed/net/ftp.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/gifwrite.rkt b/collects/typed/net/gifwrite.rkt index ec4700abce..cfe9167c5b 100644 --- a/collects/typed/net/gifwrite.rkt +++ b/collects/typed/net/gifwrite.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/file/gif) (provide (all-from-out typed/file/gif)) diff --git a/collects/typed/net/head.rkt b/collects/typed/net/head.rkt index 0c2b2f0d24..ec6493dc69 100644 --- a/collects/typed/net/head.rkt +++ b/collects/typed/net/head.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/imap.rkt b/collects/typed/net/imap.rkt index 5951b03b15..0e347e4082 100644 --- a/collects/typed/net/imap.rkt +++ b/collects/typed/net/imap.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/mime.rkt b/collects/typed/net/mime.rkt index 580737ff88..82893b26e5 100644 --- a/collects/typed/net/mime.rkt +++ b/collects/typed/net/mime.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) ;; -- basic mime structures -- diff --git a/collects/typed/net/nntp.rkt b/collects/typed/net/nntp.rkt index af1ba2bf43..f2310c9350 100644 --- a/collects/typed/net/nntp.rkt +++ b/collects/typed/net/nntp.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/pop3.rkt b/collects/typed/net/pop3.rkt index 603e285591..395b3a7be7 100644 --- a/collects/typed/net/pop3.rkt +++ b/collects/typed/net/pop3.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/qp.rkt b/collects/typed/net/qp.rkt index cd5d3a2ff1..9d0344a2e5 100644 --- a/collects/typed/net/qp.rkt +++ b/collects/typed/net/qp.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/sendmail.rkt b/collects/typed/net/sendmail.rkt index 35ccd2b83a..113dc250d4 100644 --- a/collects/typed/net/sendmail.rkt +++ b/collects/typed/net/sendmail.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/sendurl.rkt b/collects/typed/net/sendurl.rkt index 1eb922754f..2be923fc7b 100644 --- a/collects/typed/net/sendurl.rkt +++ b/collects/typed/net/sendurl.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require/typed net/sendurl [send-url (String -> Void)] [unix-browser-list (Listof Symbol)] diff --git a/collects/typed/net/smtp.rkt b/collects/typed/net/smtp.rkt index fddd3610cb..78b02ff651 100644 --- a/collects/typed/net/smtp.rkt +++ b/collects/typed/net/smtp.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/uri-codec.rkt b/collects/typed/net/uri-codec.rkt index aec195db9f..2089712c26 100644 --- a/collects/typed/net/uri-codec.rkt +++ b/collects/typed/net/uri-codec.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/net/url.rkt b/collects/typed/net/url.rkt index aab0da73cb..20b4196e08 100644 --- a/collects/typed/net/url.rkt +++ b/collects/typed/net/url.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require typed/private/utils) diff --git a/collects/typed/private/utils.rkt b/collects/typed/private/utils.rkt index 9a31a42ed4..5abf5a87f2 100644 --- a/collects/typed/private/utils.rkt +++ b/collects/typed/private/utils.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (define-syntax-rule (dt nm t) (begin (define-type-alias nm t) (provide nm))) diff --git a/collects/typed/racket/base/no-check.rkt b/collects/typed/racket/base/no-check.rkt index 9aab712beb..a5be88a158 100644 --- a/collects/typed/racket/base/no-check.rkt +++ b/collects/typed/racket/base/no-check.rkt @@ -1,5 +1,4 @@ #lang racket/base -(require racket/require typed-racket/no-check - (subtract-in typed/racket/base typed-racket/no-check)) -(provide (all-from-out typed/racket/base typed-racket/no-check)) +(require racket/require typed-scheme/no-check (subtract-in typed/racket/base typed-scheme/no-check)) +(provide (all-from-out typed/racket/base typed-scheme/no-check)) diff --git a/collects/typed/racket/no-check.rkt b/collects/typed/racket/no-check.rkt index 1d7c68ee4c..f4ee4b0923 100644 --- a/collects/typed/racket/no-check.rkt +++ b/collects/typed/racket/no-check.rkt @@ -1,5 +1,4 @@ #lang racket/base -(require racket/require typed-racket/no-check - (subtract-in typed/racket typed-racket/no-check)) -(provide (all-from-out typed/racket typed-racket/no-check)) +(require racket/require typed-scheme/no-check (subtract-in typed/racket typed-scheme/no-check)) +(provide (all-from-out typed/racket typed-scheme/no-check)) diff --git a/collects/typed/srfi/14.rkt b/collects/typed/srfi/14.rkt index 4b7c8fa3ea..70b2866fb6 100644 --- a/collects/typed/srfi/14.rkt +++ b/collects/typed/srfi/14.rkt @@ -1,4 +1,4 @@ -#lang typed-racket +#lang typed-scheme (require/opaque-type Char-Set char-set? srfi/14) (define-type-alias Cursor (Pair 0 (Listof (Pair Integer Integer)))) diff --git a/collects/typed/tests/test-docs-complete.rkt b/collects/typed/tests/test-docs-complete.rkt index ff72902957..9a26620f4a 100644 --- a/collects/typed/tests/test-docs-complete.rkt +++ b/collects/typed/tests/test-docs-complete.rkt @@ -7,7 +7,7 @@ place-sleep procedure-closure-contents-eq? processor-count)) -(check-docs (quote typed-racket) #:skip exclude) +(check-docs (quote typed-scheme) #:skip exclude) (check-docs (quote typed/scheme) #:skip exclude) (check-docs (quote typed/scheme/base) #:skip exclude) (check-docs (quote typed/racket) #:skip exclude)