Author: raja
Date: 2006-12-08 07:07:59 -0500 (Fri, 08 Dec 2006)
New Revision: 69222
Added:
trunk/mcs/tests/gtest-299.cs
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/cs-tokenizer.cs
trunk/mcs/tests/ChangeLog
Log:
Fix #80060
* mcs/cs-tokenizer.cs (parse_less_than): Recognize double-colons too.
* tests/gtest-299.cs: New test based on #80060.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2006-12-08 09:37:30 UTC (rev 69221)
+++ trunk/mcs/mcs/ChangeLog 2006-12-08 12:07:59 UTC (rev 69222)
@@ -1,3 +1,8 @@
+2006-12-08 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #80060
+ * cs-tokenizer.cs (parse_less_than): Recognize double-colons too.
+
2006-12-07 Marek Safar <[EMAIL PROTECTED]>
A fix for bug #80162
Modified: trunk/mcs/mcs/cs-tokenizer.cs
===================================================================
--- trunk/mcs/mcs/cs-tokenizer.cs 2006-12-08 09:37:30 UTC (rev 69221)
+++ trunk/mcs/mcs/cs-tokenizer.cs 2006-12-08 12:07:59 UTC (rev 69222)
@@ -573,7 +573,7 @@
if (the_token == Token.OP_GENERICS_GT)
return true;
- else if ((the_token == Token.COMMA) || (the_token ==
Token.DOT))
+ else if (the_token == Token.COMMA || the_token ==
Token.DOT || the_token == Token.DOUBLE_COLON)
goto start;
else if (the_token == Token.INTERR || the_token ==
Token.STAR)
goto again;
Modified: trunk/mcs/tests/ChangeLog
===================================================================
--- trunk/mcs/tests/ChangeLog 2006-12-08 09:37:30 UTC (rev 69221)
+++ trunk/mcs/tests/ChangeLog 2006-12-08 12:07:59 UTC (rev 69222)
@@ -1,3 +1,7 @@
+2006-12-08 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * gtest-299.cs: New test based on #80060.
+
2006-12-01 Raja R Harinath <[EMAIL PROTECTED]>
* test-541.cs, gtest-298.cs: New tests based on #79972.
Added: trunk/mcs/tests/gtest-299.cs
===================================================================
--- trunk/mcs/tests/gtest-299.cs 2006-12-08 09:37:30 UTC (rev 69221)
+++ trunk/mcs/tests/gtest-299.cs 2006-12-08 12:07:59 UTC (rev 69222)
@@ -0,0 +1,13 @@
+using System;
+using X = N;
+namespace N { class A {} }
+class B<T> { }
+class Test {
+ static public B<X::A> q;
+ static void Main ()
+ {
+ q = new B<N.A> ();
+ if (typeof (B<X::A>) != typeof (B<X.A>))
+ throw new Exception ("huh");
+ }
+}
Property changes on: trunk/mcs/tests/gtest-299.cs
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
