X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=96f027033ba30acf87ca50af3c6a22a49ed03ef8;hb=8e1d37633979005acd694fc86ee91b724fe4361b;hp=62b5dbaee46599f3a8417b8c5c25f997ee59c1b0;hpb=4465ec1a182b3e2ebc6a681e2e53a185e774cb0a;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 62b5dba..96f0270 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -16,28 +16,39 @@ void clean_node(xmlNode *node)
 		xmlNode *frag = xmlNewDocFragment(node->doc);
 		xmlReplaceNode(node, frag);
 		frag->children = node->children;
+		frag->last = node->last;
 	}
 }
 
 }  // namespace
 
+Directive::~Directive() {}
+
 Replace::Replace(const string &str)
 	: str(str) {}
 
 void Replace::process(xmlNode *node, bool clean) {
-	node->children = xmlNewTextLen(reinterpret_cast<const xmlChar *>(str.data()), str.size());
+	xmlNodeSetContentLen(node, reinterpret_cast<const xmlChar *>(str.data()), str.size());
 	if (clean) {
 		clean_node(node);
 	}
 }
 
-Clone::Clone(const std::vector<Directive *> &subdirectives)
+Clone::Clone(const vector<Directive *> &subdirectives)
 	: subdirectives(subdirectives) {}
 	
-Clone::Clone(std::initializer_list<Directive *> subdirectives)
+Clone::Clone(initializer_list<Directive *> subdirectives)
 	: subdirectives(subdirectives) {}
 
-void Clone::process(xmlNode *node, bool clean) {
+Clone::~Clone()
+{
+	for (auto it : subdirectives) {
+		delete it;
+	}
+}
+
+void Clone::process(xmlNode *node, bool clean)
+{
 	// We can't use xmlNewDocFragment, since xmlDOMWrapCloneNode only knows
 	// how to clone elements.
 	vector<xmlNode *> new_nodes;
@@ -46,12 +57,18 @@ void Clone::process(xmlNode *node, bool clean) {
 		xmlNode *new_node;
 		xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
 		it->process(new_node, clean);
-		for (xmlNode *child = new_node->children; child != NULL; child = child->next) {
+		while (new_node->children != NULL) {
+			xmlNode *child = new_node->children;
+			xmlUnlinkNode(child);
 			new_nodes.push_back(child);
 		}
+		xmlFreeNode(new_node);
 	}
 
-	node->children = NULL;
+	xmlFreeNodeList(node->children);
+	node->content = NULL;
+	node->children = node->last = NULL;
+
 	for (auto child : new_nodes) {
 		xmlAddChild(node, child);
 	}	
@@ -63,30 +80,37 @@ void Clone::process(xmlNode *node, bool clean) {
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
 	: substitution_map(substitution_map) {}
 	
-Substitute::Substitute(std::initializer_list<std::pair<const std::string, Directive*>> substitution_map)
+Substitute::Substitute(initializer_list<pair<const string, Directive*>> substitution_map)
 	: substitution_map(substitution_map) {}
 
-void Substitute::process(xmlNode *node, bool clean) {
+Substitute::~Substitute()
+{
+	for (auto it : substitution_map) {
+		delete it.second;
+	}
+}
+
+void Substitute::process(xmlNode *node, bool clean)
+{
 	for (xmlNode *child = node->children; child != NULL; child = child->next) {
 		bool processed = false;
 
 		if (child->type == XML_ELEMENT_NODE) {
 			// Find the ID, if any.
 			string id;
+			xmlAttr *id_attr = NULL;
 			for (xmlAttr *attr = child->properties; attr != NULL; attr = attr->next) {
 				if (strcmp(reinterpret_cast<const char *>(attr->ns->href), "http://template.sesse.net/") == 0 &&
 				    strcmp(reinterpret_cast<const char *>(attr->name), "id") == 0) {
-					id = reinterpret_cast<const char *>(xmlNodeGetContent(attr->children));
-
-					if (clean) {
-						if (attr->prev == NULL) {
-							child->properties = attr->next;
-						} else {
-							attr->prev->next = attr->next;
-						}
-					}
+					xmlChar *id_buf = xmlNodeGetContent(attr->children);
+					id = reinterpret_cast<const char *>(id_buf);
+					xmlFree(id_buf);
+					id_attr = attr;
 				}
 			}
+			if (clean && id_attr != NULL) {
+				xmlRemoveProp(id_attr);
+			}
 
 			// Check all substitutions to see if we found anything appropriate.
 			for (auto it : substitution_map) {
@@ -117,6 +141,7 @@ void process_file(const string &input_filename,
 	xmlDocPtr doc = xmlParseFile(input_filename.c_str());
 	root_directive->process(xmlDocGetRootElement(doc), true);
 	xmlSaveFile(output_filename.c_str(), doc);
+	xmlFreeDoc(doc);
 
 	xmlCleanupParser();
 	xmlMemoryDump();