ClojureCLR: minor updates to RT, REPL initialization

1 files changed, 14 insertions, 9 deletions

diff --git a/ClojureCLR/Clojure/Clojure.Console/ClojureConsole.cs b/ClojureCLR/Clojure/Clojure.Console/ClojureConsole.cs
index f0f88869..93ba2062 100644
--- a/ClojureCLR/Clojure/Clojure.Console/ClojureConsole.cs
+++ b/ClojureCLR/Clojure/Clojure.Console/ClojureConsole.cs
@@ -70,6 +70,17 @@ namespace clojure.console
             return new ClojureCommandLine();

         }

 

+        protected override ScriptRuntimeSetup CreateRuntimeSetup()

+        {

+            ScriptRuntimeSetup setup = base.CreateRuntimeSetup();

+

+            // Set this to true to force snippets to be written out.

+            // Or you can put -D on the command line.

+            setup.DebugMode = false;

+

+            return setup;

+        }

+

         #endregion

 

         #region Main routine

@@ -98,7 +109,8 @@ namespace clojure.console
             try

             {

                 Snippets.SetSaveAssemblies(true, ".");

-                MaybeInitialize(); 

+                MaybeInitialize();

+                RT.PostBootstrapInit();

                 Snippets.SaveAndVerifyAssemblies();

                 base.ExecuteInternal();

             }

@@ -163,7 +175,7 @@ namespace clojure.console
 

         public object LoadFromStream(TextReader rdr)

         {

-            ScriptSource scriptSource = Engine.CreateScriptSourceFromString("<already opened TextReader>");

+            ScriptSource scriptSource = Engine.CreateScriptSourceFromString("<already opened TextReader>",".");

             //PushbackReader pbr = new PushbackReader(rdr);

 

             return LoadFromPushbackReader(scriptSource, rdr, false);

@@ -206,12 +218,5 @@ namespace clojure.console
         }

 

         #endregion

-

-        protected override ScriptRuntimeSetup CreateRuntimeSetup()

-        {

-            ScriptRuntimeSetup setup =  base.CreateRuntimeSetup();

-            setup.DebugMode = true;

-            return setup;

-        }

     }

 }