RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 17:44:58 +00:00
Code Issues Activity Actions

LibWeb: Remove StringBuilder from HTMLToken::m_comment_or_character

Browse source
This commit is contained in:
Gunnar Beutner 2021-05-23 09:31:40 +02:00 • committed by Andreas Kling
parent 3aa202c432
commit c3ad8e9a52
5 changed files with 54 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Userland/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.cpp
View file

@ -74,17 +74,18 @@ namespace Web::HTML {
goto new_state; \
} while (0)
#define FLUSH_CODEPOINTS_CONSUMED_AS_A_CHARACTER_REFERENCE \
do { \
for (auto code_point : m_temporary_buffer) { \
if (consumed_as_part_of_an_attribute()) { \
m_current_builder.append_code_point(code_point); \
} else { \
create_new_token(HTMLToken::Type::Character); \
m_current_token.m_comment_or_character.data.append_code_point(code_point); \
m_queued_tokens.enqueue(m_current_token); \
} \
} \
#define FLUSH_CODEPOINTS_CONSUMED_AS_A_CHARACTER_REFERENCE \
do { \
for (auto code_point : m_temporary_buffer) { \
if (consumed_as_part_of_an_attribute()) { \
m_current_builder.append_code_point(code_point); \
} else { \
create_new_token(HTMLToken::Type::Character); \
m_current_builder.append_code_point(code_point); \
m_current_token.m_comment_or_character.data = consume_current_builder(); \
m_queued_tokens.enqueue(m_current_token); \
} \
} \
} while (0)
#define DONT_CONSUME_NEXT_INPUT_CHARACTER \
@ -139,12 +140,13 @@ namespace Web::HTML {
return m_queued_tokens.dequeue(); \
} while (0)
#define EMIT_CHARACTER(code_point) \
do { \
create_new_token(HTMLToken::Type::Character); \
m_current_token.m_comment_or_character.data.append_code_point(code_point); \
m_queued_tokens.enqueue(m_current_token); \
return m_queued_tokens.dequeue(); \
#define EMIT_CHARACTER(code_point) \
do { \
create_new_token(HTMLToken::Type::Character); \
m_current_builder.append_code_point(code_point); \
m_current_token.m_comment_or_character.data = consume_current_builder(); \
m_queued_tokens.enqueue(m_current_token); \
return m_queued_tokens.dequeue(); \
} while (0)
#define EMIT_CURRENT_CHARACTER \
@ -402,6 +404,7 @@ _StartOfFunction:
{
ON('>')
{
m_current_token.m_comment_or_character.data = consume_current_builder();
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
}
ON_EOF
@ -412,12 +415,12 @@ _StartOfFunction:
ON(0)
{
log_parse_error();
m_current_token.m_comment_or_character.data.append_code_point(0xFFFD);
m_current_builder.append_code_point(0xFFFD);
continue;
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append_code_point(current_input_character.value());
m_current_builder.append_code_point(current_input_character.value());
continue;
}
}
@ -1346,11 +1349,12 @@ _StartOfFunction:
{
ON('-')
{
SWITCH_TO(CommentEnd);
SWITCH_TO_WITH_UNCLEAN_BUILDER(CommentEnd);
}
ON('>')
{
log_parse_error();
consume_current_builder();
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
}
ON_EOF
@ -1361,7 +1365,7 @@ _StartOfFunction:
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append('-');
m_current_builder.append('-');
RECONSUME_IN(Comment);
}
}
@ -1371,17 +1375,17 @@ _StartOfFunction:
{
ON('<')
{
m_current_token.m_comment_or_character.data.append_code_point(current_input_character.value());
SWITCH_TO(CommentLessThanSign);
m_current_builder.append_code_point(current_input_character.value());
SWITCH_TO_WITH_UNCLEAN_BUILDER(CommentLessThanSign);
}
ON('-')
{
SWITCH_TO(CommentEndDash);
SWITCH_TO_WITH_UNCLEAN_BUILDER(CommentEndDash);
}
ON(0)
{
log_parse_error();
m_current_token.m_comment_or_character.data.append_code_point(0xFFFD);
m_current_builder.append_code_point(0xFFFD);
continue;
}
ON_EOF
@ -1392,7 +1396,7 @@ _StartOfFunction:
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append_code_point(current_input_character.value());
m_current_builder.append_code_point(current_input_character.value());
continue;
}
}
@ -1402,6 +1406,7 @@ _StartOfFunction:
{
ON('>')
{
m_current_token.m_comment_or_character.data = consume_current_builder();
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
}
ON('!')
@ -1410,7 +1415,7 @@ _StartOfFunction:
}
ON('-')
{
m_current_token.m_comment_or_character.data.append('-');
m_current_builder.append('-');
continue;
}
ON_EOF
@ -1421,7 +1426,7 @@ _StartOfFunction:
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append('-');
m_current_builder.append('-');
RECONSUME_IN(Comment);
}
}
@ -1431,7 +1436,7 @@ _StartOfFunction:
{
ON('-')
{
m_current_token.m_comment_or_character.data.append("--!");
m_current_builder.append("--!");
SWITCH_TO(CommentEndDash);
}
ON('>')
@ -1447,7 +1452,7 @@ _StartOfFunction:
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append("--!");
m_current_builder.append("--!");
RECONSUME_IN(Comment);
}
}
@ -1457,7 +1462,7 @@ _StartOfFunction:
{
ON('-')
{
SWITCH_TO(CommentEnd);
SWITCH_TO_WITH_UNCLEAN_BUILDER(CommentEnd);
}
ON_EOF
{
@ -1467,7 +1472,7 @@ _StartOfFunction:
}
ANYTHING_ELSE
{
m_current_token.m_comment_or_character.data.append('-');
m_current_builder.append('-');
RECONSUME_IN(Comment);
}
}
@ -1477,12 +1482,12 @@ _StartOfFunction:
{
ON('!')
{
m_current_token.m_comment_or_character.data.append_code_point(current_input_character.value());
SWITCH_TO(CommentLessThanSignBang);
m_current_builder.append_code_point(current_input_character.value());
SWITCH_TO_WITH_UNCLEAN_BUILDER(CommentLessThanSignBang);
}
ON('<')
{
m_current_token.m_comment_or_character.data.append_code_point(current_input_character.value());
m_current_builder.append_code_point(current_input_character.value());
continue;
}
ANYTHING_ELSE