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

nimgrep: change 2 iterators to closure

Browse source
This commit is contained in:
Andrey Makarov 2020-11-14 01:21:27 +03:00
commit edd84bd9bc
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tools/nimgrep.nim
View file

@ -998,7 +998,8 @@ proc hasRightDirectory(path: string, walkOptC: WalkOptComp[Pattern]): bool =
if dirname.contains(pat): return false if dirname.contains(pat): return false
result = true result = true
iterator walkDirBasic(dir: string, walkOptC: WalkOptComp[Pattern]): string = iterator walkDirBasic(dir: string, walkOptC: WalkOptComp[Pattern]): string
{.closure.} =
var dirStack = @[dir] # stack of directories var dirStack = @[dir] # stack of directories
var timeFiles = newSeq[(times.Time, string)]() var timeFiles = newSeq[(times.Time, string)]()
while dirStack.len > 0: while dirStack.len > 0:
@ -1040,7 +1041,8 @@ iterator walkDirBasic(dir: string, walkOptC: WalkOptComp[Pattern]): string =
for (_, file) in timeFiles: for (_, file) in timeFiles:
yield file yield file
iterator walkRec(paths: seq[string]): (string, string) = iterator walkRec(paths: seq[string]): tuple[error: string, filename: string]
{.closure.} =
declareCompiledPatterns(walkOptC, WalkOptComp): declareCompiledPatterns(walkOptC, WalkOptComp):
walkOptC.excludeFile.add walkOpt.excludeFile.compileArray() walkOptC.excludeFile.add walkOpt.excludeFile.compileArray()
walkOptC.includeFile.add walkOpt.includeFile.compileArray() walkOptC.includeFile.add walkOpt.includeFile.compileArray()
@ -1130,13 +1132,13 @@ proc run1Thread() =
processFileResult(searchOptC.pattern, "-", processFileResult(searchOptC.pattern, "-",
processFile(searchOptC, "-", processFile(searchOptC, "-",
yieldContents=optReplace in options)) yieldContents=optReplace in options))
for (err, filename) in walkRec(paths): for entry in walkRec(paths):
if err != "": if entry.error != "":
inc(gVar.errors) inc(gVar.errors)
printError (err & filename) printError (entry.error & entry.filename)
continue continue
processFileResult(searchOptC.pattern, filename, processFileResult(searchOptC.pattern, entry.filename,
processFile(searchOptC, filename, processFile(searchOptC, entry.filename,
yieldContents=optReplace in options)) yieldContents=optReplace in options))
# Multi-threaded version: all printing is being done in the Main thread. # Multi-threaded version: all printing is being done in the Main thread.
@ -1182,12 +1184,12 @@ proc pathProducer(arg: (seq[string], WalkOpt)) {.thread.} =
walkOpt = arg[1] # init thread-local copy of opt walkOpt = arg[1] # init thread-local copy of opt
var var
nextFileN = 0 nextFileN = 0
for (err, filename) in walkRec(paths): for entry in walkRec(paths):
if err == "": if entry.error == "":
searchRequestsChan.send((nextFileN,filename)) searchRequestsChan.send((nextFileN, entry.filename))
else: else:
resultsChan.send((false, nextFileN, resultsChan.send((false, nextFileN, entry.filename,
filename, @[Output(kind: openError, msg: err)])) @[Output(kind: openError, msg: entry.error)]))
nextFileN += 1 nextFileN += 1
resultsChan.send((true, nextFileN, "", @[])) # pass total number of files resultsChan.send((true, nextFileN, "", @[])) # pass total number of files