RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:38:11 +00:00
Code Issues Activity Actions

LibWeb: Fix EOF handling in CSS Tokenizer peek_{twin,triplet}()

Browse source 
Previously, the loops would stop before reaching EOF, meaning that the
values that should have been set to EOF were left with their 0 initial
values. Now, we initialize to EOFs instead. The if/else inside the loops
always ran the else branch so I have removed the if branches.
This commit is contained in:
Sam Atkins 2021-08-04 10:57:50 +01:00 • committed by Ali Mohammad Pur
parent 31e3b3028b
commit 74c9587798
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,7 @@ u32 Tokenizer::next_code_point()
return TOKENIZER_EOF;
m_prev_utf8_iterator = m_utf8_iterator;
++m_utf8_iterator;
dbgln_if(CSS_TOKENIZER_DEBUG, "(Tokenizer) Next code_point: {:c}", (char)*m_prev_utf8_iterator);
dbgln_if(CSS_TOKENIZER_DEBUG, "(Tokenizer) Next code_point: {:d}", *m_prev_utf8_iterator);
return *m_prev_utf8_iterator;
}
@ -229,35 +229,31 @@ u32 Tokenizer::peek_code_point(size_t offset) const
++it;
if (it == m_utf8_view.end())
return TOKENIZER_EOF;
dbgln_if(CSS_TOKENIZER_DEBUG, "(Tokenizer) Peek code_point: {:d}", *m_prev_utf8_iterator);
return *it;
}
U32Twin Tokenizer::peek_twin() const
{
U32Twin values;
U32Twin values { TOKENIZER_EOF, TOKENIZER_EOF };
auto it = m_utf8_iterator;
for (size_t i = 0; i < 2 && it != m_utf8_view.end(); ++i) {
if (it == m_utf8_view.end())
values.set(i, TOKENIZER_EOF);
else
values.set(i, *it);
values.set(i, *it);
++it;
}
dbgln_if(CSS_TOKENIZER_DEBUG, "(Tokenizer) Peek twin: {:d},{:d}", values.first, values.second);
return values;
}
U32Triplet Tokenizer::peek_triplet() const
{
U32Triplet values;
U32Triplet values { TOKENIZER_EOF, TOKENIZER_EOF, TOKENIZER_EOF };
auto it = m_utf8_iterator;
for (size_t i = 0; i < 3 && it != m_utf8_view.end(); ++i) {
if (it == m_utf8_view.end())
values.set(i, TOKENIZER_EOF);
else
values.set(i, *it);
values.set(i, *it);
++it;
}
dbgln_if(CSS_TOKENIZER_DEBUG, "(Tokenizer) Peek triplet: {:d},{:d},{:d}", values.first, values.second, values.third);
return values;
}