review.

Author: schaumb

src/base/anim/easing.cpp

@@ -45,7 +45,7 @@ Easing::Easing(const std::string &name)
 		func = EasingGradient::Bezier(Geom::Point{0.42, 0},
 		    Geom::Point{0.58, 1});
 	}
-	else if (const Text::FuncString f(nameCopy, false);
+	else if (const Text::FuncString f(nameCopy);
 	         f.getName() == "cubic-bezier") {
 		if (f.getParams().size() != 4)
 			throw std::logic_error("parameter count missmatch");

src/base/gfx/color.cpp

@@ -44,7 +44,7 @@ Color Color::fromString(const std::string &string)
 		    ((g << 4U) + g) / 255.0,
 		    ((b << 4U) + b) / 255.0};
 	}
-	if (const Text::FuncString f(string, false); !f.isEmpty()) {
+	if (const Text::FuncString f(string); !f.isEmpty()) {
 		using Conv::parse;
 
 		if (f.getName() == "rgb") {

src/base/gfx/colortransform.cpp

@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "base/text/funcstring.h"
+#include "base/text/smartstring.h"
 
 #include "color.h"
 
@@ -14,10 +15,9 @@ namespace Gfx
 
 ColorTransform ColorTransform::fromString(const std::string &code)
 {
-	const Text::FuncString func(code, false);
+	if (Text::SmartString::trim_view(code) == "none") return None();
 
-	if (func.getName() == "none" && func.getParams().empty())
-		return None();
+	const Text::FuncString func(code);
 
 	if (func.isEmpty()) return {};
 

src/base/text/funcstring.cpp

@@ -23,10 +23,7 @@ FuncString::FuncString(std::string code, bool throwOnError)
 	}
 
 	if (parts[1].empty() || parts[1].back() != ')') {
-		if (!throwOnError) {
-			name = std::move(code);
-			return;
-		}
+		if (!throwOnError) return;
 
 		throw std::logic_error("invalid function format");
 	}

src/base/text/funcstring.h

@@ -12,7 +12,14 @@ class FuncString
 public:
 	using Params = std::vector<std::string>;
 
-	explicit FuncString(std::string code, bool throwOnError = true);
+	[[nodiscard]] static FuncString fromString(
+	    const std::string &code)
+	{
+		return FuncString{code, true};
+	}
+
+	explicit FuncString(std::string code, bool throwOnError = false);
+
 	[[nodiscard]] bool isEmpty() const { return name.empty(); }
 	[[nodiscard]] const std::string &getName() const { return name; }
 	[[nodiscard]] const Params &getParams() const { return params; }

src/base/text/smartstring.cpp

@@ -4,7 +4,9 @@
 #include <algorithm>
 #include <cctype>
 #include <cstddef>
+#include <iterator>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -15,18 +17,25 @@
 
 namespace Text::SmartString
 {
-void trim(std::string &string)
+
+std::string_view trim_view(const std::string_view &string)
 {
 	auto ignore = [](unsigned char c)
 	{
 		return std::isspace(c);
 	};
-	string.erase(string.begin(),
-	    std::find_if_not(string.begin(), string.end(), ignore));
-	string.erase(
-	    std::find_if_not(string.rbegin(), string.rend(), ignore)
-	        .base(),
-	    string.end());
+	const auto *start = std::ranges::find_if_not(string, ignore);
+	return {start,
+	    std::find_if_not(string.rbegin(),
+	        std::reverse_iterator{start},
+	        ignore)
+	        .base()};
+}
+
+void trim(std::string &string)
+{
+	auto &&view = trim_view(string);
+	string.assign(view.begin(), view.end());
 }
 
 std::vector<std::string> split(const std::string &str,

src/base/text/smartstring.h

@@ -19,6 +19,8 @@ namespace SmartString
     bool ignoreEmpty = false,
     const char *parens = nullptr);
 
+std::string_view trim_view(const std::string_view &string);
+
 void trim(std::string &string);
 
 [[nodiscard]] std::string fromPhysicalValue(double value,

test/unit/base/text/funcstring.cpp

@@ -1,6 +1,7 @@
 #include "base/text/funcstring.h"
 
 #include "../../util/test.h"
+#include "base/conv/parse.h"
 
 using test::check;
 using test::collection;
@@ -101,7 +102,7 @@ const static auto tests =
             {
 	            throws<std::exception>() << []
 	            {
-		            FuncString("foo");
+		            Conv::parse<FuncString>("foo");
 	            };
             })