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

fixes #3872

Browse source
This commit is contained in:
Andreas Rumpf 2016-03-04 22:56:12 +01:00
commit 13699c596e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/vm.nim
View file

@ -1590,12 +1590,13 @@ proc evalMacroCall*(module: PSym, n, nOrig: PNode, sym: PSym): PNode =
for i in 1.. <sym.typ.len: for i in 1.. <sym.typ.len:
tos.slots[i] = setupMacroParam(n.sons[i], sym.typ.sons[i]) tos.slots[i] = setupMacroParam(n.sons[i], sym.typ.sons[i])
if sfImmediate notin sym.flags: let gp = sym.ast[genericParamsPos]
let gp = sym.ast[genericParamsPos] for i in 0 .. <gp.len:
for i in 0 .. <gp.len: if sfImmediate notin sym.flags:
let idx = sym.typ.len + i let idx = sym.typ.len + i
tos.slots[idx] = setupMacroParam(n.sons[idx], gp[i].sym.typ) tos.slots[idx] = setupMacroParam(n.sons[idx], gp[i].sym.typ)
elif gp[i].sym.typ.kind in {tyStatic, tyTypeDesc}:
globalError(n.info, "static[T] or typedesc nor supported for .immediate macros")
# temporary storage: # temporary storage:
#for i in L .. <maxSlots: tos.slots[i] = newNode(nkEmpty) #for i in L .. <maxSlots: tos.slots[i] = newNode(nkEmpty)
result = rawExecute(c, start, tos).regToNode result = rawExecute(c, start, tos).regToNode