PySMT 0.9.7.dev112__py2.py3-none-any.whl → 0.9.7.dev129__py2.py3-none-any.whl

{PySMT-0.9.7.dev112.dist-info → PySMT-0.9.7.dev129.dist-info}/METADATA

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

{PySMT-0.9.7.dev112.dist-info → PySMT-0.9.7.dev129.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=TKZ-kovL6HGfhI1GXWf0irhLNCok5tC7mk91ClJgyas,1598
+pysmt/__init__.py,sha256=VlooMhA5oranwltuSSmGVfWSC_cU2b57cM2N4SkTAv4,1598
 pysmt/__main__.py,sha256=rR-MV1QtLYqtVoJyY3m5B5Iz-lua0-5o6YSB0W4lKy8,1085
 pysmt/configuration.py,sha256=q4Ncd6f2d0VZUpyQAOR8sTPlTodgDnYhUBeRgYYXqTE,4539
 pysmt/constants.py,sha256=QelM9r5fGWSq8UNjjYoEJK2FaLHRr4Z9NZxzjeajEWA,5249
@@ -7,14 +7,14 @@ pysmt/environment.py,sha256=rdaxQ0uwmMPmcW4d5WnTYAyHNSCpRTgzRLaXQccG5-4,6522
 pysmt/exceptions.py,sha256=uG3FochPO1Y18cv1lXUjQtNbW-qZKd68zqs8oo2OEF4,4420
 pysmt/factory.py,sha256=6QFbob7LV3x8uT4w2nG_rHqXWCqbwNg5oCUMPhpnwmY,24107
 pysmt/fnode.py,sha256=zKZP4yda8JxK6AXW3vCasRLYsLH5NzK_2Bjiy5ogtqo,33256
-pysmt/formula.py,sha256=baexe5-GgrG7z_qH3Wb9s8XQqFcBgyLXnv8Rik5t2YY,43318
+pysmt/formula.py,sha256=gmK3b9481aI6rvHJTPZVOsw-YsIBFpeqKZ1-gdWHE2k,43371
 pysmt/logics.py,sha256=yJ1Yv24dVj4LlpnbspgcRT1t5e65RmvGas_bdHOGCAA,28774
 pysmt/operators.py,sha256=RU4H9E5eVjPgAar_9hIoCexq-Yc5v0xdHAMM69FcYX8,8132
 pysmt/oracles.py,sha256=lfRbPoiX4SXuJZktwmKUqA1FJ-7lRyP49LRIH8C7VoQ,19461
-pysmt/parsing.py,sha256=a3RY-ogJUSCx1BwePHL51AoD4jGjap1_6ML7S18hzuc,20786
+pysmt/parsing.py,sha256=cT2cEgm31_3au4xD-F3_QvXtvq5aVHaEBbLWB17OKZY,20729
 pysmt/printers.py,sha256=ZtV0j7jVcOGJxzKELtKJIJh1T6m_4xv1dc_3lwinHbs,13389
 pysmt/rewritings.py,sha256=00gTDbyF6sGoAKcVwRsQMKEXIt6iIrJnmrS5FRvfMCA,33290
-pysmt/shortcuts.py,sha256=dDIbmnda_MGQVF32seU1fJ5TC-LuMk5VDrHAgxBQzu0,38486
+pysmt/shortcuts.py,sha256=p-xDS69rMr_uDoBoVzXYJuXdyBWbMxb3JAeLjfcvY1U,39378
 pysmt/simplifier.py,sha256=igDczAkE5f3ctDxN_Hh2iP54ZFj_ezKRucPtgrodGzo,41464
 pysmt/substituter.py,sha256=rzdZos9zYNzq3DSKFkLR2Gu6ktwBCjdPEPM48tIzUwk,13811
 pysmt/type_checker.py,sha256=g5Mbh42ZxsjtLHnS0qizYLZ3kH3bMtNkIuyiZtTuinE,13273
@@ -27,7 +27,7 @@ pysmt/cmd/shell.py,sha256=ww1juthvLnJQciVHWxYvTJaA5W3-Np0ORfESyePF0bI,4333
 pysmt/cmd/installers/__init__.py,sha256=nHJaEXfCpsEkzBy0NL91P9extUda6jb0u88nwPYTvGo,1170
 pysmt/cmd/installers/base.py,sha256=1usHiBHrIBam9BlbVKG-6F52KPsIkJBeghkd_ckh-8U,12811
 pysmt/cmd/installers/bdd.py,sha256=Qq8YlYAVvxUqNXjoOlH9_Lhj4cj6WEt7HuhbSiF_L6k,2539
-pysmt/cmd/installers/btor.py,sha256=0fsCJEKqQ_Y4HURYNct-F3ui8Zsk5qd4Gp0AWRXAUBo,4067
+pysmt/cmd/installers/btor.py,sha256=gUl_urKcWtbSYS_Vde_O7RJM0H-kRqh6hceTju-Sbcs,4995
 pysmt/cmd/installers/cvcfive.py,sha256=PRSuEd2_y2qQO0G3gUGtCsKB2PMV40C1WwjpgbJkefE,1493
 pysmt/cmd/installers/cvcfour.py,sha256=uBZkKIX4gZEMfjrhrparUSDydMcvGIGZM2Y8JYD0GzE,3916
 pysmt/cmd/installers/msat.py,sha256=hNz7TbqYrEg9I0vvkSaBiKdy4v8RxH8oXGhXQhgNIVU,5409
@@ -42,10 +42,10 @@ pysmt/smtlib/script.py,sha256=4tATsRYDavjz1DVKXzfVVZxVXYOtBRhh4Ya0Ng4XxHY,13387
 pysmt/smtlib/solver.py,sha256=dWBzYBuYDVyCsQI1KlqndxpqX4xHQUDcHAuefwbHv24,7987
 pysmt/smtlib/utils.py,sha256=XNp7mW1DB6cZRtQhkAOTR-xrwYaGDBEcF3Q-edKDeU8,2043
 pysmt/smtlib/parser/__init__.py,sha256=Tgl8AAjZPmCrABGmKRSC4Yu634mn8r22qn18M3u-pfk,4771
-pysmt/smtlib/parser/parser.py,sha256=3eMEhW6t2XHSK_1EkGmjB4ZWrg6kWgfwVDVcyOxyWS0,58387
+pysmt/smtlib/parser/parser.py,sha256=vublFYMDAucq85WVaoq882WJ6kgcrRwUWh31bdH2u6M,58453
 pysmt/solvers/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/solvers/bdd.py,sha256=my3398_-8Rkqy1pluzZa7_12qsA43ARbs8-YAPqdMWs,15938
-pysmt/solvers/btor.py,sha256=DFBnYsa4oG8GC58UWvKf6FHwVK9AmnOQ8ytrEaYlZbI,25295
+pysmt/solvers/btor.py,sha256=2oT1PfXSGTSTPaXQUwVy0M799slSH2FJ-3QNb3YQmGw,25953
 pysmt/solvers/cvcfive.py,sha256=z8o4VxrZBC6sdb_JYTWfRS3BXdWJPznakN3k7rD4EY8,21073
 pysmt/solvers/cvcfour.py,sha256=odWm_MAgoPlhOf6gaarZQAqQS4fN-8PH-xGIYaiErQE,24538
 pysmt/solvers/eager.py,sha256=Py2_XaFj7YIOotH3Zv14JhmyLiZPTxKwzLuLztFqNIs,3297
@@ -74,8 +74,8 @@ pysmt/test/test_dwf.py,sha256=nQubO2IYjW3NnRjNz3xkhpXgK_5coZp9uZ_U-ElmFRw,2850
 pysmt/test/test_eager_model.py,sha256=hF9V8wQYXVeyW2Bo4sACa98xeJtfOMYjMvjWMHQaGag,3662
 pysmt/test/test_env.py,sha256=tshVfiKotjMUNXl0RCo7-itTnVJimWGPyMkuGHX_B6I,4118
 pysmt/test/test_euf.py,sha256=B0VRx1NwfKZZIG5Fc6gYPj7G6gNWMzYJvgbh-2q2E28,3455
-pysmt/test/test_formula.py,sha256=k-Gy5-8lHQ-1tGRI_ta8bJ-DjdYLQxYZJ-zPhH_anO8,38595
-pysmt/test/test_hr_parsing.py,sha256=xp6FLs_6UMAJEcIfEIytB3KCa1pE8-rGoU8v1N-n3X4,2754
+pysmt/test/test_formula.py,sha256=8KEBOfXVPa-oiX7j95ZFs-PWNqUt78TCR8UCyNwZMYw,40039
+pysmt/test/test_hr_parsing.py,sha256=bi-iTu7y1C7diMcWsQ7EI40MipDbzTKbMGPnLWX85A8,3118
 pysmt/test/test_imports.py,sha256=micwbKICxYXjEcKgc3eBEsnTKFRiLSBaso2l2cX0GDw,1561
 pysmt/test/test_int.py,sha256=dk72Q6viqRUs9XiPB40n6RrwiqsV6GbbKuSlYaQMU9k,1980
 pysmt/test/test_interpolation.py,sha256=WTodZtnxH5slIvUWbHbjjnI2o0naXgZwZawTGhh3E0o,3941
@@ -89,7 +89,7 @@ pysmt/test/test_oracles.py,sha256=cHBPTUoi9cPmIvR-DG4bbzohOaBdUJzpKLoQXImxS_c,56
 pysmt/test/test_portfolio.py,sha256=k0Jdrdr-EX-BVCxqYNUS3YjC77aCpzzdhezjB8U3OCM,7125
 pysmt/test/test_printing.py,sha256=glsnaMRungLc31JIJTmHlT69JnTPsC5pnYn1rZriV2s,8765
 pysmt/test/test_qe.py,sha256=k8zYX-lcij0ua9yuRXl7wErUklEgLSEh68QDpV8J9xs,7157
-pysmt/test/test_regressions.py,sha256=OHBptJUWQnUkXT17VH4z9Qea0QQeUF2v4sw_RYyottE,20119
+pysmt/test/test_regressions.py,sha256=RnZmdszTOIbDnMZ7wjVnMwdboJCcObtQeM0YumLd3ng,20400
 pysmt/test/test_rewritings.py,sha256=1eeseDwZyQD2VrOFBABXHTYJFJOXszP4olbCNeLcwfA,15607
 pysmt/test/test_shannon_expansion.py,sha256=yaiZuB24wj1Zi-KdzRTmWuzAVaF9bQ603uto7zi6XBs,3082
 pysmt/test/test_simplify.py,sha256=ckQn_DUxVvGspaRNZmSPHkudhpUlG5K2w6C0wDqhL1w,7620
@@ -97,7 +97,7 @@ pysmt/test/test_size.py,sha256=p3aqCMHfBiGLxvF0P8hE-PRQTT8VMPIJCjblq8Txh1w,3261
 pysmt/test/test_solving.py,sha256=8x9dNHbICFzHmCLZDR_Nnm3ScRal6seGoRRA89uOB4w,24906
 pysmt/test/test_sorts.py,sha256=erfInyPH91WVB8JBUYLteTo5X5skKKP3vEXdUUKC-YE,6033
 pysmt/test/test_string.py,sha256=Y6VBfkLNKuePo8-HIzcwBH3eaYj0i-k1Y8tpFyw03zw,8096
-pysmt/test/test_typechecker.py,sha256=obrRf5LSkrZjw2Kn7B4WNWVUykE7c9tU3jW-dEteHBs,6977
+pysmt/test/test_typechecker.py,sha256=S2O8HjN_bLN6sz86TnsWqpRtxHk2VcVsGDoRZCcQnzE,7309
 pysmt/test/test_unsat_cores.py,sha256=J-ip4SInZ9l96NCsLsKmvIiSI04hKpdyrPeKRh6b6aM,6563
 pysmt/test/test_walker_ext.py,sha256=4x6Ew522P_0fLpKRIL0_0igB4I3_VrWWA4juuqolhag,3522
 pysmt/test/test_walkers.py,sha256=AKVMvEUtMBht08bE1vCMaeMtdgGa6j_weDSHz_9Br3Q,9481
@@ -122,16 +122,16 @@ pysmt/test/smtlib/test_parser_qf_nra.py,sha256=a6VWFQtv_v2bqLe598NTdcK1v9cM9Q3lo
 pysmt/test/smtlib/test_parser_qf_uf.py,sha256=iKWadVfvZEKkjuP0lXo3BoEk3ISoDYyi_x4MhTt6Q_Q,978
 pysmt/test/smtlib/test_parser_qf_ufbv.py,sha256=G3Nnt4awK1A6nwDvKRv4zoFwtGHawvlf4KSVYJRltGA,984
 pysmt/test/smtlib/test_parser_type_error.py,sha256=cnil1KNDYkxc52pnqOC1ch8joGbaWWqepQmYABtTHLM,1129
-pysmt/test/smtlib/test_smtlibscript.py,sha256=x-ukB65HeccNZ9I3GUxvOf8MHCyfzc8qKBXgtQwOgmg,11013
+pysmt/test/smtlib/test_smtlibscript.py,sha256=pGNEPwCinr0oIAYbp0kx4dkczi5Z5frHKTzOdlwf350,11930
 pysmt/walkers/__init__.py,sha256=D6iHibVpqaZFzcpgYnNf3NVMxPyouAeeonTDSwCToRg,1585
 pysmt/walkers/dag.py,sha256=pUdVTZx7CQyjrAb6jMfmsqS07J4kiDqHU8R4_9UvwkQ,5352
 pysmt/walkers/generic.py,sha256=q1j1T2RvCeJn1PM0H5d8vNV4FTYAEQgT7h8X5DJhDf8,4534
 pysmt/walkers/identitydag.py,sha256=f_D5qA198ayd3QO4u59fBX1RS_UiSBnPeV9O3ULvQv0,8737
 pysmt/walkers/tree.py,sha256=WIWN9IM0riWkaD40iP4Tt3BCN21iSdE1S7gRZqy56SU,2846
-PySMT-0.9.7.dev112.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-PySMT-0.9.7.dev112.dist-info/METADATA,sha256=jyBArgrTBLc7CC6a2QaWphz8zjnXBWJdPLC5jIdbv4o,1617
-PySMT-0.9.7.dev112.dist-info/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-PySMT-0.9.7.dev112.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-PySMT-0.9.7.dev112.dist-info/entry_points.txt,sha256=si0hIk-v3V35G3p8QGINoQ4QW-v4RYDRqj-asgyCgeM,58
-PySMT-0.9.7.dev112.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-PySMT-0.9.7.dev112.dist-info/RECORD,,
+PySMT-0.9.7.dev129.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+PySMT-0.9.7.dev129.dist-info/METADATA,sha256=R2RMcBG8AfOdQ3QlgdfMrTtjMbGv4t3lY-SMtBns3X4,1617
+PySMT-0.9.7.dev129.dist-info/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+PySMT-0.9.7.dev129.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+PySMT-0.9.7.dev129.dist-info/entry_points.txt,sha256=si0hIk-v3V35G3p8QGINoQ4QW-v4RYDRqj-asgyCgeM,58
+PySMT-0.9.7.dev129.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+PySMT-0.9.7.dev129.dist-info/RECORD,,

pysmt/__init__.py

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

pysmt/cmd/installers/btor.py

@@ -12,9 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
+from tempfile import NamedTemporaryFile
 
 from pysmt.cmd.installers.base import SolverInstaller
 
+CYTHON_PATCH = '''\
+--- pyboolector.pyx	2025-05-12 14:01:27.528128358 +0200
++++ pyboolector.pyx.patched	2025-05-12 14:07:26.685645023 +0200
+@@ -1274,7 +1274,7 @@
+                 Parameter ``width`` is only required if ``c`` is an integer.
+         """
+         cdef BoolectorConstNode r
+-        if isinstance(c, int) or (sys.version < '3' and isinstance(c, long)):
++        if isinstance(c, int):
+             if c != 0 and c.bit_length() > width:
+                 raise BoolectorException(
+                           "Value of constant {} (bit width {}) exceeds bit "\\
+'''
+
 
 class BtorInstaller(SolverInstaller):
 
@@ -59,6 +74,14 @@ class BtorInstaller(SolverInstaller):
         SolverInstaller.untar(os.path.join(self.base_dir, self.archive_name),
                               self.extract_path)
 
+        # Patching for cython 3.8
+        with NamedTemporaryFile() as f:
+            f.write(CYTHON_PATCH.encode())
+            f.flush()
+            f.seek(0)
+            SolverInstaller.run("patch src/api/python/pyboolector.pyx -i %s" % f.name,
+                                directory=self.extract_path)
+
         # Build lingeling
         SolverInstaller.run("bash ./contrib/setup-lingeling.sh",
                             directory=self.extract_path)

pysmt/formula.py

@@ -89,7 +89,9 @@ class FormulaManager(object):
     def create_node(self, node_type, args, payload=None):
         content = FNodeContent(node_type, args, payload)
         if content in self.formulae:
-            return self.formulae[content]
+            n = self.formulae[content]
+            self._do_type_check(n)
+            return n
         else:
             n = FNode(content, self._next_free_id)
             self._next_free_id += 1

pysmt/parsing.py

@@ -126,9 +126,6 @@ class HRLexer(Lexer):
             Rule(r"\"(.*?)\"", self.string_constant, True), # String Constant
             Rule(r"BV\{(\d+)\}", self.bv_type, True),# BV Type
             Rule(r"(Array\{)", OpenArrayTypeTok(), False),# Array Type
-            Rule(r"(Int)", IntTypeTok(), False),# Int Type
-            Rule(r"(Real)", RealTypeTok(), False),# Real Type
-            Rule(r"(Bool)", BoolTypeTok(), False),# Bool Type
             Rule(r"(&)", InfixOpAdapter(self.AndOrBVAnd, 40), False),# conjunction
             Rule(r"(\|)", InfixOpAdapter(self.OrOrBVOr, 30), False),# disjunction
             Rule(r"(!)", UnaryOpAdapter(self.NotOrBVNot, 50), False),# negation
@@ -168,19 +165,10 @@ class HRLexer(Lexer):
             Rule(r"(:=)", ArrStore(), False),# ArrStore
             Rule(r"(::)", InfixOpAdapter(self.mgr.BVConcat, 90), False),# BVXor
             Rule(r"(:)", ExprElse(), False),# colon
-            Rule(r"(False)", Constant(self.mgr.FALSE()), False), # False
-            Rule(r"(True)", Constant(self.mgr.TRUE()), False),# True
             Rule(r"(,)", ExprComma(), False),# comma
             Rule(r"(\.)", ExprDot(), False),# dot
-            Rule(r"(xor)", InfixOpAdapter(self.mgr.BVXor, 10), False),# BVXor
-            Rule(r"(ROR)", InfixOpAdapter(self.BVHack(self.mgr.BVRor), 90), False),# BVRor
-            Rule(r"(ROL)", InfixOpAdapter(self.BVHack(self.mgr.BVRol), 90), False),# BVRol
-            Rule(r"(ZEXT)", InfixOpAdapter(self.BVHack(self.mgr.BVZExt), 90), False),# BVZext
-            Rule(r"(SEXT)", InfixOpAdapter(self.BVHack(self.mgr.BVSExt), 90), False),# BVSext
-            Rule(r"(bvcomp)", InfixOpAdapter(self.mgr.BVComp, 90), False),#
-            Rule(r"(forall)", Quantifier(self.mgr.ForAll, 20), False),#
-            Rule(r"(exists)", Quantifier(self.mgr.Exists, 20), False),#
-            Rule(r"(ToReal)", UnaryOpAdapter(self.mgr.ToReal, 100), False),#
+            Rule(r"(forall\s+)", Quantifier(self.mgr.ForAll, 20), False),#
+            Rule(r"(exists\s+)", Quantifier(self.mgr.Exists, 20), False),#
             Rule(r"(str\.len)", FunctionCallAdapter(self.mgr.StrLength, 100), False), # str_length
             Rule(r"(str\.\+\+)", FunctionCallAdapter(self.mgr.StrConcat, 100), False), # str_concat
             Rule(r"(str\.at)", FunctionCallAdapter(self.mgr.StrCharAt, 100), False), # str_charat
@@ -192,14 +180,28 @@ class HRLexer(Lexer):
             Rule(r"(str\.suffixof)", FunctionCallAdapter(self.mgr.StrSuffixOf, 100), False), # str_suffixof
             Rule(r"(str\.to\.int)", FunctionCallAdapter(self.mgr.StrToInt, 100), False), # str_to_int
             Rule(r"(int\.to\.str)", FunctionCallAdapter(self.mgr.IntToStr, 100), False), # int_to_str
-            Rule(r"(bv2nat)", UnaryOpAdapter(self.mgr.BVToNatural, 100), False),#
             Rule(r"'(.*?)'", self.identifier, True), # quoted identifiers
             Rule(r"([A-Za-z_][A-Za-z0-9_]*)", self.identifier, True),# identifiers
             Rule(r"(.)", self.lexing_error, True), # input error
         ]
-
         self.rules += hr_rules
 
+        self._identifier_map = {
+            "False": Constant(self.mgr.FALSE()), # False
+            "True": Constant(self.mgr.TRUE()),# True
+            "xor": InfixOpAdapter(self.mgr.BVXor, 10),# BVXor
+            "bv2nat": UnaryOpAdapter(self.mgr.BVToNatural, 100),#
+            "bvcomp": InfixOpAdapter(self.mgr.BVComp, 90),#
+            "ROR": InfixOpAdapter(self.BVHack(self.mgr.BVRor), 90),# BVRor
+            "ROL": InfixOpAdapter(self.BVHack(self.mgr.BVRol), 90),# BVRol
+            "ZEXT": InfixOpAdapter(self.BVHack(self.mgr.BVZExt), 90),# BVZext
+            "SEXT": InfixOpAdapter(self.BVHack(self.mgr.BVSExt), 90),# BVSext
+            "ToReal": UnaryOpAdapter(self.mgr.ToReal, 100),#
+            "Int": IntTypeTok(),# Int Type
+            "Real": RealTypeTok(),# Real Type
+            "Bool": BoolTypeTok(),# Bool Type
+        }
+
         self.compile()
 
     def bv_type(self, read):
@@ -219,6 +221,9 @@ class HRLexer(Lexer):
         return Constant(self.mgr.String(read))
 
     def identifier(self, read):
+        res = self._identifier_map.get(read, None)
+        if res is not None:
+            return res
         return Identifier(read, env=self.env)
 
     def UMinusOrBvNeg(self, x):

pysmt/shortcuts.py

@@ -233,6 +233,31 @@ def Ite(iff, left, right):
     return get_env().formula_manager.Ite(iff, left, right)
 
 
+def Abs(formula):
+    r"""Returns the absolute value of the formula.
+    
+    This is implemented as If(formula > 0, formula, -formula).
+    Works for both integer and real values.
+    
+    :param formula: The formula to compute the absolute value of
+    :returns: The absolute value of the formula
+    :raises: ValueError if the formula type is not integer or real
+    """
+    # Get the type of the formula to determine the appropriate zero value
+    formula_type = get_type(formula)
+    
+    # Create a zero value of the same type as the formula
+    if formula_type == types.INT:
+        zero = Int(0)
+    elif formula_type == types.REAL:
+        zero = Real(0)
+    else:
+        # Raise an error for unsupported types
+        raise ValueError(f"Abs function only supports integer and real types, got {formula_type}")
+    
+    return Ite(GT(formula, zero), formula, Minus(zero, formula))
+
+
 def Symbol(name, typename=types.BOOL):
     """Returns a symbol with the given name and type.
 

pysmt/smtlib/parser/parser.py

@@ -344,13 +344,15 @@ class SmtLibParser(object):
                 get_type = self.env.stc.get_type
                 get_free_variables = self.env.fvo.get_free_variables
                 new_args = []
+                changed = False
                 for x in args:
                     if get_type(x).is_int_type() and\
                        len(get_free_variables(x)) == 0:
                         new_args.append(mgr.ToReal(x))
+                        changed = True
                     else:
                         new_args.append(x)
-                if args == new_args:
+                if not changed:
                     raise
                 return op(*new_args)
 

pysmt/solvers/btor.py

@@ -15,12 +15,29 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+from enum import Enum
+import inspect
 from math import log, ceil
 
 from pysmt.exceptions import SolverAPINotFound
 
 try:
     import pyboolector
+
+    # Fixing interface for cython 3.1+
+    #
+    # Cython 3.1 changed the way enums are handled: the enum values are no
+    # longer added to the global namespace, while the documentation of btor
+    # relied on the old behavior of cython, Here, we first collect all the nums
+    # in the module and then we add their enumerands to the pyboolector module,
+    # making it work on either cython 3.0 or 3.1.
+    enums = []
+    for x in pyboolector.__dict__.values():
+        if inspect.isclass(x) and issubclass(x, Enum):
+            enums.append(x)
+    for x in enums:
+        pyboolector.__dict__.update(x.__members__)
+
 except ImportError:
     raise SolverAPINotFound
 

pysmt/test/smtlib/test_smtlibscript.py

@@ -27,7 +27,7 @@ from pysmt.smtlib.script import smtlibscript_from_formula, evaluate_command
 from pysmt.smtlib.parser import get_formula_strict, get_formula, SmtLibParser
 from pysmt.solvers.smtlib import SmtLibIgnoreMixin
 from pysmt.logics import QF_UFLIRA
-from pysmt.exceptions import UndefinedLogicError, PysmtValueError
+from pysmt.exceptions import UndefinedLogicError, PysmtValueError, PysmtTypeError
 
 
 
@@ -175,6 +175,29 @@ class TestSmtLibScript(TestCase):
         # No exceptions are thrown
         self.assertEqual(smtlib_script.replace('var', '__var0'), script.commands[0].serialize_to_string())
 
+    def test_twice_fix_real(self):
+        smtlib_script = "\n".join([
+            '(declare-fun r () Real)',
+            '(assert (< (* 1 r) 0))',
+            '(assert (< 2 (* 1 r)))'
+        ])
+        stream = StringIO(smtlib_script)
+        parser = SmtLibParser()
+        _ = parser.get_script(stream)
+        # No exceptions are thrown
+        self.assertTrue(True)
+
+    def test_type_error(self):
+        smtlib_script = "\n".join([
+            "(declare-sort B 0)",
+            "(declare-const e B)",
+            "(declare-const x Bool)",
+            "(assert (= e x))",
+        ])
+        stream = StringIO(smtlib_script)
+        parser = SmtLibParser()
+        with self.assertRaises(PysmtTypeError):
+            _ = parser.get_script(stream)
 
     def test_evaluate_command(self):
         class SmtLibIgnore(SmtLibIgnoreMixin):
@@ -233,14 +256,19 @@ class TestSmtLibScript(TestCase):
         # Create a small file that tests all commands of smt-lib 2
         parser = SmtLibParser()
 
+        te = 0
         nie = 0
         for cmd in DEMO_SMTSCRIPT:
             try:
                 next(parser.get_command_generator(StringIO(cmd)))
             except NotImplementedError:
                 nie += 1
+            except PysmtTypeError:
+                te += 1
         # There are currently 3 not-implemented commands
         self.assertEqual(nie, 3)
+        # There is currently 1 type error
+        self.assertEqual(te, 1)
 
 DEMO_SMTSCRIPT = [ "(declare-fun a () Bool)",
                    "(declare-fun b () Bool)",

pysmt/test/test_formula.py

@@ -19,7 +19,7 @@ import pysmt
 
 from pysmt.typing import BOOL, REAL, INT, FunctionType, BV8, BVType
 from pysmt.shortcuts import Symbol, is_sat, Not, Implies, GT, Plus, Int, Real
-from pysmt.shortcuts import Minus, Times, Xor, And, Or, TRUE, Iff, FALSE, Ite
+from pysmt.shortcuts import Minus, Times, Xor, And, Or, TRUE, Iff, FALSE, Ite, Abs
 from pysmt.shortcuts import Equals
 from pysmt.shortcuts import get_env
 from pysmt.environment import Environment
@@ -317,6 +317,38 @@ class TestFormulaManager(TestCase):
         inv = self.mgr.Real(Fraction(1) / self.rconst.constant_value())
         self.assertEqual(n, self.mgr.Times(self.s, inv))
 
+    def test_abs_shortcut(self):
+        # Test with integer
+        abs_int = Abs(self.p)
+        
+        # Verify the structure of the Abs node
+        self.assertTrue(abs_int.is_ite())
+        self.assertTrue(abs_int.arg(0).is_lt())  # GT is converted to LT with inverted args
+        self.assertEqual(abs_int.arg(0).arg(0), Int(0))  # First arg is 0
+        self.assertEqual(abs_int.arg(0).arg(1), self.p)  # Second arg is p
+        self.assertEqual(abs_int.arg(1), self.p)
+        self.assertTrue(abs_int.arg(2).is_minus())
+        self.assertEqual(abs_int.arg(2).arg(0), Int(0))
+        self.assertEqual(abs_int.arg(2).arg(1), self.p)
+        
+        # Test with real
+        abs_real = Abs(self.r)
+        
+        # Verify the structure of the Abs node
+        self.assertTrue(abs_real.is_ite())
+        self.assertTrue(abs_real.arg(0).is_lt())  # GT is converted to LT with inverted args
+        self.assertEqual(abs_real.arg(0).arg(0), Real(0))  # First arg is 0
+        self.assertEqual(abs_real.arg(0).arg(1), self.r)  # Second arg is r
+        self.assertEqual(abs_real.arg(1), self.r)
+        self.assertTrue(abs_real.arg(2).is_minus())
+        self.assertEqual(abs_real.arg(2).arg(0), Real(0))
+        self.assertEqual(abs_real.arg(2).arg(1), self.r)
+        
+        # Test with boolean (should raise ValueError)
+        bool_var = Symbol("z", BOOL)
+        with self.assertRaises(ValueError):
+            Abs(bool_var)
+
     def test_equals(self):
         n = self.mgr.Equals(self.real_expr, self.real_expr)
         self.assertIsNotNone(n)

pysmt/test/test_hr_parsing.py

@@ -18,8 +18,10 @@
 import unittest
 import tempfile, os
 
+from fractions import Fraction
+
 from pysmt.parsing import HRParser, parse
-from pysmt.shortcuts import Iff, Symbol, And, Or, LE, Real, Plus, Minus
+from pysmt.shortcuts import Iff, Symbol, And, Or, LE, GT, Real, Plus, Minus
 from pysmt.test.examples import get_example_formulae
 from pysmt.exceptions import NoSolverAvailableError
 from pysmt.test import TestCase
@@ -76,6 +78,7 @@ class TestHRParser(TestCase):
         p = HRParser()
         for (f, _, _, _) in get_example_formulae():
             s = f.serialize()
+            print(s)
             res = p.parse(s)
             check = (res == f)
             if not check:
@@ -84,6 +87,12 @@ class TestHRParser(TestCase):
                 except NoSolverAvailableError:
                     pass
 
+    def test_substring(self):
+        p = HRParser()
+        s=Symbol('Intake_Pressure', REAL)
+        res = p.parse('(Intake_Pressure > 91.988 & Intake_Pressure<=116.892)')
+        print(res.serialize())
+        self.assertEqual(res, And(GT(s, Real(Fraction("91.988"))), LE(s, Real(Fraction("116.892")))))
 
 
 if __name__ == '__main__':

pysmt/test/test_regressions.py

@@ -456,13 +456,20 @@ class TestRegressions(TestCase):
             self.assertEqual(ex.pos_info[1], 19)
 
     def test_parse_bvconst_width(self):
-        smtlib_input = "(assert (> #x10 #x10))"
+        smtlib_input = "(assert (bvugt #x10 #x10))"
         parser = SmtLibParser()
         buffer_ = StringIO(smtlib_input)
         expr = parser.get_script(buffer_).get_last_formula()
         const = expr.args()[0]
         self.assertEqual(const.bv_width(), 8, const.bv_width())
 
+    def test_parse_bvconst_type_check(self):
+        smtlib_input = "(assert (> #x10 #x10))"
+        parser = SmtLibParser()
+        buffer_ = StringIO(smtlib_input)
+        with self.assertRaises(PysmtTypeError):
+            _ = parser.get_script(buffer_).get_last_formula()
+
     def test_equality_typing(self):
         x = Symbol('x', BOOL)
         y = Symbol('y', BOOL)

pysmt/test/test_typechecker.py

@@ -212,6 +212,15 @@ class TestSimpleTypeChecker(TestCase):
         with self.assertRaises(PysmtTypeError):
             super_bad_function()
 
+    def test_multiple_creations(self):
+        def bad_formula():
+            return Times(self.p, self.r)
+        with self.assertRaises(PysmtTypeError):
+            bad_formula()
+        # When building the same formula a second time, should raise again.
+        with self.assertRaises(PysmtTypeError):
+            bad_formula()
+
     def test_examples(self):
         for (f, _, _, _) in get_example_formulae():
             self.assertIs(f.get_type(), BOOL, f)