removes deprecated T/P types
This commit is contained in:
parent
4233046e3f
commit
3f6168b337
64 changed files with 43 additions and 276 deletions
|
|
@ -49,13 +49,11 @@ when sizeof(int) == 4: # 32bit
|
|||
Raw = range[0..1073741823]
|
||||
## The range of uint values that can be stored directly in a value slot
|
||||
## when on a 32 bit platform
|
||||
{.deprecated: [TRaw: Raw].}
|
||||
elif sizeof(int) == 8: # 64bit
|
||||
type
|
||||
Raw = range[0'i64..4611686018427387903'i64]
|
||||
## The range of uint values that can be stored directly in a value slot
|
||||
## when on a 64 bit platform
|
||||
{.deprecated: [TRaw: Raw].}
|
||||
else:
|
||||
{.error: "unsupported platform".}
|
||||
|
||||
|
|
@ -74,7 +72,6 @@ type
|
|||
copyDone: int
|
||||
next: PConcTable[K,V]
|
||||
data: EntryArr
|
||||
{.deprecated: [TEntry: Entry, TEntryArr: EntryArr].}
|
||||
|
||||
proc setVal[K,V](table: var PConcTable[K,V], key: int, val: int,
|
||||
expVal: int, match: bool): int
|
||||
|
|
@ -544,7 +541,6 @@ when not defined(testing) and isMainModule:
|
|||
Data = tuple[k: string,v: TestObj]
|
||||
PDataArr = array[0..numTests-1, Data]
|
||||
Dict = PConcTable[string,TestObj]
|
||||
{.deprecated: [TTestObj: TestObj, TData: Data].}
|
||||
|
||||
var
|
||||
thr: array[0..numThreads-1, Thread[Dict]]
|
||||
|
|
|
|||
|
|
@ -33,8 +33,6 @@ type
|
|||
root: Node[T]
|
||||
count: int
|
||||
|
||||
{.deprecated: [TCritBitTree: CritBitTree].}
|
||||
|
||||
proc len*[T](c: CritBitTree[T]): int =
|
||||
## returns the number of elements in `c` in O(1).
|
||||
result = c.count
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ type
|
|||
data: TrunkSeq
|
||||
a: array[0..33, int] # profiling shows that 34 elements are enough
|
||||
|
||||
{.deprecated: [TIntSet: IntSet, TTrunk: Trunk, TTrunkSeq: TrunkSeq].}
|
||||
|
||||
proc mustRehash(length, counter: int): bool {.inline.} =
|
||||
assert(length > counter)
|
||||
result = (length * 2 < counter * 3) or (length - counter < 4)
|
||||
|
|
|
|||
|
|
@ -45,15 +45,6 @@ type
|
|||
|
||||
SomeLinkedNode*[T] = SinglyLinkedNode[T] | DoublyLinkedNode[T]
|
||||
|
||||
{.deprecated: [TDoublyLinkedNode: DoublyLinkedNodeObj,
|
||||
PDoublyLinkedNode: DoublyLinkedNode,
|
||||
TSinglyLinkedNode: SinglyLinkedNodeObj,
|
||||
PSinglyLinkedNode: SinglyLinkedNode,
|
||||
TDoublyLinkedList: DoublyLinkedList,
|
||||
TSinglyLinkedRing: SinglyLinkedRing,
|
||||
TDoublyLinkedRing: DoublyLinkedRing,
|
||||
TSinglyLinkedList: SinglyLinkedList].}
|
||||
|
||||
proc initSinglyLinkedList*[T](): SinglyLinkedList[T] =
|
||||
## creates a new singly linked list that is empty.
|
||||
discard
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ type
|
|||
data: seq[T]
|
||||
rd, wr, count, mask: int
|
||||
|
||||
{.deprecated: [TQueue: Queue].}
|
||||
|
||||
proc initQueue*[T](initialSize: int = 4): Queue[T] =
|
||||
## Create a new queue.
|
||||
## Optionally, the initial capacity can be reserved via `initialSize` as a
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ type
|
|||
data: KeyValuePairSeq[A]
|
||||
counter: int
|
||||
|
||||
{.deprecated: [TSet: HashSet].}
|
||||
|
||||
template default[T](t: typedesc[T]): T =
|
||||
## Used by clear methods to get a default value.
|
||||
var v: T
|
||||
|
|
@ -631,8 +629,6 @@ type
|
|||
data: OrderedKeyValuePairSeq[A]
|
||||
counter, first, last: int
|
||||
|
||||
{.deprecated: [TOrderedSet: OrderedSet].}
|
||||
|
||||
proc clear*[A](s: var OrderedSet[A]) =
|
||||
## Clears the OrderedSet back to an empty state, without shrinking
|
||||
## any of the existing storage. O(n) where n is the size of the hash bucket.
|
||||
|
|
|
|||
|
|
@ -125,8 +125,6 @@ type
|
|||
counter: int
|
||||
TableRef*[A,B] = ref Table[A, B]
|
||||
|
||||
{.deprecated: [TTable: Table, PTable: TableRef].}
|
||||
|
||||
template maxHash(t): untyped = high(t.data)
|
||||
template dataLen(t): untyped = len(t.data)
|
||||
|
||||
|
|
@ -520,8 +518,6 @@ type
|
|||
counter, first, last: int
|
||||
OrderedTableRef*[A, B] = ref OrderedTable[A, B]
|
||||
|
||||
{.deprecated: [TOrderedTable: OrderedTable, POrderedTable: OrderedTableRef].}
|
||||
|
||||
proc len*[A, B](t: OrderedTable[A, B]): int {.inline.} =
|
||||
## returns the number of keys in ``t``.
|
||||
result = t.counter
|
||||
|
|
@ -795,7 +791,7 @@ proc getOrDefault*[A, B](t: OrderedTableRef[A, B], key: A): B =
|
|||
getOrDefault(t[], key)
|
||||
|
||||
proc getOrDefault*[A, B](t: OrderedTableRef[A, B], key: A, default: B): B =
|
||||
## retrieves the value at ``t[key]`` iff ``key`` is in ``t``. Otherwise,
|
||||
## retrieves the value at ``t[key]`` iff ``key`` is in ``t``. Otherwise,
|
||||
## ``default`` is returned.
|
||||
getOrDefault(t[], key, default)
|
||||
|
||||
|
|
@ -892,8 +888,6 @@ type
|
|||
counter: int
|
||||
CountTableRef*[A] = ref CountTable[A]
|
||||
|
||||
{.deprecated: [TCountTable: CountTable, PCountTable: CountTableRef].}
|
||||
|
||||
proc len*[A](t: CountTable[A]): int =
|
||||
## returns the number of keys in ``t``.
|
||||
result = t.counter
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue