PySMT 0.9.7.dev464__tar.gz → 0.9.7.dev470__tar.gz

{pysmt-0.9.7.dev464/PySMT.egg-info → pysmt-0.9.7.dev470}/PKG-INFO

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

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/__init__.py

@@ -19,7 +19,7 @@
 from typing import Tuple, Union
 
 
-VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 464)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 470)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/environment.py

@@ -21,7 +21,7 @@ singleton objects that are used throughout the system, such as the
 FormulaManager, Simplifier, HRSerializer, SimpleTypeChecker.
 """
 
-from typing import List, Optional
+from typing import Callable, Dict, List, Optional, Tuple, Type
 
 import pysmt.simplifier
 import pysmt.printers
@@ -87,9 +87,11 @@ class Environment(object):
         # (e.g. substitution and simplification).
         self.allow_empty_var_names = False
 
-        # Dynamic Walker Configuration Map
+        # Dynamic Walker Functions: handlers for custom node types,
+        # keyed by (nodetype, walker_class). Kept local to this
+        # environment so registrations never leak across environments.
         # See: add_dynamic_walker_function
-        self.dwf = {}
+        self.dwf: Dict[Tuple[int, Type], Callable] = {}
 
     @property
     def formula_manager(self) -> pysmt.formula.FormulaManager:
@@ -154,15 +156,20 @@ class Environment(object):
         function to a given walker, so that the walker will be able to
         handle the new nodetype.
 
-        See :py:meth:`pysmt.walkers.generic.Walker.walk_error` for
-        more information.
+        See :py:meth:`pysmt.walkers.generic.Walker.super` for more
+        information on how the handler is dispatched.
         """
-        # self.dwf is a map of maps: {nodetype, {walker: function}}
-        if nodetype not in self.dwf:
-            self.dwf[nodetype] = {}
+        key = (nodetype, walker)
+        assert key not in self.dwf, "Dynamic Walker Redefinition!"
+        self.dwf[key] = function
 
-        assert walker not in self.dwf[nodetype], "Redefinition"
-        self.dwf[nodetype][walker] = function
+    def get_dynamic_walker_function(self, nodetype, walker_class):
+        """Return the handler registered for (nodetype, walker_class), or None.
+
+        Used by :py:meth:`pysmt.walkers.generic.Walker.super` to
+        dispatch custom node types without mutating the walker class.
+        """
+        return self.dwf.get((nodetype, walker_class))
 
     @property
     def factory(self) -> "pysmt.factory.Factory":

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/oracles.py

@@ -27,7 +27,7 @@ properties of formulae.
 """
 
 from itertools import chain
-from typing import FrozenSet, Iterable, List, Any, Optional, Union, cast
+from typing import FrozenSet, Iterable, List, Any, Optional, Union, cast, Callable, Dict
 
 import pysmt
 import pysmt.walkers as walkers
@@ -60,7 +60,7 @@ class SizeOracle(walkers.DagWalker):
     def __init__(self, env: Optional["pysmt.environment.Environment"]=None):
         walkers.DagWalker.__init__(self, env=env)
 
-        self.measure_to_fun = \
+        self.measure_to_fun: Dict[int, Callable] = \
                         {SizeOracle.MEASURE_TREE_NODES: self.walk_count_tree,
                          SizeOracle.MEASURE_DAG_NODES: self.walk_count_dag,
                          SizeOracle.MEASURE_LEAVES: self.walk_count_leaves,
@@ -68,12 +68,16 @@ class SizeOracle(walkers.DagWalker):
                          SizeOracle.MEASURE_SYMBOLS: self.walk_count_symbols,
                          SizeOracle.MEASURE_BOOL_DAG: self.walk_count_bool_dag,
                         }
+        self._walking_fun: Optional[Callable] = None
 
+    @walkers.handles(*op.ALL_TYPES)
+    def walk_measure(self, formula, args, **kwargs):
+        return assert_not_none(self._walking_fun)(formula, args, **kwargs)
 
     def set_walking_measure(self, measure: int):
         if measure not in self.measure_to_fun:
             raise NotImplementedError
-        self.set_function(self.measure_to_fun[measure], *op.ALL_TYPES)
+        self._walking_fun = self.measure_to_fun[measure]
 
     def _get_key(self, formula, measure, **kwargs):
         """Memoize using a tuple (measure, formula)."""

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/rewritings.py

@@ -268,15 +268,12 @@ class PolarityCNFizer(CNFizer):
     def _compute_node_result(self, formula, pol=None, **kwargs):
         key = self._get_key(formula, pol, **kwargs)
         if key not in self.memoization:
-            try:
-                f = self.functions[formula.node_type()]
-            except KeyError:
-                f = self.walk_error
-
             args = [self.memoization[self._get_key(s, p, **kwargs)] \
                     for s, p in self._get_children(formula, pol)]
 
-            self.memoization[key] = f(formula, args=args, pol=pol, **kwargs)
+            self.memoization[key] = self.__class__.super(self, formula,
+                                                         args=args, pol=pol,
+                                                         **kwargs)
         else:
             pass
 

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/simplifier.py

@@ -74,8 +74,7 @@ class Simplifier(pysmt.walkers.DagWalker):
 
         args = [self.walk(s, **kwargs) for s in formula.args()]
 
-        f = self.functions[formula.node_type()]
-        res = f(formula, args=args, **kwargs)
+        res = self.__class__.super(self, formula, args=args, **kwargs)
         ltype = get_type(formula)
         rtype = get_type(res)
         test = Equals(formula, res) if ltype != BOOL else Iff(formula, res)

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/smtlib/printers.py

@@ -346,8 +346,7 @@ class SmtDagPrinter(DagWalker):
         if formula.is_quantifier():
             # 1. We invoke the relevant function (walk_exists or
             #    walk_forall) to print the formula
-            fun = self.functions[formula.node_type()]
-            res = fun(formula, args=None, **kwargs)
+            res = self.__class__.super(self, formula, args=None, **kwargs)
 
             # 2. We memoize the result
             key = self._get_key(formula, **kwargs)

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/solvers/msat.py

@@ -41,6 +41,7 @@ from pysmt.decorators import clear_pending_pop, catch_conversion_error
 from pysmt.solvers.qelim import QuantifierEliminator
 from pysmt.solvers.interpolation import Interpolator
 from pysmt.walkers.identitydag import IdentityDagWalker
+from pysmt.walkers.generic import handles
 from pysmt.environment import Environment
 from pysmt.fnode import FNode
 from pysmt.formula import FormulaManager
@@ -1183,8 +1184,6 @@ class MSatQuantifierEliminator(QuantifierEliminator, IdentityDagWalker):
         self.msat_env = MSATCreateEnv(self.__class__.__lib_name__, self.msat_config)
         self._msat_lib.msat_destroy_config(self.msat_config)
 
-        self.set_function(self.walk_identity, op.SYMBOL, op.REAL_CONSTANT,
-                          op.BOOL_CONSTANT, op.INT_CONSTANT)
         self.logic = logic
 
         self.algorithm = algorithm
@@ -1243,6 +1242,11 @@ class MSatQuantifierEliminator(QuantifierEliminator, IdentityDagWalker):
         subf = args[0]
         return self.exist_elim(variables, subf)
 
+    @handles(op.SYMBOL, op.REAL_CONSTANT, op.BOOL_CONSTANT, op.INT_CONSTANT)
+    def walk_identity(self, formula, args, **kwargs):
+        # Leaves are unchanged by quantifier elimination.
+        return formula
+
     def _exit(self):
         del self.msat_env
 

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/substituter.py

@@ -157,8 +157,7 @@ class Substituter(pysmt.walkers.IdentityDagWalker):
 
             # 3. We invoke the relevant function (walk_exists or
             #    walk_forall) to compute the substitution
-            fun = self.functions[formula.node_type()]
-            res = fun(formula, args=[res_formula], **kwargs)
+            res = self.__class__.super(self, formula, args=[res_formula], **kwargs)
 
             # 4. We memoize the result
             key = self._get_key(formula, **kwargs)

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/test/test_dwf.py

@@ -73,3 +73,50 @@ class TestDwf(TestCase):
         new_t = new_node_type()
         new_types_set = set(all_types())
         self.assertEqual(new_types_set - old_types_set, set([new_t]))
+
+    def test_03_dwf_is_environment_local(self):
+        # A DWF registered in one environment must not leak into another.
+        # Handlers are dispatched via Walker.super through the walker's
+        # own env, not by mutating the (process-global) walker class.
+        from pysmt.environment import Environment
+        from pysmt.printers import HRPrinter
+
+        def make_printer(sep):
+            def hrprinter_walk_XOR(self, formula):
+                self.stream.write("(")
+                yield formula.arg(0)
+                self.stream.write(sep)
+                yield formula.arg(1)
+                self.stream.write(")")
+            return hrprinter_walk_XOR
+
+        XOR = new_node_type()
+        env1 = Environment()
+        env2 = Environment()
+
+        # Both envs must be able to build the node, so both get a
+        # type-checker handler. Only env1 gets a printer handler.
+        for env in (env1, env2):
+            env.add_dynamic_walker_function(
+                XOR, SimpleTypeChecker, SimpleTypeChecker.walk_bool_to_bool)
+        env1.add_dynamic_walker_function(XOR, HRPrinter, make_printer(" *+* "))
+
+        x1 = env1.formula_manager.Symbol("x")
+        f1 = env1.formula_manager.create_node(node_type=XOR, args=(x1, x1))
+        self.assertEqual(env1.serializer.serialize(f1), "(x *+* x)")
+
+        # The handler registered on env1 must NOT leak into env2.
+        x2 = env2.formula_manager.Symbol("x")
+        f2 = env2.formula_manager.create_node(node_type=XOR, args=(x2, x2))
+        with self.assertRaises(UnsupportedOperatorError):
+            env2.serializer.serialize(f2)
+
+        # env2 can register its own, independent handler for the same
+        # (nodetype, walker) pair, and env1 stays unaffected.
+        env2.add_dynamic_walker_function(XOR, HRPrinter, make_printer(" XOR "))
+        self.assertEqual(env2.serializer.serialize(f2), "(x XOR x)")
+        self.assertEqual(env1.serializer.serialize(f1), "(x *+* x)")
+
+        # Redefining the same (nodetype, walker) within one env is caught.
+        with self.assertRaises(AssertionError):
+            env1.add_dynamic_walker_function(XOR, HRPrinter, make_printer("!"))

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/test/test_rewritings.py

@@ -166,7 +166,7 @@ class TestRewritings(TestCase):
         for (f, _, _, logic) in get_example_formulae():
             if not logic.is_quantified() and logic.theory.uninterpreted:
                 if self.env.factory.has_solvers(logic=logic):
-                    self._verify_ackermannization(f)
+                    self._verify_ackermannization(f, logic)
 
     def test_ackermannization_dictionaries(self):
         self.env.enable_infix_notation = True
@@ -192,7 +192,7 @@ class TestRewritings(TestCase):
             if atom.is_function_application():
                 self.assertIsNotNone(terms_to_consts[atom])
 
-    def _verify_ackermannization(self, formula):
+    def _verify_ackermannization(self, formula, logic=None):
         ackermannization = Ackermannizer()
         ack = ackermannization.do_ackermannization(formula)
         #verify that there are no functions in ack
@@ -201,8 +201,8 @@ class TestRewritings(TestCase):
             for arg in atom.args():
                 self.assertFalse(arg.is_function_application())
         #verify that ack and formula are equisat
-        formula_sat = is_sat(formula)
-        ack_sat = is_sat(ack)
+        formula_sat = is_sat(formula, logic=logic)
+        ack_sat = is_sat(ack, logic=logic)
         self.assertTrue(formula_sat == ack_sat)
 
     def test_nnf_examples(self):

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/test/test_walkers.py

@@ -21,7 +21,8 @@ from pysmt.shortcuts import And, Or, Iff, Not, Function, Real
 from pysmt.shortcuts import LT, GT, Plus, Minus, Equals
 from pysmt.shortcuts import get_env, substitute, TRUE
 from pysmt.typing import INT, BOOL, REAL, FunctionType
-from pysmt.walkers import TreeWalker, DagWalker, IdentityDagWalker
+from pysmt.walkers import TreeWalker, DagWalker, IdentityDagWalker, handles
+from pysmt.walkers.generic import nt_to_fun
 from pysmt.test import TestCase, main
 from pysmt.formula import FormulaManager
 from pysmt.test.examples import get_example_formulae
@@ -105,36 +106,36 @@ class TestWalkers(TestCase):
             tree_walker.walk(varA)
 
     def test_walker_new_operators_complete(self):
-        walkerA = IdentityDagWalker(env=self.env)
         idx = op.new_node_type(node_str="fancy_new_node")
-        walkerB = IdentityDagWalker(env=self.env)
-        with self.assertRaises(KeyError):
-            walkerA.functions[idx]
-        self.assertEqual(walkerB.functions[idx], walkerB.walk_error)
+        fun_name = nt_to_fun(idx)
 
-        # Use a mixin to handle the node type
+        # A node type introduced after the class was defined has no
+        # dedicated walk_* method: dispatch falls back to walk_error.
+        self.assertFalse(hasattr(IdentityDagWalker, fun_name))
+
+        # Use a mixin to handle the node type (the method name matches
+        # nt_to_fun, so it is picked up by class-based dispatch).
         class FancyNewNodeWalkerMixin(object):
-            def walk_fancy_new_node(self, args, **kwargs):
+            def walk_fancy_new_node(self, formula, args, **kwargs):
                 raise UnsupportedOperatorError
 
         class IdentityDagWalker2(IdentityDagWalker, FancyNewNodeWalkerMixin):
             pass
-        walkerC = IdentityDagWalker2(env=self.env)
-        self.assertEqual(walkerC.functions[idx],
-                         walkerC.walk_fancy_new_node)
+        self.assertEqual(getattr(IdentityDagWalker2, fun_name),
+                         FancyNewNodeWalkerMixin.walk_fancy_new_node)
 
     def test_identity_walker_simple(self):
 
-        def walk_and_to_or(formula, args, **kwargs):
-            return Or(args)
-
-        def walk_or_to_and(formula, args, **kwargs):
-            return And(args)
+        class MyWalker(IdentityDagWalker):
+            @handles(op.AND)
+            def walk_and_to_or(self, formula, args, **kwargs):
+                return Or(args)
 
-        walker = IdentityDagWalker(env=get_env())
+            @handles(op.OR)
+            def walk_or_to_and(self, formula, args, **kwargs):
+                return And(args)
 
-        walker.set_function(walk_and_to_or, op.AND)
-        walker.set_function(walk_or_to_and, op.OR)
+        walker = MyWalker(env=get_env())
 
         x, y, z = Symbol('x'), Symbol('y'), Symbol('z')
 
@@ -240,8 +241,9 @@ class TestWalkers(TestCase):
         x = Symbol("x")
         w = DagWalker()
         for o in op.ALL_TYPES:
+            f = getattr(w, nt_to_fun(o))
             with self.assertRaises(UnsupportedOperatorError):
-                w.functions[o](x)
+                f(x)
 
     def test_walker_super(self):
         from pysmt.walkers import DagWalker

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/walkers/dag.py

@@ -68,14 +68,10 @@ class DagWalker(Walker):
         """
         key = self._get_key(formula, **kwargs)
         if key not in self.memoization:
-            try:
-                f = self.functions[formula.node_type()]
-            except KeyError:
-                f = self.walk_error
-
             args = [self.memoization[self._get_key(s, **kwargs)] \
                     for s in self._get_children(formula)]
-            self.memoization[key] = f(formula, args=args, **kwargs)
+            self.memoization[key] = self.__class__.super(self, formula,
+                                                         args=args, **kwargs)
         else:
             pass
 

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/walkers/generic.py

@@ -15,8 +15,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-from functools import partial
-
 import sys
 from pysmt.fnode import FNode
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union, cast, Iterable
@@ -83,24 +81,15 @@ class Walker(object, metaclass=MetaNodeTypeHandler):
             env = pysmt.environment.get_env()
         self.env: "pysmt.environment.Environment" = env
 
-        self.functions = {}
-        for o in op.all_types():
-            try:
-                # getattr will raise an AttributeError exception if a
-                # method does not exist
-                self.functions[o] = getattr(self, nt_to_fun(o))
-            except AttributeError:
-                self.functions[o] = self.walk_error
-
     def set_function(self, function, *node_types):
-        """Overrides the default walking function for each of the specified
-        node_types with the given function
+        """Instance-based walkers (<=0.6.0) are no longer supported.
+
+        Use class-based walkers instead: define walk_* methods (or use
+        the ``@handles`` decorator) on a subclass.
         """
-        from warnings import warn
-        warn("Instance-based walkers (<=0.6.0) walkers are deprecated. "
-             "You should use new-style/class based walkers", stacklevel=2)
-        for nt in node_types:
-            self.functions[nt] = function
+        raise NotImplementedError(
+            "Instance-based walkers (<=0.6.0) are deprecated. "
+            "You should use new-style/class based walkers.")
 
     @classmethod
     def set_handler(cls, function: Callable, *node_types):
@@ -109,28 +98,32 @@ class Walker(object, metaclass=MetaNodeTypeHandler):
             setattr(cls, nt_to_fun(nt), function)
 
     @classmethod
-    def super(cls, self, formula: FNode, *args, **kwargs) -> FNode:
-        """Call the correct walk_* function of cls for the given formula."""
-        f = getattr(cls, nt_to_fun(formula.node_type()))
+    def super(cls, self, formula: FNode, *args, **kwargs) -> Any:
+        """Call the correct walk_* function of cls for the given formula.
+
+        The return type depends on the walker: an FNode for rewriting
+        walkers, but a generator (TreeWalker), a set or an int (oracles),
+        etc. for others; hence Any.
+        """
+        nt = formula.node_type()
+        try:
+            f = getattr(cls, nt_to_fun(nt))
+        except AttributeError:
+            # Custom node types (see new_node_type) have no walk_* method
+            # on the class. Look for a handler registered on this walker's
+            # environment via add_dynamic_walker_function; keeping the
+            # lookup env-local is what stops registrations from leaking
+            # across environments.
+            fun = self.env.get_dynamic_walker_function(nt, cls)
+            if fun is None:
+                raise pysmt.exceptions.UnsupportedOperatorError(
+                    node_type=nt, expression=formula)
+            return fun(self, formula, *args, **kwargs)
         return f(self, formula, *args, **kwargs)
 
     @handles(op.ALL_TYPES)
     def walk_error(self, formula, **kwargs):
-        """Default function for a node that is not handled by the Walker.
-
-        This tries to handle the node using the Dynamic Walker
-        Function information from the environment. If this fails, then
-        an UnsupportedOperatorError exception is given.
-
-        """
-        node_type = formula.node_type()
-        if node_type in self.env.dwf:
-            dwf = self.env.dwf[node_type]
-            walker_class = type(self)
-            if type(self) in dwf:
-                self.functions[node_type] = partial(dwf[walker_class], self)
-                return self.functions[node_type](formula, **kwargs)
-
+        """Default function for a node that is not handled by the Walker."""
         node_type = formula.node_type()
         raise pysmt.exceptions.UnsupportedOperatorError(node_type=node_type,
                                                         expression=formula)

{pysmt-0.9.7.dev464 → pysmt-0.9.7.dev470}/pysmt/walkers/tree.py

@@ -41,19 +41,14 @@ class TreeWalker(Walker):
         return
 
     def walk(self, formula: FNode, threshold: Optional[int]=None):
-        """Generic walk method, will apply the function defined by the map
-        self.functions.
+        """Generic walk method, will apply the function associated with
+        the node.
 
         If threshold parameter is specified, the walk_threshold
         function will be called for all nodes with depth >= threshold.
         """
 
-        try:
-            f = self.functions[formula.node_type()]
-        except KeyError:
-            f = self.walk_error
-
-        iterator = f(formula)
+        iterator = self.__class__.super(self, formula)
         if iterator is None:
             return
 
@@ -67,11 +62,7 @@ class TreeWalker(Walker):
                     if iterator is not None:
                         stack.append(iterator)
                 else:
-                    try:
-                        cf = self.functions[child.node_type()]
-                    except KeyError:
-                        cf = self.walk_error
-                    iterator = cf(child)
+                    iterator = self.__class__.super(self, child)
                     if iterator is not None:
                         stack.append(iterator)
             except StopIteration: