diff options
| -rw-r--r-- | compiler/ast.nim | 1 | ||||
| -rw-r--r-- | compiler/commands.nim | 3 | ||||
| -rw-r--r-- | compiler/msgs.nim | 1 | ||||
| -rw-r--r-- | compiler/scriptconfig.nim | 1 | ||||
| -rw-r--r-- | config/nim.cfg | 9 | ||||
| -rw-r--r-- | tests/newconfig/tfoo.nims | 2 |
6 files changed, 5 insertions, 12 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 2b4de75cc..5d587f35a 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -965,7 +965,6 @@ const var ggDebug* {.deprecated.}: bool ## convenience switch for trying out things var gMainPackageId*: int - gMainPackageNotes*: TNoteKinds proc isCallExpr*(n: PNode): bool = result = n.kind in nkCallKinds diff --git a/compiler/commands.nim b/compiler/commands.nim index 22512c563..b468dd6b8 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -181,9 +181,11 @@ proc processSpecificNote*(arg: string, state: TSpecialWord, pass: TCmdLinePass, case whichKeyword(substr(arg, i)) of wOn: incl(gNotes, n) + incl(gMainPackageNotes, n) incl(enableNotes, n) of wOff: excl(gNotes, n) + excl(gMainPackageNotes, n) incl(disableNotes, n) excl(ForeignPackageNotes, n) else: localError(info, errOnOrOffExpectedButXFound, arg) @@ -548,6 +550,7 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo) = gNotes = NotesVerbosity[gVerbosity] incl(gNotes, enableNotes) excl(gNotes, disableNotes) + gMainPackageNotes = gNotes of "parallelbuild": expectArg(switch, arg, pass, info) gNumberOfProcessors = parseInt(arg) diff --git a/compiler/msgs.nim b/compiler/msgs.nim index 098370e41..03a63483d 100644 --- a/compiler/msgs.nim +++ b/compiler/msgs.nim @@ -621,6 +621,7 @@ var gHintCounter*: int = 0 gWarnCounter*: int = 0 gErrorMax*: int = 1 # stop after gErrorMax errors + gMainPackageNotes*: TNoteKinds = NotesVerbosity[1] proc unknownLineInfo*(): TLineInfo = result.line = int16(-1) diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim index 1d34cd2be..dcb92227d 100644 --- a/compiler/scriptconfig.nim +++ b/compiler/scriptconfig.nim @@ -155,4 +155,3 @@ proc runNimScript*(scriptName: string; freshDefines=true) = #initDefines() undefSymbol("nimscript") undefSymbol("nimconfig") - gMainPackageNotes = {} diff --git a/config/nim.cfg b/config/nim.cfg index 93b847784..0cc014a93 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -23,10 +23,6 @@ arm.linux.gcc.linkerexe = "arm-linux-gcc" mips.linux.gcc.exe = "mips-openwrt-linux-gcc" mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -@if not nimfix: - cs:partial -@end - path="$lib/deprecated/core" path="$lib/deprecated/pure" path="$lib/pure/collections" @@ -168,10 +164,5 @@ vcc.options.always = "/nologo" vcc.options.speed = "/O2 /arch:SSE2" vcc.options.size = "/O1" -# Configuration for the Digital Mars C/C++ compiler: -@if windows: - dmc.path = r"$nimrod\dist\dm\bin" -@end - # Configuration for the Tiny C Compiler: tcc.options.always = "-w" diff --git a/tests/newconfig/tfoo.nims b/tests/newconfig/tfoo.nims index f87aba619..057c0ed92 100644 --- a/tests/newconfig/tfoo.nims +++ b/tests/newconfig/tfoo.nims @@ -10,7 +10,7 @@ import ospaths warning("uninit", off) hint("processing", off) - +#--verbosity:2 patchFile("stdlib", "math", "mymath") task listDirs, "lists every subdirectory": |