New declarations/defs for Objc2's foreach-statement. This is work in progress.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45511 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Stmt.cpp b/AST/Stmt.cpp
index 0d1ec03..95d077c 100644
--- a/AST/Stmt.cpp
+++ b/AST/Stmt.cpp
@@ -183,6 +183,14 @@
Stmt::child_iterator ForStmt::child_begin() { return &SubExprs[0]; }
Stmt::child_iterator ForStmt::child_end() { return &SubExprs[0]+END_EXPR; }
+// ObjcForCollectionStmt
+Stmt::child_iterator ObjcForCollectionStmt::child_begin() {
+ return &SubExprs[0];
+}
+Stmt::child_iterator ObjcForCollectionStmt::child_end() {
+ return &SubExprs[0]+END_EXPR;
+}
+
// GotoStmt
Stmt::child_iterator GotoStmt::child_begin() { return child_iterator(); }
Stmt::child_iterator GotoStmt::child_end() { return child_iterator(); }
diff --git a/AST/StmtPrinter.cpp b/AST/StmtPrinter.cpp
index fc28d06..099dd28 100644
--- a/AST/StmtPrinter.cpp
+++ b/AST/StmtPrinter.cpp
@@ -296,6 +296,25 @@
}
}
+void StmtPrinter::VisitObjcForCollectionStmt(ObjcForCollectionStmt *Node) {
+ Indent() << "for (";
+ if (DeclStmt *DS = dyn_cast<DeclStmt>(Node->getElement()))
+ PrintRawDecl(DS->getDecl());
+ else
+ PrintExpr(cast<Expr>(Node->getElement()));
+ OS << " in ";
+ PrintExpr(Node->getCollection());
+ OS << ") ";
+
+ if (CompoundStmt *CS = dyn_cast<CompoundStmt>(Node->getBody())) {
+ PrintRawCompoundStmt(CS);
+ OS << "\n";
+ } else {
+ OS << "\n";
+ PrintStmt(Node->getBody());
+ }
+}
+
void StmtPrinter::VisitGotoStmt(GotoStmt *Node) {
Indent() << "goto " << Node->getLabel()->getName() << ";\n";
}
diff --git a/AST/StmtSerialization.cpp b/AST/StmtSerialization.cpp
index d6f9dca..53dabbd 100644
--- a/AST/StmtSerialization.cpp
+++ b/AST/StmtSerialization.cpp
@@ -94,6 +94,9 @@
case ForStmtClass:
return ForStmt::CreateImpl(D);
+
+ case ObjcForCollectionStmtClass:
+ return ObjcForCollectionStmt::CreateImpl(D);
case GotoStmtClass:
return GotoStmt::CreateImpl(D);
@@ -560,6 +563,21 @@
return new ForStmt(Init,Cond,Inc,Body,ForLoc);
}
+void ObjcForCollectionStmt::EmitImpl(Serializer& S) const {
+ S.Emit(ForCollectionLoc);
+ S.EmitOwnedPtr(getElement());
+ S.EmitOwnedPtr(getCollection());
+ S.EmitOwnedPtr(getBody());
+}
+
+ObjcForCollectionStmt* ObjcForCollectionStmt::CreateImpl(Deserializer& D) {
+ SourceLocation ForCollectionLoc = SourceLocation::ReadVal(D);
+ Stmt* Element = D.ReadOwnedPtr<Stmt>();
+ Expr* Collection = D.ReadOwnedPtr<Expr>();
+ Stmt* Body = D.ReadOwnedPtr<Stmt>();
+ return new ObjcForCollectionStmt(Element,Collection,Body,ForCollectionLoc);
+}
+
void GotoStmt::EmitImpl(Serializer& S) const {
S.Emit(GotoLoc);
S.Emit(LabelLoc);