[svn] r6359: nemerle/trunk/ncc: completion/CodeCompletionEngine.n passes.n

[nazgul]

Log:
Widen the scope of persistent libraries

Author: nazgul
Date: Thu Jun  1 20:51:37 2006
New Revision: 6359

Modified:
   nemerle/trunk/ncc/completion/CodeCompletionEngine.n
   nemerle/trunk/ncc/passes.n

Modified: nemerle/trunk/ncc/completion/CodeCompletionEngine.n
==============================================================================
--- nemerle/trunk/ncc/completion/CodeCompletionEngine.n	(original)
+++ nemerle/trunk/ncc/completion/CodeCompletionEngine.n	Thu Jun  1 20:51:37 2006
@@ -237,6 +237,11 @@
         {
           Options.PersistentLibraries = state == EngineState.LoadedLibs; // if we are not in loaded libs state, it will reload them
           
+          // we must clean the nodes from current program - note that this behaviour is automatically provided by Run, but completion
+          // engine does not use it at the moment.. :(
+          when (Options.PersistentLibraries && Hierarchy != null)
+            Hierarchy.RemoveProgramTypes();
+         
           InitCompiler ();
           LoadExternalLibraries ();
           

Modified: nemerle/trunk/ncc/passes.n
==============================================================================
--- nemerle/trunk/ncc/passes.n	(original)
+++ nemerle/trunk/ncc/passes.n	Thu Jun  1 20:51:37 2006
@@ -271,6 +271,7 @@
     }
 
     internal LoadExternalLibraries () : void {
+      when (shouldCreate (InternalType.Void)) {
       unless (Options.DoNotLoadStdlib) {
         LibrariesManager.AddLibrary ("mscorlib");
         LibrariesManager.AddLibrary ("System");
@@ -283,7 +284,6 @@
       foreach (file in Options.MacrosToLoad.Reverse())
         LibrariesManager.LoadMacrosFrom (file);
 
-      when (! Options.PersistentLibraries || InternalType.Void == null) {
         SystemTypeCache.Init ();                 
         InternalType.InitSystemTypes ();
         unless (Options.DoNotLoadStdlib) InternalType.InitNemerleTypes ();
@@ -292,9 +292,10 @@
 
         unless (Options.DoNotLoadMacros)
           LibrariesManager.LoadMacrosFrom ("Nemerle.Macros");
-      }
+          
       CoreEnv = GlobalEnv.CreateCore (NameTree);
     }
+    }
 
     
     /**