Merge branch 'devel' into sighashes

2016-12-19 11:35:45 +01:00 · 2016-12-19 11:35:45 +01:00 · 237252f90c
commit 237252f90c
parent 24239c2361 c130a2af17
14 changed files with 115 additions and 25 deletions
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@ -172,7 +172,9 @@ proc sumGeneric(t: PType): int =
      inc result
    of tyGenericInvocation, tyTuple, tyProc:
      result += ord(t.kind == tyGenericInvocation)
-      for i in 0 .. <t.len: result += t.sons[i].sumGeneric
+      for i in 0 .. <t.len:
+        if t.sons[i] != nil:
+          result += t.sons[i].sumGeneric
      break
    of tyGenericParam, tyExpr, tyStatic, tyStmt: break
    of tyAlias: t = t.lastSon