fixed_ptr, ちゃんといけましたね

diff --git a/roast/include/roast/iterator/string_iterator.hpp b/roast/include/roast/iterator/string_iterator.hpp
index 5e0defd..028b481 100644 (file)
--- a/roast/include/roast/iterator/string_iterator.hpp
+++ b/roast/include/roast/iterator/string_iterator.hpp
@@ -31,6 +31,8 @@ namespace roast
                
        public:
                string_iterator(::std::string& s): m_str(s) {}
+               
+               operator const char*() const { return m_str.c_str(); }
        };
        
        /////////////////////////////////////////////////////////////////

diff --git a/roast/test/lexical2_test/source/http_test.cpp b/roast/test/lexical2_test/source/http_test.cpp
index 1690e3c..d97e6e1 100644 (file)
--- a/roast/test/lexical2_test/source/http_test.cpp
+++ b/roast/test/lexical2_test/source/http_test.cpp
@@ -1,34 +1,26 @@
 #include "roast/net/url.hpp"
-#include "roast/iterator/string_iterator.hpp"
-
 using namespace roast;
 
-class hoge{};
-
-struct inc_test : value_incremental_adapter<inc_test, int>, value_cast_adapter<int, int>, value_cast_adapter<int, long>
-{
-       int value;
-
-       inc_test() : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = 0; }
-       inc_test(const inc_test& from) : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = from.value; }
-};
-
 int main()
 {
-       inc_test i;
-       printf("%d\n", (int)++i);
-       printf("%d\n", (int)i++);
-       (i++)++;
-       ++(++i);
-       printf("%d\n", (int)i);
        try{
-       /*      uri u;
+               ::std::string sss = "ABCDE";
+               char *s = (char*)sss.c_str();
+               lexical::unichar<'a'> a;
+               lexical::unichar<'a'> b;
+               lexical::unichar<'a'> c;
+               a.analyze(s, s);
+               printf("%s\n", s);
+
+               
+               uri u;
                //u.parse
                url<lexical::string> l("192.168.1.81", "/index.html", "hoge", 80);
                l.scheme = "https";
                printf("%s\n", l.to_string().c_str());
 
-               u.parse(l.to_string());*/
+               u.parse(l.to_string());
+               
        }
        catch(const ::std::string &s)
        {

diff --git a/roast/test/lexical2_test/source/iterator_test.cpp b/roast/test/lexical2_test/source/iterator_test.cpp
index ef24abf..71477cf 100644 (file)
--- a/roast/test/lexical2_test/source/iterator_test.cpp
+++ b/roast/test/lexical2_test/source/iterator_test.cpp
@@ -12,8 +12,22 @@ struct inc_test : value_full_arithmetical_adapter<inc_test, int>, value_cast_ada
 
 //struct test_iterator : public primitive_iterator_impl
 
+template <typename A>
+void aaa(A& b)
+{
+       b++;
+}
 int main()
 {
+       char *g = "abc";
+       aaa(g);
+       printf("%c\n", *g);
+
+       /*::std::string aa = "ABC";
+       string_iterator s(aa);
+       s++;
+       printf("%c\n", *s);*/
+
        //const int a;
        //++a;
        inc_test i;

diff --git a/roast/test/lexical2_test/source/lexical2_test.cpp b/roast/test/lexical2_test/source/lexical2_test.cpp
index 5761c0c..9396c54 100644 (file)
--- a/roast/test/lexical2_test/source/lexical2_test.cpp
+++ b/roast/test/lexical2_test/source/lexical2_test.cpp
@@ -1,5 +1,6 @@
 #include <string>
-#include "roast/lexical2/length.hpp"
+#include <stdio.h>
+#include "roast/lexical2/lexical.hpp"
 
 using namespace roast;
 using namespace roast::lexical;
@@ -7,7 +8,8 @@ using namespace roast::lexical;
 int main()
 {
        try{
-               //lexical::println(unichar<'U'>());
+               lexical::println(fixed_char<'U'>());
+               lexical::println(fixed_ptr<char>("aaa",3));
        }
        catch(const ::std::string &s)
        {