Revert "Abolish "typed-scheme"."

This reverts commit 49a89da818. (Will be redone later today.)
2011-09-04 10:27:58 -04:00 · 2011-09-04 10:27:58 -04:00 · 6ebf3ab32d
commit 6ebf3ab32d
parent 49a89da818
45 changed files with 114 additions and 115 deletions
--- 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?)
--- 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
--- 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
--- a/collects/honu/core/private/honu-typed-scheme.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
--- 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
--- 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 ...)
--- 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)

--- 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
--- 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))
--- 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)
--- 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)

--- 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)))))

--- 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))
--- 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))
--- 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))
--- 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))
+
--- 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)
--- 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))

--- 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)
--- 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)

--- 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)
--- 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

 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 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)

--- 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)

--- 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)

--- 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)

--- 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))])
+
--- 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)

--- 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))
--- 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)

--- 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)

--- 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 --
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)]
--- 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)

--- 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)

--- 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)

--- 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)))
--- 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))
--- 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))
--- 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))))
--- 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)