mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-05-01 11:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes a bug for 'dup' and 'with'; they can now handle nested statement lists that can result from macros

Browse Source
This commit is contained in:
Araq
2020-03-17 11:22:20 +01:00
parent 35d14095ed
commit b737bb4be0
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/std/private/underscored_calls.nim
View File

@@ -12,27 +12,38 @@
import macros
proc underscoredCall*(n, arg0: NimNode): NimNode =
proc underscoredCall(n, arg0: NimNode): NimNode =
proc underscorePos(n: NimNode): int =
for i in 1 ..< n.len:
if n[i].eqIdent("_"): return i
return -1
return 0
if n.kind in nnkCallKinds:
result = copyNimNode(n)
result.add n[0]
let u = underscorePos(n)
if u < 0:
result.add arg0
for i in 1..n.len-1: result.add n[i]
else:
for i in 1..u-1: result.add n[i]
result.add arg0
for i in u+1..n.len-1: result.add n[i]
for i in 1..u-1: result.add n[i]
result.add arg0
for i in u+1..n.len-1: result.add n[i]
else:
# handle e.g. 'x.dup(sort)'
result = newNimNode(nnkCall, n)
result.add n
result.add arg0
proc underscoredCalls*(result, calls, arg0: NimNode) =
proc handleStmtList(result, n, arg0: NimNode) =
for a in n:
if a.kind in {nnkStmtList, nnkStmtListExpr}:
handleStmtList(result, a, arg0)
else:
result.add underscoredCall(a, arg0)
expectKind calls, nnkArgList
if calls.len == 1 and calls[0].kind in {nnkStmtList, nnkStmtListExpr}:
# the 'macro: body' syntax is used:
handleStmtList(result, calls[0], arg0)
else:
for call in calls:
result.add underscoredCall(call, arg0)