summaryrefslogtreecommitdiffstats
path: root/source/core/stream.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/core/stream.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/core/stream.cpp')
-rw-r--r--source/core/stream.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/core/stream.cpp b/source/core/stream.cpp
index 0fd266e0a..de0a8b8f3 100644
--- a/source/core/stream.cpp
+++ b/source/core/stream.cpp
@@ -113,11 +113,11 @@ namespace Slang
}
if (share == Slang::FileShare::None)
#pragma warning(suppress:4996)
- handle = _wfopen(fileName.ToWString(), mode);
+ handle = _wfopen(fileName.toWString(), mode);
else
- handle = _wfsopen(fileName.ToWString(), mode, shFlag);
+ handle = _wfsopen(fileName.toWString(), mode, shFlag);
#else
- handle = fopen(fileName.Buffer(), modeMBCS);
+ handle = fopen(fileName.getBuffer(), modeMBCS);
#endif
if (!handle)
{
@@ -228,7 +228,7 @@ namespace Slang
pos = offset;
break;
case Slang::SeekOrigin::End:
- pos = Int64(m_contents.Count()) + offset;
+ pos = Int64(m_contents.getCount()) + offset;
break;
case Slang::SeekOrigin::Current:
pos = Int64(m_position) + offset;
@@ -242,7 +242,7 @@ namespace Slang
// Clamp to the valid range
pos = (pos < 0) ? 0 : pos;
- pos = (pos > Int64(m_contents.Count())) ? Int64(m_contents.Count()) : pos;
+ pos = (pos > Int64(m_contents.getCount())) ? Int64(m_contents.getCount()) : pos;
m_position = UInt(pos);
}
@@ -254,7 +254,7 @@ namespace Slang
throw IOException("Cannot read this stream.");
}
- const Int64 maxRead = Int64(m_contents.Count() - m_position);
+ const Int64 maxRead = Int64(m_contents.getCount() - m_position);
if (maxRead == 0 && length > 0)
{
@@ -276,13 +276,13 @@ namespace Slang
throw IOException("Cannot write this stream.");
}
- if (m_position == m_contents.Count())
+ if (m_position == m_contents.getCount())
{
- m_contents.AddRange((const uint8_t*)buffer, UInt(length));
+ m_contents.addRange((const uint8_t*)buffer, UInt(length));
}
else
{
- m_contents.InsertRange(m_position, (const uint8_t*)buffer, UInt(length));
+ m_contents.insertRange(m_position, (const uint8_t*)buffer, UInt(length));
}
m_atEnd = false;