diff options
author | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-09-14 18:44:26 +0100 |
---|---|---|
committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-09-14 18:44:26 +0100 |
commit | 9f09c840d615145759ad79472832abc90564cdc3 (patch) | |
tree | ed4fb18aa030011a0ecc21ee088380ad489f3cff | |
parent | ebcaf6679b41c17f02da51559d683aedfefc2966 (diff) | |
parent | 113a1c450c40478e532b616778b6f2f8377bfd37 (diff) | |
download | Nim-9f09c840d615145759ad79472832abc90564cdc3.tar.gz |
Merge branch 'bigbreak' of github.com:Araq/Nimrod into bigbreak
-rw-r--r-- | compiler/semtypes.nim | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index 4badf8f4e..83cbca50f 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -819,13 +819,14 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode, result.shouldHaveMeta of tyGenericInvokation: - for i in 1 .. <paramType.sonsLen: - let lifted = liftingWalk(paramType.sons[i]) - if lifted != nil: paramType.sons[i] = lifted - - let expanded = instGenericContainer(c, info, paramType, - allowMetaTypes = true) - result = liftingWalk(expanded, true) + when false: + for i in 1 .. <paramType.sonsLen: + let lifted = liftingWalk(paramType.sons[i]) + if lifted != nil: paramType.sons[i] = lifted + + let expanded = instGenericContainer(c, info, paramType, + allowMetaTypes = true) + result = liftingWalk(expanded, true) of tyUserTypeClass, tyBuiltInTypeClass, tyAnd, tyOr, tyNot: result = addImplicitGeneric(copyType(paramType, getCurrOwner(), true)) |