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

fix #13528 nimgrep --word now works better with operators (#13537)

Browse source
This commit is contained in:
Timothee Cour 2020-03-02 08:55:17 -08:00 • committed by GitHub
commit 27241fda23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/nimgrep.nim
View file

@ -649,7 +649,8 @@ else:
if optIgnoreStyle in options: if optIgnoreStyle in options:
pattern = styleInsensitive(pattern) pattern = styleInsensitive(pattern)
if optWord in options: if optWord in options:
pattern = r"\b(:?" & pattern & r")\b" # see https://github.com/nim-lang/Nim/issues/13528#issuecomment-592786443
pattern = r"(^|\W)(:?" & pattern & r")($|\W)"
if {optIgnoreCase, optIgnoreStyle} * options != {}: if {optIgnoreCase, optIgnoreStyle} * options != {}:
reflags.incl reIgnoreCase reflags.incl reIgnoreCase
let rep = if optRex in options: rex(pattern, reflags) let rep = if optRex in options: rex(pattern, reflags)