From 78062f883078b21d7ab83f9cfa9982f5cb739a52 Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Sat, 31 Jul 2010 00:13:19 +0900
Subject: [PATCH] =?utf8?q?roast=5Fxml:=20roast=5Fxml=5Fsax=5Fparser.hpp:?=
 =?utf8?q?=20=20pcode=E5=AF=BE=E5=BF=9C=20structure.hpp:=20=20start=5Fclos?=
 =?utf8?q?e=5Felement=5Fname,=20end=5Fclose=5Felement=5Fname,=20end=5Fempt?=
 =?utf8?q?y=5Felement=20=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../roast/xml/roast_xml/roast_xml_sax_parser.hpp   | 38 +++++++++++++++-------
 roast/include/roast/xml/roast_xml/structure.hpp    |  7 ++--
 2 files changed, 31 insertions(+), 14 deletions(-)

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 df3323e4..fb0068c4 100644
--- a/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp
+++ b/roast/include/roast/xml/roast_xml/roast_xml_sax_parser.hpp
@@ -31,27 +31,41 @@ namespace roast
 
 			void operator << (int n)
 			{
+				using namespace structure::pcode;
+
 				switch(n)
 				{
-				case 0:
+				case start_attr_name:
 					printf( "%sattr: ", m_indent.c_str() ); break;
-				case 1:
-					printf( "\"\n" ); break;
-				case 2:
+				case start_attr_value:
 					printf( "=\"" ); break;
-				case 10:
+				case end_attr_value:
+					printf( "\"\n" ); break;
+
+				case start_comment:
 					printf( "%scomment: \"", m_indent.c_str() ); break;
-				case 11:
+				case end_comment:
 					printf( "\"\n" ); break;
-				case 20:
+
+				case start_text:
 					printf( "%stext: \"", m_indent.c_str() ); break;
-				case 60:
+				case end_text:
+					printf( "\"\n" ); break;
+
+				case start_element:
 					printf( "%s<element: \"", m_indent.c_str() ); m_indent += "  "; break;
-				case 62:
+				case end_element_name:
+					printf( "\"\n" ); break;
+				case start_close_element_name:
 					printf( "%s/: \"", m_indent.c_str() ); break;
-				case 67:
-					printf( "%send of element.\n>\n", m_indent.c_str() ); m_indent = m_indent.substr(2); break;
-				case 69:
+				case end_close_element_name:
+					printf( "\"\n" ); break;
+
+				case end_element:
+					m_indent = m_indent.substr(2);
+					printf( "  %send of element.\n%s>\n", m_indent.c_str(), m_indent.c_str() );
+					break;
+				case end_empty_element:
 					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 5a916d8c..97f06fde 100644
--- a/roast/include/roast/xml/roast_xml/structure.hpp
+++ b/roast/include/roast/xml/roast_xml/structure.hpp
@@ -52,6 +52,9 @@ namespace roast
 					start_element,
 					end_element_name,
 					end_element,
+					start_close_element_name,
+					end_close_element_name,
+					end_empty_element,
 
 					__end
 				};
@@ -175,9 +178,9 @@ namespace roast
 				lesser,
 				slash,
 
-				push_num<99>,	//	Close Tag Name start
+				push_num<pcode::start_close_element_name>,	//	Close Tag Name start
 				get_string_end_by< or<greater, whitespace> >,
-				push_num<98>,	//	Close Tag Name end
+				push_num<pcode::end_close_element_name>,	//	Close Tag Name end
 				noreqws
 			> startend_element_impl;
 
-- 
2.11.0