From: myun2 <myun2@nwhite.info>
Date: Tue, 12 Jun 2012 08:10:49 +0000 (+0900)
Subject: この際なので、analyze() -> parse() にしてみた
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93692fb57e015209585e1ccb23a8d2a1fb62f8d0;p=roast%2Froast.git

この際なので、analyze() -> parse() にしてみた
---

diff --git a/roast/include/roast/lexical2/empty_type.hpp b/roast/include/roast/lexical2/empty_type.hpp
index 66c361bf..34540535 100644
--- a/roast/include/roast/lexical2/empty_type.hpp
+++ b/roast/include/roast/lexical2/empty_type.hpp
@@ -16,7 +16,7 @@ namespace roast
 		{
 		public:
 			template <typename InputIterator, typename _Param>
-			bool analyze(const InputIterator&, const _Param&) const 
+			bool parse(const InputIterator&, const _Param&) const 
 			{
 				return true;
 			}
@@ -35,7 +35,7 @@ namespace roast
 		{
 		public:
 			template <typename InputIterator, typename _Param>
-			bool analyze(const InputIterator&, const _Param&) const 
+			bool parse(const InputIterator&, const _Param&) const 
 			{
 				return false;
 			}
diff --git a/roast/include/roast/lexical2/fixed.hpp b/roast/include/roast/lexical2/fixed.hpp
index 04b9ec32..4cdfc232 100644
--- a/roast/include/roast/lexical2/fixed.hpp
+++ b/roast/include/roast/lexical2/fixed.hpp
@@ -23,8 +23,10 @@ namespace roast
 			/////////////////
 			
 			template <typename InputIterator, typename _Param>
-			bool analyze(InputIterator& it, const _Param& param) const
+			bool parse(InputIterator& it, const _Param& param) const
 			{
+				//memcmp
+				
 				bool ret = (*it == data);
 				if ( ret )
 					it++;
@@ -54,7 +56,7 @@ namespace roast
 			/////////////////
 			
 			template <typename InputIterator, typename _Param>
-			bool analyze(InputIterator& it, const _Param& param) const
+			bool parse(InputIterator& it, const _Param& param) const
 			{
 				const T* p = data;
 				for(unsigned int i=length; i!=0; i--, p++, it++)
diff --git a/roast/include/roast/lexical2/lexical2_util.hpp b/roast/include/roast/lexical2/lexical2_util.hpp
index 3d4fd772..901aa748 100644
--- a/roast/include/roast/lexical2/lexical2_util.hpp
+++ b/roast/include/roast/lexical2/lexical2_util.hpp
@@ -11,17 +11,11 @@ namespace roast
 	namespace lexical
 	{
 		//////////////////////////////////////////////////////////////////////////////////
-
-		template <typename Lexer, typename InputIterator, typename Param>
-		bool analyze(Lexer &lexer, InputIterator& it, Param& param = EmptyType())
-		{
-			return lexer.analyze(it, param);
-		}
 		
 		template <typename Lexer, typename InputIterator, typename Param>
 		bool parse(Lexer &lexer, InputIterator& it, Param& param = EmptyType())
 		{
-			return lexer.analyze(it, param);
+			return lexer.parse(it, param);
 		}
 		
 		//////////////////////////////////////////////////////////////////////////////////