lexical, roast_xml: ゴミ整理等々。

diff --git a/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp b/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp
index 916ae67..df3323e 100644 (file)
--- a/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp
+++ b/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp
@@ -47,8 +47,10 @@ namespace roast
                                        printf( "%stext: \"", m_indent.c_str() ); break;
                                case 60:
                                        printf( "%s<element: \"", m_indent.c_str() ); m_indent += "  "; break;
+                               case 62:
+                                       printf( "%s/: \"", m_indent.c_str() ); break;
                                case 67:
-                                       printf( "%send of element.>\n", m_indent.c_str() ); m_indent = m_indent.substr(2); break;
+                                       printf( "%send of element.\n>\n", m_indent.c_str() ); m_indent = m_indent.substr(2); break;
                                case 69:
                                        printf( "%s-> end of empty Tag.\n", m_indent.c_str() ); break;
                                }

diff --git a/roast/include/roast/xml/roast_xml/structure.hpp b/roast/include/roast/xml/roast_xml/structure.hpp
index d9bf1c0..b9e0bec 100644 (file)
--- a/roast/include/roast/xml/roast_xml/structure.hpp
+++ b/roast/include/roast/xml/roast_xml/structure.hpp
@@ -63,10 +63,7 @@ namespace roast
 
                        typedef repeat<comment> opt_comments;
 
-                       /*class optcomm
-                       {
-                       };*/
-                       //typedef lexical::structure::or< comment, noelems > optcomm;
+                       /////
 
                        class noelems : public seq<nrqws, optional<comment>, nrqws> {};
 
@@ -121,16 +118,6 @@ namespace roast
 
                                                //      comments
                                                repeat<comment>
-
-                                               /*
-                                               //      end when tag start.
-                                               test< not<
-                                                       seq<
-                                                               lesser,                         //      <
-                                                               not<exclamation>        //      not !
-                                                       >
-                                               > >
-                                               */
                                        >
                                >
                        > text;
@@ -187,41 +174,16 @@ namespace roast
                        
                        //      XML declaration
 
-                       /*class header
-                       {
-                       };*/
-                       /*typedef lexical::structure_base<
-                               seq6<lesser, question, str_xml, attrs, question, greater>
-                       > header, xmldecl;*/
                        typedef
                                seq<question, str_xml, attrs, question>
                                header_internal, xmldecl_internal;
-                       /*typedef
-                               seq<lesser, question, str_xml, attrs, question, greater>
-                               header, xmldecl;*/
                        typedef
                                seq<lesser, header_internal, greater>
                                header, xmldecl;
-
-                       /*
-                       typedef seq3
-                       <
-                               noreqws, lt_gt_< or<> >,
-                               noreqws, lt_gt_< >,
-                               structure::noelems
-                       > _structure;
-                       */
                }
                
                ////////////////////////////////////////////////////
                
-               /*typedef lexical::structure_base<
-                       ::roast::lexical::structure::seq3<
-                               structure::noelems_<structure::header>,
-                               structure::noelems_<structure::body>,
-                               structure::noelems
-                       >
-               > _structure;*/
                typedef ::roast::lexical::structure::seq
                <
                        structure::noelems_<structure::header>,