jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

char * and char[] and char[ANY] typemaps tidyup

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6165 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-08-29 20:35:30 +00:00
commit d55841d6ea
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
SWIG/Lib/java/java.swg
View file

@ -27,7 +27,6 @@
%typemap(jni) unsigned long long, const unsigned long long & "jobject" %typemap(jni) unsigned long long, const unsigned long long & "jobject"
%typemap(jni) float, const float & "jfloat" %typemap(jni) float, const float & "jfloat"
%typemap(jni) double, const double & "jdouble" %typemap(jni) double, const double & "jdouble"
%typemap(jni) char * "jstring"
%typemap(jni) void "void" %typemap(jni) void "void"
%typemap(jtype) bool, const bool & "boolean" %typemap(jtype) bool, const bool & "boolean"
@ -44,7 +43,6 @@
%typemap(jtype) unsigned long long, const unsigned long long & "java.math.BigInteger" %typemap(jtype) unsigned long long, const unsigned long long & "java.math.BigInteger"
%typemap(jtype) float, const float & "float" %typemap(jtype) float, const float & "float"
%typemap(jtype) double, const double & "double" %typemap(jtype) double, const double & "double"
%typemap(jtype) char * "String"
%typemap(jtype) void "void" %typemap(jtype) void "void"
%typemap(jstype) bool, const bool & "boolean" %typemap(jstype) bool, const bool & "boolean"
@ -61,12 +59,11 @@
%typemap(jstype) unsigned long long, const unsigned long long & "java.math.BigInteger" %typemap(jstype) unsigned long long, const unsigned long long & "java.math.BigInteger"
%typemap(jstype) float, const float & "float" %typemap(jstype) float, const float & "float"
%typemap(jstype) double, const double & "double" %typemap(jstype) double, const double & "double"
%typemap(jstype) char * "String"
%typemap(jstype) void "void" %typemap(jstype) void "void"
%typemap(jni) char[ANY] "jstring" %typemap(jni) char *, char[ANY], char[] "jstring"
%typemap(jtype) char[ANY] "String" %typemap(jtype) char *, char[ANY], char[] "String"
%typemap(jstype) char[ANY] "String" %typemap(jstype) char *, char[ANY], char[] "String"
/* JNI types */ /* JNI types */
%typemap(jni) jboolean "jboolean" %typemap(jni) jboolean "jboolean"
@ -515,8 +512,8 @@
%typemap(in) SWIGTYPE [] %{ $1 = *($&1_ltype)&$input; %} %typemap(in) SWIGTYPE [] %{ $1 = *($&1_ltype)&$input; %}
%typemap(out) SWIGTYPE [] %{ *($&1_ltype)&$result = $1; %} %typemap(out) SWIGTYPE [] %{ *($&1_ltype)&$result = $1; %}
/* char[ANY] - treat as String */ /* char arrays - treat as String */
%typemap(in) char[ANY] { %typemap(in) char[ANY], char[] {
$1 = 0; $1 = 0;
if ($input) { if ($input) {
$1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0); $1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
@ -524,7 +521,7 @@
} }
} }
%typemap(directorin, descriptor="Ljava/lang/String;") char[ANY] { %typemap(directorin, descriptor="Ljava/lang/String;") char[ANY], char[] {
$input = 0; $input = 0;
if ($1) { if ($1) {
$input = JCALL1(NewStringUTF, jenv, $1); $input = JCALL1(NewStringUTF, jenv, $1);
@ -532,11 +529,11 @@
} }
} }
%typemap(argout) char[ANY] "" %typemap(argout) char[ANY], char[] ""
%typemap(freearg) char[ANY] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); } %typemap(freearg) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
%typemap(out) char[ANY] { if($1) $result = JCALL1(NewStringUTF, jenv, $1); } %typemap(out) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
%typemap(javadirectorin) char[ANY] "$jniinput" %typemap(javadirectorin) char[ANY], char[] "$jniinput"
%typemap(javadirectorout) char[ANY] "$javacall" %typemap(javadirectorout) char[ANY], char[] "$javacall"
/* JNI types */ /* JNI types */
%typemap(in) jboolean, %typemap(in) jboolean,
@ -712,7 +709,8 @@
%typecheck(SWIG_TYPECHECK_STRING) /* Java String */ %typecheck(SWIG_TYPECHECK_STRING) /* Java String */
jstring, jstring,
char *, char *,
char[ANY] char[ANY],
char []
"" ""
%typecheck(SWIG_TYPECHECK_BOOL_ARRAY) /* Java boolean[] */ %typecheck(SWIG_TYPECHECK_BOOL_ARRAY) /* Java boolean[] */
@ -802,10 +800,9 @@
long long, const long long &, long long, const long long &,
unsigned long long, const unsigned long long &, unsigned long long, const unsigned long long &,
float, const float &, float, const float &,
double, const double &, double, const double &
char *,
char[ANY]
"$javainput" "$javainput"
%typemap(javain) char *, char[ANY], char[] "$javainput"
%typemap(javain) jboolean, %typemap(javain) jboolean,
jchar, jchar,
jbyte, jbyte,
@ -844,9 +841,10 @@
long long, const long long &, long long, const long long &,
unsigned long long, const unsigned long long &, unsigned long long, const unsigned long long &,
float, const float &, float, const float &,
double, const double &, double, const double & {
char *, return $jnicall;
char[ANY] { }
%typemap(javaout) char *, char[ANY], char[] {
return $jnicall; return $jnicall;
} }
%typemap(javaout) jboolean, %typemap(javaout) jboolean,