jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes most recent iterators-as-expressions regression

Browse source
This commit is contained in:
Andreas Rumpf 2018-01-18 18:57:29 +01:00
commit 33b0e73962
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/semstmts.nim
View file

@ -1169,7 +1169,7 @@ proc semProcAnnotation(c: PContext, prc: PNode;
for i in 1..<it.len: for i in 1..<it.len:
x.add(it.sons[i]) x.add(it.sons[i])
x.add(prc) x.add(prc)
# recursion assures that this works for multiple macro annotations too: # recursion assures that this works for multiple macro annotations too:
result = semExpr(c, x) result = semExpr(c, x)
# since a proc annotation can set pragmas, we process these here again. # since a proc annotation can set pragmas, we process these here again.
@ -1637,7 +1637,7 @@ proc semIterator(c: PContext, n: PNode): PNode =
# bug #7093: if after a macro transformation we don't have an # bug #7093: if after a macro transformation we don't have an
# nkIteratorDef aynmore, return. The iterator then might have been # nkIteratorDef aynmore, return. The iterator then might have been
# sem'checked already. (Or not, if the macro skips it.) # sem'checked already. (Or not, if the macro skips it.)
if result.kind != nkIteratorDef: return if result.kind != n.kind: return
var s = result.sons[namePos].sym var s = result.sons[namePos].sym
var t = s.typ var t = s.typ
if t.sons[0] == nil and s.typ.callConv != ccClosure: if t.sons[0] == nil and s.typ.callConv != ccClosure: