From f71157285cc401fc34a1a0f2faf7a1300565f2b7 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 11 Jan 2011 10:47:06 -0500 Subject: [PATCH] Abstract the initialization stuff into a separate function. Make it available outside so in the future I can use it in the PL class code. original commit: 5998ecc56430c34cabb13519a92fe755eff145cd --- collects/typed-scheme/typed-scheme.rkt | 31 +++++++++----------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/collects/typed-scheme/typed-scheme.rkt b/collects/typed-scheme/typed-scheme.rkt index 9dc546c1..2425f6d6 100644 --- a/collects/typed-scheme/typed-scheme.rkt +++ b/collects/typed-scheme/typed-scheme.rkt @@ -1,43 +1,34 @@ #lang racket/base -(require (for-syntax racket/base +(require (for-syntax racket/base ;; these requires are needed since their code ;; appears in the residual program - "typecheck/renamer.rkt" "types/type-table.rkt") + "typecheck/renamer.rkt" "types/type-table.rkt") "private/base-special-env.rkt") -(begin-for-syntax ) - (provide (rename-out [module-begin #%module-begin] [top-interaction #%top-interaction] [#%plain-lambda lambda] [#%app #%app] [require require]) - with-type) + with-type + (for-syntax do-standard-inits)) -(define-syntax (module-begin stx) +(define-for-syntax (do-standard-inits) (initialize-special) ((dynamic-require 'typed-scheme/private/base-structs 'initialize-structs)) ((dynamic-require 'typed-scheme/private/base-env-indexing 'initialize-indexing)) ((dynamic-require 'typed-scheme/private/base-env 'init)) - ((dynamic-require 'typed-scheme/private/base-env-numeric 'init)) + ((dynamic-require 'typed-scheme/private/base-env-numeric 'init))) + +(define-syntax (module-begin stx) + (do-standard-inits) ((dynamic-require 'typed-scheme/core 'mb-core) stx)) (define-syntax (top-interaction stx) - (initialize-special) - ((dynamic-require 'typed-scheme/private/base-structs 'initialize-structs)) - ((dynamic-require 'typed-scheme/private/base-env-indexing 'initialize-indexing)) - ((dynamic-require 'typed-scheme/private/base-env 'init)) - ((dynamic-require 'typed-scheme/private/base-env-numeric 'init)) + (do-standard-inits) ((dynamic-require 'typed-scheme/core 'ti-core) stx)) (define-syntax (with-type stx) - (initialize-special) - ((dynamic-require 'typed-scheme/private/base-structs 'initialize-structs)) - ((dynamic-require 'typed-scheme/private/base-env-indexing 'initialize-indexing)) - ((dynamic-require 'typed-scheme/private/base-env 'init)) - ((dynamic-require 'typed-scheme/private/base-env-numeric 'init)) + (do-standard-inits) ((dynamic-require 'typed-scheme/core 'wt-core) stx)) - - -