Merge branch 'devel' of github.com:nim-lang/Nim into devel

2017-05-16 22:09:37 +02:00 · 2017-05-16 22:09:37 +02:00 · 943aaecbe7
commit 943aaecbe7
parent ac3e7edfe4 6599cae281
4 changed files with 34 additions and 24 deletions
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@ -982,6 +982,9 @@ proc semProcAnnotation(c: PContext, prc: PNode;
    var x = newNodeI(nkCall, n.info)
    x.add(newSymNode(m))
    prc.sons[pragmasPos] = copyExcept(n, i)
+    if prc[pragmasPos].kind != nkEmpty and prc[pragmasPos].len == 0:
+      prc.sons[pragmasPos] = emptyNode
+
    if it.kind == nkExprColonExpr:
      # pass pragma argument to the macro too:
      x.add(it.sons[1])