big rename

This commit is contained in:
Araq 2014-08-28 00:24:52 +02:00
commit df172806ea
12 changed files with 108 additions and 103 deletions

View file

@ -149,11 +149,11 @@ proc contains*[A](s: TSet[A], key: A): bool =
var index = rawGet(s, key)
result = index >= 0
proc rawInsert[A](s: var TSet[A], data: var TKeyValuePairSeq[A], key: A) =
proc rawInsert[A](s: var TSet[A], data: var KeyValuePairSeq[A], key: A) =
rawInsertImpl()
proc enlarge[A](s: var TSet[A]) =
var n: TKeyValuePairSeq[A]
var n: KeyValuePairSeq[A]
newSeq(n, len(s.data) * growthFactor)
for i in countup(0, high(s.data)):
if s.data[i].slot == seFilled: rawInsert(s, n, s.data[i].key)
@ -500,7 +500,7 @@ type
##
## Use `init() <#init,OrderedSet[A],int>`_ or `initOrderedSet[type]()
## <#initOrderedSet>`_ before calling other procs on it.
data: TOrderedKeyValuePairSeq[A]
data: OrderedKeyValuePairSeq[A]
counter, first, last: int
{.deprecated: [TOrderedSet: OrderedSet].}
@ -588,7 +588,7 @@ proc contains*[A](s: TOrderedSet[A], key: A): bool =
result = index >= 0
proc rawInsert[A](s: var TOrderedSet[A],
data: var TOrderedKeyValuePairSeq[A], key: A) =
data: var OrderedKeyValuePairSeq[A], key: A) =
rawInsertImpl()
data[h].next = -1
if s.first < 0: s.first = h
@ -596,7 +596,7 @@ proc rawInsert[A](s: var TOrderedSet[A],
s.last = h
proc enlarge[A](s: var TOrderedSet[A]) =
var n: TOrderedKeyValuePairSeq[A]
var n: OrderedKeyValuePairSeq[A]
newSeq(n, len(s.data) * growthFactor)
var h = s.first
s.first = -1

View file

@ -422,7 +422,7 @@ proc hasKey*[A, B](t: TOrderedTable[A, B], key: A): bool =
result = rawGet(t, key) >= 0
proc rawInsert[A, B](t: var TOrderedTable[A, B],
data: var TOrderedKeyValuePairSeq[A, B],
data: var OrderedKeyValuePairSeq[A, B],
key: A, val: B) =
rawInsertImpl()
data[h].next = -1
@ -431,7 +431,7 @@ proc rawInsert[A, B](t: var TOrderedTable[A, B],
t.last = h
proc enlarge[A, B](t: var TOrderedTable[A, B]) =
var n: TOrderedKeyValuePairSeq[A, B]
var n: OrderedKeyValuePairSeq[A, B]
newSeq(n, len(t.data) * growthFactor)
var h = t.first
t.first = -1