mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

fixup std-order / inv-order

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-10-03 19:35:16 -07:00
parent 66bb310966
commit 969511ac00
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ast/has_free_vars.cpp
View file

@ -30,7 +30,7 @@ class contains_vars::imp {
void visit(expr * n, unsigned delta, bool & visited) { void visit(expr * n, unsigned delta, bool & visited) {
expr_delta_pair e(n, delta); expr_delta_pair e(n, delta);
if (!m_cache.contains(e)) { if (!is_ground(n) && !m_cache.contains(e)) {
m_todo.push_back(e); m_todo.push_back(e);
visited = false; visited = false;
} }
@ -74,6 +74,7 @@ public:
m_todo.push_back(expr_delta_pair(n, begin)); m_todo.push_back(expr_delta_pair(n, begin));
while (!m_todo.empty()) { while (!m_todo.empty()) {
expr_delta_pair e = m_todo.back(); expr_delta_pair e = m_todo.back();
if (visit_children(e.m_node, e.m_delta)) { if (visit_children(e.m_node, e.m_delta)) {
m_cache.insert(e); m_cache.insert(e);
m_todo.pop_back(); m_todo.pop_back();

2
src/ast/rewriter/var_subst.cpp
View file

@ -59,7 +59,7 @@ expr_ref var_subst::operator()(expr * n, unsigned num_args, expr * const * args)
new_args.push_back(arg); new_args.push_back(arg);
else { else {
unsigned idx = to_var(arg)->get_idx(); unsigned idx = to_var(arg)->get_idx();
new_args.push_back(m_std_order ? args[idx] : args[num_args - idx - 1]); new_args.push_back(m_std_order ? args[num_args - idx - 1] : args[idx]);
} }
} }
result = m.mk_app(to_app(n)->get_decl(), new_args.size(), new_args.data()); result = m.mk_app(to_app(n)->get_decl(), new_args.size(), new_args.data());

3
src/parsers/smt2/smt2parser.cpp
View file

@ -116,6 +116,7 @@ namespace smt2 {
symbol m_match; symbol m_match;
symbol m_case; symbol m_case;
symbol m_underscore; symbol m_underscore;
contains_vars m_has_free_vars;
typedef std::pair<symbol, expr*> named_expr; typedef std::pair<symbol, expr*> named_expr;
named_expr m_last_named_expr; named_expr m_last_named_expr;
@ -1031,7 +1032,7 @@ namespace smt2 {
void name_expr(expr * n, symbol const & s) { void name_expr(expr * n, symbol const & s) {
TRACE("name_expr", tout << "naming: " << s << " ->\n" << mk_pp(n, m()) << "\n";); TRACE("name_expr", tout << "naming: " << s << " ->\n" << mk_pp(n, m()) << "\n";);
if (!is_ground(n) && has_free_vars(n)) if (!is_ground(n) && m_has_free_vars(n))
throw parser_exception("invalid named expression, expression contains free variables"); throw parser_exception("invalid named expression, expression contains free variables");
m_ctx.insert(s, 0, nullptr, n); m_ctx.insert(s, 0, nullptr, n);
m_last_named_expr.first = s; m_last_named_expr.first = s;