RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:07:34 +00:00
Code Issues Activity Actions

AK+LibXML+JSSpecCompiler: Move LineTrackingLexer to AK

Browse source 
This is a simple extension of GenericLexer, and is used in more than
just LibXML, so let's move it into AK.
The move also resolves a FIXME, which is removed in this commit.
This commit is contained in:
Ali Mohammad Pur 2024-02-16 04:55:17 +03:30 • committed by Andreas Kling
parent 08c02ad888
commit bc301b6f40
8 changed files with 79 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Userland/Libraries/LibXML/Parser/Parser.cpp
View file

@ -66,31 +66,6 @@ consteval static auto set_to_search()
namespace XML {
Offset LineTrackingLexer::offset_for(size_t index) const
{
auto& [cached_index, cached_line, cached_column] = m_cached_offset;
if (cached_index <= index) {
for (size_t i = cached_index; i < index; ++i) {
if (m_input[i] == '\n')
++cached_line, cached_column = 0;
else
++cached_column;
}
} else {
auto lines_backtracked = m_input.substring_view(index, cached_index - index).count('\n');
cached_line -= lines_backtracked;
if (lines_backtracked == 0) {
cached_column -= cached_index - index;
} else {
auto current_line_start = m_input.substring_view(0, index).find_last('\n').value_or(0);
cached_column = index - current_line_start;
}
}
cached_index = index;
return m_cached_offset;
}
size_t Parser::s_debug_indent_level { 0 };
void Parser::append_node(NonnullOwnPtr<Node> node)
@ -105,7 +80,7 @@ void Parser::append_node(NonnullOwnPtr<Node> node)
}
}
void Parser::append_text(StringView text, Offset offset)
void Parser::append_text(StringView text, LineTrackingLexer::Position position)
{
if (m_listener) {
m_listener->text(text);
@ -115,7 +90,7 @@ void Parser::append_text(StringView text, Offset offset)
if (!m_entered_node) {
Node::Text node;
node.builder.append(text);
m_root_node = make<Node>(offset, move(node));
m_root_node = make<Node>(position, move(node));
return;
}
@ -130,7 +105,7 @@ void Parser::append_text(StringView text, Offset offset)
}
Node::Text text_node;
text_node.builder.append(text);
node.children.append(make<Node>(offset, move(text_node), m_entered_node));
node.children.append(make<Node>(position, move(text_node), m_entered_node));
},
[&](auto&) {
// Can't enter a text or comment node.
@ -138,7 +113,7 @@ void Parser::append_text(StringView text, Offset offset)
});
}
void Parser::append_comment(StringView text, Offset offset)
void Parser::append_comment(StringView text, LineTrackingLexer::Position position)
{
if (m_listener) {
m_listener->comment(text);
@ -152,7 +127,7 @@ void Parser::append_comment(StringView text, Offset offset)
m_entered_node->content.visit(
[&](Node::Element& node) {
node.children.append(make<Node>(offset, Node::Comment { text }, m_entered_node));
node.children.append(make<Node>(position, Node::Comment { text }, m_entered_node));
},
[&](auto&) {
// Can't enter a text or comment node.
@ -507,7 +482,7 @@ ErrorOr<void, ParseError> Parser::parse_comment()
TRY(expect("-->"sv));
if (m_options.preserve_comments)
append_comment(text, m_lexer.offset_for(comment_start));
append_comment(text, m_lexer.position_for(comment_start));
rollback.disarm();
return {};
@ -699,7 +674,7 @@ ErrorOr<NonnullOwnPtr<Node>, ParseError> Parser::parse_empty_element_tag()
TRY(expect("/>"sv));
rollback.disarm();
return make<Node>(m_lexer.offset_for(tag_start), Node::Element { move(name), move(attributes), {} });
return make<Node>(m_lexer.position_for(tag_start), Node::Element { move(name), move(attributes), {} });
}
// 3.1.41. Attribute, https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-Attribute
@ -851,7 +826,7 @@ ErrorOr<NonnullOwnPtr<Node>, ParseError> Parser::parse_start_tag()
TRY(expect(">"sv));
rollback.disarm();
return make<Node>(m_lexer.offset_for(tag_start), Node::Element { move(name), move(attributes), {} });
return make<Node>(m_lexer.position_for(tag_start), Node::Element { move(name), move(attributes), {} });
}
// 3.1.42 ETag, https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-ETag
@ -881,7 +856,7 @@ ErrorOr<void, ParseError> Parser::parse_content()
// content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)*
auto content_start = m_lexer.tell();
if (auto result = parse_char_data(); !result.is_error())
append_text(result.release_value(), m_lexer.offset_for(content_start));
append_text(result.release_value(), m_lexer.position_for(content_start));
while (true) {
auto node_start = m_lexer.tell();
@ -890,7 +865,7 @@ ErrorOr<void, ParseError> Parser::parse_content()
goto try_char_data;
if (auto result = parse_reference(); !result.is_error()) {
auto reference = result.release_value();
auto reference_offset = m_lexer.offset_for(node_start);
auto reference_offset = m_lexer.position_for(node_start);
if (auto char_reference = reference.get_pointer<ByteString>())
append_text(*char_reference, reference_offset);
else
@ -899,7 +874,7 @@ ErrorOr<void, ParseError> Parser::parse_content()
}
if (auto result = parse_cdata_section(); !result.is_error()) {
if (m_options.preserve_cdata)
append_text(result.release_value(), m_lexer.offset_for(node_start));
append_text(result.release_value(), m_lexer.position_for(node_start));
goto try_char_data;
}
if (auto result = parse_processing_instruction(); !result.is_error())
@ -911,7 +886,7 @@ ErrorOr<void, ParseError> Parser::parse_content()
try_char_data:;
if (auto result = parse_char_data(); !result.is_error())
append_text(result.release_value(), m_lexer.offset_for(node_start));
append_text(result.release_value(), m_lexer.position_for(node_start));
}
rollback.disarm();