libshvcore: Rewrite utils::joinPath

silicon-heaven · Feb 17, 2024 · 985cba2 · 985cba2
1 parent 2b1fb54
commit 985cba2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/libshvcore/include/shv/core/utils.h b/libshvcore/include/shv/core/utils.h
@@ -134,17 +134,22 @@ SHVCORE_DECL_EXPORT StringView getToken(StringView strv, char delim = ' ', char
 SHVCORE_DECL_EXPORT StringView slice(StringView s, int start, int end);
 
 SHVCORE_DECL_EXPORT std::string joinPath(const StringView &p1, const StringView &p2);
-SHVCORE_DECL_EXPORT std::string joinPath();
-template <typename StringType>
-StringType joinPath(const StringType& str)
+
+template <typename Type>
+const auto always_false = std::false_type::value;
+
+template <typename... Types>
+void joinPath(const Types& ...pack)
 {
-	return str;
+	static_assert(sizeof...(pack) >= 2, "Can't use joinPath with less than two paths.");
 }
 
-template <typename HeadStringType, typename... StringTypes>
-std::string joinPath(const HeadStringType& head, const StringTypes& ...rest)
+template <typename FirstStringType, typename SecondStringType, typename... RestStringTypes>
+std::string joinPath(const FirstStringType& head, const SecondStringType& second, const RestStringTypes& ...rest)
 {
-	return joinPath(StringView(head), StringView(joinPath(rest...)));
+	std::string res = joinPath(std::string_view(head), std::string_view(second));
+	((res = joinPath(std::string_view(res), std::string_view(rest))), ...);
+	return res;
 }
 
 template <typename Container>

diff --git a/libshvcore/src/utils.cpp b/libshvcore/src/utils.cpp
@@ -156,11 +156,6 @@ std::string Utils::joinPath(const StringView &p1, const StringView &p2)
 	return utils::joinPath(p1, p2);
 }
 
-std::string utils::joinPath()
-{
-	return {};
-}
-
 std::string utils::joinPath(const StringView &p1, const StringView &p2)
 {
 	StringView sv1(p1);

diff --git a/libshvcore/tests/test_utils.cpp b/libshvcore/tests/test_utils.cpp
@@ -87,14 +87,12 @@ DOCTEST_TEST_CASE("joinPath")
 DOCTEST_TEST_CASE("joinPath - variadic arguments")
 {
 	// The function takes any number of args.
-	REQUIRE(joinPath(std::string("a")) == "a");
 	REQUIRE(joinPath(std::string("a"), std::string("b")) == "a/b");
 	REQUIRE(joinPath(std::string("a"), std::string("b"), std::string("c")) == "a/b/c");
 	REQUIRE(joinPath(std::string("a"), std::string("b"), std::string("c"), std::string("d")) == "a/b/c/d");
 	REQUIRE(joinPath(std::string("a"), std::string("b"), std::string("c"), std::string("d"), std::string("e")) == "a/b/c/d/e");
 
 	// The function supports character literals.
-	REQUIRE(joinPath("a") == "a");
 	REQUIRE(joinPath("a", "b") == "a/b");
 	REQUIRE(joinPath(std::string("a"), "b") == "a/b");
 	REQUIRE(joinPath("a", std::string("b")) == "a/b");