address comment

nim-lang · Feb 8, 2020 · e11d51e · e11d51e
1 parent 9cc993d
commit e11d51e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -396,7 +396,7 @@ proc isOpImpl(c: PContext, n: PNode, flags: TExprFlags): PNode =
     else:
       res = false
   else:
-    if t1.skipTypes({tyAlias}).kind != tyGenericBody:
+    if t1.skipTypes({tyGenericInst, tyAlias, tySink, tyDistinct}).kind != tyGenericBody:
       maybeLiftType(t2, c, n.info)
     else:
       #[

diff --git a/tests/metatype/ttypetraits.nim b/tests/metatype/ttypetraits.nim
@@ -129,6 +129,17 @@ block genericHead:
   type FooInst = Foo[int, float]
   type Foo2 = genericHead(FooInst)
   doAssert Foo2 is Foo # issue #13066
+
+  block:
+    type Goo[T] = object
+    type Moo[U] = object
+    type Hoo = Goo[Moo[float]]
+    type Koo = genericHead(Hoo)
+    doAssert Koo is Goo
+    doAssert genericParams(Hoo) is (Moo[float],)
+    doAssert genericParams(Hoo).get(0) is Moo[float]
+    doAssert genericHead(genericParams(Hoo).get(0)) is Moo
+
   type Foo2Inst = Foo2[int, float]
   doAssert FooInst.default == Foo2Inst.default
   doAssert FooInst.default.x2 == 0.0