mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

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

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2015-05-08 22:46:38 +01:00
parent a63481de85 901d8a9f5b
commit 8d7b76f2b2
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/python/z3.py
View file

@ -32,7 +32,7 @@ sat
Z3 exceptions: Z3 exceptions:
>>> try: >>> try:
... x = Int('x') ... x = BitVec('x', 32)
... y = Bool('y') ... y = Bool('y')
... # the expression x + y is type incorrect ... # the expression x + y is type incorrect
... n = x + y ... n = x + y
@ -1228,6 +1228,16 @@ class BoolSortRef(SortRef):
_z3_assert(self.eq(val.sort()), "Value cannot be converted into a Z3 Boolean value") _z3_assert(self.eq(val.sort()), "Value cannot be converted into a Z3 Boolean value")
return val return val
def subsort(self, other):
return isinstance(other, ArithSortRef)
def is_int(self):
return True
def is_bool(self):
return True
class BoolRef(ExprRef): class BoolRef(ExprRef):
"""All Boolean expressions are instances of this class.""" """All Boolean expressions are instances of this class."""
def sort(self): def sort(self):
@ -1900,6 +1910,10 @@ class ArithSortRef(SortRef):
return val return val
if val_s.is_int() and self.is_real(): if val_s.is_int() and self.is_real():
return ToReal(val) return ToReal(val)
if val_s.is_bool() and self.is_int():
return If(val, 1, 0)
if val_s.is_bool() and self.is_real():
return ToReal(If(val, 1, 0))
if __debug__: if __debug__:
_z3_assert(False, "Z3 Integer/Real expression expected" ) _z3_assert(False, "Z3 Integer/Real expression expected" )
else: else: