Author: marek
Date: 2007-12-21 08:20:40 -0500 (Fri, 21 Dec 2007)
New Revision: 91759

Modified:
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/ecore.cs
Log:
2007-12-21  Marek Safar  <[EMAIL PROTECTED]>

        * ecore.cs: Use information about expanded params for error reporting.



Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2007-12-21 09:54:56 UTC (rev 91758)
+++ trunk/mcs/mcs/ChangeLog     2007-12-21 13:20:40 UTC (rev 91759)
@@ -1,5 +1,9 @@
 2007-12-21  Marek Safar  <[EMAIL PROTECTED]>
 
+       * ecore.cs: Use information about expanded params for error reporting.
+
+2007-12-21  Marek Safar  <[EMAIL PROTECTED]>
+
        * ecore.cs, generic.cs, delegate.cs: Refactoring of method overloading 
code
        and logic for params overloads.
        

Modified: trunk/mcs/mcs/ecore.cs
===================================================================
--- trunk/mcs/mcs/ecore.cs      2007-12-21 09:54:56 UTC (rev 91758)
+++ trunk/mcs/mcs/ecore.cs      2007-12-21 13:20:40 UTC (rev 91759)
@@ -3733,6 +3733,8 @@
                                        }
 
                                        pt = pd.ParameterType (i);
+                               } else {
+                                       params_expanded_form = true;
                                }
 
                                int score = 1;
@@ -3742,13 +3744,14 @@
                                if (score != 0 && (p_mod & 
Parameter.Modifier.PARAMS) != 0) {
                                        // It can be applicable in expanded form
                                        score = IsArgumentCompatible (ec, 
a_mod, a, 0, pt.GetElementType ());
-                                       params_expanded_form = true;
+                                       if (score == 0)
+                                               params_expanded_form = true;
                                }
 
                                if (score != 0)
                                        return (arg_count - i) * 2 + score;
                        }
-
+                       
                        if (arg_count != param_count)
                                params_expanded_form = true;                    
                        
@@ -4021,6 +4024,13 @@
                                        best_candidate_rate = candidate_rate;
                                        best_candidate = Methods [i];
                                }
+                               
+                               if (params_expanded_form) {
+                                       if (candidate_to_form == null)
+                                               candidate_to_form = new 
PtrHashtable ();
+                                       MethodBase candidate = Methods [i];
+                                       candidate_to_form [candidate] = 
candidate;
+                               }
 
                                if (candidate_rate != 0) {
                                        if (msg_recorder != null)
@@ -4029,14 +4039,6 @@
                                }
 
                                msg_recorder = null;
-
-                               if (params_expanded_form) {
-                                       if (candidate_to_form == null)
-                                               candidate_to_form = new 
PtrHashtable ();
-                                       MethodBase candidate = Methods [i];
-                                       candidate_to_form [candidate] = 
candidate;
-                               }
-
                                candidates.Add (Methods [i]);
 
                                if (applicable_type == null)
@@ -4100,8 +4102,9 @@
                                        }
                                        
                                        ParameterData pd = 
TypeManager.GetParameterData (best_candidate);
-                                       if (arg_count == pd.Count) {
-                                               if (VerifyArgumentsCompat (ec, 
Arguments, arg_count, best_candidate, false, may_fail, loc))
+                                       bool cand_params = candidate_to_form != 
null && candidate_to_form.Contains (best_candidate);
+                                       if (arg_count == pd.Count || 
pd.HasParams) {
+                                               if (VerifyArgumentsCompat (ec, 
Arguments, arg_count, best_candidate, cand_params, may_fail, loc))
                                                        throw new 
InternalErrorException ("Overload verification expected failure");
                                                return null;
                                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to