format

Author: igagis

src/svgdom/elements/shapes.cpp

@@ -240,19 +240,12 @@ decltype(path_element::path) path_element::parse(std::string_view str)
 
 			p.skip_whitespaces_and_comma();
 		}
-		// NOLINTNEXTLINE(bugprone-empty-catch)
-	} catch (
-		std::invalid_argument&
-#ifdef DEBUG
-			e
-#endif
-	)
-	{
-		LOG([&](auto& o) {
+	} catch (std::invalid_argument& e) {
+		utki::log_debug([&](auto& o) {
 			o << "WARNING: path_element::parse(): std::invalid_argument exception caught, ignored." << '\n'
-			  << "e.what() = " << e.what() << std::endl;
-		})
-		// ignore
+			  << "  e.what() = " << e.what() << std::endl;
+		});
+		// ignore the exception
 	}
 
 	return ret;
@@ -477,19 +470,12 @@ decltype(polyline_shape::points) polyline_shape::parse(std::string_view s)
 
 			p.skip_whitespaces_and_comma();
 		}
-		// NOLINTNEXTLINE(bugprone-empty-catch)
-	} catch (
-		std::invalid_argument&
-#ifdef DEBUG
-			e
-#endif
-	)
-	{
-		LOG([&](auto& o) {
+	} catch (std::invalid_argument& e) {
+		utki::log_debug([&](auto& o) {
 			o << "WARNING: polyline_shape::parse(): std::invalid_argument exception caught, ignored." << '\n'
-			  << "e.what() = " << e.what() << std::endl;
-		})
-		// ignore
+			  << "  e.what() = " << e.what() << std::endl;
+		});
+		// ignore the exception
 	}
 
 	return ret;

src/svgdom/elements/transformable.cpp

@@ -194,18 +194,12 @@ decltype(transformable::transformations) transformable::parse(std::string_view s
 			p.skip_whitespaces_and_comma();
 		}
 		// NOLINTNEXTLINE(bugprone-empty-catch)
-	} catch (
-		std::invalid_argument&
-#ifdef DEBUG
-			e
-#endif
-	)
-	{
-		LOG([&](auto& o) {
+	} catch (std::invalid_argument& e) {
+		utki::log_debug([&](auto& o) {
 			o << "WARNING: transformable::parse(): std::invalid_argument exception caught, ignored." << '\n'
-			  << "e.what() = " << e.what() << std::endl;
-		})
-		// ignore
+			  << "  e.what() = " << e.what() << std::endl;
+		});
+		// ignore the exception
 	}
 
 	return ret;

src/svgdom/parser.cpp

@@ -1026,23 +1026,21 @@ class parse_content_visitor : public visitor
 
 	void visit(style_element& e) override
 	{
-		e.css.append(
-			cssom::read(
-				papki::span_file(this->content),
-				[](std::string_view name) -> uint32_t {
-					return uint32_t(styleable::string_to_property(name));
-				},
-				[](uint32_t id, std::string_view v) -> std::unique_ptr<cssom::property_value_base> {
-					auto sp = style_property(id);
-					if (sp == style_property::unknown) {
-						return nullptr;
-					}
-					auto ret = std::make_unique<style_element::css_style_value>();
-					ret->value = styleable::parse_style_property_value(sp, v);
-					return ret;
+		e.css.append(cssom::read(
+			papki::span_file(this->content),
+			[](std::string_view name) -> uint32_t {
+				return uint32_t(styleable::string_to_property(name));
+			},
+			[](uint32_t id, std::string_view v) -> std::unique_ptr<cssom::property_value_base> {
+				auto sp = style_property(id);
+				if (sp == style_property::unknown) {
+					return nullptr;
 				}
-			)
-		);
+				auto ret = std::make_unique<style_element::css_style_value>();
+				ret->value = styleable::parse_style_property_value(sp, v);
+				return ret;
+			}
+		));
 	}
 };
 } // namespace

src/svgdom/util/casters.hpp

@@ -170,15 +170,23 @@ class styleable_caster_template : public std::conditional_t<is_const, const_visi
 		this->pointer = &e;
 	}
 
-	void visit(
-		typename std::conditional_t<is_const, const linear_gradient_element&, linear_gradient_element&> e
+	void visit( //
+		typename std::conditional_t<
+			is_const,
+			const linear_gradient_element&, //
+			linear_gradient_element& //
+			> e //
 	) override
 	{
 		this->pointer = &e;
 	}
 
-	void visit(
-		typename std::conditional_t<is_const, const radial_gradient_element&, radial_gradient_element&> e
+	void visit( //
+		typename std::conditional_t<
+			is_const,
+			const radial_gradient_element&, //
+			radial_gradient_element& //
+			> e //
 	) override
 	{
 		this->pointer = &e;
@@ -189,15 +197,23 @@ class styleable_caster_template : public std::conditional_t<is_const, const_visi
 		this->pointer = &e;
 	}
 
-	void visit(
-		typename std::conditional_t<is_const, const fe_gaussian_blur_element&, fe_gaussian_blur_element&> e
+	void visit( //
+		typename std::conditional_t<
+			is_const,
+			const fe_gaussian_blur_element&, //
+			fe_gaussian_blur_element& //
+			> e //
 	) override
 	{
 		this->pointer = &e;
 	}
 
-	void visit(
-		typename std::conditional_t<is_const, const fe_color_matrix_element&, fe_color_matrix_element&> e
+	void visit( //
+		typename std::conditional_t<
+			is_const,
+			const fe_color_matrix_element&, //
+			fe_color_matrix_element& //
+			> e //
 	) override
 	{
 		this->pointer = &e;