summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJacek Sieka <arnetheduck@gmail.com>2015-03-31 22:19:29 +0800
committerJacek Sieka <arnetheduck@gmail.com>2015-04-01 22:32:15 +0800
commit71e785904b09da332c6f8c114c1cc62baee23dea (patch)
tree7ffbc45b0f64ced5a00a6b6d7640d888edd17e98
parenta9ef5bf4592a77a9839613d378e3c6060c9bb283 (diff)
downloadNim-71e785904b09da332c6f8c114c1cc62baee23dea.tar.gz
compiler_ropes: deprecate old function names
-rw-r--r--compiler/ropes.nim31
1 files changed, 15 insertions, 16 deletions
diff --git a/compiler/ropes.nim b/compiler/ropes.nim
index d999c77ea..194b52bb2 100644
--- a/compiler/ropes.nim
+++ b/compiler/ropes.nim
@@ -76,11 +76,10 @@ type
     rCannotOpenFile
     rInvalidFormatStr
 
-  # TODO Compatibility names - update uses
-  TFormatStr* = FormatStr
-  PRope* = Rope
-  TRopeSeq* = RopeSeq
-  TRopesError* = RopesError
+{.deprecated: [TFormatStr: FormatStr].}
+{.deprecated: [PRope: Rope].}
+{.deprecated: [TRopeSeq: RopeSeq].}
+{.deprecated: [TRopesError: RopesError].}
 
 # implementation
 
@@ -154,9 +153,9 @@ proc rope*(f: BiggestFloat): Rope =
   result = rope($f)
 
 # TODO Old names - change invokations to rope
-proc toRope*(s: string): Rope =
+proc toRope*(s: string): Rope {.deprecated.} =
   result = rope(s)
-proc toRope*(i: BiggestInt): Rope =
+proc toRope*(i: BiggestInt): Rope {.deprecated.}  =
   result = rope(i)
 
 proc ropeSeqInsert(rs: var RopeSeq, r: Rope, at: Natural) =
@@ -215,19 +214,19 @@ proc `$`*(p: Rope): string =
     var resultLen = 0
     newRecRopeToStr(result, resultLen, p)
 
-# TODO Old names - change invokations to &
-proc con*(a, b: Rope): Rope = a & b
-proc con*(a: Rope, b: string): Rope = a & b
-proc con*(a: string, b: Rope): Rope = a & b
-proc con*(a: varargs[Rope]): Rope = `&`(a)
+# TODO Old names - change invokations to `&`
+proc con*(a, b: Rope): Rope {.deprecated.} = a & b
+proc con*(a: Rope, b: string): Rope {.deprecated.} = a & b
+proc con*(a: string, b: Rope): Rope {.deprecated.} = a & b
+proc con*(a: varargs[Rope]): Rope {.deprecated.} = `&`(a)
 
 proc ropeConcat*(a: varargs[Rope]): Rope =
   # not overloaded version of concat to speed-up `rfmt` a little bit
   for i in countup(0, high(a)): result = con(result, a[i])
 
 # TODO Old names - change invokations to add
-proc app*(a: var Rope, b: Rope) = add(a, b)
-proc app*(a: var Rope, b: string) = add(a, b)
+proc app*(a: var Rope, b: Rope) {.deprecated.} = add(a, b)
+proc app*(a: var Rope, b: string) {.deprecated.} = add(a, b)
 
 proc prepend*(a: var Rope, b: Rope) = a = b & a
 proc prepend*(a: var Rope, b: string) = a = b & a
@@ -316,9 +315,9 @@ proc addf*(c: var Rope, frmt: TFormatStr, args: openArray[Rope]) =
   add(c, frmt % args)
 
 # TODO Compatibility names
-proc ropef*(frmt: TFormatStr, args: varargs[Rope]): Rope =
+proc ropef*(frmt: TFormatStr, args: varargs[Rope]): Rope {.deprecated.} =
   result = frmt % args
-proc appf*(c: var Rope, frmt: TFormatStr, args: varargs[Rope]) =
+proc appf*(c: var Rope, frmt: TFormatStr, args: varargs[Rope]) {.deprecated.} =
   addf(c, frmt, args)
 
 when true: