ovld 0.5.0__tar.gz → 0.5.2__tar.gz

{ovld-0.5.0 → ovld-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.0
+Version: 0.5.2
 Summary: Overloading Python functions
 Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
 Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/

{ovld-0.5.0 → ovld-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ovld"
-version = "0.5.0"
+version = "0.5.2"
 description = "Overloading Python functions"
 authors = [
     { name = "Olivier Breuleux", email = "breuleux@gmail.com" }
@@ -32,7 +32,7 @@ benchmark = [
     "multimethod>=1.12",
     "multipledispatch>=1.0.0",
     "plum-dispatch>=2.5.2",
-    "runtype>=0.5.0",
+    "runtype>=0.5.2",
 ]
 
 [tool.hatch.build.targets.wheel]

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/codegen.py

@@ -6,7 +6,7 @@ from ast import _splitlines_no_ff as splitlines
 from itertools import count
 from types import FunctionType
 
-from .utils import MISSING, NameDatabase, sigstring
+from .utils import MISSING, NameDatabase, keyword_decorator, sigstring
 
 _current = count()
 
@@ -298,6 +298,9 @@ def codegen_specializer(typemap, fn, tup):
     return func
 
 
-def code_generator(fn):
+@keyword_decorator
+def code_generator(fn, priority=0):
     fn.specializer = codegen_specializer
+    if priority:
+        fn.priority = priority
     return fn

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/core.py

@@ -18,6 +18,7 @@ from .signatures import ArgumentAnalyzer, LazySignature, Signature
 from .typemap import MultiTypeMap
 from .utils import (
     MISSING,
+    ResolutionError,
     UsageError,
     keyword_decorator,
     sigstring,
@@ -51,6 +52,7 @@ def bootstrap_dispatch(ov, name):
     dispatch.add_mixins = ov.add_mixins
     dispatch.unregister = ov.unregister
     dispatch.next = ov.next
+    dispatch.first_entry = first_entry
     return dispatch
 
 
@@ -95,6 +97,7 @@ class Ovld:
         self._locked = False
         self.mixins = []
         self.argument_analysis = ArgumentAnalyzer()
+        self.dispatch = bootstrap_dispatch(self, name=self.shortname)
         self.add_mixins(*mixins)
 
     @property
@@ -162,12 +165,12 @@ class Ovld:
     def _key_error(self, key, possibilities=None):
         typenames = sigstring(key)
         if not possibilities:
-            return TypeError(f"No method in {self} for argument types [{typenames}]")
+            return ResolutionError(f"No method in {self} for argument types [{typenames}]")
         else:
             hlp = ""
             for c in possibilities:
                 hlp += f"* {c.handler.__name__}  (priority: {c.priority}, specificity: {list(c.specificity)})\n"
-            return TypeError(
+            return ResolutionError(
                 f"Ambiguous resolution in {self} for"
                 f" argument types [{typenames}]\n"
                 f"Candidates are:\n{hlp}"
@@ -176,10 +179,11 @@ class Ovld:
 
     def rename(self, name, shortname=None):
         """Rename this Ovld."""
-        self.name = name
-        self.shortname = shortname or name
-        self.__name__ = self.shortname
-        self.dispatch = bootstrap_dispatch(self, name=self.shortname)
+        if name != self.name:
+            self.name = name
+            self.shortname = shortname or name
+            self.__name__ = self.shortname
+            self.dispatch = bootstrap_dispatch(self, name=self.shortname)
 
     def __set_name__(self, inst, name):
         self.rename(name)
@@ -217,8 +221,6 @@ class Ovld:
 
         self.analyze_arguments()
         dispatch = generate_dispatch(self, self.argument_analysis)
-        if not hasattr(self, "dispatch"):
-            self.dispatch = bootstrap_dispatch(self, name=self.shortname)
         self.dispatch.__code__ = rename_code(dispatch.__code__, self.shortname)
         self.dispatch.__kwdefaults__ = dispatch.__kwdefaults__
         self.dispatch.__annotations__ = dispatch.__annotations__
@@ -258,6 +260,7 @@ class Ovld:
         """Register a function."""
         if fn is None:
             return partial(self._register, priority=priority)
+        priority = getattr(fn, "priority", priority)
         return self._register(fn, priority)
 
     def _register(self, fn, priority):
@@ -290,13 +293,16 @@ class Ovld:
         self._update()
 
     def _update(self):
-        if self._compiled:
-            self.compile()
+        self.reset()
         for child in self.children:
             child._update()
         if hasattr(self, "dispatch"):
             self.dispatch.__doc__ = self.mkdoc()
 
+    def reset(self):
+        self._compiled = False
+        self.dispatch.__code__ = self.dispatch.first_entry.__code__
+
     def copy(self, mixins=[], linkback=False):
         """Create a copy of this Ovld.
 
@@ -319,8 +325,6 @@ class Ovld:
             return ov
 
     def __get__(self, obj, cls):
-        if not self._compiled:
-            self.compile()
         return self.dispatch.__get__(obj, cls)
 
     def __call__(self, *args, **kwargs):  # pragma: no cover
@@ -328,8 +332,6 @@ class Ovld:
 
         This should be replaced by an auto-generated function.
         """
-        if not self._compiled:
-            self.compile()
         return self.dispatch(*args, **kwargs)
 
     def next(self, *args):

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/medley.py

@@ -110,7 +110,7 @@ class ChainAll(ImplList):
 class BuildOvld(Combiner):
     def __init__(self, field=None, ovld=None):
         super().__init__(field)
-        self.ovld = ovld or Ovld(linkback=True)
+        self.ovld = ovld or Ovld(name=field, linkback=True)
         self.pending = []
         if field is not None:
             self.__set_name__(None, field)
@@ -125,7 +125,7 @@ class BuildOvld(Combiner):
         self.pending.clear()
         if not self.ovld.defns:
             return ABSENT
-        self.ovld.compile()
+        self.ovld.reset()
         return self.ovld.dispatch
 
     def copy(self):
@@ -144,10 +144,14 @@ class BuildOvld(Combiner):
 
 
 class medley_cls_dict(dict):
-    def __init__(self, bases):
+    def __init__(self, bases, default_combiner=None):
+        if default_combiner is None:
+            (default_combiner,) = {b._ovld_default_combiner for b in bases}
         super().__init__()
         self._combiners = {}
+        self._default_combiner = default_combiner
         self.set_direct("_ovld_combiners", self._combiners)
+        self.set_direct("_ovld_default_combiner", default_combiner)
         self._basic = set()
         for base in bases:
             for attr, combiner in getattr(base, "_ovld_combiners", {}).items():
@@ -174,8 +178,10 @@ class medley_cls_dict(dict):
 
         combiner = self._combiners.get(attr, None)
         if combiner is None:
-            if inspect.isfunction(value) or isinstance(value, Ovld):
+            if to_ovld(value, force=False):
                 combiner = BuildOvld(attr)
+            elif inspect.isfunction(value):
+                combiner = self._default_combiner(attr)
             else:
                 combiner = KeepLast(attr)
             self._combiners[attr] = combiner
@@ -207,6 +213,19 @@ def specialize(cls, key):
     return new_t
 
 
+def remap_field(dc_field, require_default=False):
+    if require_default:
+        if dc_field.default is MISSING:
+            # NOTE: we do not accept default_factory, because we need the default value to be set
+            # in the class so that existing instances of classes[0] can see it.
+            raise TypeError(
+                f"Dataclass field '{dc_field.name}' must have a default value (not a default_factory) in order to be melded in."
+            )
+    dc_field = copy(dc_field)
+    dc_field.kw_only = True
+    return dc_field
+
+
 class MedleyMC(type):
     def __subclasscheck__(cls, subclass):
         if getattr(cls, "_ovld_medleys", None):
@@ -214,10 +233,10 @@ class MedleyMC(type):
         return super().__subclasscheck__(subclass)
 
     @classmethod
-    def __prepare__(mcls, name, bases):
-        return medley_cls_dict(bases)
+    def __prepare__(mcls, name, bases, default_combiner=None):
+        return medley_cls_dict(bases, default_combiner=default_combiner)
 
-    def __new__(mcls, name, bases, namespace):
+    def __new__(mcls, name, bases, namespace, default_combiner=None):
         result = super().__new__(mcls, name, bases, namespace)
         for attr, combiner in result._ovld_combiners.items():
             if (value := combiner.get(result)) is not ABSENT:
@@ -236,13 +255,16 @@ class MedleyMC(type):
         ]
         return dc
 
-    def extend(cls, *others):
-        if not others:
+    def extend(cls, *others, extend_subclasses=True):
+        if not others:  # pragma: no cover
             return cls
-        melded = meld_classes((cls, *others), require_defaults=True)
+        all_fields = [(f.name, f.type, f) for f in fields(cls)]
+        for other in others:
+            all_fields += [(f.name, f.type, remap_field(f, True)) for f in fields(other)]
+        melded = make_dataclass("_", fields=all_fields)
         for other in others:
             for k, v in vars(other).items():
-                if k in ["__module__", "__firstlineno__"]:
+                if k in ["__module__", "__firstlineno__", "__static_attributes__"]:
                     continue
                 elif comb := cls._ovld_combiners.get(k):
                     comb.juxtapose(v)
@@ -250,9 +272,10 @@ class MedleyMC(type):
                 elif not k.startswith("_ovld_") and not k.startswith("__"):
                     setattr(cls, k, v)
         cls.__init__ = melded.__init__
-        for subcls in cls.__subclasses__():
-            subothers = [o for o in others if not issubclass(subcls, o)]
-            subcls.extend(*subothers)
+        if extend_subclasses:
+            for subcls in cls.__subclasses__():
+                subothers = [o for o in others if not issubclass(subcls, o)]
+                subcls.extend(*subothers, extend_subclasses=False)
         return cls
 
     def __add__(cls, other):
@@ -290,7 +313,7 @@ def use_combiner(combiner):
     return deco
 
 
-class Medley(metaclass=MedleyMC):
+class Medley(metaclass=MedleyMC, default_combiner=BuildOvld):
     __post_init__ = RunAll()
     __add__ = KeepLast()
     __sub__ = KeepLast()
@@ -313,13 +336,10 @@ def unmeld_classes(main: type, exclude: type):
 _meld_classes_cache = {}
 
 
-def meld_classes(classes, require_defaults=False):
+def meld_classes(classes):
     medleys = {}
-    for i, cls in enumerate(classes):
-        if require_defaults and i == 0:
-            medleys[cls] = True
-        else:
-            medleys.update({x: True for x in getattr(cls, "_ovld_medleys", [cls])})
+    for cls in classes:
+        medleys.update({x: True for x in getattr(cls, "_ovld_medleys", [cls])})
     for cls in classes:
         if not hasattr(cls, "_ovld_medleys"):
             for base in cls.mro():
@@ -329,36 +349,26 @@ def meld_classes(classes, require_defaults=False):
     if len(medleys) == 1:
         return medleys[0]
 
-    cache_key = (medleys, require_defaults)
+    cache_key = medleys
     if cache_key in _meld_classes_cache:
         return _meld_classes_cache[cache_key]
 
-    def remap_field(dc_field, require_default):
-        if require_default:
-            if dc_field.default is MISSING:
-                # NOTE: we do not accept default_factory, because we need the default value to be set
-                # in the class so that existing instances of classes[0] can see it.
-                raise TypeError(
-                    f"Dataclass field '{dc_field.name}' must have a default value (not a default_factory) in order to be melded in."
-                )
-        dc_field = copy(dc_field)
-        dc_field.kw_only = True
-        return dc_field
-
     cg_fields = set()
     dc_fields = []
 
     for base in medleys:
-        rqdef = require_defaults and base is not medleys[0]
         cg_fields.update(base._ovld_codegen_fields)
         dc_fields.extend(
-            (f.name, f.type, remap_field(f, rqdef)) for f in base.__dataclass_fields__.values()
+            (f.name, f.type, remap_field(f)) for f in base.__dataclass_fields__.values()
         )
 
     merged = medley_cls_dict(medleys)
     merged.set_direct("_ovld_codegen_fields", tuple(cg_fields))
     merged.set_direct("_ovld_medleys", tuple(medleys))
 
+    if "__qualname__" in merged._combiners:
+        del merged._combiners["__qualname__"]
+
     result = make_dataclass(
         cls_name="+".join(sorted(c.__name__ for c in medleys)),
         bases=tuple(medleys),

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/mro.py

@@ -137,7 +137,7 @@ def subclasscheck(t1, t2):
     if o1 or o2:
         o1 = o1 or t1
         o2 = o2 or t2
-        if issubclass(o1, o2):
+        if isinstance(o1, type) and isinstance(o2, type) and issubclass(o1, o2):
             if o2 is t2:  # pragma: no cover
                 return True
             else:

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/recode.py

@@ -405,11 +405,8 @@ def _search_names(co, specials, glb, closure=None):
         if isinstance(co, CodeType):
             if closure is not None:
                 for varname, cell in zip(co.co_freevars, closure):
-                    try:
-                        if any(cell.cell_contents is v for v in values):
-                            yield varname
-                    except ValueError:  # cell is empty
-                        pass
+                    if any(cell.cell_contents is v for v in values):
+                        yield varname
             for name in co.co_names:
                 if any(glb.get(name, None) is v for v in values):
                     yield name
@@ -499,7 +496,18 @@ def recode(fn, ovld, syms, newname):
     if fn.__closure__:
         new = closure_wrap(new.body[0], "irrelevant", fn.__code__.co_freevars)
     ast.fix_missing_locations(new)
-    ast.increment_lineno(new, fn.__code__.co_firstlineno - 1)
+    line_delta = fn.__code__.co_firstlineno - 1
+    col_delta = len(firstline := src.split("\n", 1)[0]) - len(firstline.lstrip())
+    for node in ast.walk(new):
+        if hasattr(node, "lineno"):
+            node.lineno += line_delta
+        if hasattr(node, "end_lineno"):
+            node.end_lineno += line_delta
+        if hasattr(node, "col_offset"):
+            node.col_offset += col_delta
+        if hasattr(node, "end_col_offset"):
+            node.end_col_offset += col_delta
+
     res = compile(new, mode="exec", filename=fn.__code__.co_filename)
     if fn.__closure__:
         res = [x for x in res.co_consts if isinstance(x, CodeType)][0]

{ovld-0.5.0 → ovld-0.5.2}/src/ovld/utils.py

@@ -65,6 +65,10 @@ class UsageError(Exception):
     pass
 
 
+class ResolutionError(TypeError):
+    pass
+
+
 class SpecialForm:
     def __init__(self, name, message=None):
         self.__name = name

ovld-0.5.2/src/ovld/version.py

@@ -0,0 +1 @@
+version = "0.5.2"

{ovld-0.5.0 → ovld-0.5.2}/tests/test_codegen.py

@@ -307,3 +307,17 @@ def test_def():
     assert df.create_body(["x", "y"]).fill() == "return x + 1234"
     with pytest.raises(ValueError):
         df.create_expression(["x", "y"])
+
+
+def test_codegen_priority():
+    @ovld
+    @code_generator
+    def f(x: int):
+        return Lambda(..., "'A'")
+
+    @ovld
+    @code_generator(priority=1)
+    def f(x: object):
+        return Lambda(..., "'B'")
+
+    assert f(2) == "B"

{ovld-0.5.0 → ovld-0.5.2}/uv.lock

@@ -1,5 +1,4 @@
 version = 1
-revision = 1
 requires-python = ">=3.9"
 
 [[package]]
@@ -16,7 +15,7 @@ name = "click"
 version = "8.1.8"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "colorama", marker = "platform_system == 'Windows'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593 }
 wheels = [
@@ -172,14 +171,14 @@ wheels = [
 
 [[package]]
 name = "markdown"
-version = "3.7"
+version = "3.8"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "importlib-metadata", marker = "python_full_version < '3.10'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/54/28/3af612670f82f4c056911fbbbb42760255801b3068c48de792d354ff4472/markdown-3.7.tar.gz", hash = "sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2", size = 357086 }
+sdist = { url = "https://files.pythonhosted.org/packages/2f/15/222b423b0b88689c266d9eac4e61396fe2cc53464459d6a37618ac863b24/markdown-3.8.tar.gz", hash = "sha256:7df81e63f0df5c4b24b7d156eb81e4690595239b7d70937d0409f1b0de319c6f", size = 360906 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3f/08/83871f3c50fc983b88547c196d11cf8c3340e37c32d2e9d6152abe2c61f7/Markdown-3.7-py3-none-any.whl", hash = "sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803", size = 106349 },
+    { url = "https://files.pythonhosted.org/packages/51/3f/afe76f8e2246ffbc867440cbcf90525264df0e658f8a5ca1f872b3f6192a/markdown-3.8-py3-none-any.whl", hash = "sha256:794a929b79c5af141ef5ab0f2f642d0f7b1872981250230e72682346f7cc90dc", size = 106210 },
 ]
 
 [[package]]
@@ -286,7 +285,7 @@ version = "1.6.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
-    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "colorama", marker = "platform_system == 'Windows'" },
     { name = "ghp-import" },
     { name = "importlib-metadata", marker = "python_full_version < '3.10'" },
     { name = "jinja2" },
@@ -340,7 +339,7 @@ wheels = [
 
 [[package]]
 name = "ovld"
-version = "0.4.6"
+version = "0.5.0"
 source = { editable = "." }
 
 [package.dev-dependencies]
@@ -477,15 +476,15 @@ wheels = [
 
 [[package]]
 name = "pytest-cov"
-version = "6.1.0"
+version = "6.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "coverage", extra = ["toml"] },
     { name = "pytest" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/34/8c/039a7793f23f5cb666c834da9e944123f498ccc0753bed5fbfb2e2c11f87/pytest_cov-6.1.0.tar.gz", hash = "sha256:ec55e828c66755e5b74a21bd7cc03c303a9f928389c0563e50ba454a6dbe71db", size = 66651 }
+sdist = { url = "https://files.pythonhosted.org/packages/25/69/5f1e57f6c5a39f81411b550027bf72842c4567ff5fd572bed1edc9e4b5d9/pytest_cov-6.1.1.tar.gz", hash = "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a", size = 66857 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e1/c5/8d6ffe9fc8f7f57b3662156ae8a34f2b8e7a754c73b48e689ce43145e98c/pytest_cov-6.1.0-py3-none-any.whl", hash = "sha256:cd7e1d54981d5185ef2b8d64b50172ce97e6f357e6df5cb103e828c7f993e201", size = 23743 },
+    { url = "https://files.pythonhosted.org/packages/28/d0/def53b4a790cfb21483016430ed828f64830dd981ebe1089971cd10cab25/pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde", size = 23841 },
 ]
 
 [[package]]
@@ -664,11 +663,11 @@ wheels = [
 
 [[package]]
 name = "typing-extensions"
-version = "4.13.0"
+version = "4.13.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0e/3e/b00a62db91a83fff600de219b6ea9908e6918664899a2d85db222f4fbf19/typing_extensions-4.13.0.tar.gz", hash = "sha256:0a4ac55a5820789d87e297727d229866c9650f6521b64206413c4fbada24d95b", size = 106520 }
+sdist = { url = "https://files.pythonhosted.org/packages/f6/37/23083fcd6e35492953e8d2aaaa68b860eb422b34627b13f2ce3eb6106061/typing_extensions-4.13.2.tar.gz", hash = "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef", size = 106967 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e0/86/39b65d676ec5732de17b7e3c476e45bb80ec64eb50737a8dce1a4178aba1/typing_extensions-4.13.0-py3-none-any.whl", hash = "sha256:c8dd92cc0d6425a97c18fbb9d1954e5ff92c1ca881a309c45f06ebc0b79058e5", size = 45683 },
+    { url = "https://files.pythonhosted.org/packages/8b/54/b1ae86c0973cc6f0210b53d508ca3641fb6d0c56823f288d108bc7ab3cc8/typing_extensions-4.13.2-py3-none-any.whl", hash = "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c", size = 45806 },
 ]
 
 [[package]]

ovld-0.5.0/src/ovld/version.py

@@ -1 +0,0 @@
-version = "0.5.0"