Fix yet more memory leaks in the C++0x version.

[xml-template] / c++0x / xml-template.cpp

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 3be1407b3b5592d93b6768859135a90dfc26481f..f28b3dc93cd00e67fcefb0695576056330ae9a24 100644 (file)
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -5,17 +5,89 @@
 
 using namespace std;
 
+namespace {
+
+void clean_node(xmlNode *node)
+{
+       if (node->type != XML_ELEMENT_NODE) {
+               return;
+       }
+       if (strcmp(reinterpret_cast<const char *>(node->ns->href), "http://template.sesse.net/") == 0) {
+               xmlNode *frag = xmlNewDocFragment(node->doc);
+               xmlReplaceNode(node, frag);
+               frag->children = node->children;
+       }
+}
+
+}  // 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 vector<Directive *> &subdirectives)
+       : subdirectives(subdirectives) {}
+       
+Clone::Clone(initializer_list<Directive *> subdirectives)
+       : subdirectives(subdirectives) {}
+
+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;
+
+       for (auto it : subdirectives) {
+               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) {
+                       new_nodes.push_back(child);
+               }
+       }
+
+       xmlFreeNodeList(node->children);
+       node->content = NULL;
+       node->children = node->last = NULL;
+
+       for (auto child : new_nodes) {
+               xmlAddChild(node, child);
+       }       
+       if (clean) {
+               clean_node(node);
+       }
 }
 
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
        : substitution_map(substitution_map) {}
+       
+Substitute::Substitute(initializer_list<pair<const string, Directive*>> substitution_map)
+       : substitution_map(substitution_map) {}
+
+Substitute::~Substitute()
+{
+       for (auto it : substitution_map) {
+               delete it.second;
+       }
+}
 
-void Substitute::process(xmlNode *node, bool clean) {
+void Substitute::process(xmlNode *node, bool clean)
+{
        for (xmlNode *child = node->children; child != NULL; child = child->next) {
                bool processed = false;
 
@@ -26,6 +98,14 @@ void Substitute::process(xmlNode *node, bool clean) {
                                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;
+                                               }
+                                       }
                                }
                        }
 
@@ -44,6 +124,9 @@ void Substitute::process(xmlNode *node, bool clean) {
                        process(child, clean);
                }
        }
+       if (clean) {
+               clean_node(node);
+       }
 }
        
 void process_file(const string &input_filename,
@@ -53,8 +136,9 @@ void process_file(const string &input_filename,
        LIBXML_TEST_VERSION
 
        xmlDocPtr doc = xmlParseFile(input_filename.c_str());
-       root_directive->process(xmlDocGetRootElement(doc), false);
+       root_directive->process(xmlDocGetRootElement(doc), true);
        xmlSaveFile(output_filename.c_str(), doc);
+       xmlFreeDoc(doc);
 
        xmlCleanupParser();
        xmlMemoryDump();