Ruturaj4 updated this revision to Diff 508375.
Ruturaj4 added a comment.
1. Updating D146385 <https://reviews.llvm.org/D146385>: [clang][ExtractAPI]
Complete declaration fragments for TagDecl types defined in a typedef #
2. Enter a brief description of the changes included in this update.
3. The first line is used as subject, next lines as comment. #
4. If you intended to create a new revision, use:
5. $ arc diff --create
Made all updates as you requested, though I didn't need to generate fragments
for the underlying Decl. I added an example as you have recommended.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D146385/new/
https://reviews.llvm.org/D146385
Files:
clang/include/clang/ExtractAPI/DeclarationFragments.h
clang/lib/ExtractAPI/ExtractAPIVisitor.cpp
clang/test/ExtractAPI/typedef_struct_enum.c
Index: clang/test/ExtractAPI/typedef_struct_enum.c
===================================================================
--- clang/test/ExtractAPI/typedef_struct_enum.c
+++ clang/test/ExtractAPI/typedef_struct_enum.c
@@ -21,6 +21,12 @@
simple
} Test2;
+struct Foo;
+typedef struct Foo TypedefedFoo;
+struct Foo {
+ int bar;
+};
+
//--- reference.output.json.in
{
"metadata": {
@@ -36,6 +42,11 @@
"platform": {
"architecture": "arm64",
"operatingSystem": {
+ "minimumVersion": {
+ "major": 11,
+ "minor": 0,
+ "patch": 0
+ },
"name": "macosx"
},
"vendor": "apple"
@@ -47,6 +58,12 @@
"source": "c:@E@Test2@simple",
"target": "c:@E@Test2",
"targetFallback": "Test2"
+ },
+ {
+ "kind": "memberOf",
+ "source": "c:@S@Foo@FI@bar",
+ "target": "c:@S@Foo",
+ "targetFallback": "Foo"
}
],
"symbols": [
@@ -82,6 +99,14 @@
"preciseIdentifier": "c:i",
"spelling": "unsigned int"
},
+ {
+ "kind": "text",
+ "spelling": " { ... } "
+ },
+ {
+ "kind": "identifier",
+ "spelling": "Test2"
+ },
{
"kind": "text",
"spelling": ";"
@@ -187,6 +212,14 @@
"kind": "identifier",
"spelling": "Test"
},
+ {
+ "kind": "text",
+ "spelling": " { ... } "
+ },
+ {
+ "kind": "identifier",
+ "spelling": "Test"
+ },
{
"kind": "text",
"spelling": ";"
@@ -225,6 +258,184 @@
"pathComponents": [
"Test"
]
+ },
+ {
+ "accessLevel": "public",
+ "declarationFragments": [
+ {
+ "kind": "keyword",
+ "spelling": "struct"
+ },
+ {
+ "kind": "text",
+ "spelling": " "
+ },
+ {
+ "kind": "identifier",
+ "spelling": "Foo"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
+ }
+ ],
+ "identifier": {
+ "interfaceLanguage": "c",
+ "precise": "c:@S@Foo"
+ },
+ "kind": {
+ "displayName": "Structure",
+ "identifier": "c.struct"
+ },
+ "location": {
+ "position": {
+ "character": 8,
+ "line": 10
+ },
+ "uri": "file://INPUT_DIR/input.h"
+ },
+ "names": {
+ "navigator": [
+ {
+ "kind": "identifier",
+ "spelling": "Foo"
+ }
+ ],
+ "subHeading": [
+ {
+ "kind": "identifier",
+ "spelling": "Foo"
+ }
+ ],
+ "title": "Foo"
+ },
+ "pathComponents": [
+ "Foo"
+ ]
+ },
+ {
+ "accessLevel": "public",
+ "declarationFragments": [
+ {
+ "kind": "typeIdentifier",
+ "preciseIdentifier": "c:I",
+ "spelling": "int"
+ },
+ {
+ "kind": "text",
+ "spelling": " "
+ },
+ {
+ "kind": "identifier",
+ "spelling": "bar"
+ }
+ ],
+ "identifier": {
+ "interfaceLanguage": "c",
+ "precise": "c:@S@Foo@FI@bar"
+ },
+ "kind": {
+ "displayName": "Instance Property",
+ "identifier": "c.property"
+ },
+ "location": {
+ "position": {
+ "character": 9,
+ "line": 11
+ },
+ "uri": "file://INPUT_DIR/input.h"
+ },
+ "names": {
+ "navigator": [
+ {
+ "kind": "identifier",
+ "spelling": "bar"
+ }
+ ],
+ "subHeading": [
+ {
+ "kind": "identifier",
+ "spelling": "bar"
+ }
+ ],
+ "title": "bar"
+ },
+ "pathComponents": [
+ "Foo",
+ "bar"
+ ]
+ },
+ {
+ "accessLevel": "public",
+ "declarationFragments": [
+ {
+ "kind": "keyword",
+ "spelling": "typedef"
+ },
+ {
+ "kind": "text",
+ "spelling": " "
+ },
+ {
+ "kind": "keyword",
+ "spelling": "struct"
+ },
+ {
+ "kind": "text",
+ "spelling": " "
+ },
+ {
+ "kind": "typeIdentifier",
+ "preciseIdentifier": "c:@S@Foo",
+ "spelling": "Foo"
+ },
+ {
+ "kind": "text",
+ "spelling": " "
+ },
+ {
+ "kind": "identifier",
+ "spelling": "TypedefedFoo"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
+ }
+ ],
+ "identifier": {
+ "interfaceLanguage": "c",
+ "precise": "c:input.h@T@TypedefedFoo"
+ },
+ "kind": {
+ "displayName": "Type Alias",
+ "identifier": "c.typealias"
+ },
+ "location": {
+ "position": {
+ "character": 20,
+ "line": 9
+ },
+ "uri": "file://INPUT_DIR/input.h"
+ },
+ "names": {
+ "navigator": [
+ {
+ "kind": "identifier",
+ "spelling": "TypedefedFoo"
+ }
+ ],
+ "subHeading": [
+ {
+ "kind": "identifier",
+ "spelling": "TypedefedFoo"
+ }
+ ],
+ "title": "TypedefedFoo"
+ },
+ "pathComponents": [
+ "TypedefedFoo"
+ ],
+ "type": "c:@S@Foo"
}
]
}
Index: clang/lib/ExtractAPI/ExtractAPIVisitor.cpp
===================================================================
--- clang/lib/ExtractAPI/ExtractAPIVisitor.cpp
+++ clang/lib/ExtractAPI/ExtractAPIVisitor.cpp
@@ -48,6 +48,24 @@
return Context.getSourceManager().isInSystemHeader(D->getLocation());
}
+template <typename T>
+void modifyRecord(const T &Records, const llvm::StringRef &name) {
+ for (const auto &Record : Records) {
+ if (name == Record.second.get()->Name) {
+ Record.second.get()->Declaration.removeLast();
+ Record.second.get()
+ ->Declaration
+ .appendFront(" ", DeclarationFragments::FragmentKind::Text)
+ .appendFront("typedef", DeclarationFragments::FragmentKind::Keyword,
+ "", nullptr)
+ .append(" { ... } ", DeclarationFragments::FragmentKind::Text)
+ .append(name, DeclarationFragments::FragmentKind::Identifier)
+ .append(";", DeclarationFragments::FragmentKind::Text);
+ break;
+ }
+ }
+}
+
} // namespace
bool ExtractAPIVisitor::VisitVarDecl(const VarDecl *Decl) {
@@ -344,30 +362,10 @@
if (const TagType *TagTy = dyn_cast<TagType>(ET->desugar())) {
if (Decl->getName() == TagTy->getDecl()->getName()) {
if (TagTy->getDecl()->isStruct()) {
- for (const auto &Struct : API.getStructs()) {
- if (Decl->getName() == Struct.second.get()->Name) {
- Struct.second.get()
- ->Declaration
- .appendFront(" ", DeclarationFragments::FragmentKind::Text)
- .appendFront("typedef",
- DeclarationFragments::FragmentKind::Keyword, "",
- nullptr);
- break;
- }
- }
+ modifyRecord(API.getStructs(), Decl->getName());
}
if (TagTy->getDecl()->isEnum()) {
- for (const auto &Enum : API.getEnums()) {
- if (Decl->getName() == Enum.second.get()->Name) {
- Enum.second.get()
- ->Declaration
- .appendFront(" ", DeclarationFragments::FragmentKind::Text)
- .appendFront("typedef",
- DeclarationFragments::FragmentKind::Keyword, "",
- nullptr);
- break;
- }
- }
+ modifyRecord(API.getEnums(), Decl->getName());
}
}
}
Index: clang/include/clang/ExtractAPI/DeclarationFragments.h
===================================================================
--- clang/include/clang/ExtractAPI/DeclarationFragments.h
+++ clang/include/clang/ExtractAPI/DeclarationFragments.h
@@ -116,6 +116,8 @@
return *this;
}
+ void removeLast() { Fragments.pop_back(); }
+
/// Append a new Fragment to the end of the Fragments.
///
/// \returns a reference to the DeclarationFragments object itself after
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
