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

Fix result shadowing warning

Browse source
This commit is contained in:
Flaviu Tamas 2015-04-10 14:01:05 -04:00
commit 4b42ddfdfa
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/nre.nim
View file

@ -302,14 +302,14 @@ proc re*(pattern: string, options = ""): Regex = initRegex(pattern, options)
# Operations {{{ # Operations {{{
proc matchImpl(str: string, pattern: Regex, start, endpos: int, flags: int): Option[RegexMatch] = proc matchImpl(str: string, pattern: Regex, start, endpos: int, flags: int): Option[RegexMatch] =
var result = RegexMatch(pattern : pattern, str : str) var myResult = RegexMatch(pattern : pattern, str : str)
# See PCRE man pages. # See PCRE man pages.
# 2x capture count to make room for start-end pairs # 2x capture count to make room for start-end pairs
# 1x capture count as slack space for PCRE # 1x capture count as slack space for PCRE
let vecsize = (pattern.captureCount() + 1) * 3 let vecsize = (pattern.captureCount() + 1) * 3
# div 2 because each element is 2 cints long # div 2 because each element is 2 cints long
result.pcreMatchBounds = newSeq[Slice[cint]](ceil(vecsize / 2).int) myResult.pcreMatchBounds = newSeq[Slice[cint]](ceil(vecsize / 2).int)
result.pcreMatchBounds.setLen(vecsize div 3) myResult.pcreMatchBounds.setLen(vecsize div 3)
let strlen = if endpos == int.high: str.len else: endpos+1 let strlen = if endpos == int.high: str.len else: endpos+1
doAssert(strlen <= str.len) # don't want buffer overflows doAssert(strlen <= str.len) # don't want buffer overflows
@ -320,10 +320,10 @@ proc matchImpl(str: string, pattern: Regex, start, endpos: int, flags: int): Opt
cint(strlen), cint(strlen),
cint(start), cint(start),
cint(flags), cint(flags),
cast[ptr cint](addr result.pcreMatchBounds[0]), cast[ptr cint](addr myResult.pcreMatchBounds[0]),
cint(vecsize)) cint(vecsize))
if execRet >= 0: if execRet >= 0:
return Some(result) return Some(myResult)
elif execRet == pcre.ERROR_NOMATCH: elif execRet == pcre.ERROR_NOMATCH:
return None[RegexMatch]() return None[RegexMatch]()
else: else: