Deprecate when declared(echo):echo (#13840)

compiler/astalgo.nim

@@ -24,14 +24,14 @@ proc typeToYaml*(conf: ConfigRef; n: PType, indent: int = 0, maxRecDepth: int =
 proc symToYaml*(conf: ConfigRef; n: PSym, indent: int = 0, maxRecDepth: int = - 1): Rope
 proc lineInfoToStr*(conf: ConfigRef; info: TLineInfo): Rope
 
-when declared(echo):
-  # these are for debugging only: They are not really deprecated, but I want
-  # the warning so that release versions do not contain debugging statements:
-  proc debug*(n: PSym; conf: ConfigRef = nil) {.exportc: "debugSym", deprecated.}
-  proc debug*(n: PType; conf: ConfigRef = nil) {.exportc: "debugType", deprecated.}
-  proc debug*(n: PNode; conf: ConfigRef = nil) {.exportc: "debugNode", deprecated.}
 
-  proc typekinds*(t: PType) {.deprecated.} =
+# these are for debugging only: They are not really deprecated, but I want
+# the warning so that release versions do not contain debugging statements:
+proc debug*(n: PSym; conf: ConfigRef = nil) {.exportc: "debugSym", deprecated.}
+proc debug*(n: PType; conf: ConfigRef = nil) {.exportc: "debugType", deprecated.}
+proc debug*(n: PNode; conf: ConfigRef = nil) {.exportc: "debugNode", deprecated.}
+
+proc typekinds*(t: PType) {.deprecated.} =
   var t = t
   var s = ""
   while t != nil and t.len > 0:
@@ -40,7 +40,7 @@ when declared(echo):
     t = t.lastSon
   echo s
 
-  template debug*(x: PSym|PType|PNode) {.deprecated.} =
+template debug*(x: PSym|PType|PNode) {.deprecated.} =
   when compiles(c.config):
     debug(c.config, x)
   elif compiles(c.graph.config):
@@ -48,10 +48,10 @@ when declared(echo):
   else:
     error()
 
-  template debug*(x: auto) {.deprecated.} =
+template debug*(x: auto) {.deprecated.} =
   echo x
 
-  template mdbg*: bool {.deprecated.} =
+template mdbg*: bool {.deprecated.} =
   when compiles(c.graph):
     c.module.fileIdx == c.graph.config.projectMainIdx
   elif compiles(c.module):
@@ -628,8 +628,8 @@ proc value(this: var DebugPrinter; value: PNode) =
 
   this.closeCurly
 
-when declared(echo):
+
-  proc debug(n: PSym; conf: ConfigRef) =
+proc debug(n: PSym; conf: ConfigRef) =
   var this: DebugPrinter
   this.visited = initTable[pointer, int]()
   this.renderSymType = true
@@ -637,7 +637,7 @@ when declared(echo):
   this.value(n)
   echo($this.res)
 
-  proc debug(n: PType; conf: ConfigRef) =
+proc debug(n: PType; conf: ConfigRef) =
   var this: DebugPrinter
   this.visited = initTable[pointer, int]()
   this.renderSymType = true
@@ -645,7 +645,7 @@ when declared(echo):
   this.value(n)
   echo($this.res)
 
-  proc debug(n: PNode; conf: ConfigRef) =
+proc debug(n: PNode; conf: ConfigRef) =
   var this: DebugPrinter
   this.visited = initTable[pointer, int]()
   #this.renderSymType = true

compiler/dfa.nim

@@ -91,7 +91,6 @@ proc echoCfg*(c: ControlFlowGraph; start=0; last = -1) {.deprecated.} =
   ## echos the ControlFlowGraph for debugging purposes.
   var buf = ""
   codeListing(c, buf, start, last)
-  when declared(echo):
   echo buf
 
 proc forkI(c: var Con; n: PNode): TPosition =

compiler/lookups.nim

@@ -100,8 +100,7 @@ proc searchInScopes*(c: PContext, s: PIdent): PSym =
     if result != nil: return
   result = nil
 
-when declared(echo):
+proc debugScopes*(c: PContext; limit=0) {.deprecated.} =
-  proc debugScopes*(c: PContext; limit=0) {.deprecated.} =
   var i = 0
   for scope in walkScopes(c.currentScope):
     echo "scope ", i

lib/pure/osproc.nim

@@ -892,7 +892,7 @@ elif not defined(useNimRtl):
 
     # Parent process. Copy process information.
     if poEchoCmd in options:
-      when declared(echo): echo(command, " ", join(args, " "))
+      echo(command, " ", join(args, " "))
     result.id = pid
     result.exitFlag = false