From 49487972c40c344bf4851c8a069629dd0ee5c049 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 16 Jul 2024 16:03:50 +0200 Subject: [PATCH] renamed query_local() overload --- include/hal_core/netlist/boolean_function/solver.h | 2 +- plugins/module_identification/python/python_bindings.cpp | 6 +++--- plugins/z3_utils/src/netlist_comparison.cpp | 2 +- src/netlist/boolean_function/solver.cpp | 4 ++-- src/python_bindings/bindings/smt.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/hal_core/netlist/boolean_function/solver.h b/include/hal_core/netlist/boolean_function/solver.h index 8cdf0a86912..b0085c8956a 100644 --- a/include/hal_core/netlist/boolean_function/solver.h +++ b/include/hal_core/netlist/boolean_function/solver.h @@ -110,7 +110,7 @@ namespace hal * @param[in] smt2 - The SMT solver query as smt2 string. * @returns OK() and the result on success, Err() otherwise. */ - static Result query_local(const QueryConfig& config, const std::string& smt2); + static Result query_local_with_smt2(const QueryConfig& config, const std::string& smt2); /** * Queries a remote SMT solver with the specified query configuration. diff --git a/plugins/module_identification/python/python_bindings.cpp b/plugins/module_identification/python/python_bindings.cpp index c38e334300f..6ead7b802c7 100644 --- a/plugins/module_identification/python/python_bindings.cpp +++ b/plugins/module_identification/python/python_bindings.cpp @@ -14,13 +14,13 @@ namespace hal { #ifdef PYBIND11_MODULE - PYBIND11_MODULE(hawkeye, m) + PYBIND11_MODULE(module_identification, m) { m.doc() = "Plugin for module classification against a library of predefined types."; #else - PYBIND11_PLUGIN(hawkeye) + PYBIND11_PLUGIN(module_identification) { - py::module m("hawkeye", "Plugin for module classification against a library of predefined types."); + py::module m("module_identification", "Plugin for module classification against a library of predefined types."); #endif // ifdef PYBIND11_MODULE py::class_, BasePluginInterface> py_module_identification_plugin( diff --git a/plugins/z3_utils/src/netlist_comparison.cpp b/plugins/z3_utils/src/netlist_comparison.cpp index f10f518ed85..215839d4955 100644 --- a/plugins/z3_utils/src/netlist_comparison.cpp +++ b/plugins/z3_utils/src/netlist_comparison.cpp @@ -337,7 +337,7 @@ namespace hal s.add(bf_a != bf_b); auto smt2_str = s.to_smt2(); - auto query_res = SMT::Solver::query_local(config, smt2_str); + auto query_res = SMT::Solver::query_local_with_smt2(config, smt2_str); if (query_res.is_error()) { return ERR_APPEND(query_res.get_error(), diff --git a/src/netlist/boolean_function/solver.cpp b/src/netlist/boolean_function/solver.cpp index 3e953d0610e..1e061790d82 100644 --- a/src/netlist/boolean_function/solver.cpp +++ b/src/netlist/boolean_function/solver.cpp @@ -434,10 +434,10 @@ namespace hal } auto input_str = input.get(); - return query_local(config, input_str); + return query_local_with_smt2(config, input_str); } - Result Solver::query_local(const QueryConfig& config, const std::string& smt2) + Result Solver::query_local_with_smt2(const QueryConfig& config, const std::string& smt2) { auto query = spec2query.at({config.solver, config.call})(smt2, config); if (query.is_ok()) diff --git a/src/python_bindings/bindings/smt.cpp b/src/python_bindings/bindings/smt.cpp index fe9ddadbad9..fe02363cb1a 100644 --- a/src/python_bindings/bindings/smt.cpp +++ b/src/python_bindings/bindings/smt.cpp @@ -423,9 +423,9 @@ namespace hal )"); py_smt_solver.def_static( - "query_local", + "query_local_with_smt2", [](const SMT::QueryConfig& config, const std::string& smt2) -> std::optional { - auto res = SMT::Solver::query_local(config, smt2); + auto res = SMT::Solver::query_local_with_smt2(config, smt2); if (res.is_ok()) { return res.get();