RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:07:47 +00:00
Code Issues Activity Actions

LibWeb: Merge CSS Parser's QualifiedStyleRule and AtStyleRule

Browse source 
AtStyleRule being a subclass of QualifiedStyleRule was causing
problems when trying to distinguish between them. Combining them
and then distinguishing between them with a Type enum makes that
check simpler, and is in line with how similar checks are done
elsewhere in the parser.
This commit is contained in:
Sam Atkins 2021-07-03 13:36:33 +01:00 • committed by Andreas Kling
parent a6085e19ae
commit 82d12b170a
6 changed files with 47 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/CSS/Parser/AtStyleRule.h
View file

@ -1,26 +0,0 @@
/*
* Copyright (c) 2020-2021, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/String.h>
#include <LibWeb/CSS/Parser/QualifiedStyleRule.h>
namespace Web::CSS {
class AtStyleRule : public QualifiedStyleRule {
friend class Parser;
public:
AtStyleRule();
~AtStyleRule();
String to_string() const;
private:
String m_name;
};
}

6
Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h
View file

@ -6,8 +6,8 @@
#pragma once #pragma once
#include <LibWeb/CSS/Parser/AtStyleRule.h>
#include <LibWeb/CSS/Parser/StyleDeclarationRule.h> #include <LibWeb/CSS/Parser/StyleDeclarationRule.h>
#include <LibWeb/CSS/Parser/StyleRule.h>
namespace Web::CSS { namespace Web::CSS {
@ -15,7 +15,7 @@ class DeclarationOrAtRule {
friend class Parser; friend class Parser;
public: public:
explicit DeclarationOrAtRule(RefPtr<AtStyleRule> at); explicit DeclarationOrAtRule(RefPtr<StyleRule> at);
explicit DeclarationOrAtRule(StyleDeclarationRule declaration); explicit DeclarationOrAtRule(StyleDeclarationRule declaration);
~DeclarationOrAtRule(); ~DeclarationOrAtRule();
@ -28,7 +28,7 @@ public:
private: private:
DeclarationType m_type; DeclarationType m_type;
RefPtr<AtStyleRule> m_at; RefPtr<StyleRule> m_at;
StyleDeclarationRule m_declaration; StyleDeclarationRule m_declaration;
}; };

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

@ -10,13 +10,12 @@
#include <LibWeb/CSS/CSSStyleDeclaration.h> #include <LibWeb/CSS/CSSStyleDeclaration.h>
#include <LibWeb/CSS/CSSStyleRule.h> #include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/CSSStyleSheet.h> #include <LibWeb/CSS/CSSStyleSheet.h>
#include <LibWeb/CSS/Parser/AtStyleRule.h>
#include <LibWeb/CSS/Parser/DeclarationOrAtRule.h> #include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
#include <LibWeb/CSS/Parser/Parser.h> #include <LibWeb/CSS/Parser/Parser.h>
#include <LibWeb/CSS/Parser/QualifiedStyleRule.h>
#include <LibWeb/CSS/Parser/StyleBlockRule.h> #include <LibWeb/CSS/Parser/StyleBlockRule.h>
#include <LibWeb/CSS/Parser/StyleComponentValueRule.h> #include <LibWeb/CSS/Parser/StyleComponentValueRule.h>
#include <LibWeb/CSS/Parser/StyleFunctionRule.h> #include <LibWeb/CSS/Parser/StyleFunctionRule.h>
#include <LibWeb/CSS/Parser/StyleRule.h>
#include <LibWeb/CSS/Selector.h> #include <LibWeb/CSS/Selector.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h> #include <LibWeb/Dump.h>
@ -453,9 +452,9 @@ void Parser::reconsume_current_input_token()
--m_iterator_offset; --m_iterator_offset;
} }
NonnullRefPtrVector<QualifiedStyleRule> Parser::consume_a_list_of_rules(bool top_level) NonnullRefPtrVector<StyleRule> Parser::consume_a_list_of_rules(bool top_level)
{ {
NonnullRefPtrVector<QualifiedStyleRule> rules; NonnullRefPtrVector<StyleRule> rules;
for (;;) { for (;;) {
auto token = next_token(); auto token = next_token();
@ -498,12 +497,12 @@ NonnullRefPtrVector<QualifiedStyleRule> Parser::consume_a_list_of_rules(bool top
return rules; return rules;
} }
NonnullRefPtr<AtStyleRule> Parser::consume_an_at_rule() NonnullRefPtr<StyleRule> Parser::consume_an_at_rule()
{ {
auto initial = next_token(); auto initial = next_token();
AtStyleRule rule; NonnullRefPtr<StyleRule> rule = create<StyleRule>(StyleRule::Type::At);
rule.m_name = initial.m_value.to_string(); rule->m_name = initial.m_value.to_string();
for (;;) { for (;;) {
auto token = next_token(); auto token = next_token();
@ -517,7 +516,7 @@ NonnullRefPtr<AtStyleRule> Parser::consume_an_at_rule()
} }
if (token.is_open_curly()) { if (token.is_open_curly()) {
rule.m_block = consume_a_simple_block(); rule->m_block = consume_a_simple_block();
return rule; return rule;
} }
@ -525,13 +524,13 @@ NonnullRefPtr<AtStyleRule> Parser::consume_an_at_rule()
reconsume_current_input_token(); reconsume_current_input_token();
auto value = consume_a_component_value(); auto value = consume_a_component_value();
rule.m_prelude.append(value); rule->m_prelude.append(value);
} }
} }
RefPtr<QualifiedStyleRule> Parser::consume_a_qualified_rule() RefPtr<StyleRule> Parser::consume_a_qualified_rule()
{ {
NonnullRefPtr<QualifiedStyleRule> rule = create<QualifiedStyleRule>(); NonnullRefPtr<StyleRule> rule = create<StyleRule>(StyleRule::Type::Qualified);
for (;;) { for (;;) {
auto token = next_token(); auto token = next_token();
@ -917,7 +916,7 @@ Vector<Vector<StyleComponentValueRule>> Parser::parse_as_comma_separated_list_of
return lists; return lists;
} }
RefPtr<CSSRule> Parser::convert_rule(NonnullRefPtr<QualifiedStyleRule>) RefPtr<CSSRule> Parser::convert_rule(NonnullRefPtr<StyleRule>)
{ {
return {}; return {};
} }

11
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -9,13 +9,12 @@
#include <AK/NonnullOwnPtrVector.h> #include <AK/NonnullOwnPtrVector.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibWeb/CSS/Parser/AtStyleRule.h>
#include <LibWeb/CSS/Parser/DeclarationOrAtRule.h> #include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
#include <LibWeb/CSS/Parser/QualifiedStyleRule.h>
#include <LibWeb/CSS/Parser/StyleBlockRule.h> #include <LibWeb/CSS/Parser/StyleBlockRule.h>
#include <LibWeb/CSS/Parser/StyleComponentValueRule.h> #include <LibWeb/CSS/Parser/StyleComponentValueRule.h>
#include <LibWeb/CSS/Parser/StyleDeclarationRule.h> #include <LibWeb/CSS/Parser/StyleDeclarationRule.h>
#include <LibWeb/CSS/Parser/StyleFunctionRule.h> #include <LibWeb/CSS/Parser/StyleFunctionRule.h>
#include <LibWeb/CSS/Parser/StyleRule.h>
#include <LibWeb/CSS/Parser/Tokenizer.h> #include <LibWeb/CSS/Parser/Tokenizer.h>
#include <LibWeb/CSS/Selector.h> #include <LibWeb/CSS/Selector.h>
@ -91,9 +90,9 @@ private:
Token current_token(); Token current_token();
void reconsume_current_input_token(); void reconsume_current_input_token();
NonnullRefPtrVector<QualifiedStyleRule> consume_a_list_of_rules(bool top_level); NonnullRefPtrVector<StyleRule> consume_a_list_of_rules(bool top_level);
NonnullRefPtr<AtStyleRule> consume_an_at_rule(); NonnullRefPtr<StyleRule> consume_an_at_rule();
RefPtr<QualifiedStyleRule> consume_a_qualified_rule(); RefPtr<StyleRule> consume_a_qualified_rule();
Vector<DeclarationOrAtRule> consume_a_list_of_declarations(); Vector<DeclarationOrAtRule> consume_a_list_of_declarations();
Optional<StyleDeclarationRule> consume_a_declaration(Vector<StyleComponentValueRule>); Optional<StyleDeclarationRule> consume_a_declaration(Vector<StyleComponentValueRule>);
Optional<StyleDeclarationRule> consume_a_declaration(); Optional<StyleDeclarationRule> consume_a_declaration();
@ -101,7 +100,7 @@ private:
NonnullRefPtr<StyleBlockRule> consume_a_simple_block(); NonnullRefPtr<StyleBlockRule> consume_a_simple_block();
NonnullRefPtr<StyleFunctionRule> consume_a_function(); NonnullRefPtr<StyleFunctionRule> consume_a_function();
RefPtr<CSSRule> convert_rule(NonnullRefPtr<QualifiedStyleRule>); RefPtr<CSSRule> convert_rule(NonnullRefPtr<StyleRule>);
ParsingContext m_context; ParsingContext m_context;

13
Userland/Libraries/LibWeb/CSS/Parser/QualifiedStyleRule.h → Userland/Libraries/LibWeb/CSS/Parser/StyleRule.h
View file

@ -14,12 +14,17 @@
namespace Web::CSS { namespace Web::CSS {
class QualifiedStyleRule : public RefCounted<QualifiedStyleRule> { class StyleRule : public RefCounted<StyleRule> {
friend class Parser; friend class Parser;
public: public:
QualifiedStyleRule(); enum class Type {
~QualifiedStyleRule(); At,
Qualified,
};
StyleRule(Type);
~StyleRule();
Vector<StyleComponentValueRule> const& prelude() const { return m_prelude; } Vector<StyleComponentValueRule> const& prelude() const { return m_prelude; }
StyleBlockRule const& block() const { return *m_block; } StyleBlockRule const& block() const { return *m_block; }
@ -27,6 +32,8 @@ public:
String to_string() const; String to_string() const;
private: private:
Type const m_type;
String m_name; // At-rules only
Vector<StyleComponentValueRule> m_prelude; Vector<StyleComponentValueRule> m_prelude;
RefPtr<StyleBlockRule> m_block; RefPtr<StyleBlockRule> m_block;
}; };

39
Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp
View file

@ -5,20 +5,16 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibWeb/CSS/Parser/AtStyleRule.h>
#include <LibWeb/CSS/Parser/DeclarationOrAtRule.h> #include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
#include <LibWeb/CSS/Parser/QualifiedStyleRule.h>
#include <LibWeb/CSS/Parser/StyleBlockRule.h> #include <LibWeb/CSS/Parser/StyleBlockRule.h>
#include <LibWeb/CSS/Parser/StyleComponentValueRule.h> #include <LibWeb/CSS/Parser/StyleComponentValueRule.h>
#include <LibWeb/CSS/Parser/StyleDeclarationRule.h> #include <LibWeb/CSS/Parser/StyleDeclarationRule.h>
#include <LibWeb/CSS/Parser/StyleFunctionRule.h> #include <LibWeb/CSS/Parser/StyleFunctionRule.h>
#include <LibWeb/CSS/Parser/StyleRule.h>
namespace Web::CSS { namespace Web::CSS {
AtStyleRule::AtStyleRule() { } DeclarationOrAtRule::DeclarationOrAtRule(RefPtr<StyleRule> at)
AtStyleRule::~AtStyleRule() { }
DeclarationOrAtRule::DeclarationOrAtRule(RefPtr<AtStyleRule> at)
: m_type(DeclarationType::At) : m_type(DeclarationType::At)
, m_at(move(at)) , m_at(move(at))
{ {
@ -30,8 +26,11 @@ DeclarationOrAtRule::DeclarationOrAtRule(StyleDeclarationRule declaration)
} }
DeclarationOrAtRule::~DeclarationOrAtRule() { } DeclarationOrAtRule::~DeclarationOrAtRule() { }
QualifiedStyleRule::QualifiedStyleRule() { } StyleRule::StyleRule(StyleRule::Type type)
QualifiedStyleRule::~QualifiedStyleRule() { } : m_type(type)
{
}
StyleRule::~StyleRule() { }
StyleBlockRule::StyleBlockRule() { } StyleBlockRule::StyleBlockRule() { }
StyleBlockRule::~StyleBlockRule() { } StyleBlockRule::~StyleBlockRule() { }
@ -77,17 +76,6 @@ void append_raw(StringBuilder& builder, SeparatorType& separator, CollectionType
} }
} }
String AtStyleRule::to_string() const
{
StringBuilder builder;
builder.append("@");
builder.append(m_name);
builder.append(QualifiedStyleRule::to_string());
return builder.to_string();
}
String DeclarationOrAtRule::to_string() const String DeclarationOrAtRule::to_string() const
{ {
StringBuilder builder; StringBuilder builder;
@ -104,12 +92,21 @@ String DeclarationOrAtRule::to_string() const
return builder.to_string(); return builder.to_string();
} }
String QualifiedStyleRule::to_string() const String StyleRule::to_string() const
{ {
StringBuilder builder; StringBuilder builder;
if (m_type == Type::At) {
builder.append("@");
builder.append(m_name);
}
append_with_to_string(builder, " ", m_prelude); append_with_to_string(builder, " ", m_prelude);
builder.append(m_block->to_string());
if (m_block)
builder.append(m_block->to_string());
else
builder.append(';');
return builder.to_string(); return builder.to_string();
} }