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

Revert "Remove Option from exec(Regex, string, int)"

Browse source 
This reverts commit f692042bb8.
This commit is contained in:
Flaviu Tamas 2015-01-10 18:00:07 -05:00
commit cc33942d89
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nre.nim
View file

@ -215,10 +215,7 @@ proc initRegex*(pattern: string, options = "Sx"): Regex =
result.captureNameToId = result.getNameToNumberTable() result.captureNameToId = result.getNameToNumberTable()
# }}} # }}}
proc exec*(self: Regex, str: string, start = 0): RegexMatch = proc exec*(self: Regex, str: string, start = 0): Option[RegexMatch] =
## Tries to match the regex on the string `str` starting at `start`.
## On fail, returns `nil`
## On success, returns RegexMatch
var result: RegexMatch var result: RegexMatch
new(result) new(result)
result.pattern = self result.pattern = self
@ -239,8 +236,8 @@ proc exec*(self: Regex, str: string, start = 0): RegexMatch =
cint(0), cint(0),
cast[ptr cint](addr result.pcreMatchBounds[0]), cint(vecsize)) cast[ptr cint](addr result.pcreMatchBounds[0]), cint(vecsize))
if execRet >= 0: if execRet >= 0:
return result return Some(result)
elif execRet == pcre.ERROR_NOMATCH: elif execRet == pcre.ERROR_NOMATCH:
return nil return None[RegexMatch]()
else: else:
raise newException(AssertionError, "Internal error: errno " & $execRet) raise newException(AssertionError, "Internal error: errno " & $execRet)