crosshair-tool 0.0.94__cp313-cp313-macosx_10_13_universal2.whl → 0.0.95__cp313-cp313-macosx_10_13_universal2.whl

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.94"  # Do not forget to update in setup.py!
+__version__ = "0.0.95"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/libimpl/builtinslib.py

@@ -2611,18 +2611,6 @@ class SymbolicObject(ObjectProxy, CrossHairValue, Untracable):
             return object()
         return proxy_for_type(pytype, varname, allow_subtypes=False)
 
-    def _wrapped(self):
-        with NoTracing():
-            inner = _MISSING
-            try:
-                inner = object.__getattribute__(self, "_inner")
-            except AttributeError:
-                pass
-            if inner is _MISSING:
-                inner = self._realize()
-                object.__setattr__(self, "_inner", inner)
-            return inner
-
     def __ch_realize__(self):
         return realize(self._wrapped())
 

crosshair/objectproxy.py

@@ -10,11 +10,36 @@ from crosshair.tracers import NoTracing
 # (which is BSD licenced)
 #
 
+_MISSING = object()
+
+
+def proxy_inplace_op(proxy, op, *args):
+    my_original_value = proxy._wrapped()
+    my_new_value = op(my_original_value, *args)
+    # We need to return our own identity if (and only if!) the underlying value does.
+    if my_new_value is my_original_value:
+        return proxy
+    else:
+        object.__setattr__(proxy, "_inner", my_new_value)
+        return my_new_value
+
 
 class ObjectProxy:
-    def _wrapped(self):
+    def _realize(self):
         raise NotImplementedError
 
+    def _wrapped(self):
+        with NoTracing():
+            inner = _MISSING
+            try:
+                inner = object.__getattribute__(self, "_inner")
+            except AttributeError:
+                pass
+            if inner is _MISSING:
+                inner = self._realize()
+                object.__setattr__(self, "_inner", inner)
+            return inner
+
     def __get_module__(self) -> str:
         return self._wrapped().__module__
 
@@ -233,40 +258,40 @@ class ObjectProxy:
         return other | self._wrapped()
 
     def __iadd__(self, other):
-        return operator.iadd(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.iadd, other)
 
     def __isub__(self, other):
-        return operator.isub(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.isub, other)
 
     def __imul__(self, other):
-        return operator.imul(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.imul, other)
 
     def __itruediv__(self, other):
-        return operator.itruediv(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.itruediv, other)
 
     def __ifloordiv__(self, other):
-        return operator.iflootdiv(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.ifloordiv, other)
 
     def __imod__(self, other):
-        return operator.imod(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.imod, other)
 
     def __ipow__(self, other, *args):
-        return operator.ipow(self._wrapped(), other, *args)
+        return proxy_inplace_op(self, operator.ipow, other, *args)
 
     def __ilshift__(self, other):
-        return operator.ilshift(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.ilshift, other)
 
     def __irshift__(self, other):
-        return operator.irshift(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.irshift, other)
 
     def __iand__(self, other):
-        return operator.iand(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.iand, other)
 
     def __ixor__(self, other):
-        return operator.ixor(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.ixor, other)
 
     def __ior__(self, other):
-        return operator.ior(self._wrapped(), other)
+        return proxy_inplace_op(self, operator.ior, other)
 
     def __neg__(self):
         return -self._wrapped()

crosshair/objectproxy_test.py

@@ -7,12 +7,12 @@ class ObjectWrap(ObjectProxy):
     def __init__(self, obj):
         object.__setattr__(self, "_o", obj)
 
-    def _wrapped(self):
+    def _realize(self):
         return object.__getattribute__(self, "_o")
 
 
 class TestObjectProxy:
-    def test_object_proxy(self) -> None:
+    def test_object_proxy_over_list(self) -> None:
         i = [1, 2, 3]
         proxy = ObjectWrap(i)
         assert i == proxy
@@ -21,3 +21,21 @@ class TestObjectProxy:
         assert [1, 2, 3, 4, 5] == proxy + [5]
         assert [2, 3] == proxy[1:3]
         assert [1, 2, 3, 4] == proxy
+
+    def test_inplace_identities(self) -> None:
+        proxy = ObjectWrap(3.0)
+        orig_proxy = proxy
+        proxy += 1.0
+        assert proxy is not orig_proxy
+        proxy = ObjectWrap([1, 2])
+        orig_proxy = proxy
+        proxy += [3, 4]
+        assert proxy is orig_proxy
+
+    def test_object_proxy_over_float(self) -> None:
+        proxy = ObjectWrap(4.5)
+        proxy //= 2.0
+        assert 2.0 == proxy
+        proxy = ObjectWrap(5.0)
+        proxy /= 2.0
+        assert 2.5 == proxy

{crosshair_tool-0.0.94.dist-info → crosshair_tool-0.0.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.94
+Version: 0.0.95
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely

{crosshair_tool-0.0.94.dist-info → crosshair_tool-0.0.95.dist-info}/RECORD

@@ -1,12 +1,12 @@
-_crosshair_tracers.cpython-313-darwin.so,sha256=lLE9WD4NEIOIu4ObhjzWWVzYuTM06-T774_53teaUec,140512
+_crosshair_tracers.cpython-313-darwin.so,sha256=uen-qGN4uah_OTh3uMXkL8FCi_Kw20m0-8sq7DbR_Sk,140512
 crosshair/_tracers_pycompat.h,sha256=6IYnbQxrYkhBsLDAHSX25DPOwo1oYHCZUVWZ8c7YCnQ,14356
 crosshair/pure_importer.py,sha256=-t4eowrZOQmfqK1N2tjI5POoaxRGavytwMmbRivelFg,878
 crosshair/options.py,sha256=htQNgnrpoRjSNq6rfLBAF8nos-NNIwmP6tQYyI8ugsM,6775
 crosshair/lsp_server_test.py,sha256=7LO1Qqxkper3Xt2krgOlGqF1O_uDObo76o4FZbIqykY,969
 crosshair/conftest.py,sha256=BkLszApkdy6FrvzaHO7xh8_BJrG9AfytFTse-HuQVvg,653
 crosshair/copyext_test.py,sha256=uJzdC9m2FqMjqQ-ITFoP0MZg3OCiO8paU-d533KocD8,2108
-crosshair/objectproxy.py,sha256=Uc6mNkJBInvETGWBHI10GSNEIrBYDIxlAZ30M3PAIhQ,8935
-crosshair/objectproxy_test.py,sha256=KykRJLSHCDA7jb_XPBDhXHnS6Q1fG4oIJ579CeSEz3k,567
+crosshair/objectproxy.py,sha256=1cO_ApA0AKPfCRu6MIsxUOKUUEGn0b1U4IHxTC4nDGI,9790
+crosshair/objectproxy_test.py,sha256=UJuO_jUt8_OEUtgQWyhlekPOdvtM8IQ5M9I_1AqXPWM,1081
 crosshair/stubs_parser.py,sha256=rlBTQus5BlZ3Ygg6Xzk5dbQbDtRpv6w9i2HQmGrPVmc,14240
 crosshair/_preliminaries_test.py,sha256=r2PohNNMfIkDqsnvI6gKlJTbwBaZA9NQJueQfJMN2Eo,504
 crosshair/dynamic_typing_test.py,sha256=8p4NOJ6i9q9mozgCYlZP3VCs-TFMDaE_7W-TyNEse4o,5907
@@ -23,7 +23,7 @@ crosshair/fnutil.py,sha256=X80bD2Lh4QAh-rF561r3JRxjxcuZepF3hJaxaj1GG9s,13123
 crosshair/unicode_categories.py,sha256=g4pnUPanx8KkpwI06ZUGx8GR8Myruf_EpTjyti_V4z8,333519
 crosshair/copyext.py,sha256=GBGQP9YAHoezLXwb_M59Hh1VXSou5EQt4ZmmUA0T_og,4899
 crosshair/_tracers_test.py,sha256=KpCGspjOUeZuhwTYgn_RxI4M4wMbT5rldusFDgneQ6M,3596
-crosshair/__init__.py,sha256=5u1xF74Cj90mIqU71fUSrQIoexYRT3mwC7WOse0f2EQ,936
+crosshair/__init__.py,sha256=nR2D8DuGMw_J17BMCTn9eHoipZzO7JmRusDfFoLt41k,936
 crosshair/core.py,sha256=7CHbmWvCVK2MlKXJUUe3eILPWGZniF8qXkBJNDkU4qg,64168
 crosshair/path_cover.py,sha256=wV0Vy8IPDzqXQ2VI8a94FxltS9p-Y1oF17OKePjvpgs,6710
 crosshair/enforce_test.py,sha256=C6CQ4P1FjkdIJeJg3aJynp1iLDCE6BFCEVtSqXbvmQk,4665
@@ -108,7 +108,7 @@ crosshair/libimpl/binascii_test.py,sha256=LOBqLAJ77Kx8vorjVTaT3X0Z93zw4P5BvwUapM
 crosshair/libimpl/collectionslib_test.py,sha256=3h7XTToKWauMhjrEwLXVI0jT8FZKBlkvlw0oiPMmuKM,9164
 crosshair/libimpl/timelib.py,sha256=MXEFOZjFGa1-yLvmB3l3DFTLF9PSluOlmRK-ZJaA_oI,2409
 crosshair/libimpl/jsonlib_test.py,sha256=U40WJf-69dtflz75sIsl5zA3IV5R6Ltc4Z9jv_Fh-Fw,1382
-crosshair/libimpl/builtinslib.py,sha256=UU2WDnQbPQMIETjvKfJlDXAFYyAXcRVvGt4SFYs-Jgk,171663
+crosshair/libimpl/builtinslib.py,sha256=Mr3bDiM6pQhLh5lkMoa4UYM3Hi4A_xm0dLteYCohZzQ,171289
 crosshair/libimpl/mathlib_test.py,sha256=QShLCXHdv3tx5PQxcSoR0MHeZ1huaiV6d3u7C2mGOn4,1861
 crosshair/libimpl/fractionlib.py,sha256=qdbiAHHC480YdKq3wYK_piZ3UD7oT64YfuNclypMUfQ,458
 crosshair/libimpl/binascii_ch_test.py,sha256=hFqSfF1Q8jl2LNBIWaQ6vBJIIshPOmSwrR0T1Ko4Leo,1009
@@ -167,9 +167,9 @@ crosshair/libimpl/encodings/ascii.py,sha256=Cz1xraTkXdQ5aBKDkorX4rAvrmf877_EqzC9
 crosshair/libimpl/encodings/__init__.py,sha256=5LTEj1M-S00eZ4rfQWczAixg57vyh_9vZ5m5EKB5Ksc,680
 crosshair/libimpl/encodings/latin_1.py,sha256=ftUsPjUb9L7UKXKi9P7OAqOl9FkNP98M9jMAvseXBCQ,1242
 crosshair/libimpl/encodings/_encutil.py,sha256=nwVWqcGM1f7-hAC3Z46KnfrLzAjhfy4zaTa11uVBk6M,6828
-crosshair_tool-0.0.94.dist-info/RECORD,,
-crosshair_tool-0.0.94.dist-info/WHEEL,sha256=YOKbiIEZep2WTRrpKV0dvEfsSeIOVH2NqduVxoKQt6I,142
-crosshair_tool-0.0.94.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
-crosshair_tool-0.0.94.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
-crosshair_tool-0.0.94.dist-info/METADATA,sha256=9HsWHsF3h7uXHcGzU3_HwaWWtHHRj-Ac6UbGXFL26DQ,6777
-crosshair_tool-0.0.94.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459
+crosshair_tool-0.0.95.dist-info/RECORD,,
+crosshair_tool-0.0.95.dist-info/WHEEL,sha256=YOKbiIEZep2WTRrpKV0dvEfsSeIOVH2NqduVxoKQt6I,142
+crosshair_tool-0.0.95.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
+crosshair_tool-0.0.95.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
+crosshair_tool-0.0.95.dist-info/METADATA,sha256=zJ6FZW9znhqPs1H19hgRsMBx3-OoGpaM2uc4TjqT0fQ,6777
+crosshair_tool-0.0.95.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459