This is an archive of the discontinued LLVM Phabricator instance.

Differential D154038

[clang][ExtractAPI] Add semicolons to vars and fields and to test reference JSON
ClosedPublic

Authored by evelez7 on Jun 28 2023, 7:28 PM.

Details

Reviewers
ributzka
dang
Commits
rG422bcd10c48b: [clang][ExtractAPI] Add semicolons to vars and fields and to test reference JSON

Diff Detail

Event Timeline

evelez7 created this revision.Jun 28 2023, 7:28 PM
Herald added a reviewer: ributzka. · View Herald TranscriptJun 28 2023, 7:28 PM
Herald added a project: Restricted Project. · View Herald Transcript
evelez7 requested review of this revision.Jun 28 2023, 7:28 PM
Herald added a reviewer: dang. · View Herald TranscriptJun 28 2023, 7:28 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B241958: Diff 535605.Jun 28 2023, 7:29 PM
evelez7 added a comment.EditedJun 28 2023, 7:41 PM

These updated tests pass locally for me, not sure why the build test failed.

evelez7 mentioned this in D153557: [clang][ExtractAPI] Add support for C++ classes.Jun 29 2023, 5:58 PM
dang added inline comments.Jun 30 2023, 1:59 AM
clang/lib/ExtractAPI/DeclarationFragments.cpp
437

Should this be after the line below?

evelez7 updated this revision to Diff 536245.Jun 30 2023, 7:45 AM
evelez7 marked an inline comment as done.

Move semicolon line below After fragment

Harbormaster completed remote builds in B242423: Diff 536245.Jun 30 2023, 7:46 AM
dang accepted this revision.Jul 31 2023, 6:29 AM

LGTM!

This revision is now accepted and ready to land.Jul 31 2023, 6:29 AM
This revision was landed with ongoing or failed builds.Jul 31 2023, 11:29 PM
Closed by commit rG422bcd10c48b: [clang][ExtractAPI] Add semicolons to vars and fields and to test reference JSON (authored by evelez7). · Explain Why
This revision was automatically updated to reflect the committed changes.
evelez7 added a commit: rG422bcd10c48b: [clang][ExtractAPI] Add semicolons to vars and fields and to test reference JSON.

Revision Contents

Diff 536245

clang/lib/ExtractAPI/DeclarationFragments.cpp

Show First 20 Lines • Show All 428 Lines • ▼ Show 20 LinesDeclarationFragmentsBuilder::getFragmentsForVar(const VarDecl *Var) {
// ``` // ```
// int nums[5]; // int nums[5];
// char (*ptr_to_array)[6]; // char (*ptr_to_array)[6];
// ``` // ```
DeclarationFragments After; DeclarationFragments After;
return Fragments.append(getFragmentsForType(T, Var->getASTContext(), After)) return Fragments.append(getFragmentsForType(T, Var->getASTContext(), After))
.appendSpace() .appendSpace()
.append(Var->getName(), DeclarationFragments::FragmentKind::Identifier) .append(Var->getName(), DeclarationFragments::FragmentKind::Identifier)
.append(std::move(After)); .append(std::move(After))
dangUnsubmitted
Done
ReplyInline Actions

Should this be after the line below?

dang: Should this be after the line below?
.append(";", DeclarationFragments::FragmentKind::Text);
} }
DeclarationFragments DeclarationFragments
DeclarationFragmentsBuilder::getFragmentsForParam(const ParmVarDecl *Param) { DeclarationFragmentsBuilder::getFragmentsForParam(const ParmVarDecl *Param) {
DeclarationFragments Fragments, After; DeclarationFragments Fragments, After;
QualType T = Param->getTypeSourceInfo() QualType T = Param->getTypeSourceInfo()
? Param->getTypeSourceInfo()->getType() ? Param->getTypeSourceInfo()->getType()
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 LinesDeclarationFragmentsBuilder::getFragmentsForField(const FieldDecl *Field) {
DeclarationFragments Fragments; DeclarationFragments Fragments;
if (Field->isMutable()) if (Field->isMutable())
Fragments.append("mutable ", DeclarationFragments::FragmentKind::Keyword); Fragments.append("mutable ", DeclarationFragments::FragmentKind::Keyword);
return Fragments return Fragments
.append( .append(
getFragmentsForType(Field->getType(), Field->getASTContext(), After)) getFragmentsForType(Field->getType(), Field->getASTContext(), After))
.appendSpace() .appendSpace()
.append(Field->getName(), DeclarationFragments::FragmentKind::Identifier) .append(Field->getName(), DeclarationFragments::FragmentKind::Identifier)
.append(std::move(After)); .append(std::move(After))
.append(";", DeclarationFragments::FragmentKind::Text);
} }
DeclarationFragments DeclarationFragments
DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) { DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) {
if (const auto *TypedefNameDecl = Record->getTypedefNameForAnonDecl()) if (const auto *TypedefNameDecl = Record->getTypedefNameForAnonDecl())
return getFragmentsForTypedef(TypedefNameDecl); return getFragmentsForTypedef(TypedefNameDecl);
DeclarationFragments Fragments; DeclarationFragments Fragments;
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines

clang/test/ExtractAPI/anonymous_record_no_typedef.c

Show First 20 Lines • Show All 310 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "type" "spelling": "type"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Vehicle@FI@type" "precise": "c:@S@Vehicle@FI@type"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
Show All 35 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "information" "spelling": "information"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Vehicle@FI@information" "precise": "c:@S@Vehicle@FI@information"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
Show All 31 Lines

clang/test/ExtractAPI/global_record.c

Show First 20 Lines • Show All 62 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "num" "spelling": "num"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@num" "precise": "c:@num"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines

clang/test/ExtractAPI/global_record_multifile.c

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "num" "spelling": "num"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@num" "precise": "c:@num"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines

clang/test/ExtractAPI/known_files_only.c

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "num" "spelling": "num"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@num" "precise": "c:@num"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
Show All 30 Lines

clang/test/ExtractAPI/language.c

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "c" "spelling": "c"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@c" "precise": "c:@c"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "objc" "spelling": "objc"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:@objc" "precise": "c:@objc"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
Show All 30 Lines

clang/test/ExtractAPI/objc_interface.m

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Ivar" "spelling": "Ivar"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:objc(cs)Derived@Ivar" "precise": "c:objc(cs)Derived@Ivar"
}, },
"kind": { "kind": {
"displayName": "Instance Variable", "displayName": "Instance Variable",
▲ Show 20 Lines • Show All 104 Lines • Show Last 20 Lines

clang/test/ExtractAPI/relative_include.m

Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyInt" "spelling": "MyInt"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:@MyInt" "precise": "c:@MyInt"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
Show All 35 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyChar" "spelling": "MyChar"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:@MyChar" "precise": "c:@MyChar"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
Show All 30 Lines

clang/test/ExtractAPI/struct.c

Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Red" "spelling": "Red"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Color@FI@Red" "precise": "c:@S@Color@FI@Red"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
Show All 36 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Green" "spelling": "Green"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Color@FI@Green" "precise": "c:@S@Color@FI@Green"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
Show All 36 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Blue" "spelling": "Blue"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Color@FI@Blue" "precise": "c:@S@Color@FI@Blue"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
Show All 36 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Alpha" "spelling": "Alpha"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"docComment": { "docComment": {
"lines": [ "lines": [
{ {
"range": { "range": {
"end": { "end": {
"character": 37, "character": 37,
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

clang/test/ExtractAPI/typedef_struct_enum.c

Show First 20 Lines • Show All 322 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "bar" "spelling": "bar"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@Foo@FI@bar" "precise": "c:@S@Foo@FI@bar"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines

clang/test/ExtractAPI/underscored.c

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "exposed_global" "spelling": "exposed_global"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@exposed_global" "precise": "c:@exposed_global"
}, },
"kind": { "kind": {
"displayName": "Global Variable", "displayName": "Global Variable",
▲ Show 20 Lines • Show All 89 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "a" "spelling": "a"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@S@ExposedRecord@FI@a" "precise": "c:@S@ExposedRecord@FI@a"
}, },
"kind": { "kind": {
"displayName": "Instance Property", "displayName": "Instance Property",
▲ Show 20 Lines • Show All 209 Lines • Show Last 20 Lines