From ab56cf89142d84add96236dc71a405f1b95b9e1e Mon Sep 17 00:00:00 2001 From: Francis Visoiu Mistrih Date: Thu, 25 Jul 2019 00:16:56 +0000 Subject: [PATCH] [Remarks][NFC] Rename remarks::Parser to remarks::RemarkParser llvm-svn: 366965 --- llvm/include/llvm/Remarks/RemarkParser.h | 16 ++++++++-------- llvm/lib/Remarks/RemarkParser.cpp | 8 ++++---- llvm/lib/Remarks/YAMLRemarkParser.cpp | 2 +- llvm/lib/Remarks/YAMLRemarkParser.h | 6 +++--- llvm/tools/llvm-opt-report/OptReport.cpp | 4 ++-- llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp | 20 ++++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/llvm/include/llvm/Remarks/RemarkParser.h b/llvm/include/llvm/Remarks/RemarkParser.h index f53c04d..f736712 100644 --- a/llvm/include/llvm/Remarks/RemarkParser.h +++ b/llvm/include/llvm/Remarks/RemarkParser.h @@ -36,11 +36,11 @@ public: }; /// Parser used to parse a raw buffer to remarks::Remark objects. -struct Parser { +struct RemarkParser { /// The format of the parser. Format ParserFormat; - Parser(Format ParserFormat) : ParserFormat(ParserFormat) {} + RemarkParser(Format ParserFormat) : ParserFormat(ParserFormat) {} /// If no error occurs, this returns a valid Remark object. /// If an error of type EndOfFileError occurs, it is safe to recover from it @@ -49,7 +49,7 @@ struct Parser { /// The pointer should never be null. virtual Expected> next() = 0; - virtual ~Parser() = default; + virtual ~RemarkParser() = default; }; /// In-memory representation of the string table parsed from a buffer (e.g. the @@ -73,12 +73,12 @@ struct ParsedStringTable { Expected operator[](size_t Index) const; }; -Expected> createRemarkParser(Format ParserFormat, - StringRef Buf); +Expected> createRemarkParser(Format ParserFormat, + StringRef Buf); -Expected> createRemarkParser(Format ParserFormat, - StringRef Buf, - ParsedStringTable StrTab); +Expected> +createRemarkParser(Format ParserFormat, StringRef Buf, + ParsedStringTable StrTab); } // end namespace remarks } // end namespace llvm diff --git a/llvm/lib/Remarks/RemarkParser.cpp b/llvm/lib/Remarks/RemarkParser.cpp index 19d9dcf..e7f174c 100644 --- a/llvm/lib/Remarks/RemarkParser.cpp +++ b/llvm/lib/Remarks/RemarkParser.cpp @@ -47,7 +47,7 @@ Expected ParsedStringTable::operator[](size_t Index) const { return StringRef(Buffer.data() + Offset, NextOffset - Offset - 1); } -Expected> +Expected> llvm::remarks::createRemarkParser(Format ParserFormat, StringRef Buf) { switch (ParserFormat) { case Format::YAML: @@ -63,7 +63,7 @@ llvm::remarks::createRemarkParser(Format ParserFormat, StringRef Buf) { llvm_unreachable("unhandled ParseFormat"); } -Expected> +Expected> llvm::remarks::createRemarkParser(Format ParserFormat, StringRef Buf, ParsedStringTable StrTab) { switch (ParserFormat) { @@ -82,7 +82,7 @@ llvm::remarks::createRemarkParser(Format ParserFormat, StringRef Buf, // Wrapper that holds the state needed to interact with the C API. struct CParser { - std::unique_ptr TheParser; + std::unique_ptr TheParser; Optional Err; CParser(Format ParserFormat, StringRef Buf, @@ -108,7 +108,7 @@ extern "C" LLVMRemarkParserRef LLVMRemarkParserCreateYAML(const void *Buf, extern "C" LLVMRemarkEntryRef LLVMRemarkParserGetNext(LLVMRemarkParserRef Parser) { CParser &TheCParser = *unwrap(Parser); - remarks::Parser &TheParser = *TheCParser.TheParser; + remarks::RemarkParser &TheParser = *TheCParser.TheParser; Expected> MaybeRemark = TheParser.next(); if (Error E = MaybeRemark.takeError()) { diff --git a/llvm/lib/Remarks/YAMLRemarkParser.cpp b/llvm/lib/Remarks/YAMLRemarkParser.cpp index fcb4cce..f677bfc 100644 --- a/llvm/lib/Remarks/YAMLRemarkParser.cpp +++ b/llvm/lib/Remarks/YAMLRemarkParser.cpp @@ -59,7 +59,7 @@ YAMLRemarkParser::YAMLRemarkParser(StringRef Buf) YAMLRemarkParser::YAMLRemarkParser(StringRef Buf, Optional StrTab) - : Parser{Format::YAML}, StrTab(std::move(StrTab)), LastErrorMessage(), + : RemarkParser{Format::YAML}, StrTab(std::move(StrTab)), LastErrorMessage(), SM(setupSM(LastErrorMessage)), Stream(Buf, SM), YAMLIt(Stream.begin()) {} Error YAMLRemarkParser::error(StringRef Message, yaml::Node &Node) { diff --git a/llvm/lib/Remarks/YAMLRemarkParser.h b/llvm/lib/Remarks/YAMLRemarkParser.h index da0e9de..e8f0edc 100644 --- a/llvm/lib/Remarks/YAMLRemarkParser.h +++ b/llvm/lib/Remarks/YAMLRemarkParser.h @@ -46,7 +46,7 @@ private: }; /// Regular YAML to Remark parser. -struct YAMLRemarkParser : public Parser { +struct YAMLRemarkParser : public RemarkParser { /// The string table used for parsing strings. Optional StrTab; /// Last error message that can come from the YAML parser diagnostics. @@ -63,7 +63,7 @@ struct YAMLRemarkParser : public Parser { Expected> next() override; - static bool classof(const Parser *P) { + static bool classof(const RemarkParser *P) { return P->ParserFormat == Format::YAML; } @@ -96,7 +96,7 @@ struct YAMLStrTabRemarkParser : public YAMLRemarkParser { YAMLStrTabRemarkParser(StringRef Buf, ParsedStringTable StrTab) : YAMLRemarkParser(Buf, std::move(StrTab)) {} - static bool classof(const Parser *P) { + static bool classof(const RemarkParser *P) { return P->ParserFormat == Format::YAMLStrTab; } diff --git a/llvm/tools/llvm-opt-report/OptReport.cpp b/llvm/tools/llvm-opt-report/OptReport.cpp index 297b798..b45c3fd 100644 --- a/llvm/tools/llvm-opt-report/OptReport.cpp +++ b/llvm/tools/llvm-opt-report/OptReport.cpp @@ -163,7 +163,7 @@ static bool readLocationInfo(LocationInfoTy &LocationInfo) { return false; } - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(*Format, (*Buf)->getBuffer()); if (!MaybeParser) { handleAllErrors(MaybeParser.takeError(), [&](const ErrorInfoBase &PE) { @@ -171,7 +171,7 @@ static bool readLocationInfo(LocationInfoTy &LocationInfo) { }); return false; } - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; while (true) { Expected> MaybeRemark = Parser.next(); diff --git a/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp b/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp index baa4814..967ac96 100644 --- a/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp +++ b/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp @@ -14,12 +14,12 @@ using namespace llvm; template void parseGood(const char (&Buf)[N]) { - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(remarks::Format::YAML, {Buf, N - 1}); EXPECT_FALSE(errorToBool(MaybeParser.takeError())); EXPECT_TRUE(*MaybeParser != nullptr); - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; Expected> Remark = Parser.next(); EXPECT_FALSE(errorToBool(Remark.takeError())); // Check for parsing errors. EXPECT_TRUE(*Remark != nullptr); // At least one remark. @@ -31,12 +31,12 @@ template void parseGood(const char (&Buf)[N]) { template bool parseExpectError(const char (&Buf)[N], const char *Error) { - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(remarks::Format::YAML, {Buf, N - 1}); EXPECT_FALSE(errorToBool(MaybeParser.takeError())); EXPECT_TRUE(*MaybeParser != nullptr); - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; Expected> Remark = Parser.next(); EXPECT_FALSE(Remark); // Check for parsing errors. @@ -354,12 +354,12 @@ TEST(YAMLRemarks, Contents) { " - String: ' because its definition is unavailable'\n" "\n"; - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(remarks::Format::YAML, Buf); EXPECT_FALSE(errorToBool(MaybeParser.takeError())); EXPECT_TRUE(*MaybeParser != nullptr); - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; Expected> MaybeRemark = Parser.next(); EXPECT_FALSE( errorToBool(MaybeRemark.takeError())); // Check for parsing errors. @@ -525,13 +525,13 @@ TEST(YAMLRemarks, ContentsStrTab) { 115); remarks::ParsedStringTable StrTab(StrTabBuf); - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(remarks::Format::YAMLStrTab, Buf, std::move(StrTab)); EXPECT_FALSE(errorToBool(MaybeParser.takeError())); EXPECT_TRUE(*MaybeParser != nullptr); - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; Expected> MaybeRemark = Parser.next(); EXPECT_FALSE( errorToBool(MaybeRemark.takeError())); // Check for parsing errors. @@ -601,13 +601,13 @@ TEST(YAMLRemarks, ParsingBadStringTableIndex) { StringRef StrTabBuf = StringRef("inline"); remarks::ParsedStringTable StrTab(StrTabBuf); - Expected> MaybeParser = + Expected> MaybeParser = remarks::createRemarkParser(remarks::Format::YAMLStrTab, Buf, std::move(StrTab)); EXPECT_FALSE(errorToBool(MaybeParser.takeError())); EXPECT_TRUE(*MaybeParser != nullptr); - remarks::Parser &Parser = **MaybeParser; + remarks::RemarkParser &Parser = **MaybeParser; Expected> MaybeRemark = Parser.next(); EXPECT_FALSE(MaybeRemark); // Expect an error here. -- 2.7.4