diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 10a8e8a18a..9f4e511708 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -1111,11 +1111,6 @@ Optional Parser::parse_supports_feature(TokenStream Parser::parse_general_enclosed() -{ - return parse_general_enclosed(m_token_stream); -} - template Optional Parser::parse_general_enclosed(TokenStream&) { @@ -1123,11 +1118,6 @@ Optional Parser::parse_general_enclosed(TokenStream& return {}; } -NonnullRefPtrVector Parser::consume_a_list_of_rules(bool top_level) -{ - return consume_a_list_of_rules(m_token_stream, top_level); -} - template NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& tokens, bool top_level) { @@ -1174,11 +1164,6 @@ NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& t return rules; } -NonnullRefPtr Parser::consume_an_at_rule() -{ - return consume_an_at_rule(m_token_stream); -} - template NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) { @@ -1218,11 +1203,6 @@ NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) } } -RefPtr Parser::consume_a_qualified_rule() -{ - return consume_a_qualified_rule(m_token_stream); -} - template RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) { @@ -1277,16 +1257,6 @@ StyleComponentValueRule Parser::consume_a_component_value(TokenStream& tokens return StyleComponentValueRule(token); } -StyleComponentValueRule Parser::consume_a_component_value() -{ - return consume_a_component_value(m_token_stream); -} - -NonnullRefPtr Parser::consume_a_simple_block() -{ - return consume_a_simple_block(m_token_stream); -} - template NonnullRefPtr Parser::consume_a_simple_block(TokenStream& tokens) { @@ -1313,11 +1283,6 @@ NonnullRefPtr Parser::consume_a_simple_block(TokenStream& tok } } -NonnullRefPtr Parser::consume_a_function() -{ - return consume_a_function(m_token_stream); -} - template NonnullRefPtr Parser::consume_a_function(TokenStream& tokens) { @@ -1344,11 +1309,6 @@ NonnullRefPtr Parser::consume_a_function(TokenStream& toke return function; } -Optional Parser::consume_a_declaration() -{ - return consume_a_declaration(m_token_stream); -} - // https://www.w3.org/TR/css-syntax-3/#consume-declaration template Optional Parser::consume_a_declaration(TokenStream& tokens) @@ -1452,11 +1412,6 @@ Optional Parser::consume_a_declaration(TokenStream& tok return declaration; } -Vector Parser::consume_a_list_of_declarations() -{ - return consume_a_list_of_declarations(m_token_stream); -} - template Vector Parser::consume_a_list_of_declarations(TokenStream& tokens) { @@ -1530,7 +1485,7 @@ RefPtr Parser::parse_a_rule(TokenStream& tokens) if (token.is(Token::Type::EndOfFile)) { return {}; } else if (token.is(Token::Type::AtKeyword)) { - auto at_rule = consume_an_at_rule(); + auto at_rule = consume_an_at_rule(m_token_stream); rule = convert_to_rule(at_rule); } else { auto qualified_rule = consume_a_qualified_rule(tokens); diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index 276b987b8c..f40976655f 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -151,41 +151,25 @@ private: Optional parse_a_n_plus_b_pattern(TokenStream&); - [[nodiscard]] NonnullRefPtrVector consume_a_list_of_rules(bool top_level); template [[nodiscard]] NonnullRefPtrVector consume_a_list_of_rules(TokenStream&, bool top_level); - - [[nodiscard]] NonnullRefPtr consume_an_at_rule(); template [[nodiscard]] NonnullRefPtr consume_an_at_rule(TokenStream&); - - [[nodiscard]] RefPtr consume_a_qualified_rule(); template [[nodiscard]] RefPtr consume_a_qualified_rule(TokenStream&); - - [[nodiscard]] Vector consume_a_list_of_declarations(); template [[nodiscard]] Vector consume_a_list_of_declarations(TokenStream&); - - [[nodiscard]] Optional consume_a_declaration(); template [[nodiscard]] Optional consume_a_declaration(TokenStream&); - - [[nodiscard]] StyleComponentValueRule consume_a_component_value(); template [[nodiscard]] StyleComponentValueRule consume_a_component_value(TokenStream&); - - [[nodiscard]] NonnullRefPtr consume_a_simple_block(); template [[nodiscard]] NonnullRefPtr consume_a_simple_block(TokenStream&); - - [[nodiscard]] NonnullRefPtr consume_a_function(); template [[nodiscard]] NonnullRefPtr consume_a_function(TokenStream&); struct GeneralEnclosed { }; - [[nodiscard]] Optional parse_general_enclosed(); template [[nodiscard]] Optional parse_general_enclosed(TokenStream&);