summaryrefslogtreecommitdiff
path: root/src/core/CSS.cpp
diff options
context:
space:
mode:
authorBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2014-12-05 17:09:34 +0100
committerBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2014-12-05 17:09:34 +0100
commit5d500ea305db7185314cc2b500257529e9e9696a (patch)
tree1322c9fe1246c3b7566085f3188fa2c739140d30 /src/core/CSS.cpp
parent2dd08daa56c05d6c720a30fd9ec14a2471f81c5f (diff)
Successfully (hopefully) implemented CSS Parsing and the respective test.
Diffstat (limited to 'src/core/CSS.cpp')
-rw-r--r--src/core/CSS.cpp6
1 files changed, 6 insertions, 0 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".
*/