[cfe-commits] r159847 - in /cfe/trunk: lib/Sema/SemaStmt.cpp test/SemaObjCXX/foreach.mm
Fariborz Jahanian
fjahanian at apple.com
Fri Jul 6 12:04:04 PDT 2012
Author: fjahanian
Date: Fri Jul 6 14:04:04 2012
New Revision: 159847
URL: http://llvm.org/viewvc/llvm-project?rev=159847&view=rev
Log:
objective-c++11: extend c++11 range-based loop to iterate
over objective-c container collection. // rdar://9293227
Added:
cfe/trunk/test/SemaObjCXX/foreach.mm
Modified:
cfe/trunk/lib/Sema/SemaStmt.cpp
Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=159847&r1=159846&r2=159847&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Fri Jul 6 14:04:04 2012
@@ -1634,6 +1634,11 @@
}
+static bool ObjCEnumerationCollection(Expr *Collection) {
+ return !Collection->isTypeDependent()
+ && Collection->getType()->getAs<ObjCObjectPointerType>() != 0;
+}
+
/// ActOnCXXForRangeStmt - Check and build a C++0x for-range statement.
///
/// C++0x [stmt.ranged]:
@@ -1658,6 +1663,10 @@
SourceLocation RParenLoc) {
if (!First || !Range)
return StmtError();
+
+ if (ObjCEnumerationCollection(Range))
+ return ActOnObjCForCollectionStmt(ForLoc, LParenLoc, First, Range,
+ RParenLoc);
DeclStmt *DS = dyn_cast<DeclStmt>(First);
assert(DS && "first part of for range not a decl stmt");
@@ -1928,6 +1937,9 @@
if (!S || !B)
return StmtError();
+ if (isa<ObjCForCollectionStmt>(S))
+ return FinishObjCForCollectionStmt(S, B);
+
CXXForRangeStmt *ForStmt = cast<CXXForRangeStmt>(S);
ForStmt->setBody(B);
Added: cfe/trunk/test/SemaObjCXX/foreach.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/foreach.mm?rev=159847&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjCXX/foreach.mm (added)
+++ cfe/trunk/test/SemaObjCXX/foreach.mm Fri Jul 6 14:04:04 2012
@@ -0,0 +1,61 @@
+// RUN: %clang_cc1 -fsyntax-only -fblocks -verify -std=c++11 %s
+// rdar://9293227
+
+ at class NSArray;
+
+void f(NSArray *a) {
+ id keys;
+ for (int i : a); // expected-error{{selector element type 'int' is not a valid object}}
+ for ((id)2 : a); // expected-error {{for range declaration must declare a variable}} \
+ // expected-warning {{expression result unused}}
+ for (2 : a); // expected-error {{for range declaration must declare a variable}} \
+ // expected-warning {{expression result unused}}
+
+ for (id thisKey : keys);
+}
+
+/* // rdar://9072298 */
+ at protocol NSObject @end
+
+ at interface NSObject <NSObject> {
+ Class isa;
+}
+ at end
+
+typedef struct {
+ unsigned long state;
+ id *itemsPtr;
+ unsigned long *mutationsPtr;
+ unsigned long extra[5];
+} NSFastEnumerationState;
+
+ at protocol NSFastEnumeration
+
+- (unsigned long)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(unsigned long)len;
+
+ at end
+
+int main ()
+{
+ NSObject<NSFastEnumeration>* collection = 0;
+ for (id thing : collection) { }
+
+ id array;
+ for (int (^b)(void) : array) {
+ if (b() == 10000) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+/* rdar://problem/11068137 */
+ at interface Test2
+ at property (assign) id prop;
+ at end
+void test2(NSObject<NSFastEnumeration> *collection) {
+ Test2 *obj;
+ for (obj.prop : collection) { // expected-error {{for range declaration must declare a variable}} \
+ // expected-warning {{property access result unused - getters should not be used for side effects}}
+ }
+}
More information about the cfe-commits
mailing list