* ILReader.cs: Incriment line numbers

	* Location.cs: Do not reset line number when moving to a previous
	column. Add ToString method.

svn path=/trunk/mcs/; revision=16872

diff --git a/mcs/ilasm/scanner/ChangeLog b/mcs/ilasm/scanner/ChangeLog
index 377f12a3debbc3f3f36cc5e6039191ddce204a5e..19e6e42e7fe026552f91885c4a9e9e6181cc0c5d 100644 (file)
--- a/mcs/ilasm/scanner/ChangeLog
+++ b/mcs/ilasm/scanner/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-29 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILReader.cs: Incriment line numbers
+       * Location.cs: Do not reset line number when moving to a previous
+       column. Add ToString method.
+       
 2003-07-15 Jackson Harper <jackson@latitudegeo.com>
 
        * ILTables.cs: Add tokens for generic constraints.

diff --git a/mcs/ilasm/scanner/ILReader.cs b/mcs/ilasm/scanner/ILReader.cs
index cc8850d6e7c276ed44abd453ca3b066e42d23544..33fd59e2d318d09e08c61a908a8d7e81d07967f7 100644 (file)
--- a/mcs/ilasm/scanner/ILReader.cs
+++ b/mcs/ilasm/scanner/ILReader.cs
@@ -68,7 +68,10 @@ namespace Mono.ILASM {
                /// <returns></returns>\r
                public int Read ()\r
                {\r
-                       return DoRead ();\r
+                       int read = DoRead ();\r
+                       if (read == '\n')\r
+                               location.NewLine ();\r
+                       return read;\r
                }\r
 \r
                /// <summary>\r

diff --git a/mcs/ilasm/scanner/Location.cs b/mcs/ilasm/scanner/Location.cs
index 8dee42f7a8aaaa830053c6eee1368ee1cac87078..9075a430518ae0af7dd9088f91bc7c9397c1f8b1 100644 (file)
--- a/mcs/ilasm/scanner/Location.cs
+++ b/mcs/ilasm/scanner/Location.cs
@@ -75,11 +75,13 @@ namespace Mono.ILASM {
                /// </summary>\r
                public void PreviousColumn ()\r
                {\r
+                       /*\r
                        if (column == 1) {\r
                                PreviousLine ();\r
                        } else {\r
                                --column;\r
                        }\r
+                       */\r
                }\r
 \r
                /// <summary>\r
@@ -99,5 +101,9 @@ namespace Mono.ILASM {
                        return new Location (this);\r
                }\r
 \r
+               public override string ToString ()\r
+               {\r
+                       return "line (" + line + ")";\r
+               }\r
        }\r
 }\r