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

cosmetic changes removing unnecessary brackets and empty lines in generated code

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8251 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-01-06 13:58:10 +00:00
commit 36b1e5c2ac
11 changed files with 150 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/csharp/csharp.swg
View file

@ -147,7 +147,7 @@
const float & ($*1_ltype temp), const float & ($*1_ltype temp),
const double & ($*1_ltype temp) const double & ($*1_ltype temp)
%{ temp = ($*1_ltype)$input; %{ temp = ($*1_ltype)$input;
$1 = &temp; %} $1 = &temp; %}
%typemap(out) const bool & %{ $result = *$1; %} %typemap(out) const bool & %{ $result = *$1; %}
%typemap(out) const char & %{ $result = *$1; %} %typemap(out) const char & %{ $result = *$1; %}
@ -167,14 +167,14 @@ $1 = &temp; %}
/* Default handling. Object passed by value. Convert to a pointer */ /* Default handling. Object passed by value. Convert to a pointer */
%typemap(in, canthrow=1) SWIGTYPE ($&1_type argp) %typemap(in, canthrow=1) SWIGTYPE ($&1_type argp)
%{ argp = ($&1_ltype)$input; %{ argp = ($&1_ltype)$input;
if (!argp) { if (!argp) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0); SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
return $null; return $null;
} }
$1 = *argp; %} $1 = *argp; %}
%typemap(out) SWIGTYPE %typemap(out) SWIGTYPE
#ifdef __cplusplus #ifdef __cplusplus
%{$result = new $1_ltype(($1_ltype &)$1); %} %{ $result = new $1_ltype(($1_ltype &)$1); %}
#else #else
{ {
$&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype)); $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
@ -292,23 +292,20 @@ $1 = &temp; %}
short, short,
unsigned int, unsigned int,
unsigned long, unsigned long,
unsigned short { unsigned short
char error_msg[256]; %{ char error_msg[256];
sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, error_msg); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, error_msg);
return $null; return $null; %}
}
%typemap(throws, canthrow=1) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] %{ %typemap(throws, canthrow=1) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY]
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(throws, canthrow=1) char * %{ %typemap(throws, canthrow=1) char *
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1); %{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1);
return $null; return $null; %}
%}
/* Typemaps for code generation in proxy classes and C# type wrapper classes */ /* Typemaps for code generation in proxy classes and C# type wrapper classes */

18
Lib/csharp/enums.swg
View file

@ -15,11 +15,10 @@
%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
%typemap(throws, canthrow=1) const enum SWIGTYPE & %{ %typemap(throws, canthrow=1) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) const enum SWIGTYPE & "(int)$csinput" %typemap(csin) const enum SWIGTYPE & "(int)$csinput"
%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & { %typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
@ -44,11 +43,10 @@
%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
%typemap(throws, canthrow=1) enum SWIGTYPE %{ %typemap(throws, canthrow=1) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) enum SWIGTYPE "(int)$csinput" %typemap(csin) enum SWIGTYPE "(int)$csinput"
%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE { %typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {

18
Lib/csharp/enumsimple.swg
View file

@ -17,11 +17,10 @@
%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
%typemap(throws, canthrow=1) const enum SWIGTYPE & %{ %typemap(throws, canthrow=1) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) const enum SWIGTYPE & "$csinput" %typemap(csin) const enum SWIGTYPE & "$csinput"
%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & { %typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
@ -46,11 +45,10 @@
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
%typemap(throws, canthrow=1) enum SWIGTYPE %{ %typemap(throws, canthrow=1) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) enum SWIGTYPE "$csinput" %typemap(csin) enum SWIGTYPE "$csinput"
%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE { %typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {

18
Lib/csharp/enumtypesafe.swg
View file

@ -16,11 +16,10 @@
%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
%typemap(throws, canthrow=1) const enum SWIGTYPE & %{ %typemap(throws, canthrow=1) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) const enum SWIGTYPE & "$csinput.swigValue" %typemap(csin) const enum SWIGTYPE & "$csinput.swigValue"
%typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & { %typemap(csout, excode=SWIGEXCODE) const enum SWIGTYPE & {
@ -45,11 +44,10 @@
%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
%typemap(throws, canthrow=1) enum SWIGTYPE %{ %typemap(throws, canthrow=1) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(csin) enum SWIGTYPE "$csinput.swigValue" %typemap(csin) enum SWIGTYPE "$csinput.swigValue"
%typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE { %typemap(csout, excode=SWIGEXCODE) enum SWIGTYPE {

24
Lib/csharp/std_string.i
View file

@ -30,8 +30,8 @@ class string;
%{ if (!$input) { %{ if (!$input) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
return $null; return $null;
} }
$1 = std::string($input); %} $1 = std::string($input); %}
%typemap(out) string %{ $result = SWIG_csharp_string_callback($1.c_str()); %} %typemap(out) string %{ $result = SWIG_csharp_string_callback($1.c_str()); %}
%typemap(csin) string "$csinput" %typemap(csin) string "$csinput"
@ -52,10 +52,9 @@ class string;
%typemap(typecheck) string = char *; %typemap(typecheck) string = char *;
%typemap(throws, canthrow=1) string %{ %typemap(throws, canthrow=1) string
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str()); %{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str());
return $null; return $null; %}
%}
// const string & // const string &
%typemap(ctype) const string & "char *" %typemap(ctype) const string & "char *"
@ -66,9 +65,9 @@ class string;
%{ if (!$input) { %{ if (!$input) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
return $null; return $null;
} }
std::string $1_str($input); std::string $1_str($input);
$1 = &$1_str; %} $1 = &$1_str; %}
%typemap(out) const string & %{ $result = SWIG_csharp_string_callback($1->c_str()); %} %typemap(out) const string & %{ $result = SWIG_csharp_string_callback($1->c_str()); %}
%typemap(csin) const string & "$csinput" %typemap(csin) const string & "$csinput"
@ -89,10 +88,9 @@ class string;
%typemap(typecheck) const string & = char *; %typemap(typecheck) const string & = char *;
%typemap(throws, canthrow=1) const string & %{ %typemap(throws, canthrow=1) const string &
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str()); %{ SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, $1.c_str());
return $null; return $null; %}
%}
} }

14
Lib/java/enums.swg
View file

@ -24,10 +24,9 @@
%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
%typemap(throws) const enum SWIGTYPE & %{ %typemap(throws) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()" %typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()"
%typemap(javaout) const enum SWIGTYPE & { %typemap(javaout) const enum SWIGTYPE & {
@ -50,10 +49,9 @@
%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
%typemap(throws) enum SWIGTYPE %{ %typemap(throws) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) enum SWIGTYPE "$javainput.swigValue()" %typemap(javain) enum SWIGTYPE "$javainput.swigValue()"
%typemap(javaout) enum SWIGTYPE { %typemap(javaout) enum SWIGTYPE {

14
Lib/java/enumsimple.swg
View file

@ -24,10 +24,9 @@
%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
%typemap(throws) const enum SWIGTYPE & %{ %typemap(throws) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) const enum SWIGTYPE & "$javainput" %typemap(javain) const enum SWIGTYPE & "$javainput"
%typemap(javaout) const enum SWIGTYPE & { %typemap(javaout) const enum SWIGTYPE & {
@ -50,10 +49,9 @@
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
%typemap(throws) enum SWIGTYPE %{ %typemap(throws) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) enum SWIGTYPE "$javainput" %typemap(javain) enum SWIGTYPE "$javainput"
%typemap(javaout) enum SWIGTYPE { %typemap(javaout) enum SWIGTYPE {

14
Lib/java/enumtypesafe.swg
View file

@ -23,10 +23,9 @@
%typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_POINTER) const enum SWIGTYPE & ""
%typemap(throws) const enum SWIGTYPE & %{ %typemap(throws) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()" %typemap(javain) const enum SWIGTYPE & "$javainput.swigValue()"
%typemap(javaout) const enum SWIGTYPE & { %typemap(javaout) const enum SWIGTYPE & {
@ -48,10 +47,9 @@
%typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_POINTER) enum SWIGTYPE ""
%typemap(throws) enum SWIGTYPE %{ %typemap(throws) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) enum SWIGTYPE "$javainput.swigValue()" %typemap(javain) enum SWIGTYPE "$javainput.swigValue()"
%typemap(javaout) enum SWIGTYPE { %typemap(javaout) enum SWIGTYPE {

14
Lib/java/enumtypeunsafe.swg
View file

@ -24,10 +24,9 @@
%typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & "" %typecheck(SWIG_TYPECHECK_INT32) const enum SWIGTYPE & ""
%typemap(throws) const enum SWIGTYPE & %{ %typemap(throws) const enum SWIGTYPE &
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) const enum SWIGTYPE & "$javainput" %typemap(javain) const enum SWIGTYPE & "$javainput"
%typemap(javaout) const enum SWIGTYPE & { %typemap(javaout) const enum SWIGTYPE & {
@ -50,10 +49,9 @@
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE "" %typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
%typemap(throws) enum SWIGTYPE %{ %typemap(throws) enum SWIGTYPE
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); %}
%}
%typemap(javain) enum SWIGTYPE "$javainput" %typemap(javain) enum SWIGTYPE "$javainput"
%typemap(javaout) enum SWIGTYPE { %typemap(javaout) enum SWIGTYPE {

65
Lib/java/java.swg
View file

@ -351,7 +351,15 @@
%typemap(javadirectorout) unsigned long long "$javacall" %typemap(javadirectorout) unsigned long long "$javacall"
/* char * - treat as String */ /* char * - treat as String */
%typemap(in) char * { %typemap(in, noblock=1) char * {
$1 = 0;
if ($input) {
$1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
if (!$1) return $null;
}
}
%typemap(directorout, noblock=1) 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);
@ -359,24 +367,16 @@
} }
} }
%typemap(directorout) char * { %typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char * {
$1 = 0; $input = 0;
if ($input) {
$1 = ($1_ltype)JCALL2(GetStringUTFChars, jenv, $input, 0);
if (!$1) return $null;
}
}
%typemap(directorin, descriptor="Ljava/lang/String;") char * {
$input = 0;
if ($1) { if ($1) {
$input = JCALL1(NewStringUTF, jenv, $1); $input = JCALL1(NewStringUTF, jenv, $1);
if (!$input) return $null; if (!$input) return $null;
} }
} }
%typemap(freearg) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); } %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
%typemap(out) char * { if($1) $result = JCALL1(NewStringUTF, jenv, $1); } %typemap(out, noblock=1) char * { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
%typemap(javadirectorin) char * "$jniinput" %typemap(javadirectorin) char * "$jniinput"
%typemap(javadirectorout) char * "$javacall" %typemap(javadirectorout) char * "$javacall"
@ -593,7 +593,7 @@
%typemap(out) SWIGTYPE %typemap(out) SWIGTYPE
#ifdef __cplusplus #ifdef __cplusplus
%{*($&1_ltype*)(void *)&$result = new $1_ltype(($1_ltype &)$1); %} %{ *($&1_ltype*)(void *)&$result = new $1_ltype(($1_ltype &)$1); %}
#else #else
{ {
$&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype)); $&1_ltype $1ptr = ($&1_ltype) malloc(sizeof($1_ltype));
@ -637,7 +637,7 @@
%typemap(freearg) SWIGTYPE [ANY], SWIGTYPE [] "" %typemap(freearg) SWIGTYPE [ANY], SWIGTYPE [] ""
/* char arrays - treat as String */ /* char arrays - treat as String */
%typemap(in) char[ANY], char[] { %typemap(in, noblock=1) 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);
@ -645,7 +645,7 @@
} }
} }
%typemap(directorout) char[ANY], char[] { %typemap(directorout, noblock=1) 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);
@ -653,7 +653,7 @@
} }
} }
%typemap(directorin, descriptor="Ljava/lang/String;") char[ANY], char[] { %typemap(directorin, descriptor="Ljava/lang/String;", noblock=1) char[ANY], char[] {
$input = 0; $input = 0;
if ($1) { if ($1) {
$input = JCALL1(NewStringUTF, jenv, $1); $input = JCALL1(NewStringUTF, jenv, $1);
@ -662,8 +662,8 @@
} }
%typemap(argout) char[ANY], char[] "" %typemap(argout) char[ANY], char[] ""
%typemap(freearg) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); } %typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, $1); }
%typemap(out) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, $1); } %typemap(out, noblock=1) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, $1); }
%typemap(javadirectorin) char[ANY], char[] "$jniinput" %typemap(javadirectorin) char[ANY], char[] "$jniinput"
%typemap(javadirectorout) char[ANY], char[] "$javacall" %typemap(javadirectorout) char[ANY], char[] "$javacall"
@ -918,23 +918,20 @@
short, short,
unsigned int, unsigned int,
unsigned long, unsigned long,
unsigned short { unsigned short
char error_msg[256]; %{ char error_msg[256];
sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1); sprintf(error_msg, "C++ $1_type exception thrown, value: %d", $1);
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, error_msg); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, error_msg);
return $null; return $null; %}
}
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY] %{ %typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [], SWIGTYPE [ANY]
(void)$1; %{ (void)$1;
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown"); SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
return $null; return $null; %}
%}
%typemap(throws) char * %{ %typemap(throws) char *
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1); %{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1);
return $null; return $null; %}
%}
/* Typemaps for code generation in proxy classes and Java type wrapper classes */ /* Typemaps for code generation in proxy classes and Java type wrapper classes */

84
Lib/java/std_string.i
View file

@ -30,24 +30,24 @@ class string;
%typemap(javadirectorout) string "$javacall" %typemap(javadirectorout) string "$javacall"
%typemap(in) string %typemap(in) string
%{if(!$input) { %{ if(!$input) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
$1 = std::string($1_pstr); $1 = std::string($1_pstr);
jenv->ReleaseStringUTFChars($input, $1_pstr); %} jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorout) string %typemap(directorout) string
%{if(!$input) { %{ if(!$input) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
$1 = std::string($1_pstr); $1 = std::string($1_pstr);
jenv->ReleaseStringUTFChars($input, $1_pstr); %} jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") string %typemap(directorin,descriptor="Ljava/lang/String;") string
%{ $input = jenv->NewStringUTF($1.c_str()); %} %{ $input = jenv->NewStringUTF($1.c_str()); %}
@ -63,10 +63,9 @@ class string;
%typemap(typecheck) string = char *; %typemap(typecheck) string = char *;
%typemap(throws) string %{ %typemap(throws) string
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str()); %{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str());
return $null; return $null; %}
%}
// const string & // const string &
%typemap(jni) const string & "jstring" %typemap(jni) const string & "jstring"
@ -76,27 +75,27 @@ class string;
%typemap(javadirectorout) const string & "$javacall" %typemap(javadirectorout) const string & "$javacall"
%typemap(in) const string & %typemap(in) const string &
%{if(!$input) { %{ if(!$input) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
std::string $1_str($1_pstr); std::string $1_str($1_pstr);
$1 = &$1_str; $1 = &$1_str;
jenv->ReleaseStringUTFChars($input, $1_pstr); %} jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
%{if(!$input) { %{ if(!$input) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
return $null; return $null;
} }
const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0);
if (!$1_pstr) return $null; if (!$1_pstr) return $null;
/* possible thread/reentrant code problem */ /* possible thread/reentrant code problem */
static std::string $1_str($1_pstr); static std::string $1_str($1_pstr);
$1 = &$1_str; $1 = &$1_str;
jenv->ReleaseStringUTFChars($input, $1_pstr); %} jenv->ReleaseStringUTFChars($input, $1_pstr); %}
%typemap(directorin,descriptor="Ljava/lang/String;") const string & %typemap(directorin,descriptor="Ljava/lang/String;") const string &
%{ $input = jenv->NewStringUTF($1.c_str()); %} %{ $input = jenv->NewStringUTF($1.c_str()); %}
@ -112,10 +111,9 @@ class string;
%typemap(typecheck) const string & = char *; %typemap(typecheck) const string & = char *;
%typemap(throws) const string & %{ %typemap(throws) const string &
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str()); %{ SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, $1.c_str());
return $null; return $null; %}
%}
} }