Changeset 23824 for lang/cplusplus

Timestamp:

11/16/08 14:21:19 (5 years ago)

Author:

saturday06

Message:

b s

Files:

• lang/cplusplus/i3/trunk/src/Test2.cpp (modified) (9 diffs)

lang/cplusplus/i3/trunk/src/Test2.cpp

@@ -88 +88 @@
     };
     struct string_list {
-        char* value;
+        TCHAR* value;
         size_t length;
         string_list* prev;
@@ -122 +122 @@
     };
     struct string_array {
-        char** data;
+        TCHAR** data;
         size_t length;
         string_array& operator=(string_list& list) {
@@ -130 +130 @@
                 return *this;
             }
-            data = (char**)malloc(sizeof(*data)*length);
+            data = (TCHAR**)malloc(sizeof(*data)*length);
             if (data == NULL) {
                 abort();
@@ -143 +143 @@
     struct Config {
         int i;
-        char* s;
+        TCHAR* s;
         integer_list ia;
         string_list sa;
@@ -149 +149 @@
     struct Config2 {
         int i;
-        char* s;
+        TCHAR* s;
         integer_array ia;
         string_array sa;
@@ -178 +178 @@
         };
         struct string_value {
-            char*& data;
-            string_value(char*& data) : data(data) {}
-            void operator()(const char* first, const char* last) const {
-                data = (char*)calloc(last - first + 1, 1);
+            TCHAR*& data;
+            string_value(TCHAR*& data) : data(data) {}
+            void operator()(const TCHAR* first, const TCHAR* last) const {
+                ptrdiff_t bytes = (char*)last - (char*)first;
+                data = (TCHAR*)calloc(bytes + sizeof(TCHAR), 1);
                 if (!data) {
                     abort();
                 }
-                memcpy(data, first, last - first);
+                memcpy(data, first, bytes);
             }
         };
@@ -191 +192 @@
             string_list& data;
             string_array_value(string_list& data) : data(data) {}
-            void operator()(const char* first, const char* last) const {
+            void operator()(const TCHAR* first, const TCHAR* last) const {
+                ptrdiff_t bytes = (char*)last - (char*)first;
                 string_list* got = (string_list*)malloc(sizeof(string_list));
                 if (!got) {
                     abort();
                 }
-                got->value = (char*)calloc(last - first + 1, 1);
+                got->value = (TCHAR*)calloc(bytes + sizeof(TCHAR), 1);
                 if (!got->value) {
                     abort();
                 }
-                memcpy(got->value, first, last - first);
+                memcpy(got->value, first, bytes);
                 got->prev = data.tail;
                 data.tail = got;
@@ -226 +228 @@
                     definition(const MyIniLoader& self)
                     {
-                line_ending = str_p("\r\n") | ch_p('\r') | ch_p('\n') | end_p;
+                line_ending = str_p(_T("\r\n")) | ch_p(_T('\r')) | ch_p(_T('\n')) | end_p;
                             expr = (
-                        (*blank_p >> str_p("i")  >> *blank_p >> "=" >> *blank_p >> int_p[self.i]  >> *blank_p) |
-                        (*blank_p >> str_p("ia[]") >> *blank_p >> "=" >> *blank_p >> int_p[self.ia] >> *blank_p) |
-                        (*blank_p >> str_p("s")  >> *blank_p >> "=" >> *blank_p >> (*(anychar_p - line_ending))[self.s]) |
-                        (*blank_p >> str_p("sa[]") >> *blank_p >> "=" >> *blank_p >> (*(anychar_p - line_ending))[self.sa]) |
+                        (*blank_p >> str_p(_T("i"))  >> *blank_p >> _T("=") >> *blank_p >> int_p[self.i]  >> *blank_p) |
+                        (*blank_p >> str_p(_T("ia[]")) >> *blank_p >> _T("=") >> *blank_p >> int_p[self.ia] >> *blank_p) |
+                        (*blank_p >> str_p(_T("s"))  >> *blank_p >> _T("=") >> *blank_p >> (*(anychar_p - line_ending))[self.s]) |
+                        (*blank_p >> str_p(_T("sa[]")) >> *blank_p >> _T("=") >> *blank_p >> (*(anychar_p - line_ending))[self.sa]) |
                         *blank_p
                        )
@@ -249 +251 @@
     
     MyIniLoader i(c);
-    i3::string str = _T(
-        " ia[] = 1 \n"
-        "s=  fooobar \r"
-        "i=5000\r\n"
-        "  sa[]=20kaioj \r"
-        "ia[]=-55555\r\n"
-        "sa[]=89iaidj\r"
-        "\r"
-        "\r"
-        "sa[]=899ujif\r"
-        "ia[]=807987\r"
-        "\r\r");
-    parse_info<> r = parse(str.c_str(), i);
+    i3::string str = 
+        _T(" ia[] = 1 \n")
+        _T("s=  fooobar \r")
+        _T("i=5000\r\n")
+        _T("  sa[]=20kaioj \r")
+        _T("ia[]=-55555\r\n")
+        _T("sa[]=89iaidj\r")
+        _T("\r")
+        _T("\r")
+        _T("sa[]=899ujif\r")
+        _T("ia[]=807987\r")
+        _T("\r\r");
+    parse_info<const TCHAR* const> r = parse<TCHAR>(str.c_str(), i);
 
     c2.i = c.i;