jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #11058 (#11172)

Browse source
This commit is contained in:
Clyybber 2019-05-05 08:26:22 +02:00 • committed by Miran
commit 4fd79f5b47
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/semtypes.nim
View file

@ -950,7 +950,8 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
if tfUnresolved notin paramType.flags: if tfUnresolved notin paramType.flags:
# naked typedescs are not bindOnce types # naked typedescs are not bindOnce types
if paramType.base.kind == tyNone and paramTypId != nil and if paramType.base.kind == tyNone and paramTypId != nil and
paramTypId.id == getIdent(c.cache, "typedesc").id: (paramTypId.id == getIdent(c.cache, "typedesc").id or
paramTypId.id == getIdent(c.cache, "type").id):
# XXX Why doesn't this check for tyTypeDesc instead? # XXX Why doesn't this check for tyTypeDesc instead?
paramTypId = nil paramTypId = nil
let t = c.newTypeWithSons(tyTypeDesc, @[paramType.base]) let t = c.newTypeWithSons(tyTypeDesc, @[paramType.base])

11
tests/metatype/tbindtypedesc.nim
View file

@ -82,3 +82,14 @@ reject bindArg(int, string, 10.0, 20, "test", "nest")
reject bindArg(int, string, "test", "nest", 10, 20) reject bindArg(int, string, "test", "nest", 10, 20)
echo "ok" echo "ok"
#11058:
template test(S: type, U: type) =
discard
test(int, float)
proc test2(S: type, U: type) =
discard
test2(float, int)