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

Fix typemaps for bool

Browse source 
The existing typemaps didn't make much sense, simplify (there doesn't seem to
be any point in using $1_basetype when dealing with "bool") them and treat
"const bool&" as "bool", not as pointer, as this is much more convenient in C.

This also allows another unit test to pass.
This commit is contained in:
Vadim Zeitlin 2016-04-26 14:41:55 +02:00
commit 29563ec98e
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/c/Makefile.in
View file

@ -91,7 +91,6 @@ FAILING_CPP_TESTS := \
struct_initialization_cpp \
template_basic \
template_default \
template_default_class_parms_typedef \
template_enum \
template_explicit \
template_typedef_fnc \

10
Lib/c/c.swg
View file

@ -123,9 +123,8 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype);
%typemap(ctype) enum SWIGTYPE "int"
%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
%typemap(ctype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
%typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype"
%typemap(ctype, fragment="stdbool_inc") const bool & "const $1_ltype"
%typemap(ctype, fragment="stdbool_inc") bool, const bool, const bool & "bool"
%typemap(ctype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *"
// Typemaps for assigning wrapper parameters to local variables
same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
@ -280,9 +279,8 @@ same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
%typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *"
%typemap(cppouttype) SWIGTYPE (CLASS::*) "$1_ltype"
%typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype"
%typemap(cppouttype, fragment="stdbool_inc") bool & "$1_basetype*"
%typemap(cppouttype, fragment="stdbool_inc") const bool & "$1_basetype const *"
%typemap(cppouttype, fragment="stdbool_inc") bool, const bool, const bool & "bool"
%typemap(cppouttype, fragment="stdbool_inc") bool *, const bool *, bool & "bool *"
#ifdef SWIG_CPPMODE