ovld 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

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/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/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/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/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/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/version.py

@@ -1 +1 @@
-version = "0.5.1"
+version = "0.5.3"

{ovld-0.5.1.dist-info → ovld-0.5.3.dist-info}/METADATA

@@ -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.3.dist-info/RECORD

@@ -0,0 +1,18 @@
+ovld/__init__.py,sha256=JuCM8Sj65gobV0KYyLr95cSI23Pi6RYZ7X3_F3fdsSw,1821
+ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
+ovld/codegen.py,sha256=N8qgnpitPD8HEzNWQqmPw4MmSs3wdMsW9qoMo1jEhps,9247
+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=9iBSpgY-F4wj0t-upZDlLaji0_l-xTEqXo5_nwN8O1M,18
+ovld-0.5.3.dist-info/METADATA,sha256=2l6SNs5EFY56D3EvhxubpQ-mXoz21EUPLqcFb3JUeVg,9276
+ovld-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ovld-0.5.3.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.5.3.dist-info/RECORD,,

ovld-0.5.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-ovld/__init__.py,sha256=JuCM8Sj65gobV0KYyLr95cSI23Pi6RYZ7X3_F3fdsSw,1821
-ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
-ovld/codegen.py,sha256=oHfQHlVJUB1Y0PO--rhhkfAmgOhIhKNZyBcodrS1GEs,9210
-ovld/core.py,sha256=bnp2LIVBUCvNhI53csWaAs7hlxinOBOXhPeoAw_GD3s,17443
-ovld/dependent.py,sha256=h3j4oQYTQfGqMzggWlLV6TpojX_GtYRFWAO0GcMB0Zs,9085
-ovld/medley.py,sha256=bp4e-6qH5_Qq05poPu7AcuWf-0mqNCqKMrdK44K2hSs,12667
-ovld/mro.py,sha256=nqe9jHvsaLu-CfXoP2f7tHg5_8IkcESWMnBmvr4XGIo,4605
-ovld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ovld/recode.py,sha256=YrftCClBcP_luOdqeeQ_EQJddRjikLpY5RmYGRCQrOs,16008
-ovld/signatures.py,sha256=Q8JucSOun0ESGx14aWtHtBzLEiM6FxY5HP3imyqXoDo,8984
-ovld/typemap.py,sha256=5Pro1Ee60fH4L7NW7k5nbN5EfDygA0LFHcI6o3mCagI,13596
-ovld/types.py,sha256=0hkhAR5_5793NABdrM-fP1dSJBhYof85FILKqVP2YMg,13392
-ovld/utils.py,sha256=wO9IQqPVkcS1Opd8cl79WMMpWdCbMQY66PuWF2hMkvc,4272
-ovld/version.py,sha256=-u_JHy_NHod_JgjQcxN3CYo6TWCz6XQgbb-Z1FmF2Fg,18
-ovld-0.5.1.dist-info/METADATA,sha256=Lp8FkGbpbaMftXuCYLX3yeCdNTjV67U4ov0h9GV7tCI,9276
-ovld-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ovld-0.5.1.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.5.1.dist-info/RECORD,,