summaryrefslogtreecommitdiff
path: root/source/slang/ir-union.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-04-29 17:03:46 -0400
committerTim Foley <tfoleyNV@users.noreply.github.com>2019-04-29 14:03:46 -0700
commit4880789e3003441732cca4471091563f36531635 (patch)
tree8e0d3ed58a561373b35729d24787afe6b39732e3 /source/slang/ir-union.cpp
parentded340beb4b5197b559626acc39920abb2d39e77 (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/slang/ir-union.cpp')
-rw-r--r--source/slang/ir-union.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/slang/ir-union.cpp b/source/slang/ir-union.cpp
index 91e60c5bf..b4fbc4c96 100644
--- a/source/slang/ir-union.cpp
+++ b/source/slang/ir-union.cpp
@@ -230,7 +230,7 @@ struct DesugarUnionTypesContext
// list for later removal.
//
inst->replaceUsesWith(replacement);
- instsToRemove.Add(inst);
+ instsToRemove.add(inst);
}
break;
@@ -269,7 +269,7 @@ struct DesugarUnionTypesContext
// for fields, etc.).
//
auto taggedUnionTypeLayout = taggedUnionInfo->taggedUnionTypeLayout;
- SLANG_ASSERT(caseTagIndex < taggedUnionTypeLayout->caseTypeLayouts.Count());
+ SLANG_ASSERT(caseTagIndex < UInt(taggedUnionTypeLayout->caseTypeLayouts.getCount()));
auto caseTypeLayout = taggedUnionTypeLayout->caseTypeLayouts[caseTagIndex];
// At this point we know the type we are trying to extract, as well
@@ -321,7 +321,7 @@ struct DesugarUnionTypesContext
// this instruction, and schedule the original instruction for removal.
//
inst->replaceUsesWith(payloadVal);
- instsToRemove.Add(inst);
+ instsToRemove.add(inst);
}
break;
}
@@ -403,7 +403,7 @@ struct DesugarUnionTypesContext
fieldType,
fieldTypeLayout,
fieldOffset);
- fieldVals.Add(fieldVal);
+ fieldVals.add(fieldVal);
}
// The final value is then just a new struct constructed from
@@ -447,7 +447,7 @@ struct DesugarUnionTypesContext
elementType,
elementTypeLayout,
payloadOffset + ii*elementSize);
- elementVals.Add(elementVal);
+ elementVals.add(elementVal);
}
return builder->emitMakeVector(vecType, elementVals);
}
@@ -625,7 +625,7 @@ struct DesugarUnionTypesContext
//
auto info = createTaggedUnionInfo(type);
mapIRTypeToTaggedUnionInfo.Add(type, info.Ptr());
- taggedUnionInfos.Add(info);
+ taggedUnionInfos.add(info);
return info;
}