3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-08 00:05:46 +00:00

Merge branch 'master' of https://github.com/Z3Prover/z3 into csp

This commit is contained in:
Nikolaj Bjorner 2018-10-21 12:26:53 -07:00
commit ccca063e54
254 changed files with 1194 additions and 1753 deletions

View file

@ -476,7 +476,7 @@ struct check_logic::imp {
quick_for_each_expr(*this, n);
return true;
}
catch (failed) {
catch (const failed &) {
return false;
}
}
@ -495,7 +495,7 @@ struct check_logic::imp {
check_sort(f->get_range());
return true;
}
catch (failed) {
catch (const failed &) {
return false;
}
}

View file

@ -1883,7 +1883,7 @@ void cmd_context::validate_model() {
for_each_expr(contains_underspecified, a);
for_each_expr(contains_underspecified, r);
}
catch (contains_underspecified_op_proc::found) {
catch (const contains_underspecified_op_proc::found &) {
continue;
}
TRACE("model_validate", model_smt2_pp(tout, *this, *md, 0););

View file

@ -85,7 +85,7 @@ ATOMIC_CMD(get_user_tactics_cmd, "get-user-tactics", "display tactics defined us
void help_tactic(cmd_context & ctx) {
std::ostringstream buf;
buf << "combinators:\n";
buf << "- (and-then <tactic>+) executes the given tactics sequencially.\n";
buf << "- (and-then <tactic>+) executes the given tactics sequentially.\n";
buf << "- (or-else <tactic>+) tries the given tactics in sequence until one of them succeeds (i.e., the first that doesn't fail).\n";
buf << "- (par-or <tactic>+) executes the given tactics in parallel until one of them succeeds (i.e., the first that doesn't fail).\n";
buf << "- (par-then <tactic1> <tactic2>) executes tactic1 and then tactic2 to every subgoal produced by tactic1. All subgoals are processed in parallel.\n";