Correct special variables in 'directorargout' typemap. This change will break any 'directorargout' typemaps you may have written. Please change: to and to \n Also fix the named 'directorargout' DIRECTOROUT typemaps for these languages which didn't previously compile and add in , etc expansion.\n [C#, Go, Java, D] Add support for the 'directorargout' typemap.\n [Java] Add (char *STRING, size_t LENGTH) director typemaps.

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

Examples/test-suite/common.mk

@@ -159,6 +159,7 @@ CPP_TEST_CASES += \
 	director_abstract \
 	director_alternating \
 	director_basic \
+	director_binary_string \
 	director_classes \
 	director_classic \
 	director_constructor \

Examples/test-suite/director_binary_string.i

@@ -0,0 +1,50 @@
+%module(directors="1") director_binary_string;
+
+%feature("director") Callback;
+
+%apply (char *STRING, size_t LENGTH) { (char *dataBufferAA, int sizeAA) };
+%apply (char *STRING, size_t LENGTH) { (char *dataBufferBB, int sizeBB) };
+
+%inline %{
+#include <stdlib.h>
+
+#define BUFFER_SIZE_AA 8
+#define BUFFER_SIZE_BB 5
+
+class Callback {
+public:
+  virtual ~Callback() {}
+  virtual void run(char* dataBufferAA, int sizeAA, char* dataBufferBB, int sizeBB) {
+    memset(dataBufferAA, -1, sizeAA);
+    memset(dataBufferBB, -1, sizeBB);
+  }
+};
+
+class Caller {
+private:
+  Callback *_callback;
+public:
+  Caller(): _callback(0) {}
+  ~Caller() { delCallback(); }
+  void delCallback() { delete _callback; _callback = 0; }
+  void setCallback(Callback *cb) { delCallback(); _callback = cb; }
+  int call() {
+    if (_callback) {
+      char* aa = (char*)malloc(BUFFER_SIZE_AA);
+      memset(aa, 9, BUFFER_SIZE_AA);
+      char* bb = (char*)malloc(BUFFER_SIZE_BB);
+      memset(bb, 13, BUFFER_SIZE_BB);
+      int sum = 0;
+      _callback->run(aa, BUFFER_SIZE_AA, bb, BUFFER_SIZE_BB);
+      for (int i = 0; i < BUFFER_SIZE_AA; i++)
+        sum += aa[i];
+      for (int i = 0; i < BUFFER_SIZE_BB; i++)
+        sum += bb[i];
+      free(aa);
+      free(bb);
+      return sum;
+    }
+  }
+};
+
+%}

Examples/test-suite/java/director_binary_string_runme.java

@@ -0,0 +1,42 @@
+
+import director_binary_string.*;
+
+public class director_binary_string_runme {
+
+  static {
+    try {
+      System.loadLibrary("director_binary_string");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Caller caller = new Caller();
+    Callback callback = new DirectorBinaryStringCallback();
+    caller.setCallback(callback);
+    int sum = caller.call();
+    caller.delCallback();
+
+    if (sum != 9*2*8 + 13*3*5)
+      throw new RuntimeException("Unexpected sum: " + sum);
+  }
+}
+
+class DirectorBinaryStringCallback extends Callback {
+  public DirectorBinaryStringCallback() {
+    super();
+  }
+
+  @Override
+  public void run(byte[] dataBufferAA, byte[] dataBufferBB)
+  {
+    for (int i = 0; i < dataBufferAA.length; i++)
+      dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
+
+    for (int i = 0; i < dataBufferBB.length; i++)
+      dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
+  }
+}
+