3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00

reorder fields, rename overload name clash

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-08-25 16:01:39 -03:00
parent 64f4c9794d
commit 75a40d8f8e
7 changed files with 23 additions and 28 deletions

View file

@ -1861,15 +1861,6 @@ class QuantifierRef(BoolRef):
"""
return Z3_is_lambda(self.ctx_ref(), self.ast)
def __getitem__(self, arg):
"""Return the Z3 expression `self[arg]`.
"""
if z3_debug():
_z3_assert(self.is_lambda(), "quantifier should be a lambda expression")
arg = self.sort().domain().cast(arg)
return _to_expr_ref(Z3_mk_select(self.ctx_ref(), self.as_ast(), arg.as_ast()), self.ctx)
def weight(self):
"""Return the weight annotation of `self`.
@ -4297,9 +4288,6 @@ def is_array(a):
"""
return isinstance(a, ArrayRef)
def is_array_sort(a):
return Z3_get_sort_kind(a.ctx.ref(), Z3_get_sort(a.ctx.ref(), a.ast)) == Z3_ARRAY_SORT
def is_const_array(a):
"""Return `True` if `a` is a Z3 constant array.
@ -4424,7 +4412,7 @@ def Update(a, i, v):
proved
"""
if z3_debug():
_z3_assert(is_array_sort(a), "First argument must be a Z3 array expression")
_z3_assert(is_array(a), "First argument must be a Z3 array expression")
i = a.domain().cast(i)
v = a.range().cast(v)
ctx = a.ctx
@ -4437,7 +4425,7 @@ def Default(a):
proved
"""
if z3_debug():
_z3_assert(is_array_sort(a), "First argument must be a Z3 array expression")
_z3_assert(is_array(a), "First argument must be a Z3 array expression")
return a.default()
@ -4468,7 +4456,7 @@ def Select(a, i):
True
"""
if z3_debug():
_z3_assert(is_array_sort(a), "First argument must be a Z3 array expression")
_z3_assert(is_array(a), "First argument must be a Z3 array expression")
return a[i]
@ -4488,7 +4476,7 @@ def Map(f, *args):
if z3_debug():
_z3_assert(len(args) > 0, "At least one Z3 array expression expected")
_z3_assert(is_func_decl(f), "First argument must be a Z3 function declaration")
_z3_assert(all([is_array_sort(a) for a in args]), "Z3 array expected expected")
_z3_assert(all([is_array(a) for a in args]), "Z3 array expected expected")
_z3_assert(len(args) == f.arity(), "Number of arguments mismatch")
_args, sz = _to_ast_array(args)
ctx = f.ctx
@ -4523,7 +4511,7 @@ def Ext(a, b):
"""
ctx = a.ctx
if z3_debug():
_z3_assert(is_array_sort(a) and is_array_sort(b), "arguments must be arrays")
_z3_assert(is_array(a) and is_array(b), "arguments must be arrays")
return _to_expr_ref(Z3_mk_array_ext(ctx.ref(), a.as_ast(), b.as_ast()), ctx)
def SetHasSize(a, k):
@ -9988,7 +9976,7 @@ class SeqRef(ExprRef):
def __getitem__(self, i):
if _is_int(i):
i = IntVal(i, self.ctx)
return _to_expr_ref(Z3_mk_seq_nth(self.ctx_ref(), self.as_ast(), i.as_ast()), self.ctx)
return SeqRef(Z3_mk_seq_nth(self.ctx_ref(), self.as_ast(), i.as_ast()), self.ctx)
def at(self, i):
if _is_int(i):