[Remarks][NFC] Rename remarks::Parser to remarks::RemarkParser

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@366965 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Remarks/RemarkParser.h b/include/llvm/Remarks/RemarkParser.h
index f53c04db8ea686c40a95b0023c543c10b07ef15f..f73671214f0505617606efa9cebbd25b56319ae7 100644 (file)
--- a/include/llvm/Remarks/RemarkParser.h
+++ b/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<std::unique_ptr<Remark>> 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<StringRef> operator[](size_t Index) const;
 };
 
-Expected<std::unique_ptr<Parser>> createRemarkParser(Format ParserFormat,
-                                                     StringRef Buf);
+Expected<std::unique_ptr<RemarkParser>> createRemarkParser(Format ParserFormat,
+                                                           StringRef Buf);
 
-Expected<std::unique_ptr<Parser>> createRemarkParser(Format ParserFormat,
-                                                     StringRef Buf,
-                                                     ParsedStringTable StrTab);
+Expected<std::unique_ptr<RemarkParser>>
+createRemarkParser(Format ParserFormat, StringRef Buf,
+                   ParsedStringTable StrTab);
 
 } // end namespace remarks
 } // end namespace llvm

diff --git a/lib/Remarks/RemarkParser.cpp b/lib/Remarks/RemarkParser.cpp
index 19d9dcf17916008d9564b62078ecd1affde966a3..e7f174ce02cbd75ae5fb156c1ac92595cac45ec3 100644 (file)
--- a/lib/Remarks/RemarkParser.cpp
+++ b/lib/Remarks/RemarkParser.cpp
@@ -47,7 +47,7 @@ Expected<StringRef> ParsedStringTable::operator[](size_t Index) const {
   return StringRef(Buffer.data() + Offset, NextOffset - Offset - 1);
 }
 
-Expected<std::unique_ptr<Parser>>
+Expected<std::unique_ptr<RemarkParser>>
 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<std::unique_ptr<Parser>>
+Expected<std::unique_ptr<RemarkParser>>
 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<Parser> TheParser;
+  std::unique_ptr<RemarkParser> TheParser;
   Optional<std::string> 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<std::unique_ptr<Remark>> MaybeRemark = TheParser.next();
   if (Error E = MaybeRemark.takeError()) {

diff --git a/lib/Remarks/YAMLRemarkParser.cpp b/lib/Remarks/YAMLRemarkParser.cpp
index fcb4cce099b868bba77089ccceed0549fbcf03bc..f677bfc04ce3ae1d611cef119bbd8417d5796eae 100644 (file)
--- a/lib/Remarks/YAMLRemarkParser.cpp
+++ b/lib/Remarks/YAMLRemarkParser.cpp
@@ -59,7 +59,7 @@ YAMLRemarkParser::YAMLRemarkParser(StringRef Buf)
 
 YAMLRemarkParser::YAMLRemarkParser(StringRef Buf,
                                    Optional<ParsedStringTable> 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/lib/Remarks/YAMLRemarkParser.h b/lib/Remarks/YAMLRemarkParser.h
index da0e9de0f4d1daab418ed8ba813dbca302938d82..e8f0edc50f460fa4726f82a8278780cfa8bc8da1 100644 (file)
--- a/lib/Remarks/YAMLRemarkParser.h
+++ b/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<ParsedStringTable> StrTab;
   /// Last error message that can come from the YAML parser diagnostics.
@@ -63,7 +63,7 @@ struct YAMLRemarkParser : public Parser {
 
   Expected<std::unique_ptr<Remark>> 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/tools/llvm-opt-report/OptReport.cpp b/tools/llvm-opt-report/OptReport.cpp
index 297b798dc9d4ab7f233cc4ff2b4422906977df59..b45c3fd10de631e82ed67aed3e08b4af6d07d9bf 100644 (file)
--- a/tools/llvm-opt-report/OptReport.cpp
+++ b/tools/llvm-opt-report/OptReport.cpp
@@ -163,7 +163,7 @@ static bool readLocationInfo(LocationInfoTy &LocationInfo) {
     return false;
   }
 
-  Expected<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();

diff --git a/unittests/Remarks/YAMLRemarksParsingTest.cpp b/unittests/Remarks/YAMLRemarksParsingTest.cpp
index baa481409f9e3122cb78a91a2f3d11a63a1c550d..967ac965069cb41b1a1925f95b4576685988fcb0 100644 (file)
--- a/unittests/Remarks/YAMLRemarksParsingTest.cpp
+++ b/unittests/Remarks/YAMLRemarksParsingTest.cpp
@@ -14,12 +14,12 @@
 using namespace llvm;
 
 template <size_t N> void parseGood(const char (&Buf)[N]) {
-  Expected<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> 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 <size_t N> void parseGood(const char (&Buf)[N]) {
 
 template <size_t N>
 bool parseExpectError(const char (&Buf)[N], const char *Error) {
-  Expected<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> 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<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> 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<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> 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<std::unique_ptr<remarks::Parser>> MaybeParser =
+  Expected<std::unique_ptr<remarks::RemarkParser>> 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<std::unique_ptr<remarks::Remark>> MaybeRemark = Parser.next();
   EXPECT_FALSE(MaybeRemark); // Expect an error here.