Author: Zixu Wang Date: 2022-03-16T16:04:44-07:00 New Revision: fa331da8fb7ea915d29e0834c7acc7a01eccb4e6
URL: https://github.com/llvm/llvm-project/commit/fa331da8fb7ea915d29e0834c7acc7a01eccb4e6 DIFF: https://github.com/llvm/llvm-project/commit/fa331da8fb7ea915d29e0834c7acc7a01eccb4e6.diff LOG: [FIX][clang-extract-api] Fix scope naming violation Added: Modified: clang/include/clang/SymbolGraph/API.h clang/include/clang/SymbolGraph/Serialization.h clang/lib/SymbolGraph/API.cpp clang/lib/SymbolGraph/ExtractAPIConsumer.cpp Removed: ################################################################################ diff --git a/clang/include/clang/SymbolGraph/API.h b/clang/include/clang/SymbolGraph/API.h index 39cc7a699ed86..541673f36b223 100644 --- a/clang/include/clang/SymbolGraph/API.h +++ b/clang/include/clang/SymbolGraph/API.h @@ -88,9 +88,9 @@ struct GlobalRecord : APIRecord { } }; -class API { +class APISet { public: - API(const llvm::Triple &Target, const LangOptions &LangOpts) + APISet(const llvm::Triple &Target, const LangOptions &LangOpts) : Target(Target), LangOpts(LangOpts) {} const llvm::Triple &getTarget() const { return Target; } diff --git a/clang/include/clang/SymbolGraph/Serialization.h b/clang/include/clang/SymbolGraph/Serialization.h index 335f5f779314a..6452f6e93750b 100644 --- a/clang/include/clang/SymbolGraph/Serialization.h +++ b/clang/include/clang/SymbolGraph/Serialization.h @@ -30,7 +30,7 @@ struct SerializerOption { class Serializer { public: - Serializer(const API &API, SerializerOption Options = {}) + Serializer(const APISet &API, SerializerOption Options = {}) : API(API), Options(Options) {} Object serialize(); @@ -44,7 +44,7 @@ class Serializer { bool shouldSkip(const APIRecord &Record) const; - const API &API; + const APISet &API; SerializerOption Options; Array Symbols; Array Relationships; diff --git a/clang/lib/SymbolGraph/API.cpp b/clang/lib/SymbolGraph/API.cpp index a4e0e219d4d33..4066428c97fc9 100644 --- a/clang/lib/SymbolGraph/API.cpp +++ b/clang/lib/SymbolGraph/API.cpp @@ -23,11 +23,13 @@ namespace symbolgraph { APIRecord::~APIRecord() {} -GlobalRecord * -API::addGlobal(GVKind Kind, StringRef Name, StringRef USR, PresumedLoc Loc, - const AvailabilityInfo &Availability, LinkageInfo Linkage, - const DocComment &Comment, DeclarationFragments Fragments, - DeclarationFragments SubHeading, FunctionSignature Signature) { +GlobalRecord *APISet::addGlobal(GVKind Kind, StringRef Name, StringRef USR, + PresumedLoc Loc, + const AvailabilityInfo &Availability, + LinkageInfo Linkage, const DocComment &Comment, + DeclarationFragments Fragments, + DeclarationFragments SubHeading, + FunctionSignature Signature) { auto Result = Globals.insert({Name, nullptr}); if (Result.second) { GlobalRecord *Record = new (Allocator) @@ -38,32 +40,33 @@ API::addGlobal(GVKind Kind, StringRef Name, StringRef USR, PresumedLoc Loc, return Result.first->second; } -GlobalRecord *API::addGlobalVar(StringRef Name, StringRef USR, PresumedLoc Loc, - const AvailabilityInfo &Availability, - LinkageInfo Linkage, const DocComment &Comment, - DeclarationFragments Fragments, - DeclarationFragments SubHeading) { +GlobalRecord * +APISet::addGlobalVar(StringRef Name, StringRef USR, PresumedLoc Loc, + const AvailabilityInfo &Availability, LinkageInfo Linkage, + const DocComment &Comment, DeclarationFragments Fragments, + DeclarationFragments SubHeading) { return addGlobal(GVKind::Variable, Name, USR, Loc, Availability, Linkage, Comment, Fragments, SubHeading, {}); } -GlobalRecord *API::addFunction(StringRef Name, StringRef USR, PresumedLoc Loc, - const AvailabilityInfo &Availability, - LinkageInfo Linkage, const DocComment &Comment, - DeclarationFragments Fragments, - DeclarationFragments SubHeading, - FunctionSignature Signature) { +GlobalRecord * +APISet::addFunction(StringRef Name, StringRef USR, PresumedLoc Loc, + const AvailabilityInfo &Availability, LinkageInfo Linkage, + const DocComment &Comment, DeclarationFragments Fragments, + DeclarationFragments SubHeading, + FunctionSignature Signature) { return addGlobal(GVKind::Function, Name, USR, Loc, Availability, Linkage, Comment, Fragments, SubHeading, Signature); } -StringRef API::recordUSR(const Decl *D) { +StringRef APISet::recordUSR(const Decl *D) { SmallString<128> USR; index::generateUSRForDecl(D, USR); return copyString(USR); } -StringRef API::copyString(StringRef String, llvm::BumpPtrAllocator &Allocator) { +StringRef APISet::copyString(StringRef String, + llvm::BumpPtrAllocator &Allocator) { if (String.empty()) return {}; @@ -75,7 +78,7 @@ StringRef API::copyString(StringRef String, llvm::BumpPtrAllocator &Allocator) { return StringRef(reinterpret_cast<const char *>(Ptr), String.size()); } -StringRef API::copyString(StringRef String) { +StringRef APISet::copyString(StringRef String) { return copyString(String, Allocator); } diff --git a/clang/lib/SymbolGraph/ExtractAPIConsumer.cpp b/clang/lib/SymbolGraph/ExtractAPIConsumer.cpp index 45943c09938f4..1675045400692 100644 --- a/clang/lib/SymbolGraph/ExtractAPIConsumer.cpp +++ b/clang/lib/SymbolGraph/ExtractAPIConsumer.cpp @@ -39,7 +39,7 @@ class ExtractAPIVisitor : public RecursiveASTVisitor<ExtractAPIVisitor> { : Context(Context), API(Context.getTargetInfo().getTriple(), Context.getLangOpts()) {} - const API &getAPI() const { return API; } + const APISet &getAPI() const { return API; } bool VisitVarDecl(const VarDecl *Decl) { // Skip function parameters. @@ -165,7 +165,7 @@ class ExtractAPIVisitor : public RecursiveASTVisitor<ExtractAPIVisitor> { } ASTContext &Context; - API API; + APISet API; }; class ExtractAPIConsumer : public ASTConsumer { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits