mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-05-23 13:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

s/match/find/g

Browse Source 
The implementation needs to match the API after all ;)
This commit is contained in:
Flaviu Tamas
2015-01-16 19:11:28 -05:00
parent ca3e72ee27
commit 1a5401ebcf
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nre.nim
View File

@@ -317,11 +317,7 @@ proc matchImpl(str: string, pattern: Regex, start, endpos: int, flags: int): Reg
raise newException(AssertionError, "Internal error: errno " & $execRet)
proc match*(str: string, pattern: Regex, start = 0, endpos = -1): RegexMatch =
## Returns a `RegexMatch` if there is a match between `start` and `endpos`, otherwise
## it returns nil.
##
## if `endpos == -1`, then `endpos = str.len`
return str.matchImpl(pattern, start, endpos, 0)
return str.matchImpl(pattern, start, endpos, pcre.ANCHORED)
iterator findIter*(str: string, pattern: Regex, start = 0, endpos = -1): RegexMatch =
# see pcredemo for explaination
@@ -364,10 +360,11 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = -1): RegexMa
yield currentMatch
proc find*(str: string, pattern: Regex, start = 0, endpos = -1): RegexMatch =
for match in str.findIter(pattern, start, endpos):
return match
return nil
## Returns a `RegexMatch` if there is a match between `start` and `endpos`, otherwise
## it returns nil.
##
## if `endpos == -1`, then `endpos = str.len`
return str.matchImpl(pattern, start, endpos, 0)
proc findAll*(str: string, pattern: Regex, start = 0, endpos = -1): seq[RegexMatch] =
accumulateResult(str.findIter(pattern, start, endpos))