diff options
Diffstat (limited to 'src/options')
25 files changed, 67 insertions, 67 deletions
diff --git a/src/options/README b/src/options/README index 92609f433..8c41a28bb 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, CVC5::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 5c223d770..895a450a3 100644 --- a/src/options/base_handlers.h +++ b/src/options/base_handlers.h @@ -26,7 +26,7 @@ #include "options/option_exception.h" -namespace CVC5 { +namespace cvc5 { namespace options { template <template <class U> class Cmp> @@ -81,6 +81,6 @@ struct not_equal : public comparator<std::not_equal_to> { };/* struct not_equal_to */ } // namespace options -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__BASE_HANDLERS_H */ diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h index 88def99e6..851efc565 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 CVC5 { +namespace cvc5 { namespace decision { typedef uint64_t DecisionWeight; } // namespace decision -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__OPTIONS__DECISION_WEIGHT_H */ diff --git a/src/options/didyoumean.cpp b/src/options/didyoumean.cpp index 02307063b..8f539cdd3 100644 --- a/src/options/didyoumean.cpp +++ b/src/options/didyoumean.cpp @@ -25,7 +25,7 @@ #include <string> #include <vector> -namespace CVC5 { +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(); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/didyoumean.h b/src/options/didyoumean.h index 79deeb004..e0da600b8 100644 --- a/src/options/didyoumean.h +++ b/src/options/didyoumean.h @@ -23,7 +23,7 @@ #include <string> #include <vector> -namespace CVC5 { +namespace cvc5 { class DidYouMean { public: @@ -50,4 +50,4 @@ class DidYouMean { Words d_words; }; -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/didyoumean_test.cpp b/src/options/didyoumean_test.cpp index 7ea8e1243..f4791db95 100644 --- a/src/options/didyoumean_test.cpp +++ b/src/options/didyoumean_test.cpp @@ -23,7 +23,7 @@ #include <iostream> using namespace std; -using namespace CVC5; +using namespace cvc5; set<string> getDebugTags(); set<string> getOptionStrings(); diff --git a/src/options/language.cpp b/src/options/language.cpp index bf8f5d7bf..8fb1ad53a 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 CVC5 { +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 CVC5::Exception(ss.str()); + throw cvc5::Exception(ss.str()); } }/* switch(language) */ }/* toInputLanguage() */ @@ -171,4 +171,4 @@ InputLanguage toInputLanguage(std::string language) { }/* toInputLanguage() */ } // namespace language -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/language.h b/src/options/language.h index 99ee40c28..9ed7fb4d4 100644 --- a/src/options/language.h +++ b/src/options/language.h @@ -24,7 +24,7 @@ #include "cvc4_export.h" -namespace CVC5 { +namespace cvc5 { namespace language { namespace input { @@ -177,6 +177,6 @@ InputLanguage toInputLanguage(std::string language) CVC4_EXPORT; OutputLanguage toOutputLanguage(std::string language) CVC4_EXPORT; } // namespace language -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__LANGUAGE_H */ diff --git a/src/options/module_template.cpp b/src/options/module_template.cpp index 105ab94f8..c05017c70 100644 --- a/src/options/module_template.cpp +++ b/src/options/module_template.cpp @@ -19,7 +19,7 @@ #include "base/check.h" // clang-format off -namespace CVC5 { +namespace cvc5 { ${accs}$ @@ -31,5 +31,5 @@ ${defs}$ ${modes}$ } // namespace options -} // namespace CVC5 +} // namespace cvc5 // clang-format on diff --git a/src/options/module_template.h b/src/options/module_template.h index 501e5cf43..7e4b7775d 100644 --- a/src/options/module_template.h +++ b/src/options/module_template.h @@ -27,7 +27,7 @@ ${includes}$ ${holder_spec}$ -namespace CVC5 { +namespace cvc5 { namespace options { ${modes}$ @@ -42,7 +42,7 @@ namespace options { ${inls}$ } // namespace options -} // namespace CVC5 +} // 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 03c3e63ff..850fdce80 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 CVC5 { +namespace cvc5 { OstreamOpener::OstreamOpener(const char* channelName) : d_channelName(channelName) @@ -98,4 +98,4 @@ std::string cvc4_errno_failreason() { #endif /* HAVE_STRERROR_R */ } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/open_ostream.h b/src/options/open_ostream.h index 4f879cd6d..22e3ca16b 100644 --- a/src/options/open_ostream.h +++ b/src/options/open_ostream.h @@ -25,7 +25,7 @@ #include <string> #include <utility> -namespace CVC5 { +namespace cvc5 { class OstreamOpener { public: @@ -55,6 +55,6 @@ class OstreamOpener { std::string cvc4_errno_failreason(); -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__OPEN_OSTREAM_H */ diff --git a/src/options/option_exception.cpp b/src/options/option_exception.cpp index 997f7d84a..07a8a8e57 100644 --- a/src/options/option_exception.cpp +++ b/src/options/option_exception.cpp @@ -16,6 +16,6 @@ #include "options/option_exception.h" -namespace CVC5 { +namespace cvc5 { const std::string OptionException::s_errPrefix = "Error in option parsing: "; -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/option_exception.h b/src/options/option_exception.h index 6b522c30a..bfaa2a421 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 CVC5 { +namespace cvc5 { /** * Class representing an option-parsing exception such as badly-typed @@ -30,10 +30,10 @@ namespace CVC5 { * name is itself unrecognized, a UnrecognizedOptionException (a derived * class, below) should be used instead. */ -class CVC4_EXPORT OptionException : public CVC5::Exception +class CVC4_EXPORT OptionException : public cvc5::Exception { public: - OptionException(const std::string& s) : CVC5::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,22 +53,22 @@ class CVC4_EXPORT OptionException : public CVC5::Exception * Class representing an exception in option processing due to an * unrecognized or unsupported option key. */ -class UnrecognizedOptionException : public CVC5::OptionException +class UnrecognizedOptionException : public cvc5::OptionException { public: UnrecognizedOptionException() - : CVC5::OptionException( + : cvc5::OptionException( "Unrecognized informational or option key or setting") { } UnrecognizedOptionException(const std::string& msg) - : CVC5::OptionException( + : cvc5::OptionException( "Unrecognized informational or option key or setting: " + msg) { } }; /* class UnrecognizedOptionException */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__OPTION_EXCEPTION_H */ diff --git a/src/options/options.h b/src/options/options.h index 6958f350c..1c62d5a07 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 CVC5 { +namespace cvc5 { namespace api { class Solver; @@ -306,6 +306,6 @@ public: std::vector<std::string>* nonoptions); }; /* class Options */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__OPTIONS__OPTIONS_H */ diff --git a/src/options/options_handler.cpp b/src/options/options_handler.cpp index 250fd98ac..ccffd17ec 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 CVC5 { +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(&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); } else { if(value < 2) { - ChatChannel.setStream(&CVC5::null_os); + ChatChannel.setStream(&cvc5::null_os); } else { ChatChannel.setStream(&std::cout); } if(value < 1) { - NoticeChannel.setStream(&CVC5::null_os); + NoticeChannel.setStream(&cvc5::null_os); } else { NoticeChannel.setStream(&std::cout); } if(value < 0) { - MessageChannel.setStream(&CVC5::null_os); - WarningChannel.setStream(&CVC5::null_os); + MessageChannel.setStream(&cvc5::null_os); + WarningChannel.setStream(&cvc5::null_os); } else { MessageChannel.setStream(&std::cout); WarningChannel.setStream(&std::cerr); @@ -543,4 +543,4 @@ void OptionsHandler::decreaseVerbosity(std::string option) { } } // namespace options -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/options_handler.h b/src/options/options_handler.h index cf59c783a..ce174d32e 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 CVC5 { +namespace cvc5 { class Options; @@ -134,6 +134,6 @@ void OptionsHandler::checkSatSolverEnabled(std::string option, T m) } } // namespace options -} // namespace CVC5 +} // 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 e8cab00c7..956cd87bf 100644 --- a/src/options/options_holder_template.h +++ b/src/options/options_holder_template.h @@ -22,7 +22,7 @@ // clang-format off ${headers_module}$ -namespace CVC5 { +namespace cvc5 { namespace options { struct OptionsHolder @@ -33,7 +33,7 @@ struct OptionsHolder }; /* struct OptionsHolder */ } // namespace options -} // namespace CVC5 +} // 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 9cbdfaf97..a5a2218b2 100644 --- a/src/options/options_listener.h +++ b/src/options/options_listener.h @@ -19,7 +19,7 @@ #include <string> -namespace CVC5 { +namespace cvc5 { class OptionsListener { @@ -32,6 +32,6 @@ class OptionsListener virtual void notifySetOption(const std::string& key) = 0; }; -} // namespace CVC5 +} // 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 d7768c6c8..1bccc283f 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 CVC5 { +namespace cvc5 { // Get accessor functions. InputLanguage Options::getInputLanguage() const { @@ -238,4 +238,4 @@ void Options::flushOut() { } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp index a0037d162..f158f29e6 100644 --- a/src/options/options_template.cpp +++ b/src/options/options_template.cpp @@ -64,10 +64,10 @@ ${headers_module}$ ${headers_handler}$ -using namespace CVC5; -using namespace CVC5::options; +using namespace cvc5; +using namespace cvc5::options; -namespace CVC5 { +namespace cvc5 { thread_local Options* Options::s_current = NULL; @@ -369,7 +369,7 @@ public: } // namespace options /** - * Parse argc/argv and put the result into a CVC5::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). * @@ -601,5 +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 CVC5 +} // namespace cvc5 // clang-format on diff --git a/src/options/printer_modes.cpp b/src/options/printer_modes.cpp index 7e659b14c..1ea0a3bbe 100644 --- a/src/options/printer_modes.cpp +++ b/src/options/printer_modes.cpp @@ -17,7 +17,7 @@ #include "options/printer_modes.h" -namespace CVC5 { +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 CVC5 +} // namespace cvc5 diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h index 7f9bcc58b..f5da12b36 100644 --- a/src/options/printer_modes.h +++ b/src/options/printer_modes.h @@ -22,7 +22,7 @@ #include <iostream> -namespace CVC5 { +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 CVC5 +} // namespace cvc5 #endif /* CVC4__PRINTER__MODEL_FORMAT_H */ diff --git a/src/options/set_language.cpp b/src/options/set_language.cpp index 53dca6220..b4403f11e 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 CVC5 { +namespace cvc5 { namespace language { const int SetLanguage::s_iosIndex = std::ios_base::xalloc(); @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, SetLanguage l) { } } // namespace language -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/options/set_language.h b/src/options/set_language.h index d6b9a2da9..cebd4f65e 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 CVC5 { +namespace cvc5 { namespace language { /** @@ -91,6 +91,6 @@ private: std::ostream& operator<<(std::ostream& out, SetLanguage l) CVC4_EXPORT; } // namespace language -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__OPTIONS__SET_LANGUAGE_H */ |