css: Add a style sheet struct

browser/gui/app.cpp

@@ -91,9 +91,9 @@ std::string element_text(layout::LayoutBox const *element) {
     return std::get<dom::Element>(element->node->node).name;
 }
 
-std::string stylesheet_to_string(std::vector<css::Rule> const &stylesheet) {
+std::string stylesheet_to_string(css::StyleSheet const &stylesheet) {
     std::stringstream ss;
-    for (auto const &rule : stylesheet) {
+    for (auto const &rule : stylesheet.rules) {
         ss << css::to_string(rule) << std::endl;
     }
     return std::move(ss).str();

css/default.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021-2022 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2021-2023 Robin Lindén <[email protected]>
 //
 // SPDX-License-Identifier: BSD-2-Clause
 
@@ -13,7 +13,7 @@ namespace {
 #include "css/default_css.h"
 } // namespace
 
-std::vector<css::Rule> default_style() {
+StyleSheet default_style() {
     return css::parse(std::string_view{reinterpret_cast<char const *>(css_default_css), css_default_css_len});
 }
 

css/default.h

@@ -1,17 +1,15 @@
-// SPDX-FileCopyrightText: 2021 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2021-2023 Robin Lindén <[email protected]>
 //
 // SPDX-License-Identifier: BSD-2-Clause
 
 #ifndef CSS_DEFAULT_H_
 #define CSS_DEFAULT_H_
 
-#include "css/rule.h"
-
-#include <vector>
+#include "css/style_sheet.h"
 
 namespace css {
 
-std::vector<css::Rule> default_style();
+StyleSheet default_style();
 
 } // namespace css
 

css/parser.cpp

@@ -241,8 +241,8 @@ constexpr std::optional<std::string_view> Parser::consume_while(T const &pred) {
     return input_.substr(start, pos_ - start);
 }
 
-std::vector<css::Rule> Parser::parse_rules() {
-    std::vector<css::Rule> rules;
+StyleSheet Parser::parse_rules() {
+    StyleSheet style;
     bool in_media_query{false};
     std::optional<MediaQuery> media_query;
 
@@ -255,7 +255,7 @@ std::vector<css::Rule> Parser::parse_rules() {
             auto tmp_query = consume_while([](char c) { return c != '{'; });
             if (!tmp_query) {
                 spdlog::error("Eof while looking for end of media-query");
-                return rules;
+                return style;
             }
 
             if (auto last_char = tmp_query->find_last_not_of(' '); last_char != std::string_view::npos) {
@@ -276,7 +276,7 @@ std::vector<css::Rule> Parser::parse_rules() {
             auto kind = consume_while([](char c) { return c != ' ' && c != '{' && c != '('; });
             if (!kind) {
                 spdlog::error("Eof while looking for end of at-rule");
-                return rules;
+                return style;
             }
 
             spdlog::warn("Encountered unhandled {} at-rule", *kind);
@@ -289,7 +289,7 @@ std::vector<css::Rule> Parser::parse_rules() {
             while (peek() != '}') {
                 if (auto rule = parse_rule(); !rule) {
                     spdlog::error("Eof while looking for end of rule in unknown at-rule");
-                    return rules;
+                    return style;
                 }
 
                 skip_whitespace_and_comments();
@@ -303,11 +303,11 @@ std::vector<css::Rule> Parser::parse_rules() {
         auto rule = parse_rule();
         if (!rule) {
             spdlog::error("Eof while parsing rule");
-            return rules;
+            return style;
         }
 
-        rules.push_back(*std::move(rule));
-        rules.back().media_query = media_query;
+        style.rules.push_back(*std::move(rule));
+        style.rules.back().media_query = media_query;
 
         skip_whitespace_and_comments();
 
@@ -319,7 +319,7 @@ std::vector<css::Rule> Parser::parse_rules() {
         }
     }
 
-    return rules;
+    return style;
 }
 
 constexpr std::optional<char> Parser::peek() const {

css/parser.h

@@ -8,13 +8,13 @@
 
 #include "css/property_id.h"
 #include "css/rule.h"
+#include "css/style_sheet.h"
 
 #include <concepts>
 #include <cstddef>
 #include <optional>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 namespace css {
 
@@ -25,7 +25,7 @@ class Parser {
 public:
     explicit Parser(std::string_view input) : input_{input} {}
 
-    std::vector<css::Rule> parse_rules();
+    StyleSheet parse_rules();
 
 private:
     std::string_view input_;
@@ -77,7 +77,7 @@ class Parser {
     void expand_font(std::map<PropertyId, std::string> &declarations, std::string_view value) const;
 };
 
-inline std::vector<Rule> parse(std::string_view input) {
+inline StyleSheet parse(std::string_view input) {
     return Parser{input}.parse_rules();
 }