From abec8823aa84ab9bd11fc100cfa8c4cf3df3f37b Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Tue, 14 Nov 2017 23:26:35 +0100
Subject: [PATCH] bugfix: make 'macros' module available for nimscript

---
 compiler/vmgen.nim        | 6 +++---
 tests/test_nimscript.nims | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index b869be1133..8f0c72e454 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -1773,8 +1773,8 @@ proc gen(c: PCtx; n: PNode; dest: var TDest; flags: TGenFlags = {}) =
   of nkAddr, nkHiddenAddr: genAddrDeref(c, n, dest, opcAddrNode, flags)
   of nkIfStmt, nkIfExpr: genIf(c, n, dest)
   of nkWhenStmt:
-      # This is "when nimvm" node. Chose the first branch.
-      gen(c, n.sons[0].sons[1], dest)
+    # This is "when nimvm" node. Chose the first branch.
+    gen(c, n.sons[0].sons[1], dest)
   of nkCaseStmt: genCase(c, n, dest)
   of nkWhileStmt:
     unused(n, dest)
@@ -1810,7 +1810,7 @@ proc gen(c: PCtx; n: PNode; dest: var TDest; flags: TGenFlags = {}) =
   of nkVarSection, nkLetSection:
     unused(n, dest)
     genVarSection(c, n)
-  of declarativeDefs:
+  of declarativeDefs, nkMacroDef:
     unused(n, dest)
   of nkLambdaKinds:
     #let s = n.sons[namePos].sym
diff --git a/tests/test_nimscript.nims b/tests/test_nimscript.nims
index 2500bac738..d3eb9808e0 100644
--- a/tests/test_nimscript.nims
+++ b/tests/test_nimscript.nims
@@ -21,5 +21,6 @@ import subexes
 import tables
 import unicode
 import uri
+import macros
 
 echo "Nimscript imports are successful."