summary refs log tree commit diff stats
path: root/compiler/vm.nim
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-09-24 16:07:07 +0200
committerAraq <rumpf_a@web.de>2013-09-24 16:07:07 +0200
commit8b5aa221adc9946894225dc569bac9d2d8bdde6d (patch)
tree4affd857c41c15ed3ba4e0d2c210b69f30664489 /compiler/vm.nim
parent83584bf88934c45ce10e770ee15d070a09f88f45 (diff)
downloadNim-8b5aa221adc9946894225dc569bac9d2d8bdde6d.tar.gz
support for multiple modules of the same name; niminst supports 'platforms'; minor bugfixes
Diffstat (limited to 'compiler/vm.nim')
-rw-r--r--compiler/vm.nim2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/vm.nim b/compiler/vm.nim
index e13d91e77..d5a816e53 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -890,7 +890,7 @@ proc evalStaticExpr*(module: PSym, e: PNode, prc: PSym): PNode =
 
 proc setupMacroParam(x: PNode): PNode =
   result = x
-  if result.kind == nkHiddenStdConv: result = result.sons[1]
+  if result.kind in {nkHiddenSubConv, nkHiddenStdConv}: result = result.sons[1]
 
 proc evalMacroCall(c: PEvalContext, n, nOrig: PNode, sym: PSym): PNode =
   # XXX GlobalError() is ugly here, but I don't know a better solution for now