mirror of
https://github.com/nim-lang/Nim.git
synced 2026-08-27 09:01:37 +00:00
make tests green again
This commit is contained in:
@@ -67,7 +67,7 @@ proc toNum64(b: TBuffer): int64 =
|
||||
|
||||
proc toNum(b: TBuffer): int32 =
|
||||
# treat first byte different:
|
||||
result = ze(b[0]) and 63
|
||||
result = int32 ze(b[0]) and 63
|
||||
var
|
||||
i = 0
|
||||
Shift = 6'i32
|
||||
|
||||
@@ -32,7 +32,7 @@ suite "captures":
|
||||
test "named capture bounds":
|
||||
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
|
||||
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":
|
||||
let ex1 = re("(?<foo>foo)(?<bar>bar)?")
|
||||
@@ -42,7 +42,7 @@ suite "captures":
|
||||
test "named capture table":
|
||||
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
|
||||
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())
|
||||
|
||||
let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?"))
|
||||
@@ -51,7 +51,7 @@ suite "captures":
|
||||
test "capture sequence":
|
||||
let ex1 = "foo".find(re("(?<foo>foo)(?<bar>bar)?"))
|
||||
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", ""])
|
||||
|
||||
let ex2 = "foobar".find(re("(?<foo>foo)(?<bar>bar)?"))
|
||||
|
||||
@@ -12,7 +12,7 @@ suite "find":
|
||||
|
||||
test "find bounds":
|
||||
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])
|
||||
|
||||
test "overlapping find":
|
||||
|
||||
@@ -3,9 +3,9 @@ discard """
|
||||
"""
|
||||
|
||||
doAssert "@[23, 45]" == $(@[23, 45])
|
||||
doAssert "[32, 45]" == $([32, 45])
|
||||
doAssert "[32, 45]" == $([32, 45])
|
||||
doAssert "@[, foo, bar]" == $(@["", "foo", "bar"])
|
||||
doAssert "[, foo, bar]" == $(["", "foo", "bar"])
|
||||
doAssert "[, foo, bar]" == $(["", "foo", "bar"])
|
||||
|
||||
# bug #2395
|
||||
let alphaSet: set[char] = {'a'..'c'}
|
||||
|
||||
@@ -22,14 +22,14 @@ template `B=`*(self: TAggRgba8, val: byte) =
|
||||
template `A=`*(self: TAggRgba8, val: byte) =
|
||||
self[3] = val
|
||||
|
||||
proc ABGR* (val: int| int64): TAggRgba8 =
|
||||
proc ABGR*(val: int| int64): TAggRgba8 =
|
||||
var V = val
|
||||
result.R = V and 0xFF
|
||||
result.R = byte(V and 0xFF)
|
||||
V = V shr 8
|
||||
result.G = V and 0xFF
|
||||
result.G = byte(V and 0xFF)
|
||||
V = V shr 8
|
||||
result.B = V and 0xFF
|
||||
result.A = (V shr 8) and 0xFF
|
||||
result.B = byte(V and 0xFF)
|
||||
result.A = byte((V shr 8) and 0xFF)
|
||||
|
||||
const
|
||||
c1 = ABGR(0xFF007F7F)
|
||||
|
||||
Reference in New Issue
Block a user