* IlToken.cs: Add Dash Token (this is used for assembly names)

	* ILTokenizer.cs: Return Dash token

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

diff --git a/mcs/ilasm/scanner/ChangeLog b/mcs/ilasm/scanner/ChangeLog
index d0a0b8429c8cb3e522f2d4020636d45ca6c3d0d3..7bbf727e765a0dd7cd75161008b22cb60c389e55 100644 (file)
--- a/mcs/ilasm/scanner/ChangeLog
+++ b/mcs/ilasm/scanner/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-06 Jackson Harper <jackson@latitudegeo.com>
+
+       * IlToken.cs: Add Dash Token (this is used for assembly names)
+       * ILTokenizer.cs: Return Dash token
+       
 2003-02-02 Jackson Harper <jackson@latitudegeo.com>
 
        * ChangeLog: Add ChangeLog

diff --git a/mcs/ilasm/scanner/ILToken.cs b/mcs/ilasm/scanner/ILToken.cs
index 60fd4ac4702464d9cea876b39b7396c0921a3fb7..c5e56949a9d795ff37868e72a0386b59ff6614b3 100644 (file)
--- a/mcs/ilasm/scanner/ILToken.cs
+++ b/mcs/ilasm/scanner/ILToken.cs
@@ -32,6 +32,7 @@ namespace Mono.ILASM {
                public static readonly ILToken Slash;\r
                public static readonly ILToken Bang;\r
                public static readonly ILToken Ellipsis;\r
+               public static readonly ILToken Dash;\r
 \r
                private static readonly ILToken [] punctuations;\r
 \r
@@ -60,6 +61,7 @@ namespace Mono.ILASM {
                        Slash = new ILToken (Token.SLASH, "/");\r
                        Bang = new ILToken (Token.BANG, "!");\r
                        Ellipsis = new ILToken (Token.ELLIPSIS, "...");\r
+                       Dash = new ILToken (Token.DASH, "-");\r
 \r
                        punctuations = new ILToken [] {\r
                                OpenBrace, CloseBrace,\r

diff --git a/mcs/ilasm/scanner/ILTokenizer.cs b/mcs/ilasm/scanner/ILTokenizer.cs
index 065a1fee9a097beff3af72e3e01ac156985d18f1..b47c9d419fbdca3bbce036bc4d0a88ec465c3857 100644 (file)
--- a/mcs/ilasm/scanner/ILTokenizer.cs
+++ b/mcs/ilasm/scanner/ILTokenizer.cs
@@ -115,11 +115,16 @@ namespace Mono.ILASM {
 \r
                                // Numbers\r
                                if (numBuilder.Start (ch)) {\r
-                                       reader.Unread (ch);\r
-                                       numBuilder.Build ();\r
-                                       if (numBuilder.ResultToken != ILToken.Invalid) {\r
-                                               res.CopyFrom (numBuilder.ResultToken);\r
+                                       if ((ch == '-') && !(Char.IsDigit ((char) reader.Peek ()))) {\r
+                                               res = ILToken.Dash;\r
                                                break;\r
+                                       } else {\r
+                                               reader.Unread (ch);\r
+                                               numBuilder.Build ();\r
+                                               if (numBuilder.ResultToken != ILToken.Invalid) {\r
+                                                       res.CopyFrom (numBuilder.ResultToken);\r
+                                                       break;\r
+                                               }\r
                                        }\r
                                }\r
 \r