From cbce6e45b9232ae81f536606a6a13c22e481b66b Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Sun, 15 Dec 2013 09:35:31 -0800
Subject: [PATCH] Split out do-standard-inits.

original commit: eeacfc57ffa59d48e538831fffe3f3184a27fc19
---
 .../typed-racket/standard-inits.rkt           | 38 +++++++++++++++++++
 .../typed-racket/typed-racket.rkt             | 33 +---------------
 2 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt

diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt
new file mode 100644
index 00000000..86a05739
--- /dev/null
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt
@@ -0,0 +1,38 @@
+#lang racket/base
+
+(require
+ racket/base racket/lazy-require "env/env-req.rkt"
+ "utils/timing.rkt" ;; only for timing/debugging
+ )
+
+(provide do-standard-inits)
+
+(lazy-require
+  [typed-racket/base-env/base-env ((init init-base-env))]
+  [typed-racket/base-env/base-env-numeric ((init init-base-env-numeric))]
+  [typed-racket/base-env/base-structs (initialize-structs)]
+  [typed-racket/base-env/base-env-indexing (initialize-indexing)]
+  [typed-racket/base-env/base-special-env (initialize-special)]
+  [typed-racket/base-env/base-contracted (initialize-contracted)]
+  [(submod typed-racket/base-env/base-types initialize) (initialize-type-names)])
+
+(define initialized #f)
+(define (do-standard-inits)
+  (unless initialized
+    (do-time "Starting initialization")
+    (initialize-structs)
+    (do-time "Finshed base-structs")
+    (initialize-indexing)
+    (do-time "Finshed base-env-indexing")
+    (init-base-env)
+    (do-time "Finshed base-env")
+    (init-base-env-numeric)
+    (do-time "Finshed base-env-numeric")
+    (initialize-special)
+    (do-time "Finished base-special-env")
+    (initialize-contracted)
+    (do-time "Finished base-contracted")
+    (initialize-type-names)
+    (do-time "Finished base-types")
+    (set! initialized #t))
+  (do-requires))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt
index 6fd706b3..e2161b8c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt
@@ -1,7 +1,8 @@
 #lang racket/base
 
 (require
- (for-syntax racket/base racket/lazy-require "env/env-req.rkt")
+ (for-syntax racket/base racket/lazy-require
+             "standard-inits.rkt")
  (for-syntax "utils/timing.rkt") ;; only for timing/debugging
  ;; the below requires are needed since they provide identifiers
  ;; that may appear in the residual program
@@ -15,36 +16,6 @@
          with-type
          (for-syntax do-standard-inits))
 
-(begin-for-syntax
-  (lazy-require
-    [typed-racket/base-env/base-env ((init init-base-env))]
-    [typed-racket/base-env/base-env-numeric ((init init-base-env-numeric))]
-    [typed-racket/base-env/base-structs (initialize-structs)]
-    [typed-racket/base-env/base-env-indexing (initialize-indexing)]
-    [typed-racket/base-env/base-special-env (initialize-special)]
-    [typed-racket/base-env/base-contracted (initialize-contracted)]
-    [(submod typed-racket/base-env/base-types initialize) (initialize-type-names)]))
-
-(define-for-syntax initialized #f)
-(define-for-syntax (do-standard-inits)
-  (unless initialized
-    (do-time "Starting initialization")
-    (initialize-structs)
-    (do-time "Finshed base-structs")
-    (initialize-indexing)
-    (do-time "Finshed base-env-indexing")
-    (init-base-env)
-    (do-time "Finshed base-env")
-    (init-base-env-numeric)
-    (do-time "Finshed base-env-numeric")
-    (initialize-special)
-    (do-time "Finished base-special-env")
-    (initialize-contracted)
-    (do-time "Finished base-contracted")
-    (initialize-type-names)
-    (do-time "Finished base-types")
-    (set! initialized #t))
-  (do-requires))
 
 (define-syntax-rule (drivers [name sym] ...)
   (begin