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

updated nimgrep tool

Browse source
This commit is contained in:
Araq 2014-09-10 22:27:07 +02:00
commit 63c9c2877e
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/nimgrep.nim
View file

@ -81,14 +81,14 @@ proc countLines(s: string, first, last: int): int =
proc beforePattern(s: string, first: int): int =
result = first-1
while result >= 0:
if s[result] in Newlines: break
if s[result] in NewLines: break
dec(result)
inc(result)
proc afterPattern(s: string, last: int): int =
result = last+1
while result < s.len:
if s[result] in Newlines: break
if s[result] in NewLines: break
inc(result)
dec(result)
@ -125,12 +125,12 @@ proc processFile(filename: string) =
var buffer: string
try:
buffer = system.readFile(filename)
except EIO:
except IOError:
echo "cannot open file: ", filename
return
if optVerbose in options: stdout.writeln(filename)
var pegp: TPeg
var rep: TRegex
var rep: Regex
var result: string
if optRegex in options:
@ -267,7 +267,7 @@ proc checkOptions(subset: TOptions, a, b: string) =
for kind, key, val in getopt():
case kind
of cmdArgument:
if options.contains(optStdIn):
if options.contains(optStdin):
filenames.add(key)
elif pattern.len == 0:
pattern = key
@ -275,7 +275,7 @@ for kind, key, val in getopt():
replacement = key
else:
filenames.add(key)
of cmdLongOption, cmdShortOption:
of cmdLongoption, cmdShortOption:
case normalize(key)
of "find", "f": incl(options, optFind)
of "replace", "r": incl(options, optReplace)