summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2023-04-25 12:25:52 -0400
committerGitHub <noreply@github.com>2023-04-25 09:25:52 -0700
commit5abee6a0a30c7c965138ec7286b7f1b21b201731 (patch)
tree0469f6f85bac0fcf502a95f2a60c49179349dd17 /tools
parente5d5e3c215f3300bf447e6ab46cdf8d5c12f58a6 (diff)
StringBuilder to lowerCamel (#2840)
* #include an absolute path didn't work - because paths were taken to always be relative. * WIP lowerCamel Dictionary. * WIP more lowerCamel fixes for Dictionary. * Add/Remove/Clear * GetValue/Contains * Fix tabs in dictionary. Count -> getCount * Fix fields with caps. * Key -> key Value -> value Use m_ for members where appropriate. Use lowerCamel in linked list. * Some small fixes/improvements to Dictionary. * Kick CI. * Small tidy on String. * Append -> append * ToString -> toString ProduceString -> produceString * Small fixes. * StringToXXX -> stringToXXX * Fix typo introduced by Append -> append. * Made intToAscii do reversal at the end. --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/gfx/debug-layer/debug-helper-functions.cpp2
-rw-r--r--tools/render-test/options.cpp2
-rw-r--r--tools/render-test/shader-input-layout.cpp2
-rw-r--r--tools/slang-cpp-extractor/cpp-extractor-main.cpp4
-rw-r--r--tools/slang-cpp-extractor/node.h2
-rw-r--r--tools/slang-embed/slang-embed.cpp2
-rw-r--r--tools/slang-test/options.cpp2
-rw-r--r--tools/slang-test/slang-test-main.cpp80
-rw-r--r--tools/slang-test/test-reporter.cpp14
-rw-r--r--tools/test-process/test-process-main.cpp4
10 files changed, 57 insertions, 57 deletions
diff --git a/tools/gfx/debug-layer/debug-helper-functions.cpp b/tools/gfx/debug-layer/debug-helper-functions.cpp
index 10dcedf2a..e7c4e0246 100644
--- a/tools/gfx/debug-layer/debug-helper-functions.cpp
+++ b/tools/gfx/debug-layer/debug-helper-functions.cpp
@@ -42,7 +42,7 @@ String _gfxGetFuncName(const char* input)
StringBuilder sb;
sb.appendChar('I');
sb.append(str.subString(startIndex, endIndex - startIndex));
- return sb.ProduceString();
+ return sb.produceString();
}
void validateAccelerationStructureBuildInputs(
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index ef15346c6..3b2c07ce6 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -174,7 +174,7 @@ static gfx::DeviceType _toRenderType(Slang::RenderApiType apiType)
for (Index i = 0; i < 3; ++i)
{
string = slices[i];
- int v = StringToInt(string);
+ int v = stringToInt(string);
if (v < 1)
{
sink.diagnose(dispatchSize.loc, RenderTestDiagnostics::expectingPositiveComputeDispatch);
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index 7aef0025f..2883dd465 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -434,7 +434,7 @@ namespace renderer_test
sb << parseTypeName(parser);
sb << ">";
parser.Read(">");
- return sb.ProduceString();
+ return sb.produceString();
}
return typeName;
}
diff --git a/tools/slang-cpp-extractor/cpp-extractor-main.cpp b/tools/slang-cpp-extractor/cpp-extractor-main.cpp
index c8a4d80f5..2bc0596e1 100644
--- a/tools/slang-cpp-extractor/cpp-extractor-main.cpp
+++ b/tools/slang-cpp-extractor/cpp-extractor-main.cpp
@@ -247,7 +247,7 @@ SlangResult App::execute(const Options& options)
StringBuilder buf;
// Let's guess a 'fileMark' (it becomes part of the filename) based on the macro name. Use lower kabab.
NameConventionUtil::join(slices.getBuffer(), slices.getCount(), NameConvention::LowerKabab, buf);
- typeSet->m_fileMark = buf.ProduceString();
+ typeSet->m_fileMark = buf.produceString();
}
if (typeSet->m_typeName.getLength() == 0)
@@ -255,7 +255,7 @@ SlangResult App::execute(const Options& options)
// Let's guess a typename if not set -> go with upper camel
StringBuilder buf;
NameConventionUtil::join(slices.getBuffer(), slices.getCount(), NameConvention::UpperCamel, buf);
- typeSet->m_typeName = buf.ProduceString();
+ typeSet->m_typeName = buf.produceString();
}
}
}
diff --git a/tools/slang-cpp-extractor/node.h b/tools/slang-cpp-extractor/node.h
index db9a10e36..8455588ad 100644
--- a/tools/slang-cpp-extractor/node.h
+++ b/tools/slang-cpp-extractor/node.h
@@ -118,7 +118,7 @@ public:
void calcAbsoluteName(StringBuilder& outName) const;
/// Get the absolute name
- String getAbsoluteName() const { StringBuilder buf; calcAbsoluteName(buf); return buf.ProduceString(); }
+ String getAbsoluteName() const { StringBuilder buf; calcAbsoluteName(buf); return buf.produceString(); }
/// Calculate the scope path to this node, from the root
void calcScopePath(List<Node*>& outPath) { calcScopePath(this, outPath); }
diff --git a/tools/slang-embed/slang-embed.cpp b/tools/slang-embed/slang-embed.cpp
index d3936af71..80ee6c237 100644
--- a/tools/slang-embed/slang-embed.cpp
+++ b/tools/slang-embed/slang-embed.cpp
@@ -283,7 +283,7 @@ struct App
processInputFile(outputFile, Slang::UnownedStringSlice(inputPath));
fprintf(outputFile, ";\n");
- fprintf(outputFile, "return sb.ProduceString();\n}\n");
+ fprintf(outputFile, "return sb.produceString();\n}\n");
}
};
diff --git a/tools/slang-test/options.cpp b/tools/slang-test/options.cpp
index 9989d8164..8ab9e9ae2 100644
--- a/tools/slang-test/options.cpp
+++ b/tools/slang-test/options.cpp
@@ -201,7 +201,7 @@ static bool _isSubCommand(const char* arg)
stdError.print("error: expected operand for '%s'\n", arg);
return SLANG_FAIL;
}
- optionsOut->serverCount = StringToInt(* argCursor++);
+ optionsOut->serverCount = stringToInt(* argCursor++);
if (optionsOut->serverCount <= 0)
{
optionsOut->serverCount = 1;
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 94329831b..884a20a0e 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -233,8 +233,8 @@ void skipToEndOfLine(char const** ioCursor)
String getString(char const* textBegin, char const* textEnd)
{
StringBuilder sb;
- sb.Append(textBegin, textEnd - textBegin);
- return sb.ProduceString();
+ sb.append(textBegin, textEnd - textBegin);
+ return sb.produceString();
}
String collectRestOfLine(char const** ioCursor)
@@ -1314,15 +1314,15 @@ String getOutput(const ExecuteResult& exeRes)
// We construct a single output string that captures the results
StringBuilder actualOutputBuilder;
- actualOutputBuilder.Append("result code = ");
- actualOutputBuilder.Append(resultCode);
- actualOutputBuilder.Append("\nstandard error = {\n");
- actualOutputBuilder.Append(standardError);
- actualOutputBuilder.Append("}\nstandard output = {\n");
- actualOutputBuilder.Append(standardOuptut);
- actualOutputBuilder.Append("}\n");
-
- return actualOutputBuilder.ProduceString();
+ actualOutputBuilder.append("result code = ");
+ actualOutputBuilder.append(resultCode);
+ actualOutputBuilder.append("\nstandard error = {\n");
+ actualOutputBuilder.append(standardError);
+ actualOutputBuilder.append("}\nstandard output = {\n");
+ actualOutputBuilder.append(standardOuptut);
+ actualOutputBuilder.append("}\n");
+
+ return actualOutputBuilder.produceString();
}
// Finds the specialized or default path for expected data for a test.
@@ -1631,7 +1631,7 @@ TestResult runExecutableTest(TestContext* context, TestInput& input)
{
StringBuilder buf;
StringEscapeUtil::unescapeShellLike(escapeHandler, arg.getUnownedSlice(), buf);
- cmdLine.addArg(buf.ProduceString());
+ cmdLine.addArg(buf.produceString());
}
else
{
@@ -1935,7 +1935,7 @@ TestResult runLanguageServerTest(TestContext* context, TestInput& input)
TestResult result = TestResult::Pass;
- auto actualOutput = actualOutputSB.ProduceString();
+ auto actualOutput = actualOutputSB.produceString();
// Redact absolute file names from actualOutput
List<UnownedStringSlice> outputLines;
@@ -1952,7 +1952,7 @@ TestResult runLanguageServerTest(TestContext* context, TestInput& input)
redactedSB << "{REDACTED}" << line.tail(extIdx) << "\n";
}
- actualOutput = redactedSB.ProduceString().trim();
+ actualOutput = redactedSB.produceString().trim();
if (!_areResultsEqual(input.testOptions->type, expectedOutput, actualOutput))
{
@@ -2120,7 +2120,7 @@ TestResult runCompile(TestContext* context, TestInput& input)
{
StringBuilder buf;
StringEscapeUtil::unescapeShellLike(escapeHandler, arg.getUnownedSlice(), buf);
- cmdLine.addArg(buf.ProduceString());
+ cmdLine.addArg(buf.produceString());
}
else
{
@@ -2797,15 +2797,15 @@ static TestResult _runHLSLComparisonTest(
// We construct a single output string that captures the results
StringBuilder actualOutputBuilder;
- actualOutputBuilder.Append("result code = ");
- actualOutputBuilder.Append(resultCode);
- actualOutputBuilder.Append("\nstandard error = {\n");
- actualOutputBuilder.Append(standardError);
- actualOutputBuilder.Append("}\nstandard output = {\n");
- actualOutputBuilder.Append(standardOutput);
- actualOutputBuilder.Append("}\n");
+ actualOutputBuilder.append("result code = ");
+ actualOutputBuilder.append(resultCode);
+ actualOutputBuilder.append("\nstandard error = {\n");
+ actualOutputBuilder.append(standardError);
+ actualOutputBuilder.append("}\nstandard output = {\n");
+ actualOutputBuilder.append(standardOutput);
+ actualOutputBuilder.append("}\n");
- String actualOutput = actualOutputBuilder.ProduceString();
+ String actualOutput = actualOutputBuilder.produceString();
// Always fail if the compilation produced a failure, just
// to catch situations where, e.g., command-line options parsing
@@ -2877,16 +2877,16 @@ TestResult doGLSLComparisonTestRun(TestContext* context,
// We construct a single output string that captures the results
StringBuilder outputBuilder;
- outputBuilder.Append("result code = ");
- outputBuilder.Append(resultCode);
- outputBuilder.Append("\nstandard error = {\n");
- outputBuilder.Append(standardError);
- outputBuilder.Append("}\nstandard output = {\n");
- outputBuilder.Append(standardOuptut);
- outputBuilder.Append("}\n");
+ outputBuilder.append("result code = ");
+ outputBuilder.append(resultCode);
+ outputBuilder.append("\nstandard error = {\n");
+ outputBuilder.append(standardError);
+ outputBuilder.append("}\nstandard output = {\n");
+ outputBuilder.append(standardOuptut);
+ outputBuilder.append("}\n");
String outputPath = outputStem + outputKind;
- String output = outputBuilder.ProduceString();
+ String output = outputBuilder.produceString();
*outOutput = output;
@@ -2954,7 +2954,7 @@ static SlangResult _extractProfileTime(const UnownedStringSlice& text, double& t
UnownedStringSlice remaining(line.begin() + lineStart.getLength(), line.end());
remaining.trim();
- timeOut = StringToDouble(String(remaining));
+ timeOut = stringToDouble(String(remaining));
return SLANG_OK;
}
}
@@ -3249,16 +3249,16 @@ TestResult doRenderComparisonTestRun(TestContext* context, TestInput& input, cha
// We construct a single output string that captures the results
StringBuilder outputBuilder;
- outputBuilder.Append("result code = ");
- outputBuilder.Append(resultCode);
- outputBuilder.Append("\nstandard error = {\n");
- outputBuilder.Append(standardError);
- outputBuilder.Append("}\nstandard output = {\n");
- outputBuilder.Append(standardOutput);
- outputBuilder.Append("}\n");
+ outputBuilder.append("result code = ");
+ outputBuilder.append(resultCode);
+ outputBuilder.append("\nstandard error = {\n");
+ outputBuilder.append(standardError);
+ outputBuilder.append("}\nstandard output = {\n");
+ outputBuilder.append(standardOutput);
+ outputBuilder.append("}\n");
String outputPath = outputStem + outputKind;
- String output = outputBuilder.ProduceString();
+ String output = outputBuilder.produceString();
*outOutput = output;
diff --git a/tools/slang-test/test-reporter.cpp b/tools/slang-test/test-reporter.cpp
index 2d252ebed..e0696eab2 100644
--- a/tools/slang-test/test-reporter.cpp
+++ b/tools/slang-test/test-reporter.cpp
@@ -22,7 +22,7 @@ static void appendXmlEncode(char c, StringBuilder& out)
case '>': out << "&gt;"; break;
case '\'': out << "&apos;"; break;
case '"': out << "&quot;"; break;
- default: out.Append(c);
+ default: out.append(c);
}
}
@@ -56,7 +56,7 @@ static void appendXmlEncode(const String& in, StringBuilder& out)
// Write it
if (cur > start)
{
- out.Append(start, UInt(end - start));
+ out.append(start, UInt(end - start));
}
// if not at the end, we must be on an xml encoded character, so just output it xml encoded.
@@ -261,11 +261,11 @@ static void _appendEncodedTeamCityString(const UnownedStringSlice& in, StringBui
// Flush
if (cur > start)
{
- builder.Append(start, UInt(cur - start));
+ builder.append(start, UInt(cur - start));
}
- builder.Append('|');
- builder.Append(escapeChar);
+ builder.append('|');
+ builder.append(escapeChar);
start = cur + 1;
}
}
@@ -273,7 +273,7 @@ static void _appendEncodedTeamCityString(const UnownedStringSlice& in, StringBui
// Flush the end
if (end > start)
{
- builder.Append(start, UInt(end - start));
+ builder.append(start, UInt(end - start));
}
}
@@ -544,7 +544,7 @@ void TestReporter::message(TestMessageType type, const String& message)
{
m_currentMessage << "\n";
}
- m_currentMessage.Append(message);
+ m_currentMessage.append(message);
}
void TestReporter::messageFormat(TestMessageType type, char const* format, ...)
diff --git a/tools/test-process/test-process-main.cpp b/tools/test-process/test-process-main.cpp
index 852b58cef..e1ff3c8a7 100644
--- a/tools/test-process/test-process-main.cpp
+++ b/tools/test-process/test-process-main.cpp
@@ -33,7 +33,7 @@ static SlangResult _outputCount(int argc, const char* const* argv)
return SLANG_FAIL;
}
// Get the count
- const Index count = StringToInt(argv[2]);
+ const Index count = stringToInt(argv[2]);
// If we want to crash
Index crashIndex = -1;
@@ -41,7 +41,7 @@ static SlangResult _outputCount(int argc, const char* const* argv)
{
// When we crash, we want to make sure everything is flushed...
_makeStdStreamsUnbuffered();
- crashIndex = StringToInt(argv[3]);
+ crashIndex = stringToInt(argv[3]);
}
FILE* fileOut = stdout;