PySMT 0.9.7.dev132__tar.gz → 0.9.7.dev139__tar.gz

{PySMT-0.9.7.dev132/PySMT.egg-info → PySMT-0.9.7.dev139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.7.dev132
+Version: 0.9.7.dev139
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.7.dev132
+Version: 0.9.7.dev139
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 7, "dev", 132)
+VERSION = (0, 9, 7, "dev", 139)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/cmd/install.py

@@ -36,7 +36,7 @@ INSTALLERS = [
     Installer(CVC5Installer,    "1.1.2", {}),
     Installer(CVC4Installer,    "1.7-prerelease",
               {"git_version" : "391ab9df6c3fd9a3771864900c1718534c1e4666"}),
-    Installer(Z3Installer,      "4.13.0", {}),
+    Installer(Z3Installer,      "4.15.0", {}),
     Installer(YicesInstaller,   "2.6.4", {"yices_api_version": "1.1.5"}),
     Installer(BtorInstaller,    "3.2.3", {}),
     Installer(PicoSATInstaller, "965",

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/rewritings.py

@@ -188,6 +188,8 @@ class CNFizer(DagWalker):
     @handles(op.THEORY_OPERATORS)
     def walk_theory_op(self, formula, **kwargs):
         #pylint: disable=unused-argument
+        if formula.get_type().is_bool_type():
+            return formula, CNFizer.TRUE_CNF
         return CNFizer.THEORY_PLACEHOLDER
 
     @handles(op.CONSTANTS)

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/smtlib/parser/parser.py

@@ -1438,6 +1438,7 @@ class SmtLibZ3Parser(SmtLibParser):
                                 self._operator_adapter(self._ext_rotate_right)
         mgr = self.env.formula_manager
         self.interpreted['bv2int'] = self._operator_adapter(mgr.BVToNatural)
+        self.interpreted['ubv_to_int'] = self._operator_adapter(mgr.BVToNatural)
 
     def _ext_rotate_left(self, x, y):
         return self.env.formula_manager.BVRol(x, y.simplify().constant_value())

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/test/test_cnf.py

@@ -18,9 +18,9 @@
 import os
 import pytest
 
-from pysmt.shortcuts import Implies, is_sat, reset_env, Symbol, Iff
+from pysmt.shortcuts import Implies, is_sat, reset_env, Symbol, Iff, Select, ArrayType, INT, BOOL, And, get_env
 from pysmt.rewritings import CNFizer
-from pysmt.logics import QF_BOOL, QF_LRA, QF_LIA, QF_UFLIRA, QF_UFLRA
+from pysmt.logics import QF_BOOL, QF_LRA, QF_LIA, QF_UFLIRA, QF_UFLRA, QF_ALIA
 from pysmt.test import TestCase, skipIfNoSolverForLogic, main
 from pysmt.test.examples import get_example_formulae
 from pysmt.test.smtlib.parser_utils import SMTLIB_TEST_FILES, SMTLIB_DIR
@@ -106,5 +106,29 @@ class TestCnf(TestCase):
 
         self.assertValid(Implies(cnf, f), logic=QF_BOOL)
 
+    @skipIfNoSolverForLogic(QF_ALIA)
+    def test_CNFizer_bool_theory(self):
+        test_logic = QF_ALIA
+        # (and (select boolean_array idx0) (select boolean_array idx1))
+        boolean_array = Symbol("boolean_array", ArrayType(INT, BOOL))
+        idx_0, idx_1 = Symbol("idx0", INT), Symbol("idx1", INT)
+        f = And(
+            Select(boolean_array, idx_0),
+            Select(boolean_array, idx_1)
+        )
+        conv = CNFizer()
+        cnf = conv.convert_as_formula(f)
+
+        factory = get_env().factory
+        for solver_name in factory.all_solvers(test_logic):
+            # msat needs to be skipped. Check issue #807
+            if solver_name == "msat":
+                continue
+            self.assertValid(
+                Implies(cnf, f),
+                solver_name=solver_name,
+                logic=test_logic
+            )
+
 if __name__ == '__main__':
     main()

{PySMT-0.9.7.dev132 → PySMT-0.9.7.dev139}/pysmt/test/test_regressions.py

@@ -565,7 +565,6 @@ class TestRegressions(TestCase):
         self.assertIn(p, atoms)
         self.assertIn(Equals(x, Int(1)), atoms)
 
-
     @skipIfSolverNotAvailable("yices")
     def test_yices_quantifier(self):
         x = Symbol('x', REAL)