RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

LibWeb: Utilize SourceLocation for CSS/Tokenizer logging

Browse source
This commit is contained in:
Brian Gianforcaro 2021-04-24 20:21:18 -07:00 • committed by Andreas Kling
parent 46524426fb
commit 1411ae1bc7
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibWeb/CSS/Parser/Tokenizer.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/SourceLocation.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibTextCodec/Decoder.h> #include <LibTextCodec/Decoder.h>
#include <LibWeb/CSS/Parser/Tokenizer.h> #include <LibWeb/CSS/Parser/Tokenizer.h>
@ -11,14 +12,14 @@
#define CSS_TOKENIZER_TRACE 0 #define CSS_TOKENIZER_TRACE 0
#define PARSE_ERROR() \
do { \
dbgln_if(CSS_TOKENIZER_TRACE, "Parse error (css tokenization) {} @ {}", __PRETTY_FUNCTION__, __LINE__); \
} while (0)
//U+FFFD REPLACEMENT CHARACTER (<28>) //U+FFFD REPLACEMENT CHARACTER (<28>)
#define REPLACEMENT_CHARACTER 0xFFFD #define REPLACEMENT_CHARACTER 0xFFFD
static inline void log_parse_error(const SourceLocation& location = SourceLocation::current())
{
dbgln_if(CSS_TOKENIZER_TRACE, "Parse error (css tokenization) {} ", location);
}
static inline bool is_surrogate(u32 codepoint) static inline bool is_surrogate(u32 codepoint)
{ {
return (codepoint & 0xfffff800) == 0xd800; return (codepoint & 0xfffff800) == 0xd800;
@ -296,7 +297,7 @@ u32 Tokenizer::consume_escaped_codepoint()
auto codepoint = next_codepoint(); auto codepoint = next_codepoint();
if (!codepoint.has_value()) { if (!codepoint.has_value()) {
PARSE_ERROR(); log_parse_error();
return REPLACEMENT_CHARACTER; return REPLACEMENT_CHARACTER;
} }
@ -324,7 +325,7 @@ u32 Tokenizer::consume_escaped_codepoint()
} }
if (!input) { if (!input) {
PARSE_ERROR(); log_parse_error();
return REPLACEMENT_CHARACTER; return REPLACEMENT_CHARACTER;
} }
@ -465,7 +466,7 @@ Token Tokenizer::consume_a_url_token()
auto codepoint = peek_codepoint(); auto codepoint = peek_codepoint();
if (!codepoint.has_value()) { if (!codepoint.has_value()) {
PARSE_ERROR(); log_parse_error();
return token; return token;
} }
@ -486,7 +487,7 @@ Token Tokenizer::consume_a_url_token()
} }
if (!codepoint.has_value()) { if (!codepoint.has_value()) {
PARSE_ERROR(); log_parse_error();
return token; return token;
} }
@ -501,7 +502,7 @@ Token Tokenizer::consume_a_url_token()
} }
if (is_quotation_mark(input) || is_apostrophe(input) || is_left_paren(input) || is_non_printable(input)) { if (is_quotation_mark(input) || is_apostrophe(input) || is_left_paren(input) || is_non_printable(input)) {
PARSE_ERROR(); log_parse_error();
(void)next_codepoint(); (void)next_codepoint();
consume_the_remnants_of_a_bad_url(); consume_the_remnants_of_a_bad_url();
return create_new_token(Token::TokenType::BadUrl); return create_new_token(Token::TokenType::BadUrl);
@ -511,7 +512,7 @@ Token Tokenizer::consume_a_url_token()
if (is_valid_escape_sequence()) { if (is_valid_escape_sequence()) {
token.m_value.append_code_point(consume_escaped_codepoint()); token.m_value.append_code_point(consume_escaped_codepoint());
} else { } else {
PARSE_ERROR(); log_parse_error();
(void)next_codepoint(); (void)next_codepoint();
consume_the_remnants_of_a_bad_url(); consume_the_remnants_of_a_bad_url();
return create_new_token(Token::TokenType::BadUrl); return create_new_token(Token::TokenType::BadUrl);
@ -657,7 +658,7 @@ Token Tokenizer::consume_string_token(u32 ending_codepoint)
auto codepoint = next_codepoint(); auto codepoint = next_codepoint();
if (!codepoint.has_value()) { if (!codepoint.has_value()) {
PARSE_ERROR(); log_parse_error();
return token; return token;
} }
@ -694,7 +695,7 @@ void Tokenizer::consume_comments()
start: start:
auto peek = peek_twin(); auto peek = peek_twin();
if (!peek.has_value()) { if (!peek.has_value()) {
PARSE_ERROR(); log_parse_error();
return; return;
} }
@ -708,7 +709,7 @@ start:
for (;;) { for (;;) {
auto peek_inner = peek_twin(); auto peek_inner = peek_twin();
if (!peek_inner.has_value()) { if (!peek_inner.has_value()) {
PARSE_ERROR(); log_parse_error();
return; return;
} }
@ -882,7 +883,7 @@ Token Tokenizer::consume_a_token()
return consume_an_ident_like_token(); return consume_an_ident_like_token();
} }
PARSE_ERROR(); log_parse_error();
return create_value_token(Token::TokenType::Delim, input); return create_value_token(Token::TokenType::Delim, input);
} }