Merge branch 'devel' into sighashes

2016-12-19 11:35:45 +01:00 · 2016-12-19 11:35:45 +01:00 · 237252f90c
commit 237252f90c
parent 24239c2361 c130a2af17
14 changed files with 115 additions and 25 deletions
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@ -369,6 +369,7 @@ proc semMacroExpr(c: PContext, n, nOrig: PNode, sym: PSym,
  result = evalMacroCall(c.module, c.cache, n, nOrig, sym)
  if efNoSemCheck notin flags:
    result = semAfterMacroCall(c, result, sym, flags)
+  result = wrapInComesFrom(nOrig.info, result)
  popInfoContext()

 proc forceBool(c: PContext, n: PNode): PNode =