PySMT 0.9.7.dev474__tar.gz → 0.9.7.dev477__tar.gz

{pysmt-0.9.7.dev474/PySMT.egg-info → pysmt-0.9.7.dev477}/PKG-INFO

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

{pysmt-0.9.7.dev474 → pysmt-0.9.7.dev477/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev474 → pysmt-0.9.7.dev477}/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", 474)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 477)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev474 → pysmt-0.9.7.dev477}/pysmt/smtlib/parser/parser.py

@@ -561,6 +561,10 @@ class SmtLibParser(object):
                 return res
             stack[-1].append(handler)
         else:
+            # pySMT binds one type per symbol name, but SMT-LIB model values
+            # reuse the same @name across sorts, so we qualify it with the sort
+            if what.startswith('@'):
+                what += "_" + str(ty)
             def handler():
                 return self.env.formula_manager.Symbol(what, ty)
             stack[-1].append(handler)

{pysmt-0.9.7.dev474 → pysmt-0.9.7.dev477}/pysmt/test/smtlib/test_model_validation.py

@@ -97,6 +97,29 @@ class TestModelValidation(TestCase):
         simp = simplifier.simplify(formula.substitute(model, interpretations))
         self.assertEqual(simp, self.fm.TRUE())
 
+    def test_same_value_name_different_sorts(self):
+        # SMT-COMP/postprocessors#10: solvers reuse @0 across sorts
+        model_source ="""\
+(model
+  (define-fun a () U (as @0 U))
+  (define-fun c () U (as @1 U))
+  (define-fun b () V (as @0 V))
+  (define-fun d () V (as @0 V))
+)
+"""
+        U = self.tm.Type('U', 0)
+        V = self.tm.Type('V', 0)
+        a = self.fm.Symbol('a', U)
+        b = self.fm.Symbol('b', V)
+        c = self.fm.Symbol('c', U)
+        d = self.fm.Symbol('d', V)
+        formula = self.fm.And(self.fm.Not(self.fm.Equals(a, c)),
+                              self.fm.Equals(b, d))
+
+        model, interpretations = SmtLibParser().parse_model(StringIO(model_source))
+        simp = SmtLibModelValidationSimplifier(self.env).simplify(
+            formula.substitute(model, interpretations))
+        self.assertEqual(simp, self.fm.TRUE())
 
 
 if __name__ == '__main__':