diff options
| author | Daniil Yarancev <21169548+Yardanico@users.noreply.github.com> | 2018-01-07 21:02:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 21:02:00 +0300 |
| commit | fb44c522e6173528efa8035ecc459c84887d0167 (patch) | |
| tree | a2f5e98606be265981a5f72748896967033e23d7 /tools | |
| parent | ccf99fa5ce4fe992fb80dc89271faa51456c3fa5 (diff) | |
| parent | e23ea64c41e101d4e1d933f0b015f51cc6c2f7de (diff) | |
| download | Nim-fb44c522e6173528efa8035ecc459c84887d0167.tar.gz | |
Merge pull request #1 from nim-lang/devel
upstream
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/finish.nim | 2 | ||||
| -rw-r--r-- | tools/nimgrep.nim | 46 | ||||
| -rw-r--r-- | tools/niminst/buildsh.tmpl | 2 | ||||
| -rw-r--r-- | tools/niminst/makefile.tmpl | 61 | ||||
| -rw-r--r-- | tools/niminst/niminst.nim | 2 | ||||
| -rw-r--r-- | tools/nimpretty.nim | 5 | ||||
| -rw-r--r-- | tools/nimresolve.nim | 158 | ||||
| -rw-r--r-- | tools/nimweb.nim | 4 |
8 files changed, 60 insertions, 220 deletions
diff --git a/tools/finish.nim b/tools/finish.nim index 45d7dd3a8..207f15f76 100644 --- a/tools/finish.nim +++ b/tools/finish.nim @@ -32,7 +32,7 @@ proc downloadMingw(): DownloadResult = let curl = findExe"curl" var cmd: string if curl.len > 0: - cmd = curl & " --out " & "dist" / mingw & " " & url + cmd = quoteShell(curl) & " --out " & "dist" / mingw & " " & url elif fileExists"bin/nimgrab.exe": cmd = "bin/nimgrab.exe " & url & " dist" / mingw if cmd.len > 0: diff --git a/tools/nimgrep.nim b/tools/nimgrep.nim index 8dff722ec..e9c1b26fa 100644 --- a/tools/nimgrep.nim +++ b/tools/nimgrep.nim @@ -45,6 +45,9 @@ type TOptions = set[TOption] TConfirmEnum = enum ceAbort, ceYes, ceAll, ceNo, ceNone + Pattern = Regex | Peg + +using pattern: Pattern var filenames: seq[string] = @[] @@ -118,7 +121,7 @@ proc highlight(s, match, repl: string, t: tuple[first, last: int], stdout.write("\n") stdout.flushFile() -proc processFile(filename: string) = +proc processFile(pattern; filename: string) = var filenameShown = false template beforeHighlight = if not filenameShown and optVerbose notin options: @@ -135,18 +138,8 @@ proc processFile(filename: string) = if optVerbose in options: ode> |