From dd239f3d4faf4f501be3dbea313b8f192c8069fe Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Fri, 28 Mar 2014 12:09:51 -0400 Subject: [PATCH] Cut out class dependencies for typed/racket/base Use (require typed/racket/class) for classes when using #lang typed/racket/base --- .../typed-racket-lib/typed-racket/base-env/prims.rkt | 3 --- .../typed-racket-lib/typed/racket.rkt | 11 ++++++++--- .../typed-racket-lib/typed/racket/class.rkt | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt index 385a66b35f..09c24c64a2 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt @@ -29,7 +29,6 @@ This file defines two sorts of primitives. All of them are provided into any mod (all-from-out "base-contracted.rkt") (all-from-out "top-interaction.rkt") (all-from-out "case-lambda.rkt") - class : (rename-out [define-typed-struct define-struct:] [define-typed-struct define-struct] @@ -106,7 +105,6 @@ This file defines two sorts of primitives. All of them are provided into any mod "base-types-extra.rkt" "case-lambda.rkt" 'struct-extraction - "class-prims.rkt" racket/flonum ; for for/flvector and for*/flvector (for-syntax racket/lazy-require @@ -125,7 +123,6 @@ This file defines two sorts of primitives. All of them are provided into any mod "../private/parse-classes.rkt" "../private/syntax-properties.rkt" ;"../types/utils.rkt" - ;"../types/classes.rkt" "for-clauses.rkt" 'struct-extraction) "../types/numeric-predicates.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt index eeeddc35fe..0c9e713408 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt @@ -1,7 +1,12 @@ #lang typed-racket/minimal (require typed/racket/base racket/require - (subtract-in racket typed/racket/base racket/contract) + (subtract-in racket typed/racket/base racket/contract + typed/racket/class) + typed/racket/class (for-syntax racket/base)) -(provide (all-from-out typed/racket/base racket) - (for-syntax (all-from-out racket/base))) +(provide (all-from-out racket + typed/racket/base + typed/racket/class) + (for-syntax (all-from-out racket/base)) + class) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt new file mode 100644 index 0000000000..cf7e274ea1 --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt @@ -0,0 +1,7 @@ +#lang racket/base + +(require (except-in racket/class class) + typed-racket/base-env/class-prims) + +(provide class + (all-from-out racket/class))