PySMT 0.9.7.dev474__py2.py3-none-any.whl → 0.9.7.dev477__py2.py3-none-any.whl

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/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/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__':

{pysmt-0.9.7.dev474.dist-info → pysmt-0.9.7.dev477.dist-info}/METADATA

@@ -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.dist-info → pysmt-0.9.7.dev477.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=Rmi3LGb58YqJ6dREmo96fbK7E5mltVnKvP4wtJpIhvE,1701
+pysmt/__init__.py,sha256=D4wKbKbyKykOKhdJR9zJPcu0mML4q9kKVXFpLzvfvxc,1701
 pysmt/__main__.py,sha256=rR-MV1QtLYqtVoJyY3m5B5Iz-lua0-5o6YSB0W4lKy8,1085
 pysmt/configuration.py,sha256=Iq_46QZ9z_jpBMk76euJWTqGEwHad2qyiEDPix5sXsA,4538
 pysmt/constants.py,sha256=pulb6NvROY_X8BePeyyX8T9MJLB79HZ_1FUYSlZ7Jfg,5769
@@ -50,7 +50,7 @@ pysmt/smtlib/script.py,sha256=S3HIWTqRTckTEDIp1KFkYy69yC65hbqSKbbIYUroAZs,24630
 pysmt/smtlib/solver.py,sha256=bvJVut5vrreqe_gM7a8qY3re9l12jwxoe03W1SSvaUk,8109
 pysmt/smtlib/utils.py,sha256=C-P8RPgR8RDRQnrB8xfLGc5aFso11u0sEtFw04NMbKQ,2126
 pysmt/smtlib/parser/__init__.py,sha256=Pfdm6pv9hwOv8D9NbAaHEokDZXkRg3CwYLN5Ny7UNyY,5055
-pysmt/smtlib/parser/parser.py,sha256=y8jKOupjwFA7PZBeqsROD-n40UlpJ5zUKtQRTT-5WA4,69466
+pysmt/smtlib/parser/parser.py,sha256=pgxnUw_0vV43P4_2VpQawRk0I9WsWHqxH2V7lQBhaYg,69698
 pysmt/solvers/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/solvers/bdd.py,sha256=tIW85N-iJbYUGCKucPhAsoXqo9G9bIcdBnCitzUmYTQ,15997
 pysmt/solvers/btor.py,sha256=zRjBTwnEeXurHMDGVDpSmTI9Iw3IDlte-q8aS3_A-3w,26316
@@ -122,7 +122,7 @@ pysmt/test/smtlib/test_annotations.py,sha256=U2UVLgokS0nidsAvTnWy7JWA7dQzaxndmCT
 pysmt/test/smtlib/test_fuzzed.py,sha256=pNKXmb57NO8hvBwo1yc1FbzATmgS0efaRTkEJs-jGGo,2190
 pysmt/test/smtlib/test_generic_wrapper.py,sha256=UOVNZ8dWqUJNfNkFsXp0fz4CNMFvyblfPpUy1m2NQTk,7913
 pysmt/test/smtlib/test_griggio.py,sha256=W8C5SWABwUeAQdnslQoU_6pxFokaz2cT5sAfJLo1cKw,2959
-pysmt/test/smtlib/test_model_validation.py,sha256=xHHBkbANSNnxuc8HFUVcEANde0zsZZdTWPtIWVazw7c,3076
+pysmt/test/smtlib/test_model_validation.py,sha256=sfWHILkTl_H3MzofSeYLrIYCCNeap7jzBCM6Ure9aJY,3942
 pysmt/test/smtlib/test_omt_lib_solver.py,sha256=xZZWDSB0eDBsmzu7R8AqRN0fSCvFRW6x4Cq9MmTAfos,8177
 pysmt/test/smtlib/test_parser_examples.py,sha256=fNRVEY3zy5NDTq1WyvAcliCwTHnosKQm-x8C7Fe6fpk,15782
 pysmt/test/smtlib/test_parser_extensibility.py,sha256=MgEVUU-icDEryKh54sW9VC59e8CuC6Q_5Sw65FtxBgo,3933
@@ -143,10 +143,10 @@ pysmt/walkers/dag.py,sha256=hw9qUfadQTpihX685YQobfxKv9XA84ffiA8XRMUQEfU,5694
 pysmt/walkers/generic.py,sha256=2oMr_MDr7FswSlyx2ulbJ9ke5FsTCKABURnCsMeg4fc,5093
 pysmt/walkers/identitydag.py,sha256=EAxSneEW91Z8GphlkbMPsPdlac7_FDcVj-_6_aunU2s,10902
 pysmt/walkers/tree.py,sha256=1vquhaChRMSG_pvbz16wqKOFnsQAkzLvjh_xbB3dg5c,2730
-pysmt-0.9.7.dev474.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pysmt-0.9.7.dev474.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-pysmt-0.9.7.dev474.dist-info/METADATA,sha256=GOXjNgNjsk7XCI1LSmOkp9UO0gX0dPhYvlMYog15K2s,1774
-pysmt-0.9.7.dev474.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pysmt-0.9.7.dev474.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
-pysmt-0.9.7.dev474.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-pysmt-0.9.7.dev474.dist-info/RECORD,,
+pysmt-0.9.7.dev477.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev477.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev477.dist-info/METADATA,sha256=tdxWAclomTF5eGcgBisQL5Q0BhBBG3B9Sbjd_jSQmK0,1774
+pysmt-0.9.7.dev477.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev477.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev477.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev477.dist-info/RECORD,,