fix getTypeInst for tyGenericInst (#6868)

This commit is contained in:
jcosborn 2017-12-04 10:37:25 -06:00 • committed by Andreas Rumpf
commit 35d7a99b6a
2 changed files with 32 additions and 9 deletions

View file

@ -27,9 +27,10 @@ macro testX(x,inst0: typed; recurse: static[bool]; implX: typed): typed =
let inst = x.getTypeInst
let instr = inst.symToIdent.treeRepr
let inst0r = inst0.symToIdent.treeRepr
#echo instr
#echo inst0r
doAssert(instr == inst0r)
if instr != inst0r:
echo "instr:\n", instr
echo "inst0r:\n", inst0r
doAssert(instr == inst0r)
# check that getTypeImpl(x) is correct
# if implX is nil then compare to inst0
@ -41,9 +42,10 @@ macro testX(x,inst0: typed; recurse: static[bool]; implX: typed): typed =
else: implX[0][2]
let implr = impl.symToIdent.treerepr
let impl0r = impl0.symToIdent.treerepr
#echo implr
#echo impl0r
doAssert(implr == impl0r)
if implr != impl0r:
echo "implr:\n", implr
echo "impl0r:\n", impl0r
doAssert(implr == impl0r)
result = newStmtList()
#template echoString(s: string) = echo s.replace("\n","\n ")
@ -111,6 +113,14 @@ type
Generic[T] = seq[int]
Concrete = Generic[int]
Alias1 = float
Alias2 = Concrete
Vec[N: static[int],T] = object
arr: array[N,T]
Vec4[T] = Vec[4,T]
test(bool)
test(char)
test(int)
@ -149,6 +159,16 @@ test(Generic[int]):
type _ = seq[int]
test(Generic[float]):
type _ = seq[int]
test(Alias1):
type _ = float
test(Alias2):
type _ = Generic[int]
test(Vec[4,float32]):
type _ = object
arr: array[0..3,float32]
test(Vec4[float32]):
type _ = object
arr: array[0..3,float32]
# bug #4862
static: