Merge pull request #1404 from def-/strutils-count
Add count procedures to strutils
This commit is contained in:
commit
43f78d2c4a
1 changed files with 35 additions and 0 deletions
|
|
@ -803,6 +803,36 @@ proc rfind*(s, sub: string, start: int = -1): int {.noSideEffect.} =
|
||||||
if result != -1: return
|
if result != -1: return
|
||||||
return -1
|
return -1
|
||||||
|
|
||||||
|
proc count*(s: string, sub: string, overlapping: bool = false): int {.noSideEffect,
|
||||||
|
rtl, extern: "nsuCountString".} =
|
||||||
|
## Count the occurences of a substring `sub` in the string `s`.
|
||||||
|
## Overlapping occurences of `sub` only count when `overlapping`
|
||||||
|
## is set to true.
|
||||||
|
var i = 0
|
||||||
|
while true:
|
||||||
|
i = s.find(sub, i)
|
||||||
|
if i < 0:
|
||||||
|
break
|
||||||
|
if overlapping:
|
||||||
|
inc i
|
||||||
|
else:
|
||||||
|
i += sub.len
|
||||||
|
inc result
|
||||||
|
|
||||||
|
proc count*(s: string, sub: char): int {.noSideEffect,
|
||||||
|
rtl, extern: "nsuCountChar".} =
|
||||||
|
## Count the occurences of the character `sub` in the string `s`.
|
||||||
|
for c in s:
|
||||||
|
if c == sub:
|
||||||
|
inc result
|
||||||
|
|
||||||
|
proc count*(s: string, subs: set[char]): int {.noSideEffect,
|
||||||
|
rtl, extern: "nsuCountCharSet".} =
|
||||||
|
## Count the occurences of the group of character `subs` in the string `s`.
|
||||||
|
for c in s:
|
||||||
|
if c in subs:
|
||||||
|
inc result
|
||||||
|
|
||||||
proc quoteIfContainsWhite*(s: string): string {.deprecated.} =
|
proc quoteIfContainsWhite*(s: string): string {.deprecated.} =
|
||||||
## Returns ``'"' & s & '"'`` if `s` contains a space and does not
|
## Returns ``'"' & s & '"'`` if `s` contains a space and does not
|
||||||
## start with a quote, else returns `s`.
|
## start with a quote, else returns `s`.
|
||||||
|
|
@ -1354,3 +1384,8 @@ when isMainModule:
|
||||||
doAssert parseEnum[TMyEnum]("enu_D") == enuD
|
doAssert parseEnum[TMyEnum]("enu_D") == enuD
|
||||||
|
|
||||||
doAssert parseEnum("invalid enum value", enC) == enC
|
doAssert parseEnum("invalid enum value", enC) == enC
|
||||||
|
|
||||||
|
doAssert count("foofoofoo", "foofoo") == 1
|
||||||
|
doAssert count("foofoofoo", "foofoo", overlapping = true) == 2
|
||||||
|
doAssert count("foofoofoo", 'f') == 3
|
||||||
|
doAssert count("foofoofoobar", {'f','b'}) == 4
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue