crosshair-tool 0.0.93__cp38-cp38-win_amd64.whl → 0.0.94__cp38-cp38-win_amd64.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.1
 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,5 +1,5 @@
-_crosshair_tracers.cp38-win_amd64.pyd,sha256=ImLwMEdrR1ETEdC7t2rV3B6BZjE-PQRF3TleI_PeqY4,21504
-crosshair/__init__.py,sha256=aNQs81VDq95_ZF8wWBUtdIO4BNRcGH-CkBCuKIy37dE,978
+_crosshair_tracers.cp38-win_amd64.pyd,sha256=7C95w1Ny1Cet9t7ombZ8B9oAcI3GFRrJemox7DuuEjs,21504
+crosshair/__init__.py,sha256=MJjBwGp2rylUig86jpTmjum-iQ-meS0EmJhfAr30dLo,978
 crosshair/__main__.py,sha256=i4pjsZlXvtieQHJTEB0sF3e40qJjLoOm1z5rm-u70Uo,260
 crosshair/_mark_stacks.h,sha256=IImygydFK9qethf41gUZDjySHR3WLXs-YsqWCHK9UFg,29468
 crosshair/_preliminaries_test.py,sha256=klkzKGpyyVDGctCXdvq1xyXbGa4PRnXda1jfgE-7LLY,522
@@ -16,14 +16,14 @@ crosshair/condition_parser_test.py,sha256=kosW60A4HnBBT3sOHxWCl_cixpbO1kmsjgNuNU
 crosshair/conftest.py,sha256=JjUauvXnjERszuS46iskuBRHBx-0uHacwKHeQ-gEQ2c,683
 crosshair/copyext.py,sha256=_SRnS6UrUFl2-CHl8uRIOq-Y0MKYNQTFK132S3Ru34A,5044
 crosshair/copyext_test.py,sha256=VSIoVeqAf18g2RNuLTbyNWJiMBgzHeab7LNX1KHCWZU,2182
-crosshair/core.py,sha256=bUkWzbyhEvk24_UJ7tYo489ccq-Q6V0Pnpj4aY165qg,65497
+crosshair/core.py,sha256=1aAptxDoCv-hYIxl5USINEE6eJsKKctoZf0k9wpX9v8,65928
 crosshair/core_and_libs.py,sha256=U9GDCBE9Ecxy7T7bmJT7IYiQTdY1C8qbcoIoMMocu5U,4112
 crosshair/core_regestered_types_test.py,sha256=3o1GrtjCEWSW-paPp5-yVdE2K1_ZIviGCff7KVZ0VS0,2181
-crosshair/core_test.py,sha256=bHpq_OcUsVWFWGnsCUX4AEM22vLfoCzCsPaEnsbAzYc,33490
+crosshair/core_test.py,sha256=2rKU1rUrUPeYLQ-I0UbddUx9henGAacRbmeeMd-2K14,34323
 crosshair/diff_behavior.py,sha256=2T11J2Hk35Qp3RRp5ALtXyTgAl3v0W3KDNR_mSec-D4,11567
 crosshair/diff_behavior_test.py,sha256=TUmqPOj_Qij8a7NMLFYt0IskL5Q_CdDLD5pnxnomuJ0,7505
-crosshair/dynamic_typing.py,sha256=YDh0e73AnWyPjwjPXbjO4vSqpgIhYaV5AURpRe2AkXg,12323
-crosshair/dynamic_typing_test.py,sha256=szfUa9zLFVMv1YiuJvrC9-ZMZnlS36tqJ373MGXVkAA,5673
+crosshair/dynamic_typing.py,sha256=UspjP89YmX5CzkMrXrPRl6DL4eqmsuHMQv-zTpq4JcQ,13104
+crosshair/dynamic_typing_test.py,sha256=4z9s6j-u2oQqlrzFx9Mc2Mc0RBPGiCZ2mDqP0F4IFVA,6117
 crosshair/enforce.py,sha256=lIeDeqavEa06tVMlIk5ScibVGS04yHZ3xIpkTPK5QQw,10291
 crosshair/enforce_test.py,sha256=CvofUxa_Y-np5vhlBcjsrZ2CkpxNFbjv5U-rH027pw4,4847
 crosshair/fnutil.py,sha256=Fe77jLudjf7X_fNLExLoMTFElQWQ3wCpA_MC06JaOKk,13515
@@ -31,8 +31,8 @@ crosshair/fnutil_test.py,sha256=I-jFcROrNFUs7xSGrLcGJk_cX8014g5h8ItwPSFpvLY,2264
 crosshair/fuzz_core_test.py,sha256=wWILaE5cpxfiRl89WgCWMpNIGS8BnWcQmgartQYCCJ8,17411
 crosshair/lsp_server.py,sha256=Kl6z-Nudt2ZkzV0ojfzvGGa3cukXLOYKTCHYJUxzrRk,8920
 crosshair/lsp_server_test.py,sha256=yHp7JtJLpF2G049lwhNlgAYXnVM88CtsudVVHVY7Hs0,999
-crosshair/main.py,sha256=Dibj8nGZeNe010vCU0j1v-h8IhcUJyyED_dVKQZaIj0,35341
-crosshair/main_test.py,sha256=zzNANuPZd9SWr15jSWfHVsGFKTWMlyREgnxKojJj-eo,14958
+crosshair/main.py,sha256=2kiGrmjNeLYkgzPnrc-zyfWPJqCi2km_SSZ0IDhm-_Q,35630
+crosshair/main_test.py,sha256=BQvSEE_hkyIOW_n9-SIkG29k1ZFuB6j8LgftVvNmXAU,15377
 crosshair/objectproxy.py,sha256=qYPVvH3EVUmh7GI9-73mfmOTzcTH_gyn5DhK44hp8KI,9286
 crosshair/objectproxy_test.py,sha256=P5N28U5l9ngozqLr2EgtVOII3PS3fB2dOOPc9LLt8Zo,590
 crosshair/opcode_intercept.py,sha256=RGcwx4f5-KKjY2C3Do4mBm4S8rEpn6nWtOQvaSKQnoM,22453
@@ -72,7 +72,7 @@ crosshair/watcher_test.py,sha256=TCOdXmdGZ3NJ59X_w7SRVqiJY-BL2tUqyXK-3ql1d6s,287
 crosshair/z3util.py,sha256=_NcVbYhvSt24vhkpiXdEh4o2VRSIjb4g8Xpq49sJsGg,1835
 crosshair/z3util_test.py,sha256=9_6fhpTphEQlg4QY29bGzN0KxfktsT8wYveNgbfqueg,184
 crosshair/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-crosshair/examples/check_examples_test.py,sha256=Gu5NzNZN0aOBdJzujXLBuxSwag79CjplEhqp6Rdn9zs,4205
+crosshair/examples/check_examples_test.py,sha256=0xoBSAVt3cLJdmvPVvSXsN8Szot16kPyihWG8iToi_4,4207
 crosshair/examples/PEP316/__init__.py,sha256=39eVIMt1avfS9HXte7nzP9LbVlFo97Q4-YL1CQXM1JM,35
 crosshair/examples/PEP316/bugs_detected/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crosshair/examples/PEP316/bugs_detected/getattr_magic.py,sha256=PyaKiAVHnlaPTEpaupKmGQcyK24HGiq1eKU2t-mHJFo,335
@@ -167,9 +167,9 @@ crosshair/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crosshair/tools/check_help_in_doc.py,sha256=An-2EJ0_Xr-Szo431AoEgJafoFWwnPl8HoT4bi86dd8,8499
 crosshair/tools/check_init_and_setup_coincide.py,sha256=f4TvPg1Q3C_BQYtGgPfY_fqxo_ZTeU7QCy7WwQjaIlA,3621
 crosshair/tools/generate_demo_table.py,sha256=qm4ZUXjUBKkVZ3bVVK9h6dJMDKYme8zMl-7at_aG7b0,3958
-crosshair_tool-0.0.93.dist-info/LICENSE,sha256=qQLSJN48eqvalILMr3uzkg0p74FtK7WSwkux-0twy-s,4552
-crosshair_tool-0.0.93.dist-info/METADATA,sha256=HvJ77a1X42cdi05tJu51AbGfjqc4v_eIWd2qr38idAY,6692
-crosshair_tool-0.0.93.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
-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/RECORD,,
+crosshair_tool-0.0.94.dist-info/LICENSE,sha256=qQLSJN48eqvalILMr3uzkg0p74FtK7WSwkux-0twy-s,4552
+crosshair_tool-0.0.94.dist-info/METADATA,sha256=6GgnwAUAPfZUjDFHIy9ZB4AK0wW8HGhRipShZjFZB9Q,6692
+crosshair_tool-0.0.94.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
+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/RECORD,,