Remove some operator fwd decls and replace with direct inline impl

Author: fabianbs96

include/phasar/Utils/DOTGraph.h

@@ -104,10 +104,26 @@ struct DOTNode {
           bool IsStmt = true, bool Isv = true);
   [[nodiscard]] std::string str(const std::string &Indent = "") const;
 
-  friend bool operator<(const DOTNode &Lhs, const DOTNode &Rhs);
-  friend bool operator==(const DOTNode &Lhs, const DOTNode &Rhs);
+  friend bool operator<(const DOTNode &Lhs, const DOTNode &Rhs) {
+    StringIDLess StrLess;
+    // comparing control flow nodes
+    if (Lhs.FactId == 0 && Rhs.FactId == 0) {
+      return StrLess(Lhs.StmtId, Rhs.StmtId);
+    } // comparing fact nodes
+    if (Lhs.FactId == Rhs.FactId) {
+      return StrLess(Lhs.StmtId, Rhs.StmtId);
+    }
+    return Lhs.FactId < Rhs.FactId;
+  }
+
+  friend bool operator==(const DOTNode &Lhs, const DOTNode &Rhs) {
+    return !(Lhs < Rhs) && !(Rhs < Lhs);
+  }
+
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const DOTNode &Node);
+                                       const DOTNode &Node) {
+    return OS << Node.str();
+  }
 };
 
 struct DOTEdge {
@@ -121,9 +137,17 @@ struct DOTEdge {
           std::string Vl = "");
   [[nodiscard]] std::string str(const std::string &Indent = "") const;
 
-  friend bool operator<(const DOTEdge &Lhs, const DOTEdge &Rhs);
+  friend bool operator<(const DOTEdge &Lhs, const DOTEdge &Rhs) {
+    if (Lhs.Source == Rhs.Source) {
+      return Lhs.Target < Rhs.Target;
+    }
+    return Lhs.Source < Rhs.Source;
+  }
+
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const DOTEdge &Edge);
+                                       const DOTEdge &Edge) {
+    return OS << Edge.str();
+  }
 };
 
 struct DOTFactSubGraph {
@@ -138,7 +162,9 @@ struct DOTFactSubGraph {
   [[nodiscard]] std::string str(const std::string &Indent = "") const;
 
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const DOTFactSubGraph &FactSG);
+                                       const DOTFactSubGraph &FactSG) {
+    return OS << FactSG.str();
+  }
 };
 
 struct DOTFunctionSubGraph {
@@ -161,7 +187,9 @@ struct DOTFunctionSubGraph {
   void createLayoutFactEdges();
 
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const DOTFunctionSubGraph &FunctionSG);
+                                       const DOTFunctionSubGraph &FunctionSG) {
+    return OS << FunctionSG.str();
+  }
 };
 
 template <typename D> struct DOTGraph {

lib/Utils/DOTGraph.cpp

@@ -199,46 +199,6 @@ void DOTFunctionSubGraph::createLayoutFactEdges() {
   }
 }
 
-bool operator<(const DOTNode &Lhs, const DOTNode &Rhs) {
-  StringIDLess StrLess;
-  // comparing control flow nodes
-  if (Lhs.FactId == 0 && Rhs.FactId == 0) {
-    return StrLess(Lhs.StmtId, Rhs.StmtId);
-  } // comparing fact nodes
-  if (Lhs.FactId == Rhs.FactId) {
-    return StrLess(Lhs.StmtId, Rhs.StmtId);
-  }
-  return Lhs.FactId < Rhs.FactId;
-}
-
-bool operator==(const DOTNode &Lhs, const DOTNode &Rhs) {
-  return !(Lhs < Rhs) && !(Rhs < Lhs);
-}
-
-std::ostream &operator<<(std::ostream &OS, const DOTNode &Node) {
-  return OS << Node.str();
-}
-
-bool operator<(const DOTEdge &Lhs, const DOTEdge &Rhs) {
-  if (Lhs.Source == Rhs.Source) {
-    return Lhs.Target < Rhs.Target;
-  }
-  return Lhs.Source < Rhs.Source;
-}
-
-std::ostream &operator<<(std::ostream &OS, const DOTEdge &Edge) {
-  return OS << Edge.str();
-}
-
-std::ostream &operator<<(std::ostream &OS, const DOTFactSubGraph &FactSG) {
-  return OS << FactSG.str();
-}
-
-std::ostream &operator<<(std::ostream &OS,
-                         const DOTFunctionSubGraph &FunctionSG) {
-  return OS << FunctionSG.str();
-}
-
 DOTConfig &DOTConfig::getDOTConfig() {
   static DOTConfig DC;
   return DC;

tools/ptaben/PTAResult.cpp

@@ -21,7 +21,9 @@ struct PTAResult {
   QueryId Query{};
   AliasResult Result{};
 
-  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, PTAResult Res);
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, PTAResult Res) {
+    return OS << uint64_t(Res.Query) << ", " << to_string(Res.Result);
+  }
 };
 
 } // namespace psr::ptaben