From 442f8c6d3d42b892e3f13128bcb6487ff7508f0d Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 19 Jun 2019 16:05:40 -0400 Subject: Make extractLine return a bool. (#991) --- tools/slang-test/unit-test-string.cpp | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'tools/slang-test/unit-test-string.cpp') diff --git a/tools/slang-test/unit-test-string.cpp b/tools/slang-test/unit-test-string.cpp index 6110ca55e..5811a4a64 100644 --- a/tools/slang-test/unit-test-string.cpp +++ b/tools/slang-test/unit-test-string.cpp @@ -26,36 +26,21 @@ static bool _areEqual(const List& lines, const UnownedString static bool _checkLines(const UnownedStringSlice& input, const UnownedStringSlice* checkLines, Int checkLinesCount) { List lines; - UnownedStringSlice text(input); - while (true) - { - UnownedStringSlice line = StringUtil::extractLine(text); - if (line.begin() == nullptr) - { - return _areEqual(lines, checkLines, checkLinesCount); - } - lines.add(line); - } + StringUtil::calcLines(input, lines); + return _areEqual(lines, checkLines, checkLinesCount); } static bool _checkLineParser(const UnownedStringSlice& input) { - UnownedStringSlice remaining(input); - for (const auto line : LineParser(input)) + UnownedStringSlice remaining(input), line; + for (const auto parserLine : LineParser(input)) { - UnownedStringSlice extractLine = StringUtil::extractLine(remaining); - if (line != extractLine) + if (!StringUtil::extractLine(remaining, line) || line != parserLine) { return false; } - // Handle hitting the end - if (line.begin() == nullptr || extractLine.begin() == nullptr) - { - return line.begin() == extractLine.begin(); - } } - - return remaining.begin() == nullptr; + return StringUtil::extractLine(remaining, line) == false; } static void stringUnitTest() -- cgit v1.2.3