Use return {}.

[libcxml.git] / src / cxml.cc

diff --git a/src/cxml.cc b/src/cxml.cc
index f667584f4fee595331061d0d401b90009356db00..922a3d713a45849d2078438ecfb39b1ee61915fc 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libcxml.
 
@@ -18,14 +18,15 @@
 
 */
 
+#include "cxml.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <libxml++/libxml++.h>
-#include "cxml.h"
+#include <cstdio>
 
+using std::shared_ptr;
 using std::string;
-using std::list;
-using boost::shared_ptr;
+using std::vector;
 using boost::optional;
 
 cxml::Node::Node ()
@@ -52,7 +53,7 @@ cxml::Node::name () const
 shared_ptr<cxml::Node>
 cxml::Node::node_child (string name) const
 {
-       list<shared_ptr<cxml::Node> > n = node_children (name);
+       auto const n = node_children (name);
        if (n.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + name);
        } else if (n.empty ()) {
@@ -65,45 +66,42 @@ cxml::Node::node_child (string name) const
 shared_ptr<cxml::Node>
 cxml::Node::optional_node_child (string name) const
 {
-       list<shared_ptr<cxml::Node> > n = node_children (name);
+       auto const n = node_children (name);
        if (n.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + name);
        } else if (n.empty ()) {
-               return shared_ptr<cxml::Node> ();
+               return {};
        }
 
        return n.front ();
 }
 
-list<shared_ptr<cxml::Node> >
+vector<shared_ptr<cxml::Node>>
 cxml::Node::node_children () const
 {
        if (!_node) {
                throw Error ("No node to read children from");
        }
-       xmlpp::Node::NodeList c = _node->get_children ();
 
-       list<shared_ptr<cxml::Node> > n;
-       for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
-               n.push_back (shared_ptr<Node> (new Node (*i)));
+       vector<shared_ptr<cxml::Node> > n;
+       for (auto i: _node->get_children()) {
+               n.push_back (shared_ptr<Node> (new Node (i)));
        }
 
        return n;
 }
 
-list<shared_ptr<cxml::Node> >
+vector<shared_ptr<cxml::Node>>
 cxml::Node::node_children (string name) const
 {
        /* XXX: using find / get_path should work here, but I can't follow
           how get_path works.
        */
 
-       xmlpp::Node::NodeList c = _node->get_children ();
-
-       list<shared_ptr<cxml::Node> > n;
-       for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
-               if ((*i)->get_name() == name) {
-                       n.push_back (shared_ptr<Node> (new Node (*i)));
+       vector<shared_ptr<cxml::Node> > n;
+       for (auto i: _node->get_children()) {
+               if (i->get_name() == name) {
+                       n.push_back (shared_ptr<Node> (new Node (i)));
                }
        }
 
@@ -120,13 +118,13 @@ cxml::Node::string_child (string c) const
 optional<string>
 cxml::Node::optional_string_child (string c) const
 {
-       list<shared_ptr<Node> > nodes = node_children (c);
+       auto const nodes = node_children (c);
        if (nodes.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + c);
        }
 
        if (nodes.empty ()) {
-               return optional<string> ();
+               return {};
        }
 
        return nodes.front()->content();
@@ -135,16 +133,16 @@ cxml::Node::optional_string_child (string c) const
 bool
 cxml::Node::bool_child (string c) const
 {
-       string const s = string_child (c);
+       auto const s = string_child (c);
        return (s == "1" || s == "yes" || s == "True");
 }
 
 optional<bool>
 cxml::Node::optional_bool_child (string c) const
 {
-       optional<string> s = optional_string_child (c);
+       auto const s = optional_string_child (c);
        if (!s) {
-               return optional<bool> ();
+               return {};
        }
 
        return (s.get() == "1" || s.get() == "yes" || s.get() == "True");
@@ -159,12 +157,12 @@ cxml::Node::ignore_child (string name) const
 string
 cxml::Node::string_attribute (string name) const
 {
-       xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+       auto e = dynamic_cast<const xmlpp::Element *> (_node);
        if (!e) {
                throw cxml::Error ("missing attribute " + name);
        }
 
-       xmlpp::Attribute* a = e->get_attribute (name);
+       auto a = e->get_attribute (name);
        if (!a) {
                throw cxml::Error ("missing attribute " + name);
        }
@@ -175,14 +173,14 @@ cxml::Node::string_attribute (string name) const
 optional<string>
 cxml::Node::optional_string_attribute (string name) const
 {
-       xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+       auto e = dynamic_cast<const xmlpp::Element *> (_node);
        if (!e) {
-               return optional<string> ();
+               return {};
        }
 
-       xmlpp::Attribute* a = e->get_attribute (name);
+       auto a = e->get_attribute (name);
        if (!a) {
-               return optional<string> ();
+               return {};
        }
 
        return string (a->get_value ());
@@ -191,16 +189,16 @@ cxml::Node::optional_string_attribute (string name) const
 bool
 cxml::Node::bool_attribute (string name) const
 {
-       string const s = string_attribute (name);
+       auto const s = string_attribute (name);
        return (s == "1" || s == "yes");
 }
 
 optional<bool>
 cxml::Node::optional_bool_attribute (string name) const
 {
-       optional<string> s = optional_string_attribute (name);
+       auto s = optional_string_attribute (name);
        if (!s) {
-               return optional<bool> ();
+               return {};
        }
 
        return (s.get() == "1" || s.get() == "yes");
@@ -209,10 +207,9 @@ cxml::Node::optional_bool_attribute (string name) const
 void
 cxml::Node::done () const
 {
-       xmlpp::Node::NodeList c = _node->get_children ();
-       for (xmlpp::Node::NodeList::iterator i = c.begin(); i != c.end(); ++i) {
-               if (dynamic_cast<xmlpp::Element *> (*i) && find (_taken.begin(), _taken.end(), (*i)->get_name()) == _taken.end ()) {
-                       throw cxml::Error ("unexpected XML node " + (*i)->get_name());
+       for (auto i: _node->get_children()) {
+               if (dynamic_cast<xmlpp::Element *> (i) && find (_taken.begin(), _taken.end(), i->get_name()) == _taken.end ()) {
+                       throw cxml::Error ("unexpected XML node " + i->get_name());
                }
        }
 }
@@ -222,9 +219,8 @@ cxml::Node::content () const
 {
        string content;
 
-        xmlpp::Node::NodeList c = _node->get_children ();
-       for (xmlpp::Node::NodeList::const_iterator i = c.begin(); i != c.end(); ++i) {
-               xmlpp::ContentNode const * v = dynamic_cast<xmlpp::ContentNode const *> (*i);
+       for (auto i: _node->get_children()) {
+               auto v = dynamic_cast<xmlpp::ContentNode const *> (i);
                if (v && dynamic_cast<xmlpp::TextNode const *>(v)) {
                        content += v->get_content ();
                }
@@ -305,7 +301,7 @@ static
 string
 make_local (string v)
 {
-       struct lconv* lc = localeconv ();
+       auto lc = localeconv ();
        boost::algorithm::replace_all (v, ".", lc->decimal_point);
        /* We hope it's ok not to add in thousands separators here */
        return v;
@@ -348,6 +344,45 @@ locale_convert (string x)
        return y;
 }
 
+template<>
+long unsigned int
+locale_convert (string x)
+{
+        long unsigned int y = 0;
+#ifdef LIBCXML_WINDOWS
+        __mingw_sscanf (x.c_str(), "%lud", &y);
+#else
+        sscanf (x.c_str(), "%lud", &y);
+#endif
+        return y;
+}
+
+template<>
+long long
+locale_convert (string x)
+{
+       long long y = 0;
+#ifdef LIBCXML_WINDOWS
+       __mingw_sscanf (x.c_str(), "%lld", &y);
+#else
+       sscanf (x.c_str(), "%lld", &y);
+#endif
+       return y;
+}
+
+template<>
+long long unsigned
+locale_convert (string x)
+{
+       long long unsigned y = 0;
+#ifdef LIBCXML_WINDOWS
+        __mingw_sscanf (x.c_str(), "%llud", &y);
+#else
+        sscanf (x.c_str(), "%llud", &y);
+#endif
+        return y;
+}
+
 template<>
 float
 locale_convert (string x)
@@ -373,6 +408,13 @@ cxml::raw_convert (string v)
        return locale_convert<int> (make_local(v));
 }
 
+template <>
+unsigned int
+cxml::raw_convert (string v)
+{
+       return locale_convert<unsigned int> (make_local(v));
+}
+
 template <>
 long int
 cxml::raw_convert (string v)
@@ -381,10 +423,24 @@ cxml::raw_convert (string v)
 }
 
 template <>
-unsigned int
+long unsigned int
 cxml::raw_convert (string v)
 {
-       return locale_convert<unsigned int> (make_local(v));
+       return locale_convert<long unsigned int> (make_local(v));
+}
+
+template <>
+long long
+cxml::raw_convert (string v)
+{
+       return locale_convert<long long> (make_local(v));
+}
+
+template <>
+long long unsigned
+cxml::raw_convert (string v)
+{
+       return locale_convert<long long unsigned> (make_local(v));
 }
 
 template <>