とりあえずヘッダについては一通り出来た？

diff --git a/roast/include/roast/xml/roast_xml/structure.hpp b/roast/include/roast/xml/roast_xml/structure.hpp
index c380248..198bda3 100644 (file)
--- a/roast/include/roast/xml/roast_xml/structure.hpp
+++ b/roast/include/roast/xml/roast_xml/structure.hpp
@@ -16,6 +16,13 @@ namespace roast
                {
                        using namespace ::roast::lexical;
                        using namespace ::roast::lexical::structure;
+                       
+                       //////////////////////////////////////////////////
+
+                       template <typename T>
+                       class ws_ : public seq3<nrqws, T, nrqws>{};
+
+                       //////////////////////////////////////////////////
 
                        class greater
                        {
@@ -47,7 +54,7 @@ namespace roast
                                }
                        };
 
-                       class _string_xml
+                       class str_xml
                        {
                        public:
                                template <typename T>
@@ -71,22 +78,29 @@ namespace roast
                        };
                        
                        /////////////////////////////////////////////////////
-                       
-                       class element
+
+                       class comment
                        {
                        };
-                       class attr
+                       class optcomm
                        {
                        };
-                       typedef lexical::structure::repeat<attr> attrs;
+                       class nothing : public seq3<nrqws, optcomm, nrqws> {};
 
-                       class comment
+                       template <typename T>
+                       class nothing_ : public seq2<nothing, T>{};
+
+                       
+                       class element
                        {
                        };
-                       class optcomm
+
+                       class attr
                        {
                        };
-                       class nothing : public seq3<nrqws, optcomm, nrqws> {};
+                       //typedef ws_<lexical::structure::repeat<attr> > attrs;
+                       typedef seq3<reqws, lexical::structure::repeat<attr>, nrqws> attrs;
+
 
                        class text
                        {
@@ -96,14 +110,11 @@ namespace roast
                        {
                        };
                        
-                       template <typename T>
-                       class nothing_ : public seq2<nothing, T>{};
-                       
                        /*class header
                        {
                        };*/
                        typedef lexical::structure_base<
-                               seq7<lesser, question, _string_xml, _reqws, attrs, question, greater>
+                               seq6<lesser, question, str_xml, attrs, question, greater>
                        > header, xmldecl;
                }