summaryrefslogtreecommitdiff
path: root/Userland
diff options
context:
space:
mode:
authorBrian Gianforcaro <bgianf@serenityos.org>2021-04-24 20:20:14 -0700
committerAndreas Kling <kling@serenityos.org>2021-04-25 09:32:03 +0200
commit46524426fbcbe2e98d9ff6c78e1fe8bc4f5c2f7d (patch)
tree08c41506c90ce9ac26a3c1acd188ab908c40cce1 /Userland
parent4022d3cb75cf3496ebfd051f7955a5fd2e214d99 (diff)
downloadserenity-46524426fbcbe2e98d9ff6c78e1fe8bc4f5c2f7d.zip
LibWeb: Utilize SourceLocation for CSS/Parser logging
Diffstat (limited to 'Userland')
-rw-r--r--Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
index f380909d88..87784c4bc6 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
@@ -4,9 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <AK/NonnullOwnPtrVector.h>
-#include <AK/Vector.h>
-#include <LibWeb/CSS/CSSStyleRule.h>
+#include <AK/SourceLocation.h>
#include <LibWeb/CSS/Parser/AtStyleRule.h>
#include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
#include <LibWeb/CSS/Parser/Parser.h>
@@ -18,10 +16,10 @@
#define CSS_PARSER_TRACE 1
-#define PARSE_ERROR() \
- do { \
- dbgln_if(CSS_PARSER_TRACE, "Parse error (CSS) {} @ {}", __PRETTY_FUNCTION__, __LINE__); \
- } while (0)
+static void log_parse_error(const SourceLocation& location = SourceLocation::current())
+{
+ dbgln_if(CSS_PARSER_TRACE, "Parse error (CSS) {}", location);
+}
namespace Web::CSS {
@@ -161,7 +159,7 @@ AtStyleRule Parser::consume_an_at_rule()
}
if (token.is_eof()) {
- PARSE_ERROR();
+ log_parse_error();
return rule;
}
@@ -191,7 +189,7 @@ Optional<QualifiedStyleRule> Parser::consume_a_qualified_rule()
auto token = next_token();
if (token.is_eof()) {
- PARSE_ERROR();
+ log_parse_error();
return {};
}
@@ -251,7 +249,7 @@ StyleBlockRule Parser::consume_a_simple_block()
}
if (token.is_eof()) {
- PARSE_ERROR();
+ log_parse_error();
return block;
}
@@ -278,7 +276,7 @@ StyleFunctionRule Parser::consume_a_function()
}
if (token.is_eof()) {
- PARSE_ERROR();
+ log_parse_error();
return function;
}
@@ -316,7 +314,7 @@ Optional<StyleDeclarationRule> Parser::consume_a_declaration()
auto colon = next_token();
if (!colon.is_colon()) {
- PARSE_ERROR();
+ log_parse_error();
return {};
}
@@ -402,7 +400,7 @@ Vector<DeclarationOrAtRule> Parser::consume_a_list_of_declarations()
}
}
- PARSE_ERROR();
+ log_parse_error();
reconsume_current_input_token();
auto peek = peek_token();
if (!(peek.is_semicolon() || peek.is_eof())) {