ovld 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

ovld/codegen.py

@@ -45,13 +45,22 @@ def transfer_function(
     globals=MISSING,
     name=MISSING,
 ):
-    new_fn = FunctionType(
-        argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
-        closure=func.__closure__ if closure is MISSING else closure,
-        code=func.__code__ if code is MISSING else code,
-        globals=func.__globals__ if globals is MISSING else globals,
-        name=func.__name__ if name is MISSING else name,
-    )
+    closure = func.__closure__ if closure is MISSING else closure
+    if closure:
+        new_fn = FunctionType(
+            argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
+            closure=func.__closure__ if closure is MISSING else closure,
+            code=func.__code__ if code is MISSING else code,
+            globals=func.__globals__ if globals is MISSING else globals,
+            name=func.__name__ if name is MISSING else name,
+        )
+    else:
+        new_fn = FunctionType(
+            argdefs=func.__defaults__ if argdefs is MISSING else argdefs,
+            code=func.__code__ if code is MISSING else code,
+            globals=func.__globals__ if globals is MISSING else globals,
+            name=func.__name__ if name is MISSING else name,
+        )
     new_fn.__kwdefaults__ = func.__kwdefaults__
     new_fn.__annotations__ = func.__annotations__
     new_fn.__dict__.update(func.__dict__)

ovld/dependent.py

@@ -15,22 +15,15 @@ from .types import (
     Intersection,
     Order,
     clsstring,
-    get_args,
     normalize_type,
     subclasscheck,
     typeorder,
 )
 
 
-def is_dependent(t):
-    if isinstance(t, DependentType):
-        return True
-    elif any(is_dependent(subt) for subt in get_args(t)):
-        return True
-    return False
-
-
 class DependentType(type):
+    __dependent__ = True
+
     exclusive_type = False
     keyable_type = False
     bound_is_name = False

ovld/mro.py

@@ -3,7 +3,7 @@ from enum import Enum
 from graphlib import TopologicalSorter
 from typing import get_args, get_origin
 
-from .utils import UnionTypes
+from .utils import UnionTypes, is_dependent
 
 
 class Order(Enum):
@@ -123,6 +123,11 @@ def subclasscheck(t1, t2):
     ):
         return result
 
+    if is_dependent(t2):
+        # t2's instancecheck could return anything, and unless it defines
+        # __is_supertype__ or __is_subtype__ the bound devolves to object
+        return True
+
     if t2 in UnionTypes:
         return isinstance(t1, t2)
 

ovld/recode.py

@@ -12,7 +12,7 @@ from .codegen import (
     rename_function,
     transfer_function,
 )
-from .utils import MISSING, NameDatabase, SpecialForm, UsageError, subtler_type
+from .utils import MISSING, NameDatabase, SpecialForm, UsageError, is_dependent, subtler_type
 
 recurse = SpecialForm("recurse")
 call_next = SpecialForm("call_next")
@@ -160,8 +160,6 @@ def generate_dispatch(ov, arganal):
 
 
 def generate_dependent_dispatch(tup, handlers, next_call, slf, name, err, nerr):
-    from .dependent import is_dependent
-
     def to_dict(tup):
         return dict(
             entry if isinstance(entry, tuple) else (i, entry) for i, entry in enumerate(tup)

ovld/typemap.py

@@ -6,7 +6,7 @@ from types import CodeType
 
 from .mro import sort_types
 from .recode import generate_dependent_dispatch
-from .utils import MISSING, CodegenInProgress, subtler_type
+from .utils import MISSING, CodegenInProgress, is_dependent, subtler_type
 
 
 class TypeMap(dict):
@@ -213,8 +213,6 @@ class MultiTypeMap(dict):
             sig: A Signature object.
             handler: A function to handle the tuple.
         """
-        from .dependent import is_dependent
-
         self.clear()
 
         obj_t_tup = sig.types
@@ -251,8 +249,6 @@ class MultiTypeMap(dict):
             print(f"{'':{width - 2}} @ {co.co_filename}:{co.co_firstlineno}")
 
     def display_resolution(self, *args, **kwargs):
-        from .dependent import is_dependent
-
         def dependent_match(tup, args):
             for t, a in zip(tup, args):
                 if isinstance(t, tuple):

ovld/types.py

@@ -10,14 +10,9 @@ from .codegen import Code
 from .mro import Order, TypeRelationship, subclasscheck, typeorder
 from .recode import generate_checking_code
 from .typemap import TypeMap
-from .utils import UnionType, UnionTypes, UsageError, clsstring
+from .utils import UnionType, UnionTypes, UsageError, clsstring, get_args
 
-
-def get_args(tp):
-    args = getattr(tp, "__args__", None)
-    if not isinstance(args, tuple):
-        args = ()
-    return args
+NoneType = type(None)
 
 
 def eval_annotation(t, ctx, locals, catch=False):
@@ -90,6 +85,8 @@ class TypeNormalizer:
             raise UsageError(
                 f"Dependent type {t} has not been given a type bound. Please use Dependent[<bound>, {t}] instead."
             )
+        elif t is None:
+            return NoneType
         else:
             return t
 
@@ -103,6 +100,8 @@ def _(self, t, fn):
 
 
 class MetaMC(type):
+    __dependent__ = False
+
     def __new__(T, name, handler):
         return super().__new__(T, name, (), {"_handler": handler})
 

ovld/utils.py

@@ -1,10 +1,15 @@
 """Miscellaneous utilities."""
 
+import builtins
 import functools
 import re
 import typing
+from abc import ABCMeta
 from itertools import count
 
+_builtins_dict = vars(builtins)
+
+
 try:
     from types import UnionType
 
@@ -152,7 +157,7 @@ class NameDatabase:
         i = 1
         name = desired_name
         while name in self.registered or (
-            name in __builtins__ and __builtins__[name] != value
+            name in _builtins_dict and _builtins_dict[name] != value
         ):
             name = f"{desired_name}{i}"
             i += 1
@@ -179,3 +184,31 @@ class NameDatabase:
         return name
 
     __getitem__ = get
+
+
+def get_args(tp):
+    args = getattr(tp, "__args__", None)
+    if not isinstance(args, tuple):
+        args = ()
+    return args
+
+
+_standard_instancechecks = {
+    type.__instancecheck__,
+    GenericAlias.__instancecheck__,
+    type(list[object]).__instancecheck__,
+    ABCMeta.__instancecheck__,
+    type(typing.Protocol).__instancecheck__,
+}
+
+
+def is_dependent(t):
+    if any(is_dependent(subt) for subt in get_args(t)):
+        return True
+    elif hasattr(t, "__dependent__"):
+        return t.__dependent__
+    elif not isinstance(t, type):
+        return False
+    elif type(t).__instancecheck__ not in _standard_instancechecks:
+        return True
+    return False

ovld/version.py

@@ -1 +1 @@
-version = "0.5.4"
+version = "0.5.6"

{ovld-0.5.4.dist-info → ovld-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.4
+Version: 0.5.6
 Summary: Overloading Python functions
 Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
 Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/
@@ -251,13 +251,13 @@ f3 = Total(punctuation="!", factor=3)
 
 Time relative to the fastest implementation (1.00) (lower is better).
 
-| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
+| Benchmark | custom | [ovld](https://github.com/breuleux/ovld) | [plum](https://github.com/beartype/plum) | [multim](https://github.com/coady/multimethod) | [multid](https://github.com/mrocklin/multipledispatch/) | [runtype](https://github.com/erezsh/runtype) | [sd](https://docs.python.org/3/library/functools.html#functools.singledispatch) |
 | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.45|1.00|3.32|4.63|2.04|2.41|1.91|
-|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.13|1.00|11.05|4.53|8.31|2.19|7.32|
-|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.08|1.00|3.73|5.21|2.37|2.79|x|
-|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.00|1.08|23.14|3.09|1.68|1.91|1.66|
-|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.23|54.61|29.32|x|x|x|
-|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|1.87|19.18|x|x|x|x|
-|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.30|444.31|125.77|x|x|x|
-|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|2.09|x|x|x|x|x|
+|[trivial](https://github.com/breuleux/ovld/tree/master/benchmarks/test_trivial.py)|1.56|1.00|3.38|4.92|2.00|2.38|2.15|
+|[multer](https://github.com/breuleux/ovld/tree/master/benchmarks/test_multer.py)|1.22|1.00|11.06|4.67|9.22|2.24|3.92|
+|[add](https://github.com/breuleux/ovld/tree/master/benchmarks/test_add.py)|1.27|1.00|3.61|4.93|2.24|2.62|x|
+|[ast](https://github.com/breuleux/ovld/tree/master/benchmarks/test_ast.py)|1.01|1.00|22.98|2.72|1.52|1.70|1.57|
+|[calc](https://github.com/breuleux/ovld/tree/master/benchmarks/test_calc.py)|1.00|1.28|57.86|29.79|x|x|x|
+|[regexp](https://github.com/breuleux/ovld/tree/master/benchmarks/test_regexp.py)|1.00|2.28|22.71|x|x|x|x|
+|[fib](https://github.com/breuleux/ovld/tree/master/benchmarks/test_fib.py)|1.00|3.39|403.38|114.69|x|x|x|
+|[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x||[tweaknum](https://github.com/breuleux/ovld/tree/master/benchmarks/test_tweaknum.py)|1.00|1.86|x|x|x|x|x|

ovld-0.5.6.dist-info/RECORD

@@ -0,0 +1,18 @@
+ovld/__init__.py,sha256=JuCM8Sj65gobV0KYyLr95cSI23Pi6RYZ7X3_F3fdsSw,1821
+ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
+ovld/codegen.py,sha256=27tmamlanuTPDT-x31ISyqP0wGKW9BCFZJGVyq9qLg8,9728
+ovld/core.py,sha256=HEREHblKcjM9dhFBr0FNwUCyec7o-9XjCsCfJ23SnNw,17544
+ovld/dependent.py,sha256=JIgsc_5ddPH51_2IrZ6JW6bWE5RyrrrOwR2e9UvDhZ4,8922
+ovld/medley.py,sha256=0fseIntzJRCPYXq-tmnxgy5ipNa4ZxR0D_6So0xstdQ,12729
+ovld/mro.py,sha256=Aw1r5Zz7V9cVBDwWzQ-WNnbpBwoGztgbw3wLAyS6Y60,4863
+ovld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ovld/recode.py,sha256=vXg9XLExp_9LdAHO0JWR4wvwHhpOLu2Xcrg9ZYg1nms,16407
+ovld/signatures.py,sha256=Q8JucSOun0ESGx14aWtHtBzLEiM6FxY5HP3imyqXoDo,8984
+ovld/typemap.py,sha256=EH3oM_QmX-SHLEz14saVrQtRlqG_ltPyJGORLvcGOFk,13520
+ovld/types.py,sha256=CRL6Vuzg5moXgAAhIj2698GvZoyF4HWbUDYz2hKt6us,13373
+ovld/utils.py,sha256=cyy9pcuMhmo1_UdPonH9JT6B9QlI4oH6_JK89cM3_gk,5046
+ovld/version.py,sha256=FtfC8ptaFH0Unc72bPRynMH_N62bxa4tnazGgIcgnTY,18
+ovld-0.5.6.dist-info/METADATA,sha256=NuqYyUraNAzGzrl8XUVET_xO6xBSzbPhy5F5AtzITWk,9383
+ovld-0.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ovld-0.5.6.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.5.6.dist-info/RECORD,,

ovld-0.5.4.dist-info/RECORD

@@ -1,18 +0,0 @@
-ovld/__init__.py,sha256=JuCM8Sj65gobV0KYyLr95cSI23Pi6RYZ7X3_F3fdsSw,1821
-ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
-ovld/codegen.py,sha256=iiGgWSpHQEB8QoMDqCx3Jup8bBGpDsESFeKtzGVAolM,9298
-ovld/core.py,sha256=HEREHblKcjM9dhFBr0FNwUCyec7o-9XjCsCfJ23SnNw,17544
-ovld/dependent.py,sha256=h3j4oQYTQfGqMzggWlLV6TpojX_GtYRFWAO0GcMB0Zs,9085
-ovld/medley.py,sha256=0fseIntzJRCPYXq-tmnxgy5ipNa4ZxR0D_6So0xstdQ,12729
-ovld/mro.py,sha256=LXHkP_28J9EwM9IrXYraYI0qm4dHWkDKCgkXn0u_YCo,4655
-ovld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ovld/recode.py,sha256=ZVqD3sCu_myaFj3lKPCMjFBf1pTdTAAd3NJdsqtLYuU,16434
-ovld/signatures.py,sha256=Q8JucSOun0ESGx14aWtHtBzLEiM6FxY5HP3imyqXoDo,8984
-ovld/typemap.py,sha256=5Pro1Ee60fH4L7NW7k5nbN5EfDygA0LFHcI6o3mCagI,13596
-ovld/types.py,sha256=0hkhAR5_5793NABdrM-fP1dSJBhYof85FILKqVP2YMg,13392
-ovld/utils.py,sha256=MAPQUhZc3_AcLrU4jFQrkVu4nvMJJKiw10N7zFk5QPc,4294
-ovld/version.py,sha256=yCowtNX3TKFIKd4P4DFW3MKaLU51L0lyEs-QRX2uVPs,18
-ovld-0.5.4.dist-info/METADATA,sha256=heLELAtYnCT1C6lVPIaZ5709iMDzYJxBhegZAr8uHC8,9276
-ovld-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ovld-0.5.4.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.5.4.dist-info/RECORD,,