From 4880789e3003441732cca4471091563f36531635 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
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<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.
---
 source/slang/dxc-support.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source/slang/dxc-support.cpp')

diff --git a/source/slang/dxc-support.cpp b/source/slang/dxc-support.cpp
index cab94e74b..b6eaf8aa9 100644
--- a/source/slang/dxc-support.cpp
+++ b/source/slang/dxc-support.cpp
@@ -99,15 +99,15 @@ namespace Slang
             entryPointIndex,
             targetReq,
             endToEndReq);
-        maybeDumpIntermediate(compileRequest, hlslCode.Buffer(), CodeGenTarget::HLSL);
+        maybeDumpIntermediate(compileRequest, hlslCode.getBuffer(), CodeGenTarget::HLSL);
 
         // Wrap the 
 
         // Create blob from the string
         ComPtr<IDxcBlobEncoding> dxcSourceBlob;
         SLANG_RETURN_ON_FAIL(dxcLibrary->CreateBlobWithEncodingFromPinned(
-            (LPBYTE)hlslCode.Buffer(),
-            (UINT32)hlslCode.Length(),
+            (LPBYTE)hlslCode.getBuffer(),
+            (UINT32)hlslCode.getLength(),
             0,
             dxcSourceBlob.writeRef()));
 
@@ -181,11 +181,11 @@ namespace Slang
         args[argCount++] = L"-no-warnings";
 
         String entryPointName = getText(entryPoint->getName());
-        OSString wideEntryPointName = entryPointName.ToWString();
+        OSString wideEntryPointName = entryPointName.toWString();
 
         auto profile = getEffectiveProfile(entryPoint, targetReq);
         String profileName = GetHLSLProfileName(profile);
-        OSString wideProfileName = profileName.ToWString();
+        OSString wideProfileName = profileName.toWString();
 
         // We will enable the flag to generate proper code for 16-bit types
         // by default, as long as the user is requesting a sufficiently
@@ -207,7 +207,7 @@ namespace Slang
 
         ComPtr<IDxcOperationResult> dxcResult;
         SLANG_RETURN_ON_FAIL(dxcCompiler->Compile(dxcSourceBlob,
-            sourcePath.ToWString().begin(),
+            sourcePath.toWString().begin(),
             profile.GetStage() == Stage::Unknown ? L"" : wideEntryPointName.begin(),
             wideProfileName.begin(),
             args,
@@ -248,7 +248,7 @@ namespace Slang
         ComPtr<IDxcBlob> dxcResultBlob;
         SLANG_RETURN_ON_FAIL(dxcResult->GetResult(dxcResultBlob.writeRef()));
         
-        outCode.AddRange(
+        outCode.addRange(
             (uint8_t const*)dxcResultBlob->GetBufferPointer(),
             (int)           dxcResultBlob->GetBufferSize());
 
-- 
cgit v1.2.3