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

fixes #12874 (#12890)

Browse source 
* fixes #12874

* fixes introduced regressions
This commit is contained in:
Andreas Rumpf 2019-12-13 15:36:39 +01:00 • committed by GitHub
commit a0aa8fa857
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

50
lib/pure/sugar.nim
View file

@ -236,30 +236,37 @@ when (NimMajor, NimMinor) >= (1, 1):
proc transLastStmt(n, res, bracketExpr: NimNode): (NimNode, NimNode, NimNode) = proc transLastStmt(n, res, bracketExpr: NimNode): (NimNode, NimNode, NimNode) =
# Looks for the last statement of the last statement, etc... # Looks for the last statement of the last statement, etc...
case n.kind case n.kind
of nnkIfExpr, nnkIfStmt, nnkTryStmt, nnkCaseStmt:
result[0] = copyNimTree(n)
result[1] = copyNimTree(n)
result[2] = copyNimTree(n)
for i in ord(n.kind == nnkCaseStmt)..<n.len:
(result[0][i], result[1][^1], result[2][^1]) = transLastStmt(n[i], res, bracketExpr)
of nnkStmtList, nnkStmtListExpr, nnkBlockStmt, nnkBlockExpr, nnkWhileStmt, of nnkStmtList, nnkStmtListExpr, nnkBlockStmt, nnkBlockExpr, nnkWhileStmt,
nnkForStmt, nnkIfExpr, nnkIfStmt, nnkTryStmt, nnkCaseStmt, nnkForStmt, nnkElifBranch, nnkElse, nnkElifExpr, nnkOfBranch, nnkExceptBranch:
nnkElifBranch, nnkElse, nnkElifExpr:
result[0] = copyNimTree(n) result[0] = copyNimTree(n)
result[1] = copyNimTree(n) result[1] = copyNimTree(n)
result[2] = copyNimTree(n) result[2] = copyNimTree(n)
if n.len >= 1: if n.len >= 1:
(result[0][^1], result[1][^1], result[2][^1]) = transLastStmt(n[^1], res, (result[0][^1], result[1][^1], result[2][^1]) = transLastStmt(n[^1], res, bracketExpr)
bracketExpr)
of nnkTableConstr: of nnkTableConstr:
result[1] = n[0][0] result[1] = n[0][0]
result[2] = n[0][1] result[2] = n[0][1]
bracketExpr.add([newCall(bindSym"typeof", newEmptyNode()), newCall( if bracketExpr.len == 1:
bindSym"typeof", newEmptyNode())]) bracketExpr.add([newCall(bindSym"typeof", newEmptyNode()), newCall(
bindSym"typeof", newEmptyNode())])
template adder(res, k, v) = res[k] = v template adder(res, k, v) = res[k] = v
result[0] = getAst(adder(res, n[0][0], n[0][1])) result[0] = getAst(adder(res, n[0][0], n[0][1]))
of nnkCurly: of nnkCurly:
result[2] = n[0] result[2] = n[0]
bracketExpr.add(newCall(bindSym"typeof", newEmptyNode())) if bracketExpr.len == 1:
bracketExpr.add(newCall(bindSym"typeof", newEmptyNode()))
template adder(res, v) = res.incl(v) template adder(res, v) = res.incl(v)
result[0] = getAst(adder(res, n[0])) result[0] = getAst(adder(res, n[0]))
else: else:
result[2] = n result[2] = n
bracketExpr.add(newCall(bindSym"typeof", newEmptyNode())) if bracketExpr.len == 1:
bracketExpr.add(newCall(bindSym"typeof", newEmptyNode()))
template adder(res, v) = res.add(v) template adder(res, v) = res.add(v)
result[0] = getAst(adder(res, n)) result[0] = getAst(adder(res, n))
@ -347,3 +354,30 @@ when (NimMajor, NimMinor) >= (1, 1):
for (i, d) in data.pairs: for (i, d) in data.pairs:
if i mod 2 == 0: d if i mod 2 == 0: d
assert x == @["bird"] assert x == @["bird"]
# bug #12874
let bug1 = collect(
newSeq,
for (i, d) in data.pairs:(
block:
if i mod 2 == 0:
d
else:
d & d
)
)
assert bug1 == @["bird", "wordword"]
import strutils
let y = collect(newSeq):
for (i, d) in data.pairs:
try: parseInt(d) except: 0
assert y == @[0, 0]
let z = collect(newSeq):
for (i, d) in data.pairs:
case d
of "bird": "word"
else: d
assert z == @["word", "word"]