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

LibWeb: Bring parse_a_declaration() to spec and add comments

Browse source 
User code now calls `parse_as_supports_condition()` which actually does
the conversion to a StyleProperty.
This commit is contained in:
Sam Atkins 2022-03-30 12:05:16 +01:00 • committed by Andreas Kling
parent 239c36a19e
commit 2aac9f9258
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -1932,26 +1932,36 @@ NonnullRefPtrVector<StyleRule> Parser::parse_a_list_of_rules(TokenStream<T>& tok
return list_of_rules;
}
Optional<StyleProperty> Parser::parse_as_declaration()
Optional<StyleProperty> Parser::parse_as_supports_condition()
{
return parse_a_declaration(m_token_stream);
auto maybe_declaration = parse_a_declaration(m_token_stream);
if (maybe_declaration.has_value())
return convert_to_style_property(maybe_declaration.release_value());
return {};
}
// 5.3.6. Parse a declaration
// https://www.w3.org/TR/css-syntax-3/#parse-a-declaration
template<typename T>
Optional<StyleProperty> Parser::parse_a_declaration(TokenStream<T>& tokens)
Optional<StyleDeclarationRule> Parser::parse_a_declaration(TokenStream<T>& tokens)
{
// To parse a declaration from input:
// 1. Normalize input, and set input to the result.
// Note: This is done when initializing the Parser.
// 2. While the next input token from input is a <whitespace-token>, consume the next input token.
tokens.skip_whitespace();
// 3. If the next input token from input is not an <ident-token>, return a syntax error.
auto& token = tokens.peek_token();
if (!token.is(Token::Type::Ident)) {
return {};
}
auto declaration = consume_a_declaration(tokens);
if (declaration.has_value())
return convert_to_style_property(declaration.value());
// 4. Consume a declaration from input. If anything was returned, return it. Otherwise, return a syntax error.
if (auto declaration = consume_a_declaration(tokens); declaration.has_value())
return declaration.release_value();
return {};
}