** merged revisions 54091-54321 from mcs

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

4 files changed, 51 insertions, 21 deletions

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 7e66f4d80c3..87ca0ba3bfd 100644
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,41 @@
+2005-12-13  Marek Safar  <marek.safar@seznam.cz>
+
+	* class.cs (Method.ApplyAttributeBuilder): Test out modifier properly.
+
+2005-12-11  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* doc.cs : The search for referenced namespace was insufficient to
+	  get global one as it used to do. Fixed bug #76965.
+
+2005-12-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* doc.cs : check name in cref in the last phase that whether it is
+	  namespace or not.
+
+2005-12-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* cs-tokenizer.cs : reverted the latest change: it somehow broke
+	  Mono.C5.
+
+2005-12-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* doc.cs : so it turned out that we cannot skip override check for 
+	  interface members. Fixed bug #76954.
+
+2005-12-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* cs-tokenizer.cs : fixed bug #75984:
+	  - #warning and #error should not be handled when the source line
+	    is disabled.
+	  - #line is not checked strictly when the source line is disabled.
+	  - #define and #undef is on the other hand checked strictly at any
+	    state.
+
+2005-12-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* cs-tokenizer.cs : missing Location (actually, filename) in one of
+	  CS1027 report.
+
 2005-12-15  Raja R Harinath  <rharinath@novell.com>
 
 	* generic.cs (TypeManager.IsGeneric): Remove unused method.
diff --git a/mcs/gmcs/class.cs b/mcs/gmcs/class.cs
index a098e1524c1..0e61fcf5790 100644
--- a/mcs/gmcs/class.cs
+++ b/mcs/gmcs/class.cs
@@ -4095,7 +4095,7 @@ namespace Mono.CSharp {
 				}
 
 				for (int i = 0; i < ParameterInfo.Count; ++i) {
-					if ((ParameterInfo.ParameterModifier (i) & Parameter.Modifier.OUT) != 0) {
+					if ((ParameterInfo.ParameterModifier (i) & Parameter.Modifier.OUTMASK) != 0) {
 						Report.Error (685, Location, "Conditional method `{0}' cannot have an out parameter", GetSignatureForError ());
 						return;
 					}
diff --git a/mcs/gmcs/cs-tokenizer.cs b/mcs/gmcs/cs-tokenizer.cs
index 8a881750a2e..da63a863aa7 100644
--- a/mcs/gmcs/cs-tokenizer.cs
+++ b/mcs/gmcs/cs-tokenizer.cs
@@ -2500,7 +2500,7 @@ namespace Mono.CSharp
 				if ((state & REGION) != 0)
 					Report.Error (1038, Location, "#endregion directive expected");
 				else 
-					Report.Error (1027, "Expected `#endif' directive");
+					Report.Error (1027, Location, "Expected `#endif' directive");
 			}
 				
 		}
diff --git a/mcs/gmcs/doc.cs b/mcs/gmcs/doc.cs
index b8ddfa9ee20..a0c81d475da 100644
--- a/mcs/gmcs/doc.cs
+++ b/mcs/gmcs/doc.cs
@@ -381,22 +381,9 @@ namespace Mono.CSharp {
 		{
 			if (ml == null)
 				return empty_member_infos;
-			if (type.IsInterface)
-				return ml;
 
 			ArrayList al = new ArrayList (ml.Length);
 			for (int i = 0; i < ml.Length; i++) {
-				// Interface methods which are returned
-				// from the filter must exist in the 
-				// target type (if there is only a 
-				// private implementation, then the 
-				// filter should not return it.)
-				// This filtering is required to 
-				// deambiguate results.
-				//
-				// It is common to properties, so check it here.
-				if (ml [i].DeclaringType.IsInterface)
-					continue;
 				MethodBase mx = ml [i] as MethodBase;
 				PropertyInfo px = ml [i] as PropertyInfo;
 				if (mx != null || px != null) {
@@ -716,12 +703,6 @@ namespace Mono.CSharp {
 				return; // a type
 			}
 
-			// don't use identifier here. System[] is not alloed.
-			if (RootNamespace.Global.IsNamespace (name)) {
-				xref.SetAttribute ("cref", "N:" + name);
-				return; // a namespace
-			}
-
 			int period = name.LastIndexOf ('.');
 			if (period > 0) {
 				string typeName = name.Substring (0, period);
@@ -760,6 +741,17 @@ namespace Mono.CSharp {
 				}
 			}
 
+			// It still might be part of namespace name.
+			Namespace ns = ds.NamespaceEntry.NS.GetNamespace (name, false);
+			if (ns != null) {
+				xref.SetAttribute ("cref", "N:" + ns.FullName);
+				return; // a namespace
+			}
+			if (RootNamespace.Global.IsNamespace (name)) {
+				xref.SetAttribute ("cref", "N:" + name);
+				return; // a namespace
+			}
+
 			Report.Warning (1574, 1, mc.Location, "XML comment on `{0}' has cref attribute `{1}' that could not be resolved",
 				mc.GetSignatureForError (), cref);