reworked deprecation to retain old procs

3 files changed, 14 insertions, 3 deletions

diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim
index 15022fe0d..8aa8d35d8 100644
--- a/lib/pure/streams.nim
+++ b/lib/pure/streams.nim
@@ -117,14 +117,17 @@ proc write*(s: Stream, x: string) =
   ## terminating zero is written.
   writeData(s, cstring(x), x.len)
 
+proc writeLn*(s: Stream, args: varargs[string, `$`]) {.deprecated.} =
+  ## **Deprecated since version 0.11.4:** Use **writeLine** instead.
+  for str in args: write(s, str)
+  write(s, "\n")
+
 proc writeLine*(s: Stream, args: varargs[string, `$`]) =
   ## writes one or more strings to the the stream `s` followed
   ## by a new line. No length field or terminating zero is written.
   for str in args: write(s, str)
   write(s, "\n")
 
-{.deprecated: [writeln:writeLine].}
-
 proc read[T](s: Stream, result: var T) =
   ## generic read procedure. Reads `result` from the stream `s`.
   if readData(s, addr(result), sizeof(T)) != sizeof(T):
diff --git a/lib/system.nim b/lib/system.nim
index 9ffc51e80..34531eb46 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2526,6 +2526,10 @@ when not defined(JS): #and not defined(NimrodVM):
       ## Returns ``false`` if the end of the file has been reached, ``true``
       ## otherwise. If ``false`` is returned `line` contains no new data.
 
+    proc writeLn*[Ty](f: File, x: varargs[Ty, `$`]) {.inline,
+                             tags: [WriteIOEffect], benign, deprecated.}
+      ## **Deprecated since version 0.11.4:** Use **writeLine** instead.
+
     proc writeLine*[Ty](f: File, x: varargs[Ty, `$`]) {.inline,
                              tags: [WriteIOEffect], benign.}
       ## writes the values `x` to `f` and then writes "\n".
diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim
index e84c7ac3a..5464ee126 100644
--- a/lib/system/sysio.nim
+++ b/lib/system/sysio.nim
@@ -208,10 +208,14 @@ proc endOfFile(f: File): bool =
   ungetc(c, f)
   return c < 0'i32
 
+proc writeLn[Ty](f: File, x: varargs[Ty, `$`]) =
+  for i in items(x): write(f, i)
+  write(f, "\n")
+
 proc writeLine[Ty](f: File, x: varargs[Ty, `$`]) =
   for i in items(x): write(f, i)
   write(f, "\n")
-{.deprecated: [writeln:writeLine].}
+
 
 proc rawEcho(x: string) {.inline, compilerproc.} = write(stdout, x)
 proc rawEchoNL() {.inline, compilerproc.} = write(stdout, "\n")