Add libclang visitation for C99 designated initializers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113560 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 35e28ad..c899f5d 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -380,8 +380,8 @@
// FIXME: AddrLabelExpr (once we have cursors for labels)
bool VisitTypesCompatibleExpr(TypesCompatibleExpr *E);
bool VisitVAArgExpr(VAArgExpr *E);
- // FIXME: InitListExpr (for the designators)
- // FIXME: DesignatedInitExpr
+ bool VisitInitListExpr(InitListExpr *E);
+ bool VisitDesignatedInitExpr(DesignatedInitExpr *E);
bool VisitCXXTypeidExpr(CXXTypeidExpr *E);
bool VisitCXXUuidofExpr(CXXUuidofExpr *E);
bool VisitCXXDefaultArgExpr(CXXDefaultArgExpr *E) { return false; }
@@ -1652,6 +1652,42 @@
return Visit(MakeCXCursor(E->getSubExpr(), StmtParent, TU));
}
+bool CursorVisitor::VisitInitListExpr(InitListExpr *E) {
+ // We care about the syntactic form of the initializer list, only.
+ return VisitExpr(E->getSyntacticForm());
+}
+
+bool CursorVisitor::VisitDesignatedInitExpr(DesignatedInitExpr *E) {
+ // Visit the designators.
+ typedef DesignatedInitExpr::Designator Designator;
+ for (DesignatedInitExpr::designators_iterator D = E->designators_begin(),
+ DEnd = E->designators_end();
+ D != DEnd; ++D) {
+ if (D->isFieldDesignator()) {
+ if (FieldDecl *Field = D->getField())
+ if (Visit(MakeCursorMemberRef(Field, D->getFieldLoc(), TU)))
+ return true;
+
+ continue;
+ }
+
+ if (D->isArrayDesignator()) {
+ if (Visit(MakeCXCursor(E->getArrayIndex(*D), StmtParent, TU)))
+ return true;
+
+ continue;
+ }
+
+ assert(D->isArrayRangeDesignator() && "Unknown designator kind");
+ if (Visit(MakeCXCursor(E->getArrayRangeStart(*D), StmtParent, TU)) ||
+ Visit(MakeCXCursor(E->getArrayRangeEnd(*D), StmtParent, TU)))
+ return true;
+ }
+
+ // Visit the initializer value itself.
+ return Visit(MakeCXCursor(E->getInit(), StmtParent, TU));
+}
+
bool CursorVisitor::VisitCXXTypeidExpr(CXXTypeidExpr *E) {
if (E->isTypeOperand()) {
if (TypeSourceInfo *TSInfo = E->getTypeOperandSourceInfo())