**** Merged r36988 from MCS ****

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 52864f85068b974e162b9ba95c2fc96c2b678d08..d5c79b8687ee9d2bd78890ec41fa923d7c2e618b 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-03  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * cs-tokenizer.cs : Only '////' is rejected. Other non-whitespace
+         comments are allowed.
+
 2004-12-03  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
        * delegate.cs: Add checks for subtypes in paramaters and return values

diff --git a/mcs/gmcs/cs-tokenizer.cs b/mcs/gmcs/cs-tokenizer.cs
index f147ec537637dc3a251f6ce415373ce8a7b592b5..94569f753036df0b3296ad01b0270d8522ea6219 100755 (executable)
--- a/mcs/gmcs/cs-tokenizer.cs
+++ b/mcs/gmcs/cs-tokenizer.cs
@@ -2039,9 +2039,8 @@ namespace Mono.CSharp
                                                getChar ();
                                                if (RootContext.Documentation != null && peekChar () == '/') {
                                                        getChar ();
-                                                       // Allow only ///ws.
                                                        // Don't allow ////.
-                                                       if ((d = peekChar ()) == ' ' || d == '\t') {
+                                                       if ((d = peekChar ()) != '/') {
                                                                if (doc_state == XmlCommentState.Allowed)
                                                                        handle_one_line_xml_comment ();
                                                                else if (doc_state == XmlCommentState.NotAllowed)