diff options
| author | Araq <rumpf_a@web.de> | 2013-12-13 15:58:03 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-13 15:58:03 +0100 |
| commit | 8c553fa8a2e9476c67c6348bf64c02ea0f19a679 (patch) | |
| tree | ce32cf3cd815f4dbb7e5f0f00942f43e1a7871c0 /compiler/seminst.nim | |
| parent | 328f1932925889d5bb7f91c68fb1504b9b26ba8c (diff) | |
| parent | 01661daf76daa713d25d06d202f83c842a6f1fe3 (diff) | |
| download | Nim-8c553fa8a2e9476c67c6348bf64c02ea0f19a679.tar.gz | |
Merge branch 'master' into vm2
Diffstat (limited to 'compiler/seminst.nim')
| -rw-r--r-- | compiler/seminst.nim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/seminst.nim b/compiler/seminst.nim index 0cf5086a8..d7d64fd54 100644 --- a/compiler/seminst.nim +++ b/compiler/seminst.nim @@ -20,7 +20,8 @@ proc instantiateGenericParamList(c: PContext, n: PNode, pt: TIdTable, if a.kind != nkSym: InternalError(a.info, "instantiateGenericParamList; no symbol") var q = a.sym - if q.typ.kind notin {tyTypeDesc, tyGenericParam, tyTypeClass, tyExpr}: continue + if q.typ.kind notin {tyTypeDesc, tyGenericParam, tyExpr}+tyTypeClasses: + continue var s = newSym(skType, q.name, getCurrOwner(), q.info) s.flags = s.flags + {sfUsed, sfFromGeneric} var t = PType(IdTableGet(pt, q.typ)) @@ -193,7 +194,7 @@ proc fixupProcType(c: PContext, genericType: PType, if result == nil: return case genericType.kind - of tyGenericParam, tyTypeClass: + of tyGenericParam, tyTypeClasses: result = inst.concreteTypes[genericType.sym.position] of tyTypeDesc: result = inst.concreteTypes[genericType.sym.position] |