Big overhaul. Most of these typemaps were broken. Fixed some and removed some.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5278 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton
parent
227a79d890
commit
4b317678e5
1 changed files with 93 additions and 107 deletions
|
|
@ -4,119 +4,100 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* char **STRING_IN */
|
/*
|
||||||
%typemap(jni) char **STRING_IN "jobjectArray"
|
* char **STRING_ARRAY typemaps.
|
||||||
%typemap(jtype) char **STRING_IN "String[]"
|
* These typemaps are for C String arrays which are NULL terminated.
|
||||||
%typemap(jstype) char **STRING_IN "String[]"
|
* char *values[] = { "one", "two", "three", NULL }; // note NULL
|
||||||
%typemap(javadirectorin) char **STRING_IN "$jniinput"
|
* char ** is mapped to a Java String[].
|
||||||
%typemap(javadirectorout) char **STRING_IN "$javacall"
|
*
|
||||||
%typemap(in) char **STRING_IN {
|
* Example usage wrapping:
|
||||||
int i;
|
* char ** foo(char **input);
|
||||||
jsize sz = JCALL1(GetArrayLength, jenv, $input);
|
*
|
||||||
$1 = (char **) calloc((sz+1), sizeof(char *));
|
* Java usage:
|
||||||
for(i=0; i<sz; i++) {
|
* String numbers[] = { "one", "two", "three" };
|
||||||
jstring js;
|
* String[] ret = modulename.foo( numbers };
|
||||||
char *cs;
|
*/
|
||||||
|
%typemap(jni) char **STRING_ARRAY "jobjectArray"
|
||||||
js = (jstring) JCALL2(GetObjectArrayElement, jenv, $input, i);
|
%typemap(jtype) char **STRING_ARRAY "String[]"
|
||||||
cs = (char *) JCALL2(GetStringUTFChars, jenv, js, 0);
|
%typemap(jstype) char **STRING_ARRAY "String[]"
|
||||||
$1[i] = cs;
|
%typemap(in) char **STRING_ARRAY (jint size) {
|
||||||
}
|
|
||||||
$1[sz] = '\0';
|
|
||||||
}
|
|
||||||
%typemap(argout) char **STRING_IN %{
|
|
||||||
/* should copy changes in char ** back into array and release strings obtained from GetStringUTFChars */
|
|
||||||
%}
|
|
||||||
%typemap(freearg) char **STRING_IN
|
|
||||||
%{ free($1); %}
|
|
||||||
|
|
||||||
%typemap(directorin, parse="Ljava/lang/String;") char **STRING_IN
|
|
||||||
%{ $input = JCALL1(NewStringUTF, jenv, *$1); %}
|
|
||||||
|
|
||||||
/* char **STRING_OUT - result must be a null terminated string */
|
|
||||||
%typemap(jni) char **STRING_OUT "jobjectArray"
|
|
||||||
%typemap(jtype) char **STRING_OUT "String[]"
|
|
||||||
%typemap(jstype) char **STRING_OUT "String[]"
|
|
||||||
%typemap(javadirectorin) char **STRING_OUT "$jniinput"
|
|
||||||
%typemap(javadirectorout) char **STRING_OUT "$javacall"
|
|
||||||
%typemap(in) char **STRING_OUT (char *s)
|
|
||||||
%{ $1 = &s; %}
|
|
||||||
%typemap(argout) char **STRING_OUT {
|
|
||||||
if($1) {
|
|
||||||
JCALL3(SetObjectArrayElement, jenv, $input, 0, JCALL1(NewStringUTF, jenv, *$1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
%typemap(directorin,parse="Ljava/lang/String;") char **STRING_OUT
|
|
||||||
%{ $input = JCALL1(NewStringUTF, jenv, *$1); %}
|
|
||||||
|
|
||||||
/* char **STRING_RET - a NULL terminated array of char* */
|
|
||||||
%typemap(jni) char **STRING_RET "jarray"
|
|
||||||
%typemap(jtype) char **STRING_RET "String[]"
|
|
||||||
%typemap(jstype) char **STRING_RET "String[]"
|
|
||||||
%typemap(javadirectorin) char **STRING_RET "$jniinput"
|
|
||||||
%typemap(javadirectorout) char **STRING_RET "$javacall"
|
|
||||||
%typemap(out) char **STRING_RET {
|
|
||||||
if($1 != NULL) {
|
|
||||||
char **p = $1;
|
|
||||||
jsize size = 0;
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
jclass strClass;
|
size = JCALL1(GetArrayLength, jenv, $input);
|
||||||
|
#ifdef __cplusplus
|
||||||
while (*p++) size++; /* determine size */
|
$1 = new char*[size+1];
|
||||||
strClass = JCALL1(FindClass, jenv, "java/lang/String");
|
#else
|
||||||
$result = JCALL3(NewObjectArray, jenv, size, strClass, NULL);
|
$1 = (char **)calloc(size+1, sizeof(char *));
|
||||||
p = $1;
|
#endif
|
||||||
while (*p) {
|
for (i = 0; i<size; i++) {
|
||||||
jstring js = JCALL1(NewStringUTF, jenv, *p);
|
jstring j_string = (jstring)JCALL2(GetObjectArrayElement, jenv, $input, i);
|
||||||
JCALL3(SetObjectArrayElement, jenv, $result, i++, js);
|
const char *c_string = JCALL2(GetStringUTFChars, jenv, j_string, 0);
|
||||||
p++;
|
#ifdef __cplusplus
|
||||||
|
$1[i] = new char [strlen((c_string)+1)];
|
||||||
|
#else
|
||||||
|
$1[i] = (char *)calloc(strlen((c_string)+1), sizeof(const char *));
|
||||||
|
#endif
|
||||||
|
strcpy($1[i], c_string);
|
||||||
|
JCALL2(ReleaseStringUTFChars, jenv, j_string, c_string);
|
||||||
|
JCALL1(DeleteLocalRef, jenv, j_string);
|
||||||
}
|
}
|
||||||
}
|
$1[i] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(directorin,parse="Ljava/lang/String;") char **STRING_RET
|
%typemap(freearg) char **STRING_ARRAY {
|
||||||
%{ $input = JCALL1(NewStringUTF, jenv, *$1; %}
|
int i;
|
||||||
|
for (i=0; i<size$argnum-1; i++)
|
||||||
/* float *FLOAT_ARRAY_RETURN */
|
#ifdef __cplusplus
|
||||||
%typemap(jni) float *FLOAT_ARRAY_RETURN "jfloatArray"
|
delete[] $1[i];
|
||||||
%typemap(jtype) float *FLOAT_ARRAY_RETURN "float[]"
|
delete[] $1;
|
||||||
%typemap(jstype) float *FLOAT_ARRAY_RETURN "float[]"
|
#else
|
||||||
%typemap(javadirectorin) float *FLOAT_ARRAY_RETURN "$jniinput"
|
free($1[i]);
|
||||||
%typemap(javadirectorout) float *FLOAT_ARRAY_RETURN "$javacall"
|
free($1);
|
||||||
%typemap(out) float *FLOAT_ARRAY_RETURN {
|
#endif
|
||||||
if($1) {
|
|
||||||
float *fp = $1;
|
|
||||||
jfloat *jfp;
|
|
||||||
int size = 0;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* determine size of array */
|
|
||||||
while(*fp++) size++;
|
|
||||||
|
|
||||||
/* new float array */
|
|
||||||
$result = JCALL1(NewFloatArray, jenv, size);
|
|
||||||
|
|
||||||
/* copy elements to float array */
|
|
||||||
jfp = JCALL2(GetFloatArrayElements, jenv, $result, 0);
|
|
||||||
for(i=0; i<size; i++ )
|
|
||||||
jfp[i] = (jfloat) $1[i];
|
|
||||||
|
|
||||||
JCALL3(ReleaseFloatArrayElements, jenv, $result, jfp, 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(directorin,parse="[F") float *FLOATARRAYRETURN
|
%typemap(out) char **STRING_ARRAY (char *s) {
|
||||||
%{
|
int i;
|
||||||
#error "Need directorin typemape for FLOATARRAYRETURN, array input size is unknown."
|
int len=0;
|
||||||
%}
|
jstring temp_string;
|
||||||
|
const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String");
|
||||||
|
|
||||||
/* char *BYTE */
|
while ($1[len]) len++;
|
||||||
|
jresult = JCALL3(NewObjectArray, jenv, len, clazz, NULL);
|
||||||
|
/* exception checking omitted */
|
||||||
|
|
||||||
|
for (i=0; i<len; i++) {
|
||||||
|
temp_string = JCALL1(NewStringUTF, jenv, *result++);
|
||||||
|
JCALL3(SetObjectArrayElement, jenv, jresult, i, temp_string);
|
||||||
|
JCALL1(DeleteLocalRef, jenv, temp_string);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
%typemap(javain) char **STRING_ARRAY "$javainput"
|
||||||
|
%typemap(javaout) char **STRING_ARRAY {
|
||||||
|
return $jnicall;
|
||||||
|
}
|
||||||
|
|
||||||
|
%typemap(javadirectorin) char **STRING_ARRAY "$jniinput"
|
||||||
|
%typemap(javadirectorout) char **STRING_ARRAY "$javacall"
|
||||||
|
%typemap(directorin, descriptor="Ljava/lang/String;") char **STRING_ARRAY
|
||||||
|
%{ $input = JCALL1(NewStringUTF, jenv, *$1); %}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* char *BYTE typemap.
|
||||||
|
* This is an input typemap for mapping a Java byte[] array to a C char array.
|
||||||
|
* Note that as a Java array is used and thus passeed by reference, the C routine
|
||||||
|
* can return data to Java via the parameter.
|
||||||
|
*
|
||||||
|
* Example usage wrapping:
|
||||||
|
* void foo(char *array);
|
||||||
|
*
|
||||||
|
* Java usage:
|
||||||
|
* byte b[] = new byte[20];
|
||||||
|
* modulename.foo(b);
|
||||||
|
*/
|
||||||
%typemap(jni) char *BYTE "jbyteArray"
|
%typemap(jni) char *BYTE "jbyteArray"
|
||||||
%typemap(jtype) char *BYTE "byte[]"
|
%typemap(jtype) char *BYTE "byte[]"
|
||||||
%typemap(jstype) char *BYTE "byte[]"
|
%typemap(jstype) char *BYTE "byte[]"
|
||||||
%typemap(javadirectorin) char *BYTE "$jniinput"
|
|
||||||
%typemap(javadirectorout) char *BYTE "$javacall"
|
|
||||||
%typemap(in) char *BYTE {
|
%typemap(in) char *BYTE {
|
||||||
$1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0);
|
$1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0);
|
||||||
}
|
}
|
||||||
|
|
@ -125,10 +106,15 @@
|
||||||
JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0);
|
JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(directorin,parse="[B") char *BYTE
|
%typemap(javain) char *BYTE "$javainput"
|
||||||
%{
|
|
||||||
#error "Need directorin typemape for BYTE, array input size is unknown."
|
|
||||||
%}
|
|
||||||
|
|
||||||
/* Prevent default freearg typemap from being used */
|
/* Prevent default freearg typemap from being used */
|
||||||
%typemap(freearg) char *BYTE ""
|
%typemap(freearg) char *BYTE ""
|
||||||
|
|
||||||
|
%typemap(javadirectorin) char *BYTE "$jniinput"
|
||||||
|
%typemap(javadirectorout) char *BYTE "$javacall"
|
||||||
|
%typemap(directorin,descriptor="[B") char *BYTE
|
||||||
|
%{
|
||||||
|
#error "Need directorin typemap for char *BYTE, array input size is unknown."
|
||||||
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue