Add parser::next_expect() version that also sets content model

1 files changed, 15 insertions, 2 deletions

diff --git a/xml/parser.hxx b/xml/parser.hxx
index 1c9d389..c957b6d 100644
--- a/xml/parser.hxx
+++ b/xml/parser.hxx
@@ -178,10 +178,10 @@ namespace xml
     next_expect (event_type);
 
     void
-    next_expect (event_type, const qname_type& qname);
+    next_expect (event_type, const std::string& name);
 
     void
-    next_expect (event_type, const std::string& name);
+    next_expect (event_type, const qname_type& qname);
 
     void
     next_expect (event_type, const std::string& ns, const std::string& name);
@@ -321,6 +321,19 @@ namespace xml
         : mixed;
     }
 
+    // Versions that also set the content. Event type must be start_element.
+    //
+    void
+    next_expect (event_type, const std::string& name, content_type);
+
+    void
+    next_expect (event_type, const qname_type& qname, content_type);
+
+    void
+    next_expect (event_type,
+                 const std::string& ns, const std::string& name,
+                 content_type);
+
   private:
     static void XMLCALL
     start_element_ (void*, const XML_Char*, const XML_Char**);