From c5432390c560074361d9d02150f2c68c39eab481 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.) original commit: 6ebf3ab32d666e9d1e56cd546fea29d18c42dfff --- collects/tests/typed-racket/fail/all-bad-syntax.rkt | 2 +- collects/tests/typed-racket/fail/ann-map-funcs.rkt | 2 +- collects/tests/typed-racket/fail/apply-dots.rkt | 2 +- collects/tests/typed-racket/fail/bad-any.rkt | 2 +- collects/tests/typed-racket/fail/bad-first.rkt | 2 +- collects/tests/typed-racket/fail/set-tests.rkt | 3 ++- collects/tests/typed-racket/succeed/dotted-identity2.rkt | 5 ++--- collects/tests/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 +- 35 files changed, 43 insertions(+), 44 deletions(-) diff --git a/collects/tests/typed-racket/fail/all-bad-syntax.rkt b/collects/tests/typed-racket/fail/all-bad-syntax.rkt index f07efdc7..daf10f54 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 a1598f70..f8ba9fb4 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 df0a2952..fd2b0313 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 0625a5f8..3fc5acc8 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 223645b5..eb0fd623 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 45d022a1..fad4d5f4 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 af5ca156..c00f16b9 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 124619cd..fe16662b 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 a8076214..ab158a8c 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 abbccbc8..6f96c976 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 74dce83a..0cab46d7 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 5ec7086b..0497d8c9 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 fa7a2f9a..23f267e6 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 c1090e1e..07457945 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 c670549f..80c3b0de 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 6eb59fe9..3eb8092a 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 d29ae084..24ef679f 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 d4e6e7e4..041befc0 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 ec4700ab..cfe9167c 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 0c2b2f0d..ec6493dc 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 5951b03b..0e347e40 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 580737ff..82893b26 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 af1ba2bf..f2310c93 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 603e2855..395b3a7b 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 cd5d3a2f..9d0344a2 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 35ccd2b8..113dc250 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 1eb92275..2be923fc 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 fddd3610..78b02ff6 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 aec195db..2089712c 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 aab0da73..20b4196e 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 9a31a42e..5abf5a87 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 9aab712b..a5be88a1 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 1d7c68ee..f4ee4b09 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 4b7c8fa3..70b2866f 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 ff729029..9a26620f 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)