added XMLElement::addAttributes()

to assign multiple attributes at once

Author: mgieseki

src/XMLNode.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <fstream>
+#include <iterator>
 #include <list>
 #include <map>
 #include <sstream>
@@ -136,6 +137,12 @@ void XMLElement::addAttribute (const string &name, double value) {
 }
 
 
+void XMLElement::addAttributes (const map<string, string> &attribs) {
+	for (auto &attr : attribs)
+		_attributes.emplace_back(attr);
+}
+
+
 void XMLElement::removeAttribute (const std::string &name) {
 	_attributes.erase(find_if(_attributes.begin(), _attributes.end(), [&](const Attribute &attr) {
 		return attr.name == name;

src/XMLNode.hpp

@@ -111,6 +111,7 @@ class XMLElement : public XMLNode {
 	public:
 		struct Attribute {
 			Attribute (std::string nam, std::string val) : name(std::move(nam)), value(std::move(val)) {}
+			Attribute (std::pair<std::string, std::string> attr) : name(std::move(attr.first)), value(std::move(attr.second)) {}
 			bool inheritable () const;
 			std::string name;
 			std::string value;
@@ -127,6 +128,7 @@ class XMLElement : public XMLNode {
 		void clear () override;
 		void addAttribute (const std::string &name, const std::string &value);
 		void addAttribute (const std::string &name, double value);
+		void addAttributes (const std::map<std::string, std::string> &attribs);
 		void removeAttribute (const std::string &name);
 		XMLNode* append (std::unique_ptr<XMLNode> child);
 		XMLNode* append (const std::string &str);

src/XMLParser.cpp

@@ -185,8 +185,7 @@ XMLElement* XMLParser::openElement (const string &tag) {
 	string name = ir.getString("/ \t\n\r");
 	ir.skipSpace();
 	unique_ptr<XMLElement> elemNode{createElementPtr(name)};
-	for (const auto &attrpair : ir.parseAttributes(true, "\"'"))
-		elemNode->addAttribute(attrpair.first, attrpair.second);
+	elemNode->addAttributes(ir.parseAttributes(true, "\"'"));
 	ir.skipSpace();
 	XMLElement *elemPtr = elemNode.get();
 	if (ir.peek() == '/')       // end of empty element tag

tests/XMLNodeTest.cpp

@@ -200,7 +200,7 @@ TEST(XMLNodeTest, prependText) {
 }
 
 
-TEST(XMLNodeTest, attributes) {
+TEST(XMLNodeTest, attributes1) {
 	XMLElement root("root");
 	root.addAttribute("string", "text");
 	root.addAttribute("integer", 42);
@@ -209,14 +209,29 @@ TEST(XMLNodeTest, attributes) {
 	EXPECT_TRUE(root.hasAttribute("string"));
 	EXPECT_TRUE(root.hasAttribute("integer"));
 	EXPECT_TRUE(root.hasAttribute("double"));
-	EXPECT_FALSE(root.hasAttribute("noname	"));
+	EXPECT_FALSE(root.hasAttribute("noname"));
 	EXPECT_STREQ(root.getAttributeValue("string"), "text");
 	EXPECT_STREQ(root.getAttributeValue("integer"), "42");
 	EXPECT_STREQ(root.getAttributeValue("double"), "42.24");
 	EXPECT_EQ(root.getAttributeValue("none"), nullptr);
 }
 
 
+TEST(XMLNodeTest, attributes2) {
+	XMLElement root("root");
+	root.addAttributes({{"attr1", "val1"}, {"attr2", "val2"}, {"attr3", "val3"}});
+	EXPECT_TRUE(root.empty());
+	EXPECT_TRUE(root.hasAttribute("attr1"));
+	EXPECT_TRUE(root.hasAttribute("attr2"));
+	EXPECT_TRUE(root.hasAttribute("attr3"));
+	EXPECT_FALSE(root.hasAttribute("noname"));
+	EXPECT_STREQ(root.getAttributeValue("attr1"), "val1");
+	EXPECT_STREQ(root.getAttributeValue("attr2"), "val2");
+	EXPECT_STREQ(root.getAttributeValue("attr3"), "val3");
+	EXPECT_EQ(root.getAttributeValue("none"), nullptr);
+}
+
+
 TEST(XMLNodeTest, clone) {
 	XMLElement root ("root");
 	root.addAttribute("string", "text");