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

make tests green again

Browse source
This commit is contained in:
Araq 2017-11-01 00:20:40 +01:00
commit 3174cfe55c
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/strutils.nim
View file

@ -2434,7 +2434,8 @@ when isMainModule:
doAssert formatBiggestFloat(0.00000000001, ffScientific, 1, ',') in doAssert formatBiggestFloat(0.00000000001, ffScientific, 1, ',') in
["1,0e-11", "1,0e-011"] ["1,0e-11", "1,0e-011"]
# bug #6589 # bug #6589
doAssert formatFloat(123.456, ffScientific, precision=0) == "1.234560e+02" doAssert formatFloat(123.456, ffScientific, precision=0) in
["1.234560e+02", "1.234560e+002"]
doAssert "$# $3 $# $#" % ["a", "b", "c"] == "a c b c" doAssert "$# $3 $# $#" % ["a", "b", "c"] == "a c b c"
doAssert "${1}12 ${-1}$2" % ["a", "b"] == "a12 bb" doAssert "${1}12 ${-1}$2" % ["a", "b"] == "a12 bb"

2
tests/misc/tvarnums.nim
View file

@ -67,7 +67,7 @@ proc toNum64(b: TBuffer): int64 =
proc toNum(b: TBuffer): int32 = proc toNum(b: TBuffer): int32 =
# treat first byte different: # treat first byte different:
result = ze(b[0]) and 63 result = int32 ze(b[0]) and 63
var var
i = 0 i = 0
Shift = 6'i32 Shift = 6'i32

6
tests/stdlib/nre/captures.nim
View file

@ -32,7 +32,7 @@ suite "captures":
test "named capture bounds": test "named capture bounds":
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?")) let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
check(ex1.captureBounds["foo"] == some(0..2)) check(ex1.captureBounds["foo"] == some(0..2))
check(ex1.captureBounds["bar"] == none(Slice[int, int])) check(ex1.captureBounds["bar"] == none(Slice[int]))
test "capture count": test "capture count":
let ex1 = re("(?<foo>foo)(?<bar>bar)?") let ex1 = re("(?<foo>foo)(?<bar>bar)?")
@ -42,7 +42,7 @@ suite "captures":
test "named capture table": test "named capture table":
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?")) let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
check(ex1.captures.toTable == {"foo" : "foo", "bar" : nil}.toTable()) check(ex1.captures.toTable == {"foo" : "foo", "bar" : nil}.toTable())
check(ex1.captureBounds.toTable == {"foo" : some(0..2), "bar" : none(Slice[int, int])}.toTable()) check(ex1.captureBounds.toTable == {"foo" : some(0..2), "bar" : none(Slice[int])}.toTable())
check(ex1.captures.toTable("") == {"foo" : "foo", "bar" : ""}.toTable()) check(ex1.captures.toTable("") == {"foo" : "foo", "bar" : ""}.toTable())
let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?")) let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?"))
@ -51,7 +51,7 @@ suite "captures":
test "capture sequence": test "capture sequence":
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?")) let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
check(ex1.captures.toSeq == @["foo", nil]) check(ex1.captures.toSeq == @["foo", nil])
check(ex1.captureBounds.toSeq == @[some(0..2), none(Slice[int, int])]) check(ex1.captureBounds.toSeq == @[some(0..2), none(Slice[int])])
check(ex1.captures.toSeq("") == @["foo", ""]) check(ex1.captures.toSeq("") == @["foo", ""])
let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?")) let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?"))

2
tests/stdlib/nre/find.nim
View file

@ -12,7 +12,7 @@ suite "find":
test "find bounds": test "find bounds":
check(toSeq(findIter("1 2 3 4 5 ", re" ")).map( check(toSeq(findIter("1 2 3 4 5 ", re" ")).map(
proc (a: RegexMatch): Slice[int, int] = a.matchBounds proc (a: RegexMatch): Slice[int] = a.matchBounds
) == @[1..1, 3..3, 5..5, 7..7, 9..9]) ) == @[1..1, 3..3, 5..5, 7..7, 9..9])
test "overlapping find": test "overlapping find":

8
tests/vm/trgba.nim
View file

@ -24,12 +24,12 @@ template `A=`*(self: TAggRgba8, val: byte) =
proc ABGR*(val: int| int64): TAggRgba8 = proc ABGR*(val: int| int64): TAggRgba8 =
var V = val var V = val
result.R = V and 0xFF result.R = byte(V and 0xFF)
V = V shr 8 V = V shr 8
result.G = V and 0xFF result.G = byte(V and 0xFF)
V = V shr 8 V = V shr 8
result.B = V and 0xFF result.B = byte(V and 0xFF)
result.A = (V shr 8) and 0xFF result.A = byte((V shr 8) and 0xFF)
const const
c1 = ABGR(0xFF007F7F) c1 = ABGR(0xFF007F7F)