Restore message() method for errors loading IR

GrammaTech · Feb 24, 2022 · 83cd84d · 83cd84d
1 parent 0a9aa98
commit 83cd84d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/include/gtirb/ErrorOr.hpp b/include/gtirb/ErrorOr.hpp
@@ -33,13 +33,13 @@ namespace gtirb {
 
 /// A small struct to hold an error code
 /// along with a string holding additional details
-struct ErrorInfo {
+struct GTIRB_EXPORT_API ErrorInfo {
   std::error_code ErrorCode;
   std::string Msg;
   ErrorInfo() = default;
   ErrorInfo(const std::error_code& EC, const std::string& S)
       : ErrorCode(EC), Msg(S){};
-  std::string asString();
+  std::string message() const;
 };
 
 template <typename CharT, typename Traits>

diff --git a/src/ByteInterval.cpp b/src/ByteInterval.cpp
@@ -141,15 +141,15 @@ ErrorOr<ByteInterval*> ByteInterval::fromProtobuf(Context& C,
     case proto::Block::ValueCase::kCode: {
       auto B = CodeBlock::fromProtobuf(C, ProtoBlock.code());
       if (!B) {
-        Err.Msg += "\n" + B.getError().asString();
+        Err.Msg += "\n" + B.getError().message();
         return Err;
       }
       BI->addBlock(ProtoBlock.offset(), *B);
     } break;
     case proto::Block::ValueCase::kData: {
       auto B = DataBlock::fromProtobuf(C, ProtoBlock.data());
       if (!B) {
-        Err.Msg += "\n" + B.getError().asString();
+        Err.Msg += "\n" + B.getError().message();
         return Err;
       }
       BI->addBlock(ProtoBlock.offset(), *B);

diff --git a/src/ErrorOr.cpp b/src/ErrorOr.cpp
@@ -3,7 +3,7 @@
 
 namespace gtirb {
 
-std::string ErrorInfo::asString() {
+std::string ErrorInfo::message() const {
   std::stringstream Stream;
   Stream << *this;
   return Stream.str();

diff --git a/src/IR.cpp b/src/IR.cpp
@@ -165,7 +165,7 @@ ErrorOr<IR*> IR::fromProtobuf(Context& C, const MessageType& Message) {
     auto M = Module::fromProtobuf(C, Elt);
     if (!M) {
       ErrorInfo Err{load_error::CorruptModule, "#" + std::to_string(i)};
-      Err.Msg += "\n" + M.getError().asString();
+      Err.Msg += "\n" + M.getError().message();
       return Err;
     }
     I->addModule(*M);

diff --git a/src/Module.cpp b/src/Module.cpp
@@ -130,23 +130,23 @@ ErrorOr<Module*> Module::fromProtobuf(Context& C, const MessageType& Message) {
   for (const auto& Elt : Message.proxies()) {
     auto PB = ProxyBlock::fromProtobuf(C, Elt);
     if (!PB) {
-      Problem.Msg += "\n" + PB.getError().asString();
+      Problem.Msg += "\n" + PB.getError().message();
       return Problem;
     }
     M->addProxyBlock(*PB);
   }
   for (const auto& Elt : Message.sections()) {
     auto S = Section::fromProtobuf(C, Elt);
     if (!S) {
-      Problem.Msg += "\n" + S.getError().asString();
+      Problem.Msg += "\n" + S.getError().message();
       return Problem;
     }
     M->addSection(*S);
   }
   for (const auto& Elt : Message.symbols()) {
     auto S = Symbol::fromProtobuf(C, Elt);
     if (!S) {
-      Problem.Msg += "\n" + S.getError().asString();
+      Problem.Msg += "\n" + S.getError().message();
       return Problem;
     }
     M->addSymbol(*S);

diff --git a/src/Section.cpp b/src/Section.cpp
@@ -93,7 +93,7 @@ ErrorOr<Section*> Section::fromProtobuf(Context& C,
     if (!BI) {
       ErrorInfo err{IR::load_error::CorruptSection,
                     "Could not load section" + Message.name() + "\n" +
-                        BI.getError().asString()};
+                        BI.getError().message()};
       return err;
     }
     S->addByteInterval(*BI);