Author: ankit
Date: 2005-04-26 08:56:25 -0400 (Tue, 26 Apr 2005)
New Revision: 43590

Modified:
   trunk/mcs/ilasm/scanner/ChangeLog
   trunk/mcs/ilasm/scanner/ILTokenizer.cs
Log:
* ILTokenizer.cs (ILTokenizer.GetNextToken): Advance reader to look at
char after a '.' .
(ILTokenizer.BuildId): Never end an id on a DOT.
Patch by Harinath.


Modified: trunk/mcs/ilasm/scanner/ChangeLog
===================================================================
--- trunk/mcs/ilasm/scanner/ChangeLog   2005-04-26 12:49:08 UTC (rev 43589)
+++ trunk/mcs/ilasm/scanner/ChangeLog   2005-04-26 12:56:25 UTC (rev 43590)
@@ -1,3 +1,10 @@
+2004-04-26  Ankit Jain  <[EMAIL PROTECTED]>
+
+       * ILTokenizer.cs (ILTokenizer.GetNextToken): Advance reader to look at
+       char after a '.' .
+       (ILTokenizer.BuildId): Never end an id on a DOT.
+       Patch by Harinath.
+
 2004-12-02  Miguel de Icaza  <[EMAIL PROTECTED]>
 
        * ILTable.cs: Add new .stackreserve token.

Modified: trunk/mcs/ilasm/scanner/ILTokenizer.cs
===================================================================
--- trunk/mcs/ilasm/scanner/ILTokenizer.cs      2005-04-26 12:49:08 UTC (rev 
43589)
+++ trunk/mcs/ilasm/scanner/ILTokenizer.cs      2005-04-26 12:56:25 UTC (rev 
43590)
@@ -212,7 +212,9 @@
                                                 next = reader.Peek ();
                                                 if (next == '.') {
                                                         reader.MarkLocation ();
+                                                        reader.Read ();
                                                         next = reader.Peek ();
+                                                        reader.Unread ('.');
                                                         if (IsIdChar ((char) 
next)) {
                                                                 string opTail 
= BuildId ();
                                                                 string 
full_str = String.Format ("{0}{1}", val, opTail);
@@ -322,15 +324,20 @@
                 private string BuildId ()
                 {
                         StringBuilder idsb = new StringBuilder ();
-                        int ch;
+                        int ch, last;
 
+                        last = -1;
                         while ((ch = reader.Read ()) != -1) {
                                 if (IsIdChar ((char) ch) || ch == '.') {
                                         idsb.Append ((char) ch);
                                 } else {
                                         reader.Unread (ch);
+                                        // Never end an id on a DOT
+                                        if (last == '.')
+                                                reader.Unread (last);
                                         break;
                                 }
+                                last = ch;
                         }
 
                         return idsb.ToString ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to