diff options
| author | Araq <rumpf_a@web.de> | 2016-01-18 10:55:23 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-01-18 10:55:23 +0100 |
| commit | 55c1f3d30ce5d2ab8745ab2b98a38a605c690a54 (patch) | |
| tree | d729e8c0d7c929208c84450ad4a449e3eb32491e /compiler/jsgen.nim | |
| parent | 68cbb4d2b4bc408e13fc27e6d054e3a0bb98bfb4 (diff) | |
| parent | 2309975f782bf59b240e3874d5c31b4b299eca5d (diff) | |
| download | Nim-55c1f3d30ce5d2ab8745ab2b98a38a605c690a54.tar.gz | |
Merge branch 'devel' of https://github.com/nim-lang/Nim into devel
Diffstat (limited to 'compiler/jsgen.nim')
| -rw-r--r-- | compiler/jsgen.nim | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index f8bf35ed6..14cdf0174 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -931,7 +931,7 @@ proc isIndirect(v: PSym): bool = result = {sfAddrTaken, sfGlobal} * v.flags != {} and #(mapType(v.typ) != etyObject) and {sfImportc, sfVolatile, sfExportc} * v.flags == {} and - v.kind notin {skProc, skConverter, skMethod, skIterator, skClosureIterator, + v.kind notin {skProc, skConverter, skMethod, skIterator, skConst, skTemp, skLet} proc genAddr(p: PProc, n: PNode, r: var TCompRes) = @@ -1636,7 +1636,10 @@ proc gen(p: PProc, n: PNode, r: var TCompRes) = of nkSym: genSym(p, n, r) of nkCharLit..nkInt64Lit: - r.res = rope(n.intVal) + if n.typ.kind == tyBool: + r.res = if n.intVal == 0: rope"false" else: rope"true" + else: + r.res = rope(n.intVal) r.kind = resExpr of nkNilLit: if isEmptyType(n.typ): |