From 884dea7531962b17ef843ac2175faa050e8b0758 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 10 Apr 2014 12:57:06 +0200
Subject: Add support for ordered types, mixed content

---
 libxsd/xsd/cxx/xml/dom/parsing-source.hxx | 33 +++++++++++++++++------
 libxsd/xsd/cxx/xml/dom/parsing-source.txx | 44 +++++++++++++++++++++++--------
 2 files changed, 58 insertions(+), 19 deletions(-)

(limited to 'libxsd/xsd/cxx/xml')

diff --git a/libxsd/xsd/cxx/xml/dom/parsing-source.hxx b/libxsd/xsd/cxx/xml/dom/parsing-source.hxx
index 1c53928..fac1006 100644
--- a/libxsd/xsd/cxx/xml/dom/parsing-source.hxx
+++ b/libxsd/xsd/cxx/xml/dom/parsing-source.hxx
@@ -30,30 +30,47 @@ namespace xsd
     {
       namespace dom
       {
-        // Parser state object. Can be used for parsing element, attributes,
-        // or both.
+        // Parser state object. Can be used for parsing elements (and
+        // optionally text), attributes, or both.
         //
         template <typename C>
         class parser
         {
         public:
-          parser (const xercesc::DOMElement& e, bool ep, bool ap);
+          parser (const xercesc::DOMElement& e, bool ep, bool tp, bool ap);
 
+          // Content parsing.
+          //
           bool
-          more_elements ()
+          more_content ()
           {
-            return next_element_ != 0;
+            return next_content_ != 0;
           }
 
           const xercesc::DOMElement&
           cur_element ()
           {
-            return *static_cast<const xercesc::DOMElement*> (next_element_);
+            return *static_cast<const xercesc::DOMElement*> (next_content_);
+          }
+
+          const xercesc::DOMText&
+          cur_text ()
+          {
+            return *static_cast<const xercesc::DOMText*> (next_content_);
+          }
+
+          bool
+          cur_is_text ()
+          {
+            return next_content_->getNodeType () !=
+              xercesc::DOMNode::ELEMENT_NODE;
           }
 
           void
-          next_element ();
+          next_content (bool text);
 
+          // Attribute parsing.
+          //
           bool
           more_attributes ()
           {
@@ -86,7 +103,7 @@ namespace xsd
 
         private:
           const xercesc::DOMElement& element_;
-          const xercesc::DOMNode* next_element_;
+          const xercesc::DOMNode* next_content_;
 
           const xercesc::DOMNamedNodeMap* a_;
           XMLSize_t ai_; // Index of the next DOMAttr.
diff --git a/libxsd/xsd/cxx/xml/dom/parsing-source.txx b/libxsd/xsd/cxx/xml/dom/parsing-source.txx
index 8eb4d6e..c789fa6 100644
--- a/libxsd/xsd/cxx/xml/dom/parsing-source.txx
+++ b/libxsd/xsd/cxx/xml/dom/parsing-source.txx
@@ -29,9 +29,9 @@ namespace xsd
         //
         template <typename C>
         parser<C>::
-        parser (const xercesc::DOMElement& e, bool ep, bool ap)
+        parser (const xercesc::DOMElement& e, bool ep, bool tp, bool ap)
             : element_ (e),
-              next_element_ (0),
+              next_content_ (0),
               a_ (0),
               ai_ (0)
         {
@@ -39,10 +39,21 @@ namespace xsd
 
           if (ep)
           {
-            for (next_element_ = e.getFirstChild ();
-                 next_element_ != 0 &&
-                   next_element_->getNodeType () != DOMNode::ELEMENT_NODE;
-                 next_element_ = next_element_->getNextSibling ()) /*noop*/;
+            for (next_content_ = e.getFirstChild ();;
+                 next_content_ = next_content_->getNextSibling ())
+            {
+              if (next_content_ == 0)
+                break;
+
+              DOMNode::NodeType t (next_content_->getNodeType ());
+
+              if (t == DOMNode::ELEMENT_NODE)
+                break;
+
+              if (tp && (t == DOMNode::TEXT_NODE ||
+                         t == DOMNode::CDATA_SECTION_NODE))
+                break;
+            }
           }
 
           if (ap)
@@ -54,14 +65,25 @@ namespace xsd
 
         template <typename C>
         void parser<C>::
-        next_element ()
+        next_content (bool tp)
         {
           using xercesc::DOMNode;
 
-          for (next_element_ = next_element_->getNextSibling ();
-               next_element_ != 0 &&
-                 next_element_->getNodeType () != DOMNode::ELEMENT_NODE;
-               next_element_ = next_element_->getNextSibling ())/*noop*/;
+          for (next_content_ = next_content_->getNextSibling ();;
+               next_content_ = next_content_->getNextSibling ())
+          {
+            if (next_content_ == 0)
+              break;
+
+            DOMNode::NodeType t (next_content_->getNodeType ());
+
+            if (t == DOMNode::ELEMENT_NODE)
+              break;
+
+            if (tp && (t == DOMNode::TEXT_NODE ||
+                       t == DOMNode::CDATA_SECTION_NODE))
+              break;
+          }
         }
 
         // parse()
-- 
cgit v1.1