parseの方も

diff --git a/roast/include/roast/lexical2/lexical2_util.hpp b/roast/include/roast/lexical2/lexical2_util.hpp
index 901aa74..5acce53 100644 (file)
--- a/roast/include/roast/lexical2/lexical2_util.hpp
+++ b/roast/include/roast/lexical2/lexical2_util.hpp
@@ -13,19 +13,46 @@ namespace roast
                //////////////////////////////////////////////////////////////////////////////////
                
                template <typename Lexer, typename InputIterator, typename Param>
-               bool parse(Lexer &lexer, InputIterator& it, Param& param = EmptyType())
+               bool parse(Lexer &lexer, InputIterator& it, Param& param)
                {
                        return lexer.parse(it, param);
                }
                
+               template <typename Lexer, typename InputIterator>
+               bool parse(Lexer &lexer, InputIterator& it)
+               {
+                       EmptyType e;
+                       return lexer.parse(it, e);
+               }
+               
+               template <typename Lexer, typename Param>
+               bool parse(Lexer &lexer, const char* s, Param& param)
+               {
+                       return lexer.parse(s, param);
+               }
+               
+               template <typename Lexer>
+               bool parse(Lexer &lexer, const char* s)
+               {
+                       EmptyType e;
+                       return lexer.parse(s, e);
+               }
+               
                //////////////////////////////////////////////////////////////////////////////////
 
                template <typename Lexer, typename OutputStream, typename Param>
-               void generate(const Lexer &lexer, OutputStream& os, Param& param = EmptyType())
+               void generate(const Lexer &lexer, OutputStream& os, Param& param)
                {
                        lexer.generate(os, param);
                }
                
+               template <typename Lexer, typename OutputStream>
+               void generate(const Lexer &lexer, OutputStream& os)
+               {
+                       EmptyType e;
+                       lexer.generate(os, e);
+               }
+               
                //////////////////////////////////////////////////////////////////////////////////
        }
 }

diff --git a/roast/test/lexical2_test/source/lexical2_test.cpp b/roast/test/lexical2_test/source/lexical2_test.cpp
index 9396c54..12a4d6e 100644 (file)
--- a/roast/test/lexical2_test/source/lexical2_test.cpp
+++ b/roast/test/lexical2_test/source/lexical2_test.cpp
@@ -9,7 +9,10 @@ int main()
 {
        try{
                lexical::println(fixed_char<'U'>());
-               lexical::println(fixed_ptr<char>("aaa",3));
+               //lexical::println(fixed_ptr<char>("aaa",3));
+               lexical::println(fixed_string("aaca",3));
+
+               printf("%d\n", lexical::parse(fixed_char<'U'>(), "Z") );
        }
        catch(const ::std::string &s)
        {