From 4880789e3003441732cca4471091563f36531635 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 29 Apr 2019 17:03:46 -0400 Subject: 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.Count() -> getSize() * List Add -> add First -> getFirst Last -> getLast RemoveLast -> removeLast ReleaseBuffer -> detachBuffer GetArrayView -> getArrayView * List:: 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 FreeBuffer -> _deallocateBuffer Free -> clearAndDeallocate SwapWith -> swapWith * List SetSize -> setSize Reserve -> reserve GrowToSize growToSize * UnsafeShrinkToSize -> unsafeShrinkToSize Compress -> compress FindLast -> findLastIndex FindLast -> findLastIndex Simplify Contains * List 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:: Allocate -> _allocate Init -> _init IndexOf -> indexOf * * Put #include 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. --- source/slang/ir-bind-existentials.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/slang/ir-bind-existentials.cpp') diff --git a/source/slang/ir-bind-existentials.cpp b/source/slang/ir-bind-existentials.cpp index f87a7d233..f0c02dd67 100644 --- a/source/slang/ir-bind-existentials.cpp +++ b/source/slang/ir-bind-existentials.cpp @@ -285,7 +285,7 @@ struct BindExistentialSlots UInt slotOperandCount = slotCount*2; List slotOperands; for(UInt ii = 0; ii < slotOperandCount; ++ii) - slotOperands.Add(slotArgs[ii].get()); + slotOperands.add(slotArgs[ii].get()); // We are going to create a proxy type that represents // the results of plugging all the information @@ -294,7 +294,7 @@ struct BindExistentialSlots auto newType = builder.getBindExistentialsType( fullType, slotOperandCount, - slotOperands.Buffer()); + slotOperands.getBuffer()); // We will replace the type of the original parameter // with the new proxy type. @@ -315,7 +315,7 @@ struct BindExistentialSlots // List usesToReplace; for(auto use = inst->firstUse; use; use = use->nextUse ) - usesToReplace.Add(use); + usesToReplace.add(use); // Now we can loop over our list of uses and replace each. // @@ -329,7 +329,7 @@ struct BindExistentialSlots fullType, inst, slotOperandCount, - slotOperands.Buffer()); + slotOperands.getBuffer()); // Second we make the use site point at the new // value instead. -- cgit v1.2.3