From 670bde6aad1180d5c288230059095322e1f2728a Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Thu, 5 Dec 2013 17:49:08 -0500 Subject: [PATCH] Split legacy Typed Racket languages into their own module. original commit: 9a67230ae0eb04f5e6667dd5e05a64e9e5789edd --- .../typed-racket-compatibility/LICENSE.txt | 10 ++++++++++ .../typed-racket-compatibility/info.rkt | 12 +++++++++++ .../typed-scheme/lang/reader.rkt | 0 .../typed-scheme/main.rkt | 0 .../typed-scheme/no-check.rkt | 4 ++++ .../typed-scheme/no-check/lang/reader.rkt | 0 .../typed/scheme.rkt | 0 .../typed/scheme/base.rkt | 0 .../typed/scheme/base/lang/reader.rkt | 0 .../typed/scheme/base/no-check.rkt | 4 ++++ .../scheme/base/no-check/lang/reader.rkt | 0 .../typed/scheme/lang/reader.rkt | 0 .../typed/scheme/no-check.rkt | 4 ++++ .../typed/scheme/no-check/lang/reader.rkt | 0 .../typed/scheme/system.rkt | 0 .../typed-racket-doc/info.rkt | 1 + .../private/no-check-helper.rkt} | 20 +++++++++---------- .../typed/racket/base/no-check.rkt | 4 ++-- .../typed/racket/no-check.rkt | 5 +++-- .../typed-racket-more/info.rkt | 1 + .../typed-racket-test/info.rkt | 3 ++- 21 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt create mode 100644 pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed-scheme/lang/reader.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed-scheme/main.rkt (100%) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed-scheme/no-check/lang/reader.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/base.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/base/lang/reader.rkt (100%) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/base/no-check/lang/reader.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/lang/reader.rkt (100%) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/no-check/lang/reader.rkt (100%) rename pkgs/typed-racket-pkgs/{typed-racket-lib => typed-racket-compatibility}/typed/scheme/system.rkt (100%) rename pkgs/typed-racket-pkgs/typed-racket-lib/{typed-scheme/no-check.rkt => typed/private/no-check-helper.rkt} (79%) diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt new file mode 100644 index 00000000..1ef012d9 --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt @@ -0,0 +1,10 @@ +typed-racket-lib +Copyright (c) 2010-2013 PLT Design Inc. + +This package is distributed under the GNU Lesser General Public +License (LGPL). This means that you can link Racket into proprietary +applications, provided you follow the rules stated in the LGPL. You +can also modify this package; if you distribute a modified version, +you must distribute it under the terms of the LGPL, which in +particular means that you must release the source code for the +modified software. See COPYING_LESSER.txt for more information. diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt new file mode 100644 index 00000000..06e51270 --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt @@ -0,0 +1,12 @@ +#lang info + +(define collection 'multi) + +(define deps '("scheme-lib" + "typed-racket-lib" + "base")) + + +(define pkg-desc "compatibility library for older Typed Racket-based languages") + +(define pkg-authors '(samth stamourv)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/main.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/main.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/main.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt new file mode 100644 index 00000000..5e0f470f --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt @@ -0,0 +1,4 @@ +#lang typed-racket/minimal + +(require racket/require typed/racket/no-check (subtract-in typed/scheme typed/racket/no-check)) +(provide (all-from-out typed/scheme typed/racket/no-check)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/no-check/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt new file mode 100644 index 00000000..8635a457 --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt @@ -0,0 +1,4 @@ +#lang typed-racket/minimal + +(require racket/require typed/racket/no-check (subtract-in typed/scheme/base typed/racket/no-check)) +(provide (all-from-out typed/scheme/base typed/racket/no-check)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/base/no-check/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt new file mode 100644 index 00000000..5e0f470f --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt @@ -0,0 +1,4 @@ +#lang typed-racket/minimal + +(require racket/require typed/racket/no-check (subtract-in typed/scheme typed/racket/no-check)) +(provide (all-from-out typed/scheme typed/racket/no-check)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check/lang/reader.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/no-check/lang/reader.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check/lang/reader.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/system.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/system.rkt similarity index 100% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed/scheme/system.rkt rename to pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/system.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt index 64ab3d4c..033d0b39 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt @@ -14,6 +14,7 @@ "at-exp-lib" "scribble-lib" "typed-racket-lib" + "typed-racket-compatibility" "racket-doc")) (define deps '("base")) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt similarity index 79% rename from pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/no-check.rkt rename to pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt index 52647ae4..0f94e540 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-scheme/no-check.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt @@ -1,13 +1,13 @@ -#lang scheme/base +#lang racket/base (require (except-in typed-racket/base-env/prims require/typed require/opaque-type require-typed-struct) typed-racket/base-env/base-types-extra - (for-syntax scheme/base syntax/parse syntax/struct)) -(provide (all-from-out scheme/base) - (all-defined-out) - (all-from-out typed-racket/base-env/prims + (for-syntax racket/base syntax/parse syntax/struct)) +(provide (all-from-out racket/base) + (all-defined-out) + (all-from-out typed-racket/base-env/prims typed-racket/base-env/base-types-extra)) @@ -17,8 +17,8 @@ (pattern nm:id #:with spec #'nm) (pattern (orig-nm:id internal-nm:id) - #:with spec #'(orig-nm internal-nm) - #:with nm #'internal-nm)) + #:with spec #'(orig-nm internal-nm) + #:with nm #'internal-nm)) (define-syntax-class simple-clause #:attributes (nm ty) (pattern [nm:opt-rename ty])) @@ -39,9 +39,9 @@ (syntax-parse stx [(_ lib (~or sc:simple-clause strc:struct-clause oc:opaque-clause) ...) #'(begin - (require/opaque-type oc.ty oc.pred lib . oc.opt) ... - (require/typed sc.nm sc.ty lib) ... - (require-typed-struct strc.nm (strc.body ...) lib) ...)] + (require/opaque-type oc.ty oc.pred lib . oc.opt) ... + (require/typed sc.nm sc.ty lib) ... + (require-typed-struct strc.nm (strc.body ...) lib) ...)] [(_ nm:opt-rename ty lib (~optional [~seq #:struct-maker parent]) ...) #'(require (only-in lib nm.spec))])) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt index 4508a415..45eb6f60 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt @@ -1,4 +1,4 @@ #lang typed-racket/minimal -(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)) +(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)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt index 5dec3f1a..1d7abb52 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt @@ -1,4 +1,5 @@ #lang typed-racket/minimal -(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)) +(require racket/require typed/private/no-check-helper + (subtract-in typed/racket typed/private/no-check-helper)) +(provide (all-from-out typed/racket typed/private/no-check-helper)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt index 5fc03f93..ee384e07 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt @@ -10,6 +10,7 @@ "rackunit-lib" "rackunit-gui" "typed-racket-lib" + "typed-racket-compatibility" "gui-lib")) (define build-deps '("scribble-lib")) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt index e7928c55..ab8a53ea 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt @@ -1,7 +1,8 @@ #lang info (define collection 'multi) -(define deps '("typed-racket" "typed-racket-more" "unstable")) +(define deps '("typed-racket" "typed-racket-more" "typed-racket-compatibility" + "unstable")) (define build-deps '("scheme-lib" "base" "racket-benchmarks"