diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-01-14 15:05:48 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-01-14 15:05:48 +0100 |
| commit | 35b65e6f4ed9ff0c6eb327de6c49c9ed32d3592c (patch) | |
| tree | 0a84b1253d6fce6c83cda778565f651d4fe504bd /compiler/evaltempl.nim | |
| parent | 1124c61c491ab335a7005b98e01cc1632f041ff5 (diff) | |
| parent | 2e62090ec3c58023034d3fc21d8660731dfc3d42 (diff) | |
| download | Nim-35b65e6f4ed9ff0c6eb327de6c49c9ed32d3592c.tar.gz | |
Merge branch 'devel' into new-ll
Diffstat (limited to 'compiler/evaltempl.nim')
| -rw-r--r-- | compiler/evaltempl.nim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/evaltempl.nim b/compiler/evaltempl.nim index 863aa696e..a5a132005 100644 --- a/compiler/evaltempl.nim +++ b/compiler/evaltempl.nim @@ -38,7 +38,8 @@ proc evalTemplateAux(templ, actual: PNode, c: var TemplCtx, result: PNode) = if s.owner.id == c.owner.id: if s.kind == skParam and sfGenSym notin s.flags: handleParam actual.sons[s.position] - elif s.kind == skGenericParam: + elif s.kind == skGenericParam or + s.kind == skType and s.typ != nil and s.typ.kind == tyGenericParam: handleParam actual.sons[s.owner.typ.len + s.position - 1] else: internalAssert sfGenSym in s.flags |