Nothing to see here

[mono.git] / mcs / mcs / typemanager.cs

diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
index bae1f15db52ffc3a7a4bb686923e179e4b8ebb9c..4ee2508abedac106cabb08e1ba73a8e4b8246767 100644 (file)
--- a/mcs/mcs/typemanager.cs
+++ b/mcs/mcs/typemanager.cs
@@ -600,8 +600,11 @@ namespace Mono.CSharp {
                if (t == typeof (AnonymousMethodBody))
                        return "anonymous method";
 
+               if (t == null)
+                       return "internal error";
+
                return CSharpName (GetFullName (t));
-    }
+       }
 
        static readonly char [] elements = new char [] { '*', '[' };
 
@@ -770,8 +773,14 @@ namespace Mono.CSharp {
                if (!mb.IsConstructor && TypeManager.IsSpecialMethod (mb)) {
                        string op_name = Operator.GetName (mb.Name);
                        if (op_name != null) {
-                               sig.Append ("operator ");
-                               sig.Append (op_name);
+                               if (op_name == "explicit" || op_name == "implicit") {
+                                       sig.Append (op_name);
+                                       sig.Append (" operator ");
+                                       sig.Append (CSharpName (((MethodInfo)mb).ReturnType));
+                               } else {
+                                       sig.Append ("operator ");
+                                       sig.Append (op_name);
+                               }
                                sig.Append (parameters);
                                return sig.ToString ();
                        }
@@ -1079,7 +1088,7 @@ namespace Mono.CSharp {
                if (obsolete_attribute_type != null) {
                        Class c = TypeManager.LookupClass (obsolete_attribute_type);
                        if (c != null)
-                               c.DefineMembers ();
+                               c.Define ();
                }
 
                dllimport_type = CoreLookupType ("System.Runtime.InteropServices", "DllImportAttribute", Kind.Class, false);
@@ -1693,10 +1702,9 @@ namespace Mono.CSharp {
 
        static void Error_FriendAccessNameNotMatching (string other_name)
        {
-               Report.Error (281, "Friend access was granted to `" + other_name + 
-                               "', but the output assembly is named `" + CodeGen.Assembly.Name.FullName +
-                               "'. Try adding a reference to `" + other_name + 
-                               "' or change the output assembly name to match it");
+               Report.Error (281,
+                       "Friend access was granted to `{0}', but the output assembly is named `{1}'. Try adding a reference to `{0}' or change the output assembly name to match it",
+                       other_name, CodeGen.Assembly.Name.FullName);
        }
 #endif