diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2015-02-01 01:30:38 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2015-02-01 01:30:38 +0100 |
| commit | f6131f412a89f7b7cb2a501fa23235a9259c165e (patch) | |
| tree | 0894b376e945e33bf7dd12ce2bc42049accc631d /compiler | |
| parent | 014be3a29c7c4691cde5b446a04fe522e008ea34 (diff) | |
| parent | 11292a9e0b2d614948c8b7cca780a1545a2cce34 (diff) | |
| download | Nim-f6131f412a89f7b7cb2a501fa23235a9259c165e.tar.gz | |
Merge pull request #2033 from reactormonk/round-in-js
Fixes #1959, rounding floats in JS
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jsgen.nim | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index c48bf8c91..beb84b00a 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -1448,9 +1448,18 @@ proc genConv(p: PProc, n: PNode, r: var TCompRes) = var dest = skipTypes(n.typ, abstractVarRange) var src = skipTypes(n.sons[1].typ, abstractVarRange) gen(p, n.sons[1], r) - if (dest.kind != src.kind) and (src.kind == tyBool): + if dest.kind == src.kind: + # no-op conversion + return + case dest.kind: + of tyBool: r.res = ropef("(($1)? 1:0)" | "toBool($#)", [r.res]) r.kind = resExpr + of tyInt: + r.res = ropef("($1|0)", [r.res]) + else: + # TODO: What types must we handle here? + discard proc upConv(p: PProc, n: PNode, r: var TCompRes) = gen(p, n.sons[0], r) # XXX |