In gcc/objc/: 2010-12-08 Nicola Pero <nicola.pero@meta-innovation.com>

In gcc/objc/:
2010-12-08  Nicola Pero  <nicola.pero@meta-innovation.com>

	* objc-act.c (objc_finish_foreach_loop): Use error_at() instead of
	error() when printing an error about the iterating variable or
	collection not being an object.

In gcc/testsuite/:
2010-12-08  Nicola Pero  <nicola.pero@meta-innovation.com>

	* objc.dg/foreach-6.m: Updated location of error messages.
	* objc.dg/foreach-7.m: Same change.

From-SVN: r167610
This commit is contained in:
Nicola Pero 2010-12-08 23:20:21 +00:00 committed by Nicola Pero
parent fd66ea1a6f
commit 7c35d89dca
5 changed files with 22 additions and 11 deletions

View File

@ -1,3 +1,9 @@
2010-12-08 Nicola Pero <nicola.pero@meta-innovation.com>
* objc-act.c (objc_finish_foreach_loop): Use error_at() instead of
error() when printing an error about the iterating variable or
collection not being an object.
2010-12-06 Nicola Pero <nicola.pero@meta-innovation.com>
* objc-act.c (objc_finish_foreach_loop): Mark the

View File

@ -13246,13 +13246,13 @@ objc_finish_foreach_loop (location_t location, tree object_expression, tree coll
if (!objc_type_valid_for_messaging (TREE_TYPE (object_expression), true))
{
error ("iterating variable in fast enumeration is not an object");
error_at (location, "iterating variable in fast enumeration is not an object");
return;
}
if (!objc_type_valid_for_messaging (TREE_TYPE (collection_expression), true))
{
error ("collection in fast enumeration is not an object");
error_at (location, "collection in fast enumeration is not an object");
return;
}

View File

@ -1,3 +1,8 @@
2010-12-08 Nicola Pero <nicola.pero@meta-innovation.com>
* objc.dg/foreach-6.m: Updated location of error messages.
* objc.dg/foreach-7.m: Same change.
2010-12-08 Richard Guenther <rguenther@suse.de>
Sebastian Pop <sebastian.pop@amd.com>

View File

@ -46,16 +46,16 @@ int main (void)
;
for (12 in array) /* { dg-error "invalid iterating variable in fast enumeration" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" "" { target *-*-* } 48 } */
for (object in 12)
; /* { dg-error "collection in fast enumeration is not an object" } */
for (object in 12) /* { dg-error "collection in fast enumeration is not an object" } */
;
for (object in invalid)
; /* { dg-error "collection in fast enumeration is not an object" } */
for (object in invalid) /* { dg-error "collection in fast enumeration is not an object" } */
;
for (invalid in [object enumerator])
; /* { dg-error "iterating variable in fast enumeration is not an object" } */
for (invalid in [object enumerator]) /* { dg-error "iterating variable in fast enumeration is not an object" } */
;
return 0;
}

View File

@ -36,10 +36,10 @@ int main (void)
id object = nil;
for (typedef int my_typedef in array) /* { dg-error "declaration of non-variable" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" "" { target *-*-* } 38 } */
for (function () in nil) /* { dg-error "invalid iterating variable in fast enumeration" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" } */
; /* { dg-error "iterating variable in fast enumeration is not an object" "" { target *-*-* } 41 } */
for (object_function () in nil) /* { dg-error "invalid iterating variable in fast enumeration" } */
;