From fc7b3a7c2a223b04087426c3b7df9edc12ce1f03 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Sun, 9 Dec 2018 21:45:15 -0800 Subject: enhance `dump --dump.format:json` --- compiler/main.nim | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'compiler/main.nim') diff --git a/compiler/main.nim b/compiler/main.nim index 6afe57d87..fb8fe8443 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -266,11 +266,27 @@ proc mainCommand*(graph: ModuleGraph) = var libpaths = newJArray() for dir in conf.searchPaths: libpaths.elems.add(%dir.string) + var hints = block: # consider factoring with `listHints` + var ret = newJObject() + for a in hintMin..hintMax: + let key = lineinfos.HintsToStr[ord(a) - ord(hintMin)] + ret[key] = % (a in conf.notes) + ret + var warnings = block: # consider factoring with `listWarnings` + var ret = newJObject() + for a in warnMin..warnMax: + let key = lineinfos.WarningsToStr[ord(a) - ord(warnMin)] + ret[key] = % (a in conf.notes) + ret + var dumpdata = % [ (key: "version", val: %VersionAsString), (key: "project_path", val: %conf.projectFull.string), (key: "defined_symbols", val: definedSymbols), - (key: "lib_paths", val: libpaths) + (key: "lib_paths", val: %libpaths), + (key: "out", val: %conf.outFile.string), + (key: "hints", val: hints), + (key: "warnings", val: warnings), ] msgWriteln(conf, $dumpdata, {msgStdout, msgSkipHook}) -- cgit 1.4.1-2-gfad0 From 3695819018ca7c6b981313a2a7bf91b842f5207c Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Tue, 11 Dec 2018 22:06:15 +0100 Subject: cleanup main.nim's code style --- compiler/main.nim | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'compiler/main.nim') diff --git a/compiler/main.nim b/compiler/main.nim index fb8fe8443..4e28ed483 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -266,20 +266,16 @@ proc mainCommand*(graph: ModuleGraph) = var libpaths = newJArray() for dir in conf.searchPaths: libpaths.elems.add(%dir.string) - var hints = block: # consider factoring with `listHints` - var ret = newJObject() - for a in hintMin..hintMax: - let key = lineinfos.HintsToStr[ord(a) - ord(hintMin)] - ret[key] = % (a in conf.notes) - ret - var warnings = block: # consider factoring with `listWarnings` - var ret = newJObject() - for a in warnMin..warnMax: - let key = lineinfos.WarningsToStr[ord(a) - ord(warnMin)] - ret[key] = % (a in conf.notes) - ret - - var dumpdata = % [ + var hints = newJObject() # consider factoring with `listHints` + for a in hintMin..hintMax: + let key = lineinfos.HintsToStr[ord(a) - ord(hintMin)] + hints[key] = %(a in conf.notes) + var warnings = newJObject() + for a in warnMin..warnMax: + let key = lineinfos.WarningsToStr[ord(a) - ord(warnMin)] + warnings[key] = %(a in conf.notes) + + var dumpdata = %[ (key: "version", val: %VersionAsString), (key: "project_path", val: %conf.projectFull.string), (key: "defined_symbols", val: definedSymbols), -- cgit 1.4.1-2-gfad0