RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 15:07:44 +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

25
AK/GenericLexer.cpp
View file

@ -176,6 +176,31 @@ ErrorOr<T> GenericLexer::consume_decimal_integer()
}
}
LineTrackingLexer::Position LineTrackingLexer::position_for(size_t index) const
{
auto& [cached_index, cached_line, cached_column] = m_cached_position;
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_position;
}
template ErrorOr<u8> GenericLexer::consume_decimal_integer<u8>();
template ErrorOr<i8> GenericLexer::consume_decimal_integer<i8>();
template ErrorOr<u16> GenericLexer::consume_decimal_integer<u16>();

29
AK/GenericLexer.h
View file

@ -234,6 +234,34 @@ private:
#endif
};
class LineTrackingLexer : public GenericLexer {
public:
using GenericLexer::GenericLexer;
struct Position {
size_t offset { 0 };
size_t line { 0 };
size_t column { 0 };
};
LineTrackingLexer(StringView input, Position start_position)
: GenericLexer(input)
, m_cached_position {
.line = start_position.line,
.column = start_position.column,
}
{
}
Position cached_position() const { return m_cached_position; }
void restore_cached_offset(Position cached_position) { m_cached_position = cached_position; }
Position position_for(size_t) const;
Position current_position() const { return position_for(m_index); }
protected:
mutable Position m_cached_position;
};
constexpr auto is_any_of(StringView values)
{
return [values](auto c) { return values.contains(c); };
@ -254,4 +282,5 @@ using AK::GenericLexer;
using AK::is_any_of;
using AK::is_path_separator;
using AK::is_quote;
using AK::LineTrackingLexer;
#endif