seqやらnrqwsやら色々直してるところ

diff --git a/roast/include/roast/lexical/structure_base.hpp b/roast/include/roast/lexical/structure_base.hpp
index 4a6d8c5..ff22869 100644 (file)
--- a/roast/include/roast/lexical/structure_base.hpp
+++ b/roast/include/roast/lexical/structure_base.hpp
@@ -19,27 +19,27 @@ namespace roast
                        };
 
                        template <typename T1, typename T2>
-                       class series2
+                       class seq2
                        {
                        };
                        template <typename T1, typename T2, typename T3>
-                       class series3
+                       class seq3
                        {
                        };
                        template <typename T1, typename T2, typename T3, typename T4>
-                       class series4
+                       class seq4
                        {
                        };
                        template <typename T1, typename T2, typename T3, typename T4, typename T5>
-                       class series5
+                       class seq5
                        {
                        };
                        template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-                       class series6
+                       class seq6
                        {
                        };
                        template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-                       class series7
+                       class seq7
                        {
                        };
 
@@ -65,6 +65,19 @@ namespace roast
                        class _reqws
                        {
                        };
+                       class _nrqws
+                       {
+                       };
+
+                       class reqws
+                       {
+                       };
+                       class nrqws
+                       {
+                       };
+                       class optws
+                       {
+                       };
                }
 
                ///////////////////////////////////////

diff --git a/roast/include/roast/xml/roast_xml/structure.hpp b/roast/include/roast/xml/roast_xml/structure.hpp
index 4f43cd8..c380248 100644 (file)
--- a/roast/include/roast/xml/roast_xml/structure.hpp
+++ b/roast/include/roast/xml/roast_xml/structure.hpp
@@ -83,6 +83,11 @@ namespace roast
                        class comment
                        {
                        };
+                       class optcomm
+                       {
+                       };
+                       class nothing : public seq3<nrqws, optcomm, nrqws> {};
+
                        class text
                        {
                        };
@@ -91,21 +96,25 @@ namespace roast
                        {
                        };
                        
+                       template <typename T>
+                       class nothing_ : public seq2<nothing, T>{};
                        
                        /*class header
                        {
                        };*/
                        typedef lexical::structure_base<
-                               series7<lesser, question, _string_xml, _reqws, attrs, question, greater>
+                               seq7<lesser, question, _string_xml, _reqws, attrs, question, greater>
                        > header, xmldecl;
                }
                
                ////////////////////////////////////////////////////
                
                typedef lexical::structure_base<
-                       ::roast::lexical::structure::series2<
-                               structure::header,
-                               structure::body>
+                       ::roast::lexical::structure::seq3<
+                               structure::nothing_<structure::header>,
+                               structure::nothing_<structure::body>,
+                               structure::nothing
+                       >
                > _structure;
        }
 }