diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-29 17:03:46 -0400 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-04-29 14:03:46 -0700 |
| commit | 4880789e3003441732cca4471091563f36531635 (patch) | |
| tree | 8e0d3ed58a561373b35729d24787afe6b39732e3 /source/core/dictionary.h | |
| parent | ded340beb4b5197b559626acc39920abb2d39e77 (diff) | |
String/List closer to conventions, and use Index type (#959)
* List made members m_
Tweaked types to closer match conventions.
* Use asserts for checking conditions on List.
Other small improvements.
* List<T>.Count() -> getSize()
* List<T>
Add -> add
First -> getFirst
Last -> getLast
RemoveLast -> removeLast
ReleaseBuffer -> detachBuffer
GetArrayView -> getArrayView
* List<T>::
AddRange -> addRange
Capacity -> getCapacity
Insert -> insert
InsertRange -> insertRange
AddRange -> addRange
RemoveRange -> removeRange
RemoveAt -> removeAt
Remove -> remove
Reverse -> reverse
FastRemove -> fastRemove
FastRemoveAt -> fastRemoveAt
Clear -> clear
* List<T>
FreeBuffer -> _deallocateBuffer
Free -> clearAndDeallocate
SwapWith -> swapWith
* List<T>
SetSize -> setSize
Reserve -> reserve
GrowToSize growToSize
* UnsafeShrinkToSize -> unsafeShrinkToSize
Compress -> compress
FindLast -> findLastIndex
FindLast -> findLastIndex
Simplify Contains
* List<T>
Removed m_allocator (wasn't used)
Swap -> swapElements
Sort -> sort
Contains -> contains
ForEach -> forEach
QuickSort -> quickSort
InsertionSort -> insertionSort
BinarySearch -> binarySearch
Max -> calcMax
Min -> calcMin
* Initializer::Initialize -> initialize
List<T>::
Allocate -> _allocate
Init -> _init
IndexOf -> indexOf
* * Put #include <assert.h> in common.h, and remove unneeded inclusions
* Small refactor of ArrayView - remove stride as not used
* getSize -> getCount
setSize -> setCount
unsafeShrinkToSize->unsafeShrinkToCount
growToSize -> growToCount
m_size -> m_count
* Some tidy up around Allocator.
* Use Index type on List.
* Refactor of IntSet.
First tentative look at using Index.
* Made Index an Int
Did preliminary fixes.
Made String use Index.
* Partial refactor of String.
* String::Buffer -> getBuffer
ToWString -> toWString
* Small improvements to String.
String::
Buffer() -> getBuffer()
Equals() -> equals
* Try to use Index where appropriate.
* Fix warnings on windows x86 builds.
Diffstat (limited to 'source/core/dictionary.h')
| -rw-r--r-- | source/core/dictionary.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/core/dictionary.h b/source/core/dictionary.h index 6d97bc2b3..a38699368 100644 --- a/source/core/dictionary.h +++ b/source/core/dictionary.h @@ -91,25 +91,25 @@ namespace Slang } inline bool IsDeleted(int pos) const { - return marks.Contains((pos << 1) + 1); + return marks.contains((pos << 1) + 1); } inline bool IsEmpty(int pos) const { - return !marks.Contains((pos << 1)); + return !marks.contains((pos << 1)); } inline void SetDeleted(int pos, bool val) { if (val) - marks.Add((pos << 1) + 1); + marks.add((pos << 1) + 1); else - marks.Remove((pos << 1) + 1); + marks.remove((pos << 1) + 1); } inline void SetEmpty(int pos, bool val) { if (val) - marks.Remove((pos << 1)); + marks.remove((pos << 1)); else - marks.Add((pos << 1)); + marks.add((pos << 1)); } struct FindPositionResult { @@ -180,7 +180,7 @@ namespace Slang Dictionary<TKey, TValue> newDict; newDict.bucketSizeMinusOne = newSize - 1; newDict.hashMap = new KeyValuePair<TKey, TValue>[newSize]; - newDict.marks.SetMax(newSize * 2); + newDict.marks.setMax(newSize * 2); if (hashMap) { for (auto & kvPair : *this) @@ -326,7 +326,7 @@ namespace Slang { _count = 0; - marks.Clear(); + marks.clear(); } TValue* TryGetValueOrAdd(const TKey& key, const TValue& value) |