summaryrefslogtreecommitdiffstats
path: root/tools/slang-test/options.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 /tools/slang-test/options.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 'tools/slang-test/options.cpp')
-rw-r--r--tools/slang-test/options.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/slang-test/options.cpp b/tools/slang-test/options.cpp
index 17e424127..3e985b493 100644
--- a/tools/slang-test/options.cpp
+++ b/tools/slang-test/options.cpp
@@ -4,7 +4,6 @@
#include "os.h"
#include "../../source/core/slang-string-util.h"
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
@@ -37,7 +36,7 @@ TestCategory* TestCategorySet::findOrError(String const& name)
TestCategory* category = find(name);
if (!category)
{
- StdWriters::getError().print("error: unknown test category name '%s'\n", name.Buffer());
+ StdWriters::getError().print("error: unknown test category name '%s'\n", name.getBuffer());
}
return category;
}
@@ -92,18 +91,18 @@ static bool _isSubCommand(const char* arg)
{
optionsOut->subCommand = arg;
// Make the first arg the command name
- optionsOut->subCommandArgs.Add(optionsOut->subCommand);
+ optionsOut->subCommandArgs.add(optionsOut->subCommand);
// Add all the remaining commands to subCommands
for (; argCursor != argEnd; ++argCursor)
{
- optionsOut->subCommandArgs.Add(*argCursor);
+ optionsOut->subCommandArgs.add(*argCursor);
}
// Done
return SLANG_OK;
}
- positionalArgs.Add(arg);
+ positionalArgs.add(arg);
continue;
}
@@ -112,7 +111,7 @@ static bool _isSubCommand(const char* arg)
// Add all positional args at the end
while (argCursor != argEnd)
{
- positionalArgs.Add(*argCursor++);
+ positionalArgs.add(*argCursor++);
}
break;
}
@@ -278,24 +277,24 @@ static bool _isSubCommand(const char* arg)
// first positional argument is source shader path
- if (positionalArgs.Count())
+ if (positionalArgs.getCount())
{
optionsOut->testPrefix = positionalArgs[0];
- positionalArgs.RemoveAt(0);
+ positionalArgs.removeAt(0);
}
// any remaining arguments represent an error
- if (positionalArgs.Count() != 0)
+ if (positionalArgs.getCount() != 0)
{
stdError.print("unexpected arguments\n");
return SLANG_FAIL;
}
- if (optionsOut->binDir.Length() == 0)
+ if (optionsOut->binDir.getLength() == 0)
{
// If the binDir isn't set try using the path to the executable
String exePath = Path::getExecutablePath();
- if (exePath.Length())
+ if (exePath.getLength())
{
optionsOut->binDir = Path::getParentDirectory(exePath);
}