Add xml::rnParse, a simple and lightweight xml::Reader interface.

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 97a5cec..d6c5239 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -384,6 +384,7 @@ SET( zypp_parser_xml_SRCS
 )
 
 SET( zypp_parser_xml_HEADERS
+  parser/xml/Parse.h
   parser/xml/Node.h
   parser/xml/ParseDef.h
   parser/xml/ParseDefConsume.h

diff --git a/zypp/parser/xml/Parse.h b/zypp/parser/xml/Parse.h
new file mode 100644 (file)
index 0000000..85ffc86
--- /dev/null
+++ b/zypp/parser/xml/Parse.h
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file       zypp/parser/xml/Parse.h
+ *
+*/
+#ifndef ZYPP_PARSER_XML_PARSE_H
+#define ZYPP_PARSER_XML_PARSE_H
+
+#include <iosfwd>
+
+#include "zypp/parser/xml/Reader.h"
+#include "zypp/parser/xml/ParseDef.h"
+#include "zypp/parser/xml/ParseDefConsume.h"
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
+  namespace xml
+  { /////////////////////////////////////////////////////////////////
+
+    /** Parse xml \c input_r and store data in \c data_r.
+     *
+     * \c _Data must be defaultconstructible and assignable.
+     *
+     * \c _Data::RootNode must be a \ref xml::ParseDef constructible
+     * from \c _Data&.
+     *
+     * \throws ParseDefException on parse errors.
+     *
+     * To parse a xml file like this:
+     * \code
+     * <test>
+     *   <setup attr="13">value</setup>
+     *   <list name="A"/>
+     *   <list name="b"/>
+     * </test>
+     * \endcode
+     *
+     * You need something like this:
+     * \code
+     *  struct XmlData
+     *  {
+     *    // data
+     *    unsigned              attr;
+     *    std::string           value;
+     *    std:list<std::string> names;
+     *
+     *    public:
+     *      // Convenience parsing to *this.
+     *      void parse( const Pathname & path_r )
+     *      { xml::rnParse( path_r, *this ); }
+     *
+     *    public:
+     *      // Parser description
+     *      struct RootNode : public xml::ParseDef
+     *      {
+     *        RootNode( XmlData & data )
+     *          : ParseDef( "test", MANDTAORY )
+     *          , _data( data )
+     *        {
+     *          (*this)
+     *              ("setup", MANDTAORY,
+     *                        xml::parseDefAssign( data.value )
+     *                                           ( "attr", data.attr ) )
+     *              // Each individual list entry is collected locally
+     *              // and appended to the list after the node is done.
+     *              ("list",  MULTIPLE_OPTIONAL,
+     *                        xml::parseDefAssign( "name", _cname )
+     *                                           >> bind( &RootNode::cdone, this, _1 ) )
+     *              ;
+     *        }
+     *
+     *        void cdone( const xml::Node & node_r )
+     *        {
+     *          _data.push_back( _cname );
+     *          _cname.clear(); // prepare for next
+     *        }
+     *
+     *        private:
+     *          XmlData &   _data; // stored just because notification callbacks are used.
+     *          std::string _cname;
+     *      };
+     *  };
+     *
+     *  XmlData xmlData;
+     *  xmlData.parse( "/tmp/mytest.xml" );
+     * \endcode
+     */
+    template<class _Data>
+    inline void rnParse( const InputStream & input_r, _Data & data_r )
+    {
+      typedef typename _Data::RootNode RootNode;
+      _Data pdata;
+
+      xml::Reader reader( input_r );
+      RootNode rootNode( pdata );
+      rootNode.take( reader );
+
+      data_r = pdata;
+    }
+
+    /////////////////////////////////////////////////////////////////
+  } // namespace xml
+  ///////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+#endif // ZYPP_PARSER_XML_PARSEDEF_H