strutils: don't deprecate escape/unescape, too much code uses it

This commit is contained in:
Araq 2018-08-31 17:30:58 +02:00
commit 06e6c38d99

View file

@ -1692,14 +1692,12 @@ proc insertSep*(s: string, sep = '_', digits = 3): string {.noSideEffect,
dec(L)
proc escape*(s: string, prefix = "\"", suffix = "\""): string {.noSideEffect,
rtl, extern: "nsuEscape", deprecated.} =
rtl, extern: "nsuEscape".} =
## Escapes a string `s`. See `system.addEscapedChar <system.html#addEscapedChar>`_
## for the escaping scheme.
##
## The resulting string is prefixed with `prefix` and suffixed with `suffix`.
## Both may be empty strings.
##
## **Warning:** This procedure is deprecated because it's to easy to missuse.
result = newStringOfCap(s.len + s.len shr 2)
result.add(prefix)
for c in items(s):
@ -1714,7 +1712,7 @@ proc escape*(s: string, prefix = "\"", suffix = "\""): string {.noSideEffect,
add(result, suffix)
proc unescape*(s: string, prefix = "\"", suffix = "\""): string {.noSideEffect,
rtl, extern: "nsuUnescape", deprecated.} =
rtl, extern: "nsuUnescape".} =
## Unescapes a string `s`.
##
## This complements `escape <#escape>`_ as it performs the opposite
@ -1722,8 +1720,6 @@ proc unescape*(s: string, prefix = "\"", suffix = "\""): string {.noSideEffect,
##
## If `s` does not begin with ``prefix`` and end with ``suffix`` a
## ValueError exception will be raised.
##
## **Warning:** This procedure is deprecated because it's to easy to missuse.
result = newStringOfCap(s.len)
var i = prefix.len
if not s.startsWith(prefix):