mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-06 08:10:02 +00:00
LibWeb/CSS: Un-template parse_comma_separated_value_list()
This doesn't need to be a template. Changing it means we can use it from any FooParsing.cpp file, and also move it ValueParsing.cpp where it belongs.
This commit is contained in:
parent
dfbc9a7349
commit
ceeaf352c8
3 changed files with 25 additions and 25 deletions
|
@ -358,7 +358,7 @@ private:
|
||||||
RefPtr<CSSStyleValue> parse_time_value(TokenStream<ComponentValue>&);
|
RefPtr<CSSStyleValue> parse_time_value(TokenStream<ComponentValue>&);
|
||||||
RefPtr<CSSStyleValue> parse_time_percentage_value(TokenStream<ComponentValue>&);
|
RefPtr<CSSStyleValue> parse_time_percentage_value(TokenStream<ComponentValue>&);
|
||||||
|
|
||||||
template<typename ParseFunction>
|
using ParseFunction = AK::Function<RefPtr<CSSStyleValue>(TokenStream<ComponentValue>&)>;
|
||||||
RefPtr<CSSStyleValue> parse_comma_separated_value_list(TokenStream<ComponentValue>&, ParseFunction);
|
RefPtr<CSSStyleValue> parse_comma_separated_value_list(TokenStream<ComponentValue>&, ParseFunction);
|
||||||
RefPtr<CSSStyleValue> parse_simple_comma_separated_value_list(PropertyID, TokenStream<ComponentValue>&);
|
RefPtr<CSSStyleValue> parse_simple_comma_separated_value_list(PropertyID, TokenStream<ComponentValue>&);
|
||||||
RefPtr<CSSStyleValue> parse_all_as_single_keyword_value(TokenStream<ComponentValue>&, Keyword);
|
RefPtr<CSSStyleValue> parse_all_as_single_keyword_value(TokenStream<ComponentValue>&, Keyword);
|
||||||
|
|
|
@ -80,30 +80,6 @@ RefPtr<CSSStyleValue> Parser::parse_all_as_single_keyword_value(TokenStream<Comp
|
||||||
return keyword_value;
|
return keyword_value;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ParseFunction>
|
|
||||||
RefPtr<CSSStyleValue> Parser::parse_comma_separated_value_list(TokenStream<ComponentValue>& tokens, ParseFunction parse_one_value)
|
|
||||||
{
|
|
||||||
auto first = parse_one_value(tokens);
|
|
||||||
if (!first || !tokens.has_next_token())
|
|
||||||
return first;
|
|
||||||
|
|
||||||
StyleValueVector values;
|
|
||||||
values.append(first.release_nonnull());
|
|
||||||
|
|
||||||
while (tokens.has_next_token()) {
|
|
||||||
if (!tokens.consume_a_token().is(Token::Type::Comma))
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
if (auto maybe_value = parse_one_value(tokens)) {
|
|
||||||
values.append(maybe_value.release_nonnull());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return StyleValueList::create(move(values), StyleValueList::Separator::Comma);
|
|
||||||
}
|
|
||||||
|
|
||||||
RefPtr<CSSStyleValue> Parser::parse_simple_comma_separated_value_list(PropertyID property_id, TokenStream<ComponentValue>& tokens)
|
RefPtr<CSSStyleValue> Parser::parse_simple_comma_separated_value_list(PropertyID property_id, TokenStream<ComponentValue>& tokens)
|
||||||
{
|
{
|
||||||
return parse_comma_separated_value_list(tokens, [this, property_id](auto& tokens) -> RefPtr<CSSStyleValue> {
|
return parse_comma_separated_value_list(tokens, [this, property_id](auto& tokens) -> RefPtr<CSSStyleValue> {
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#include <LibWeb/CSS/StyleValues/RectStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/RectStyleValue.h>
|
||||||
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
|
||||||
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
||||||
|
#include <LibWeb/CSS/StyleValues/StyleValueList.h>
|
||||||
#include <LibWeb/CSS/StyleValues/TimeStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/TimeStyleValue.h>
|
||||||
#include <LibWeb/CSS/StyleValues/URLStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/URLStyleValue.h>
|
||||||
#include <LibWeb/CSS/StyleValues/UnicodeRangeStyleValue.h>
|
#include <LibWeb/CSS/StyleValues/UnicodeRangeStyleValue.h>
|
||||||
|
@ -64,6 +65,29 @@
|
||||||
|
|
||||||
namespace Web::CSS::Parser {
|
namespace Web::CSS::Parser {
|
||||||
|
|
||||||
|
RefPtr<CSSStyleValue> Parser::parse_comma_separated_value_list(TokenStream<ComponentValue>& tokens, ParseFunction parse_one_value)
|
||||||
|
{
|
||||||
|
auto first = parse_one_value(tokens);
|
||||||
|
if (!first || !tokens.has_next_token())
|
||||||
|
return first;
|
||||||
|
|
||||||
|
StyleValueVector values;
|
||||||
|
values.append(first.release_nonnull());
|
||||||
|
|
||||||
|
while (tokens.has_next_token()) {
|
||||||
|
if (!tokens.consume_a_token().is(Token::Type::Comma))
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
if (auto maybe_value = parse_one_value(tokens)) {
|
||||||
|
values.append(maybe_value.release_nonnull());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return StyleValueList::create(move(values), StyleValueList::Separator::Comma);
|
||||||
|
}
|
||||||
|
|
||||||
Optional<Dimension> Parser::parse_dimension(ComponentValue const& component_value)
|
Optional<Dimension> Parser::parse_dimension(ComponentValue const& component_value)
|
||||||
{
|
{
|
||||||
if (component_value.is(Token::Type::Dimension)) {
|
if (component_value.is(Token::Type::Dimension)) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue