diff options
| author | Araq <rumpf_a@web.de> | 2015-04-26 11:14:45 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2015-04-26 22:44:05 +0200 |
| commit | 22b5f4df545fd1f096a4f30aaec5b827e9e6b422 (patch) | |
| tree | eb5132e0408c1b3bb4542f380aaf5b973bf4a195 /compiler | |
| parent | 1cb14f888a4534d8e71f1fb9a64ba172558e138e (diff) | |
| download | Nim-22b5f4df545fd1f096a4f30aaec5b827e9e6b422.tar.gz | |
fixes #2603
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/semmacrosanity.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/semmacrosanity.nim b/compiler/semmacrosanity.nim index 2ef7a54e7..bb9814a16 100644 --- a/compiler/semmacrosanity.nim +++ b/compiler/semmacrosanity.nim @@ -16,9 +16,9 @@ proc ithField(n: PNode, field: int): PSym = result = nil case n.kind of nkRecList: - for i in countup(0, sonsLen(n) - 1): + for i in countup(0, sonsLen(n) - 1): result = ithField(n.sons[i], field-i) - if result != nil: return + if result != nil: return of nkRecCase: if n.sons[0].kind != nkSym: internalError(n.info, "ithField") result = ithField(n.sons[0], field-1) @@ -34,7 +34,7 @@ proc ithField(n: PNode, field: int): PSym = else: discard proc annotateType*(n: PNode, t: PType) = - let x = t.skipTypes(abstractInst) + let x = t.skipTypes(abstractInst+{tyRange}) # Note: x can be unequal to t and we need to be careful to use 't' # to not to skip tyGenericInst case n.kind @@ -80,7 +80,7 @@ proc annotateType*(n: PNode, t: PType) = if x.kind in {tyString, tyCString}: n.typ = t else: - globalError(n.info, "string literal must be of some string type") + globalError(n.info, "string literal must be of some string type") of nkNilLit: if x.kind in NilableTypes: n.typ = t |