diff options
| author | Araq <rumpf_a@web.de> | 2013-09-24 21:45:22 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-09-24 21:45:22 +0200 |
| commit | e3ecc328a19386142b13f3ef1cc801e7c158235f (patch) | |
| tree | ab5c61609694f6a57afadb6b7d58faeee4d17b67 /compiler | |
| parent | 8b5aa221adc9946894225dc569bac9d2d8bdde6d (diff) | |
| download | Nim-e3ecc328a19386142b13f3ef1cc801e7c158235f.tar.gz | |
fixes #593
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/importer.nim | 5 | ||||
| -rw-r--r-- | compiler/jsgen.nim | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/compiler/importer.nim b/compiler/importer.nim index 077e5e0c9..54ffb1947 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -38,12 +38,11 @@ proc getModuleName*(n: PNode): string = # hacky way to implement 'x / y /../ z': result = renderTree(n, {renderNoComments}).replace(" ") of nkDotExpr: - result = renderTree(n, {renderNoComments}).replace(".") + result = renderTree(n, {renderNoComments}).replace(".", "/") of nkImportAs: result = getModuleName(n.sons[0]) else: - localError(n.info, errGenerated, - "invalid module name: '$1'" % renderTree(n)) + localError(n.info, errGenerated, "invalid module name: '$1'" % n.renderTree) result = "" proc checkModuleName*(n: PNode): int32 = diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index fc186c379..8f5ef4bce 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -984,7 +984,7 @@ proc genSym(p: PProc, 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) or + if lfNoDecl in s.loc.flags or s.magic != mNone or {sfImportc, sfInfixCall} * s.flags != {}: nil elif s.kind == skMethod and s.getBody.kind == nkEmpty: @@ -1583,7 +1583,7 @@ proc gen(p: PProc, n: PNode, r: var TCompRes) = let s = n.sons[namePos].sym 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: nil elif not p.g.generatedSyms.containsOrIncl(s.id): app(p.locals, genProc(p, s)) of nkMetaNode: gen(p, n.sons[0], r) |