diff --git a/typed-racket-compatibility/typed/scheme/base.rkt b/typed-racket-compatibility/typed/scheme/base.rkt index 669f4cc69..0b339164b 100644 --- a/typed-racket-compatibility/typed/scheme/base.rkt +++ b/typed-racket-compatibility/typed/scheme/base.rkt @@ -23,11 +23,12 @@ require-typed-signature) (require-typed-struct-legacy require-typed-struct) (require/typed-legacy require/typed)) + typed-racket/base-env/prims-deprecated typed-racket/base-env/base-types (except-in typed-racket/base-env/base-types-extra Distinction) (for-syntax (except-in typed-racket/base-env/base-types-extra Distinction))) -(provide (rename-out [define-type-alias define-type]) - (all-from-out typed-racket/base-env/prims) +(provide (all-from-out typed-racket/base-env/prims) + (all-from-out typed-racket/base-env/prims-deprecated) (all-from-out typed-racket/base-env/base-types) (all-from-out typed-racket/base-env/base-types-extra) assert defined? with-type for for* diff --git a/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt new file mode 100644 index 000000000..ec3be495f --- /dev/null +++ b/typed-racket-lib/typed-racket/base-env/prims-deprecated.rkt @@ -0,0 +1,89 @@ +#lang racket/base + + +(provide case-lambda: + struct: + define-struct: + define-typed-struct + define-struct/exec: + for: + for/and: + for/first: + for/fold: + for/foldr: + for/hash: + for/hasheq: + for/hasheqv: + for/hashalw: + for/last: + for/list: + for/lists: + for/set: + for/or: + for/product: + for/sum: + for/vector: + for*/and: + for*/first: + for*/fold: + for*/foldr: + for*/hash: + for*/hasheq: + for*/hasheqv: + for*/hashalw: + for*/last: + for*/list: + for*/lists: + for*/set: + for*/or: + for*/product: + for*/sum: + for*/vector: + do: + define-type-alias) + + +(require racket/deprecation + typed-racket/base-env/prims) + + +(define-deprecated-alias define-type-alias define-type) +(define-deprecated-alias case-lambda: case-lambda) +(define-deprecated-alias struct: struct) +(define-deprecated-alias define-struct: define-struct) +(define-deprecated-alias define-typed-struct define-struct) +(define-deprecated-alias define-struct/exec: define-struct/exec) +(define-deprecated-alias for: for) +(define-deprecated-alias for/and: for/and) +(define-deprecated-alias for/first: for/first) +(define-deprecated-alias for/fold: for/fold) +(define-deprecated-alias for/foldr: for/foldr) +(define-deprecated-alias for/hash: for/hash) +(define-deprecated-alias for/hasheq: for/hasheq) +(define-deprecated-alias for/hasheqv: for/hasheqv) +(define-deprecated-alias for/hashalw: for/hashalw) +(define-deprecated-alias for/last: for/last) +(define-deprecated-alias for/list: for/list) +(define-deprecated-alias for/lists: for/lists) +(define-deprecated-alias for/set: for/set) +(define-deprecated-alias for/or: for/or) +(define-deprecated-alias for/product: for/product) +(define-deprecated-alias for/sum: for/sum) +(define-deprecated-alias for/vector: for/vector) +(define-deprecated-alias for*/and: for/and) +(define-deprecated-alias for*/first: for*/first) +(define-deprecated-alias for*/fold: for*/fold) +(define-deprecated-alias for*/foldr: for*/foldr) +(define-deprecated-alias for*/hash: for*/hash) +(define-deprecated-alias for*/hasheq: for*/hasheq) +(define-deprecated-alias for*/hasheqv: for*/hasheqv) +(define-deprecated-alias for*/hashalw: for*/hashalw) +(define-deprecated-alias for*/last: for*/last) +(define-deprecated-alias for*/list: for*/list) +(define-deprecated-alias for*/lists: for*/lists) +(define-deprecated-alias for*/set: for*/set) +(define-deprecated-alias for*/or: for*/or) +(define-deprecated-alias for*/product: for*/product) +(define-deprecated-alias for*/sum: for*/sum) +(define-deprecated-alias for*/vector: for*/vector) +(define-deprecated-alias do: do) diff --git a/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt b/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt index 37f64db1b..4998980cf 100644 --- a/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt +++ b/typed-racket-lib/typed-racket/base-env/prims-lambda.rkt @@ -16,7 +16,6 @@ syntax/parse/pre)) (provide (rename-out [-case-lambda case-lambda] - [-case-lambda case-lambda:] [-case-lambda case-λ] [lambda: λ:]) pcase-lambda: diff --git a/typed-racket-lib/typed-racket/base-env/prims.rkt b/typed-racket-lib/typed-racket/base-env/prims.rkt index e039520e6..05a998ce7 100644 --- a/typed-racket-lib/typed-racket/base-env/prims.rkt +++ b/typed-racket-lib/typed-racket/base-env/prims.rkt @@ -34,22 +34,51 @@ the typed racket language. def-redirect define-for*-variants with-handlers: with-handlers*: define-for/acc:-variants base-for/flvector: base-for/vector -define -do -let - -let* -let*-values -let-values -let/cc -let/ec -letrec -letrec-values) + -let* -let*-values -let-values -let/cc -let/ec -letrec -letrec-values + for: + for/and: + for/first: + for/fold: + for/foldr: + for/hash: + for/hasheq: + for/hasheqv: + for/hashalw: + for/last: + for/list: + for/lists: + for/set: + for/or: + for/product: + for/sum: + for/vector: + for*/and: + for*/first: + for*/fold: + for*/foldr: + for*/hash: + for*/hasheq: + for*/hasheqv: + for*/hashalw: + for*/last: + for*/list: + for*/lists: + for*/set: + for*/or: + for*/product: + for*/sum: + for*/vector:) (all-from-out "top-interaction.rkt") (except-out (all-from-out "prims-lambda.rkt") -lambda) (all-from-out (submod "prims-contract.rkt" forms)) - define-type-alias define-new-subtype - define-typed-struct - define-typed-struct/exec ann inst row-inst : - (rename-out [define-typed-struct define-struct:] - [define-typed-struct define-struct] + (rename-out [define-typed-struct define-struct] + [define-type-alias define-type] [-lambda lambda] [-lambda λ] [-struct struct] - [-struct struct:] [-define define] [-let let] [-let* let*] @@ -102,10 +131,8 @@ the typed racket language. [for/set: for/set] [for*/set: for*/set] [-do do] - [-do do:] [with-handlers: with-handlers] [with-handlers*: with-handlers*] - [define-typed-struct/exec define-struct/exec:] [define-typed-struct/exec define-struct/exec])) (require "colon.rkt" diff --git a/typed-racket-lib/typed/racket/base.rkt b/typed-racket-lib/typed/racket/base.rkt index 41d8807fe..31ad7e6c7 100644 --- a/typed-racket-lib/typed/racket/base.rkt +++ b/typed-racket-lib/typed/racket/base.rkt @@ -17,13 +17,15 @@ (require typed-racket/base-env/extra-procs (except-in typed-racket/base-env/prims - require-typed-struct-legacy - require/typed-legacy - require-typed-signature) + require-typed-struct-legacy + require/typed-legacy + require-typed-signature) + typed-racket/base-env/prims-deprecated typed-racket/base-env/base-types (except-in typed-racket/base-env/base-types-extra Distinction Unit)) -(provide (rename-out [define-type-alias define-type]) - (all-from-out typed-racket/base-env/prims) +(provide (all-from-out typed-racket/base-env/prims) + (all-from-out typed-racket/base-env/prims-deprecated) (all-from-out typed-racket/base-env/base-types) (all-from-out typed-racket/base-env/base-types-extra) assert defined? with-type for for*) +