json.hpp -> nlohmann/json.hpp

pdschubert · pdschubert · commit 94f041923825 · 2020-02-05T14:11:46.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -106,7 +106,7 @@ add_definitions(-DBOOST_LOG_DYN_LINK)
 # JSON library
 option(JSON_BuildTests OFF)
 add_subdirectory(external/json EXCLUDE_FROM_ALL)
-include_directories(external/json/single_include/nlohmann)
+include_directories(external/json/single_include/)
 
 # Googletest
 if (NOT PHASAR_IN_TREE)
@@ -243,7 +243,7 @@ install(DIRECTORY include/
 )
 
 # Install the header only json container
-install(DIRECTORY external/json/single_include/nlohmann/
+install(DIRECTORY external/json/single_include/
   DESTINATION include
   FILES_MATCHING PATTERN "*.hpp"
 )
diff --git a/include/phasar/PhasarLLVM/ControlFlow/CFG.h b/include/phasar/PhasarLLVM/ControlFlow/CFG.h
@@ -21,7 +21,7 @@
 #include <utility> // std::pair
 #include <vector>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/ICFG.h b/include/phasar/PhasarLLVM/ControlFlow/ICFG.h
@@ -22,7 +22,7 @@
 #include <set>
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/ControlFlow/CFG.h>
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h
@@ -28,7 +28,7 @@
 #include <unordered_set>
 #include <utility>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <boost/algorithm/string/trim.hpp>
 
diff --git a/include/phasar/PhasarLLVM/Plugins/AnalysisPluginController.h b/include/phasar/PhasarLLVM/Plugins/AnalysisPluginController.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMPointsToGraph.h b/include/phasar/PhasarLLVM/Pointer/LLVMPointsToGraph.h
@@ -26,7 +26,7 @@
 
 #include <llvm/IR/CallSite.h>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/Config/Configuration.h>
 
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h b/include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h
@@ -18,7 +18,7 @@
 #include <llvm/IR/PassManager.h>
 #include <llvm/Passes/PassBuilder.h>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/Pointer/PointsToInfo.h>
 
diff --git a/include/phasar/PhasarLLVM/Pointer/PointsToInfo.h b/include/phasar/PhasarLLVM/Pointer/PointsToInfo.h
@@ -13,7 +13,7 @@
 #include <iosfwd>
 #include <set>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
@@ -32,7 +32,7 @@
 
 #include <gtest/gtest_prod.h>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h>
 #include <phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h>
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
@@ -13,7 +13,7 @@
 #include <iosfwd>
 #include <vector>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/TypeHierarchy/VFTable.h>
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h
@@ -13,7 +13,7 @@
 #include <set>
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/TypeHierarchy/VFTable.h>
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/VFTable.h b/include/phasar/PhasarLLVM/TypeHierarchy/VFTable.h
@@ -13,7 +13,7 @@
 #include <iosfwd>
 #include <vector>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/Utils/TaintConfiguration.h b/include/phasar/PhasarLLVM/Utils/TaintConfiguration.h
@@ -17,20 +17,22 @@
 #ifndef PHASAR_PHASARLLVM_UTILS_TAINTCONFIGURATION_H
 #define PHASAR_PHASARLLVM_UTILS_TAINTCONFIGURATION_H
 
-#include <boost/filesystem.hpp>
 #include <cassert>
 #include <fstream>
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
-#include <json.hpp>
 #include <map>
 #include <set>
 #include <string>
 #include <variant>
 #include <vector>
 
-#include "llvm/Support/ErrorHandling.h"
+#include <boost/filesystem.hpp>
+
+#include <llvm/Support/ErrorHandling.h>
+
+#include <nlohmann/json.hpp>
 
 #include <phasar/Config/Configuration.h>
 
diff --git a/lib/Controller/AnalysisController.cpp b/lib/Controller/AnalysisController.cpp
@@ -60,8 +60,8 @@ AnalysisController::AnalysisController(
       ICF(IRDB, CGTy, EntryPoints, &TH, &PT),
       DataFlowAnalyses(move(DataFlowAnalyses)),
       AnalysisConfigs(move(AnalysisConfigs)), EntryPoints(move(EntryPoints)),
-      Strategy(Strategy), EmitterOptions(EmitterOptions),
-      ProjectID(ProjectID), OutDirectory(OutDirectory) {
+      Strategy(Strategy), EmitterOptions(EmitterOptions), ProjectID(ProjectID),
+      OutDirectory(OutDirectory) {
   if (OutDirectory != "") {
     // create directory for results
     ResultDirectory = OutDirectory + "/" + ProjectID + "-" + createTimeStamp();
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
@@ -286,8 +286,7 @@ LLVMBasedICFG::getCalleesOfCallAt(const llvm::Instruction *n) const {
       return Callees;
     }
     out_edge_iterator ei, ei_end;
-    for (boost::tie(ei, ei_end) =
-             boost::out_edges(mapEntry->second, CallGraph);
+    for (boost::tie(ei, ei_end) = boost::out_edges(mapEntry->second, CallGraph);
          ei != ei_end; ++ei) {
       auto source = boost::source(*ei, CallGraph);
       auto edge = CallGraph[*ei];
@@ -313,8 +312,7 @@ LLVMBasedICFG::getCallersOf(const llvm::Function *F) const {
     return CallersOf;
   }
   in_edge_iterator ei, ei_end;
-  for (boost::tie(ei, ei_end) =
-           boost::in_edges(mapEntry->second, CallGraph);
+  for (boost::tie(ei, ei_end) = boost::in_edges(mapEntry->second, CallGraph);
        ei != ei_end; ++ei) {
     auto source = boost::source(*ei, CallGraph);
     auto edge = CallGraph[*ei];
diff --git a/lib/PhasarLLVM/Plugins/ICFGTestPlugin.h b/lib/PhasarLLVM/Plugins/ICFGTestPlugin.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/PhasarLLVM/Plugins/Interfaces/ControlFlow/ICFGPlugin.h>
 
diff --git a/lib/PhasarLLVM/Utils/DOTGraph.cpp b/lib/PhasarLLVM/Utils/DOTGraph.cpp
@@ -15,11 +15,13 @@
  */
 
 #include <algorithm>
-#include <boost/filesystem.hpp>
 #include <iterator>
-#include <json.hpp>
 #include <ostream>
 
+#include <boost/filesystem.hpp>
+
+#include <nlohmann/json.hpp>
+
 #include <phasar/Config/Configuration.h>
 #include <phasar/PhasarLLVM/Utils/DOTGraph.h>
 
diff --git a/lib/Utils/PAMM.cpp b/lib/Utils/PAMM.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <phasar/Config/Configuration.h>
 #include <phasar/Utils/PAMM.h>
