lexical: seqX廃止

diff --git a/roast/include/roast/lexical/structure_base.hpp b/roast/include/roast/lexical/structure_base.hpp
index 6a94d49..32e632c 100644 (file)
--- a/roast/include/roast/lexical/structure_base.hpp
+++ b/roast/include/roast/lexical/structure_base.hpp
@@ -106,6 +106,7 @@ namespace roast
                                        return true;
                                }
                        };
+                       /*
 
                        ////////////////////////////////////////////////////////////////
                        template <typename T1, typename T2>
@@ -253,6 +254,7 @@ namespace roast
                                        return true;
                                }
                        };
+                       */
 
                        //////////////////////////////////////////////////////////////
 

diff --git a/roast/include/roast/xml/roast_xml/structure.hpp b/roast/include/roast/xml/roast_xml/structure.hpp
index d501afc..65f6130 100644 (file)
--- a/roast/include/roast/xml/roast_xml/structure.hpp
+++ b/roast/include/roast/xml/roast_xml/structure.hpp
@@ -21,7 +21,7 @@ namespace roast
                        //////////////////////////////////////////////////
 
                        template <typename T>
-                       class ws_ : public seq3<nrqws, T, nrqws>{};
+                       class ws_ : public seq<nrqws, T, nrqws>{};
 
                        //////////////////////////////////////////////////
 
@@ -100,14 +100,14 @@ namespace roast
                                        return ( memcmp(s1,s2) == 0 );
                                }
                        };*/
-                       typedef seq3<
+                       typedef seq<
                                unichar<'x'>,
                                unichar<'m'>,
                                unichar<'l'>
                        > str_xml;
 
                        template <typename T>
-                       class lt_gt_ : public seq3<lesser, T, greater> {};
+                       class lt_gt_ : public seq<lesser, T, greater> {};
                        
                        /////////////////////////////////////////////////////
 
@@ -120,17 +120,17 @@ namespace roast
                                        return true;
                                }
                        };
-                       typedef lt_gt_< seq6< exclamation, hyphen, hyphen, comment_impl, hyphen, hyphen> > comment;
+                       typedef lt_gt_< seq< exclamation, hyphen, hyphen, comment_impl, hyphen, hyphen> > comment;
 
                        /*class optcomm
                        {
                        };*/
                        //typedef lexical::structure::or< comment, noelems > optcomm;
 
-                       class noelems : public seq3<nrqws, optional<comment>, nrqws> {};
+                       class noelems : public seq<nrqws, optional<comment>, nrqws> {};
 
                        template <typename T>
-                       class noelems_ : public seq2<noelems, T>{};
+                       class noelems_ : public seq<noelems, T>{};
 
                        //////////////////////////////////////////////////////////////////
 
@@ -202,8 +202,8 @@ namespace roast
 
                        //typedef ws_<lexical::structure::repeat<attr> > attrs;
                        //typedef seq3<reqws, lexical::structure::repeat<attr>, nrqws> attrs;
-                       typedef seq2<
-                               lexical::structure::repeat< seq2<reqws, attr> >,
+                       typedef seq<
+                               lexical::structure::repeat< seq<reqws, attr> >,
                        nrqws> attrs;
 
                        ///////////////////////////////////////////////////////////////////////////////////
@@ -275,10 +275,10 @@ namespace roast
                                seq6<lesser, question, str_xml, attrs, question, greater>
                        > header, xmldecl;*/
                        typedef
-                               seq4<question, str_xml, attrs, question>
+                               seq<question, str_xml, attrs, question>
                                header_internal, xmldecl_internal;
                        typedef
-                               seq6<lesser, question, str_xml, attrs, question, greater>
+                               seq<lesser, question, str_xml, attrs, question, greater>
                                header, xmldecl;
 
                        /*
@@ -300,7 +300,7 @@ namespace roast
                                structure::noelems
                        >
                > _structure;*/
-               typedef ::roast::lexical::structure::seq3
+               typedef ::roast::lexical::structure::seq
                <
                        structure::noelems_<structure::header>,
                        structure::noelems_<structure::body>,