Fixes to CodegenParameters in edge cases

Author: breuleux

src/ovld/core.py

@@ -208,7 +208,8 @@ def signatures(self):
             regs = {}
             for fn, priority in self.regs():
                 ss = self.specialization_self
-                lcl = {} if ss is MISSING else vars(ss)
+                cgf = getattr(ss, "_ovld_codegen_fields", ())
+                lcl = {f: getattr(ss, f) for f in cgf}
                 sig = replace(Signature.extract(fn, lcl), priority=priority)
 
                 def _set(sig, fn):

src/ovld/medley.py

@@ -337,15 +337,20 @@ def unmeld_classes(main: type, exclude: type):
 
 
 def meld_classes(classes):
+    def key(cls):
+        return getattr(cls, "_ovld_specialization_parent", None) or cls
+
     medleys = {}
     for cls in classes:
-        medleys.update({x: True for x in getattr(cls, "_ovld_medleys", [cls])})
+        medleys.update({key(x): x for x in getattr(cls, "_ovld_medleys", [cls])})
     for cls in classes:
+        cls = key(cls)
         if not hasattr(cls, "_ovld_medleys"):
             for base in cls.mro():
                 if base is not cls and base in medleys:
                     del medleys[base]
-    medleys = tuple(medleys)
+
+    medleys = tuple(medleys.values())
     if len(medleys) == 1:
         return medleys[0]
 
@@ -372,7 +377,7 @@ def meld_classes(classes):
 
     result = make_dataclass(
         cls_name="+".join(sorted(c.__name__ for c in medleys)),
-        bases=tuple(medleys),
+        bases=medleys,
         fields=dc_fields,
         kw_only=True,
         namespace=merged,

tests/test_medley.py

@@ -546,16 +546,17 @@ class Lust(Lost):
     assert lu.xs == []
 
 
-def test_configure_dependent():
-    class Monkey(Medley):
-        regex: CodegenParameter[str] = "monk[iey]+"
+class Monkey(Medley):
+    regex: CodegenParameter[str] = "monk[iey]+"
+
+    def hi(self, x: Regexp[regex]):
+        return "hello!"
 
-        def hi(self, x: Regexp[regex]):
-            return "hello!"
+    def hi(self, x: str):
+        return "goodbye!"
 
-        def hi(self, x: str):
-            return "goodbye!"
 
+def test_configure_dependent():
     m1 = Monkey()
     m2 = Monkey(regex="go+rilla")
 
@@ -566,3 +567,8 @@ def hi(self, x: str):
     assert m2.hi("monki") == "goodbye!"
     assert m2.hi("monkeeeee") == "goodbye!"
     assert m2.hi("goorilla") == "hello!"
+
+
+def test_configure_dependent_pileon():
+    m = Monkey(regex="chimpanze+") + Monkey(regex="go+rilla")
+    assert m.hi("goorilla") == "hello!"