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

Merge branch 'bigbreak' of github.com:Araq/Nimrod into bigbreak

Browse source
This commit is contained in:
Dominik Picheta 2014-09-14 18:44:26 +01:00
commit 9f09c840d6
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/semtypes.nim
View file

@ -819,13 +819,14 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
result.shouldHaveMeta result.shouldHaveMeta
of tyGenericInvokation: of tyGenericInvokation:
for i in 1 .. <paramType.sonsLen: when false:
let lifted = liftingWalk(paramType.sons[i]) for i in 1 .. <paramType.sonsLen:
if lifted != nil: paramType.sons[i] = lifted let lifted = liftingWalk(paramType.sons[i])
if lifted != nil: paramType.sons[i] = lifted
let expanded = instGenericContainer(c, info, paramType, let expanded = instGenericContainer(c, info, paramType,
allowMetaTypes = true) allowMetaTypes = true)
result = liftingWalk(expanded, true) result = liftingWalk(expanded, true)
of tyUserTypeClass, tyBuiltInTypeClass, tyAnd, tyOr, tyNot: of tyUserTypeClass, tyBuiltInTypeClass, tyAnd, tyOr, tyNot:
result = addImplicitGeneric(copyType(paramType, getCurrOwner(), true)) result = addImplicitGeneric(copyType(paramType, getCurrOwner(), true))