ovld 0.5.1__tar.gz → 0.5.3__tar.gz

{ovld-0.5.1 → ovld-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.1
+Version: 0.5.3
 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.1 → ovld-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ovld"
-version = "0.5.1"
+version = "0.5.3"
 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.1",
+    "runtype>=0.5.3",
 ]
 
 [tool.hatch.build.targets.wheel]

{ovld-0.5.1 → ovld-0.5.3}/src/ovld/codegen.py

@@ -295,6 +295,7 @@ def codegen_specializer(typemap, fn, tup):
     adjusted_name = f"{fn.__name__.split('[')[0]}[{sigstring(tup)}]"
     func = rename_function(func, adjusted_name)
     func.__codegen__ = cg
+    func.__orig_name__ = fn.__name__
     return func
 
 

{ovld-0.5.1 → ovld-0.5.3}/src/ovld/core.py

@@ -169,7 +169,10 @@ class Ovld:
         else:
             hlp = ""
             for c in possibilities:
-                hlp += f"* {c.handler.__name__}  (priority: {c.priority}, specificity: {list(c.specificity)})\n"
+                hn = getattr(c.handler, "__orig_name__", c.handler.__name__)
+                hlp += (
+                    f"* {hn}  (priority: {c.priority}, specificity: {list(c.specificity)})\n"
+                )
             return ResolutionError(
                 f"Ambiguous resolution in {self} for"
                 f" argument types [{typenames}]\n"

{ovld-0.5.1 → ovld-0.5.3}/src/ovld/medley.py

@@ -178,7 +178,9 @@ 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)

{ovld-0.5.1 → ovld-0.5.3}/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.1 → ovld-0.5.3}/src/ovld/recode.py

@@ -496,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.1 → ovld-0.5.3}/src/ovld/utils.py

@@ -106,7 +106,7 @@ def clsstring(cls):
         return f"{origin.__name__}[{args}]"
     else:
         r = repr(cls)
-        if r.startswith("<class "):
+        if r.startswith("<class ") or r.startswith("<enum "):
             return cls.__name__
         else:
             return r
@@ -160,7 +160,7 @@ class NameDatabase:
         return name
 
     def get(self, value, suggested_name=None):
-        if isinstance(value, (int, float, str)):
+        if type(value) in (int, float, str):
             return repr(value)
         if id(value) in self.names:
             return self.names[id(value)]

ovld-0.5.3/src/ovld/version.py

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

ovld-0.5.1/src/ovld/version.py

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