diff --git a/src/api/python/z3/z3.py b/src/api/python/z3/z3.py index 71385cd1c..540a2b728 100644 --- a/src/api/python/z3/z3.py +++ b/src/api/python/z3/z3.py @@ -1270,7 +1270,7 @@ def Distinct(*args): >>> simplify(Distinct(x, y, z)) Distinct(x, y, z) >>> simplify(Distinct(x, y, z), blast_distinct=True) - And(Not(x == y), Not(z == x), Not(z == y)) + And(Not(y == x), Not(z == x), Not(z == y)) """ args = _get_args(args) ctx = _ctx_from_ast_arg_list(args) @@ -1630,7 +1630,7 @@ def Xor(a, b, ctx=None): >>> Xor(p, q) Xor(p, q) >>> simplify(Xor(p, q)) - Not(p) == q + q == Not(p) """ ctx = _get_ctx(_ctx_from_ast_arg_list([a, b], ctx)) s = BoolSort(ctx) @@ -8158,7 +8158,7 @@ def simplify(a, *arguments, **keywords): >>> simplify((x + 1)*(y + 1), som=True) 1 + x + y + x*y >>> simplify(Distinct(x, y, 1), blast_distinct=True) - And(Not(y == x), Not(1 == x), Not(y == 1)) + And(Not(x == y), Not(x == 1), Not(1 == y)) >>> simplify(And(x == 0, y == 1), elim_and=True) Not(Or(Not(x == 0), Not(y == 1))) """ diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp index a0ee29130..ffc78f7ef 100644 --- a/src/ast/ast.cpp +++ b/src/ast/ast.cpp @@ -169,7 +169,7 @@ bool family_manager::has_family(symbol const & s) const { return m_families.contains(s); } -#if 0 +#if 1 static unsigned s_count = 0; void ast::inc_ref() { SASSERT(m_ref_count < UINT_MAX); diff --git a/src/ast/ast.h b/src/ast/ast.h index 05b4c241e..d06750b30 100644 --- a/src/ast/ast.h +++ b/src/ast/ast.h @@ -482,7 +482,7 @@ protected: void * m_mark2_owner; #endif -#if 1 +#if 0 void inc_ref() { SASSERT(m_ref_count < UINT_MAX); m_ref_count ++;