[svn] r6829: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Relocation.n Ne...

[VladD2]

Log:
Incremental compilation done.

Author: VladD2
Date: Fri Nov  3 17:10:16 2006
New Revision: 6829

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Relocation.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Type.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Utils.n
   vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/ProjectManager.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Relocation.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Relocation.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Relocation.n	Fri Nov  3 17:10:16 2006
@@ -60,6 +60,7 @@
 #if DebugLocations
             UpdateDebugTree(fileIndex);
 #endif
+            method.ResetBody();
             true
           }
           else

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Type.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Type.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Type.n	Fri Nov  3 17:10:16 2006
@@ -76,8 +76,7 @@
       typeDecl  : Decl.Type,
       fileIndex : int,
       line      : int,
-      col       : int,
-      source    : ISource
+      col       : int
     )
       : Location * object * object
     {
@@ -116,7 +115,7 @@
 
         if (loc.Contains(line, col)) // in method body
         {
-          def (pBody, tBody, _) = method.GetMethodBody(source);
+          def (pBody, tBody, _) = method.GetMethodBody();
 
           ExprFinder().Find(pBody, tBody, line, col);
         }
@@ -160,7 +159,7 @@
     )
       : QuickTipInfo
     {
-      def (loc, _, tObj) = FindObject(typeDecl, fileIndex, line, col, source);
+      def (loc, _, tObj) = FindObject(typeDecl, fileIndex, line, col);
 
       match (tObj)
       {
@@ -187,7 +186,7 @@
     )
       : list [GotoInfo]
     {
-      def (_, _, tObj) = FindObject(typeDecl, fileIndex, line, col, source);
+      def (_, _, tObj) = FindObject(typeDecl, fileIndex, line, col);
 
       def getMembers (ti : TypeInfo) {
         def members = ti.GetMembers(BindingFlags.Static 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.n	Fri Nov  3 17:10:16 2006
@@ -247,7 +247,7 @@
 #endif
               // Get errors.
               //
-              def (pExpr, _, _) = method.GetMethodBody(source);
+              def (pExpr, _, _) = method.GetMethodBody();
 
               when (pExpr != null)
               {

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Utils.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Utils.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Utils.n	Fri Nov  3 17:10:16 2006
@@ -14,18 +14,16 @@
 {
   public module Utils
   {
-    public GetMethodBody(
-      this /*[NotNull]*/ method   : MethodBuilder,
-           /*[NotNull]*/ _source   : ISource
-    )
+    public GetMethodBody(this /*[NotNull]*/ method   : MethodBuilder)
       : PExpr * TExpr * Exception
     {
-      def loc      = method.BodyLocation;
-      def filePath = loc.File;
-      def engine   = method.Manager :> Engine;
-      def source   = engine.ProjectSources.GetSource(filePath);
-      def bodyCode = source.GetRegion(loc.Line, loc.Column, loc.EndLine, loc.EndColumn);
-      engine.CompileMethod(method, bodyCode, loc);
+      (method.BodyParsed, method.BodyTyped, null)
+      //def loc      = method.BodyLocation;
+      //def filePath = loc.File;
+      //def engine   = method.Manager :> Engine;
+      //def source   = engine.ProjectSources.GetSource(filePath);
+      //def bodyCode = source.GetRegion(loc.Line, loc.Column, loc.EndLine, loc.EndColumn);
+      //engine.CompileMethod(method, bodyCode, loc);
     }
 
     public IsNullOrEmpty(this value : string) : bool

Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/ProjectManager.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/ProjectManager.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/ProjectManager.cs	Fri Nov  3 17:10:16 2006
@@ -27,7 +27,7 @@
 				if (source == null)
 					return base.GetSource(filePath);
 				else
-					return new SourceTextManager(info.GetSource(filePath));
+					return new SourceTextManager(source);
 			}
 		}
 	}