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

The 'directorin' typemap now accepts , etc expansions instead of having to use workarounds - _name, _name etc.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12879 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-12-21 07:16:44 +00:00
commit 4c898b023c
23 changed files with 80 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/csharp/csharp.swg
View file

@ -297,19 +297,19 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
temp = ($*1_ltype)$input; temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin) const bool & "$input = $1_name;" %typemap(directorin) const bool & "$input = $1;"
%typemap(directorin) const char & "$input = $1_name;" %typemap(directorin) const char & "$input = $1;"
%typemap(directorin) const signed char & "$input = $1_name;" %typemap(directorin) const signed char & "$input = $1;"
%typemap(directorin) const unsigned char & "$input = $1_name;" %typemap(directorin) const unsigned char & "$input = $1;"
%typemap(directorin) const short & "$input = $1_name;" %typemap(directorin) const short & "$input = $1;"
%typemap(directorin) const unsigned short & "$input = $1_name;" %typemap(directorin) const unsigned short & "$input = $1;"
%typemap(directorin) const int & "$input = $1_name;" %typemap(directorin) const int & "$input = $1;"
%typemap(directorin) const unsigned int & "$input = $1_name;" %typemap(directorin) const unsigned int & "$input = $1;"
%typemap(directorin) const long & "$input = $1_name;" %typemap(directorin) const long & "$input = $1;"
%typemap(directorin) const unsigned long & "$input = $1_name;" %typemap(directorin) const unsigned long & "$input = $1;"
%typemap(directorin) const long long & "$input = $1_name;" %typemap(directorin) const long long & "$input = $1;"
%typemap(directorin) const float & "$input = $1_name;" %typemap(directorin) const float & "$input = $1;"
%typemap(directorin) const double & "$input = $1_name;" %typemap(directorin) const double & "$input = $1;"
%typemap(csdirectorin) const char & ($*1_ltype temp), %typemap(csdirectorin) const char & ($*1_ltype temp),
const signed char & ($*1_ltype temp), const signed char & ($*1_ltype temp),

2
Lib/csharp/enums.swg
View file

@ -18,7 +18,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(directorin) const enum SWIGTYPE & "$input = $1;"
%typemap(csdirectorin) const enum SWIGTYPE & "($*csclassname)$iminput" %typemap(csdirectorin) const enum SWIGTYPE & "($*csclassname)$iminput"
%typemap(csdirectorout) const enum SWIGTYPE & "(int)$cscall" %typemap(csdirectorout) const enum SWIGTYPE & "(int)$cscall"

2
Lib/csharp/enumsimple.swg
View file

@ -20,7 +20,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(directorin) const enum SWIGTYPE & "$input = $1;"
%typemap(csdirectorin) const enum SWIGTYPE & "$iminput" %typemap(csdirectorin) const enum SWIGTYPE & "$iminput"
%typemap(csdirectorout) const enum SWIGTYPE & "$cscall" %typemap(csdirectorout) const enum SWIGTYPE & "$cscall"

2
Lib/csharp/enumtypesafe.swg
View file

@ -19,7 +19,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(directorin) const enum SWIGTYPE & "$input = $1;"
%typemap(csdirectorin) const enum SWIGTYPE & "$*csclassname.swigToEnum($iminput)" %typemap(csdirectorin) const enum SWIGTYPE & "$*csclassname.swigToEnum($iminput)"
%typemap(csdirectorout) const enum SWIGTYPE & "$cscall.swigValue" %typemap(csdirectorout) const enum SWIGTYPE & "$cscall.swigValue"

2
Lib/d/denums.swg
View file

@ -45,7 +45,7 @@
$1 = &temp; %} $1 = &temp; %}
%typemap(out) const enum SWIGTYPE & %{ $result = *$1; %} %typemap(out) const enum SWIGTYPE & %{ $result = *$1; %}
%typemap(directorin) const enum SWIGTYPE & "$input = $1_name;" %typemap(directorin) const enum SWIGTYPE & "$input = $1;"
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}

2
Lib/d/dprimitives.swg
View file

@ -38,7 +38,7 @@
%{ temp = ($*1_ltype)$input; %{ temp = ($*1_ltype)$input;
$1 = &temp; %} $1 = &temp; %}
%typemap(out) const TYPE & "$result = *$1;" %typemap(out) const TYPE & "$result = *$1;"
%typemap(directorin) const TYPE & "$input = $1_name;" %typemap(directorin) const TYPE & "$input = $1;"
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const TYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const TYPE &
%{ static $*1_ltype temp; %{ static $*1_ltype temp;
temp = ($*1_ltype)$input; temp = ($*1_ltype)$input;

24
Lib/go/go.swg
View file

@ -108,7 +108,7 @@
unsigned long long, unsigned long long,
float, float,
double double
%{ $input = ($1_ltype)$1_name; %} %{ $input = ($1_ltype)$1; %}
%typemap(directorin) const bool &, %typemap(directorin) const bool &,
const char &, const char &,
@ -124,7 +124,7 @@
const unsigned long long &, const unsigned long long &,
const float &, const float &,
const double & const double &
%{ $input = ($*1_ltype)$1_name; %} %{ $input = ($*1_ltype)$1; %}
%typemap(directorout) bool, %typemap(directorout) bool,
char, char,
@ -182,10 +182,10 @@
%{ $result = ($*1_ltype)*$1; %} %{ $result = ($*1_ltype)*$1; %}
%typemap(directorin) size_t %typemap(directorin) size_t
%{ $input = (size_t)$1_name; %} %{ $input = (size_t)$1; %}
%typemap(directorin) const size_t & %typemap(directorin) const size_t &
%{ $input = ($*1_ltype)$1_name; %} %{ $input = ($*1_ltype)$1; %}
%typemap(directorout) size_t %typemap(directorout) size_t
%{ $result = ($1_ltype)$input; %} %{ $result = ($1_ltype)$input; %}
@ -211,7 +211,7 @@
%} %}
%typemap(directorin) SWIGTYPE (CLASS::*) %typemap(directorin) SWIGTYPE (CLASS::*)
%{ $input = *($&1_ltype)$1_name; %} %{ $input = *($&1_ltype)$1; %}
%typemap(directorout) SWIGTYPE (CLASS::*) %typemap(directorout) SWIGTYPE (CLASS::*)
%{ %{
@ -233,7 +233,7 @@
%{ *($&1_ltype)&$result = $1; %} %{ *($&1_ltype)&$result = $1; %}
%typemap(directorin) SWIGTYPE * %typemap(directorin) SWIGTYPE *
%{ $input = ($1_ltype)$1_name; %} %{ $input = ($1_ltype)$1; %}
%typemap(directorout) SWIGTYPE * %typemap(directorout) SWIGTYPE *
%{ $result = ($1_ltype)$input; %} %{ $result = ($1_ltype)$input; %}
@ -268,7 +268,7 @@
%{ *($&1_ltype)&$result = $1; %} %{ *($&1_ltype)&$result = $1; %}
%typemap(directorin) SWIGTYPE & %typemap(directorin) SWIGTYPE &
%{ $input = ($1_ltype)&$1_name; %} %{ $input = ($1_ltype)&$1; %}
%typemap(directorout) SWIGTYPE & %typemap(directorout) SWIGTYPE &
%{ *($&1_ltype)&$result = $input; %} %{ *($&1_ltype)&$result = $input; %}
@ -286,7 +286,7 @@
%{ *($&1_ltype)&$result = $1; %} %{ *($&1_ltype)&$result = $1; %}
%typemap(directorin) SWIGTYPE [] %typemap(directorin) SWIGTYPE []
%{ $input = *($1_ltype)&$1_name; %} %{ $input = *($1_ltype)&$1; %}
%typemap(directorout) SWIGTYPE [] %typemap(directorout) SWIGTYPE []
%{ *($&1_ltype)&$result = $input; %} %{ *($&1_ltype)&$result = $input; %}
@ -324,7 +324,7 @@
signed char *, signed char *&, signed char[ANY], signed char[], signed char *, signed char *&, signed char[ANY], signed char[],
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[] unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
%{ %{
$input = _swig_makegostring((char*)$1_name, $1_name ? strlen((char*)$1_name) : 0); $input = _swig_makegostring((char*)$1, $1 ? strlen((char*)$1) : 0);
%} %}
%typemap(directorout) %typemap(directorout)
@ -347,7 +347,7 @@
%{ $result = _swig_makegostring((char*)$1, (size_t)$2); %} %{ $result = _swig_makegostring((char*)$1, (size_t)$2); %}
%typemap(directorin) (char *STRING, size_t LENGTH) %typemap(directorin) (char *STRING, size_t LENGTH)
%{ $input = _swig_makegostring((char*)$1_name, $2_name); %} %{ $input = _swig_makegostring((char*)$1, $2); %}
%typemap(directorout) (char *STRING, size_t LENGTH) %typemap(directorout) (char *STRING, size_t LENGTH)
%{ %{
@ -369,7 +369,7 @@
%{ $result = $1; %} %{ $result = $1; %}
%typemap(directorin) enum SWIGTYPE %typemap(directorin) enum SWIGTYPE
%{ $input = ($1_ltype)$1_name; %} %{ $input = ($1_ltype)$1; %}
%typemap(directorout) enum SWIGTYPE %typemap(directorout) enum SWIGTYPE
%{ $result = ($1_ltype)$input; %} %{ $result = ($1_ltype)$input; %}
@ -402,7 +402,7 @@
#endif #endif
%typemap(directorin) SWIGTYPE %typemap(directorin) SWIGTYPE
%{ $input = ($&1_ltype)&$1_name; %} %{ $input = ($&1_ltype)&$1; %}
%typemap(directorout) SWIGTYPE %typemap(directorout) SWIGTYPE
%{ $result = *($&1_ltype)$input; %} %{ $result = *($&1_ltype)$input; %}

4
Lib/go/std_string.i
View file

@ -31,7 +31,7 @@ class string;
%{ $result = _swig_makegostring($1.data(), $1.length()); %} %{ $result = _swig_makegostring($1.data(), $1.length()); %}
%typemap(directorin) string %typemap(directorin) string
%{ $input = _swig_makegostring($1_name.data(), $1_name.length()); %} %{ $input = _swig_makegostring($1.data(), $1.length()); %}
%typemap(in) const string & %typemap(in) const string &
%{ %{
@ -50,6 +50,6 @@ class string;
%{ $result = _swig_makegostring((*$1).data(), (*$1).length()); %} %{ $result = _swig_makegostring((*$1).data(), (*$1).length()); %}
%typemap(directorin) const string & %typemap(directorin) const string &
%{ $input = _swig_makegostring($1_name.data(), $1_name.length()); %} %{ $input = _swig_makegostring($1.data(), $1.length()); %}
} }

2
Lib/java/enums.swg
View file

@ -20,7 +20,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1;"
%typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)" %typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)"
%typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()" %typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()"

2
Lib/java/enumsimple.swg
View file

@ -20,7 +20,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1;"
%typemap(javadirectorin) const enum SWIGTYPE & "$jniinput" %typemap(javadirectorin) const enum SWIGTYPE & "$jniinput"
%typemap(javadirectorout) const enum SWIGTYPE & "$javacall" %typemap(javadirectorout) const enum SWIGTYPE & "$javacall"

2
Lib/java/enumtypesafe.swg
View file

@ -19,7 +19,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(directorin, descriptor="L$packagepath/$*javaclassname;") const enum SWIGTYPE & "$input = (jint)$1;"
%typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)" %typemap(javadirectorin) const enum SWIGTYPE & "$*javaclassname.swigToEnum($jniinput)"
%typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()" %typemap(javadirectorout) const enum SWIGTYPE & "($javacall).swigValue()"

2
Lib/java/enumtypeunsafe.swg
View file

@ -20,7 +20,7 @@
%typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE & %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const enum SWIGTYPE &
%{ static $*1_ltype temp = ($*1_ltype)$input; %{ static $*1_ltype temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1_name;" %typemap(directorin, descriptor="I") const enum SWIGTYPE & "$input = (jint)$1;"
%typemap(javadirectorin) const enum SWIGTYPE & "$jniinput" %typemap(javadirectorin) const enum SWIGTYPE & "$jniinput"
%typemap(javadirectorout) const enum SWIGTYPE & "$javacall" %typemap(javadirectorout) const enum SWIGTYPE & "$javacall"

26
Lib/java/java.swg
View file

@ -469,19 +469,19 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
temp = ($*1_ltype)$input; temp = ($*1_ltype)$input;
$result = &temp; %} $result = &temp; %}
%typemap(directorin, descriptor="Z") const bool & "$input = (jboolean)$1_name;" %typemap(directorin, descriptor="Z") const bool & "$input = (jboolean)$1;"
%typemap(directorin, descriptor="C") const char & "$input = (jchar)$1_name;" %typemap(directorin, descriptor="C") const char & "$input = (jchar)$1;"
%typemap(directorin, descriptor="B") const signed char & "$input = (jbyte)$1_name;" %typemap(directorin, descriptor="B") const signed char & "$input = (jbyte)$1;"
%typemap(directorin, descriptor="S") const unsigned char & "$input = (jshort)$1_name;" %typemap(directorin, descriptor="S") const unsigned char & "$input = (jshort)$1;"
%typemap(directorin, descriptor="S") const short & "$input = (jshort)$1_name;" %typemap(directorin, descriptor="S") const short & "$input = (jshort)$1;"
%typemap(directorin, descriptor="I") const unsigned short & "$input = (jint)$1_name;" %typemap(directorin, descriptor="I") const unsigned short & "$input = (jint)$1;"
%typemap(directorin, descriptor="I") const int & "$input = (jint)$1_name;" %typemap(directorin, descriptor="I") const int & "$input = (jint)$1;"
%typemap(directorin, descriptor="J") const unsigned int & "$input = (jlong)$1_name;" %typemap(directorin, descriptor="J") const unsigned int & "$input = (jlong)$1;"
%typemap(directorin, descriptor="I") const long & "$input = (jint)$1_name;" %typemap(directorin, descriptor="I") const long & "$input = (jint)$1;"
%typemap(directorin, descriptor="J") const unsigned long & "$input = (jlong)$1_name;" %typemap(directorin, descriptor="J") const unsigned long & "$input = (jlong)$1;"
%typemap(directorin, descriptor="J") const long long & "$input = (jlong)$1_name;" %typemap(directorin, descriptor="J") const long long & "$input = (jlong)$1;"
%typemap(directorin, descriptor="F") const float & "$input = (jfloat)$1_name;" %typemap(directorin, descriptor="F") const float & "$input = (jfloat)$1;"
%typemap(directorin, descriptor="D") const double & "$input = (jdouble)$1_name;" %typemap(directorin, descriptor="D") const double & "$input = (jdouble)$1;"
%typemap(javadirectorin) const char & ($*1_ltype temp), %typemap(javadirectorin) const char & ($*1_ltype temp),
const signed char & ($*1_ltype temp), const signed char & ($*1_ltype temp),

2
Lib/ocaml/typemaps.i
View file

@ -165,7 +165,7 @@
swig_result = caml_list_append(swig_result,C_TO_MZ((long)*$1)); swig_result = caml_list_append(swig_result,C_TO_MZ((long)*$1));
} }
%typemap(directorin) C_NAME { %typemap(directorin) C_NAME {
args = caml_list_append(args,C_TO_MZ($1_name)); args = caml_list_append(args,C_TO_MZ($1));
} }
%enddef %enddef

10
Lib/php/php.swg
View file

@ -266,7 +266,7 @@
size_t, size_t,
enum SWIGTYPE enum SWIGTYPE
{ {
ZVAL_LONG($input,$1_name); ZVAL_LONG($input,$1);
} }
%typemap(out) bool %typemap(out) bool
@ -281,7 +281,7 @@
%typemap(directorin) bool %typemap(directorin) bool
{ {
ZVAL_BOOL($input,($1_name)?1:0); ZVAL_BOOL($input,($1)?1:0);
} }
%typemap(out) float, %typemap(out) float,
@ -299,7 +299,7 @@
%typemap(directorin) float, %typemap(directorin) float,
double double
{ {
ZVAL_DOUBLE($input,$1_name); ZVAL_DOUBLE($input,$1);
} }
%typemap(out) char %typemap(out) char
@ -347,7 +347,7 @@
SWIGTYPE [], SWIGTYPE [],
SWIGTYPE & SWIGTYPE &
%{ %{
SWIG_SetPointerZval($input, (void *)&$1_name, $1_descriptor, ($owner)|2); SWIG_SetPointerZval($input, (void *)&$1, $1_descriptor, ($owner)|2);
%} %}
%typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*) %typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
@ -390,7 +390,7 @@
%typemap(directorin) SWIGTYPE %typemap(directorin) SWIGTYPE
{ {
SWIG_SetPointerZval($input, SWIG_as_voidptr(&$1_name), $&1_descriptor, 2); SWIG_SetPointerZval($input, SWIG_as_voidptr(&$1), $&1_descriptor, 2);
} }
%typemap(out) void ""; %typemap(out) void "";

2
Lib/php/std_string.i
View file

@ -42,7 +42,7 @@ namespace std {
%} %}
%typemap(directorin) string, const string& %{ %typemap(directorin) string, const string& %{
ZVAL_STRINGL($input, const_cast<char*>($1_name.data()), $1_name.size(), 1); ZVAL_STRINGL($input, const_cast<char*>($1.data()), $1.size(), 1);
%} %}
%typemap(out) const string & %{ %typemap(out) const string & %{

4
Lib/pike/std_string.i
View file

@ -36,9 +36,9 @@ namespace std {
%typemap(out, pikedesc="tStr") const string & "push_text($1->c_str());"; %typemap(out, pikedesc="tStr") const string & "push_text($1->c_str());";
%typemap(directorin) string, const string &, string & "$1_name.c_str()"; %typemap(directorin) string, const string &, string & "$1.c_str()";
%typemap(directorin) string *, const string * "$1_name->c_str()"; %typemap(directorin) string *, const string * "$1->c_str()";
%typemap(directorout) string { %typemap(directorout) string {
if ($input.type == T_STRING) if ($input.type == T_STRING)

8
Lib/typemaps/strings.swg
View file

@ -159,7 +159,7 @@
%typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtr) %typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtr)
Char *, Char const*, Char *const, Char const *const, Char *, Char const*, Char *const, Char const *const,
Char const *&, Char *const &, Char const *const & { Char const *&, Char *const &, Char const *const & {
$input = SWIG_FromCharPtr((const Char *)$1_name); $input = SWIG_FromCharPtr((const Char *)$1);
} }
@ -326,9 +326,9 @@
{ {
size_t size = $1_dim0; size_t size = $1_dim0;
%#ifndef SWIG_PRESERVE_CARRAY_SIZE %#ifndef SWIG_PRESERVE_CARRAY_SIZE
while (size && ($1_name[size - 1] == '\0')) --size; while (size && ($1[size - 1] == '\0')) --size;
%#endif %#endif
$input = SWIG_FromCharPtrAndSize($1_name, size); $input = SWIG_FromCharPtrAndSize($1, size);
} }
/* directorout */ /* directorout */
@ -389,7 +389,7 @@
%typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtrAndSize) %typemap(directorin,noblock=1,fragment=#SWIG_FromCharPtrAndSize)
Char FIXSIZE[ANY], const Char FIXSIZE[ANY] Char FIXSIZE[ANY], const Char FIXSIZE[ANY]
{ {
$input = SWIG_FromCharPtrAndSize($1_name, $1_dim0); $input = SWIG_FromCharPtrAndSize($1, $1_dim0);
} }
#endif /* SWIG_DIRECTOR_TYPEMAPS */ #endif /* SWIG_DIRECTOR_TYPEMAPS */

2
Lib/typemaps/swigobject.swg
View file

@ -30,7 +30,7 @@
#if defined(SWIG_DIRECTOR_TYPEMAPS) #if defined(SWIG_DIRECTOR_TYPEMAPS)
%typemap(directorin) SWIG_Object "$input = $1_name;"; %typemap(directorin) SWIG_Object "$input = $1;";
%typemap(directorout) SWIG_Object "$result = $input;"; %typemap(directorout) SWIG_Object "$result = $input;";
#endif /* SWIG_DIRECTOR_TYPEMAPS */ #endif /* SWIG_DIRECTOR_TYPEMAPS */

10
Lib/typemaps/swigtype.swg
View file

@ -344,15 +344,15 @@
/* directorin */ /* directorin */
%typemap(directorin,noblock=1) SWIGTYPE *, SWIGTYPE *const& { %typemap(directorin,noblock=1) SWIGTYPE *, SWIGTYPE *const& {
$input = SWIG_NewPointerObj(%as_voidptr($1_name), $descriptor, %newpointer_flags); $input = SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags);
} }
%typemap(directorin,noblock=1) SWIGTYPE { %typemap(directorin,noblock=1) SWIGTYPE {
$input = SWIG_NewPointerObj(%as_voidptr(&$1_name), $&descriptor, %newpointer_flags); $input = SWIG_NewPointerObj(%as_voidptr(&$1), $&descriptor, %newpointer_flags);
} }
%typemap(directorin,noblock=1) SWIGTYPE & { %typemap(directorin,noblock=1) SWIGTYPE & {
$input = SWIG_NewPointerObj(%as_voidptr(&$1_name), $descriptor, %newpointer_flags); $input = SWIG_NewPointerObj(%as_voidptr(&$1), $descriptor, %newpointer_flags);
} }
/* directorout */ /* directorout */
@ -480,7 +480,7 @@
/* directorin */ /* directorin */
%typemap(directorin,noblock=1) SWIGTYPE (CLASS::*) { %typemap(directorin,noblock=1) SWIGTYPE (CLASS::*) {
$input = SWIG_NewMemberObj(%as_voidptr(&$1_name), sizeof($type), $descriptor); $input = SWIG_NewMemberObj(%as_voidptr(&$1), sizeof($type), $descriptor);
} }
/* directorout */ /* directorout */
@ -540,7 +540,7 @@
/* directorin */ /* directorin */
%typemap(directorin,noblock=1) SWIGTYPE ((*)(ANY)) { %typemap(directorin,noblock=1) SWIGTYPE ((*)(ANY)) {
$input = SWIG_NewFunctionPtrObj((void*)($1_name), $descriptor); $input = SWIG_NewFunctionPtrObj((void*)($1), $descriptor);
} }
/* directorout */ /* directorout */

4
Lib/typemaps/valtypes.swg
View file

@ -97,10 +97,10 @@
%define %value_directorin_typemap(from_meth,frag,Type...) %define %value_directorin_typemap(from_meth,frag,Type...)
%typemap(directorin,noblock=1,fragment=frag) Type *DIRECTORIN { %typemap(directorin,noblock=1,fragment=frag) Type *DIRECTORIN {
$input = from_meth(%static_cast(*$1_name,Type)); $input = from_meth(%static_cast(*$1,Type));
} }
%typemap(directorin,noblock=1,fragment=frag) Type, const Type& { %typemap(directorin,noblock=1,fragment=frag) Type, const Type& {
$input = from_meth(%static_cast($1_name,Type)); $input = from_meth(%static_cast($1,Type));
} }
%enddef %enddef

2
Lib/typemaps/void.swg
View file

@ -56,7 +56,7 @@
%typemap(directorin,noblock=1) void *, void const*, void *const, void const *const, %typemap(directorin,noblock=1) void *, void const*, void *const, void const *const,
void const *&, void *const &, void const *const & { void const *&, void *const &, void const *const & {
$input = SWIG_NewPointerObj(%as_voidptr($1_name), $descriptor, %newpointer_flags); $input = SWIG_NewPointerObj(%as_voidptr($1), $descriptor, %newpointer_flags);
} }
/* directorout */ /* directorout */

2
Source/Modules/ocaml.cxx
View file

@ -1471,6 +1471,8 @@ public:
/* attach typemaps to arguments (C/C++ -> Ocaml) */ /* attach typemaps to arguments (C/C++ -> Ocaml) */
String *arglist = NewString(""); String *arglist = NewString("");
Swig_director_parms_fixup(l);
Swig_typemap_attach_parms("in", l, 0); Swig_typemap_attach_parms("in", l, 0);
Swig_typemap_attach_parms("directorin", l, 0); Swig_typemap_attach_parms("directorin", l, 0);
Swig_typemap_attach_parms("directorargout", l, w); Swig_typemap_attach_parms("directorargout", l, w);