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

[nre]fix #17129 (#18632)

Browse source 
* fix #17129

* correct

* give reference implementaion links

* add comment

* typo

* I'm conservative

* change
This commit is contained in:
flywind 2021-08-09 01:27:43 +08:00 • committed by GitHub
commit 9269a72f6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/impure/nre.nim
View file

@ -539,7 +539,7 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = int.high): R
## Variants: ## Variants:
## ##
## - `proc findAll(...)` returns a `seq[string]` ## - `proc findAll(...)` returns a `seq[string]`
# see pcredemo for explanation # see pcredemo for explanation => https://www.pcre.org/original/doc/html/pcredemo.html
let matchesCrLf = pattern.matchesCrLf() let matchesCrLf = pattern.matchesCrLf()
let unicode = uint32(getinfo[culong](pattern, pcre.INFO_OPTIONS) and let unicode = uint32(getinfo[culong](pattern, pcre.INFO_OPTIONS) and
pcre.UTF8) > 0u32 pcre.UTF8) > 0u32
@ -560,7 +560,7 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = int.high): R
# either the end of the input or the string # either the end of the input or the string
# cannot be split here - we also need to bail # cannot be split here - we also need to bail
# if we've never matched and we've already tried to... # if we've never matched and we've already tried to...
if offset >= strlen or neverMatched: if flags == 0 or offset >= strlen or neverMatched: # All matches found
break break
if matchesCrLf and offset < (str.len - 1) and if matchesCrLf and offset < (str.len - 1) and
@ -576,7 +576,6 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = int.high): R
else: else:
neverMatched = false neverMatched = false
offset = match.get.matchBounds.b + 1 offset = match.get.matchBounds.b + 1
yield match.get yield match.get
proc find*(str: string, pattern: Regex, start = 0, endpos = int.high): Option[RegexMatch] = proc find*(str: string, pattern: Regex, start = 0, endpos = int.high): Option[RegexMatch] =