Remove duplicated/dead code from output builders

Author: otargowski

src/printer/AugmentedOIOutputBuilder.cc

@@ -24,20 +24,5 @@ std::string AugmentedOIOutputBuilder::dump() const {
     return ss.str();
 }
 
-void AugmentedOIOutputBuilder::dumpStatus(std::ostream& ss) const {
-    if (killReason_ != KillReason::NONE) {
-        ss << killReasonComment_;
-    }
-    else if (killSignal_ > 0) {
-        ss << "process exited due to signal " << killSignal_;
-    }
-    else if (exitStatus_ > 0) {
-        ss << "runtime error " << exitStatus_;
-    }
-    else {
-        ss << "ok";
-    }
-}
-
 } // namespace printer
 } // namespace s2j

src/printer/AugmentedOIOutputBuilder.h

@@ -10,10 +10,6 @@ class AugmentedOIOutputBuilder : public OIModelOutputBuilder {
     std::string dump() const override;
 
     const static std::string FORMAT_NAME;
-
-private:
-    void dumpStatus(std::ostream& ss) const;
-    int encodeStatusCode() const;
 };
 
 } // namespace printer

src/printer/OIModelOutputBuilder.cc

@@ -1,6 +1,7 @@
 #include "OIModelOutputBuilder.h"
 
 #include <cstdint>
+#include <sstream>
 
 namespace s2j {
 namespace printer {
@@ -55,5 +56,20 @@ OutputBuilder& OIModelOutputBuilder::setKillReason(
     return *this;
 }
 
+void OIModelOutputBuilder::dumpStatus(std::ostream& ss) const {
+    if (killReason_ != KillReason::NONE) {
+        ss << killReasonComment_;
+    }
+    else if (killSignal_ > 0) {
+        ss << "process exited due to signal " << killSignal_;
+    }
+    else if (exitStatus_ > 0) {
+        ss << "runtime error " << exitStatus_;
+    }
+    else {
+        ss << "ok";
+    }
+}
+
 } // namespace printer
 } // namespace s2j

src/printer/OIModelOutputBuilder.h

@@ -31,6 +31,8 @@ class OIModelOutputBuilder : public OutputBuilder {
 
     KillReason killReason_ = KillReason::NONE;
     std::string killReasonComment_;
+
+    void dumpStatus(std::ostream& ss) const;
 };
 
 } // namespace printer

src/printer/OITimeToolOutputBuilder.cc

@@ -19,21 +19,6 @@ std::string OITimeToolOutputBuilder::dump() const {
     return ss.str();
 }
 
-void OITimeToolOutputBuilder::dumpStatus(std::ostream& ss) const {
-    if (killReason_ != KillReason::NONE) {
-        ss << killReasonComment_;
-    }
-    else if (killSignal_ > 0) {
-        ss << "process exited due to signal " << killSignal_;
-    }
-    else if (exitStatus_ > 0) {
-        ss << "runtime error " << exitStatus_;
-    }
-    else {
-        ss << "ok";
-    }
-}
-
 int OITimeToolOutputBuilder::encodeStatusCode() const {
     static const int CODE_SIG_BASE = 0;
     static const int CODE_RE_BASE = 200;

src/printer/OITimeToolOutputBuilder.h

@@ -12,7 +12,6 @@ class OITimeToolOutputBuilder : public OIModelOutputBuilder {
     const static std::string FORMAT_NAME;
 
 private:
-    void dumpStatus(std::ostream& ss) const;
     int encodeStatusCode() const;
 };
 

src/printer/RealTimeOIOutputBuilder.cc

@@ -24,20 +24,5 @@ std::string RealTimeOIOutputBuilder::dump() const {
     return ss.str();
 }
 
-void RealTimeOIOutputBuilder::dumpStatus(std::ostream& ss) const {
-    if (killReason_ != KillReason::NONE) {
-        ss << killReasonComment_;
-    }
-    else if (killSignal_ > 0) {
-        ss << "process exited due to signal " << killSignal_;
-    }
-    else if (exitStatus_ > 0) {
-        ss << "runtime error " << exitStatus_;
-    }
-    else {
-        ss << "ok";
-    }
-}
-
 } // namespace printer
 } // namespace s2j

src/printer/RealTimeOIOutputBuilder.h

@@ -10,10 +10,6 @@ class RealTimeOIOutputBuilder : public OIModelOutputBuilder {
     std::string dump() const override;
 
     const static std::string FORMAT_NAME;
-
-private:
-    void dumpStatus(std::ostream& ss) const;
-    int encodeStatusCode() const;
 };
 
 } // namespace printer