Move the solver file from the lib folder to the ir folder. (p4lang#4188)

Author: fruffy

backends/p4tools/common/core/z3_solver.h

@@ -11,10 +11,10 @@
 
 #include "ir/ir.h"
 #include "ir/json_generator.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/ordered_map.h"
 #include "lib/safe_vector.h"
-#include "lib/solver.h"
 
 namespace P4Tools {
 

backends/p4tools/common/lib/model.h

@@ -8,8 +8,8 @@
 #include <boost/container/flat_map.hpp>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/visitor.h"
-#include "lib/solver.h"
 
 namespace P4Tools {
 

backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h

@@ -7,9 +7,9 @@
 
 #include "ir/ir.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "ir/visitor.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/small_step.h"

backends/p4tools/modules/testgen/core/small_step/cmd_stepper.cpp

@@ -20,12 +20,12 @@
 #include "ir/id.h"
 #include "ir/indexed_vector.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "lib/cstring.h"
 #include "lib/exceptions.h"
 #include "lib/log.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h

@@ -6,8 +6,8 @@
 #include <vector>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h"

backends/p4tools/modules/testgen/core/small_step/expr_stepper.cpp

@@ -14,10 +14,10 @@
 #include "ir/declaration.h"
 #include "ir/irutils.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/exceptions.h"
 #include "lib/log.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 #include "lib/source_file.h"
 #include "midend/coverage.h"
 #include "midend/saturationElim.h"

backends/p4tools/modules/testgen/core/small_step/expr_stepper.h

@@ -6,9 +6,9 @@
 
 #include "ir/id.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "lib/cstring.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h"

backends/p4tools/modules/testgen/core/small_step/small_step.cpp

@@ -15,10 +15,10 @@
 #include "ir/ir.h"
 #include "ir/irutils.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

backends/p4tools/modules/testgen/core/small_step/small_step.h

@@ -9,7 +9,7 @@
 
 #include "backends/p4tools/common/compiler/reachability.h"
 #include "ir/node.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

backends/p4tools/modules/testgen/core/symbolic_executor/depth_first.cpp

@@ -4,8 +4,8 @@
 #include <iterator>
 #include <vector>
 
+#include "ir/solver.h"
 #include "lib/error.h"
-#include "lib/solver.h"
 #include "lib/timer.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"