From aa79aef0a1f5514e0e724591d499077cc7948c35 Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Tue, 20 Jul 2010 22:36:24 +0900
Subject: [PATCH] =?utf8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9A?=
 =?utf8?q?=E3=83=98=E3=83=83=E3=83=80=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?=
 =?utf8?q?=E3=81=AF=E4=B8=80=E9=80=9A=E3=82=8A=E5=87=BA=E6=9D=A5=E3=81=9F?=
 =?utf8?q?=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 roast/include/roast/xml/roast_xml/structure.hpp | 35 ++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/roast/include/roast/xml/roast_xml/structure.hpp b/roast/include/roast/xml/roast_xml/structure.hpp
index c3802486..198bda3c 100644
--- 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;
 		}
 		
-- 
2.11.0