seq<T1, EmptyType> の方の修正

diff --git a/roast/include/roast/lexical2/seq.hpp b/roast/include/roast/lexical2/seq.hpp
index 6753a78..4dbf990 100644 (file)
--- a/roast/include/roast/lexical2/seq.hpp
+++ b/roast/include/roast/lexical2/seq.hpp
@@ -302,18 +302,18 @@ namespace roast
                ///////////////////////////////////////////////////////////////////////////////////////////////////
 
                template <typename T1>
-               struct seq<T1, true_nop>
+               struct seq<T1, EmptyType>
                {
                public:
                        typedef T1       _T1;
 
                        //static const unsigned int length = T1::length;
 
-                       template <typename _It, typename _Param>
-                       bool parse(_It& it, _Param& param)
+                       template <typename InputIterator, typename _Param>
+                       bool parse(InputIterator& it, _Param& param)
                        {
                                T1 t1;
-                               _It it_work = it;
+                               InputIterator it_work = it;
                                if ( t1.parse(it_work, param) == false )
                                        return false;
                                
@@ -322,15 +322,15 @@ namespace roast
                                return true;
                        }
                        
-                       template <typename _Strm, typename _Document>
-                       bool generate(_Strm& strm, _Document& doc) const
+                       template <typename OutputStream, typename _Param>
+                       void generate(OutputStream& os, const _Param& param) const
                        {
                                /*T1 t1;
                                if ( t1.generate(strm, doc) == false )
                                        return false;
                                        
                                return true;*/
-                               return _seq_generate(strm, doc, EmptyType());
+                               _seq_generate(*this, os, param, EmptyType());
                        }
                };