[svn] r6679: nemerle/trunk: ncc/completion/CodeCompletionEngine.n ncc/hierarchy/ClassMembers.n ncc/parsing...

[VladD2]

Log:
Work on relocation.

Author: VladD2
Date: Sat Sep 23 07:30:54 2006
New Revision: 6679

Modified:
   nemerle/trunk/ncc/completion/CodeCompletionEngine.n
   nemerle/trunk/ncc/hierarchy/ClassMembers.n
   nemerle/trunk/ncc/parsing/AST.n
   nemerle/trunk/tools/msbuild-task/MSBuildTask.n

Modified: nemerle/trunk/ncc/completion/CodeCompletionEngine.n
==============================================================================
--- nemerle/trunk/ncc/completion/CodeCompletionEngine.n	(original)
+++ nemerle/trunk/ncc/completion/CodeCompletionEngine.n	Sat Sep 23 07:30:54 2006
@@ -78,7 +78,8 @@
     {
       def relocatePoint(oldLn, oldCh)
       {
-        if (oldLn > line)                     (oldLn + lineOffset,  oldCh) 
+        if (oldLn > line)
+          (oldLn + lineOffset,  oldCh) 
         else if (oldLn == line && oldCh >= ch)
           if (lineOffset == 0)                (oldLn,               oldCh + chOffset)
           else                                (oldLn + lineOffset,  chOffset)

Modified: nemerle/trunk/ncc/hierarchy/ClassMembers.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/ClassMembers.n	(original)
+++ nemerle/trunk/ncc/hierarchy/ClassMembers.n	Sat Sep 23 07:30:54 2006
@@ -644,7 +644,7 @@
   internal mutable overridden_method : IMethod;
 
   [Accessor (flags = Override)]
-  protected body_location : Location;
+  protected mutable body_location : Location;
   
   [Accessor] _parsedFunction : PT.ClassMember.Function;
   
@@ -1125,6 +1125,19 @@
                                           PT.SyntaxElement.ParameterBuilder (p)],
                                          MacroTargets.Parameter, MacroPhase.WithTypedMembers, p.modifiers, this);
   }
+
+  internal override Relocate(
+    fileIndex : int,
+    line : int,
+    ch : int,
+    lineOffset : int,
+    chOffset : int
+  )
+    : void
+  {
+    body_location = Completion.Relocate(body_location, fileIndex, line, ch, lineOffset, chOffset);
+    base.Relocate(fileIndex, line, ch, lineOffset, chOffset);
+  }
 }
 
 public partial class EventBuilder : MemberBuilder, IEvent

Modified: nemerle/trunk/ncc/parsing/AST.n
==============================================================================
--- nemerle/trunk/ncc/parsing/AST.n	(original)
+++ nemerle/trunk/ncc/parsing/AST.n	Sat Sep 23 07:30:54 2006
@@ -106,6 +106,11 @@
       }
     }    
     
+    public static GetFileName(index : int) : string
+    {
+      _files[index];
+    }
+
     /** Adds new filename to locations index. If filename in already in
         store, an error message is outputted.
      */

Modified: nemerle/trunk/tools/msbuild-task/MSBuildTask.n
==============================================================================
--- nemerle/trunk/tools/msbuild-task/MSBuildTask.n	(original)
+++ nemerle/trunk/tools/msbuild-task/MSBuildTask.n	Sat Sep 23 07:30:54 2006
@@ -101,7 +101,7 @@
       
     }
 
-    protected override LogEventsFromTextOutput(singleLine : string, messageImportance : MessageImportance) : void
+    protected override LogEventsFromTextOutput(singleLine : string, _ : MessageImportance) : void
     {
       def get_location (before) : p {
         def str = singleLine.Substring (0, singleLine.IndexOf (before));
@@ -129,7 +129,8 @@
         def (file, l1, c1, l2, c2) = get_location ("debug:");
         Log.LogError (null, null, null, file, l1, c1, l2, c2, singleLine.Substring (singleLine.IndexOf ("debug:") + 7));
       }
-      else _ = Log.LogMessageFromText(singleLine, messageImportance);
+      else 
+        _ = Log.LogMessageFromText(singleLine, MessageImportance.High);
     }
 
     protected override GetResponseFileSwitch(responseFilePath : string) : string