ezsat: Rename files and class for ezCmdlineSat

YosysHQ · Apr 9, 2024 · 8b73af4 · 8b73af4
1 parent a1088c8
commit 8b73af4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -633,7 +633,7 @@ $(eval $(call add_include_file,kernel/yosys_common.h))
 $(eval $(call add_include_file,kernel/yw.h))
 $(eval $(call add_include_file,libs/ezsat/ezsat.h))
 $(eval $(call add_include_file,libs/ezsat/ezminisat.h))
-$(eval $(call add_include_file,libs/ezsat/ezcommand.h))
+$(eval $(call add_include_file,libs/ezsat/ezcmdline.h))
 ifeq ($(ENABLE_ZLIB),1)
 $(eval $(call add_include_file,libs/fst/fstapi.h))
 endif
@@ -674,7 +674,7 @@ OBJS += libs/json11/json11.o
 
 OBJS += libs/ezsat/ezsat.o
 OBJS += libs/ezsat/ezminisat.o
-OBJS += libs/ezsat/ezcommand.o
+OBJS += libs/ezsat/ezcmdline.o
 
 OBJS += libs/minisat/Options.o
 OBJS += libs/minisat/SimpSolver.o

diff --git a/libs/ezsat/ezcommand.cc → libs/ezsat/ezcmdline.cc b/libs/ezsat/ezcommand.cc → libs/ezsat/ezcmdline.cc
@@ -1,13 +1,13 @@
 
-#include "ezcommand.h"
+#include "ezcmdline.h"
 
 #include "../../kernel/yosys.h"
 
-ezSATCommand::ezSATCommand(const std::string &cmd) : command(cmd) {}
+ezCmdlineSAT::ezCmdlineSAT(const std::string &cmd) : command(cmd) {}
 
-ezSATCommand::~ezSATCommand() {}
+ezCmdlineSAT::~ezCmdlineSAT() {}
 
-bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions)
+bool ezCmdlineSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions)
 {
 #if !defined(YOSYS_DISABLE_SPAWN)
 	const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX");
@@ -85,4 +85,5 @@ bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<
 #else
 	Yosys::log_error("SAT solver command not available in this build!\n");
 #endif
-}
+}
+}
diff --git a/libs/ezsat/ezcommand.h → libs/ezsat/ezcmdline.h b/libs/ezsat/ezcommand.h → libs/ezsat/ezcmdline.h
@@ -22,14 +22,14 @@
 
 #include "ezsat.h"
 
-class ezSATCommand : public ezSAT
+class ezCmdlineSAT : public ezSAT
 {
 private:
 	std::string command;
 
 public:
-	ezSATCommand(const std::string &cmd);
-	virtual ~ezSATCommand();
+	ezCmdlineSAT(const std::string &cmd);
+	virtual ~ezCmdlineSAT();
 	bool solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) override;
 };