normalize cstring.i to use fragments, and add cwstring.i as a subproduct

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7406 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Examples/test-suite/li_cstring.i

@@ -6,17 +6,18 @@
 
 %cstring_input_binary(char *in, int n);
 %cstring_bounded_output(char *out1, 512);
-%cstring_chunk_output(char *out2, 128);
+%cstring_chunk_output(char *out2, 64);
 %cstring_bounded_mutable(char *out3, 512);
 %cstring_mutable(char *out4, 32);
 %cstring_output_maxsize(char *out5, int max);
 %cstring_output_withsize(char *out6, int *size);
+
 #ifdef __cplusplus
-%cstring_output_allocate(char **out7, delete [] $1);
-%cstring_output_allocate_size(char **out8, int *size, delete [] $1);
+%cstring_output_allocate(char **out7, delete [] *$1);
+%cstring_output_allocate_size(char **out8, int *size, delete [] *$1);
 #else
-%cstring_output_allocate(char **out7, free($1));
-%cstring_output_allocate_size(char **out8, int *size, free($1));
+%cstring_output_allocate(char **out7, free(*$1));
+%cstring_output_allocate_size(char **out8, int *size, free(*$1));
 #endif
 
 %inline %{
@@ -38,8 +39,8 @@ void test1(char *out1) {
 
 void test2(char *out2) {
    int i;
-   for (i = 0; i < 128; i++) {
-       *out2 = (char) i;
+   for (i = 0; i < 64; i++) {
+       *out2 = (char) i + 32;
        out2++;
    }
 }
@@ -74,29 +75,23 @@ void test7(char **out7) {
 #else
    *out7 = malloc(64);
 #endif
+   (*out7)[0] = 0;
    strcat(*out7,"Hello world!");
 }
 
-void test8(char **out8, int *sz) {
+void test8(char **out8, int *size) {
    int i;
 #ifdef __cplusplus
-   *out8 = new char[128];
+   *out8 = new char[64];
 #else
-   *out8 = malloc(128);
+   *out8 = malloc(64);
 #endif
-   for (i = 0; i < 128; i++) {
-      *out8[i] = (char) i;
+   for (i = 0; i < 64; i++) {
+      (*out8)[i] = (char) i+32;
    }
+   *size = 64;
 }
 
 %}
 
 #endif
-  
-    
-
-
-
-
-      
-    

SWIG/Examples/test-suite/li_cwstring.i

@@ -0,0 +1,97 @@
+%module li_cwstring
+
+%include "cwstring.i"
+
+#ifndef _CSTRING_UNIMPL
+
+%cwstring_input_binary(wchar_t *in, int n);
+%cwstring_bounded_output(wchar_t *out1, 512);
+%cwstring_chunk_output(wchar_t *out2, 64);
+%cwstring_bounded_mutable(wchar_t *out3, 512);
+%cwstring_mutable(wchar_t *out4, 32);
+%cwstring_output_maxsize(wchar_t *out5, int max);
+%cwstring_output_withsize(wchar_t *out6, int *size);
+
+#ifdef __cplusplus
+%cwstring_output_allocate(wchar_t **out7, delete [] *$1);
+%cwstring_output_allocate_size(wchar_t **out8, int *size, delete [] *$1);
+#else
+%cwstring_output_allocate(wchar_t **out7, free(*$1));
+%cwstring_output_allocate_size(wchar_t **out8, int *size, free(*$1));
+#endif
+
+%inline %{
+
+int count(wchar_t *in, int n, wchar_t c) {
+   int r = 0;
+   while (n > 0) {
+     if (*in == c) {
+	r++;
+     }
+     in++;
+   }
+   return r;
+}
+
+void test1(wchar_t *out1) {
+   wcscpy(out1,L"Hello World");
+}
+
+void test2(wchar_t *out2) {
+   int i;
+   for (i = 0; i < 64; i++) {
+       *out2 = (wchar_t) i + 32;
+       out2++;
+   }
+}
+
+void test3(wchar_t *out3) {
+   wcscat(out3,L"-suffix");
+}
+
+void test4(wchar_t *out4) {
+   wcscat(out4,L"-suffix");
+}
+
+void test5(wchar_t *out5, int max) {
+   int i;
+   for (i = 0; i < max; i++) {
+       out5[i] = 'x';
+   }
+   out5[max]='\0';
+}
+
+void test6(wchar_t *out6, int *size) {
+   int i;
+   for (i = 0; i < (*size/2); i++) {
+       out6[i] = 'x';
+   }
+   *size = (*size/2);
+}
+
+void test7(wchar_t **out7) {
+#ifdef __cplusplus
+   *out7 = new wchar_t[64];
+#else
+   *out7 = malloc(64*sizeof(wchar_t));
+#endif
+   (*out7)[0] = 0;
+   wcscat(*out7,L"Hello world!");
+}
+
+void test8(wchar_t **out8, int *size) {
+   int i;
+#ifdef __cplusplus
+   *out8 = new wchar_t[64];
+#else
+   *out8 = malloc(64*sizeof(wchar_t));
+#endif
+   for (i = 0; i < 64; i++) {
+      (*out8)[i] = (wchar_t) i + 32;
+   }
+   *size = 64;
+}
+
+%}
+
+#endif

SWIG/Examples/test-suite/python/Makefile.in

@@ -25,6 +25,7 @@ CPP_TEST_CASES += \
 	inplaceadd \
 	kwargs \
 	li_cstring \
+	li_cwstring \
 	li_std_except \
 	li_std_vectora \
 	li_std_map \
@@ -41,6 +42,7 @@ CPP_TEST_CASES += \
 C_TEST_CASES += \
 	file_test \
 	li_cstring \
+	li_cwstring \
 	nondynamic
 
 #

SWIG/Examples/test-suite/python/li_cstring_runme.py

@@ -1,5 +1,26 @@
 from li_cstring import *
 
+if test1() != "Hello World":
+    raise RuntimeError
 
+if test2() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
+    raise RuntimeError
+
+if test3("hello") != "hello-suffix":
+    raise RuntimeError
+
+if test4("hello") != "hello-suffix":
+    raise RuntimeError
+    
 if test5(4) != 'xxxx':
     raise RuntimeError
+
+if test6(10) != 'xxxxx':
+    raise RuntimeError
+    
+if test7() !="Hello world!":
+    raise RuntimeError
+
+if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
+    raise RuntimeError
+

SWIG/Examples/test-suite/python/li_cwstring_runme.py

@@ -0,0 +1,26 @@
+from li_cwstring import *
+
+if test1() != "Hello World":
+    raise RuntimeError
+
+if test2() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
+    raise RuntimeError
+
+if test3("hello") != "hello-suffix":
+    raise RuntimeError
+
+if test4("hello") != "hello-suffix":
+    raise RuntimeError
+    
+if test5(4) != 'xxxx':
+    raise RuntimeError
+
+if test6(10) != 'xxxxx':
+    raise RuntimeError
+    
+if test7() !="Hello world!":
+    raise RuntimeError
+
+if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
+    raise RuntimeError
+