crosshair-tool 0.0.93__cp313-cp313-macosx_10_13_x86_64.whl → 0.0.94__cp313-cp313-macosx_10_13_x86_64.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.93"  # Do not forget to update in setup.py!
+__version__ = "0.0.94"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/core.py

@@ -127,6 +127,14 @@ from crosshair.util import (
     warn,
 )
 
+if sys.version_info >= (3, 12):
+    from typing import TypeAliasType
+
+    TypeAliasTypes = (TypeAliasType,)
+else:
+    TypeAliasTypes = ()
+
+
 _MISSING = object()
 
 
@@ -667,6 +675,11 @@ def proxy_for_type(
         typ = normalize_pytype(typ)
         origin = origin_of(typ)
         type_args = type_args_of(typ)
+        while isinstance(origin, TypeAliasTypes):
+            type_var_bindings = dict(zip(origin.__type_params__, type_args))
+            unified = dynamic_typing.realize(origin.__value__, type_var_bindings)
+            return proxy_for_type(unified, varname, allow_subtypes)
+
         # special cases
         if isinstance(typ, type) and issubclass(typ, enum.Enum):
             enum_values = list(typ)  # type:ignore

crosshair/core_test.py

@@ -5,6 +5,7 @@ import re
 import sys
 import time
 from typing import *
+from unittest import skipIf
 
 import pytest  # type: ignore
 
@@ -28,7 +29,7 @@ from crosshair.core_and_libs import (
     standalone_statespace,
 )
 from crosshair.fnutil import FunctionInfo, walk_qualname
-from crosshair.libimpl.builtinslib import SymbolicInt
+from crosshair.libimpl.builtinslib import LazyIntSymbolicStr, SymbolicInt
 from crosshair.options import DEFAULT_OPTIONS, AnalysisOptionSet
 from crosshair.statespace import (
     CANNOT_CONFIRM,
@@ -735,6 +736,29 @@ def test_newtype() -> None:
     assert isinstance(x, SymbolicInt)
 
 
+@skipIf(sys.version_info < (3, 12), "type statements added in 3.12")
+def test_type_statement() -> None:
+    env: dict[str, Any] = {}
+    exec("type MyIntNew = int\n", env)
+    assert "MyIntNew" in env
+    MyIntNew = env["MyIntNew"]
+    with standalone_statespace:
+        x = proxy_for_type(MyIntNew, "x")
+    assert isinstance(x, SymbolicInt)
+
+
+@skipIf(sys.version_info < (3, 12), "type statements added in 3.12")
+def test_parameterized_type_statement() -> None:
+    env: dict[str, Any] = {}
+    exec("type Pair[A, B] = tuple[B, A]\n", env)
+    assert "Pair" in env
+    Pair = env["Pair"]
+    with standalone_statespace:
+        x = proxy_for_type(Pair[int, str], "x")
+    assert isinstance(x[0], LazyIntSymbolicStr)
+    assert isinstance(x[1], SymbolicInt)
+
+
 def test_container_typevar() -> None:
     T = TypeVar("T")
 

crosshair/dynamic_typing.py

@@ -1,4 +1,5 @@
 import collections.abc
+import sys
 import typing
 from inspect import Parameter, Signature
 from itertools import zip_longest
@@ -223,21 +224,41 @@ def get_bindings_from_type_arguments(pytype: Type) -> Mapping[object, type]:
     return {}
 
 
-def realize(pytype: Type, bindings: Mapping[object, type]) -> object:
-    if typing_inspect.is_typevar(pytype):
-        return bindings[pytype]
-    if not hasattr(pytype, "__args__"):
-        return pytype
-    newargs: List = []
-    for arg in pytype.__args__:  # type:ignore
-        newargs.append(realize(arg, bindings))
-    # print('realizing pytype', repr(pytype), 'newargs', repr(newargs))
-    pytype_origin = origin_of(pytype)
-    if not hasattr(pytype_origin, "_name"):
-        pytype_origin = getattr(typing, pytype._name)  # type:ignore
-    if pytype_origin is Callable:  # Callable args get flattened
-        newargs = [newargs[:-1], newargs[-1]]
-    return pytype_origin.__getitem__(tuple(newargs))
+if sys.version_info >= (3, 9):
+
+    def realize(pytype: Type, bindings: Mapping[object, type]) -> object:
+        if typing_inspect.is_typevar(pytype):
+            return bindings[pytype]
+        if not hasattr(pytype, "__args__"):
+            return pytype
+        newargs: List = []
+        for arg in pytype.__args__:  # type:ignore
+            newargs.append(realize(arg, bindings))
+        pytype_origin = origin_of(pytype)
+        if pytype_origin in (
+            collections.abc.Callable,
+            typing.Callable,
+        ):  # Callable args get flattened
+            newargs = [newargs[:-1], newargs[-1]]
+        return pytype_origin.__class_getitem__(tuple(newargs))
+
+else:
+
+    def realize(pytype: Type, bindings: Mapping[object, type]) -> object:
+        if typing_inspect.is_typevar(pytype):
+            return bindings[pytype]
+        if not hasattr(pytype, "__args__"):
+            return pytype
+        newargs: List = []
+        for arg in pytype.__args__:  # type:ignore
+            newargs.append(realize(arg, bindings))
+        # print('realizing pytype', repr(pytype), 'newargs', repr(newargs))
+        pytype_origin = origin_of(pytype)
+        if not hasattr(pytype_origin, "_name"):
+            pytype_origin = getattr(typing, pytype._name)  # type:ignore
+        if pytype_origin is Callable:  # Callable args get flattened
+            newargs = [newargs[:-1], newargs[-1]]
+        return pytype_origin.__getitem__(tuple(newargs))
 
 
 def isolate_var_params(

crosshair/dynamic_typing_test.py

@@ -1,4 +1,5 @@
 import collections
+import sys
 from inspect import Parameter, Signature, signature
 from typing import (
     Callable,
@@ -60,7 +61,12 @@ def test_typedicts():
 def test_typevars():
     bindings = collections.ChainMap()
     assert unify(Tuple[int, str, List[int]], Tuple[int, _T, _U], bindings)
-    assert realize(Mapping[_U, _T], bindings) == Mapping[List[int], str]
+
+    ret = realize(Mapping[_U, _T], bindings)
+    if sys.version_info >= (3, 9):
+        assert ret == collections.abc.Mapping[List[int], str]
+    else:
+        assert ret == Mapping[List[int], str]
 
 
 def test_bound_vtypears():
@@ -79,7 +85,13 @@ def test_callable():
 
     assert not unify(Callable[[List], bool], Callable[[Iterable], bool], bindings)
     assert unify(Callable[[int, _T], List[int]], Callable[[int, str], _U], bindings)
-    assert realize(Callable[[_U], _T], bindings) == Callable[[List[int]], str]
+    if sys.version_info >= (3, 9):
+        assert (
+            realize(Callable[[_U], _T], bindings)
+            == collections.abc.Callable[[List[int]], str]
+        )
+    else:
+        assert realize(Callable[[_U], _T], bindings) == Callable[[List[int]], str]
 
 
 def test_plain_callable():
@@ -131,7 +143,10 @@ class Pair(Generic[_U, _T]):
 def test_bindings_from_type_arguments():
     var_mapping = get_bindings_from_type_arguments(Pair[int, str])
     assert var_mapping == {_U: int, _T: str}
-    assert realize(List[_U], var_mapping) == List[int]
+    if sys.version_info >= (3, 9):
+        assert realize(List[_U], var_mapping) == list[int]
+    else:
+        assert realize(List[_U], var_mapping) == List[int]
 
 
 def test_intersect_signatures_basic():

crosshair/examples/check_examples_test.py

@@ -24,7 +24,7 @@ def extract_linenums(text: str) -> List[int]:
 
 def find_examples() -> Iterable[Path]:
     examples_dir = pathlib.Path(os.path.realpath(__file__)).parent
-    for path in sorted(examples_dir.glob("**/*.py")):
+    for path in sorted(examples_dir.glob("*/**/*.py")):
         if path.stem != "__init__":
             yield path
 

crosshair/main.py

@@ -860,16 +860,24 @@ def check(
     if isinstance(entities, int):
         return entities
     full_options = DEFAULT_OPTIONS.overlay(report_verbose=False).overlay(options)
-    for entity in entities:
-        debug("Check ", getattr(entity, "__name__", str(entity)))
-        for message in run_checkables(analyze_any(entity, options)):
-            line = describe_message(message, full_options)
-            if line is None:
-                continue
-            stdout.write(line + "\n")
-            debug("Traceback for output message:\n", message.traceback)
-            if message.state > MessageType.PRE_UNSAT:
-                any_problems = True
+    checkables = [c for e in entities for c in analyze_any(e, options)]
+    if not checkables:
+        extra_help = ""
+        if full_options.analysis_kind == [AnalysisKind.asserts]:
+            extra_help = "\nHINT: Ensure that your functions to analyze lead with assert statements."
+        print(
+            "WARNING: Targets found, but contain no checkable functions." + extra_help,
+            file=stderr,
+        )
+
+    for message in run_checkables(checkables):
+        line = describe_message(message, full_options)
+        if line is None:
+            continue
+        stdout.write(line + "\n")
+        debug("Traceback for output message:\n", message.traceback)
+        if message.state > MessageType.PRE_UNSAT:
+            any_problems = True
     return 1 if any_problems else 0
 
 

crosshair/main_test.py

@@ -251,19 +251,28 @@ def test_no_args_prints_usage(root):
     assert re.search(r"^usage", out)
 
 
-def DISABLE_TODO_test_assert_mode_e2e(root):
+def test_assert_mode_e2e(root, capsys: pytest.CaptureFixture[str]):
     simplefs(root, ASSERT_BASED_FOO)
-    try:
-        sys.stdout = io.StringIO()
-        exitcode = unwalled_main(["check", root / "foo.py", "--analysis_kind=asserts"])
-    finally:
-        out = sys.stdout.getvalue()
-        sys.stdout = sys.__stdout__
-    assert exitcode == 1
+    exitcode = unwalled_main(["check", str(root / "foo.py"), "--analysis_kind=asserts"])
+    (out, err) = capsys.readouterr()
+    assert err == ""
     assert re.search(
-        r"foo.py\:8\: error\: AssertionError\:  when calling foofn\(x \= 100\)", out
+        r"foo.py\:8\: error\: AssertionError\:  when calling foofn\(100\)", out
     )
     assert len([ls for ls in out.split("\n") if ls]) == 1
+    assert exitcode == 1
+
+
+def test_assert_without_checkable(root, capsys: pytest.CaptureFixture[str]):
+    simplefs(root, SIMPLE_FOO)
+    exitcode = unwalled_main(["check", str(root / "foo.py"), "--analysis_kind=asserts"])
+    (out, err) = capsys.readouterr()
+    assert (
+        err
+        == "WARNING: Targets found, but contain no checkable functions.\nHINT: Ensure that your functions to analyze lead with assert statements.\n"
+    )
+    assert out == ""
+    assert exitcode == 0
 
 
 def test_directives(root):

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

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

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

@@ -1,4 +1,4 @@
-_crosshair_tracers.cpython-313-darwin.so,sha256=3GARmSJTWnFMXQUCu6I0n72ZhMbLxjW-boxMGSxBmig,49728
+_crosshair_tracers.cpython-313-darwin.so,sha256=5lGEIbbE5qxc8gB3Vlbn7XZnpN77zgI_svKbsw6DAgs,49728
 crosshair/_tracers_pycompat.h,sha256=6IYnbQxrYkhBsLDAHSX25DPOwo1oYHCZUVWZ8c7YCnQ,14356
 crosshair/pure_importer.py,sha256=-t4eowrZOQmfqK1N2tjI5POoaxRGavytwMmbRivelFg,878
 crosshair/options.py,sha256=htQNgnrpoRjSNq6rfLBAF8nos-NNIwmP6tQYyI8ugsM,6775
@@ -9,12 +9,12 @@ crosshair/objectproxy.py,sha256=Uc6mNkJBInvETGWBHI10GSNEIrBYDIxlAZ30M3PAIhQ,8935
 crosshair/objectproxy_test.py,sha256=KykRJLSHCDA7jb_XPBDhXHnS6Q1fG4oIJ579CeSEz3k,567
 crosshair/stubs_parser.py,sha256=rlBTQus5BlZ3Ygg6Xzk5dbQbDtRpv6w9i2HQmGrPVmc,14240
 crosshair/_preliminaries_test.py,sha256=r2PohNNMfIkDqsnvI6gKlJTbwBaZA9NQJueQfJMN2Eo,504
-crosshair/dynamic_typing_test.py,sha256=oyg94OXjF_2jNFy33UJjkfWnDXKnM4or2TXbxrOqOQs,5478
+crosshair/dynamic_typing_test.py,sha256=8p4NOJ6i9q9mozgCYlZP3VCs-TFMDaE_7W-TyNEse4o,5907
 crosshair/enforce.py,sha256=FsZx3D-KtGrhb8xdAZbPUtwvVmEu8IAn7rwf7tmkrRY,10010
 crosshair/path_search_test.py,sha256=7cqzAMXUYAtA00mq9XR5AaZChqeQyXyCfuuv53_51pk,1692
 crosshair/condition_parser.py,sha256=oquaht026eZUigh2lyaFLXYDbmENdBKjddszx0a-B3w,42647
 crosshair/util.py,sha256=sIfaKFvNHR5w5VCno2d15d_LyfwoewKqRzJ_3ZNV-Vc,22218
-crosshair/dynamic_typing.py,sha256=jbI9FXv5-WXREQjeDtlDQladv-xCW21TUOM3qErJaJ4,11998
+crosshair/dynamic_typing.py,sha256=ANq42kxSQ5B0STZF3uwOEys_fLCj20cMCCcBH6dbXWo,12758
 crosshair/register_contract.py,sha256=EnDAxngJhKvJLFdw5kVgqaYDQ5hAZXKwAGBdXpot-AQ,10386
 crosshair/tracers.py,sha256=_jaSDgZ_pYdqacWE_msXn7W7CoSdQ_-7hlrxa891oHo,17139
 crosshair/_tracers.h,sha256=QFBklLqMWmIpUzBIn_A4SKdpjwHs-N7ttx-F5jtWWCQ,2174
@@ -23,12 +23,12 @@ 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=LfHa3bjHbl9WlLnVFSn-2R3qe0yEptc8-0Edze71rmo,936
-crosshair/core.py,sha256=YegFbe3RMJwxHCadhJ42gUJjL9mICaLAE_Dmb1-lsK4,63750
+crosshair/__init__.py,sha256=5u1xF74Cj90mIqU71fUSrQIoexYRT3mwC7WOse0f2EQ,936
+crosshair/core.py,sha256=7CHbmWvCVK2MlKXJUUe3eILPWGZniF8qXkBJNDkU4qg,64168
 crosshair/path_cover.py,sha256=wV0Vy8IPDzqXQ2VI8a94FxltS9p-Y1oF17OKePjvpgs,6710
 crosshair/enforce_test.py,sha256=C6CQ4P1FjkdIJeJg3aJynp1iLDCE6BFCEVtSqXbvmQk,4665
 crosshair/test_util.py,sha256=D9-f-DdzJemfAUkQL0cwKxPL8RZ-5gkVmghyRcKlBJI,10367
-crosshair/core_test.py,sha256=H6qZFBFuUhgh9qWgxxc1Cs7xuC8s6FYvewmTYUh0Dpg,32200
+crosshair/core_test.py,sha256=540ASl3zOQf3AnZORGJus4PMYHP5YM15zTWhNI16Dew,33009
 crosshair/codeconfig.py,sha256=GgF-ND8Ha3FysSTQ-JuezHjlhGVBbo5aCJov1Ps3VSE,3959
 crosshair/util_test.py,sha256=_KTQ0O4cLhF1pAeB8Y8Cyqbd0UyZf5KxJUaiA-ew-tE,4676
 crosshair/watcher_test.py,sha256=Ef1YSwy68wWPR5nPjwvEKPqxltI9pE9lTbnesmDy3Bk,2764
@@ -55,7 +55,7 @@ crosshair/smtlib_test.py,sha256=edzEn19u2YYHxSzG9RrMiu2HTiEexAuehC3IlG9LuJM,511
 crosshair/register_contract_test.py,sha256=DhvKIcF3LgQfHfUSCccoA11ctCdFaQR263Pc4YUuxyk,4970
 crosshair/statespace.py,sha256=TVjUhFZU0x72oLPN7-eRu7PoMh1OiQOy0uMASsFb_Qw,41236
 crosshair/opcode_intercept_test.py,sha256=Si3rJQR5cs5d4uB8uwE2K8MjP8rE1a4yHkjXzhfS10A,9241
-crosshair/main_test.py,sha256=eEoK4LHKSaX-6iJx3tAVbwCaBJc0ri3VoCPtLD5em2U,14424
+crosshair/main_test.py,sha256=2xpgNqog__XcYffGcwPeEEmr0Vy4EgVZE8GCAjQnE8U,14834
 crosshair/codeconfig_test.py,sha256=RnC-RnNpr6If4eHmOepDZ33MCmfyhup08dzHKCm5xWA,3350
 crosshair/watcher.py,sha256=kCCMlLe2KhW5MbEbMmixNRjRAvu5CypIAGd1V_YZ9QM,10048
 crosshair/test_util_test.py,sha256=_r8DtAI5b1Yn1ruv9o51FWHmARII3-WDkWWnnY1iaAw,943
@@ -63,7 +63,7 @@ crosshair/opcode_intercept.py,sha256=z4Yb9prYE2UK21AxhjAeXyXAk5IriDuCSSCeNhbDu2A
 crosshair/simplestructs.py,sha256=CiZSuHH_j_bYitaW-n7vWd_42xSyV6Jh8es3BQLlcHk,34221
 crosshair/tracers_test.py,sha256=EBK_ZCy2MsxqmEaGjo0uw9zAztW9O6fhCW_0PJxyTS8,3270
 crosshair/smtlib.py,sha256=hh-P32KHoH9BCq3oDYGp2PfOeOb8CwDj8tTkgqroLD8,689
-crosshair/main.py,sha256=6RXjj1FIyBK6i6xOx-bs-CsHLgOZcc9hL3U1JRwxpA0,34378
+crosshair/main.py,sha256=TkaOr39tMV9ZHQXgfJobKFEVW60XpHUqdY520nMIWw8,34659
 crosshair/path_cover_test.py,sha256=U46zw4-m7yAXhu8-3Xnhvf-_9Ov5ivfCAm5euGwpRFA,4089
 crosshair/__main__.py,sha256=zw9Ylf8v2fGocE57o4FqvD0lc7U4Ld2GbeCGxRWrpqo,252
 crosshair/pathing_oracle.py,sha256=3M93zXMorWr8m5c1KM2zGU5X1M3lcV-AIw0lX74eN00,9219
@@ -76,7 +76,7 @@ crosshair/tools/check_help_in_doc.py,sha256=P21AH3mYrTVuBgWD6v65YXqBqmqpQDUTQeoZ
 crosshair/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crosshair/tools/check_init_and_setup_coincide.py,sha256=kv61bXqKSKF_5J-kLNEhCrCPyszg7iZQWDu_Scnec98,3502
 crosshair/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-crosshair/examples/check_examples_test.py,sha256=CPKG0lKgxpPSjrEf02bBTAivQZwrDyFNTBU-4sSRrr0,4060
+crosshair/examples/check_examples_test.py,sha256=pFZRUi_yubIOaIZ_n7KkrG_qCKyHZnzcL5_y0NFqZKM,4062
 crosshair/examples/deal/__init__.py,sha256=Jp9ZnHBCuRzkgP8OIgEWWOzQiC0jLIYPd-rCqF5Xyrg,32
 crosshair/examples/PEP316/__init__.py,sha256=LdmvJx2cbzC3iip3NwtT0Ds2v99l3KXl1q9Kc0TmCWE,34
 crosshair/examples/PEP316/correct_code/chess.py,sha256=w29qVe-1oKMaHgZYhqyp2vQghXm2oohruFENljoVBCY,2081
@@ -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.93.dist-info/RECORD,,
-crosshair_tool-0.0.93.dist-info/WHEEL,sha256=0rn5ODYhsjI3KEHrk9RXNWLZT7Rowo6wA0Jh2iAIJLk,138
-crosshair_tool-0.0.93.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
-crosshair_tool-0.0.93.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
-crosshair_tool-0.0.93.dist-info/METADATA,sha256=EYRE-NAWbA23Od5TfsbHDQ_R70UNonJPNCdNawPlT-c,6777
-crosshair_tool-0.0.93.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459
+crosshair_tool-0.0.94.dist-info/RECORD,,
+crosshair_tool-0.0.94.dist-info/WHEEL,sha256=0rn5ODYhsjI3KEHrk9RXNWLZT7Rowo6wA0Jh2iAIJLk,138
+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