jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #1959, rounding floats in JS

Browse source
This commit is contained in:
Simon Hafner 2015-01-29 05:30:55 -06:00
commit 11292a9e0b
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/jsgen.nim
View file

@ -1448,9 +1448,18 @@ proc genConv(p: PProc, n: PNode, r: var TCompRes) =
var dest = skipTypes(n.typ, abstractVarRange) var dest = skipTypes(n.typ, abstractVarRange)
var src = skipTypes(n.sons[1].typ, abstractVarRange) var src = skipTypes(n.sons[1].typ, abstractVarRange)
gen(p, n.sons[1], r) 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.res = ropef("(($1)? 1:0)" | "toBool($#)", [r.res])
r.kind = resExpr 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) = proc upConv(p: PProc, n: PNode, r: var TCompRes) =
gen(p, n.sons[0], r) # XXX gen(p, n.sons[0], r) # XXX

7
tests/js/tfloatround.nim Normal file
View file

@ -0,0 +1,7 @@
discard """
output: '''
3
'''
"""
echo int(22 / 7)