summaryrefslogtreecommitdiff
path: root/source/slang/ir.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.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.cpp')
-rw-r--r--source/slang/ir.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 43ec09abb..150a5d544 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -275,12 +275,12 @@ namespace Slang
List<IRInst*> existentialArgs;
for( UInt ii = 0; ii < existentialArgCount; ++ii )
{
- existentialArgs.Add(bindExistentials->getExistentialArg(ii));
+ existentialArgs.add(bindExistentials->getExistentialArg(ii));
}
return builder->getBindExistentialsType(
baseElementType,
existentialArgCount,
- existentialArgs.Buffer());
+ existentialArgs.getBuffer());
}
}
@@ -1862,12 +1862,12 @@ namespace Slang
List<IRInst*> slotArgs;
for( UInt ii = 0; ii < slotArgCount; ++ii )
{
- slotArgs.Add(slotArgUses[ii].get());
+ slotArgs.add(slotArgUses[ii].get());
}
return getBindExistentialsType(
baseType,
slotArgCount,
- slotArgs.Buffer());
+ slotArgs.getBuffer());
}
@@ -3069,7 +3069,7 @@ namespace Slang
// Allow an empty nam
// Special case a name that is the empty string, just in case.
- if(name.Length() == 0)
+ if(name.getLength() == 0)
{
sb.append('_');
}
@@ -3766,7 +3766,7 @@ namespace Slang
dumpInst(&context, globalVal);
- writer->write(sb.Buffer(), sb.Length());
+ writer->write(sb.getBuffer(), sb.getLength());
writer->flush();
}
@@ -3780,7 +3780,7 @@ namespace Slang
void dumpIR(IRModule* module, ISlangWriter* writer, IRDumpMode mode)
{
String ir = getSlangIRAssembly(module, mode);
- writer->write(ir.Buffer(), ir.Length());
+ writer->write(ir.getBuffer(), ir.getLength());
writer->flush();
}