From 11292a9e0b2d614948c8b7cca780a1545a2cce34 Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Thu, 29 Jan 2015 05:30:55 -0600
Subject: Fixes #1959, rounding floats in JS

---
 compiler/jsgen.nim | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'compiler')

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
-- 
cgit 1.4.1-2-gfad0