summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-01-26 15:48:51 -0800
committerAraq <rumpf_a@web.de>2013-01-26 15:48:51 -0800
commit76ed657c9bea39ba0aa7445b20921437685c9292 (patch)
tree17724b91d3f9d7ec477f2fa695d4e40852971a1e
parent0a5344b595f0617d9da2be9d3f0f909e9337b517 (diff)
parent0ba7da62ddf431800221edd3611d1673724cd8d2 (diff)
downloadNim-76ed657c9bea39ba0aa7445b20921437685c9292.tar.gz
Merge pull request #320 from Tass/master
Fix for the import bug in JS
-rwxr-xr-xcompiler/ecmasgen.nim2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ecmasgen.nim b/compiler/ecmasgen.nim
index f3f716a01..6ecda9a7c 100755
--- a/compiler/ecmasgen.nim
+++ b/compiler/ecmasgen.nim
@@ -959,7 +959,7 @@ proc genSym(p: var TProc, n: PNode, r: var TCompRes) =
   of skProc, skConverter, skMethod:
     discard mangleName(s)
     r.res = s.loc.r
-    if lfNoDecl in s.loc.flags or s.magic != mNone or isGenericRoutine(s): nil
+    if lfNoDecl in s.loc.flags or s.magic != mNone or isGenericRoutine(s) or {sfImportc, sfInfixCall} * s.flags != {}: nil
     elif s.kind == skMethod and s.getBody.kind == nkEmpty:
       # we cannot produce code for the dispatcher yet:
       nil