alternative fake covariance based on converters

2 files changed, 25 insertions, 3 deletions

diff --git a/tests/generics/tfakecovariance.nim b/tests/generics/tfakecovariance.nim
index bca285283..0920cb504 100644
--- a/tests/generics/tfakecovariance.nim
+++ b/tests/generics/tfakecovariance.nim
@@ -35,8 +35,8 @@ reject wantsSpecificContainers(derived)
 # Now, let's make a more general solution able to catch all derived types:
 
 type
-  DerivedFrom[T] = concept type A
-    var derived: ref A
+  DerivedFrom[T] = concept type D
+    var derived: ref D
     var base: ref T = derived
 
 proc wantsDerived(x: DerivedFrom[BaseObj]) = discard
@@ -54,3 +54,25 @@ accept wantsDerivedContainer(derivedContainer)
 
 reject wantsDerivedContainer(nonDerivedContainer)
 
+# The previous solutions were solving the problem for a single overload.
+# Let's solve it for multiple overloads by introducing a converter:
+
+type
+  OtherContainer[T] = object
+
+proc wantsBaseContainer1(c: OtherContainer[BaseObj]) = discard
+proc wantsBaseContainer2(c: OtherContainer[BaseObj]) = discard
+
+converter derivedToBase(c: OtherContainer[DerivedFrom[BaseObj]]): OtherContainer[BaseObj] = discard
+
+block:
+  var baseContainer: OtherContainer[BaseObj]
+  var derivedContainer: OtherContainer[DerivedObj]
+  var nonDerivedContainer: OtherContainer[NonDerivedObj]
+
+  accept wantsBaseContainer1(derivedContainer)
+  reject wantsBaseContainer1(nonDerivedContainer)
+
+  accept wantsBaseContainer2(derivedContainer)
+  reject wantsBaseContainer2(nonDerivedContainer)
+
diff --git a/tests/generics/tptrinheritance.nim b/tests/generics/tptrinheritance.nim
index 1e1115fa5..221b8777b 100644
--- a/tests/generics/tptrinheritance.nim
+++ b/tests/generics/tptrinheritance.nim
@@ -10,7 +10,7 @@ proc newMutableArrayAbstract*(): NSMutableArrayAbstract = discard
 template newMutableArray*(T: typedesc): NSMutableArray[T] =
   cast[NSMutableArray[T]](newMutableArrayAbstract())
 
-proc writeObjects*(p: NSPasteboard, o: ptr NSArray[NSPasteboardItem]) = discard
+proc writeObjects*(p: NSPasteboard, o: NSArray[NSPasteboardItem]) = discard
 
 let a = newMutableArray NSPasteboardItem
 var x: NSMutableArray[NSPasteboardItem]