x

diff --git a/roast/include/roast/lexical2/empty_type.hpp b/roast/include/roast/lexical2/empty_type.hpp
index 5511f6c..92d9377 100644 (file)
--- a/roast/include/roast/lexical2/empty_type.hpp
+++ b/roast/include/roast/lexical2/empty_type.hpp
@@ -27,7 +27,7 @@ namespace roast
                                return true;
                        }
                };
-               typedef empty_true              nop_true;
+               typedef empty_true              nop_true, true_nop;
                
                ////////////////////////////////////////////////////////////
                
@@ -47,7 +47,7 @@ namespace roast
                                return false;
                        }
                };
-               typedef empty_false             nop_fase;
+               typedef empty_false             nop_fase, false_nop;
                
                //////////////////////////////////////////////////////////////////////////////////
        }

diff --git a/roast/include/roast/lexical2/seq.hpp b/roast/include/roast/lexical2/seq.hpp
index 6188f57..208d542 100644 (file)
--- a/roast/include/roast/lexical2/seq.hpp
+++ b/roast/include/roast/lexical2/seq.hpp
@@ -18,39 +18,39 @@ namespace roast
                        //////////////////////////////////////////////////////////////////////////////////
 
                        template <
-                               typename T0 = _true_analyze,
-                               typename T1 = _true_analyze,
-                               typename T2 = _true_analyze,
-                               typename T3 = _true_analyze,
-                               typename T4 = _true_analyze,
-                               typename T5 = _true_analyze,
-                               typename T6 = _true_analyze,
-                               typename T7 = _true_analyze,
-                               typename T8 = _true_analyze,
-                               typename T9 = _true_analyze,
-                               typename T10 = _true_analyze,
-                               typename T11 = _true_analyze,
-                               typename T12 = _true_analyze,
-                               typename T13 = _true_analyze,
-                               typename T14 = _true_analyze,
-                               typename T15 = _true_analyze,
-                               typename T16 = _true_analyze,
-                               typename T17 = _true_analyze,
-                               typename T18 = _true_analyze,
-                               typename T19 = _true_analyze,
-                               typename T20 = _true_analyze,
-                               typename T21 = _true_analyze,
-                               typename T22 = _true_analyze,
-                               typename T23 = _true_analyze,
-                               typename T24 = _true_analyze,
-                               typename T25 = _true_analyze,
-                               typename T26 = _true_analyze,
-                               typename T27 = _true_analyze,
-                               typename T28 = _true_analyze,
-                               typename T29 = _true_analyze,
-                               typename T30 = _true_analyze,
-                               typename T31 = _true_analyze,
-                               typename T32 = _true_analyze
+                               typename T0 = true_nop,
+                               typename T1 = true_nop,
+                               typename T2 = true_nop,
+                               typename T3 = true_nop,
+                               typename T4 = true_nop,
+                               typename T5 = true_nop,
+                               typename T6 = true_nop,
+                               typename T7 = true_nop,
+                               typename T8 = true_nop,
+                               typename T9 = true_nop,
+                               typename T10 = true_nop,
+                               typename T11 = true_nop,
+                               typename T12 = true_nop,
+                               typename T13 = true_nop,
+                               typename T14 = true_nop,
+                               typename T15 = true_nop,
+                               typename T16 = true_nop,
+                               typename T17 = true_nop,
+                               typename T18 = true_nop,
+                               typename T19 = true_nop,
+                               typename T20 = true_nop,
+                               typename T21 = true_nop,
+                               typename T22 = true_nop,
+                               typename T23 = true_nop,
+                               typename T24 = true_nop,
+                               typename T25 = true_nop,
+                               typename T26 = true_nop,
+                               typename T27 = true_nop,
+                               typename T28 = true_nop,
+                               typename T29 = true_nop,
+                               typename T30 = true_nop,
+                               typename T31 = true_nop,
+                               typename T32 = true_nop
                                >
                        struct seq : /*lengthable_seq,*/ tuple<
                                typename _seq::te<T0>::type,
@@ -302,7 +302,7 @@ namespace roast
                        ///////////////////////////////////////////////////////////////////////////////////////////////////
 
                        template <typename T1>
-                       struct seq<T1, _true_analyze>
+                       struct seq<T1, true_nop>
                        {
                        public:
                                typedef T1       _T1;
@@ -519,7 +519,7 @@ namespace roast
                }
 
        /*      template <typename T1>
-               struct seq<T1, _true_analyze>
+               struct seq<T1, true_nop>
                {
                public:
                        typedef T1       _T1;