diff options
author | Araq <rumpf_a@web.de> | 2018-01-03 13:24:44 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-01-03 13:24:44 +0100 |
commit | 9abbd6c880a2326bf152641bf28515aebbc2da1a (patch) | |
tree | 973d71a7235057ccfcef61fac918e41c0cf9cb82 /compiler | |
parent | e593fef3206c359344c93bf7a3716da644f1906f (diff) | |
parent | bbfe6e81ad9a09fc57710809d5325e13a8c95cbe (diff) | |
download | Nim-9abbd6c880a2326bf152641bf28515aebbc2da1a.tar.gz |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/jsgen.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index 65a6a5dae..dac2de746 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -2051,10 +2051,10 @@ proc genConv(p: PProc, n: PNode, r: var TCompRes) = return case dest.kind: of tyBool: - r.res = "(($1)? 1:0)" % [r.res] + r.res = "(!!($1))" % [r.res] r.kind = resExpr of tyInt: - r.res = "($1|0)" % [r.res] + r.res = "(($1)|0)" % [r.res] else: # TODO: What types must we handle here? discard |