3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-02 21:37:02 +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

@ -2048,7 +2048,7 @@ namespace smt2 {
if (expr_stack().size() == fr->m_expr_spos) {
if (!ignore_bad_patterns())
throw parser_exception("invalid empty pattern");
// ingoring empty pattern
// ignoring empty pattern
expr_stack().shrink(fr->m_expr_spos);
}
else {
@ -2761,7 +2761,7 @@ namespace smt2 {
next();
}
unsigned spos = sort_stack().size();
parse_sorts("Invalid function name. Expecting sort list startig with '(' to disambiguate function name");
parse_sorts("Invalid function name. Expecting sort list starting with '(' to disambiguate function name");
unsigned domain_size = sort_stack().size() - spos;
parse_sort("Invalid function name");
func_decl * d = m_ctx.find_func_decl(id, indices.size(), indices.c_ptr(), domain_size, sort_stack().c_ptr() + spos, sort_stack().back());
@ -3148,7 +3148,7 @@ namespace smt2 {
<< ": " << ex.msg() << "\")" << std::endl;
exit(ex.error_code());
}
catch (stop_parser_exception) {
catch (const stop_parser_exception &) {
m_scanner.stop_caching();
return !found_errors;
}

View file

@ -118,7 +118,7 @@ bool simple_parser::parse(std::istream & in, expr_ref & result) {
if (!result)
throw parser_error();
}
catch (parser_error) {
catch (const parser_error &) {
warning_msg("parser error");
return false;
}