mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

enforce stringstream formatting to avoid default format routine. fixes issue #149

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-07-06 09:11:52 -07:00
parent 3fd5d0eaba
commit 940fed16e1
6 changed files with 71 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/util/gparams.cpp
View file

@ -205,12 +205,17 @@ public:
if (mod_name == symbol::null) {
char const * new_name = get_new_param_name(param_name);
if (new_name) {
throw exception("the parameter '%s' was renamed to '%s', invoke 'z3 -p' to obtain the new parameter list, and 'z3 -pp:%s' for the full description of the parameter",
param_name.bare_str(), new_name, new_name);
std::stringstream strm;
strm << "the parameter '" << param_name
<< "', invoke 'z3 -p' to obtain the new parameter list, and 'z3 -pp:" << new_name
<< "' for the full description of the parameter";
throw exception(strm.str());
}
else if (is_old_param_name(param_name)) {
throw exception("unknown parameter '%s', this is an old parameter name, invoke 'z3 -p' to obtain the new parameter list",
param_name.bare_str());
std::stringstream strm;
strm << "unknown parameter '" << param_name
<< "', this is an old parameter name, invoke 'z3 -p' to obtain the new parameter list";
throw default_exception(strm.str());
}
else {
std::stringstream strm;
@ -290,10 +295,12 @@ public:
ps.set_bool(param_name, false);
}
else {
if (mod_name == symbol::null)
throw exception("invalid value '%s' for Boolean parameter '%s'", value, param_name.bare_str());
else
throw exception("invalid value '%s' for Boolean parameter '%s' at module '%s'", value, param_name.bare_str(), mod_name.bare_str());
std::stringstream strm;
strm << "invalid value '" << value << "' for Boolean parameter '" << param_name << "'";
if (mod_name == symbol::null) {
strm << " at module '" << mod_name << "'";
}
throw default_exception(strm.str());
}
}
else if (k == CPK_SYMBOL) {
@ -312,10 +319,12 @@ public:
ps.set_str(param_name, symbol(value).bare_str());
}
else {
if (mod_name == symbol::null)
throw exception("unsupported parameter type '%s'", param_name.bare_str());
else
throw exception("unsupported parameter type '%s' at module '%s'", param_name.bare_str(), mod_name.bare_str());
std::stringstream strm;
strm << "unsupported parameter type '" << param_name << "'";
if (mod_name == symbol::null) {
strm << " at module '" << mod_name << "'";
}
throw exception(strm.str());
}
}
@ -338,7 +347,9 @@ public:
set(*d, p, value, m);
}
else {
throw exception("invalid parameter, unknown module '%s'", m.bare_str());
std::stringstream strm;
strm << "invalid parameter, unknown module '" << m << "'";
throw exception(strm.str());
}
}
}
@ -396,7 +407,9 @@ public:
r = get_default(*d, p, m);
}
else {
throw exception("unknown module '%s'", m.bare_str());
std::stringstream strm;
strm << "unknown module '" << m << "'";
throw exception(strm.str());
}
}
}
@ -488,8 +501,11 @@ public:
{
try {
param_descrs * d = 0;
if (!get_module_param_descrs().find(module_name, d))
throw exception("unknown module '%s'", module_name.bare_str());
if (!get_module_param_descrs().find(module_name, d)) {
std::stringstream strm;
strm << "unknown module '" << module_name << "'";
throw exception(strm.str());
}
out << "[module] " << module_name;
char const * descr = 0;
if (get_module_descrs().find(module_name, descr)) {
@ -522,8 +538,11 @@ public:
d = &get_param_descrs();
}
else {
if (!get_module_param_descrs().find(m, d))
throw exception("unknown module '%s'", m.bare_str());
if (!get_module_param_descrs().find(m, d)) {
std::stringstream strm;
strm << "unknown module '" << m << "'";
throw exception(strm.str());
}
}
if (!d->contains(p))
throw_unknown_parameter(p, *d, m);

2
src/util/z3_exception.cpp
View file

@ -58,7 +58,7 @@ unsigned z3_error::error_code() const {
return m_error_code;
}
default_exception::default_exception(char const* msg, ...) {
default_exception::default_exception(fmt, char const* msg, ...) {
std::stringstream out;
va_list args;
va_start(args, msg);

3
src/util/z3_exception.h
View file

@ -40,8 +40,9 @@ public:
class default_exception : public z3_exception {
std::string m_msg;
public:
struct fmt {};
default_exception(std::string const& msg);
default_exception(char const* msg, ...);
default_exception(fmt, char const* msg, ...);
virtual ~default_exception() {}
virtual char const * msg() const;
};