[svn] r7485: nemerle/trunk/ncc/generation/ILEmitter.n vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Compl...

[IT]

Log:
Working on debug locations.

Author: IT
Date: Sun Feb 25 02:21:33 2007
New Revision: 7485

Modified:
   nemerle/trunk/ncc/generation/ILEmitter.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n

Modified: nemerle/trunk/ncc/generation/ILEmitter.n
==============================================================================
--- nemerle/trunk/ncc/generation/ILEmitter.n	(original)
+++ nemerle/trunk/ncc/generation/ILEmitter.n	Sun Feb 25 02:21:33 2007
@@ -192,11 +192,22 @@
       }
     }
 
+    Mark (loc : Location, ignoreMultiline : bool) : void
+    {
+      when (!ignoreMultiline || loc.Line == loc.EndLine)
+        Mark(loc);
+    }
+
     MaybeMark (loc : Location) : void {
       when (limited_debug_nesting == 0)
         Mark (loc);   
     }
     
+    MaybeMark (loc : Location, ignoreMultiline : bool) : void {
+      when (!ignoreMultiline || loc.Line == loc.EndLine)
+        MaybeMark(loc);
+    }
+
     IsDebugEnabled : bool {
       get { _debug_doc != null }   
     }
@@ -1424,7 +1435,7 @@
 
         /* loads a literal on the evaluation stack */
         | Literal (l) => 
-          MaybeMark (expr.Location);
+          MaybeMark (expr.Location, true);
           Util.cassert (l != null);
           if (l is Literal.Null)
             match (expr.MType) {

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n	Sun Feb 25 02:21:33 2007
@@ -38,14 +38,14 @@
           Assert.AreEqual(len, result.ColEnd - result.ColStart);
       }
 
-      //test("038",  6, "StrExt");
-      //test("037",  3, "Int32");
-      //test("036",  7, "foreach");
-      //test("035",  3, "bbb");
-      //test("034",  2, "ex");
-      //test("033",  8, "ToString");
-      //test("032",  3, "aaa");
-      //test("031",  3, "arr");
+      test("038",  6, "StrExt");
+      test("037",  3, "Int32");
+      test("036",  7, "foreach");
+      test("035",  3, "bbb");
+      test("034",  2, "ex");
+      test("033",  8, "ToString");
+      test("032",  3, "aaa");
+      test("031",  3, "arr");
       test("030",  3, "bbb");
       test("029",  1, "y");
       test("028",  1, "x");