Revert "Abolish "typed-scheme"."

This reverts commit 49a89da818.

(Will be redone later today.)
This commit is contained in:
Eli Barzilay 2011-09-04 10:27:58 -04:00
parent 49a89da818
commit 6ebf3ab32d
45 changed files with 114 additions and 115 deletions

View File

@ -1,7 +1,7 @@
#lang typed-racket #lang typed-scheme
(require typed/framework/framework (require typed/framework/framework
typed/mred/mred typed/mred/mred
racket/class) racket/class)
(provide pick-new-language looks-like-module?) (provide pick-new-language looks-like-module?)

View File

@ -1,6 +1,6 @@
#lang racket/base #lang racket/base
(require "private/honu-typed-racket.rkt" (require "private/honu-typed-scheme.rkt"
"private/honu2.rkt" "private/honu2.rkt"
"private/macro2.rkt" "private/macro2.rkt"
(for-syntax (only-in "private/parse2.rkt" honu-expression)) (for-syntax (only-in "private/parse2.rkt" honu-expression))
@ -51,10 +51,10 @@
(require (for-meta 2 racket/base)) (require (for-meta 2 racket/base))
(require racket/class) (require racket/class)
(require "private/honu-typed-racket.rkt" (require "private/honu-typed-scheme.rkt"
"private/parse.rkt" "private/parse.rkt"
(for-syntax "private/literals.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/parse.rkt")
(for-syntax "private/canonical.rkt") (for-syntax "private/canonical.rkt")
syntax/parse syntax/parse

View File

@ -3,7 +3,7 @@
(provide (all-defined-out)) (provide (all-defined-out))
(require "literals.rkt" (require "literals.rkt"
(for-template "honu-typed-racket.rkt") (for-template "honu-typed-scheme.rkt")
syntax/parse) syntax/parse)
;; syntax -> string ;; syntax -> string

View File

@ -1,6 +1,6 @@
#lang racket/base #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 (require (for-syntax scheme/base
syntax/stx syntax/stx
syntax/name syntax/name

View File

@ -1,6 +1,6 @@
#lang racket/base #lang racket/base
(require "honu-typed-racket.rkt" (require "honu-typed-scheme.rkt"
"literals.rkt" "literals.rkt"
"parse.ss" "parse.ss"
"syntax.ss" "syntax.ss"
@ -16,7 +16,7 @@
"parse.rkt" "parse.rkt"
"syntax.rkt" "syntax.rkt"
"literals.rkt" "literals.rkt"
"honu-typed-racket.rkt" "honu-typed-scheme.rkt"
racket/base racket/base
syntax/parse syntax/parse
syntax/stx syntax/stx

View File

@ -2,7 +2,7 @@
#| #|
(require "honu-typed-racket.rkt" (require "honu-typed-scheme.rkt"
"literals.rkt" "literals.rkt"
syntax/parse syntax/parse
mzlib/trace mzlib/trace
@ -16,7 +16,7 @@
"syntax.rkt" "syntax.rkt"
(only-in racket (... scheme-ellipses)) (only-in racket (... scheme-ellipses))
"literals.rkt") "literals.rkt")
(for-template "honu-typed-racket.rkt" (for-template "honu-typed-scheme.rkt"
"literals.rkt" "literals.rkt"
"syntax.rkt" "syntax.rkt"
(only-in racket ...) (only-in racket ...)

View File

@ -26,7 +26,7 @@ Usage:
Examples: Examples:
(check-requires 'typed-racket) (check-requires 'typed-scheme)
(check-requires 'unstable/markparam) (check-requires 'unstable/markparam)
(check-requires 'macro-debugger/syntax-browser/widget) (check-requires 'macro-debugger/syntax-browser/widget)

View File

@ -12,7 +12,7 @@
(rename-in honu/core/private/literals (rename-in honu/core/private/literals
[honu-= =] [honu-= =]
[semicolon |;|]) [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]) [honu-var var])
(for-syntax racket/base (for-syntax racket/base
honu/core/private/macro2 honu/core/private/macro2

View File

@ -140,8 +140,8 @@
#:cache-keys? #t)))) #:cache-keys? #t))))
(define modules-from-framework (trace-modules '(framework))) (define modules-from-framework (trace-modules '(framework)))
(define modules-from-typed-racket (define modules-from-typed-scheme
#;(trace-modules '(typed-racket)) #;(trace-modules '(typed-scheme))
'(#| '(#|
mzlib/contract mzlib/contract
mzlib/etc mzlib/etc
@ -267,59 +267,59 @@
syntax/stx syntax/stx
mzlib/trace mzlib/trace
|# |#
typed-racket typed-scheme
typed-racket/minimal typed-scheme/minimal
typed-racket/private/base-env typed-scheme/private/base-env
typed-racket/private/base-types typed-scheme/private/base-types
typed-racket/private/check-subforms-unit typed-scheme/private/check-subforms-unit
typed-racket/private/def-binding typed-scheme/private/def-binding
typed-racket/private/effect-rep typed-scheme/private/effect-rep
typed-racket/private/extra-procs typed-scheme/private/extra-procs
typed-racket/private/free-variance typed-scheme/private/free-variance
typed-racket/private/infer typed-scheme/private/infer
typed-racket/private/infer-ops typed-scheme/private/infer-ops
typed-racket/private/init-envs typed-scheme/private/init-envs
typed-racket/private/internal-forms typed-scheme/private/internal-forms
typed-racket/private/interning typed-scheme/private/interning
typed-racket/private/lexical-env typed-scheme/private/lexical-env
typed-racket/private/mutated-vars typed-scheme/private/mutated-vars
typed-racket/private/parse-type typed-scheme/private/parse-type
typed-racket/private/planet-requires typed-scheme/private/planet-requires
typed-racket/private/prims typed-scheme/private/prims
typed-racket/private/provide-handling typed-scheme/private/provide-handling
typed-racket/private/remove-intersect typed-scheme/private/remove-intersect
typed-racket/private/rep-utils typed-scheme/private/rep-utils
typed-racket/private/require-contract typed-scheme/private/require-contract
typed-racket/private/resolve-type typed-scheme/private/resolve-type
typed-racket/private/signatures typed-scheme/private/signatures
typed-racket/private/subtype typed-scheme/private/subtype
typed-racket/private/syntax-traversal typed-scheme/private/syntax-traversal
typed-racket/private/tables typed-scheme/private/tables
typed-racket/private/tc-app-unit typed-scheme/private/tc-app-unit
typed-racket/private/tc-expr-unit typed-scheme/private/tc-expr-unit
typed-racket/private/tc-if-unit typed-scheme/private/tc-if-unit
typed-racket/private/tc-lambda-unit typed-scheme/private/tc-lambda-unit
typed-racket/private/tc-let-unit typed-scheme/private/tc-let-unit
typed-racket/private/tc-structs typed-scheme/private/tc-structs
typed-racket/private/tc-toplevel typed-scheme/private/tc-toplevel
typed-racket/private/tc-utils typed-scheme/private/tc-utils
typed-racket/private/type-alias-env typed-scheme/private/type-alias-env
typed-racket/private/type-annotation typed-scheme/private/type-annotation
typed-racket/private/type-comparison typed-scheme/private/type-comparison
typed-racket/private/type-contract typed-scheme/private/type-contract
typed-racket/private/type-effect-convenience typed-scheme/private/type-effect-convenience
typed-racket/private/type-effect-printer typed-scheme/private/type-effect-printer
typed-racket/private/type-env typed-scheme/private/type-env
typed-racket/private/type-environments typed-scheme/private/type-environments
typed-racket/private/type-name-env typed-scheme/private/type-name-env
typed-racket/private/type-rep typed-scheme/private/type-rep
typed-racket/private/type-utils typed-scheme/private/type-utils
typed-racket/private/typechecker typed-scheme/private/typechecker
typed-racket/private/unify typed-scheme/private/unify
typed-racket/private/union typed-scheme/private/union
typed-racket/private/unit-utils typed-scheme/private/unit-utils
typed-racket/private/utils typed-scheme/private/utils
typed-racket/typed-racket)) typed-scheme/typed-scheme))
(define big-libs-tests (define big-libs-tests
(test-libs "Collections" modules-from-typed-racket)) (test-libs "Collections" modules-from-typed-scheme))

View File

@ -144,7 +144,7 @@
(local [(define x 1)] x))))]) (local [(define x 1)] x))))])
(check-pred list? rs))) (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'" (test-case "transformer calls 'expand'"
(check-pred deriv? (check-pred deriv?
(trace '(let-syntax ([m (lambda (stx) (trace '(let-syntax ([m (lambda (stx)

View File

@ -1,6 +1,6 @@
#; #;
(exn-pred 2) (exn-pred 2)
#lang typed-racket #lang typed-scheme
(require scheme/list) (require scheme/list)

View File

@ -1,6 +1,6 @@
#; #;
(exn-pred 3) (exn-pred 3)
#lang typed-racket #lang typed-scheme
(: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b))))) (: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b)))))

View File

@ -1,6 +1,6 @@
#; #;
(exn-pred 2) (exn-pred 2)
#lang typed-racket #lang typed-scheme
(plambda: (a ...) ([z : String] . [w : Number *]) (plambda: (a ...) ([z : String] . [w : Number *])
(apply (case-lambda: (([x : Number] . [y : Number ... a]) x)) (apply (case-lambda: (([x : Number] . [y : Number ... a]) x))

View File

@ -2,7 +2,7 @@
(exn-pred exn:fail:contract?) (exn-pred exn:fail:contract?)
#lang scheme/load #lang scheme/load
(module m typed-racket (module m typed-scheme
(: f Any) (: f Any)
(define f (lambda: ([x : Number]) (add1 x))) (define f (lambda: ([x : Number]) (add1 x)))
(provide f)) (provide f))

View File

@ -1,3 +1,3 @@
#lang typed-racket #lang typed-scheme
(require scheme/list) (require scheme/list)
(first (cons 1 2)) (first (cons 1 2))

View File

@ -1,7 +1,8 @@
;; should FAIL! ;; should FAIL!
#lang typed-racket #lang typed-scheme
(let*: ((x : Any 1) (let*: ((x : Any 1)
(f : (-> Void) (lambda () (set! x (quote foo))))) (f : (-> Void) (lambda () (set! x (quote foo)))))
(if (number? x) (begin (f) (add1 x)) 12)) (if (number? x) (begin (f) (add1 x)) 12))

View File

@ -1,7 +1,6 @@
#lang typed-racket #lang typed-scheme
;; I don't believe the below should work, but it points out where that ;; I don't believe the below should work, but it points out where that internal error is coming from.
;; internal error is coming from.
(: f (All (a ...) ((a ... a -> Integer) -> (a ... a -> Integer)))) (: f (All (a ...) ((a ... a -> Integer) -> (a ... a -> Integer))))
(define (f x) x) (define (f x) x)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(define-type-alias number Number) (define-type-alias number Number)
(define-type-alias boolean Boolean) (define-type-alias boolean Boolean)
(define-type-alias symbol Symbol) (define-type-alias symbol Symbol)
@ -7,8 +7,8 @@
(let-values ([(#{x : number} #{y : number}) (values 3 4)] (let-values ([(#{x : number} #{y : number}) (values 3 4)]
[(#{z : number}) (values 3)] [(#{z : number}) (values 3)]
#;[(#{fact : (number -> number)}) #;[(#{fact : (number -> number)})
(lambda: ([x : number]) (lambda: ([x : number])
(if (zero? x) 1 (* x (fact (- x 1)))))] (if (zero? x) 1 (* x (fact (- x 1)))))]
#;[(#{z : number}) (- x y)]) #;[(#{z : number}) (- x y)])
(+ x y)) (+ x y))

View File

@ -4,7 +4,7 @@
(provide (all-defined-out)) (provide (all-defined-out))
(define (item* header . args) (apply item @bold[header]{: } args)) (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) (define (gtech . x)
(apply tech x #:doc '(lib "scribblings/guide/guide.scrbl"))) (apply tech x #:doc '(lib "scribblings/guide/guide.scrbl")))
(define (rtech . x) (define (rtech . x)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require/typed file/md5 (require/typed file/md5
[md5 ((U Bytes Input-Port) -> Bytes)]) [md5 ((U Bytes Input-Port) -> Bytes)])
(provide md5) (provide md5)

View File

@ -1,5 +1,5 @@
#lang typed-racket #lang typed-scheme
;; typed-racket wrapper on file/tar ;; typed-scheme wrapper on file/tar
;; yc 2009/2/25 ;; yc 2009/2/25
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils typed/mred/mred) (require typed/private/utils typed/mred/mred)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)
@ -7,3 +7,4 @@
[dns-get-name (String String -> String)] [dns-get-name (String String -> String)]
[dns-get-mail-exchanger (String String -> String )] [dns-get-mail-exchanger (String String -> String )]
[dns-find-nameserver (-> (Option String))]) [dns-find-nameserver (-> (Option String))])

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/file/gif) (require typed/file/gif)
(provide (all-from-out typed/file/gif)) (provide (all-from-out typed/file/gif))

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)
;; -- basic mime structures -- ;; -- basic mime structures --

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require/typed net/sendurl (require/typed net/sendurl
[send-url (String -> Void)] [send-url (String -> Void)]
[unix-browser-list (Listof Symbol)] [unix-browser-list (Listof Symbol)]

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require typed/private/utils) (require typed/private/utils)

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(define-syntax-rule (dt nm t) (define-syntax-rule (dt nm t)
(begin (define-type-alias nm t) (provide nm))) (begin (define-type-alias nm t) (provide nm)))

View File

@ -1,5 +1,4 @@
#lang racket/base #lang racket/base
(require racket/require typed-racket/no-check (require racket/require typed-scheme/no-check (subtract-in typed/racket/base typed-scheme/no-check))
(subtract-in typed/racket/base typed-racket/no-check)) (provide (all-from-out typed/racket/base typed-scheme/no-check))
(provide (all-from-out typed/racket/base typed-racket/no-check))

View File

@ -1,5 +1,4 @@
#lang racket/base #lang racket/base
(require racket/require typed-racket/no-check (require racket/require typed-scheme/no-check (subtract-in typed/racket typed-scheme/no-check))
(subtract-in typed/racket typed-racket/no-check)) (provide (all-from-out typed/racket typed-scheme/no-check))
(provide (all-from-out typed/racket typed-racket/no-check))

View File

@ -1,4 +1,4 @@
#lang typed-racket #lang typed-scheme
(require/opaque-type Char-Set char-set? srfi/14) (require/opaque-type Char-Set char-set? srfi/14)
(define-type-alias Cursor (Pair 0 (Listof (Pair Integer Integer)))) (define-type-alias Cursor (Pair 0 (Listof (Pair Integer Integer))))

View File

@ -7,7 +7,7 @@
place-sleep place-sleep
procedure-closure-contents-eq? procedure-closure-contents-eq?
processor-count)) 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) #:skip exclude)
(check-docs (quote typed/scheme/base) #:skip exclude) (check-docs (quote typed/scheme/base) #:skip exclude)
(check-docs (quote typed/racket) #:skip exclude) (check-docs (quote typed/racket) #:skip exclude)