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

improvements to addInt and $ for integer types (#18592)

Browse source 
* improvements to $(SomeInteger) and addInt
* remove mIntToStr, mInt64ToStr
* improvements
* fix tests/pragmas/tinjectstmt.nim; the diff is harmless, cgen code is identical with -d:danger or debug mode
* rm tests/system/tstrmantle.nim
* revert compiler/jsgen.nim for -d:nimVersion140
This commit is contained in:
Timothee Cour 2021-08-19 02:33:52 -07:00 • committed by GitHub
commit 394f4ac7bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 162 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

81
tests/system/tdollars.nim
View file

@ -102,40 +102,41 @@ block: # #14350, #16674, #16686 for JS
doAssert nil2 == cstring("")
block:
block:
let x = -1'i8
let y = uint32(x)
doAssert $y == "4294967295"
block:
let x = -1'i16
let y = uint32(x)
doAssert $y == "4294967295"
block:
let x = -1'i32
let y = uint32(x)
doAssert $y == "4294967295"
when defined(js): # bug #18591
let a1 = -1'i8
let a2 = uint8(a1)
# if `uint8(a1)` changes meaning to `cast[uint8](a1)` in future, update this test;
# until then, this is the correct semantics.
let a3 = $a2
doAssert a2 < 3
doAssert a3 == "-1"
proc intToStr(a: uint8): cstring {.importjs: "(# + \"\")".}
doAssert $intToStr(a2) == "-1"
else:
block:
let x = -1'i8
let y = uint32(x)
doAssert $y == "4294967295"
block:
let x = -1'i16
let y = uint32(x)
doAssert $y == "4294967295"
block:
let x = -1'i32
let y = uint32(x)
doAssert $y == "4294967295"
block:
proc foo1(arg: int): string =
let x = uint32(arg)
$x
doAssert $foo1(-1) == "4294967295"
block:
let x = 4294967295'u32
doAssert $x == "4294967295"
block:
doAssert $(4294967295'u32) == "4294967295"
block:
proc foo1(arg: int): string =
let x = uint32(arg)
$x
doAssert $foo1(-1) == "4294967295"
proc main()=
block:
let a = -0.0
@ -159,6 +160,32 @@ proc main()=
doAssert $uint32.high == "4294967295"
block: # addInt
var res = newStringOfCap(24)
template test2(a, b) =
res.setLen(0)
res.addInt a
doAssert res == b
for i in 0 .. 9:
res.addInt int64(i)
doAssert res == "0123456789"
res.setLen(0)
for i in -9 .. 0:
res.addInt int64(i)
doAssert res == "-9-8-7-6-5-4-3-2-10"
when not defined(js):
test2 high(int64), "9223372036854775807"
test2 low(int64), "-9223372036854775808"
test2 high(int32), "2147483647"
test2 low(int32), "-2147483648"
test2 high(int16), "32767"
test2 low(int16), "-32768"
test2 high(int8), "127"
test2 low(int8), "-128"
static: main()
main()

46
tests/system/tstrmantle.nim
View file

@ -1,46 +0,0 @@
var res = newStringOfCap(24)
for i in 0 .. 9:
res.addInt int64(i)
doAssert res == "0123456789"
res.setLen(0)
for i in -9 .. 0:
res.addInt int64(i)
doAssert res == "-9-8-7-6-5-4-3-2-10"
res.setLen(0)
res.addInt high(int64)
doAssert res == "9223372036854775807"
res.setLen(0)
res.addInt low(int64)
doAssert res == "-9223372036854775808"
res.setLen(0)
res.addInt high(int32)
doAssert res == "2147483647"
res.setLen(0)
res.addInt low(int32)
doAssert res == "-2147483648"
res.setLen(0)
res.addInt high(int16)
doAssert res == "32767"
res.setLen(0)
res.addInt low(int16)
doAssert res == "-32768"
res.setLen(0)
res.addInt high(int8)
doAssert res == "127"
res.setLen(0)
res.addInt low(int8)
doAssert res == "-128"