From 2368e6c5f2c6c02f64bb32b16f228c8edb1da4f4 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Sat, 11 Feb 2023 16:31:54 +0000 Subject: [PATCH] LibWeb: Convert CSS Token/ComponentValue::to_debug_string() to String These are only used for debugging, so I've decided that logging the ErrorOr itself is fine instead of trying to handle that error more gracefully in those cases. If you're getting OOM trying to debug log things, you have bigger problems. --- .../LibWeb/CSS/Parser/ComponentValue.cpp | 14 ++--- .../LibWeb/CSS/Parser/ComponentValue.h | 2 +- .../Libraries/LibWeb/CSS/Parser/Token.cpp | 52 +++++++++---------- Userland/Libraries/LibWeb/CSS/Parser/Token.h | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp index d30bd5e8de..5768a8dd68 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.cpp @@ -34,17 +34,17 @@ DeprecatedString ComponentValue::to_deprecated_string() const [](NonnullRefPtr const& function) { return function->to_deprecated_string(); }); } -DeprecatedString ComponentValue::to_debug_string() const +ErrorOr ComponentValue::to_debug_string() const { return m_value.visit( - [](Token const& token) { - return DeprecatedString::formatted("Token: {}", token.to_debug_string()); + [](Token const& token) -> ErrorOr { + return String::formatted("Token: {}", TRY(token.to_debug_string())); }, - [](NonnullRefPtr const& block) { - return DeprecatedString::formatted("Block: {}", block->to_deprecated_string()); + [](NonnullRefPtr const& block) -> ErrorOr { + return String::formatted("Block: {}", block->to_deprecated_string()); }, - [](NonnullRefPtr const& function) { - return DeprecatedString::formatted("Function: {}", function->to_deprecated_string()); + [](NonnullRefPtr const& function) -> ErrorOr { + return String::formatted("Function: {}", function->to_deprecated_string()); }); } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.h b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.h index 4ad73f7028..8bec23ad22 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/ComponentValue.h @@ -34,7 +34,7 @@ public: operator Token() const { return m_value.get(); } DeprecatedString to_deprecated_string() const; - DeprecatedString to_debug_string() const; + ErrorOr to_debug_string() const; private: Variant, NonnullRefPtr> m_value; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Token.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Token.cpp index 88e2f68c56..c4c16581fd 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Token.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Token.cpp @@ -79,62 +79,62 @@ DeprecatedString Token::to_deprecated_string() const } } -DeprecatedString Token::to_debug_string() const +ErrorOr Token::to_debug_string() const { switch (m_type) { case Type::Invalid: VERIFY_NOT_REACHED(); case Type::EndOfFile: - return "__EOF__"; + return String::from_utf8("__EOF__"sv); case Type::Ident: - return DeprecatedString::formatted("Ident: {}", ident()); + return String::formatted("Ident: {}", ident()); case Type::Function: - return DeprecatedString::formatted("Function: {}", function()); + return String::formatted("Function: {}", function()); case Type::AtKeyword: - return DeprecatedString::formatted("AtKeyword: {}", at_keyword()); + return String::formatted("AtKeyword: {}", at_keyword()); case Type::Hash: - return DeprecatedString::formatted("Hash: {} (hash_type: {})", hash_value(), m_hash_type == HashType::Unrestricted ? "Unrestricted" : "Id"); + return String::formatted("Hash: {} (hash_type: {})", hash_value(), m_hash_type == HashType::Unrestricted ? "Unrestricted" : "Id"); case Type::String: - return DeprecatedString::formatted("String: {}", string()); + return String::formatted("String: {}", string()); case Type::BadString: - return "BadString"; + return String::from_utf8("BadString"sv); case Type::Url: - return DeprecatedString::formatted("Url: {}", url()); + return String::formatted("Url: {}", url()); case Type::BadUrl: - return "BadUrl"; + return String::from_utf8("BadUrl"sv); case Type::Delim: - return DeprecatedString::formatted("Delim: {}", m_value); + return String::formatted("Delim: {}", m_value); case Type::Number: - return DeprecatedString::formatted("Number: {}{} (number_type: {})", m_number_value.value() > 0 && m_number_value.is_integer_with_explicit_sign() ? "+" : "", m_number_value.value(), m_number_value.is_integer() ? "Integer" : "Number"); + return String::formatted("Number: {}{} (number_type: {})", m_number_value.value() > 0 && m_number_value.is_integer_with_explicit_sign() ? "+" : "", m_number_value.value(), m_number_value.is_integer() ? "Integer" : "Number"); case Type::Percentage: - return DeprecatedString::formatted("Percentage: {}% (number_type: {})", percentage(), m_number_value.is_integer() ? "Integer" : "Number"); + return String::formatted("Percentage: {}% (number_type: {})", percentage(), m_number_value.is_integer() ? "Integer" : "Number"); case Type::Dimension: - return DeprecatedString::formatted("Dimension: {}{} (number_type: {})", dimension_value(), dimension_unit(), m_number_value.is_integer() ? "Integer" : "Number"); + return String::formatted("Dimension: {}{} (number_type: {})", dimension_value(), dimension_unit(), m_number_value.is_integer() ? "Integer" : "Number"); case Type::Whitespace: - return "Whitespace"; + return String::from_utf8("Whitespace"sv); case Type::CDO: - return "CDO"; + return String::from_utf8("CDO"sv); case Type::CDC: - return "CDC"; + return String::from_utf8("CDC"sv); case Type::Colon: - return "Colon"; + return String::from_utf8("Colon"sv); case Type::Semicolon: - return "Semicolon"; + return String::from_utf8("Semicolon"sv); case Type::Comma: - return "Comma"; + return String::from_utf8("Comma"sv); case Type::OpenSquare: - return "OpenSquare"; + return String::from_utf8("OpenSquare"sv); case Type::CloseSquare: - return "CloseSquare"; + return String::from_utf8("CloseSquare"sv); case Type::OpenParen: - return "OpenParen"; + return String::from_utf8("OpenParen"sv); case Type::CloseParen: - return "CloseParen"; + return String::from_utf8("CloseParen"sv); case Type::OpenCurly: - return "OpenCurly"; + return String::from_utf8("OpenCurly"sv); case Type::CloseCurly: - return "CloseCurly"; + return String::from_utf8("CloseCurly"sv); } VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Token.h b/Userland/Libraries/LibWeb/CSS/Parser/Token.h index ee6b842588..afcd4149b8 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Token.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Token.h @@ -146,7 +146,7 @@ public: StringView bracket_mirror_string() const; DeprecatedString to_deprecated_string() const; - DeprecatedString to_debug_string() const; + ErrorOr to_debug_string() const; Position const& start_position() const { return m_start_position; } Position const& end_position() const { return m_end_position; }