===================================================================
@@ -1,3 +1,11 @@
+2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ * c-typeck.c (convert_arguments): Use warning 'too many arguments
+ to method [methodname]' for an Objective-C method instead of the
+ less satisfactory 'too many arguments to function' (with no method
+ name).
+ * cp/typeck.c (warn_args_num): Same change for Objective-C++.
+
2010-09-10 Jan Hubicka <jh@suse.cz>
* tree-ssa-ccp.c (fold_const_aggregate_ref): Do not check STATIC flag.
===================================================================
@@ -1,3 +1,16 @@
+2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ * obj-c++.dg/too-many-args.mm: New file.
+
+2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ Merge from 'apple/trunk' branch on FSF servers.
+
+ 2006-03-27 Fariborz Jahanian <fjahanian@apple.com>
+
+ Radar 4491608
+ * objc.dg/too-many-args.m: New
+
2010-09-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
* gfortran.dg/promotion.f90: Fix options.
===================================================================
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+@interface SomeClass
++ method:(int)foo;
+@end
+
+int main(void) {
+ [SomeClass method:3, 4]; /* { dg-error "too many arguments to method \\'method:\\'" } */
+ return 0;
+}
===================================================================
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+@interface SomeClass
++ method:(int)foo;
+@end
+
+int main(void) {
+ [SomeClass method:3, 4]; /* { dg-error "too many arguments to method \\'method:\\'" } */
+ return 0;
+}
===================================================================
@@ -3428,8 +3428,17 @@ warn_args_num (location_t loc, tree fnde
"declared here");
}
else
- error_at (loc, too_many_p ? G_("too many arguments to function")
- : G_("too few arguments to function"));
+ {
+ if (c_dialect_objc () && objc_message_selector ())
+ error_at (loc,
+ too_many_p
+ ? G_("too many arguments to method %q#D")
+ : G_("too few arguments to method %q#D"),
+ objc_message_selector ());
+ else
+ error_at (loc, too_many_p ? G_("too many arguments to function")
+ : G_("too few arguments to function"));
+ }
}
/* Convert the actual parameter expressions in the list VALUES to the
===================================================================
@@ -2897,8 +2897,13 @@ convert_arguments (tree typelist, VEC(tr
if (type == void_type_node)
{
- error_at (input_location,
- "too many arguments to function %qE", function);
+ if (selector)
+ error_at (input_location,
+ "too many arguments to method %qE", selector);
+ else
+ error_at (input_location,
+ "too many arguments to function %qE", function);
+
if (fundecl && !DECL_BUILT_IN (fundecl))
inform (DECL_SOURCE_LOCATION (fundecl), "declared here");
return parmnum;