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

typemap name changes:

Browse source 
inv => directorin
outv => directorout
argoutv => directorargout


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5137 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-09-20 23:52:28 +00:00
commit 7ee01311b2
24 changed files with 500 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/java/arrays_java.i
View file

@ -225,7 +225,7 @@ JAVA_ARRAYS_IMPL(double, jdouble, Double, Double) /* double[] */
if (!SWIG_JavaArrayIn##JFUNCNAME(jenv, &jarr, &$1, $input)) return $null; %}
%typemap(argout) CTYPE[ANY]
%{ SWIG_JavaArrayArgout##JFUNCNAME(jenv, jarr$argnum, $1, $input); %}
%typemap(inv,parse=JNIDESC) CTYPE[ANY]
%typemap(directorin,parse=JNIDESC) CTYPE[ANY]
%{$input = SWIG_JavaArrayOut##JFUNCNAME(jenv, $1, $1_dim0); %}
%typemap(out) CTYPE[ANY]
%{$result = SWIG_JavaArrayOut##JFUNCNAME(jenv, $1, $1_dim0); %}

270
Lib/java/java.swg
View file

@ -179,49 +179,49 @@
enum SWIGTYPE
%{ $1 = ($1_ltype)$input; %}
%typemap(inv, parse="Z") bool "$input = (jboolean) $1;"
%typemap(inv, parse="C") char "$input = (jint) $1;"
%typemap(inv, parse="B") signed char "$input = (jbyte) $1;"
%typemap(inv, parse="S") unsigned char "$input = (jshort) $1;"
%typemap(inv, parse="S") short "$input = (jshort) $1;"
%typemap(inv, parse="I") unsigned short "$input = (jint) $1;"
%typemap(inv, parse="I") int "$input = (jint) $1;"
%typemap(inv, parse="J") unsigned int "$input = (jlong) $1;"
%typemap(inv, parse="I") long "$input = (jint) $1;"
%typemap(inv, parse="J") unsigned long "$input = (jlong) $1;"
%typemap(inv, parse="J") long long "$input = (jlong) $1;"
%typemap(inv, parse="F") float "$input = (jfloat) $1;"
%typemap(inv, parse="D") double "$input = (jdouble) $1;"
%typemap(inv, parse="I") enum SWIGTYPE "$input = (jint) $1;"
%typemap(directorin, parse="Z") bool "$input = (jboolean) $1;"
%typemap(directorin, parse="C") char "$input = (jint) $1;"
%typemap(directorin, parse="B") signed char "$input = (jbyte) $1;"
%typemap(directorin, parse="S") unsigned char "$input = (jshort) $1;"
%typemap(directorin, parse="S") short "$input = (jshort) $1;"
%typemap(directorin, parse="I") unsigned short "$input = (jint) $1;"
%typemap(directorin, parse="I") int "$input = (jint) $1;"
%typemap(directorin, parse="J") unsigned int "$input = (jlong) $1;"
%typemap(directorin, parse="I") long "$input = (jint) $1;"
%typemap(directorin, parse="J") unsigned long "$input = (jlong) $1;"
%typemap(directorin, parse="J") long long "$input = (jlong) $1;"
%typemap(directorin, parse="F") float "$input = (jfloat) $1;"
%typemap(directorin, parse="D") double "$input = (jdouble) $1;"
%typemap(directorin, parse="I") enum SWIGTYPE "$input = (jint) $1;"
%typemap(javadirectorin) char,
signed char,
unsigned char,
short,
unsigned short,
int,
unsigned int,
long,
unsigned long,
long long,
float,
double,
enum SWIGTYPE
signed char,
unsigned char,
short,
unsigned short,
int,
unsigned int,
long,
unsigned long,
long long,
float,
double,
enum SWIGTYPE
"$jniinput"
%typemap(javadirectorout) char,
signed char,
unsigned char,
short,
unsigned short,
int,
unsigned int,
long,
unsigned long,
long long,
float,
double,
enum SWIGTYPE
signed char,
unsigned char,
short,
unsigned short,
int,
unsigned int,
long,
unsigned long,
long long,
float,
double,
enum SWIGTYPE
"$javacall"
%typemap(out) bool %{ $result = (jboolean)$1; %}
@ -292,7 +292,7 @@
}
/* Convert to BigInteger (see out typemap) */
%typemap(inv, parse="Ljava/math/Biginteger;") unsigned long long, const unsigned long long & {
%typemap(directorin, parse="Ljava/math/Biginteger;") unsigned long long, const unsigned long long & {
jbyteArray ba = JCALL1(NewByteArray, jenv, 9);
jbyte* bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
jclass clazz = JCALL1(FindClass, jenv, "java/math/BigInteger");
@ -322,7 +322,7 @@
}
}
%typemap(inv, parse="Ljava/lang/String;") char * {
%typemap(directorin, parse="Ljava/lang/String;") char * {
$input = 0;
if ($1) {
$input = JCALL1(NewStringUTF, jenv, $1);
@ -337,7 +337,7 @@
%typemap(out) void ""
%typemap(javadirectorin) void "$jniinput"
%typemap(javadirectorout) void "$javacall"
%typemap(inv, parse="V") void ""
%typemap(directorin, parse="V") void ""
/* primitive types by reference */
%typemap(in) const bool & (bool temp)
@ -362,46 +362,46 @@
%{ temp = ($*1_ltype)$input;
$1 = &temp; %}
%typemap(inv, parse="Z") const bool & "$input = (jboolean)$1_name;"
%typemap(inv, parse="C") const char & "$input = (jchar)$1_name;"
%typemap(inv, parse="B") const signed char & "$input = (jbyte)$1_name;"
%typemap(inv, parse="S") const unsigned char & "$input = (jshort)$1_name;"
%typemap(inv, parse="S") const short & "$input = (jshort)$1_name;"
%typemap(inv, parse="I") const unsigned short & "$input = (jint)$1_name;"
%typemap(inv, parse="I") const int & "$input = (jint)$1_name;"
%typemap(inv, parse="J") const unsigned int & "$input = (jlong)$1_name;"
%typemap(inv, parse="I") const long & "$input = (jint)$1_name;"
%typemap(inv, parse="J") const unsigned long & "$input = (jlong)$1_name;"
%typemap(inv, parse="J") const long long & "$input = (jlong)$1_name;"
%typemap(inv, parse="F") const float & "$input = (jfloat)$1_name;"
%typemap(inv, parse="D") const double & "$input = (jdouble)$1_name;"
%typemap(directorin, parse="Z") const bool & "$input = (jboolean)$1_name;"
%typemap(directorin, parse="C") const char & "$input = (jchar)$1_name;"
%typemap(directorin, parse="B") const signed char & "$input = (jbyte)$1_name;"
%typemap(directorin, parse="S") const unsigned char & "$input = (jshort)$1_name;"
%typemap(directorin, parse="S") const short & "$input = (jshort)$1_name;"
%typemap(directorin, parse="I") const unsigned short & "$input = (jint)$1_name;"
%typemap(directorin, parse="I") const int & "$input = (jint)$1_name;"
%typemap(directorin, parse="J") const unsigned int & "$input = (jlong)$1_name;"
%typemap(directorin, parse="I") const long & "$input = (jint)$1_name;"
%typemap(directorin, parse="J") const unsigned long & "$input = (jlong)$1_name;"
%typemap(directorin, parse="J") const long long & "$input = (jlong)$1_name;"
%typemap(directorin, parse="F") const float & "$input = (jfloat)$1_name;"
%typemap(directorin, parse="D") const double & "$input = (jdouble)$1_name;"
%typemap(javadirectorin) const char & (char temp),
const signed char & (signed char temp),
const unsigned char & (unsigned char temp),
const short & (short temp),
const unsigned short & (unsigned short temp),
const int & (int temp),
const unsigned int & (unsigned int temp),
const long & (long temp),
const unsigned long & (unsigned long temp),
const long long & ($*1_ltype temp),
const float & (float temp),
const double & (double temp)
const signed char & (signed char temp),
const unsigned char & (unsigned char temp),
const short & (short temp),
const unsigned short & (unsigned short temp),
const int & (int temp),
const unsigned int & (unsigned int temp),
const long & (long temp),
const unsigned long & (unsigned long temp),
const long long & ($*1_ltype temp),
const float & (float temp),
const double & (double temp)
"$jniinput"
%typemap(javadirectorout) const char & (char temp),
const signed char & (signed char temp),
const unsigned char & (unsigned char temp),
const short & (short temp),
const unsigned short & (unsigned short temp),
const int & (int temp),
const unsigned int & (unsigned int temp),
const long & (long temp),
const unsigned long & (unsigned long temp),
const long long & ($*1_ltype temp),
const float & (float temp),
const double & (double temp)
const signed char & (signed char temp),
const unsigned char & (unsigned char temp),
const short & (short temp),
const unsigned short & (unsigned short temp),
const int & (int temp),
const unsigned int & (unsigned int temp),
const long & (long temp),
const unsigned long & (unsigned long temp),
const long long & ($*1_ltype temp),
const float & (float temp),
const double & (double temp)
"$javacall"
@ -494,7 +494,7 @@
}
#endif
%typemap(inv,parse="L$packagepath/$javaclassname;") SWIGTYPE "*(($&1_type)&$input) = &$1;"
%typemap(directorin,parse="L$packagepath/$javaclassname;") SWIGTYPE "*(($&1_type)&$input) = &$1;"
%typemap(javadirectorin) SWIGTYPE "new $javaclassname($jniinput, false)"
%typemap(javadirectorout) SWIGTYPE "$javaclassname.getCPtr($javacall)"
@ -510,10 +510,10 @@
%typemap(out) SWIGTYPE &
%{ *($&1_ltype)&$result = $1; %}
%typemap(inv,parse="L$packagepath/$javaclassname;") SWIGTYPE *, SWIGTYPE (CLASS::*)
%typemap(directorin,parse="L$packagepath/$javaclassname;") SWIGTYPE *, SWIGTYPE (CLASS::*)
%{ *(($&1_ltype)&$input) = ($1_ltype) $1; %}
%typemap(inv,parse="L$packagepath/$javaclassname;") SWIGTYPE &
%typemap(directorin,parse="L$packagepath/$javaclassname;") SWIGTYPE &
%{ *($&1_ltype)&$input = ($1_ltype) &$1; %}
%typemap(javadirectorin) SWIGTYPE *, SWIGTYPE (CLASS::*), SWIGTYPE &, const SWIGTYPE & "new $javaclassname($jniinput, false)"
@ -532,7 +532,7 @@
}
}
%typemap(inv,parse="Ljava/lang/String;") char[ANY] "$input = JCALL1(NewStringUTF, jenv, $1_name);"
%typemap(directorin,parse="Ljava/lang/String;") char[ANY] "$input = JCALL1(NewStringUTF, jenv, $1_name);"
%typemap(argout) char[ANY] ""
%typemap(freearg) char[ANY] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
@ -583,66 +583,66 @@
jobjectArray
%{ $result = $1; %}
%typemap(inv,parse="Z") jboolean "$input = $1;"
%typemap(inv,parse="C") jchar "$input = $1;"
%typemap(inv,parse="B") jbyte "$input = $1;"
%typemap(inv,parse="S") jshort "$input = $1;"
%typemap(inv,parse="I") jint "$input = $1;"
%typemap(inv,parse="J") jlong "$input = $1;"
%typemap(inv,parse="F") jfloat "$input = $1;"
%typemap(inv,parse="D") jdouble "$input = $1;"
%typemap(inv,parse="Ljava/lang/String;") jstring "$input = $1;"
%typemap(inv,parse="Ljava/lang/Object;") jobject "$input = $1;"
%typemap(inv,parse="[Z") jbooleanArray "$input = $1;"
%typemap(inv,parse="[C") jcharArray "$input = $1;"
%typemap(inv,parse="[B") jbyteArray "$input = $1;"
%typemap(inv,parse="[S") jshortArray "$input = $1;"
%typemap(inv,parse="[I") jintArray "$input = $1;"
%typemap(inv,parse="[J") jlongArray "$input = $1;"
%typemap(inv,parse="[F") jfloatArray "$input = $1;"
%typemap(inv,parse="[D") jdoubleArray "$input = $1;"
%typemap(inv,parse="[Ljava/lang/Object;") jobjectArray "$input = $1;"
%typemap(directorin,parse="Z") jboolean "$input = $1;"
%typemap(directorin,parse="C") jchar "$input = $1;"
%typemap(directorin,parse="B") jbyte "$input = $1;"
%typemap(directorin,parse="S") jshort "$input = $1;"
%typemap(directorin,parse="I") jint "$input = $1;"
%typemap(directorin,parse="J") jlong "$input = $1;"
%typemap(directorin,parse="F") jfloat "$input = $1;"
%typemap(directorin,parse="D") jdouble "$input = $1;"
%typemap(directorin,parse="Ljava/lang/String;") jstring "$input = $1;"
%typemap(directorin,parse="Ljava/lang/Object;") jobject "$input = $1;"
%typemap(directorin,parse="[Z") jbooleanArray "$input = $1;"
%typemap(directorin,parse="[C") jcharArray "$input = $1;"
%typemap(directorin,parse="[B") jbyteArray "$input = $1;"
%typemap(directorin,parse="[S") jshortArray "$input = $1;"
%typemap(directorin,parse="[I") jintArray "$input = $1;"
%typemap(directorin,parse="[J") jlongArray "$input = $1;"
%typemap(directorin,parse="[F") jfloatArray "$input = $1;"
%typemap(directorin,parse="[D") jdoubleArray "$input = $1;"
%typemap(directorin,parse="[Ljava/lang/Object;") jobjectArray "$input = $1;"
%typemap(javadirectorin) jboolean,
jchar,
jbyte,
jshort,
jint,
jlong,
jfloat,
jdouble,
jstring,
jobject,
jbooleanArray,
jcharArray,
jbyteArray,
jshortArray,
jintArray,
jlongArray,
jfloatArray,
jdoubleArray,
jobjectArray
jchar,
jbyte,
jshort,
jint,
jlong,
jfloat,
jdouble,
jstring,
jobject,
jbooleanArray,
jcharArray,
jbyteArray,
jshortArray,
jintArray,
jlongArray,
jfloatArray,
jdoubleArray,
jobjectArray
"$jniinput"
%typemap(javadirectorout) jboolean,
jchar,
jbyte,
jshort,
jint,
jlong,
jfloat,
jdouble,
jstring,
jobject,
jbooleanArray,
jcharArray,
jbyteArray,
jshortArray,
jintArray,
jlongArray,
jfloatArray,
jdoubleArray,
jobjectArray
jchar,
jbyte,
jshort,
jint,
jlong,
jfloat,
jdouble,
jstring,
jobject,
jbooleanArray,
jcharArray,
jbyteArray,
jshortArray,
jintArray,
jlongArray,
jfloatArray,
jdoubleArray,
jobjectArray
"$javacall"
/* Typecheck typemaps - The purpose of these is merely to issue a warning for overloaded C++ functions

8
Lib/java/std_string.i
View file

@ -43,7 +43,7 @@ class string;
return $null;
} %}
%typemap(inv,parse="Ljava/lang/String;") string
%typemap(directorin,parse="Ljava/lang/String;") string
%{ $input = jenv->NewStringUTF($1.c_str()); %}
%typemap(out) string
@ -80,7 +80,7 @@ class string;
%typemap(freearg) const string &
%{ delete $1; %}
%typemap(inv,parse="Ljava/lang/String;") const string &
%typemap(directorin,parse="Ljava/lang/String;") const string &
%{ $input = jenv->NewStringUTF($1.c_str()); %}
%typemap(out) const string &
@ -142,7 +142,7 @@ class wstring;
return $null;
} %}
%typemap(inv,parse="Ljava/lang/String;") wstring
%typemap(directorin,parse="Ljava/lang/String;") wstring
%{jsize len = $1.length();
jchar *conv_buf = new jchar[len];
for (jsize i = 0; i < len; ++i) {
@ -194,7 +194,7 @@ class wstring;
return $null;
} %}
%typemap(inv,parse="Ljava/lang/String;") const wstring &
%typemap(directorin,parse="Ljava/lang/String;") const wstring &
%{jsize len = $1->length();
jchar *conv_buf = new jchar[len];
for (jsize i = 0; i < len; ++i) {

16
Lib/java/typemaps.i
View file

@ -76,10 +76,10 @@ In Java you could then use it like this:
%typemap(in) CTYPE *INPUT, CTYPE &INPUT
%{ $1 = ($1_ltype)&$input; %}
%typemap(inv,parse=JNIDESC) CYTPE &INPUT
%typemap(directorin,parse=JNIDESC) CYTPE &INPUT
%{ *(($&1_ltype) $input) = (JNITYPE *) &$1; %}
%typemap(inv,parse=JNIDESC) CTYPE *INPUT
%typemap(directorin,parse=JNIDESC) CTYPE *INPUT
%{ *(($&1_ltype) $input) = (JNITYPE *) $1; %}
%typemap(typecheck) CTYPE *INPUT = CTYPE;
@ -220,12 +220,12 @@ value in the single element array. In Java you would use it like this:
$1 = &temp;
}
%typemap(inv,parse=JNIDESC) CTYPE &OUTPUT
%typemap(directorin,parse=JNIDESC) CTYPE &OUTPUT
%{ *(($&1_ltype) $input = &$1; %}
%typemap(inv,parse=JNIDESC) CTYPE *OUTPUT
%typemap(directorin,parse=JNIDESC) CTYPE *OUTPUT
%{
#error "Need to provide OUT inv typemap, CTYPE array length is unknown"
#error "Need to provide OUT directorin typemap, CTYPE array length is unknown"
%}
%typemap(argout) CTYPE *OUTPUT, CTYPE &OUTPUT
@ -354,12 +354,12 @@ of the function return value. This difference is due to Java being a typed langu
$1 = ($1_ltype) JCALL2(Get##JAVATYPE##ArrayElements, jenv, $input, 0);
}
%typemap(inv,parse=JNIDESC) CTYPE &INOUT
%typemap(directorin,parse=JNIDESC) CTYPE &INOUT
%{ *(($&1_ltype)&$input) = &$1; %}
%typemap(inv,parse=JNIDESC) CTYPE *INOUT, CTYPE &INOUT
%typemap(directorin,parse=JNIDESC) CTYPE *INOUT, CTYPE &INOUT
{
#error "Need to provide INOUT inv typemap, CTYPE array length is unknown"
#error "Need to provide INOUT directorin typemap, CTYPE array length is unknown"
}
%typemap(argout) CTYPE *INOUT, CTYPE &INOUT

14
Lib/java/various.i
View file

@ -30,7 +30,7 @@
%typemap(freearg) char **STRING_IN
%{ free($1); %}
%typemap(inv, parse="Ljava/lang/String;") char **STRING_IN
%typemap(directorin, parse="Ljava/lang/String;") char **STRING_IN
%{ $input = JCALL1(NewStringUTF, jenv, *$1); %}
/* char **STRING_OUT - result must be a null terminated string */
@ -47,7 +47,7 @@
}
}
%typemap(inv,parse="Ljava/lang/String;") char **STRING_OUT
%typemap(directorin,parse="Ljava/lang/String;") char **STRING_OUT
%{ $input = JCALL1(NewStringUTF, jenv, *$1); %}
/* char **STRING_RET - a NULL terminated array of char* */
@ -75,7 +75,7 @@
}
}
%typemap(inv,parse="Ljava/lang/String;") char **STRING_RET
%typemap(directorin,parse="Ljava/lang/String;") char **STRING_RET
%{ $input = JCALL1(NewStringUTF, jenv, *$1; %}
/* float *FLOAT_ARRAY_RETURN */
@ -106,9 +106,9 @@
}
}
%typemap(inv,parse="[F") float *FLOATARRAYRETURN
%typemap(directorin,parse="[F") float *FLOATARRAYRETURN
%{
#error "Need inv typemape for FLOATARRAYRETURN, array input size is unknown."
#error "Need directorin typemape for FLOATARRAYRETURN, array input size is unknown."
%}
/* char *BYTE */
@ -125,9 +125,9 @@
JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0);
}
%typemap(inv,parse="[B") char *BYTE
%typemap(directorin,parse="[B") char *BYTE
%{
#error "Need inv typemape for BYTE, array input size is unknown."
#error "Need directorin typemape for BYTE, array input size is unknown."
%}
/* Prevent default freearg typemap from being used */