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

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 62b5dba..c2b62cd 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;
@@ -51,7 +62,10 @@ void Clone::process(xmlNode *node, bool clean) {
 		}
 	}
 
-	node->children = NULL;
+	xmlFreeNodeList(node->children);
+	node->content = NULL;
+	node->children = node->last = NULL;
+
 	for (auto child : new_nodes) {
 		xmlAddChild(node, child);
 	}	
@@ -63,10 +77,18 @@ 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;
 
@@ -117,6 +139,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();