Browse Source

Allow XML documentation predefined types to be used with parameters for methods

Marek Safar 14 years ago
parent
commit
7a05a2fe35
3 changed files with 3 additions and 4 deletions
  1. 2 1
      mcs/mcs/cs-tokenizer.cs
  2. 1 1
      mcs/mcs/doc.cs
  3. 0 2
      mcs/tests/known-issues-net_4_0

+ 2 - 1
mcs/mcs/cs-tokenizer.cs

@@ -3089,7 +3089,8 @@ namespace Mono.CSharp
 										WarningMisplacedComment (Location - 3);
 								}
 							} else {
-								check_incorrect_doc_comment ();
+								if (xml_comment_buffer.Length > 0)
+									doc_state = XmlCommentState.NotAllowed;
 							}
 						}
 

+ 1 - 1
mcs/mcs/doc.cs

@@ -302,7 +302,7 @@ namespace Mono.CSharp
 			// Try built-in type first because we are using ParsedName as identifier of
 			// member names on built-in types
 			//
-			if (ParsedBuiltinType != null && ParsedParameters == null) {
+			if (ParsedBuiltinType != null && (ParsedParameters == null || ParsedName != null)) {
 				member = ParsedBuiltinType.Type;
 			} else {
 				member = null;

+ 0 - 2
mcs/tests/known-issues-net_4_0

@@ -8,5 +8,3 @@ gtest-230.cs
 gtest-437.cs
 
 test-106.cs bug #628662
-
-test-xml-030.cs