mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-04 05:19:11 +00:00
Code Activity

improve error messages on incorrect parameter passing

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-10-15 21:37:37 -07:00
parent 097f4c3a34
commit 7767a23626
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cmd_context/context_params.cpp
View file

@ -86,7 +86,13 @@ void context_params::set(char const * param, char const * value) {
set_bool(m_smtlib2_compliant, param, value); set_bool(m_smtlib2_compliant, param, value);
} }
else { else {
throw default_exception("unknown parameter '%s'", p.c_str()); param_descrs d;
collect_param_descrs(d);
std::stringstream strm;
strm << "unknown parameter '" << p << "'\n";
strm << "Legal parameters are:\n";
d.display(strm, 2, false, false);
throw default_exception(strm.str());
} }
} }

4
src/smt/arith_eq_solver.cpp
View file

@ -604,7 +604,9 @@ bool arith_eq_solver::solve_integer_equations_gcd(
} }
SASSERT(g == r0[i]); SASSERT(g == r0[i]);
} }
SASSERT(abs(r0[i]).is_one()); if (!abs(r0[i]).is_one()) {
return false;
}
live.erase(live.begin()+live_pos); live.erase(live.begin()+live_pos);
for (j = 0; j < live.size(); ++j) { for (j = 0; j < live.size(); ++j) {
row& r = rows[live[j]]; row& r = rows[live[j]];

21
src/util/gparams.cpp
View file

@ -201,7 +201,7 @@ public:
} }
} }
void throw_unknown_parameter(symbol const & param_name, symbol const & mod_name) { void throw_unknown_parameter(symbol const & param_name, param_descrs const& d, symbol const & mod_name) {
if (mod_name == symbol::null) { if (mod_name == symbol::null) {
char const * new_name = get_new_param_name(param_name); char const * new_name = get_new_param_name(param_name);
if (new_name) { if (new_name) {
@ -213,11 +213,20 @@ public:
param_name.bare_str()); param_name.bare_str());
} }
else { else {
throw exception("unknown parameter '%s'", param_name.bare_str()); std::stringstream strm;
strm << "unknown parameter '" << param_name << "'\n";
strm << "Legal parameters are:\n";
d.display(strm, 2, false, false);
throw default_exception(strm.str());
} }
} }
else { else {
throw exception("unknown parameter '%s' at module '%s'", param_name.bare_str(), mod_name.bare_str()); std::stringstream strm;
strm << "unknown parameter '" << param_name << "' ";
strm << "at module '" << mod_name << "'\n";
strm << "Legal parameters are:\n";
d.display(strm, 2, false, false);
throw default_exception(strm.str());
} }
} }
@ -225,7 +234,7 @@ public:
param_kind k = d.get_kind(param_name); param_kind k = d.get_kind(param_name);
params_ref & ps = get_params(mod_name); params_ref & ps = get_params(mod_name);
if (k == CPK_INVALID) { if (k == CPK_INVALID) {
throw_unknown_parameter(param_name, mod_name); throw_unknown_parameter(param_name, d, mod_name);
} }
else if (k == CPK_UINT) { else if (k == CPK_UINT) {
long val = strtol(value, 0, 10); long val = strtol(value, 0, 10);
@ -312,7 +321,7 @@ public:
std::string get_default(param_descrs const & d, symbol const & p, symbol const & m) { std::string get_default(param_descrs const & d, symbol const & p, symbol const & m) {
if (!d.contains(p)) { if (!d.contains(p)) {
throw_unknown_parameter(p, m); throw_unknown_parameter(p, d, m);
} }
char const * r = d.get_default(p); char const * r = d.get_default(p);
if (r == 0) if (r == 0)
@ -478,7 +487,7 @@ public:
throw exception("unknown module '%s'", m.bare_str()); throw exception("unknown module '%s'", m.bare_str());
} }
if (!d->contains(p)) if (!d->contains(p))
throw_unknown_parameter(p, m); throw_unknown_parameter(p, *d, m);
out << " name: " << p << "\n"; out << " name: " << p << "\n";
if (m != symbol::null) { if (m != symbol::null) {
out << " module: " << m << "\n"; out << " module: " << m << "\n";