summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/CSS.cpp6
-rw-r--r--src/core/CSS.hpp9
-rw-r--r--src/core/Managed.cpp12
-rw-r--r--src/core/Managed.hpp2
-rw-r--r--src/core/Tokenizer.hpp2
-rw-r--r--src/plugins/css/CSSParser.cpp24
-rw-r--r--src/plugins/css/CSSParser.hpp4
7 files changed, 35 insertions, 24 deletions
diff --git a/src/core/CSS.cpp b/src/core/CSS.cpp
index c3900e8..d131fec 100644
--- a/src/core/CSS.cpp
+++ b/src/core/CSS.cpp
@@ -20,6 +20,12 @@
namespace ousia {
+void RuleSet::merge(Rooted<RuleSet> other){
+ for(auto& o : other->rules){
+ rules[o.first] = o.second;
+ }
+}
+
/*
* different versions of "getChildren".
*/
diff --git a/src/core/CSS.hpp b/src/core/CSS.hpp
index 4cf15be..aa701b5 100644
--- a/src/core/CSS.hpp
+++ b/src/core/CSS.hpp
@@ -85,10 +85,11 @@ public:
return rules;
}
- void merge(Rooted<RuleSet> other)
- {
- rules.insert(other->rules.begin(), other->rules.end());
- }
+ /**
+ * This implements an overriding "insert all" of all rules in the other
+ * RuleSet to the rules in this RuleSet.
+ */
+ void merge(Rooted<RuleSet> other);
};
/**
diff --git a/src/core/Managed.cpp b/src/core/Managed.cpp
index 8cbbb17..f3a68a3 100644
--- a/src/core/Managed.cpp
+++ b/src/core/Managed.cpp
@@ -101,7 +101,7 @@ void ObjectDescriptor::incrDegree(RefDir dir, Managed *o)
}
// Fetch a reference to either the input or the output reference map
- auto &m = dir == RefDir::in ? refIn : refOut;
+ auto &m = dir == RefDir::IN ? refIn : refOut;
// Insert a new entry or increment the corresponding reference counter
auto it = m.find(o);
@@ -128,7 +128,7 @@ bool ObjectDescriptor::decrDegree(RefDir dir, Managed *o, bool all)
}
// Fetch a reference to either the input or the output reference map
- auto &m = dir == RefDir::in ? refIn : refOut;
+ auto &m = dir == RefDir::IN ? refIn : refOut;
// Decrement corresponding reference counter, delete the entry if the
// reference counter reaches zero
@@ -187,11 +187,11 @@ void Manager::addRef(Managed *tar, Managed *src)
// Store the tar <- src reference
assert(dTar);
- dTar->incrDegree(RefDir::in, src);
+ dTar->incrDegree(RefDir::IN, src);
if (src) {
// Store the src -> tar reference
assert(dSrc);
- dSrc->incrDegree(RefDir::out, tar);
+ dSrc->incrDegree(RefDir::OUT, tar);
} else {
// We have just added a root reference, remove the element from the
// list of marked objects
@@ -207,11 +207,11 @@ void Manager::deleteRef(Managed *tar, Managed *src, bool all)
// Decrement the output degree of the source Managed first
if (dSrc) {
- dSrc->decrDegree(RefDir::out, tar, all);
+ dSrc->decrDegree(RefDir::OUT, tar, all);
}
// Decrement the input degree of the input Managed
- if (dTar && dTar->decrDegree(RefDir::in, src, all)) {
+ if (dTar && dTar->decrDegree(RefDir::IN, src, all)) {
// If the Managed has a zero in degree, it can be safely deleted, otherwise
// if it has no root reference, add it to the "marked" set which is
// subject to tracing garbage collection
diff --git a/src/core/Managed.hpp b/src/core/Managed.hpp
index 6199e33..25fa14b 100644
--- a/src/core/Managed.hpp
+++ b/src/core/Managed.hpp
@@ -45,7 +45,7 @@ class Owned;
* Enum used to specify the direction of a object reference (inbound or
* outbound).
*/
-enum class RefDir { in, out };
+enum class RefDir { IN, OUT };
/**
* The ObjectDescriptor struct is used by the Manager for reference counting and
diff --git a/src/core/Tokenizer.hpp b/src/core/Tokenizer.hpp
index 4aebf56..8f80150 100644
--- a/src/core/Tokenizer.hpp
+++ b/src/core/Tokenizer.hpp
@@ -225,6 +225,8 @@ public:
void consumePeek();
const BufferedCharReader &getInput() const { return input; }
+
+ BufferedCharReader &getInput() { return input; }
};
}
diff --git a/src/plugins/css/CSSParser.cpp b/src/plugins/css/CSSParser.cpp
index 82ed7e1..51b2fd2 100644
--- a/src/plugins/css/CSSParser.cpp
+++ b/src/plugins/css/CSSParser.cpp
@@ -18,6 +18,8 @@
#include "CSSParser.hpp"
+#include <core/variant/Reader.hpp>
+
namespace ousia {
namespace parser {
namespace css {
@@ -121,13 +123,13 @@ void CSSParser::parseSelectors(Rooted<SelectorNode> root,
auto tuple = parseSelector(tokenizer, ctx);
// append the SelectorPath to the root node.
std::vector<Rooted<SelectorNode>> unmergedLeafs =
- root->append(std::get<0>(tuple));
+ root->append(tuple.first);
// append the leaf to the leafList.
switch (unmergedLeafs.size()) {
case 0:
// if the leaf could be merged we take the leaf reference from the
// parseSelector method.
- leafList.push_back(std::get<1>(tuple));
+ leafList.push_back(tuple.second);
break;
case 1:
// if the leaf could not be merged we take the existing leaf.
@@ -147,7 +149,7 @@ void CSSParser::parseSelectors(Rooted<SelectorNode> root,
}
}
-std::tuple<Rooted<SelectorNode>, Rooted<SelectorNode>> CSSParser::parseSelector(
+std::pair<Rooted<SelectorNode>, Rooted<SelectorNode>> CSSParser::parseSelector(
CodeTokenizer &tokenizer, ParserContext &ctx)
{
Rooted<SelectorNode> s = parsePrimitiveSelector(tokenizer, ctx);
@@ -155,7 +157,7 @@ std::tuple<Rooted<SelectorNode>, Rooted<SelectorNode>> CSSParser::parseSelector(
if (!tokenizer.peek(t)) {
// if we are at the end the found selector is the immediate child as
// well as the leaf.
- return std::make_tuple(s, s);
+ return std::make_pair(s, s);
}
switch (t.tokenId) {
case TOKEN_TEXT: {
@@ -166,9 +168,9 @@ std::tuple<Rooted<SelectorNode>, Rooted<SelectorNode>> CSSParser::parseSelector(
auto tuple = parseSelector(tokenizer, ctx);
// then we establish the DESCENDANT relationship
s->getEdges().push_back(new SelectorNode::SelectorEdge(
- ctx.manager, std::get<0>(tuple)));
+ ctx.manager, tuple.first));
// and we return this node as well as the leaf.
- return std::make_tuple(s, std::get<1>(tuple));
+ return std::make_pair(s, tuple.second);
}
case ARROW: {
tokenizer.consumePeek();
@@ -178,15 +180,15 @@ std::tuple<Rooted<SelectorNode>, Rooted<SelectorNode>> CSSParser::parseSelector(
auto tuple = parseSelector(tokenizer, ctx);
// then we establish the DESCENDANT relationship
s->getEdges().push_back(new SelectorNode::SelectorEdge(
- ctx.manager, std::get<0>(tuple),
+ ctx.manager, tuple.first,
SelectionOperator::DIRECT_DESCENDANT));
// and we return this node as well as the leaf.
- return std::make_tuple(s, std::get<1>(tuple));
+ return std::make_pair(s, tuple.second);
}
default:
// everything else is not part of the SelectorPath anymore.
tokenizer.resetPeek();
- return std::make_tuple(s, s);
+ return std::make_pair(s, s);
}
}
@@ -330,8 +332,8 @@ bool CSSParser::parseRule(CodeTokenizer &tokenizer, ParserContext &ctx,
expect(COLON, tokenizer, t, true, ctx);
// then the value
// TODO: Resolve key for appropriate parsing function here.
- expect(STRING, tokenizer, t, true, ctx);
- value = variant::Variant(t.content.c_str());
+ value = variant::Reader::parseGeneric(tokenizer.getInput(), ctx.logger,
+ {';'}).second;
// and a ;
expect(SEMICOLON, tokenizer, t, true, ctx);
return true;
diff --git a/src/plugins/css/CSSParser.hpp b/src/plugins/css/CSSParser.hpp
index 27a483d..a4d8cdc 100644
--- a/src/plugins/css/CSSParser.hpp
+++ b/src/plugins/css/CSSParser.hpp
@@ -20,7 +20,7 @@
#define _OUSIA_CSS_PARSER_HPP_
#include <vector>
-#include <tuple>
+#include <utility>
#include <core/BufferedCharReader.hpp>
#include <core/CodeTokenizer.hpp>
@@ -79,7 +79,7 @@ private:
* of the SelectorTree and returns the beginning node of the path as first
* element as well as the leaf of the path as second tuple element.
*/
- std::tuple<Rooted<SelectorNode>, Rooted<SelectorNode>> parseSelector(
+ std::pair<Rooted<SelectorNode>, Rooted<SelectorNode>> parseSelector(
CodeTokenizer &tokenizer, ParserContext &ctx);
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 08:42:33 +0000