From 14cbce42896d724af6b60b64b588aecf09f68330 Mon Sep 17 00:00:00 2001 From: Eric Dobson Date: Tue, 7 Jun 2011 15:55:07 -0400 Subject: [PATCH] Make sure type environment is only initialized once original commit: 44d591b5ba848dd8735c25f4bafbe1409506b219 --- collects/typed-scheme/typed-scheme.rkt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/collects/typed-scheme/typed-scheme.rkt b/collects/typed-scheme/typed-scheme.rkt index 1d20a7af..875466a9 100644 --- a/collects/typed-scheme/typed-scheme.rkt +++ b/collects/typed-scheme/typed-scheme.rkt @@ -14,12 +14,15 @@ with-type (for-syntax do-standard-inits)) +(define-for-syntax initialized #f) (define-for-syntax (do-standard-inits) - (initialize-special) - ((dynamic-require 'typed-scheme/base-env/base-structs 'initialize-structs)) - ((dynamic-require 'typed-scheme/base-env/base-env-indexing 'initialize-indexing)) - ((dynamic-require 'typed-scheme/base-env/base-env 'init)) - ((dynamic-require 'typed-scheme/base-env/base-env-numeric 'init))) + (unless initialized + (initialize-special) + ((dynamic-require 'typed-scheme/base-env/base-structs 'initialize-structs)) + ((dynamic-require 'typed-scheme/base-env/base-env-indexing 'initialize-indexing)) + ((dynamic-require 'typed-scheme/base-env/base-env 'init)) + ((dynamic-require 'typed-scheme/base-env/base-env-numeric 'init)) + (set! initialized #t))) (define-syntax-rule (drivers [name sym] ...) (begin