From 598b17a21fc9d9d9b09b6c0734493c51528c696b Mon Sep 17 00:00:00 2001
From: myun2 <myun2@nwhite.info>
Date: Mon, 11 Jun 2012 13:25:06 +0900
Subject: [PATCH] lexical2/fixed_numeric.hpp

---
 roast/include/roast/lexical2/fixed_numeric.hpp | 170 ++++++-------------------
 1 file changed, 36 insertions(+), 134 deletions(-)

diff --git a/roast/include/roast/lexical2/fixed_numeric.hpp b/roast/include/roast/lexical2/fixed_numeric.hpp
index 1e25311e..2f57f8a4 100644
--- a/roast/include/roast/lexical2/fixed_numeric.hpp
+++ b/roast/include/roast/lexical2/fixed_numeric.hpp
@@ -4,147 +4,49 @@
 #ifndef __SFJP_ROAST__lexical2__fixed_numeric_HPP__
 #define __SFJP_ROAST__lexical2__fixed_numeric_HPP__
 
-#include "roast/memory/sized_ptr.hpp"
+#include "roast/lexical2/fixed.hpp"
 
 namespace roast
 {
 	namespace lexical
 	{
-		namespace rule
-		{
-			////////////////////////////////////////////////////////////////////
-			
-			template <typename T, T _Min, T _Max>
-			class range : public lengthable
-			{
-			public:
-				static const int length = sizeof(T);
-
-				template <typename _It, typename _Param>
-				bool analyze(_It& it, _Param& param)
-				{
-					T n = *it;
-					if ( n >= _Min && n <= _Max )
-					{
-						it++;
-						return true;
-					}
-					else
-						return false;
-				}
-			};
-			
-			template <char _Min, char _Max>
-			class char_range : public range<char, _Min, _Max> {};
-			
-			template <short _Min, short _Max>
-			class short_range : public range<short, _Min, _Max> {};
-			
-			template <int _Min, int _Max>
-			class int_range : public range<int, _Min, _Max> {};
-			
-			template <unsigned char _Min, unsigned char _Max>
-			class uchar_range : public range<unsigned char, _Min, _Max> {};
-			
-			template <unsigned short _Min, unsigned short _Max>
-			class ushort_range : public range<unsigned short, _Min, _Max> {};
-			
-			template <int _Min, int _Max>
-			class uint_range : public range<unsigned int, _Min, _Max> {};
-
-			/////////////////////////////////////////////////////////////
-
-			template <typename T, T _Val>
-			class fixed_numeric : public lengthable
-			{
-			public:
-				static const int length = sizeof(T);
-
-				template <typename _It, typename _Param>
-				bool analyze(_It& it, _Param& param)
-				{
-					switch(*it)
-					{
-					case _Val:
-						it++;
-						return true;
-					}
-					return false;
-				}
-
-				//----
-				
-				template <typename _Strm, typename _Document>
-				bool generate(_Strm& strm, _Document& doc)
-				{
-					//strm << _Val;
-					T v = _Val;
-					//strm << v;
-					strm << sized_ptr_<char>((char*)&v,sizeof(T));
-					return true;
-				}	
-				/*template <typename _Document>
-				bool generate(::std::fstream& strm, _Document& doc)
-				{
-					//strm << _Val;
-					T v = _Val;
-					strm.write((const char*)&v, sizeof(_Val));
-					return true;
-				}*/
-			};
+		/////////////////////////////////////////////////////////////
 
-			/////////////////////////////////////////////////////////////
-
-			/*
-			template <unsigned char _ByteCode>
-			class unibyte
-			{
-			public:
-				template <typename _It, typename _Param>
-				bool analyze(_It& it, _Param& param)
-				{
-					switch(*it)
-					{
-					case _Byte:
-						it++;
-						return true;
-					}
-					return false;
-				}
-				
-				template <typename _Strm, typename _Document>
-				bool generate(_Strm& strm, _Document& doc)
-				{
-					strm << _ByteCode;
-					return true;
-				}
-			};
-			*/
-			template <unsigned char _ByteCode>
-			class unibyte : public fixed_numeric<unsigned char, _ByteCode> {};
-
-			template <char _Val>
-			class fixed_char : public fixed_numeric<char, _Val> {};
-			template <short _Val>
-			class fixed_short : public fixed_numeric<short, _Val> {};
-			template <int _Val>
-			class fixed_int : public fixed_numeric<int, _Val> {};
-			template <long _Val>
-			class fixed_long : public fixed_numeric<long, _Val> {};
-
-			template <unsigned char _Val>
-			class fixed_uchar : public fixed_numeric<unsigned char, _Val> {};
-			template <unsigned short _Val>
-			class fixed_ushort : public fixed_numeric<unsigned short, _Val> {};
-			template <unsigned int _Val>
-			class fixed_uint : public fixed_numeric<unsigned int, _Val> {};
-			template <unsigned long _Val>
-			class fixed_ulong : public fixed_numeric<unsigned long, _Val> {};
+		template <typename T, T FixedNumericValue>
+		class fixed_numeric : public fixed<T>
+		{
+		private:
+			typedef fixed<T> _Base;
+		public:
+			fixed_numeric() : _Base(FixedNumericValue) {}
+		};
 
-			typedef unibyte<0> zeroterm;
-			
-			////////////////////////////////////////////////////////////////////
-		}
+		/////////////////////////////////////////////////////////////
+/*
+		template <unsigned char _ByteCode>
+		class unibyte : public fixed_numeric<unsigned char, _ByteCode> {};
+
+		template <char _Val>
+		class fixed_char : public fixed_numeric<char, _Val> {};
+		template <short _Val>
+		class fixed_short : public fixed_numeric<short, _Val> {};
+		template <int _Val>
+		class fixed_int : public fixed_numeric<int, _Val> {};
+		template <long _Val>
+		class fixed_long : public fixed_numeric<long, _Val> {};
+
+		template <unsigned char _Val>
+		class fixed_uchar : public fixed_numeric<unsigned char, _Val> {};
+		template <unsigned short _Val>
+		class fixed_ushort : public fixed_numeric<unsigned short, _Val> {};
+		template <unsigned int _Val>
+		class fixed_uint : public fixed_numeric<unsigned int, _Val> {};
+		template <unsigned long _Val>
+		class fixed_ulong : public fixed_numeric<unsigned long, _Val> {};
+
+		typedef unibyte<0> zeroterm;
+		*/
+		////////////////////////////////////////////////////////////////////
 	}
 }
 
-- 
2.11.0