crosshair-tool 0.0.96__cp311-cp311-macosx_10_9_x86_64.whl → 0.0.97__cp311-cp311-macosx_10_9_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.96"  # Do not forget to update in setup.py!
+__version__ = "0.0.97"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/_tracers_test.py

@@ -19,19 +19,19 @@ class ExampleModule:
 
 def test_CTracer_module_refcounts_dont_leak():
     mod = ExampleModule()
-    assert sys.getrefcount(mod) == 2
+    base_count = sys.getrefcount(mod)
     tracer = CTracer()
     tracer.push_module(mod)
-    assert sys.getrefcount(mod) == 3
+    assert sys.getrefcount(mod) == base_count + 1
     tracer.push_module(mod)
     tracer.start()
     tracer.stop()
-    assert sys.getrefcount(mod) == 4
+    assert sys.getrefcount(mod) == base_count + 2
     tracer.pop_module(mod)
-    assert sys.getrefcount(mod) == 3
+    assert sys.getrefcount(mod) == base_count + 1
     del tracer
     gc.collect()
-    assert sys.getrefcount(mod) == 2
+    assert sys.getrefcount(mod) == base_count
 
 
 def _get_depths(fn):

crosshair/codeconfig.py

@@ -1,4 +1,5 @@
 """Configure analysis options at different levels."""
+
 import importlib.resources
 import inspect
 import re
@@ -25,7 +26,7 @@ def get_directives(source_text: str) -> Iterable[Tuple[int, int, str]]:
     ret = []
     tokens = tokenize.generate_tokens(StringIO(source_text).readline)
     # TODO catch tokenize.TokenError ... just in case?
-    for (toktyp, tokval, begin, _, _) in tokens:
+    for toktyp, tokval, begin, _, _ in tokens:
         linenum, colnum = begin
         if toktyp == tokenize.COMMENT:
             directive = _COMMENT_TOKEN_RE.sub(r"\1", tokval)
@@ -39,7 +40,7 @@ class InvalidDirective(Exception):
 
 
 def parse_directives(
-    directive_lines: Iterable[Tuple[int, int, str]]
+    directive_lines: Iterable[Tuple[int, int, str]],
 ) -> AnalysisOptionSet:
     """
     Parse options from directives in comments.

crosshair/condition_parser.py

@@ -520,6 +520,7 @@ class ConcreteConditionParser(ConditionParser):
                 "__delattr__",
                 "__replace__",  # Will raise an exception with most arbitrary **kwargs.
                 "__annotate__",  # a staticmethod, but not isinstance(staticmethod)
+                "__annotate_func__",
             ):
                 pass
             elif method_name == "__del__":

crosshair/core.py

@@ -563,12 +563,12 @@ class SymbolicFactory:
     @overload
     def __call__(
         self, typ: Callable[..., _T], suffix: str = "", allow_subtypes: bool = True
-    ) -> _T:
-        ...
+    ) -> _T: ...
 
     @overload
-    def __call__(self, typ: Any, suffix: str = "", allow_subtypes: bool = True) -> Any:
-        ...
+    def __call__(
+        self, typ: Any, suffix: str = "", allow_subtypes: bool = True
+    ) -> Any: ...
 
     def __call__(self, typ, suffix: str = "", allow_subtypes: bool = True):
         """
@@ -653,8 +653,7 @@ def proxy_for_type(
     typ: Callable[..., _T],
     varname: str,
     allow_subtypes: bool = False,
-) -> _T:
-    ...
+) -> _T: ...
 
 
 @overload
@@ -662,8 +661,7 @@ def proxy_for_type(
     typ: Any,
     varname: str,
     allow_subtypes: bool = False,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 def proxy_for_type(

crosshair/dynamic_typing.py

@@ -59,7 +59,7 @@ def unify_callable_args(
         return True
     if len(value_types) != len(recv_types):
         return False
-    for (varg, rarg) in zip(value_types, recv_types):
+    for varg, rarg in zip(value_types, recv_types):
         # note reversal here: Callable is contravariant in argument types
         if not unify(rarg, varg, bindings):
             return False
@@ -206,7 +206,7 @@ def unify(
                 vargs = [object for _ in rargs]
             else:
                 return False
-        for (varg, targ) in zip(vargs, rargs):
+        for varg, targ in zip(vargs, rargs):
             if not unify(varg, targ, bindings):
                 return False
         return True
@@ -302,7 +302,7 @@ def intersect_signatures(
     is_squishy1 = var_pos1 is not None or var_key1 is not None
     is_squishy2 = var_pos2 is not None or var_key2 is not None
     out_params: Dict[str, Parameter] = {}
-    for (p1, p2) in zip_longest(pos1, pos2):
+    for p1, p2 in zip_longest(pos1, pos2):
         if p1 is None:
             if is_squishy1:
                 out_params[p2.name] = p2

crosshair/enforce.py

@@ -36,6 +36,7 @@ def WithEnforcement(fn: Callable) -> Callable:
     Enforcement is normally disabled when calling from some internal files, for
     performance reasons. Use WithEnforcement to ensure it is enabled anywhere.
     """
+
     # This local function has a special name that we look for while tracing
     # (see the wants_codeobj method below):
     def _crosshair_with_enforcement(*a, **kw):

crosshair/examples/check_examples_test.py

@@ -1,4 +1,5 @@
 """Run functional tests of the tool on all the examples."""
+
 import argparse
 import os
 import pathlib

crosshair/fnutil.py

@@ -41,8 +41,7 @@ if sys.version_info >= (3, 8):
     from typing import Protocol
 
     class Descriptor(Protocol):
-        def __get__(self, instance: object, cls: type) -> Any:
-            ...
+        def __get__(self, instance: object, cls: type) -> Any: ...
 
 else:
     Descriptor = Any
@@ -344,7 +343,7 @@ def walk_paths(paths: Iterable[Path], ignore_missing=False) -> Iterable[Path]:
             else:
                 raise FileNotFoundError(str(path))
         if path.is_dir():
-            for (dirpath, _dirs, files) in os.walk(str(path)):
+            for dirpath, _dirs, files in os.walk(str(path)):
                 for curfile in files:
                     if analyzable_filename(curfile):
                         yield Path(dirpath) / curfile

crosshair/fnutil_test.py

@@ -26,10 +26,7 @@ def test_fn_globals_on_builtin() -> None:
 
 def test_resolve_signature_invalid_annotations() -> None:
     sig = resolve_signature(with_invalid_type_annotation)
-    if sys.version_info >= (3, 14):
-        assert sig == "TypeThatIsNotDefined"
-    else:
-        assert sig == "name 'TypeThatIsNotDefined' is not defined"
+    assert sig == "name 'TypeThatIsNotDefined' is not defined"
 
 
 @pytest.mark.skipif(

crosshair/fuzz_core_test.py

@@ -47,7 +47,7 @@ from crosshair.statespace import (
 from crosshair.stubs_parser import signature_from_stubs
 from crosshair.test_util import flexible_equal
 from crosshair.tracers import COMPOSITE_TRACER, NoTracing, ResumedTracing
-from crosshair.util import CrosshairUnsupported, debug, type_args_of
+from crosshair.util import CrosshairUnsupported, debug, is_iterable, type_args_of
 
 FUZZ_SEED = 1348
 
@@ -267,6 +267,14 @@ class FuzzTester:
         ) -> object:
             for name in typed_args.keys():
                 literal, symbolic = literal_args[name], symbolic_args[name]
+                with NoTracing():
+                    # TODO: transition into general purpose SMT expr extractor
+                    # for equality with constant
+                    if hasattr(symbolic, "_smt_promote_literal"):
+                        symbolic.var = symbolic._smt_promote_literal(literal)  # type: ignore
+                    elif is_iterable(literal) and is_iterable(symbolic):
+                        with ResumedTracing():
+                            space.add(len(literal) == len(symbolic))  # type: ignore
                 if literal != symbolic:
                     raise IgnoreAttempt(
                         f'symbolic "{name}" not equal to literal "{name}"'

crosshair/libimpl/arraylib.py

@@ -32,7 +32,7 @@ INT_TYPE_SIZE = {c: array(c).itemsize for c in INT_TYPE_BOUNDS.keys()}
 
 def pick_code(space: StateSpace) -> Tuple[str, int, int]:
     last_idx = len(INT_TYPE_BOUNDS) - 1
-    for (idx, (code, rng)) in enumerate(INT_TYPE_BOUNDS.items()):
+    for idx, (code, rng) in enumerate(INT_TYPE_BOUNDS.items()):
         if idx < last_idx:
             if space.smt_fork(desc=f"not_{code}_array"):
                 continue

crosshair/libimpl/builtinslib.py

@@ -189,6 +189,7 @@ def smt_not(x: object) -> Union[bool, "SymbolicBool"]:
 
 _NONHEAP_PYTYPES = set([int, float, bool, NoneType, complex])
 
+
 # TODO: isn't this pretty close to isinstance(typ, AtomicSymbolicValue)?
 def pytype_uses_heap(typ: Type) -> bool:
     return not (typ in _NONHEAP_PYTYPES)
@@ -900,6 +901,7 @@ def setup_binops():
                 if isinstance(a, FiniteFloat)
                 else a.var
             )
+            assert smt_a is not None
             if isinstance(b, NonFiniteFloat):
                 if isnan(b.val):
                     return (nan, nan)
@@ -912,6 +914,7 @@ def setup_binops():
                     return (-1.0, b.val)
                 else:
                     return (0.0, a.val if isinstance(a, FiniteFloat) else a)
+            assert smt_b is not None
 
             remainder = z3.Real(f"remainder{space.uniq()}")
             modproduct = z3.Int(f"modproduct{space.uniq()}")
@@ -1591,6 +1594,7 @@ class RealBasedSymbolicFloat(SymbolicFloat):
             denominator = SymbolicInt("denominator" + space.uniq())
             space.add(denominator.var > 0)
             space.add(numerator.var == denominator.var * self.var)
+
         # There are many valid integer ratios to return. Experimentally, both
         # z3 and CPython tend to pick the same ones. But verify this, while
         # deferring materialization:
@@ -2330,7 +2334,7 @@ class SymbolicRange:
             return False
         if len(self) != len(other):
             return False
-        for (v1, v2) in zip(self, other):
+        for v1, v2 in zip(self, other):
             if v1 != v2:
                 return False
         return True
@@ -2783,7 +2787,7 @@ class SymbolicBoundedIntTuple(collections.abc.Sequence):
         with NoTracing():
             self._create_up_to(realize(otherlen))
             constraints = []
-            for (int1, int2) in zip(self._created_vars, tracing_iter(other)):
+            for int1, int2 in zip(self._created_vars, tracing_iter(other)):
                 smtint2 = force_to_smt_sort(int2, SymbolicInt)
                 constraints.append(int1.var == smtint2)
             return SymbolicBool(z3.And(*constraints))
@@ -2910,7 +2914,7 @@ class AnySymbolicStr(AbcString):
             raise TypeError
         if self == other:
             return True if op in (ops.le, ops.ge) else False
-        for (mych, otherch) in zip_longest(iter(self), iter(other)):
+        for mych, otherch in zip_longest(iter(self), iter(other)):
             if mych == otherch:
                 continue
             if mych is None:
@@ -3172,7 +3176,7 @@ class AnySymbolicStr(AbcString):
 
         else:
             raise TypeError
-        for (idx, ch) in enumerate(self):
+        for idx, ch in enumerate(self):
             if not filter(ch):
                 return self[idx:]
         return ""
@@ -3184,7 +3188,7 @@ class AnySymbolicStr(AbcString):
         mylen = self.__len__()
         if mylen == 0:
             return []
-        for (idx, ch) in enumerate(self):
+        for idx, ch in enumerate(self):
             codepoint = ord(ch)
             with NoTracing():
                 space = context_statespace()
@@ -4008,7 +4012,7 @@ class SymbolicByteArray(BytesLike, ShellMutableSequence):  # type: ignore
 
 
 class SymbolicMemoryView(BytesLike):
-    format = "B"
+    format = "B"  # type: ignore
     itemsize = 1
     ndim = 1
     strides = (1,)
@@ -4817,11 +4821,11 @@ def _str_percent_format(self, other):
     return self.__mod__(deep_realize(other))
 
 
-def _bytes_join(self, itr) -> str:
+def _bytes_join(self, itr) -> bytes:
     return _join(self, itr, self_type=bytes, item_type=Buffer)
 
 
-def _bytearray_join(self, itr) -> str:
+def _bytearray_join(self, itr) -> bytes:
     return _join(self, itr, self_type=bytearray, item_type=Buffer)
 
 

crosshair/libimpl/builtinslib_ch_test.py

@@ -178,7 +178,7 @@ def check_iter(obj: Union[str, List[int], Dict[int, int]]) -> ResultComparison:
 
 
 def check_len(
-    s: Union[Dict[int, int], Tuple[int, ...], str, List[int], Set[int]]
+    s: Union[Dict[int, int], Tuple[int, ...], str, List[int], Set[int]],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(len, s)
@@ -984,7 +984,7 @@ def check_bytes___init__(source: Union[int, List[int], bytes, bytearray, memoryv
 
 
 def check_bytearray___init__(
-    source: Union[int, List[int], bytes, bytearray, memoryview]
+    source: Union[int, List[int], bytes, bytearray, memoryview],
 ):
     """
     post: _
@@ -994,7 +994,7 @@ def check_bytearray___init__(
 
 
 def check_memoryview___init__(
-    source: Union[int, List[int], bytes, bytearray, memoryview]
+    source: Union[int, List[int], bytes, bytearray, memoryview],
 ):
     """
     post: _

crosshair/libimpl/builtinslib_test.py

@@ -1450,7 +1450,7 @@ def test_str_lower():
 
 
 def test_str_title():
-    chr_lj = "\u01C9"  # "lj"
+    chr_lj = "\u01c9"  # "lj"
     chr_Lj = "\u01c8"  # "Lj" (different from "LJ", "\u01c7")
     with standalone_statespace:
         with NoTracing():
@@ -2649,6 +2649,7 @@ if sys.version_info >= (3, 9):
 def test_set_basic_fail() -> None:
     def f(a: Set[int], k: int) -> None:
         """
+        pre: len(a) <= 2
         post[a]: k+1 in a
         """
         a.add(k)

crosshair/libimpl/datetimelib.py

@@ -627,9 +627,7 @@ class timedelta:
 
     def total_seconds(self):
         """Total seconds in the duration."""
-        return (
-            (self.days * 86400 + self.seconds) * 10**6 + self.microseconds
-        ) / 10**6
+        return ((self.days * 86400 + self.seconds) * 10**6 + self.microseconds) / 10**6
 
     # Read-only field accessors
     @property

crosshair/libimpl/datetimelib_ch_test.py

@@ -29,7 +29,7 @@ def check_datetimelib_lt(
         Tuple[timedelta, timedelta],
         Tuple[date, datetime],
         Tuple[datetime, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.lt, *p)
@@ -40,7 +40,7 @@ def check_datetimelib_add(
         Tuple[timedelta, timedelta],
         Tuple[date, timedelta],
         Tuple[timedelta, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.add, *p)
@@ -52,14 +52,14 @@ def check_datetimelib_subtract(
         Tuple[date, timedelta],
         Tuple[datetime, timedelta],
         Tuple[datetime, datetime],
-    ]
+    ],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(operator.sub, *p)
 
 
 def check_datetimelib_str(
-    obj: Union[timedelta, timezone, date, time, datetime]
+    obj: Union[timedelta, timezone, date, time, datetime],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(_invoker("__str__"), obj)
@@ -67,7 +67,7 @@ def check_datetimelib_str(
 
 def check_datetimelib_repr(
     # TODO: re-enable time, datetime repr checking after fixing in Python 3.11
-    obj: Union[timedelta, timezone, date]
+    obj: Union[timedelta, timezone, date],
 ) -> ResultComparison:
     """post: _"""
     return compare_results(_invoker("__repr__"), obj)

crosshair/libimpl/encodings/_encutil.py

@@ -25,6 +25,7 @@ class UnexpectedEndError(ChunkError):
 @dataclass
 class MidChunkError(ChunkError):
     _reason: str
+
     # _errlen: int = 1
     def reason(self) -> str:
         return self._reason
@@ -112,7 +113,7 @@ class StemEncoder:
                     continue
                 if errors == "replace":
                     idx += 1
-                    parts.append("\uFFFD")
+                    parts.append("\ufffd")
                     continue
 
                 # 2. Then fall back to native implementations if necessary:
@@ -132,24 +133,28 @@ class StemEncoder:
 
 def _getregentry(stem_encoder: Type[StemEncoder]):
     class StemIncrementalEncoder(codecs.BufferedIncrementalEncoder):
-        def _buffer_encode(self, input: str, errors: str, final: bool) -> bytes:
+        def _buffer_encode(
+            self, input: str, errors: str, final: bool
+        ) -> Tuple[bytes, int]:
             enc_name = stem_encoder.encoding_name
             out, idx, err = stem_encoder._encode_chunk(input, 0)
             assert isinstance(out, bytes)
             if not err:
-                return out
+                return (out, idx)
             if isinstance(err, UnexpectedEndError) or not final:
-                return out
+                return (out, idx)
             exc = UnicodeEncodeError(enc_name, input, idx, idx + 1, err.reason())
             replacement, idx = codecs.lookup_error(errors)(exc)
             if isinstance(replacement, str):
                 replacement = codecs.encode(replacement, enc_name)
-            return out + replacement
+            return (out + replacement, idx)
 
     class StemIncrementalDecoder(codecs.BufferedIncrementalDecoder):
         def _buffer_decode(
-            self, input: bytes, errors: str, final: bool
+            self, input: Buffer, errors: str, final: bool
         ) -> Tuple[str, int]:
+            if not isinstance(input, bytes):
+                input = memoryview(input).tobytes()
             enc_name = stem_encoder.encoding_name
             out, idx, err = stem_encoder._decode_chunk(input, 0)
             assert isinstance(out, str)

crosshair/libimpl/relib.py

@@ -7,7 +7,7 @@ from unicodedata import category
 if sys.version_info < (3, 11):
     import sre_parse as re_parser
 else:
-    import re._parser as re_parser
+    import re._parser as re_parser  # type: ignore
 
 from sys import maxunicode
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union, cast

crosshair/libimpl/unicodedatalib_test.py

@@ -11,7 +11,7 @@ def test_numeric():
     with standalone_statespace as space:
         with NoTracing():
             fourstr = LazyIntSymbolicStr(list(map(ord, "4")))
-            halfstr = LazyIntSymbolicStr(list(map(ord, "\u00BD")))  # (1/2 character)
+            halfstr = LazyIntSymbolicStr(list(map(ord, "\u00bd")))  # (1/2 character)
         four = unicodedata.numeric(fourstr)
         half = unicodedata.numeric(halfstr)
         assert type(four) is float
@@ -22,7 +22,7 @@ def test_numeric():
 def test_decimal():
     with standalone_statespace as space:
         with NoTracing():
-            thai4 = LazyIntSymbolicStr(list(map(ord, "\u0E54")))  # (Thai numerial 4)
+            thai4 = LazyIntSymbolicStr(list(map(ord, "\u0e54")))  # (Thai numerial 4)
             super4 = LazyIntSymbolicStr(list(map(ord, "\u2074")))  # (superscript 4)
         four = unicodedata.decimal(thai4)
         assert type(four) is int
@@ -34,7 +34,7 @@ def test_decimal():
 def test_digit():
     with standalone_statespace as space:
         with NoTracing():
-            thai4 = LazyIntSymbolicStr(list(map(ord, "\u0E54")))  # (Thai numerial 4)
+            thai4 = LazyIntSymbolicStr(list(map(ord, "\u0e54")))  # (Thai numerial 4)
             super4 = LazyIntSymbolicStr(list(map(ord, "\u2074")))  # (superscript 4)
         four = unicodedata.digit(thai4)
         assert type(four) is int

crosshair/main.py

@@ -774,9 +774,11 @@ def cover(
                 ctxfn,
                 options,
                 args.coverage_type,
-                arg_formatter=format_boundargs_as_dictionary
-                if example_output_format == ExampleOutputFormat.ARG_DICTIONARY
-                else format_boundargs,
+                arg_formatter=(
+                    format_boundargs_as_dictionary
+                    if example_output_format == ExampleOutputFormat.ARG_DICTIONARY
+                    else format_boundargs
+                ),
             )
         except NotDeterministic:
             print(

crosshair/opcode_intercept.py

@@ -7,7 +7,7 @@ from sys import version_info
 from types import CodeType, FrameType
 from typing import Any, Callable, Iterable, List, Mapping, Tuple, Union
 
-from z3 import ExprRef
+from z3 import ExprRef  # type: ignore
 
 from crosshair.core import (
     ATOMIC_IMMUTABLE_TYPES,
@@ -55,6 +55,7 @@ TO_BOOL = dis.opmap.get("TO_BOOL", 256)
 IS_OP = dis.opmap.get("IS_OP", 256)
 BINARY_MODULO = dis.opmap.get("BINARY_MODULO", 256)
 BINARY_OP = dis.opmap.get("BINARY_OP", 256)
+LOAD_COMMON_CONSTANT = dis.opmap.get("LOAD_COMMON_CONSTANT", 256)
 
 
 def frame_op_arg(frame):
@@ -152,6 +153,39 @@ class MultiSubscriptableContainer:
                 raise IndexError  # (f"Index {key} out of range for list/tuple of length {len(container)}")
 
 
+class LoadCommonConstantInterceptor(TracingModule):
+    """
+    As of 3.14, the bytecode generation process generates optimizations
+    for builtins.any/all when invoked on a generator expression.
+    It essentially "inlines" the logic as bytecode.
+    We need to avoid this.
+    Before entering the optimized code path, it will check that the any/all
+    function is identity-equal to the original builtin, which is loaded using
+    the LOAD_COMMON_CONSTANT opcode.
+
+    This interceptor replaces that function with a proxy that functions
+    identically but is not identity-equal (so that we avoid the optimized
+    path),
+    """
+
+    opcodes_wanted = frozenset([LOAD_COMMON_CONSTANT])
+
+    def trace_op(self, frame, codeobj, codenum):
+        CONSTANT_BUILTIN_ALL = 3
+        CONSTANT_BUILTIN_ANY = 4
+        index = frame_op_arg(frame)
+
+        def post_op():
+            expected_fn = all if index == CONSTANT_BUILTIN_ALL else any
+            if CROSSHAIR_EXTRA_ASSERTS:
+                if frame_stack_read(frame, -1) is not expected_fn:
+                    raise CrossHairInternal
+            frame_stack_write(frame, -1, lambda *a: expected_fn(*a))
+
+        if index == CONSTANT_BUILTIN_ALL or index == CONSTANT_BUILTIN_ANY:
+            COMPOSITE_TRACER.set_postop_callback(post_op, frame)
+
+
 class SymbolicSubscriptInterceptor(TracingModule):
     opcodes_wanted = frozenset([BINARY_SUBSCR, BINARY_OP])
 
@@ -554,6 +588,8 @@ def make_registrations():
         register_opcode_patch(SymbolicSliceInterceptor())
     if sys.version_info < (3, 9):
         register_opcode_patch(ComparisonInterceptForwarder())
+    if sys.version_info >= (3, 14):
+        register_opcode_patch(LoadCommonConstantInterceptor())
     register_opcode_patch(ContainmentInterceptor())
     register_opcode_patch(BuildStringInterceptor())
     register_opcode_patch(FormatValueInterceptor())

crosshair/pathing_oracle.py

@@ -2,7 +2,7 @@ import math
 from collections import defaultdict
 from typing import Counter, Dict, List, Optional, Sequence, Tuple
 
-from z3 import ExprRef
+from z3 import ExprRef  # type: ignore
 
 from crosshair.statespace import (
     AbstractPathingOracle,

crosshair/pathing_oracle_test.py

@@ -1,6 +1,6 @@
 import random
 
-import z3
+import z3  # type: ignore
 
 from crosshair.pathing_oracle import ConstrainedOracle, PreferNegativeOracle
 from crosshair.statespace import RootNode, SimpleStateSpace, WorstResultNode

crosshair/register_contract.py

@@ -1,4 +1,5 @@
 """API for registering contracts for external libraries."""
+
 from dataclasses import dataclass
 from inspect import Parameter, Signature, getmodule, ismethod, signature
 from types import MethodDescriptorType, ModuleType, WrapperDescriptorType

crosshair/register_contract_test.py

@@ -99,12 +99,10 @@ def test_register_numpy_randint():
 
 def test_register_overload():
     @overload
-    def overld(a: int) -> int:
-        ...
+    def overld(a: int) -> int: ...
 
     @overload
-    def overld(a: str) -> str:
-        ...
+    def overld(a: str) -> str: ...
 
     def overld(a: Union[int, str]) -> Union[int, str]:
         if isinstance(a, int):

crosshair/simplestructs.py

@@ -38,10 +38,10 @@ class MapBase(collections.abc.MutableMapping):
             return NotImplemented
         if len(self) != len(other):
             return False
-        for (k, self_value) in self.items():
+        for k, self_value in self.items():
             found = False
             # We do a slow nested loop search because we don't want to hash the key.
-            for (other_key, other_value) in other.items():
+            for other_key, other_value in other.items():
                 if other_key != k:
                     continue
                 if self_value == other_value:
@@ -122,7 +122,7 @@ class SimpleDict(MapBase):
     def __getitem__(self, key, default=_MISSING):
         if not is_hashable(key):
             raise TypeError("unhashable type")
-        for (k, v) in self.contents_:
+        for k, v in self.contents_:
             # Note that the identity check below is not just an optimization;
             # it is required to implement the semantics of NaN dict keys
             if k is key or k == key:
@@ -134,7 +134,7 @@ class SimpleDict(MapBase):
     def __setitem__(self, key, value):
         if not is_hashable(key):
             raise TypeError("unhashable type")
-        for (i, (k, v)) in enumerate(self.contents_):
+        for i, (k, v) in enumerate(self.contents_):
             if k == key:
                 self.contents_[i] = (k, value)
                 return
@@ -143,7 +143,7 @@ class SimpleDict(MapBase):
     def __delitem__(self, key):
         if not is_hashable(key):
             raise TypeError("unhashable type")
-        for (i, (k, v)) in enumerate(self.contents_):
+        for i, (k, v) in enumerate(self.contents_):
             if k == key:
                 del self.contents_[i]
                 return
@@ -493,9 +493,11 @@ class SequenceConcatenation(collections.abc.Sequence, SeqBase):
                     return second.__getitem__(
                         slice(
                             i.start - firstlen,
-                            i.stop
-                            if i.stop is None or i.stop < 0
-                            else i.stop - firstlen,
+                            (
+                                i.stop
+                                if i.stop is None or i.stop < 0
+                                else i.stop - firstlen
+                            ),
                             i.step,
                         )
                     )

crosshair/statespace.py

@@ -1018,7 +1018,7 @@ class StateSpace:
     ) -> object:
         with NoTracing():
             # TODO: needs more testing
-            for (curref, curtyp, curval) in self.heaps[snapshot]:
+            for curref, curtyp, curval in self.heaps[snapshot]:
 
                 # TODO: using unify() is almost certainly wrong; just because the types
                 # have some instances in common does not mean that `curval` actually

crosshair/tools/generate_demo_table.py

@@ -107,7 +107,7 @@ def divide_stdlib_module(
     modulename: str, items: list[tuple[str, str, str]]
 ) -> dict[str, list[tuple[str, str, str]]]:
     ret = defaultdict(list)
-    for (name, color, src) in items:
+    for name, color, src in items:
         if name.endswith("_method"):
             name = name.removesuffix("_method")
             (classname, methodname) = name.split("_", 1)
@@ -120,7 +120,7 @@ def divide_stdlib_module(
 
 
 stdlib = {}
-for (modulename, items) in stdlib_demos().items():
+for modulename, items in stdlib_demos().items():
     stdlib[modulename] = divide_stdlib_module(modulename, items)
 
 

crosshair/tracers.py

@@ -156,12 +156,14 @@ _CALL_HANDLERS: Dict[int, Callable[[object], CallStackInfo]] = {
     CALL_KW: handle_call_kw,
     CALL_FUNCTION: handle_call_function,
     CALL_FUNCTION_KW: handle_call_function_kw,
-    CALL_FUNCTION_EX: handle_call_function_ex_3_14
-    if sys.version_info >= (3, 14)
-    else (
-        handle_call_function_ex_3_13
-        if sys.version_info >= (3, 13)
-        else handle_call_function_ex_3_6
+    CALL_FUNCTION_EX: (
+        handle_call_function_ex_3_14
+        if sys.version_info >= (3, 14)
+        else (
+            handle_call_function_ex_3_13
+            if sys.version_info >= (3, 13)
+            else handle_call_function_ex_3_6
+        )
     ),
     CALL_METHOD: handle_call_method,
 }

crosshair/util.py

@@ -368,7 +368,7 @@ def format_boundargs_as_dictionary(bound_args: BoundArguments) -> str:
 
 def format_boundargs(bound_args: BoundArguments) -> str:
     arg_strings: List[str] = []
-    for (name, param) in bound_args.signature.parameters.items():
+    for name, param in bound_args.signature.parameters.items():
         param_kind = param.kind
         vals = bound_args.arguments.get(name, param.default)
         if param_kind == Parameter.VAR_POSITIONAL:
@@ -503,9 +503,9 @@ class EvalFriendlyReprContext:
             oid = id(obj)
             typ = type(obj)
             if obj in instance_overrides:
-                repr_fn: Callable[
-                    [Any], Union[str, ReferencedIdentifier]
-                ] = instance_overrides[obj]
+                repr_fn: Callable[[Any], Union[str, ReferencedIdentifier]] = (
+                    instance_overrides[obj]
+                )
             elif typ == float:
                 if math.isfinite(obj):
                     repr_fn = repr
@@ -543,7 +543,7 @@ class EvalFriendlyReprContext:
         counts = collections.Counter(re.compile(r"\b_ch_efr_\d+_\b").findall(output))
         assignment_remaps = {}
         nextvarnum = 1
-        for (varname, count) in counts.items():
+        for varname, count in counts.items():
             if count > 1:
                 assignment_remaps[varname + ":="] = f"v{nextvarnum}:="
                 assignment_remaps[varname] = f"v{nextvarnum}"
@@ -625,7 +625,7 @@ class DynamicScopeVar(Generic[_T]):
 
 class AttributeHolder:
     def __init__(self, attrs: Mapping[str, object]):
-        for (k, v) in attrs.items():
+        for k, v in attrs.items():
             self.__dict__[k] = v
 
 

{crosshair_tool-0.0.96.dist-info → crosshair_tool-0.0.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.96
+Version: 0.0.97
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -8,7 +8,6 @@ Author-email: pschanely+vE7F@gmail.com
 License: MIT
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
@@ -32,14 +31,14 @@ Requires-Dist: pygls>=1.0.0
 Requires-Dist: typeshed-client>=2.0.5
 Provides-Extra: dev
 Requires-Dist: autodocsumm<1,>=0.2.2; extra == "dev"
-Requires-Dist: black==22.3.0; extra == "dev"
+Requires-Dist: black==25.9.0; extra == "dev"
 Requires-Dist: deal>=4.13.0; extra == "dev"
 Requires-Dist: icontract>=2.4.0; extra == "dev"
 Requires-Dist: isort==5.11.5; extra == "dev"
-Requires-Dist: mypy==0.990; extra == "dev"
+Requires-Dist: mypy==1.18.1; extra == "dev"
 Requires-Dist: numpy==1.23.4; python_version < "3.12" and extra == "dev"
 Requires-Dist: numpy==1.26.0; (python_version >= "3.12" and python_version < "3.13") and extra == "dev"
-Requires-Dist: numpy==2.0.1; python_version >= "3.13" and extra == "dev"
+Requires-Dist: numpy==2.3.3; python_version >= "3.13" and extra == "dev"
 Requires-Dist: pre-commit~=2.20; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"

{crosshair_tool-0.0.96.dist-info → crosshair_tool-0.0.97.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_crosshair_tracers.cpython-311-darwin.so,sha256=GvaasQdiB0aOjNco_TGEgrEDzlMFMTYLb4d4OVHb3jk,23696
+_crosshair_tracers.cpython-311-darwin.so,sha256=RwciJyliUt3D5fge8gI2ZdZR58IIBFtBlZTfH2fh7p8,23696
 crosshair/_tracers_pycompat.h,sha256=6IYnbQxrYkhBsLDAHSX25DPOwo1oYHCZUVWZ8c7YCnQ,14356
 crosshair/pure_importer.py,sha256=-t4eowrZOQmfqK1N2tjI5POoaxRGavytwMmbRivelFg,878
 crosshair/options.py,sha256=htQNgnrpoRjSNq6rfLBAF8nos-NNIwmP6tQYyI8ugsM,6775
@@ -6,31 +6,31 @@ crosshair/lsp_server_test.py,sha256=7LO1Qqxkper3Xt2krgOlGqF1O_uDObo76o4FZbIqykY,
 crosshair/conftest.py,sha256=BkLszApkdy6FrvzaHO7xh8_BJrG9AfytFTse-HuQVvg,653
 crosshair/copyext_test.py,sha256=uJzdC9m2FqMjqQ-ITFoP0MZg3OCiO8paU-d533KocD8,2108
 crosshair/objectproxy.py,sha256=1cO_ApA0AKPfCRu6MIsxUOKUUEGn0b1U4IHxTC4nDGI,9790
-crosshair/pathing_oracle_test.py,sha256=-6U-n1k6MahHYnQ6lvI9ahFjPr9vUfaUAnFThXR2k78,709
+crosshair/pathing_oracle_test.py,sha256=6k9-8kAbTFUvxhEKSE5NPntEW2qMWkQi4zac_U1kYxY,725
 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
-crosshair/enforce.py,sha256=FsZx3D-KtGrhb8xdAZbPUtwvVmEu8IAn7rwf7tmkrRY,10010
+crosshair/enforce.py,sha256=YVze7uYfR_bM1jUvDlU-8cF4cphRRfe78exNZ1xXtuI,10011
 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=ANq42kxSQ5B0STZF3uwOEys_fLCj20cMCCcBH6dbXWo,12758
-crosshair/register_contract.py,sha256=EnDAxngJhKvJLFdw5kVgqaYDQ5hAZXKwAGBdXpot-AQ,10386
-crosshair/tracers.py,sha256=_jaSDgZ_pYdqacWE_msXn7W7CoSdQ_-7hlrxa891oHo,17139
+crosshair/condition_parser.py,sha256=C7S_IogPTDSB-NPGRgJ_CzuWF9YCzGsm6mc37VBo6lY,42684
+crosshair/util.py,sha256=pfBTBNhqMuaoUvAaFZal4LqVEMzWlzmcobHTxp_ZrlE,22214
+crosshair/dynamic_typing.py,sha256=JMcEX5HMMm9u0_lLtZI1jrAw9HGZqXyq8IYGQP4KYSc,12752
+crosshair/register_contract.py,sha256=4p99KAUhu1k-OctIT6WX2YFbVaMCV6BDEULNvQFONGE,10387
+crosshair/tracers.py,sha256=UX-JKKjggQ0_EDh0AGNf4b_2ku9SD9pWgRyFcJDAVpc,17179
 crosshair/_tracers.h,sha256=QFBklLqMWmIpUzBIn_A4SKdpjwHs-N7ttx-F5jtWWCQ,2174
 crosshair/type_repo.py,sha256=x_eK-YlcHv_dxDKy6m7ty0zNO6y058o3r6QJ55RcG3s,4664
-crosshair/fnutil.py,sha256=X80bD2Lh4QAh-rF561r3JRxjxcuZepF3hJaxaj1GG9s,13123
+crosshair/fnutil.py,sha256=Xs0xJPcQm0z3tWQDjd_I-ainWHTxcT61dv8A3CY3--8,13109
 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=pX7dpKGv0frAXPUfHUH9_8CmbQ0ItGRkG9yPi7_uApI,936
-crosshair/core.py,sha256=nUdmPCcEWxaYawkydj2AJ7VdXe8IIu7hVyDi83Bxwec,64262
+crosshair/_tracers_test.py,sha256=7rrK0djASmRAlWcH4SiJqrWN7hk3oB_rYwhUG4gjxm4,3645
+crosshair/__init__.py,sha256=7ph2S2-0_w1V5foTkyDqlkF63lSBFZ_QR10iQNgoKH0,936
+crosshair/core.py,sha256=HqelePQQYES9SS36qR9mGEEeKcvEFrIHGg-8OG5i-Kg,64252
 crosshair/path_cover.py,sha256=TCofZ9D5q7hpEIOnifp53BvY_YyPpZZC-heZw_NuTOQ,6838
 crosshair/enforce_test.py,sha256=C6CQ4P1FjkdIJeJg3aJynp1iLDCE6BFCEVtSqXbvmQk,4665
 crosshair/test_util.py,sha256=D9-f-DdzJemfAUkQL0cwKxPL8RZ-5gkVmghyRcKlBJI,10367
 crosshair/core_test.py,sha256=P-r-qzHPZ2yLmSBZByYPccJZfxYi2ZCwn9o1mEfzRe8,33019
-crosshair/codeconfig.py,sha256=GgF-ND8Ha3FysSTQ-JuezHjlhGVBbo5aCJov1Ps3VSE,3959
+crosshair/codeconfig.py,sha256=TaIdOKxykpk6YeTtO_Xwsa3IDBTP6g3UGkFBt0PTDR4,3959
 crosshair/util_test.py,sha256=_KTQ0O4cLhF1pAeB8Y8Cyqbd0UyZf5KxJUaiA-ew-tE,4676
 crosshair/watcher_test.py,sha256=Ef1YSwy68wWPR5nPjwvEKPqxltI9pE9lTbnesmDy3Bk,2764
 crosshair/auditwall.py,sha256=sqOmfXQLgmGfWS7b8SmVv66eFM2owaGn-4Ppq453VLI,5138
@@ -39,13 +39,13 @@ crosshair/z3util_test.py,sha256=CZovn4S9mYcG_yQegcxm80VHrvUdvNei0gvGTF9TOrk,173
 crosshair/diff_behavior.py,sha256=_5X_pTN0_-rSPrh8dfpODJG_phFMn7fWc-_zLgO3UTk,11253
 crosshair/condition_parser_test.py,sha256=UcgxzqrBLUMScif_RrgHvrhjzWx1KUPgAQOEmfJw7lc,15500
 crosshair/pure_importer_test.py,sha256=Xjtlwn1mj7g-6VA87lrvzfUADCjlmn1wgHtbrnc0uuY,421
-crosshair/fnutil_test.py,sha256=wXtfIxAupRm0KUzKob8luEsNI4YegBQUfwz7msWbfHY,2186
+crosshair/fnutil_test.py,sha256=cLHJ9uhQf797sTxuh4BGgQ0Fo5rcQFStkiPbzQPhIXA,2091
 crosshair/stubs_parser_test.py,sha256=0itTT0Udul_51RJXNv6KB97z44gYze6NZfKJL7yIDzA,1228
 crosshair/options_test.py,sha256=lzA-XtwEwQPa4wV1wwhCRKhyLOvIhThU9WK5QRaRbxQ,379
 crosshair/patch_equivalence_test.py,sha256=eoLaGRvrR9nGUO_ybZ9XsWhs5ejC4IEPd0k-ihG3Nsg,2580
 crosshair/abcstring.py,sha256=ROU8LzS7kfEU2L_D3QfhVxIjrYr1VctwUWfylC7KlCc,6549
 crosshair/_mark_stacks.h,sha256=j86qubOUvVhoR19d74iQ084RrTEq8M6oT4wJsGQUySY,28678
-crosshair/fuzz_core_test.py,sha256=q7WsZt6bj5OJrXaVsT3JaRYWWnL8X_1flSfty4Z7CcA,16903
+crosshair/fuzz_core_test.py,sha256=bLzdHBROzX3P3cfBeDTY9bJbfhe-CCoeLOF4Mt31wm0,17443
 crosshair/unicode_categories_test.py,sha256=ZAU37IDGm9PDvwy_CGFcrF9Waa8JuUNdI4aq74wkB6c,739
 crosshair/statespace_test.py,sha256=Eq7LNpjradHyCoCKU91Fxmo9DUpK2Mk4PyxxiAEp-Yk,3211
 crosshair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,31 +53,31 @@ crosshair/lsp_server.py,sha256=j7SX4pdVwa2MrtkNIjajLilzl5CZTY6PrBQsa26cdNo,8670
 crosshair/path_search.py,sha256=wwZjp-3E4dENnJa6BlnSq8FARkIx0PyUYc7kvH32A2k,5588
 crosshair/auditwall_test.py,sha256=VPcw_OW3nl3BkOZY4wEEtVDyTamdgqD4IjRccI2p5vI,2030
 crosshair/smtlib_test.py,sha256=edzEn19u2YYHxSzG9RrMiu2HTiEexAuehC3IlG9LuJM,511
-crosshair/register_contract_test.py,sha256=DhvKIcF3LgQfHfUSCccoA11ctCdFaQR263Pc4YUuxyk,4970
-crosshair/statespace.py,sha256=h1un79C-vkyKJ1iLAU4lQlVu3A6YqqbpcrqHGCsTsrg,43442
+crosshair/register_contract_test.py,sha256=9AWv9psiAredvcOlK2_pBpsgwIgBbecWyKEEvWiWBSI,4954
+crosshair/statespace.py,sha256=D0Bptt3KMPG8RDzq_numy51sK1Pu_6QqcGKGfXC37s8,43440
 crosshair/opcode_intercept_test.py,sha256=Si3rJQR5cs5d4uB8uwE2K8MjP8rE1a4yHkjXzhfS10A,9241
 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
-crosshair/opcode_intercept.py,sha256=ZNePiOMX5xmREkA-x2t1MuM8fmHPbaogMOmGYn21NzU,21579
-crosshair/simplestructs.py,sha256=CiZSuHH_j_bYitaW-n7vWd_42xSyV6Jh8es3BQLlcHk,34221
+crosshair/opcode_intercept.py,sha256=atmnEDG9oDP0zlkGjJRAsYhD0Aw_PORf4coZZz2JgWw,23060
+crosshair/simplestructs.py,sha256=O236XDO0dWGM59jktMUp5RG9xYY5iqZV219DknKAXgc,34283
 crosshair/tracers_test.py,sha256=EBK_ZCy2MsxqmEaGjo0uw9zAztW9O6fhCW_0PJxyTS8,3270
 crosshair/smtlib.py,sha256=hh-P32KHoH9BCq3oDYGp2PfOeOb8CwDj8tTkgqroLD8,689
-crosshair/main.py,sha256=TkaOr39tMV9ZHQXgfJobKFEVW60XpHUqdY520nMIWw8,34659
+crosshair/main.py,sha256=CY3PBcis302n0KvqoyDDoqtthNL4XASXHssO1I7DkJM,34707
 crosshair/path_cover_test.py,sha256=U46zw4-m7yAXhu8-3Xnhvf-_9Ov5ivfCAm5euGwpRFA,4089
 crosshair/__main__.py,sha256=zw9Ylf8v2fGocE57o4FqvD0lc7U4Ld2GbeCGxRWrpqo,252
-crosshair/pathing_oracle.py,sha256=PvqX7396SaQK3m-bMpCwBKmHW9SYiioooUWNvmmEqNw,10497
+crosshair/pathing_oracle.py,sha256=qa-_OlyuCHpNHkK5xN8OvxRgOEOA56VpGf0jUIR8L-M,10513
 crosshair/diff_behavior_test.py,sha256=nCpzOjrw0qsYgVhD2iCvKiNAt82SrfUWxWS5mPSE73w,7215
 crosshair/core_and_libs.py,sha256=8FGL62GnyX6WHOqKh0rqJ0aJ_He5pwZm_zwPXTaPqhI,3963
 crosshair/core_regestered_types_test.py,sha256=er3ianvu-l0RS-WrS46jmOWr4Jq06Cec9htAXGXJSNg,2099
 crosshair/z3util.py,sha256=AkslxCSfzgSni6oWXUckWihWn3LuceQycR0X3D3ZhD8,1759
-crosshair/tools/generate_demo_table.py,sha256=0SeO0xQdiT-mbLNHt4rYL0wcc2DMh0v3qtzBdoQonDk,3831
+crosshair/tools/generate_demo_table.py,sha256=Z8gPUPQM8G_szPTgagBYzvsQeWDEEhGoZCU0z5FAS3E,3827
 crosshair/tools/check_help_in_doc.py,sha256=P21AH3mYrTVuBgWD6v65YXqBqmqpQDUTQeoZ10rB6TU,8235
 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=pFZRUi_yubIOaIZ_n7KkrG_qCKyHZnzcL5_y0NFqZKM,4062
+crosshair/examples/check_examples_test.py,sha256=ieB2KBBPReQBOr5-AZCgrVyhN1YXGYyQMjHyQBQ4zTI,4063
 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
@@ -109,19 +109,19 @@ crosshair/libimpl/binascii_test.py,sha256=LOBqLAJ77Kx8vorjVTaT3X0Z93zw4P5BvwUapM
 crosshair/libimpl/collectionslib_test.py,sha256=0qmCRQbxfX8vMZLaok1GS68NIocR--RyTVVDqbtHalU,9185
 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=j275QUgWqnq62immbBqUzlPesOq0t-oTb0C9WL7sIiA,173276
+crosshair/libimpl/builtinslib.py,sha256=R6w3t-i1uJ3U8R-qHtrktZRTFm_K4SD0LjfeWBZbBDw,173362
 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
 crosshair/libimpl/jsonlib.py,sha256=xFTvqGKzQcCgPme1WIpNMjBPfNHVZBMNuNx0uKMYXj0,28805
 crosshair/libimpl/typeslib_test.py,sha256=qCeUU_c-zmuvfwHEsaYqic9wdGzs9XbDZNr6bF2Xp58,1129
-crosshair/libimpl/builtinslib_test.py,sha256=jbN2t-zteWqF5TxA7oo4c9UsPrqklBY7wlEt16rxqtI,92230
+crosshair/libimpl/builtinslib_test.py,sha256=LYjvmVx0ndUK7YNMzNUaH39YesY_yrvIWb5XOwdnkDM,92255
 crosshair/libimpl/zliblib.py,sha256=XymJTKYbplpYJZ-P7GKVSY3V_8HPy5lqRFsCH1zezIk,357
 crosshair/libimpl/decimallib.py,sha256=zBKDrDZcg45oCKUkf6SIDuVpjA1Web7tD1MEQo5cjxI,177348
 crosshair/libimpl/relib_ch_test.py,sha256=zvSBF82mNQR5yEOMwwcaBOh8OpJkQeiVl85pgYVvJRA,5235
 crosshair/libimpl/functoolslib.py,sha256=YD0g9UnC4v_wZXR3ekQa2gLrKJnr6dHdYtT9qIMUIGM,1009
 crosshair/libimpl/collectionslib_ch_test.py,sha256=PYitnmXXEZfm25FzBodEX1hOpwqnDspbqt5aqzeVar0,5855
-crosshair/libimpl/builtinslib_ch_test.py,sha256=Fyu2fZLXI-pUaS3gyyM6zMQhsTFdpRCnnp1rXwxKXwk,30854
+crosshair/libimpl/builtinslib_ch_test.py,sha256=UasixDc_qZHOEkmMkh_2r9l2NgItQBzwHpvs7dRfgvk,30857
 crosshair/libimpl/randomlib_test.py,sha256=KuEgrih9JvstsFDwrgAuHZrlVjIvaNUxS8ftiGPrwHI,3322
 crosshair/libimpl/weakreflib_test.py,sha256=CdGJhW32qJoxedn8QzPcMcKKmfl9Nv4FPDYebblIKmY,1812
 crosshair/libimpl/mathlib.py,sha256=ci_byDulWf1VOitpD3C-TwToL6CRYKkJUVMxjAYzUH8,4256
@@ -131,7 +131,7 @@ crosshair/libimpl/timelib_test.py,sha256=Ercmhw1Yc96CYnWhqIW7eu31R95uTGVZcgzxSiZ
 crosshair/libimpl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crosshair/libimpl/importliblib_test.py,sha256=DM8wWvPYbDTsdKVlS-JMrZ2cQpWSy4yXjZGPMQwF7Ss,1020
 crosshair/libimpl/relib_test.py,sha256=3raQ0JoU4vu8_NKfrjk7TkUIqVuuhR8mGCRPJPb0RI0,16085
-crosshair/libimpl/arraylib.py,sha256=vW0lvkYJx8B3hLnhwXhCc-ZwtWtEwZFLm7T8ahrrKgs,4877
+crosshair/libimpl/arraylib.py,sha256=QL6QH9iHHsmKA2zzW9DKPB6AbaxRiZbD3ikSGQVgqxU,4875
 crosshair/libimpl/urlliblib.py,sha256=EaC-nWdi-IFG3ewZrzgCqbKc9Sf9wlUN0wvGjTU5TOM,614
 crosshair/libimpl/bisectlib_test.py,sha256=ZQtYmBYD0Pb1IiFelsgdvqyeUMKaqaDb1BRb87LTSbI,753
 crosshair/libimpl/itertoolslib.py,sha256=1bwV8voMV2j18KjXYMKkuNSC8p4VE_ZvY-74rAbWjB4,1245
@@ -143,18 +143,18 @@ crosshair/libimpl/codecslib_test.py,sha256=8K64njhxnTe7qLh-_onARNsm_qSG7BWM5dXgA
 crosshair/libimpl/jsonlib_ch_test.py,sha256=lLGnFq6Ti7l6aV_jDz-HEzKaPy5TIj_JA0sSnfI0Psc,1267
 crosshair/libimpl/iolib_test.py,sha256=VJRSQ3nnROfXvtqdy3yLx3eYmIh31qSmeuAiIa7ywKU,667
 crosshair/libimpl/codecslib.py,sha256=lB87T1EYSBh4JXaqzjSpQG9CMfKtgckwA7f6OIR0S-Q,2668
-crosshair/libimpl/datetimelib_ch_test.py,sha256=r_V9H34a4POlEeffi46mEtVI9ek80DHaEOiCTKON9Us,9283
+crosshair/libimpl/datetimelib_ch_test.py,sha256=nevP0P8nkJ8DasvoVcD2tHiaZSFz5H8BHozzI-ZElhg,9288
 crosshair/libimpl/itertoolslib_test.py,sha256=MV-zSdfdeQi_UpZJdanKzHm2GRqrC7BMUoCd95ldMPw,1183
 crosshair/libimpl/copylib.py,sha256=icHJWeFK_tsPSdJhvlS5fVcBwlh0uJh0nzXsRJCGtzs,527
 crosshair/libimpl/hashliblib_test.py,sha256=HhPdm5CBTAeqrs41NpCxkexWYWyIf1JiA4cls72WQfM,406
 crosshair/libimpl/binasciilib.py,sha256=9w4C37uxRNOmz9EUuhJduHlMKn0f7baY5fwwdvx1uto,5070
 crosshair/libimpl/typeslib.py,sha256=5qWrHZZN8jQZoHPiQtkaFolR8qTYCQtJw3HRWCrCKQI,468
-crosshair/libimpl/datetimelib.py,sha256=kVWcoHMX-dPW-un7XoEIURfWlVOst6h_JFmjrhFiE1U,79168
-crosshair/libimpl/relib.py,sha256=3DhrbGqJcfpj5JNfcD8Pf4xsA4WEegxbukwgKoPLP3o,29256
+crosshair/libimpl/datetimelib.py,sha256=3mdouYmzY5wIbByKcx_ehvzLYasiM4LDEn1-BB9edV0,79146
+crosshair/libimpl/relib.py,sha256=ahS9f1_rhbVKZUhvYmuSTv0_ovmvH5NXShxDJu7aUhE,29272
 crosshair/libimpl/iolib.py,sha256=FbvqTfQRPaML5u0hHnrFZLrk3jYC-x4OO6eJujvFJaY,6983
 crosshair/libimpl/urlliblib_test.py,sha256=UcSmwRdJFkzXvkaV-jmrP6G4zhbu7X2NNjM7ePsYxRs,503
 crosshair/libimpl/heapqlib.py,sha256=TWH55dg-Hi5FRz2oZuXHcBU_xJzHjvhe9YQVvw7ZbfI,1311
-crosshair/libimpl/unicodedatalib_test.py,sha256=CJkAbiu8_2uhvjDIoYi3IJ8Nb_8sdjKVNvNhJCgPbZ0,1442
+crosshair/libimpl/unicodedatalib_test.py,sha256=b0CHHHqDj5Ej_UEDnz3aUesILObcfLm00eEXQtfsgfM,1442
 crosshair/libimpl/encodings_ch_test.py,sha256=0qLsioOuFUZkOjP4J9Wct4CGBaBY8BnHx9paZHnIofI,2513
 crosshair/libimpl/hashliblib.py,sha256=Ki_cw28OnhZExgKbSoh5GaDbBfNRIOqH7O2aYQJGS3M,1234
 crosshair/libimpl/functoolslib_test.py,sha256=eaT_JWu-C3j8l9ekwDXd2dhPJvuB577T9DuXRohL0fc,1604
@@ -167,10 +167,10 @@ crosshair/libimpl/encodings/utf_8.py,sha256=BygLLIeI3_F2MpFVgaty8ebiuxp0YWz7IzXe
 crosshair/libimpl/encodings/ascii.py,sha256=Cz1xraTkXdQ5aBKDkorX4rAvrmf877_EqzC9hOmbItw,1416
 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.96.dist-info/RECORD,,
-crosshair_tool-0.0.96.dist-info/WHEEL,sha256=TY6wS7uh4kKn2hb4-XnLjkub5JFV8id422w1jhyVjcQ,137
-crosshair_tool-0.0.96.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
-crosshair_tool-0.0.96.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
-crosshair_tool-0.0.96.dist-info/METADATA,sha256=XkqQh0ph4NN3is0V3zwd434hTKNQug9pOooY9FIrclg,6777
-crosshair_tool-0.0.96.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459
+crosshair/libimpl/encodings/_encutil.py,sha256=R0tLdyc83fN6C8c_tl5vetDCpayxeYaAT7UWwPQzX10,6982
+crosshair_tool-0.0.97.dist-info/RECORD,,
+crosshair_tool-0.0.97.dist-info/WHEEL,sha256=TY6wS7uh4kKn2hb4-XnLjkub5JFV8id422w1jhyVjcQ,137
+crosshair_tool-0.0.97.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
+crosshair_tool-0.0.97.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
+crosshair_tool-0.0.97.dist-info/METADATA,sha256=5ADW4j5TNenYaOjXs10_7udeVLv9eUlaIq9ZztZMXC8,6727
+crosshair_tool-0.0.97.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459