diff options
Diffstat (limited to 'src/options')
25 files changed, 99 insertions, 95 deletions
diff --git a/src/options/README b/src/options/README index 47a7d9db7..92609f433 100644 --- a/src/options/README +++ b/src/options/README @@ -215,7 +215,7 @@ Further information (the old option package) well as an OptionsHandler*. void custom-notification( - const std::string& option, CVC4::options::OptionsHandler* handler); + const std::string& option, CVC5::options::OptionsHandler* handler); The name is provided so multiple options can use the same notification implementation. diff --git a/src/options/base_handlers.h b/src/options/base_handlers.h index 64353af5d..5c223d770 100644 --- a/src/options/base_handlers.h +++ b/src/options/base_handlers.h @@ -26,7 +26,7 @@ #include "options/option_exception.h" -namespace CVC4 { +namespace CVC5 { namespace options { template <template <class U> class Cmp> @@ -80,7 +80,7 @@ struct not_equal : public comparator<std::not_equal_to> { not_equal(double d) : comparator<std::not_equal_to>(d) {} };/* struct not_equal_to */ -}/* CVC4::options namespace */ -}/* CVC4 namespace */ +} // namespace options +} // namespace CVC5 #endif /* CVC4__BASE_HANDLERS_H */ diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h index 42fef60bc..88def99e6 100644 --- a/src/options/decision_weight.h +++ b/src/options/decision_weight.h @@ -19,12 +19,12 @@ #ifndef CVC4__OPTIONS__DECISION_WEIGHT_H #define CVC4__OPTIONS__DECISION_WEIGHT_H -namespace CVC4 { +namespace CVC5 { namespace decision { typedef uint64_t DecisionWeight; -}/* CVC4::decision namespace */ -}/* CVC4 namespace */ +} // namespace decision +} // namespace CVC5 #endif /* CVC4__OPTIONS__DECISION_WEIGHT_H */ diff --git a/src/options/didyoumean.cpp b/src/options/didyoumean.cpp index 305d9b5c4..02307063b 100644 --- a/src/options/didyoumean.cpp +++ b/src/options/didyoumean.cpp @@ -25,7 +25,7 @@ #include <string> #include <vector> -namespace CVC4 { +namespace CVC5 { std::vector<std::string> DidYouMean::getMatch(std::string input) { /** Magic numbers */ @@ -158,4 +158,4 @@ std::string DidYouMean::getMatchAsString(std::string input, int prefixNewLines, return oss.str(); } -} /* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/options/didyoumean.h b/src/options/didyoumean.h index d829214e4..79deeb004 100644 --- a/src/options/didyoumean.h +++ b/src/options/didyoumean.h @@ -23,7 +23,7 @@ #include <string> #include <vector> -namespace CVC4 { +namespace CVC5 { class DidYouMean { public: @@ -50,4 +50,4 @@ class DidYouMean { Words d_words; }; -} /*CVC4 namespace*/ +} // namespace CVC5 diff --git a/src/options/didyoumean_test.cpp b/src/options/didyoumean_test.cpp index 20d4ee162..7ea8e1243 100644 --- a/src/options/didyoumean_test.cpp +++ b/src/options/didyoumean_test.cpp @@ -23,7 +23,7 @@ #include <iostream> using namespace std; -using namespace CVC4; +using namespace CVC5; set<string> getDebugTags(); set<string> getOptionStrings(); diff --git a/src/options/language.cpp b/src/options/language.cpp index abd0d9124..bf8f5d7bf 100644 --- a/src/options/language.cpp +++ b/src/options/language.cpp @@ -21,7 +21,7 @@ #include "base/exception.h" #include "options/option_exception.h" -namespace CVC4 { +namespace CVC5 { namespace language { /** define the end points of smt2 languages */ @@ -83,7 +83,7 @@ InputLanguage toInputLanguage(OutputLanguage language) { std::stringstream ss; ss << "Cannot map output language `" << language << "' to an input language."; - throw CVC4::Exception(ss.str()); + throw CVC5::Exception(ss.str()); } }/* switch(language) */ }/* toInputLanguage() */ @@ -170,5 +170,5 @@ InputLanguage toInputLanguage(std::string language) { throw OptionException(std::string("unknown input language `" + language + "'")); }/* toInputLanguage() */ -}/* CVC4::language namespace */ -}/* CVC4 namespace */ +} // namespace language +} // namespace CVC5 diff --git a/src/options/language.h b/src/options/language.h index a8b42fec1..99ee40c28 100644 --- a/src/options/language.h +++ b/src/options/language.h @@ -24,7 +24,7 @@ #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { namespace language { namespace input { @@ -83,7 +83,7 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) { return out; } -}/* CVC4::language::input namespace */ +} // namespace input namespace output { @@ -147,9 +147,9 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) { return out; } -}/* CVC4::language::output namespace */ +} // namespace output -}/* CVC4::language namespace */ +} // namespace language typedef language::input::Language InputLanguage; typedef language::output::Language OutputLanguage; @@ -176,7 +176,7 @@ OutputLanguage toOutputLanguage(InputLanguage language) CVC4_EXPORT; InputLanguage toInputLanguage(std::string language) CVC4_EXPORT; OutputLanguage toOutputLanguage(std::string language) CVC4_EXPORT; -}/* CVC4::language namespace */ -}/* CVC4 namespace */ +} // namespace language +} // namespace CVC5 #endif /* CVC4__LANGUAGE_H */ diff --git a/src/options/module_template.cpp b/src/options/module_template.cpp index 32670d846..105ab94f8 100644 --- a/src/options/module_template.cpp +++ b/src/options/module_template.cpp @@ -18,7 +18,8 @@ #include "options/options_holder.h" #include "base/check.h" -namespace CVC4 { +// clang-format off +namespace CVC5 { ${accs}$ @@ -30,4 +31,5 @@ ${defs}$ ${modes}$ } // namespace options -} // namespace CVC4 +} // namespace CVC5 +// clang-format on diff --git a/src/options/module_template.h b/src/options/module_template.h index 33d0de629..501e5cf43 100644 --- a/src/options/module_template.h +++ b/src/options/module_template.h @@ -22,14 +22,12 @@ #include "options/options.h" +// clang-format off ${includes}$ - ${holder_spec}$ - -namespace CVC4 { - +namespace CVC5 { namespace options { ${modes}$ @@ -40,12 +38,11 @@ ${decls}$ ${specs}$ - namespace options { - ${inls}$ } // namespace options -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__OPTIONS__${id}$_H */ +//clang-format on diff --git a/src/options/open_ostream.cpp b/src/options/open_ostream.cpp index f03584c55..03c3e63ff 100644 --- a/src/options/open_ostream.cpp +++ b/src/options/open_ostream.cpp @@ -28,7 +28,7 @@ #include "lib/strtok_r.h" #include "options/parser_options.h" -namespace CVC4 { +namespace CVC5 { OstreamOpener::OstreamOpener(const char* channelName) : d_channelName(channelName) @@ -98,4 +98,4 @@ std::string cvc4_errno_failreason() { #endif /* HAVE_STRERROR_R */ } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/options/open_ostream.h b/src/options/open_ostream.h index 6c6046d86..4f879cd6d 100644 --- a/src/options/open_ostream.h +++ b/src/options/open_ostream.h @@ -25,7 +25,7 @@ #include <string> #include <utility> -namespace CVC4 { +namespace CVC5 { class OstreamOpener { public: @@ -55,6 +55,6 @@ class OstreamOpener { std::string cvc4_errno_failreason(); -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__OPEN_OSTREAM_H */ diff --git a/src/options/option_exception.cpp b/src/options/option_exception.cpp index 35cbc9b73..997f7d84a 100644 --- a/src/options/option_exception.cpp +++ b/src/options/option_exception.cpp @@ -16,6 +16,6 @@ #include "options/option_exception.h" -namespace CVC4 { +namespace CVC5 { const std::string OptionException::s_errPrefix = "Error in option parsing: "; -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/options/option_exception.h b/src/options/option_exception.h index 11d6b8fd3..6b522c30a 100644 --- a/src/options/option_exception.h +++ b/src/options/option_exception.h @@ -22,7 +22,7 @@ #include "base/exception.h" #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { /** * Class representing an option-parsing exception such as badly-typed @@ -30,10 +30,10 @@ namespace CVC4 { * name is itself unrecognized, a UnrecognizedOptionException (a derived * class, below) should be used instead. */ -class CVC4_EXPORT OptionException : public CVC4::Exception +class CVC4_EXPORT OptionException : public CVC5::Exception { public: - OptionException(const std::string& s) : CVC4::Exception(s_errPrefix + s) {} + OptionException(const std::string& s) : CVC5::Exception(s_errPrefix + s) {} /** * Get the error message without the prefix that is automatically added for @@ -53,18 +53,22 @@ class CVC4_EXPORT OptionException : public CVC4::Exception * Class representing an exception in option processing due to an * unrecognized or unsupported option key. */ -class UnrecognizedOptionException : public CVC4::OptionException +class UnrecognizedOptionException : public CVC5::OptionException { public: - UnrecognizedOptionException() : - CVC4::OptionException("Unrecognized informational or option key or setting") { + UnrecognizedOptionException() + : CVC5::OptionException( + "Unrecognized informational or option key or setting") + { } - UnrecognizedOptionException(const std::string& msg) : - CVC4::OptionException("Unrecognized informational or option key or setting: " + msg) { + UnrecognizedOptionException(const std::string& msg) + : CVC5::OptionException( + "Unrecognized informational or option key or setting: " + msg) + { } }; /* class UnrecognizedOptionException */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__OPTION_EXCEPTION_H */ diff --git a/src/options/options.h b/src/options/options.h index 728e5c7c8..6958f350c 100644 --- a/src/options/options.h +++ b/src/options/options.h @@ -31,7 +31,7 @@ #include "options/option_exception.h" #include "options/printer_modes.h" -namespace CVC4 { +namespace CVC5 { namespace api { class Solver; @@ -39,7 +39,7 @@ class Solver; namespace options { struct OptionsHolder; class OptionsHandler; -}/* CVC4::options namespace */ + } // namespace options class OptionsListener; @@ -306,6 +306,6 @@ public: std::vector<std::string>* nonoptions); }; /* class Options */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__OPTIONS__OPTIONS_H */ diff --git a/src/options/options_handler.cpp b/src/options/options_handler.cpp index ee3242067..250fd98ac 100644 --- a/src/options/options_handler.cpp +++ b/src/options/options_handler.cpp @@ -38,7 +38,7 @@ #include "options/smt_options.h" #include "options/theory_options.h" -namespace CVC4 { +namespace CVC5 { namespace options { // helper functions @@ -505,26 +505,26 @@ InputLanguage OptionsHandler::stringToInputLanguage(std::string option, void OptionsHandler::setVerbosity(std::string option, int value) { if(Configuration::isMuzzledBuild()) { - DebugChannel.setStream(&CVC4::null_os); - TraceChannel.setStream(&CVC4::null_os); - NoticeChannel.setStream(&CVC4::null_os); - ChatChannel.setStream(&CVC4::null_os); - MessageChannel.setStream(&CVC4::null_os); - WarningChannel.setStream(&CVC4::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); } else { if(value < 2) { - ChatChannel.setStream(&CVC4::null_os); + ChatChannel.setStream(&CVC5::null_os); } else { ChatChannel.setStream(&std::cout); } if(value < 1) { - NoticeChannel.setStream(&CVC4::null_os); + NoticeChannel.setStream(&CVC5::null_os); } else { NoticeChannel.setStream(&std::cout); } if(value < 0) { - MessageChannel.setStream(&CVC4::null_os); - WarningChannel.setStream(&CVC4::null_os); + MessageChannel.setStream(&CVC5::null_os); + WarningChannel.setStream(&CVC5::null_os); } else { MessageChannel.setStream(&std::cout); WarningChannel.setStream(&std::cerr); @@ -542,6 +542,5 @@ void OptionsHandler::decreaseVerbosity(std::string option) { setVerbosity(option, options::verbosity()); } - -}/* CVC4::options namespace */ -}/* CVC4 namespace */ +} // namespace options +} // namespace CVC5 diff --git a/src/options/options_handler.h b/src/options/options_handler.h index b24fb032f..cf59c783a 100644 --- a/src/options/options_handler.h +++ b/src/options/options_handler.h @@ -30,7 +30,7 @@ #include "options/printer_modes.h" #include "options/quantifiers_options.h" -namespace CVC4 { +namespace CVC5 { class Options; @@ -133,7 +133,7 @@ void OptionsHandler::checkSatSolverEnabled(std::string option, T m) #endif } -}/* CVC4::options namespace */ -}/* CVC4 namespace */ +} // namespace options +} // namespace CVC5 #endif /* CVC4__OPTIONS__OPTIONS_HANDLER_H */ diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h index 781d6f037..e8cab00c7 100644 --- a/src/options/options_holder_template.h +++ b/src/options/options_holder_template.h @@ -19,20 +19,21 @@ #ifndef CVC4__OPTIONS__OPTIONS_HOLDER_H #define CVC4__OPTIONS__OPTIONS_HOLDER_H +// clang-format off ${headers_module}$ - -namespace CVC4 { +namespace CVC5 { namespace options { -struct OptionsHolder { +struct OptionsHolder +{ OptionsHolder(); ${macros_module}$ - -};/* struct OptionsHolder */ +}; /* struct OptionsHolder */ } // namespace options -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__OPTIONS__OPTIONS_HOLDER_H */ +// clang-format on diff --git a/src/options/options_listener.h b/src/options/options_listener.h index 589d49323..9cbdfaf97 100644 --- a/src/options/options_listener.h +++ b/src/options/options_listener.h @@ -19,7 +19,7 @@ #include <string> -namespace CVC4 { +namespace CVC5 { class OptionsListener { @@ -32,6 +32,6 @@ class OptionsListener virtual void notifySetOption(const std::string& key) = 0; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__OPTIONS__OPTION_LISTENER_H */ diff --git a/src/options/options_public_functions.cpp b/src/options/options_public_functions.cpp index 5ef04bc6d..d7768c6c8 100644 --- a/src/options/options_public_functions.cpp +++ b/src/options/options_public_functions.cpp @@ -36,7 +36,7 @@ #include "options/smt_options.h" #include "options/uf_options.h" -namespace CVC4 { +namespace CVC5 { // Get accessor functions. InputLanguage Options::getInputLanguage() const { @@ -238,4 +238,4 @@ void Options::flushOut() { } } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp index 4d11aa522..a0037d162 100644 --- a/src/options/options_template.cpp +++ b/src/options/options_template.cpp @@ -55,20 +55,19 @@ extern int optreset; #include "options/options_handler.h" #include "options/options_listener.h" +// clang-format off ${headers_module}$ - #include "options/options_holder.h" #include "cvc4autoconfig.h" #include "options/base_handlers.h" ${headers_handler}$ +using namespace CVC5; +using namespace CVC5::options; -using namespace CVC4; -using namespace CVC4::options; - -namespace CVC4 { +namespace CVC5 { thread_local Options* Options::s_current = NULL; @@ -367,10 +366,10 @@ public: } };/* class OptionsGuard */ -}/* CVC4::options namespace */ +} // namespace options /** - * Parse argc/argv and put the result into a CVC4::Options. + * Parse argc/argv and put the result into a CVC5::Options. * The return value is what's left of the command line (that is, the * non-option arguments). * @@ -505,7 +504,8 @@ void Options::parseOptionsRecursive(Options* options, Debug("preemptGetopt") << "processing option " << c << " (`" << char(c) << "'), " << option << std::endl; - switch(c) { + switch(c) + { ${options_handler}$ @@ -601,4 +601,5 @@ std::string Options::getOption(const std::string& key) const #undef USE_EARLY_TYPE_CHECKING_BY_DEFAULT #undef DO_SEMANTIC_CHECKS_BY_DEFAULT -} // namespace CVC4 +} // namespace CVC5 +// clang-format on diff --git a/src/options/printer_modes.cpp b/src/options/printer_modes.cpp index 3fe73be29..7e659b14c 100644 --- a/src/options/printer_modes.cpp +++ b/src/options/printer_modes.cpp @@ -17,7 +17,7 @@ #include "options/printer_modes.h" -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, options::InstFormatMode mode) { @@ -31,4 +31,4 @@ std::ostream& operator<<(std::ostream& out, options::InstFormatMode mode) return out; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h index d4cdbd9a4..7f9bcc58b 100644 --- a/src/options/printer_modes.h +++ b/src/options/printer_modes.h @@ -22,7 +22,7 @@ #include <iostream> -namespace CVC4 { +namespace CVC5 { namespace options { /** Enumeration of inst_format modes (how to print models from get-model @@ -39,6 +39,6 @@ enum class InstFormatMode std::ostream& operator<<(std::ostream& out, options::InstFormatMode mode); -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__MODEL_FORMAT_H */ diff --git a/src/options/set_language.cpp b/src/options/set_language.cpp index 567d909cb..53dca6220 100644 --- a/src/options/set_language.cpp +++ b/src/options/set_language.cpp @@ -22,7 +22,7 @@ #include "options/language.h" #include "options/options.h" -namespace CVC4 { +namespace CVC5 { namespace language { const int SetLanguage::s_iosIndex = std::ios_base::xalloc(); @@ -78,5 +78,5 @@ std::ostream& operator<<(std::ostream& out, SetLanguage l) { return out; } -}/* CVC4::language namespace */ -}/* CVC4 namespace */ +} // namespace language +} // namespace CVC5 diff --git a/src/options/set_language.h b/src/options/set_language.h index b94bdf1d8..d6b9a2da9 100644 --- a/src/options/set_language.h +++ b/src/options/set_language.h @@ -24,7 +24,7 @@ #include "cvc4_export.h" #include "options/language.h" -namespace CVC4 { +namespace CVC5 { namespace language { /** @@ -90,7 +90,7 @@ private: */ std::ostream& operator<<(std::ostream& out, SetLanguage l) CVC4_EXPORT; -}/* CVC4::language namespace */ -}/* CVC4 namespace */ +} // namespace language +} // namespace CVC5 #endif /* CVC4__OPTIONS__SET_LANGUAGE_H */ |