Enhance SWIGTYPE "out" typemaps to use std::move when copying
objects, thereby making use of move semantics when wrapping a function returning
by value if the returned type supports move semantics.
Wrapping functions that return move only types 'by value' now work out the box
without having to provide custom typemaps.
The implementation removed all casts in the "out" typemaps to allow the compiler to
appropriately choose calling a move constructor, where possible, otherwise a copy
constructor. The implementation alsoand required modifying SwigValueWrapper to
change a cast operator from:
SwigValueWrapper::operator T&() const;
to
#if __cplusplus >=201103L
SwigValueWrapper::operator T&&() const;
#else
SwigValueWrapper::operator T&() const;
#endif
This is not backwards compatible for C++11 and later when using the valuewrapper feature
if a cast is explicitly being made in user supplied "out" typemaps. Suggested change
in custom "out" typemaps for C++11 and later code:
1. Try remove the cast altogether to let the compiler use an appropriate implicit cast.
2. Change the cast, for example, from static_cast<X &> to static_cast<X &&>, using the
__cplusplus macro if all versions of C++ need to be supported.
Issue #999
Closes #1044
More about the commit:
Added some missing "varout" typemaps for Ocaml which was falling back to
use "out" typemaps as they were missing.
Ruby std::set fix for SwigValueWrapper C++11 changes.
319 lines
8.6 KiB
Text
319 lines
8.6 KiB
Text
/* -----------------------------------------------------------------------------
|
|
* ocaml.swg
|
|
*
|
|
* The Ocaml module handles all types uniformly via typemaps. Here
|
|
* are the definitions.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
/* Pointers */
|
|
|
|
%typemap(in) void ""
|
|
|
|
%typemap(out) void "$result = Val_int(0);"
|
|
|
|
%typemap(in) void * {
|
|
$1 = caml_ptr_val($input,$descriptor);
|
|
}
|
|
|
|
%typemap(varin) void * {
|
|
$1 = ($ltype)caml_ptr_val($input,$descriptor);
|
|
}
|
|
|
|
%typemap(out) void * {
|
|
$result = caml_val_ptr($1,$descriptor);
|
|
}
|
|
|
|
%typemap(varout) void * {
|
|
$result = caml_val_ptr($1,$descriptor);
|
|
}
|
|
|
|
%typemap(in) char *& (char *temp) {
|
|
temp = (char*)caml_val_ptr($1,$descriptor);
|
|
$1 = &temp;
|
|
}
|
|
|
|
%typemap(argout) char *& {
|
|
swig_result = caml_list_append(swig_result,caml_val_string_len(*$1, strlen(*$1)));
|
|
}
|
|
|
|
%typemap(in) SWIGTYPE & {
|
|
$1 = ($ltype) caml_ptr_val($input,$1_descriptor);
|
|
}
|
|
|
|
%typemap(in) SWIGTYPE && {
|
|
$1 = ($ltype) caml_ptr_val($input,$1_descriptor);
|
|
}
|
|
|
|
%typemap(varin) SWIGTYPE & {
|
|
$1 = *(($ltype) caml_ptr_val($input,$1_descriptor));
|
|
}
|
|
|
|
%typemap(varin) SWIGTYPE && {
|
|
$1 = *(($ltype) caml_ptr_val($input,$1_descriptor));
|
|
}
|
|
|
|
%typemap(varout) SWIGTYPE &, SWIGTYPE && {
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)&$1, $1_descriptor);
|
|
}
|
|
|
|
%typemap(out) SWIGTYPE &, SWIGTYPE && {
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)$1, $1_descriptor);
|
|
}
|
|
|
|
#if 0
|
|
%typemap(argout) SWIGTYPE & {
|
|
const CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
|
|
if( fromval ) {
|
|
swig_result =
|
|
caml_list_append(swig_result,
|
|
caml_callback(*fromval,caml_val_ptr((void *) $1,
|
|
$1_descriptor)));
|
|
} else {
|
|
swig_result =
|
|
caml_list_append(swig_result,
|
|
caml_val_ptr ((void *) $1,$1_descriptor));
|
|
}
|
|
}
|
|
%typemap(argout) SWIGTYPE && {
|
|
const CAML_VALUE *fromval = caml_named_value("create_$ntype_from_ptr");
|
|
if( fromval ) {
|
|
swig_result =
|
|
caml_list_append(swig_result,
|
|
caml_callback(*fromval,caml_val_ptr((void *) $1,
|
|
$1_descriptor)));
|
|
} else {
|
|
swig_result =
|
|
caml_list_append(swig_result,
|
|
caml_val_ptr ((void *) $1,$1_descriptor));
|
|
}
|
|
}
|
|
#endif
|
|
|
|
%typemap(in) SWIGTYPE {
|
|
$1 = *(($&1_ltype) caml_ptr_val($input,$&1_descriptor)) ;
|
|
}
|
|
|
|
%typemap(varout) SWIGTYPE {
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)&$1, $&1_descriptor);
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
|
|
%typemap(out) SWIGTYPE {
|
|
$&1_ltype temp = new $1_ltype($1);
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)temp, $&1_descriptor);
|
|
}
|
|
|
|
#else
|
|
|
|
%typemap(out) SWIGTYPE {
|
|
void *temp = calloc(1,sizeof($ltype));
|
|
memmove(temp, &$1, sizeof($1_type));
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", temp, $&1_descriptor);
|
|
}
|
|
|
|
#endif
|
|
|
|
%typemap(varout) SWIGTYPE * {
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)$1, $1_descriptor);
|
|
}
|
|
|
|
%typemap(directorin) SWIGTYPE {
|
|
$<ype temp = new $ltype((const $ltype &)$1);
|
|
swig_result = SWIG_Ocaml_ptr_to_val("create_$ltype_from_ptr", (void *)temp, $&1_descriptor);
|
|
args = caml_list_append(args, swig_result);
|
|
}
|
|
|
|
%typemap(directorin) SWIGTYPE *, SWIGTYPE [], SWIGTYPE &, SWIGTYPE && {
|
|
swig_result = SWIG_Ocaml_ptr_to_val("create_$ltype_from_ptr", (void *)&$1, $&1_descriptor);
|
|
args = caml_list_append(args, swig_result);
|
|
}
|
|
|
|
/* The SIMPLE_MAP macro below defines the whole set of typemaps needed
|
|
for simple types. */
|
|
|
|
%define SIMPLE_MAP(C_NAME, C_TO_OCAML, OCAML_TO_C)
|
|
/* In */
|
|
%typemap(in) C_NAME {
|
|
$1 = OCAML_TO_C($input);
|
|
}
|
|
%typemap(varin) C_NAME {
|
|
$1 = OCAML_TO_C($input);
|
|
}
|
|
%typemap(in) const C_NAME & ($*1_ltype temp) {
|
|
temp = ($*1_ltype) OCAML_TO_C($input);
|
|
$1 = &temp;
|
|
}
|
|
%typemap(varin) const C_NAME & {
|
|
$1 = OCAML_TO_C($input);
|
|
}
|
|
%typemap(directorout) C_NAME {
|
|
$1 = OCAML_TO_C($input);
|
|
}
|
|
/* Out */
|
|
%typemap(out) C_NAME {
|
|
$result = C_TO_OCAML($1);
|
|
}
|
|
%typemap(varout) C_NAME {
|
|
$result = C_TO_OCAML($1);
|
|
}
|
|
%typemap(varout) const C_NAME & {
|
|
$result = C_TO_OCAML($1);
|
|
}
|
|
%typemap(out) const C_NAME & {
|
|
$result = C_TO_OCAML(*$1);
|
|
}
|
|
%typemap(directorin) C_NAME {
|
|
args = caml_list_append(args, C_TO_OCAML($1));
|
|
}
|
|
%enddef
|
|
|
|
SIMPLE_MAP(bool, caml_val_bool, caml_long_val);
|
|
SIMPLE_MAP(char, caml_val_char, caml_long_val);
|
|
SIMPLE_MAP(signed char, caml_val_char, caml_long_val);
|
|
SIMPLE_MAP(unsigned char, caml_val_uchar, caml_long_val);
|
|
SIMPLE_MAP(int, caml_val_int, caml_long_val);
|
|
SIMPLE_MAP(short, caml_val_short, caml_long_val);
|
|
SIMPLE_MAP(wchar_t, caml_val_short, caml_long_val);
|
|
SIMPLE_MAP(long, caml_val_long, caml_long_val);
|
|
SIMPLE_MAP(ptrdiff_t, caml_val_int, caml_long_val);
|
|
SIMPLE_MAP(unsigned int, caml_val_uint, caml_long_val);
|
|
SIMPLE_MAP(unsigned short, caml_val_ushort, caml_long_val);
|
|
SIMPLE_MAP(unsigned long, caml_val_ulong, caml_long_val);
|
|
SIMPLE_MAP(size_t, caml_val_int, caml_long_val);
|
|
SIMPLE_MAP(float, caml_val_float, caml_double_val);
|
|
SIMPLE_MAP(double, caml_val_double, caml_double_val);
|
|
SIMPLE_MAP(long long,caml_val_ulong,caml_long_val);
|
|
SIMPLE_MAP(unsigned long long,caml_val_ulong,caml_long_val);
|
|
|
|
/* Void */
|
|
|
|
%typemap(out) void "$result = Val_unit;";
|
|
|
|
/* Pass through value */
|
|
|
|
%typemap (in) CAML_VALUE "$1=$input;";
|
|
%typemap (out) CAML_VALUE "$result=$1;";
|
|
|
|
#if 0
|
|
%include <carray.i>
|
|
#endif
|
|
|
|
/* Handle char arrays as strings */
|
|
|
|
%define %char_ptr_in(how)
|
|
%typemap(how) char *, signed char *, unsigned char * {
|
|
$1 = ($ltype)caml_string_val($input);
|
|
}
|
|
/* Again work around the empty array bound bug */
|
|
%typemap(how) char [ANY], signed char [ANY], unsigned char [ANY] {
|
|
char *temp = caml_string_val($input);
|
|
strcpy((char *)$1,temp);
|
|
}
|
|
%enddef
|
|
|
|
%char_ptr_in(in);
|
|
%char_ptr_in(varin);
|
|
%char_ptr_in(directorout);
|
|
|
|
%define %char_ptr_out(how)
|
|
%typemap(how)
|
|
char *, signed char *, unsigned char *,
|
|
const char *, const signed char *, const unsigned char * {
|
|
$result = caml_val_string((char *)$1);
|
|
}
|
|
/* I'd like to use the length here but can't because it might be empty */
|
|
%typemap(how)
|
|
char [ANY], signed char [ANY], unsigned char [ANY],
|
|
const char [ANY], const signed char [ANY], const unsigned char [ANY] {
|
|
$result = caml_val_string((char *)$1);
|
|
}
|
|
%enddef
|
|
|
|
%char_ptr_out(out);
|
|
%char_ptr_out(varout);
|
|
%char_ptr_out(directorin);
|
|
|
|
%define %swigtype_ptr_in(how)
|
|
%typemap(how) SWIGTYPE * {
|
|
$1 = ($ltype)caml_ptr_val($input,$1_descriptor);
|
|
}
|
|
%typemap(how) SWIGTYPE (CLASS::*) {
|
|
void *v = caml_ptr_val($input,$1_descriptor);
|
|
memcpy(& $1, &v, sizeof(v));
|
|
}
|
|
%enddef
|
|
|
|
%typemap(out) SWIGTYPE * {
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)$1, $1_descriptor);
|
|
}
|
|
|
|
%define %swigtype_ptr_out(how)
|
|
%typemap(how) SWIGTYPE (CLASS::*) {
|
|
void *v;
|
|
memcpy(&v,& $1, sizeof(void *));
|
|
$result = caml_val_ptr (v,$1_descriptor);
|
|
}
|
|
%enddef
|
|
|
|
%swigtype_ptr_in(in);
|
|
%swigtype_ptr_in(varin);
|
|
%swigtype_ptr_in(directorout);
|
|
%swigtype_ptr_out(out);
|
|
%swigtype_ptr_out(varout);
|
|
%swigtype_ptr_out(directorin);
|
|
|
|
%define %swigtype_array_fail(how,msg)
|
|
%typemap(how) SWIGTYPE [] {
|
|
caml_failwith(msg);
|
|
}
|
|
%enddef
|
|
|
|
%swigtype_array_fail(in,"Array arguments for arbitrary types need a typemap");
|
|
%swigtype_array_fail(varin,"Assignment to global arrays for arbitrary types need a typemap");
|
|
%swigtype_array_fail(out,"Array arguments for arbitrary types need a typemap");
|
|
%swigtype_array_fail(varout,"Array variables need a typemap");
|
|
%swigtype_array_fail(directorin,"Array results with arbitrary types need a typemap");
|
|
%swigtype_array_fail(directorout,"Array arguments with arbitrary types need a typemap");
|
|
|
|
/* C++ References */
|
|
|
|
/* Enums */
|
|
%define %swig_enum_in(how)
|
|
%typemap(how) enum SWIGTYPE {
|
|
$1 = ($type)caml_long_val_full($input,"$type_marker");
|
|
}
|
|
%enddef
|
|
|
|
%define %swig_enum_out(how)
|
|
%typemap(how) enum SWIGTYPE {
|
|
$result = caml_callback2(*caml_named_value(SWIG_MODULE "_int_to_enum"),*caml_named_value("$type_marker"),Val_int((int)$1));
|
|
}
|
|
%enddef
|
|
|
|
%swig_enum_in(in)
|
|
%swig_enum_in(varin)
|
|
%swig_enum_in(directorout)
|
|
%swig_enum_out(out)
|
|
%swig_enum_out(varout)
|
|
%swig_enum_out(directorin)
|
|
|
|
%typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) {
|
|
$1 = ($1_ltype) caml_string_val($input);
|
|
$2 = ($2_ltype) caml_string_len($input);
|
|
}
|
|
|
|
%typemap(out) SWIGTYPE *DYNAMIC, SWIGTYPE &DYNAMIC {
|
|
swig_type_info *ty = SWIG_TypeDynamicCast($1_descriptor, (void **)&$1);
|
|
$result = SWIG_Ocaml_ptr_to_val("create_$ntype_from_ptr", (void *)$1, ty);
|
|
}
|
|
|
|
/* Array reference typemaps */
|
|
%apply SWIGTYPE & { SWIGTYPE ((&)[ANY]) }
|
|
%apply SWIGTYPE && { SWIGTYPE ((&)[ANY]) }
|
|
|
|
/* const pointers */
|
|
%apply SWIGTYPE * { SWIGTYPE *const }
|
|
%apply SWIGTYPE (CLASS::*) { SWIGTYPE (CLASS::*const) }
|
|
%apply SWIGTYPE & { SWIGTYPE (CLASS::*const&) }
|
|
|