crosshair-tool 0.0.92__tar.gz → 0.0.93__tar.gz

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.92
+Version: 0.0.93
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -47,6 +47,7 @@ Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: sphinx>=3.4.3; extra == "dev"
 Requires-Dist: sphinx-rtd-theme>=0.5.1; extra == "dev"
 Requires-Dist: rst2pdf>=0.102; extra == "dev"
+Requires-Dist: z3-solver==4.14.1.0; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair/__init__.py

@@ -15,7 +15,7 @@ from crosshair.statespace import StateSpace
 from crosshair.tracers import NoTracing, ResumedTracing
 from crosshair.util import IgnoreAttempt, debug
 
-__version__ = "0.0.92"  # Do not forget to update in setup.py!
+__version__ = "0.0.93"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair/core.py

@@ -329,9 +329,10 @@ def with_realized_args(fn: Callable, deep=False) -> Callable:
 
     def realizer(*a, **kw):
         with NoTracing():
-            a = map(realize_fn, a)
+            a = [realize_fn(arg) for arg in a]
             kw = {k: realize_fn(v) for (k, v) in kw.items()}
-            return fn(*a, **kw)
+        # You might think we don't need tracing here, but some operations can invoke user-defined behavior:
+        return fn(*a, **kw)
 
     functools.update_wrapper(realizer, fn)
     return realizer

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair/libimpl/builtinslib.py

@@ -4441,10 +4441,11 @@ def _int(val: Any = 0, base=_MISSING):
                     else:
                         ret = (ret * base) + ch_num
                 return ret
-        if base is _MISSING:
-            return int(deep_realize(val))
-        else:
-            return int(deep_realize(val), base=realize(base))
+        elif isinstance(val, CrossHairValue):
+            val = deep_realize(val)
+            base = deep_realize(base)
+
+    return int(val) if base is _MISSING else int(val, base=base)
 
 
 _FLOAT_REGEX = re.compile(
@@ -4549,7 +4550,7 @@ def _len(ls):
 def _map(fn, *iters):
     # Wrap the `map` callback in a pure Python lambda.
     # This de-optimization ensures that the callback can be intercepted.
-    return map(lambda x: fn(x), *iters)
+    return map(lambda *a: fn(*a), *iters)
 
 
 def _memoryview(source):

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair/libimpl/fractionlib_test.py

@@ -5,7 +5,8 @@ from crosshair.core import deep_realize
 from crosshair.core_and_libs import proxy_for_type
 from crosshair.statespace import POST_FAIL
 from crosshair.test_util import check_states
-from crosshair.tracers import ResumedTracing
+from crosshair.tracers import ResumedTracing, is_tracing
+from crosshair.util import CrossHairInternal
 
 
 def test_fraction_realize(space):
@@ -16,6 +17,28 @@ def test_fraction_realize(space):
         deep_realize(Fraction(n, d))
 
 
+class UserFraction(Fraction):
+    def __int__(self):
+        if not is_tracing():
+            raise CrossHairInternal("tracing required while in user code")
+        return 1
+
+    def __round__(self, *a, **kw):
+        if not is_tracing():
+            raise CrossHairInternal("tracing required while in user code")
+        return super().__round__(*a, **kw)
+
+
+def test_user_fraction_tracing(space):
+    n = proxy_for_type(int, "n")
+    d = proxy_for_type(int, "d")
+    with ResumedTracing():
+        space.add(d != 0)
+        fraction = UserFraction(n, d)
+        round(fraction)  # (works via with_realized_args)
+        int(fraction)  # (custom interception)
+
+
 def test_fraction_copy_doesnt_realize(space):
     n = proxy_for_type(int, "n")
     with ResumedTracing():

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair/patch_equivalence_test.py

@@ -1,5 +1,6 @@
 import copy
 import itertools
+import operator
 import re
 import sys
 from dataclasses import dataclass
@@ -39,6 +40,7 @@ possible_args = [
     (42, int),  # isinstance
     (re.compile("(ab|a|b)"), r"\n", ""),  # re methods
     (bool, [1, 1, 0]),  # itertools.takewhile and friends
+    (operator.add, [1, 0], [1, 1]),  # multi-iterable map
     ([(1, 2), (3, 4)]),  # key-value pairs
     ([(1, 2), ([], 4)]),  # key-value pairs w/ unhashable key
 ]

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair_tool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.92
+Version: 0.0.93
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -47,6 +47,7 @@ Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: sphinx>=3.4.3; extra == "dev"
 Requires-Dist: sphinx-rtd-theme>=0.5.1; extra == "dev"
 Requires-Dist: rst2pdf>=0.102; extra == "dev"
+Requires-Dist: z3-solver==4.14.1.0; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/crosshair_tool.egg-info/requires.txt

@@ -20,6 +20,7 @@ setuptools
 sphinx>=3.4.3
 sphinx-rtd-theme>=0.5.1
 rst2pdf>=0.102
+z3-solver==4.14.1.0
 
 [dev:python_version < "3.12"]
 numpy==1.23.4

{crosshair_tool-0.0.92 → crosshair_tool-0.0.93}/setup.py

@@ -14,7 +14,7 @@ from setuptools import Extension, find_packages, setup  # type: ignore
 # the pre-commit checks through check_init_and_setup_coincide.py.
 setup(
     name="crosshair-tool",
-    version="0.0.92",  # Update this in crosshair/__init__.py too
+    version="0.0.93",  # Update this in crosshair/__init__.py too
     author="Phillip Schanely",
     author_email="pschanely+vE7F@gmail.com",
     ext_modules=[
@@ -66,6 +66,7 @@ setup(
             "sphinx>=3.4.3",
             "sphinx-rtd-theme>=0.5.1",
             "rst2pdf>=0.102",
+            "z3-solver==4.14.1.0",  # TODO: the 4.15 release has significant performance improvements
         ]
     },
     classifiers=[