From 05a53a2ac405bcd18a84024247145f161809c3b0 Mon Sep 17 00:00:00 2001 From: Aina Niemetz Date: Thu, 1 Apr 2021 09:56:14 -0700 Subject: Rename namespace CVC5 to cvc5. (#6258) --- src/main/command_executor.cpp | 4 ++-- src/main/command_executor.h | 10 +++++----- src/main/driver_unified.cpp | 24 ++++++++++++------------ src/main/interactive_shell.cpp | 4 ++-- src/main/interactive_shell.h | 4 ++-- src/main/main.cpp | 6 +++--- src/main/main.h | 12 ++++++------ src/main/signal_handlers.cpp | 6 +++--- src/main/signal_handlers.h | 4 ++-- src/main/time_limit.cpp | 4 ++-- src/main/time_limit.h | 4 ++-- 11 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/main') diff --git a/src/main/command_executor.cpp b/src/main/command_executor.cpp index ebe51f359..6152064be 100644 --- a/src/main/command_executor.cpp +++ b/src/main/command_executor.cpp @@ -26,7 +26,7 @@ #include "main/main.h" #include "smt/command.h" -namespace CVC5 { +namespace cvc5 { namespace main { // Function to cancel any (externally-imposed) limit on CPU time. @@ -332,4 +332,4 @@ void CommandExecutor::flushOutputStreams() { } } // namespace main -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/main/command_executor.h b/src/main/command_executor.h index a2dc4a4e9..f066a27b6 100644 --- a/src/main/command_executor.h +++ b/src/main/command_executor.h @@ -24,7 +24,7 @@ #include "smt/smt_engine.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class Command; @@ -65,9 +65,9 @@ class CommandExecutor * sequence. Eventually uses doCommandSingleton (which can be * overridden by a derived class). */ - bool doCommand(CVC5::Command* cmd); + bool doCommand(cvc5::Command* cmd); - bool doCommand(std::unique_ptr& cmd) + bool doCommand(std::unique_ptr& cmd) { return doCommand(cmd.get()); } @@ -101,7 +101,7 @@ class CommandExecutor protected: /** Executes treating cmd as a singleton */ - virtual bool doCommandSingleton(CVC5::Command* cmd); + virtual bool doCommandSingleton(cvc5::Command* cmd); private: CommandExecutor(); @@ -114,6 +114,6 @@ bool solverInvoke(api::Solver* solver, std::ostream* out); } // namespace main -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__MAIN__COMMAND_EXECUTOR_H */ diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index 40ed674c0..fdf6a8335 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -41,11 +41,11 @@ #include "util/result.h" using namespace std; -using namespace CVC5; -using namespace CVC5::parser; -using namespace CVC5::main; +using namespace cvc5; +using namespace cvc5::parser; +using namespace cvc5::main; -namespace CVC5 { +namespace cvc5 { namespace main { /** Global options variable */ thread_local Options* pOptions; @@ -57,7 +57,7 @@ const char* progPath; const std::string* progName; /** A pointer to the CommandExecutor (the signal handlers need it) */ -std::unique_ptr pExecutor; +std::unique_ptr pExecutor; /** The time point the binary started, accessible to signal handlers */ std::unique_ptr totalTime; @@ -73,7 +73,7 @@ TotalTimer::~TotalTimer() } } // namespace main - } // namespace CVC5 + } // namespace cvc5 void printUsage(Options& opts, bool full) { stringstream ss; @@ -175,12 +175,12 @@ int runCvc4(int argc, char* argv[], Options& opts) { // Determine which messages to show based on smtcomp_mode and verbosity if(Configuration::isMuzzledBuild()) { - DebugChannel.setStream(&CVC5::null_os); - TraceChannel.setStream(&CVC5::null_os); - NoticeChannel.setStream(&CVC5::null_os); - ChatChannel.setStream(&CVC5::null_os); - MessageChannel.setStream(&CVC5::null_os); - WarningChannel.setStream(&CVC5::null_os); + DebugChannel.setStream(&cvc5::null_os); + TraceChannel.setStream(&cvc5::null_os); + NoticeChannel.setStream(&cvc5::null_os); + ChatChannel.setStream(&cvc5::null_os); + MessageChannel.setStream(&cvc5::null_os); + WarningChannel.setStream(&cvc5::null_os); } // important even for muzzled builds (to get result output right) diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index 91b3d53b3..44fee3eb5 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -49,7 +49,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { using namespace parser; using namespace language; @@ -432,4 +432,4 @@ char* commandGenerator(const char* text, int state) { #endif /* HAVE_LIBEDITLINE */ -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h index 2c421d7b2..2f7f0af21 100644 --- a/src/main/interactive_shell.h +++ b/src/main/interactive_shell.h @@ -22,7 +22,7 @@ #include "options/options.h" #include "util/unsafe_interrupt_exception.h" -namespace CVC5 { +namespace cvc5 { class Command; class Options; @@ -72,6 +72,6 @@ public: };/* class InteractiveShell */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__INTERACTIVE_SHELL_H */ diff --git a/src/main/main.cpp b/src/main/main.cpp index f880d5ee1..a17b2e7c5 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -34,9 +34,9 @@ #include "util/result.h" using namespace std; -using namespace CVC5; -using namespace CVC5::main; -using namespace CVC5::language; +using namespace cvc5; +using namespace cvc5::main; +using namespace cvc5::language; /** * CVC4's main() routine is just an exception-safe wrapper around CVC4. diff --git a/src/main/main.h b/src/main/main.h index 47312c465..6f485a1f5 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -26,7 +26,7 @@ #ifndef CVC4__MAIN__MAIN_H #define CVC4__MAIN__MAIN_H -namespace CVC5 { +namespace cvc5 { namespace main { class CommandExecutor; @@ -38,7 +38,7 @@ extern const char* progPath; extern const std::string* progName; /** A reference for use by the signal handlers to print statistics */ -extern std::unique_ptr pExecutor; +extern std::unique_ptr pExecutor; /** Manages a custom timer for the total runtime in RAII-style. */ class TotalTimer @@ -64,7 +64,7 @@ extern bool segvSpin; extern thread_local Options* pOptions; /** Initialize the driver. Sets signal handlers for SIGINT and SIGSEGV. - * This can throw a CVC5::Exception. + * This can throw a cvc5::Exception. */ void cvc4_init(); @@ -72,10 +72,10 @@ void cvc4_init(); void cvc4_shutdown() noexcept; } // namespace main -} // namespace CVC5 +} // namespace cvc5 /** Actual Cvc4 driver functions **/ -int runCvc4(int argc, char* argv[], CVC5::Options&); -void printUsage(CVC5::Options&, bool full = false); +int runCvc4(int argc, char* argv[], cvc5::Options&); +void printUsage(cvc5::Options&, bool full = false); #endif /* CVC4__MAIN__MAIN_H */ diff --git a/src/main/signal_handlers.cpp b/src/main/signal_handlers.cpp index a7a3a073c..ae549e9a6 100644 --- a/src/main/signal_handlers.cpp +++ b/src/main/signal_handlers.cpp @@ -41,10 +41,10 @@ #include "smt/smt_engine.h" #include "util/safe_print.h" -using CVC5::Exception; +using cvc5::Exception; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace main { /** @@ -343,4 +343,4 @@ void cleanup() noexcept } // namespace signal_handlers } // namespace main -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/main/signal_handlers.h b/src/main/signal_handlers.h index 1312ca27d..f8fdaf7fd 100644 --- a/src/main/signal_handlers.h +++ b/src/main/signal_handlers.h @@ -17,7 +17,7 @@ #ifndef CVC4__MAIN__SIGNAL_HANDLERS_H #define CVC4__MAIN__SIGNAL_HANDLERS_H -namespace CVC5 { +namespace cvc5 { namespace main { namespace signal_handlers { @@ -41,6 +41,6 @@ void cleanup(); } // namespace signal_handlers } // namespace main -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__MAIN__SIGNAL_HANDLERS_H */ diff --git a/src/main/time_limit.cpp b/src/main/time_limit.cpp index 7f2bc0c61..e3a95d640 100644 --- a/src/main/time_limit.cpp +++ b/src/main/time_limit.cpp @@ -58,7 +58,7 @@ #include "signal_handlers.h" -namespace CVC5 { +namespace cvc5 { namespace main { #if HAVE_SETITIMER @@ -133,4 +133,4 @@ TimeLimit install_time_limit(const Options& opts) } } // namespace main -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/main/time_limit.h b/src/main/time_limit.h index 62dc6a6a3..ce55523f1 100644 --- a/src/main/time_limit.h +++ b/src/main/time_limit.h @@ -19,7 +19,7 @@ #include "options/options.h" -namespace CVC5 { +namespace cvc5 { namespace main { /** @@ -47,6 +47,6 @@ struct TimeLimit TimeLimit install_time_limit(const Options& opts); } // namespace main -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__MAIN__TIME_LIMIT_H */ -- cgit v1.2.3