2005-07-05 Marek Safar <marek.safar@seznam.cz>

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

diff --git a/mcs/mcs/anonymous.cs b/mcs/mcs/anonymous.cs
index bd1b72ead460fb2b2636ad1aa622d79b376412f2..a8ee98135e432721b4f1359984a8a3a0fdbf654a 100644 (file)
--- a/mcs/mcs/anonymous.cs
+++ b/mcs/mcs/anonymous.cs
@@ -245,9 +245,8 @@ namespace Mono.CSharp {
                        
                        if (amp.Count != invoke_pd.Count){
                                if (!probe){
-                                       Report.Error (1593, loc, 
-                                             "Anonymous method has {0} parameters, while delegate requires {1}",
-                                             amp.Count, invoke_pd.Count);
+                                       Report.Error (1593, loc, "Delegate `{0}' does not take `{1}' arguments",
+                                               TypeManager.CSharpName (delegate_type), amp.Count);
                                        Error_ParameterMismatch (delegate_type);
                                }
                                return null;
@@ -256,33 +255,29 @@ namespace Mono.CSharp {
                        for (int i = 0; i < amp.Count; i++){
                                Parameter.Modifier amp_mod = amp.ParameterModifier (i);
 
-                               if ((amp_mod & (Parameter.Modifier.OUT | Parameter.Modifier.REF)) != 0){
-                                       if (!probe){
-                                               Error_ParameterMismatch (delegate_type);
-                                               Report.Error (1677, loc, "Parameter '{0}' should not be declared with the '{1}' keyword", 
+                               if (!probe) {
+                                       if ((amp_mod & (Parameter.Modifier.OUT | Parameter.Modifier.REF)) != 0){
+                                               Report.Error (1677, loc, "Parameter `{0}' should not be declared with the `{1}' keyword", 
                                                        i+1, amp.ModifierDesc (i));
+                                               Error_ParameterMismatch (delegate_type);
+                                               return null;
                                        }
-                                       return null;
-                               }
 
-                               if (amp_mod != invoke_pd.ParameterModifier (i)){
-                                       if (!probe){
-                                               Report.Error (1676, loc, 
-                                                     "Signature mismatch in parameter modifier for parameter #0", i + 1);
+                                       if (amp_mod != invoke_pd.ParameterModifier (i)){
+                                               Report.Error (1676, loc, "Parameter `{0}' must be declared with the `{1}' keyword",
+                                                       i+1, Parameter.GetModifierSignature (invoke_pd.ParameterModifier (i)));
                                                Error_ParameterMismatch (delegate_type);
+                                               return null;
                                        }
-                                       return null;
-                               }
                                
-                               if (amp.ParameterType (i) != invoke_pd.ParameterType (i)){
-                                       if (!probe){
-                                               Report.Error (1678, loc, 
-                                                                     "Signature mismatch in parameter {0}: need `{1}' got `{2}'", i + 1,
-                                                                     TypeManager.CSharpName (invoke_pd.ParameterType (i)),
-                                                                     TypeManager.CSharpName (amp.ParameterType (i)));
+                                       if (amp.ParameterType (i) != invoke_pd.ParameterType (i)){
+                                               Report.Error (1678, loc, "Parameter `{0}' is declared as type `{1}' but should be `{2}'",
+                                                       i+1,
+                                                       TypeManager.CSharpName (amp.ParameterType (i)),
+                                                       TypeManager.CSharpName (invoke_pd.ParameterType (i)));
                                                Error_ParameterMismatch (delegate_type);
+                                               return null;
                                        }
-                                       return null;
                                }
                        }
 
@@ -315,7 +310,7 @@ namespace Mono.CSharp {
                        ContainerAnonymousMethod = ec.CurrentAnonymousMethod;
                        ContainingBlock = ec.CurrentBlock;
 
-                       if (aec.ResolveTopBlock (ec, Block, amp, loc, out unreachable))
+                       if (aec.ResolveTopBlock (ec, Block, amp, null, out unreachable))
                                return new AnonymousDelegate (this, delegate_type, loc).Resolve (ec);
 
                        return null;
@@ -325,6 +320,12 @@ namespace Mono.CSharp {
                {
                        return method.MethodData.MethodBuilder;
                }
+
+               public override string GetSignatureForError ()
+               {
+                       string s = TypeManager.CSharpSignature (invoke_mb);
+                       return s.Substring (0, s.IndexOf (".Invoke("));
+               }
                
                public bool EmitMethod (EmitContext ec)
                {
@@ -375,7 +376,8 @@ namespace Mono.CSharp {
                public static void Error_AddressOfCapturedVar (string name, Location loc)
                {
                        Report.Error (1686, loc,
-                                     "Variable {0} is captured in an anonymous method and its address is also being taken: they are exclusive", name);
+                               "Local variable `{0}' or its members cannot have their address taken and be used inside an anonymous method block",
+                               name);
                }
        }