remove isCmdLine; use passCmd1

nim-lang · Feb 26, 2020 · cd4f6de · cd4f6de
1 parent 8a3eb98
commit cd4f6de
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim
@@ -27,9 +27,7 @@ proc initDefinesProg*(self: NimProg, conf: ConfigRef, name: string) =
   defineSymbol conf.symbols, name
 
 proc processCmdLineAndProjectPath*(self: NimProg, conf: ConfigRef) =
-  conf.isCmdLine = true
   self.processCmdLine(passCmd1, "", conf)
-  conf.isCmdLine = false
   if self.supportsStdinFile and conf.projectName == "-":
     handleStdinInput(conf)
   elif conf.projectName != "":

diff --git a/compiler/commands.nim b/compiler/commands.nim
@@ -204,15 +204,15 @@ proc processSpecificNote*(arg: string, state: TSpecialWord, pass: TCmdLinePass,
     incl(conf.notes, n)
     incl(conf.mainPackageNotes, n)
     incl(conf.enableNotes, n)
-    if conf.isCmdLine:
+    if pass == passCmd1:
       incl(conf.cmdLineNotes, n)
       excl(conf.cmdLineDisabledNotes, n)
   of "off":
     excl(conf.notes, n)
     excl(conf.mainPackageNotes, n)
     incl(conf.disableNotes, n)
     excl(conf.foreignPackageNotes, n)
-    if conf.isCmdLine:
+    if pass == passCmd1:
       incl(conf.cmdLineDisabledNotes, n)
       excl(conf.cmdLineNotes, n)
   else: localError(conf, info, errOnOrOffExpectedButXFound % arg)

diff --git a/compiler/options.nim b/compiler/options.nim
@@ -288,7 +288,6 @@ type
     structuredErrorHook*: proc (config: ConfigRef; info: TLineInfo; msg: string;
                                 severity: Severity) {.closure, gcsafe.}
     cppCustomNamespace*: string
-    isCmdLine*: bool # whether we are currently processing cmdline args, not cfg files
 
 proc hasHint*(conf: ConfigRef, note: TNoteKind): bool =
   optHints in conf.options and note in conf.notes
@@ -394,7 +393,6 @@ proc newConfigRef*(): ConfigRef =
     arguments: "",
     suggestMaxResults: 10_000,
     maxLoopIterationsVM: 10_000_000,
-    isCmdLine: false,
   )
   setTargetFromSystem(result.target)
   # enable colors by default on terminals