modify getTypeImpl to reduce result to final implementation (#6891)
* added test case for getTypeImpl * modify getTypeImpl to reduce result to final implementation
This commit is contained in:
parent
b87ef65532
commit
96a5062b8c
2 changed files with 15 additions and 5 deletions
|
|
@ -84,10 +84,10 @@ proc mapTypeToAstX(t: PType; info: TLineInfo;
|
||||||
|
|
||||||
if inst:
|
if inst:
|
||||||
if t.sym != nil: # if this node has a symbol
|
if t.sym != nil: # if this node has a symbol
|
||||||
if allowRecursion: # getTypeImpl behavior: turn off recursion
|
if not allowRecursion: # getTypeInst behavior: return symbol
|
||||||
allowRecursion = false
|
|
||||||
else: # getTypeInst behavior: return symbol
|
|
||||||
return atomicType(t.sym)
|
return atomicType(t.sym)
|
||||||
|
#else: # getTypeImpl behavior: turn off recursion
|
||||||
|
# allowRecursion = false
|
||||||
|
|
||||||
case t.kind
|
case t.kind
|
||||||
of tyNone: result = atomicType("none", mNone)
|
of tyNone: result = atomicType("none", mNone)
|
||||||
|
|
|
||||||
|
|
@ -113,8 +113,12 @@ type
|
||||||
Generic[T] = seq[int]
|
Generic[T] = seq[int]
|
||||||
Concrete = Generic[int]
|
Concrete = Generic[int]
|
||||||
|
|
||||||
|
Generic2[T1, T2] = seq[T1]
|
||||||
|
Concrete2 = Generic2[int, float]
|
||||||
|
|
||||||
Alias1 = float
|
Alias1 = float
|
||||||
Alias2 = Concrete
|
Alias2 = Concrete
|
||||||
|
Alias3 = Concrete2
|
||||||
|
|
||||||
Vec[N: static[int],T] = object
|
Vec[N: static[int],T] = object
|
||||||
arr: array[N,T]
|
arr: array[N,T]
|
||||||
|
|
@ -154,15 +158,21 @@ test(Tree):
|
||||||
left: ref Tree
|
left: ref Tree
|
||||||
right: ref Tree
|
right: ref Tree
|
||||||
test(Concrete):
|
test(Concrete):
|
||||||
type _ = Generic[int]
|
type _ = seq[int]
|
||||||
test(Generic[int]):
|
test(Generic[int]):
|
||||||
type _ = seq[int]
|
type _ = seq[int]
|
||||||
test(Generic[float]):
|
test(Generic[float]):
|
||||||
type _ = seq[int]
|
type _ = seq[int]
|
||||||
|
test(Concrete2):
|
||||||
|
type _ = seq[int]
|
||||||
|
test(Generic2[int,float]):
|
||||||
|
type _ = seq[int]
|
||||||
test(Alias1):
|
test(Alias1):
|
||||||
type _ = float
|
type _ = float
|
||||||
test(Alias2):
|
test(Alias2):
|
||||||
type _ = Generic[int]
|
type _ = seq[int]
|
||||||
|
test(Alias3):
|
||||||
|
type _ = seq[int]
|
||||||
test(Vec[4,float32]):
|
test(Vec[4,float32]):
|
||||||
type _ = object
|
type _ = object
|
||||||
arr: array[0..3,float32]
|
arr: array[0..3,float32]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue