[svn] r7682: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine: Engine-main.n Engine.Init....

VladD2 svnadmin at nemerle.org
Tue May 15 04:37:10 CEST 2007


Log:
Call InitCompiler() on each TypeTree build.

Author: VladD2
Date: Tue May 15 04:37:09 2007
New Revision: 7682

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Init.n

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n	Tue May 15 04:37:09 2007
@@ -46,15 +46,12 @@
         {
           RestoreManagerClassInstance();
 
-          NameTree.Init();
+          InitCompiler();
 
           // 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.. :(
-          if (Options.PersistentLibraries)
-            when (Hierarchy != null)
-              Hierarchy.RemoveProgramTypes();
-          else
+          unless (Options.PersistentLibraries)
           {
             // Get assembly references from IDE.
             def asmRefs = _callback.GetAssemblyReferences().ToArray();
@@ -202,6 +199,9 @@
       }
       finally
       {
+        when (Hierarchy != null)
+          Hierarchy.Dispose();
+
         _currentMessages = null;
       }
     }

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Init.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Init.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Init.n	Tue May 15 04:37:09 2007
@@ -69,16 +69,9 @@
       {
         Options.PersistentLibraries = false; // reload libraries on next parse
         ResetTypeTree();
-        // 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 (Hierarchy != null)
-        {
-          Hierarchy.Dispose();
+        
           Hierarchy = null;
-        }
 
-        InitCompiler();
         _isCanBeReset = false; // it set tu true in BuildNamespaceTreeAndInitProject()
       }
     }



More information about the svn mailing list