diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2015-06-30 17:54:39 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2015-06-30 17:54:39 +0200 |
| commit | 2f9ad55fbdaea5e9746e868a765c2a154a983f6f (patch) | |
| tree | 2924610260e55f741811643d7d9b6ec9f891f636 /compiler | |
| parent | e9afddcb0d38a18bc321e9e85fdb3a8a0c1e3880 (diff) | |
| parent | 1a14e9d366799181f7d04ea3572c8b9052607584 (diff) | |
| download | Nim-2f9ad55fbdaea5e9746e868a765c2a154a983f6f.tar.gz | |
Merge pull request #3025 from r-ku/3022_fix
Fixes #3022
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/sigmatch.nim | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index 40836a94d..97a059dbe 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -158,11 +158,15 @@ proc sumGeneric(t: PType): int = t = t.sons[0] inc result inc isvar + of tyTypeDesc: + t = t.lastSon + if t.kind == tyEmpty: break + inc result of tyGenericInvocation, tyTuple: result += ord(t.kind == tyGenericInvocation) for i in 0 .. <t.len: result += t.sons[i].sumGeneric break - of tyGenericParam, tyExpr, tyStatic, tyStmt, tyTypeDesc: break + of tyGenericParam, tyExpr, tyStatic, tyStmt: break of tyBool, tyChar, tyEnum, tyObject, tyProc, tyPointer, tyString, tyCString, tyInt..tyInt64, tyFloat..tyFloat128, tyUInt..tyUInt64: |