From: <le...@us...> - 2012-05-28 22:56:43
|
Revision: 13134 http://swig.svn.sourceforge.net/swig/?rev=13134&view=rev Author: leiflm Date: 2012-05-28 22:56:37 +0000 (Mon, 28 May 2012) Log Message: ----------- Fix return type assignment Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-05-28 19:47:03 UTC (rev 13133) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-05-28 22:56:37 UTC (rev 13134) @@ -330,10 +330,10 @@ else _temp[i] = (SwigObj*) 0; } - $result = _temp; + $result = ($1_ltype) _temp; } else - $result = (SwigObj**) 0; + $result = ($1_ltype) 0; } // typemaps for 'cppresult' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-06-19 17:18:58
|
Revision: 13187 http://swig.svn.sourceforge.net/swig/?rev=13187&view=rev Author: leiflm Date: 2012-06-19 17:18:52 +0000 (Tue, 19 Jun 2012) Log Message: ----------- Repair typemap for proxy function params. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-06-19 17:18:39 UTC (rev 13186) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-06-19 17:18:52 UTC (rev 13187) @@ -52,7 +52,7 @@ %typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" %typemap(proxy) SWIGTYPE "$1_ltype *" -%typemap(proxy) SWIGTYPE * "$1_ltype *" +%typemap(proxy) SWIGTYPE * "$1_ltype " %typemap(proxy) SWIGTYPE & "$1_ltype *" %typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-07-05 00:22:50
|
Revision: 13257 http://swig.svn.sourceforge.net/swig/?rev=13257&view=rev Author: leiflm Date: 2012-07-05 00:22:44 +0000 (Thu, 05 Jul 2012) Log Message: ----------- Repair object references in proxy functions Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-07-04 22:56:29 UTC (rev 13256) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-07-05 00:22:44 UTC (rev 13257) @@ -53,7 +53,7 @@ %typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" %typemap(proxy) SWIGTYPE "$1_ltype *" %typemap(proxy) SWIGTYPE * "$1_ltype " -%typemap(proxy) SWIGTYPE & "$1_ltype *" +%typemap(proxy) SWIGTYPE & "$1_ltype" %typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $1_ltype ***" %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" %typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" @@ -439,7 +439,7 @@ // objects %typemap(proxycouttype) SWIGTYPE "$1_ltype *" %typemap(proxycouttype) SWIGTYPE * "/*aaaaaa*/$1_ltype" -%typemap(proxycouttype) SWIGTYPE & "$1_ltype *" +%typemap(proxycouttype) SWIGTYPE & "$1_ltype" %typemap(proxycouttype) SWIGTYPE *& "$1_ltype **" %typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-07-05 00:23:05
|
Revision: 13258 http://swig.svn.sourceforge.net/swig/?rev=13258&view=rev Author: leiflm Date: 2012-07-05 00:22:59 +0000 (Thu, 05 Jul 2012) Log Message: ----------- Fix fptr cast of wrapper parameter within proxy function Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-07-05 00:22:44 UTC (rev 13257) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-07-05 00:22:59 UTC (rev 13258) @@ -135,7 +135,7 @@ %typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" %typemap(wrap_call) enum SWIGTYPE "" %typemap(wrap_call) enum SWIGTYPE & "" -%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" +%typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "(SWIG_CPP_FP)" %typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" %typemap(wrap_call, fragment="stdbool_inc") bool & "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-07-09 23:29:17
|
Revision: 13311 http://swig.svn.sourceforge.net/swig/?rev=13311&view=rev Author: leiflm Date: 2012-07-09 23:29:11 +0000 (Mon, 09 Jul 2012) Log Message: ----------- Fix enum pointer typemaps Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-07-09 22:35:19 UTC (rev 13310) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-07-09 23:29:11 UTC (rev 13311) @@ -58,7 +58,7 @@ %typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $1_ltype **" %typemap(proxy) SWIGTYPE *& "/* *& */ $1_ltype **" %typemap(proxy) enum SWIGTYPE "int" -%typemap(proxy) enum SWIGTYPE & "int *" +%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(proxy, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -96,7 +96,7 @@ %typemap(ctype) SWIGTYPE *[ANY] "/*ooooh*/ SwigObj **" %typemap(ctype) SWIGTYPE *& "/* *& */ SwigObj **" %typemap(ctype) enum SWIGTYPE "int" -%typemap(ctype) enum SWIGTYPE & "int *" +%typemap(ctype) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(ctype, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" %typemap(ctype, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -134,7 +134,7 @@ %typemap(wrap_call) SWIGTYPE *[ANY] "/*ooooh*/ (SwigObj **)" %typemap(wrap_call) SWIGTYPE *& "/* *& */ (SwigObj **)" %typemap(wrap_call) enum SWIGTYPE "" -%typemap(wrap_call) enum SWIGTYPE & "" +%typemap(wrap_call) enum SWIGTYPE &, enum SWIGTYPE * "" %typemap(wrap_call, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "(SWIG_CPP_FP)" %typemap(wrap_call, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" @@ -164,7 +164,7 @@ %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" %typemap(in) enum SWIGTYPE "$1 = ($1_ltype) $input;" -%typemap(in) enum SWIGTYPE & "$1 = ($1_ltype) $input;" +%typemap(in) enum SWIGTYPE &,enum SWIGTYPE * "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE [] "$1 = ($1_ltype) $input;" %typemap(in) SWIGTYPE ((&)[ANY]) "$1 = ($1_ltype) $input;" @@ -548,8 +548,7 @@ %typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype" %typemap(cppouttype) SWIGTYPE ** "/*SWIGTYPE ** */ $1_basetype **" %typemap(cppouttype, retobj="1") enum SWIGTYPE "int" -%typemap(cppouttype) enum SWIGTYPE * "int *" -%typemap(cppouttype) enum SWIGTYPE & "int *" +%typemap(cppouttype) enum SWIGTYPE &, enum SWIGTYPE * "int *" %typemap(cppouttype, fragment="fptr_decl") SWIGTYPE (CLASS::*) "$1_ltype" %typemap(cppouttype, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-07-30 10:47:43
|
Revision: 13431 http://swig.svn.sourceforge.net/swig/?rev=13431&view=rev Author: leiflm Date: 2012-07-30 10:47:37 +0000 (Mon, 30 Jul 2012) Log Message: ----------- Fix unnecessary/wrong casts within proxy->wrapper call Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-07-30 08:09:14 UTC (rev 13430) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-07-30 10:47:37 UTC (rev 13431) @@ -109,14 +109,14 @@ %typemap(wrap_call) void *, short *, int *, long *, long long *, char *, float *, double * "" %typemap(wrap_call) void **, short **, int **, long **, long long **, char **, float **, double ** "" %typemap(wrap_call) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "" -%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" +%typemap(wrap_call) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "" %typemap(wrap_call) short &, int &, long &, long long &, char &, float &, double & "" %typemap(wrap_call) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "" %typemap(wrap_call) const short, const int, const long, const long long, const char, const float, const double "" %typemap(wrap_call) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "" -%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" +%typemap(wrap_call) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "" %typemap(wrap_call) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "" -%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" +%typemap(wrap_call) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "" %typemap(wrap_call) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "" %typemap(wrap_call) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& " **" %typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-09 20:02:54
|
Revision: 13578 http://swig.svn.sourceforge.net/swig/?rev=13578&view=rev Author: leiflm Date: 2012-08-09 20:02:47 +0000 (Thu, 09 Aug 2012) Log Message: ----------- Type lookup of $1_ltype fails for templates, so use types directly. Add size_t as type. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-09 19:06:58 UTC (rev 13577) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-09 20:02:47 UTC (rev 13578) @@ -28,43 +28,119 @@ %fragment("stdbool_inc", "proxy_header") {#include <stdbool.h>} // typemaps for proxy function parameters -%typemap(proxy) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(proxy) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" -%typemap(proxy) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" -%typemap(proxy) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" -%typemap(proxy) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" -%typemap(proxy) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" -%typemap(proxy) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" -%typemap(proxy) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" -%typemap(proxy) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(proxy) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(proxy) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" -%typemap(proxy) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" -%typemap(proxy) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" -%typemap(proxy) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(proxy) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(proxy) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" -%typemap(proxy) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" -// special cases of array passing - does not intended to be used for objects -%typemap(proxy) SWIGTYPE [] "$1_ltype" -%typemap(proxy) SWIGTYPE ((&)[ANY]) "$1_basetype **" +// void +%typemap(proxy) void "void" +%typemap(proxy) void*, const void* "void *" -%typemap(proxy) void [ANY][ANY], short [ANY][ANY], int [ANY][ANY], long [ANY][ANY], char [ANY][ANY], float [ANY][ANY], double [ANY][ANY] "$1_ltype" -%typemap(proxy) SWIGTYPE "$resolved_type*" -%typemap(proxy) SWIGTYPE * "$resolved_type*" -%typemap(proxy) SWIGTYPE & "$resolved_type*" -%typemap(proxy) SWIGTYPE [ANY][ANY], SWIGTYPE ** "/* whoa */ $resolved_type ***" -%typemap(proxy) SWIGTYPE *[ANY] "/*ooooh*/ $resolved_type **" -%typemap(proxy) SWIGTYPE *& "/* *& */ $resolved_type **" -%typemap(proxy) enum SWIGTYPE "int" -%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" -%typemap(proxy, fragment="fptr_decl", fragment="fptr_decl_proxy") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" +// short +%typemap(proxy) short, const short "short" +%typemap(proxy) short*, short&, short[ANY], short[] "short *" +%typemap(proxy) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(proxy) unsigned short "unsigned short" +%typemap(proxy) const unsigned short "const unsigned short" +%typemap(proxy) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(proxy) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(proxy) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -%typemap(proxy, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool *, bool * [ANY] "$1_type" -%typemap(proxy, fragment="stdbool_inc") bool & "$1_ltype" -%typemap(proxy, fragment="stdbool_inc") const bool & "$1_ltype const" +// int +%typemap(proxy) int, const int "int" +%typemap(proxy) int*, int&, int[ANY], int[] "int *" +%typemap(proxy) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(proxy) unsigned int "unsigned int" +%typemap(proxy) const unsigned int "unsigned int" +%typemap(proxy) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(proxy) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(proxy) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// long +%typemap(proxy) long, const long "long" +%typemap(proxy) long*, long&, long[ANY], long[] "long *" +%typemap(proxy) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(proxy) unsigned long "unsigned long" +%typemap(proxy) const unsigned long "const unsigned long" +%typemap(proxy) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(proxy) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(proxy) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(proxy) long long, const long long "long long" +%typemap(proxy) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(proxy) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(proxy) unsigned long long "unsigned long long" +%typemap(proxy) const unsigned long long "const unsigned long long" +%typemap(proxy) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(proxy) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(proxy) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(proxy) char, const char "char" +%typemap(proxy) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(proxy) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(proxy) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(proxy) signed char "signed char" +%typemap(proxy) const signed char "const signed char" +%typemap(proxy) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(proxy) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(proxy) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(proxy) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(proxy) unsigned char "unsigned char" +%typemap(proxy) const unsigned char "const unsigned char" +%typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(proxy) float, const float "float" +%typemap(proxy) float*, float&, float[ANY], float[] "float *" +%typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(proxy) double, const double "double" +%typemap(proxy) double*, double&, double[ANY], double[] "double *" +%typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **" + +// size_t +%typemap(proxy) size_t, const size_t "size_t" +%typemap(proxy) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + +// objects +%typemap(proxy) SWIGTYPE "$&resolved_type*" +%typemap(proxy) SWIGTYPE * "$resolved_type*" +%typemap(proxy) SWIGTYPE & "$resolved_type*" +%typemap(proxy) SWIGTYPE *& "$resolved_type**" +%typemap(proxy) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" +%typemap(proxy) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" +%typemap(proxy) SWIGTYPE ** "/*SWIGTYPE ** */ $1_ltype **" +%typemap(proxy) enum SWIGTYPE "int" +%typemap(proxy) enum SWIGTYPE &, enum SWIGTYPE * "int *" +%typemap(proxy, fragment="fptr_decl") SWIGTYPE (CLASS::*) "SWIG_CPP_FP" + +%typemap(proxy, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$1_ltype" +%typemap(proxy, fragment="stdbool_inc") bool & "$1_basetype*" +%typemap(proxy, fragment="stdbool_inc") const bool & "$1_basetype const *" + // typemaps for function parameters %typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" %typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" @@ -84,6 +160,13 @@ %typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// size_t +%typemap(ctype) size_t, const size_t "size_t" +%typemap(ctype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **" @@ -122,6 +205,13 @@ %typemap(wrap_call) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ " %typemap(wrap_call) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ " +// size_t +%typemap(wrap_call) size_t, const size_t "" +%typemap(wrap_call) size_t*, size_t&, size_t[ANY], size_t[] "" +%typemap(wrap_call) const size_t&, const size_t*, const size_t[ANY], const size_t[] "" +%typemap(wrap_call) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "" +%typemap(wrap_call) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "" + // special cases of array passing - does not intended to be used for objects %typemap(wrap_call) SWIGTYPE [] "" %typemap(wrap_call) SWIGTYPE ((&)[ANY]) " **" @@ -159,6 +249,13 @@ %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" +// size_t +%typemap(in) size_t, const size_t "$1 = (size_t) $input;" +%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$input = (size_t *) $input;" +%typemap(in) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$1 = (const size_t *) &$input;" +%typemap(in) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$1 = (size_t **) $input;" +%typemap(in) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$1 = (const size_t **) $input;" + %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" %typemap(in, fragment="stdbool_inc") const bool &, const bool * "$1 = ($1_basetype *) $input;" @@ -329,6 +426,13 @@ %typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// size_t +%typemap(couttype) size_t, const size_t "size_t" +%typemap(couttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // objects %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "/*aaaaaa*/SwigObj *" @@ -436,6 +540,13 @@ %typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// size_t +%typemap(proxycouttype) size_t, const size_t "size_t" +%typemap(proxycouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" %typemap(proxycouttype) SWIGTYPE * "$resolved_type*" @@ -469,6 +580,13 @@ %typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" +// size_t +%typemap(out) size_t, const size_t "$result = (size_t) $1;" +%typemap(out) size_t*, size_t&, size_t[ANY], size_t[] "$result = (size_t *) $1;" +%typemap(out) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$result = (const size_t *) &$1;" +%typemap(out) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$result = (size_t **) $1;" +%typemap(out) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$result = (const size_t **) $1;" + %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" @@ -533,6 +651,13 @@ %typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" %typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" +// size_t +%typemap(cppouttype) size_t, const size_t "size_t" +%typemap(cppouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" +%typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" +%typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" +%typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" + %typemap(cppouttype) const char* "const char *" %typemap(cppouttype) const unsigned char* "const unsigned char *" %typemap(cppouttype) const signed char* "const signed char *" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-09 20:03:12
|
Revision: 13579 http://swig.svn.sourceforge.net/swig/?rev=13579&view=rev Author: leiflm Date: 2012-08-09 20:03:06 +0000 (Thu, 09 Aug 2012) Log Message: ----------- Remove wrong typemap. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-09 20:02:47 UTC (rev 13578) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-09 20:03:06 UTC (rev 13579) @@ -690,11 +690,6 @@ %typemap(cppouttype) SWIGTYPE<T>, const SWIGTYPE<T> &, const SWIGTYPE<T> * "$1_ltype" */ -//%define size_t unsigned long %enddef - -%apply unsigned long { size_t }; -%apply const unsigned long & { const size_t & }; - #ifdef SWIG_CPPMODE #ifdef SWIG_C_EXCEPT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-13 16:22:09
|
Revision: 13604 http://swig.svn.sourceforge.net/swig/?rev=13604&view=rev Author: leiflm Date: 2012-08-13 16:22:02 +0000 (Mon, 13 Aug 2012) Log Message: ----------- Add wrapper typemap for "int *const &" Fix proxy type of complex type (SWIGTYPE) references. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-13 16:21:36 UTC (rev 13603) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-13 16:22:02 UTC (rev 13604) @@ -128,7 +128,7 @@ // objects %typemap(proxy) SWIGTYPE "$&resolved_type*" %typemap(proxy) SWIGTYPE * "$resolved_type*" -%typemap(proxy) SWIGTYPE & "$resolved_type*" +%typemap(proxy) SWIGTYPE & "$*resolved_type*" %typemap(proxy) SWIGTYPE *& "$resolved_type**" %typemap(proxy) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxy) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" @@ -363,7 +363,7 @@ %typemap(couttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" %typemap(couttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" %typemap(couttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(couttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" @@ -550,7 +550,7 @@ // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" %typemap(proxycouttype) SWIGTYPE * "$resolved_type*" -%typemap(proxycouttype) SWIGTYPE & "$resolved_type*" +%typemap(proxycouttype) SWIGTYPE & "$*resolved_type*" %typemap(proxycouttype) SWIGTYPE *& "$resolved_type**" %typemap(proxycouttype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(proxycouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:55:12
|
Revision: 13609 http://swig.svn.sourceforge.net/swig/?rev=13609&view=rev Author: leiflm Date: 2012-08-15 19:55:06 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Move to appropriate segment Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 07:48:57 UTC (rev 13608) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:06 UTC (rev 13609) @@ -650,6 +650,7 @@ %typemap(cppouttype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" %typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" %typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" +%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" // size_t %typemap(cppouttype) size_t, const size_t "size_t" @@ -663,7 +664,6 @@ %typemap(cppouttype) const signed char* "const signed char *" %typemap(cppouttype) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" -%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:55:28
|
Revision: 13610 http://swig.svn.sourceforge.net/swig/?rev=13610&view=rev Author: leiflm Date: 2012-08-15 19:55:22 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Refactor 'cppouttype' to be split by type Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:06 UTC (rev 13609) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:22 UTC (rev 13610) @@ -638,20 +638,95 @@ } // typemaps for 'cppresult' -// this needs refactoring -- see 'couttype' typemaps +// void +%typemap(cppouttype) void "void" +%typemap(cppouttype) void*, const void* "void *" -%typemap(cppouttype) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(cppouttype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$1_ltype" -%typemap(cppouttype) void *, short *, int *, long *, long long *, char *, float *, double*, unsigned char *, unsigned int *, unsigned long *, unsigned char *, signed char * "$1_ltype" -%typemap(cppouttype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(cppouttype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_ltype" -%typemap(cppouttype) short &, int &, long &, long long &, char &, float &, double &, unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$1_ltype" -%typemap(cppouttype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(cppouttype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(cppouttype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_ltype" -%typemap(cppouttype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$1_ltype" -%typemap(cppouttype) short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" +// short +%typemap(cppouttype) short, const short "short" +%typemap(cppouttype) short*, short&, short[ANY], short[] "short *" +%typemap(cppouttype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(cppouttype) unsigned short "unsigned short" +%typemap(cppouttype) const unsigned short "const unsigned short" +%typemap(cppouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(cppouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(cppouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// int +%typemap(cppouttype) int, const int "int" +%typemap(cppouttype) int*, int&, int[ANY], int[] "int *" +%typemap(cppouttype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(cppouttype) unsigned int "unsigned int" +%typemap(cppouttype) const unsigned int "unsigned int" +%typemap(cppouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(cppouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(cppouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" + +// long +%typemap(cppouttype) long, const long "long" +%typemap(cppouttype) long*, long&, long[ANY], long[] "long *" +%typemap(cppouttype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(cppouttype) unsigned long "unsigned long" +%typemap(cppouttype) const unsigned long "const unsigned long" +%typemap(cppouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(cppouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(cppouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" + +// long long +%typemap(cppouttype) long long, const long long "long long" +%typemap(cppouttype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(cppouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(cppouttype) unsigned long long "unsigned long long" +%typemap(cppouttype) const unsigned long long "const unsigned long long" +%typemap(cppouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(cppouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(cppouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" + +// char: signed/unsigned +%typemap(cppouttype) char, const char "char" +%typemap(cppouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(cppouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(cppouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(cppouttype) signed char "signed char" +%typemap(cppouttype) const signed char "const signed char" +%typemap(cppouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(cppouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(cppouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(cppouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(cppouttype) unsigned char "unsigned char" +%typemap(cppouttype) const unsigned char "const unsigned char" +%typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" + +// float +%typemap(cppouttype) float, const float "float" +%typemap(cppouttype) float*, float&, float[ANY], float[] "float *" +%typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" + +// double +%typemap(cppouttype) double, const double "double" +%typemap(cppouttype) double*, double&, double[ANY], double[] "double *" +%typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" + // size_t %typemap(cppouttype) size_t, const size_t "size_t" %typemap(cppouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" @@ -659,11 +734,6 @@ %typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -%typemap(cppouttype) const char* "const char *" -%typemap(cppouttype) const unsigned char* "const unsigned char *" -%typemap(cppouttype) const signed char* "const signed char *" -%typemap(cppouttype) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*builtin * [ANY]*/ $1_ltype" - %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:55:42
|
Revision: 13611 http://swig.svn.sourceforge.net/swig/?rev=13611&view=rev Author: leiflm Date: 2012-08-15 19:55:36 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'proxy' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:22 UTC (rev 13610) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:36 UTC (rev 13611) @@ -31,7 +31,13 @@ // void %typemap(proxy) void "void" -%typemap(proxy) void*, const void* "void *" +%typemap(proxy) void*, void&, void[ANY], void[] "void *" +%typemap(proxy) const void&, const void*, const void[ANY], const void[] "const void *" +%typemap(proxy) void**, void*&, void*[ANY], void[ANY][ANY] "void **" +%typemap(proxy) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **" +// constant pointers +%typemap(proxy) void* * const "void* * const" +%typemap(proxy) const void* * const "const void* * const" // short %typemap(proxy) short, const short "short" @@ -45,6 +51,13 @@ %typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(proxy) short * const "short * const" +%typemap(proxy) short* * const "short* * const" +%typemap(proxy) const short* * const "const short* * const" +%typemap(proxy) unsigned short * const "unsigned short * const" +%typemap(proxy) unsigned short* * const "unsigned short* * const" +%typemap(proxy) const unsigned short* * const "const unsigned short* * const" // int %typemap(proxy) int, const int "int" @@ -58,6 +71,13 @@ %typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(proxy) int * const "int * const" +%typemap(proxy) int* * const "int* * const" +%typemap(proxy) const int* * const "const int* * const" +%typemap(proxy) unsigned int * const "unsigned int * const" +%typemap(proxy) unsigned int* * const "unsigned int* * const" +%typemap(proxy) const unsigned int* * const "const unsigned int* * const" // long %typemap(proxy) long, const long "long" @@ -71,6 +91,13 @@ %typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(proxy) long * const "long * const" +%typemap(proxy) long* * const "long* * const" +%typemap(proxy) const long* * const "const long* * const" +%typemap(proxy) unsigned long * const "unsigned long * const" +%typemap(proxy) unsigned long* * const "unsigned long* * const" +%typemap(proxy) const unsigned long* * const "const unsigned long* * const" // long long %typemap(proxy) long long, const long long "long long" @@ -84,6 +111,13 @@ %typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(proxy) long long * const "long long * const" +%typemap(proxy) long long* * const "long long* * const" +%typemap(proxy) const long long* * const "const long long* * const" +%typemap(proxy) unsigned long long * const "unsigned long long * const" +%typemap(proxy) unsigned long long* * const "unsigned long long* * const" +%typemap(proxy) const unsigned long long* * const "const unsigned long long* * const" // char: signed/unsigned %typemap(proxy) char, const char "char" @@ -103,6 +137,13 @@ %typemap(proxy) const unsigned char "const unsigned char" %typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(proxy) char * const "char * const" +%typemap(proxy) char* * const "char* * const" +%typemap(proxy) const char* * const "const char* * const" +%typemap(proxy) unsigned char * const "unsigned char * const" +%typemap(proxy) unsigned char* * const "unsigned char* * const" +%typemap(proxy) const unsigned char* * const "const unsigned char* * const" // float %typemap(proxy) float, const float "float" @@ -110,6 +151,13 @@ %typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(proxy) float * const "float * const" +%typemap(proxy) float* * const "float* * const" +%typemap(proxy) const float* * const "const float* * const" +%typemap(proxy) unsigned float * const "unsigned float * const" +%typemap(proxy) unsigned float* * const "unsigned float* * const" +%typemap(proxy) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxy) double, const double "double" @@ -117,6 +165,13 @@ %typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(proxy) double * const "double * const" +%typemap(proxy) double* * const "double* * const" +%typemap(proxy) const double* * const "const double* * const" +%typemap(proxy) unsigned double * const "unsigned double * const" +%typemap(proxy) unsigned double* * const "unsigned double* * const" +%typemap(proxy) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxy) size_t, const size_t "size_t" @@ -124,6 +179,10 @@ %typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(proxy) size_t * const "size_t * const" +%typemap(proxy) size_t* * const "size_t* * const" +%typemap(proxy) const size_t* * const "const size_t* * const" // objects %typemap(proxy) SWIGTYPE "$&resolved_type*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:55:55
|
Revision: 13612 http://swig.svn.sourceforge.net/swig/?rev=13612&view=rev Author: leiflm Date: 2012-08-15 19:55:49 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'ctype' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:36 UTC (rev 13611) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:49 UTC (rev 13612) @@ -218,6 +218,9 @@ %typemap(ctype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" %typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" %typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// constant pointers +%typemap(ctype) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1_ltype" +%typemap(ctype) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1_ltype" // size_t %typemap(ctype) size_t, const size_t "size_t" @@ -225,6 +228,10 @@ %typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(ctype) size_t * const "size_t * const" +%typemap(ctype) size_t* * const "size_t* * const" +%typemap(ctype) const size_t* * const "const size_t* * const" // special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:56:09
|
Revision: 13613 http://swig.svn.sourceforge.net/swig/?rev=13613&view=rev Author: leiflm Date: 2012-08-15 19:56:03 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'in' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:55:49 UTC (rev 13612) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:03 UTC (rev 13613) @@ -315,12 +315,20 @@ %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" %typemap(in) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$1 = ($1_basetype *) $input;" +// constant pointers +%typemap(in) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1 = ($1_ltype) $input;" +%typemap(in) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1 = ($1_ltype) $input;" + // size_t %typemap(in) size_t, const size_t "$1 = (size_t) $input;" -%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$input = (size_t *) $input;" +%typemap(in) size_t*, size_t&, size_t[ANY], size_t[] "$1 = (size_t *) $input;" %typemap(in) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$1 = (const size_t *) &$input;" %typemap(in) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$1 = (size_t **) $input;" %typemap(in) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$1 = (const size_t **) $input;" +// constant pointers +%typemap(in) size_t * const "$1 = (size_t) $input;" +%typemap(in) size_t* * const "$1 = (size_t *) $input;" +%typemap(in) const size_t* * const "$1 = (const size_t **) $input;" %typemap(in, fragment="stdbool_inc") bool, bool *, bool **, const bool, const bool * "$1 = ($1_ltype) $input;" %typemap(in, fragment="stdbool_inc") bool & "$1 = ($1_basetype *) $input;" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:56:25
|
Revision: 13614 http://swig.svn.sourceforge.net/swig/?rev=13614&view=rev Author: leiflm Date: 2012-08-15 19:56:19 +0000 (Wed, 15 Aug 2012) Log Message: ----------- add const pointers to 'couttype' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:03 UTC (rev 13613) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:19 UTC (rev 13614) @@ -414,6 +414,10 @@ // void %typemap(couttype) void "void" %typemap(couttype) void*, const void* "void *" +// constant pointers +%typemap(couttype) void * const "void * const" +%typemap(couttype) void* * const * const "void* *" +%typemap(couttype) const void* * const "const void* *" // short %typemap(couttype) short, const short "short" @@ -427,6 +431,13 @@ %typemap(couttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(couttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(couttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(couttype) short * const "short *" +%typemap(couttype) short* * const "short* *" +%typemap(couttype) const short* * const "const short* *" +%typemap(couttype) unsigned short * const "unsigned short *" +%typemap(couttype) unsigned short* * const "unsigned short* *" +%typemap(couttype) const unsigned short* * const "const unsigned short* *" // int %typemap(couttype) int, const int "int" @@ -440,6 +451,13 @@ %typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(couttype) int * const "int *" +%typemap(couttype) int* * const "int* *" +%typemap(couttype) const int* * const "const int* *" +%typemap(couttype) unsigned int * const "unsigned int *" +%typemap(couttype) unsigned int* * const "unsigned int* *" +%typemap(couttype) const unsigned int* * const "const unsigned int* *" // long %typemap(couttype) long, const long "long" @@ -453,6 +471,13 @@ %typemap(couttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(couttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(couttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(couttype) long * const "long *" +%typemap(couttype) long* * const "long* *" +%typemap(couttype) const long* * const "const long* *" +%typemap(couttype) unsigned long * const "unsigned long *" +%typemap(couttype) unsigned long* * const "unsigned long* *" +%typemap(couttype) const unsigned long* * const "const unsigned long* *" // long long %typemap(couttype) long long, const long long "long long" @@ -466,6 +491,13 @@ %typemap(couttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(couttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(couttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(couttype) long long * const "long long *" +%typemap(couttype) long long* * const "long long* *" +%typemap(couttype) const long long* * const "const long long* *" +%typemap(couttype) unsigned long long * const "unsigned long long *" +%typemap(couttype) unsigned long long* * const "unsigned long long* *" +%typemap(couttype) const unsigned long long* * const "const unsigned long long* *" // char: signed/unsigned %typemap(couttype) char, const char "char" @@ -485,6 +517,13 @@ %typemap(couttype) const unsigned char "const unsigned char" %typemap(couttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(couttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(couttype) char * const "char *" +%typemap(couttype) char* * const "char* *" +%typemap(couttype) const char* * const "const char* *" +%typemap(couttype) unsigned char * const "unsigned char *" +%typemap(couttype) unsigned char* * const "unsigned char* *" +%typemap(couttype) const unsigned char* * const "const unsigned char* *" // float %typemap(couttype) float, const float "float" @@ -492,6 +531,13 @@ %typemap(couttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(couttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(couttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(couttype) float * const "float *" +%typemap(couttype) float* * const "float* *" +%typemap(couttype) const float* * const "const float* *" +%typemap(couttype) unsigned float * const "unsigned float *" +%typemap(couttype) unsigned float* * const "unsigned float* *" +%typemap(couttype) const unsigned float* * const "const unsigned float* *" // double %typemap(couttype) double, const double "double" @@ -499,6 +545,13 @@ %typemap(couttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(couttype) double * const "double *" +%typemap(couttype) double* * const "double* *" +%typemap(couttype) const double* * const "const double* *" +%typemap(couttype) unsigned double * const "unsigned double *" +%typemap(couttype) unsigned double* * const "unsigned double* *" +%typemap(couttype) const unsigned double* * const "const unsigned double* *" // size_t %typemap(couttype) size_t, const size_t "size_t" @@ -506,6 +559,10 @@ %typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(couttype) size_t * const "size_t *" +%typemap(couttype) size_t* * const "size_t* *" +%typemap(couttype) const size_t* * const "const size_t* *" // objects %typemap(couttype) SWIGTYPE "SwigObj *" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:56:39
|
Revision: 13615 http://swig.svn.sourceforge.net/swig/?rev=13615&view=rev Author: leiflm Date: 2012-08-15 19:56:33 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'cppouttype' typemaps Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:19 UTC (rev 13614) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:33 UTC (rev 13615) @@ -772,6 +772,10 @@ // void %typemap(cppouttype) void "void" %typemap(cppouttype) void*, const void* "void *" +// constant pointers +%typemap(cppouttype) void * const "void * const" +%typemap(cppouttype) void* * const * const "void* *" +%typemap(cppouttype) const void* * const "const void* *" // short %typemap(cppouttype) short, const short "short" @@ -785,6 +789,13 @@ %typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(cppouttype) short * const "short *" +%typemap(cppouttype) short* * const "short* *" +%typemap(cppouttype) const short* * const "const short* *" +%typemap(cppouttype) unsigned short * const "unsigned short *" +%typemap(cppouttype) unsigned short* * const "unsigned short* *" +%typemap(cppouttype) const unsigned short* * const "const unsigned short* *" // int %typemap(cppouttype) int, const int "int" @@ -798,6 +809,13 @@ %typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(cppouttype) int * const "int *" +%typemap(cppouttype) int* * const "int* *" +%typemap(cppouttype) const int* * const "const int* *" +%typemap(cppouttype) unsigned int * const "unsigned int *" +%typemap(cppouttype) unsigned int* * const "unsigned int* *" +%typemap(cppouttype) const unsigned int* * const "const unsigned int* *" // long %typemap(cppouttype) long, const long "long" @@ -811,6 +829,13 @@ %typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(cppouttype) long * const "long *" +%typemap(cppouttype) long* * const "long* *" +%typemap(cppouttype) const long* * const "const long* *" +%typemap(cppouttype) unsigned long * const "unsigned long *" +%typemap(cppouttype) unsigned long* * const "unsigned long* *" +%typemap(cppouttype) const unsigned long* * const "const unsigned long* *" // long long %typemap(cppouttype) long long, const long long "long long" @@ -824,6 +849,13 @@ %typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(cppouttype) long long * const "long long *" +%typemap(cppouttype) long long* * const "long long* *" +%typemap(cppouttype) const long long* * const "const long long* *" +%typemap(cppouttype) unsigned long long * const "unsigned long long *" +%typemap(cppouttype) unsigned long long* * const "unsigned long long* *" +%typemap(cppouttype) const unsigned long long* * const "const unsigned long long* *" // char: signed/unsigned %typemap(cppouttype) char, const char "char" @@ -843,6 +875,13 @@ %typemap(cppouttype) const unsigned char "const unsigned char" %typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(cppouttype) char * const "char *" +%typemap(cppouttype) char* * const "char* *" +%typemap(cppouttype) const char* * const "const char* *" +%typemap(cppouttype) unsigned char * const "unsigned char *" +%typemap(cppouttype) unsigned char* * const "unsigned char* *" +%typemap(cppouttype) const unsigned char* * const "const unsigned char* *" // float %typemap(cppouttype) float, const float "float" @@ -850,6 +889,13 @@ %typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(cppouttype) float * const "float *" +%typemap(cppouttype) float* * const "float* *" +%typemap(cppouttype) const float* * const "const float* *" +%typemap(cppouttype) unsigned float * const "unsigned float *" +%typemap(cppouttype) unsigned float* * const "unsigned float* *" +%typemap(cppouttype) const unsigned float* * const "const unsigned float* *" // double %typemap(cppouttype) double, const double "double" @@ -857,6 +903,13 @@ %typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(cppouttype) double * const "double *" +%typemap(cppouttype) double* * const "double* *" +%typemap(cppouttype) const double* * const "const double* *" +%typemap(cppouttype) unsigned double * const "unsigned double *" +%typemap(cppouttype) unsigned double* * const "unsigned double* *" +%typemap(cppouttype) const unsigned double* * const "const unsigned double* *" // size_t %typemap(cppouttype) size_t, const size_t "size_t" @@ -864,6 +917,10 @@ %typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(cppouttype) size_t * const "size_t *" +%typemap(cppouttype) size_t* * const "size_t* *" +%typemap(cppouttype) const size_t* * const "const size_t* *" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:56:59
|
Revision: 13616 http://swig.svn.sourceforge.net/swig/?rev=13616&view=rev Author: leiflm Date: 2012-08-15 19:56:53 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'proxycouttype' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:33 UTC (rev 13615) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:53 UTC (rev 13616) @@ -585,6 +585,9 @@ // void %typemap(proxycouttype) void "void" %typemap(proxycouttype) void*, const void* "void *" +// constant pointers +%typemap(proxycouttype) void* * const "void* * const" +%typemap(proxycouttype) const void* * const "const void* * const" // short %typemap(proxycouttype) short, const short "short" @@ -598,6 +601,13 @@ %typemap(proxycouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" %typemap(proxycouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" %typemap(proxycouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(proxycouttype) short * const "short * const" +%typemap(proxycouttype) short* * const "short* * const" +%typemap(proxycouttype) const short* * const "const short* * const" +%typemap(proxycouttype) unsigned short * const "unsigned short * const" +%typemap(proxycouttype) unsigned short* * const "unsigned short* * const" +%typemap(proxycouttype) const unsigned short* * const "const unsigned short* * const" // int %typemap(proxycouttype) int, const int "int" @@ -611,6 +621,13 @@ %typemap(proxycouttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" %typemap(proxycouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" %typemap(proxycouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(proxycouttype) int * const "int * const" +%typemap(proxycouttype) int* * const "int* * const" +%typemap(proxycouttype) const int* * const "const int* * const" +%typemap(proxycouttype) unsigned int * const "unsigned int * const" +%typemap(proxycouttype) unsigned int* * const "unsigned int* * const" +%typemap(proxycouttype) const unsigned int* * const "const unsigned int* * const" // long %typemap(proxycouttype) long, const long "long" @@ -624,6 +641,13 @@ %typemap(proxycouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" %typemap(proxycouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" %typemap(proxycouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(proxycouttype) long * const "long * const" +%typemap(proxycouttype) long* * const "long* * const" +%typemap(proxycouttype) const long* * const "const long* * const" +%typemap(proxycouttype) unsigned long * const "unsigned long * const" +%typemap(proxycouttype) unsigned long* * const "unsigned long* * const" +%typemap(proxycouttype) const unsigned long* * const "const unsigned long* * const" // long long %typemap(proxycouttype) long long, const long long "long long" @@ -637,6 +661,13 @@ %typemap(proxycouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" %typemap(proxycouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" %typemap(proxycouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(proxycouttype) long long * const "long long * const" +%typemap(proxycouttype) long long* * const "long long* * const" +%typemap(proxycouttype) const long long* * const "const long long* * const" +%typemap(proxycouttype) unsigned long long * const "unsigned long long * const" +%typemap(proxycouttype) unsigned long long* * const "unsigned long long* * const" +%typemap(proxycouttype) const unsigned long long* * const "const unsigned long long* * const" // char: signed/unsigned %typemap(proxycouttype) char, const char "char" @@ -656,6 +687,13 @@ %typemap(proxycouttype) const unsigned char "const unsigned char" %typemap(proxycouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" %typemap(proxycouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(proxycouttype) char * const "char * const" +%typemap(proxycouttype) char* * const "char* * const" +%typemap(proxycouttype) const char* * const "const char* * const" +%typemap(proxycouttype) unsigned char * const "unsigned char * const" +%typemap(proxycouttype) unsigned char* * const "unsigned char* * const" +%typemap(proxycouttype) const unsigned char* * const "const unsigned char* * const" // float %typemap(proxycouttype) float, const float "float" @@ -663,6 +701,13 @@ %typemap(proxycouttype) const float&, const float*, const float[ANY], const float[] "const float *" %typemap(proxycouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" %typemap(proxycouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(proxycouttype) float * const "float * const" +%typemap(proxycouttype) float* * const "float* * const" +%typemap(proxycouttype) const float* * const "const float* * const" +%typemap(proxycouttype) unsigned float * const "unsigned float * const" +%typemap(proxycouttype) unsigned float* * const "unsigned float* * const" +%typemap(proxycouttype) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxycouttype) double, const double "double" @@ -670,6 +715,13 @@ %typemap(proxycouttype) const double&, const double*, const double[ANY], const double[] "const double *" %typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" %typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(proxycouttype) double * const "double * const" +%typemap(proxycouttype) double* * const "double* * const" +%typemap(proxycouttype) const double* * const "const double* * const" +%typemap(proxycouttype) unsigned double * const "unsigned double * const" +%typemap(proxycouttype) unsigned double* * const "unsigned double* * const" +%typemap(proxycouttype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxycouttype) size_t, const size_t "size_t" @@ -677,6 +729,10 @@ %typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" %typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" %typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" +// constant pointers +%typemap(proxycouttype) size_t * const "size_t * const" +%typemap(proxycouttype) size_t* * const "size_t* * const" +%typemap(proxycouttype) const size_t* * const "const size_t* * const" // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-15 19:57:17
|
Revision: 13617 http://swig.svn.sourceforge.net/swig/?rev=13617&view=rev Author: leiflm Date: 2012-08-15 19:57:11 +0000 (Wed, 15 Aug 2012) Log Message: ----------- Add constant pointers to 'out' typemap. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:56:53 UTC (rev 13616) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-15 19:57:11 UTC (rev 13617) @@ -767,12 +767,20 @@ %typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" %typemap(out) void "" +// constant pointers +%typemap(out) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$result = ($1_ltype) $1;" +%typemap(out) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$result = ($1_ltype) $1;" + // size_t %typemap(out) size_t, const size_t "$result = (size_t) $1;" %typemap(out) size_t*, size_t&, size_t[ANY], size_t[] "$result = (size_t *) $1;" %typemap(out) const size_t&, const size_t*, const size_t[ANY], const size_t[] "$result = (const size_t *) &$1;" %typemap(out) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "$result = (size_t **) $1;" %typemap(out) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "$result = (const size_t **) $1;" +// constant pointers +%typemap(out) size_t * const "$result = (size_t) $1;" +%typemap(out) size_t* * const "$result = (size_t *) $1;" +%typemap(out) const size_t* * const "$result = (const size_t **) $1;" %typemap(out, fragment="stdbool_inc") bool, bool *, const bool, const bool * "$result = ($1_ltype) $1;" %typemap(out, fragment="stdbool_inc") bool &, const bool & "$result = $1;" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-16 12:47:33
|
Revision: 13623 http://swig.svn.sourceforge.net/swig/?rev=13623&view=rev Author: leiflm Date: 2012-08-16 12:47:27 +0000 (Thu, 16 Aug 2012) Log Message: ----------- Fix typemaps of char* and equivalents to be explicit about the resolved type. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 11:35:02 UTC (rev 13622) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:27 UTC (rev 13623) @@ -121,7 +121,7 @@ // char: signed/unsigned %typemap(proxy) char, const char "char" -%typemap(proxy) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxy) char*, char&, char[ANY], char[] "char *" %typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -501,7 +501,7 @@ // char: signed/unsigned %typemap(couttype) char, const char "char" -%typemap(couttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(couttype) char*, char&, char[ANY], char[] "char *" %typemap(couttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(couttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(couttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -671,7 +671,7 @@ // char: signed/unsigned %typemap(proxycouttype) char, const char "char" -%typemap(proxycouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(proxycouttype) char*, char&, char[ANY], char[] "char *" %typemap(proxycouttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(proxycouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(proxycouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" @@ -923,7 +923,7 @@ // char: signed/unsigned %typemap(cppouttype) char, const char "char" -%typemap(cppouttype) char*, char&, char[ANY], char[] "$1_ltype" +%typemap(cppouttype) char*, char&, char[ANY], char[] "char *" %typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *" %typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" %typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-16 12:47:49
|
Revision: 13624 http://swig.svn.sourceforge.net/swig/?rev=13624&view=rev Author: leiflm Date: 2012-08-16 12:47:39 +0000 (Thu, 16 Aug 2012) Log Message: ----------- Add explicit types for 'ctype' typemap because swig does not resolve e.g. std::vector<int>::value_type to 'int' with the $1_ltype approach. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:27 UTC (rev 13623) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:39 UTC (rev 13624) @@ -201,27 +201,150 @@ %typemap(proxy, fragment="stdbool_inc") const bool & "$1_basetype const *" // typemaps for function parameters -%typemap(ctype) void, short, int, long, long long, char, float, double "$1_ltype" -%typemap(ctype) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1_ltype" -%typemap(ctype) void *, short *, int *, long *, long long *, char *, float *, double * "$1_ltype" -%typemap(ctype) void **, short **, int **, long **, long long **, char **, float **, double ** "$1_ltype" -%typemap(ctype) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1_ltype" -%typemap(ctype) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1_type" -%typemap(ctype) short &, int &, long &, long long &, char &, float &, double & "$1_ltype" -%typemap(ctype) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1_ltype" -%typemap(ctype) const short, const int, const long, const long long, const char, const float, const double "$1_ltype" -%typemap(ctype) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1_ltype" -%typemap(ctype) const unsigned short, const unsigned int, const unsigned long, const unsigned long long, const unsigned char "$1_type" -%typemap(ctype) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1_ltype" -%typemap(ctype) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1_type" -%typemap(ctype) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1_ltype" -%typemap(ctype) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$1_basetype **" -%typemap(ctype) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], unsigned int [ANY] "/*aaa*/ $1_ltype" -%typemap(ctype) void * [ANY], short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "/*bbb*/ $1_ltype" +// void +%typemap(ctype) void "void" +%typemap(ctype) void*, void&, void[ANY], void[] "void *" +%typemap(ctype) const void&, const void*, const void[ANY], const void[] "const void *" +%typemap(ctype) void**, void*&, void*[ANY], void[ANY][ANY] "void **" +%typemap(ctype) const void**, const void*&, const void*[ANY], const void[ANY][ANY] "const void **" // constant pointers -%typemap(ctype) short* * const, int* * const, long* * const, long long* * const, char* * const, float* * const, double* * const "$1_ltype" -%typemap(ctype) const short* * const, const int* * const, const long* * const, const long long* * const, const char* * const, const float* * const, const double* * const "$1_ltype" +%typemap(ctype) void* * const "void* * const" +%typemap(ctype) const void* * const "const void* * const" +// short +%typemap(ctype) short, const short "short" +%typemap(ctype) short*, short&, short[ANY], short[] "short *" +%typemap(ctype) const short&, const short*, const short[ANY], const short[] "const short *" +%typemap(ctype) unsigned short "unsigned short" +%typemap(ctype) const unsigned short "const unsigned short" +%typemap(ctype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" +%typemap(ctype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" +%typemap(ctype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" +%typemap(ctype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" +%typemap(ctype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" +%typemap(ctype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +// constant pointers +%typemap(ctype) short * const "short * const" +%typemap(ctype) short* * const "short* * const" +%typemap(ctype) const short* * const "const short* * const" +%typemap(ctype) unsigned short * const "unsigned short * const" +%typemap(ctype) unsigned short* * const "unsigned short* * const" +%typemap(ctype) const unsigned short* * const "const unsigned short* * const" + +// int +%typemap(ctype) int, const int "int" +%typemap(ctype) int*, int&, int[ANY], int[] "int *" +%typemap(ctype) const int&, const int*, const int[ANY], const int[] "const int *" +%typemap(ctype) unsigned int "unsigned int" +%typemap(ctype) const unsigned int "unsigned int" +%typemap(ctype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" +%typemap(ctype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" +%typemap(ctype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" +%typemap(ctype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" +%typemap(ctype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" +%typemap(ctype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" +// constant pointers +%typemap(ctype) int * const "int * const" +%typemap(ctype) int* * const "int* * const" +%typemap(ctype) const int* * const "const int* * const" +%typemap(ctype) unsigned int * const "unsigned int * const" +%typemap(ctype) unsigned int* * const "unsigned int* * const" +%typemap(ctype) const unsigned int* * const "const unsigned int* * const" + +// long +%typemap(ctype) long, const long "long" +%typemap(ctype) long*, long&, long[ANY], long[] "long *" +%typemap(ctype) const long&, const long*, const long[ANY], const long[] "const long *" +%typemap(ctype) unsigned long "unsigned long" +%typemap(ctype) const unsigned long "const unsigned long" +%typemap(ctype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" +%typemap(ctype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" +%typemap(ctype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" +%typemap(ctype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" +%typemap(ctype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" +%typemap(ctype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" +// constant pointers +%typemap(ctype) long * const "long * const" +%typemap(ctype) long* * const "long* * const" +%typemap(ctype) const long* * const "const long* * const" +%typemap(ctype) unsigned long * const "unsigned long * const" +%typemap(ctype) unsigned long* * const "unsigned long* * const" +%typemap(ctype) const unsigned long* * const "const unsigned long* * const" + +// long long +%typemap(ctype) long long, const long long "long long" +%typemap(ctype) long long*, long long&, long long[ANY], long long[] "long long *" +%typemap(ctype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" +%typemap(ctype) unsigned long long "unsigned long long" +%typemap(ctype) const unsigned long long "const unsigned long long" +%typemap(ctype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" +%typemap(ctype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" +%typemap(ctype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" +%typemap(ctype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" +%typemap(ctype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" +%typemap(ctype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" +// constant pointers +%typemap(ctype) long long * const "long long * const" +%typemap(ctype) long long* * const "long long* * const" +%typemap(ctype) const long long* * const "const long long* * const" +%typemap(ctype) unsigned long long * const "unsigned long long * const" +%typemap(ctype) unsigned long long* * const "unsigned long long* * const" +%typemap(ctype) const unsigned long long* * const "const unsigned long long* * const" + +// char: signed/unsigned +%typemap(ctype) char, const char "char" +%typemap(ctype) char*, char&, char[ANY], char[] "char *" +%typemap(ctype) const char&, const char*, const char[ANY], const char[] "const char *" +%typemap(ctype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" +%typemap(ctype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" +%typemap(ctype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" +%typemap(ctype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" +%typemap(ctype) signed char "signed char" +%typemap(ctype) const signed char "const signed char" +%typemap(ctype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" +%typemap(ctype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" +%typemap(ctype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" +%typemap(ctype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" +%typemap(ctype) unsigned char "unsigned char" +%typemap(ctype) const unsigned char "const unsigned char" +%typemap(ctype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" +%typemap(ctype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" +// constant pointers +%typemap(ctype) char * const "char * const" +%typemap(ctype) char* * const "char* * const" +%typemap(ctype) const char* * const "const char* * const" +%typemap(ctype) unsigned char * const "unsigned char * const" +%typemap(ctype) unsigned char* * const "unsigned char* * const" +%typemap(ctype) const unsigned char* * const "const unsigned char* * const" + +// float +%typemap(ctype) float, const float "float" +%typemap(ctype) float*, float&, float[ANY], float[] "float *" +%typemap(ctype) const float&, const float*, const float[ANY], const float[] "const float *" +%typemap(ctype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" +%typemap(ctype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" +// constant pointers +%typemap(ctype) float * const "float * const" +%typemap(ctype) float* * const "float* * const" +%typemap(ctype) const float* * const "const float* * const" +%typemap(ctype) unsigned float * const "unsigned float * const" +%typemap(ctype) unsigned float* * const "unsigned float* * const" +%typemap(ctype) const unsigned float* * const "const unsigned float* * const" + +// double +%typemap(ctype) double, const double "double" +%typemap(ctype) double*, double&, double[ANY], double[] "double *" +%typemap(ctype) const double&, const double*, const double[ANY], const double[] "const double *" +%typemap(ctype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" +%typemap(ctype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" +// constant pointers +%typemap(ctype) double * const "double * const" +%typemap(ctype) double* * const "double* * const" +%typemap(ctype) const double* * const "const double* * const" +%typemap(ctype) unsigned double * const "unsigned double * const" +%typemap(ctype) unsigned double* * const "unsigned double* * const" +%typemap(ctype) const unsigned double* * const "const unsigned double* * const" + // size_t %typemap(ctype) size_t, const size_t "size_t" %typemap(ctype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-16 12:47:55
|
Revision: 13625 http://swig.svn.sourceforge.net/swig/?rev=13625&view=rev Author: leiflm Date: 2012-08-16 12:47:49 +0000 (Thu, 16 Aug 2012) Log Message: ----------- Remove copy and pasta (unsigned float and unsigned double typemaps). Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:39 UTC (rev 13624) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:49 UTC (rev 13625) @@ -155,9 +155,6 @@ %typemap(proxy) float * const "float * const" %typemap(proxy) float* * const "float* * const" %typemap(proxy) const float* * const "const float* * const" -%typemap(proxy) unsigned float * const "unsigned float * const" -%typemap(proxy) unsigned float* * const "unsigned float* * const" -%typemap(proxy) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxy) double, const double "double" @@ -169,9 +166,6 @@ %typemap(proxy) double * const "double * const" %typemap(proxy) double* * const "double* * const" %typemap(proxy) const double* * const "const double* * const" -%typemap(proxy) unsigned double * const "unsigned double * const" -%typemap(proxy) unsigned double* * const "unsigned double* * const" -%typemap(proxy) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxy) size_t, const size_t "size_t" @@ -327,9 +321,6 @@ %typemap(ctype) float * const "float * const" %typemap(ctype) float* * const "float* * const" %typemap(ctype) const float* * const "const float* * const" -%typemap(ctype) unsigned float * const "unsigned float * const" -%typemap(ctype) unsigned float* * const "unsigned float* * const" -%typemap(ctype) const unsigned float* * const "const unsigned float* * const" // double %typemap(ctype) double, const double "double" @@ -341,9 +332,6 @@ %typemap(ctype) double * const "double * const" %typemap(ctype) double* * const "double* * const" %typemap(ctype) const double* * const "const double* * const" -%typemap(ctype) unsigned double * const "unsigned double * const" -%typemap(ctype) unsigned double* * const "unsigned double* * const" -%typemap(ctype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(ctype) size_t, const size_t "size_t" @@ -657,10 +645,7 @@ // constant pointers %typemap(couttype) float * const "float *" %typemap(couttype) float* * const "float* *" -%typemap(couttype) const float* * const "const float* *" -%typemap(couttype) unsigned float * const "unsigned float *" -%typemap(couttype) unsigned float* * const "unsigned float* *" -%typemap(couttype) const unsigned float* * const "const unsigned float* *" +%typemap(couttype) const float* * const "float* *" // double %typemap(couttype) double, const double "double" @@ -671,10 +656,7 @@ // constant pointers %typemap(couttype) double * const "double *" %typemap(couttype) double* * const "double* *" -%typemap(couttype) const double* * const "const double* *" -%typemap(couttype) unsigned double * const "unsigned double *" -%typemap(couttype) unsigned double* * const "unsigned double* *" -%typemap(couttype) const unsigned double* * const "const unsigned double* *" +%typemap(couttype) const double* * const "double* *" // size_t %typemap(couttype) size_t, const size_t "size_t" @@ -828,9 +810,6 @@ %typemap(proxycouttype) float * const "float * const" %typemap(proxycouttype) float* * const "float* * const" %typemap(proxycouttype) const float* * const "const float* * const" -%typemap(proxycouttype) unsigned float * const "unsigned float * const" -%typemap(proxycouttype) unsigned float* * const "unsigned float* * const" -%typemap(proxycouttype) const unsigned float* * const "const unsigned float* * const" // double %typemap(proxycouttype) double, const double "double" @@ -842,9 +821,6 @@ %typemap(proxycouttype) double * const "double * const" %typemap(proxycouttype) double* * const "double* * const" %typemap(proxycouttype) const double* * const "const double* * const" -%typemap(proxycouttype) unsigned double * const "unsigned double * const" -%typemap(proxycouttype) unsigned double* * const "unsigned double* * const" -%typemap(proxycouttype) const unsigned double* * const "const unsigned double* * const" // size_t %typemap(proxycouttype) size_t, const size_t "size_t" @@ -1079,10 +1055,7 @@ // constant pointers %typemap(cppouttype) float * const "float *" %typemap(cppouttype) float* * const "float* *" -%typemap(cppouttype) const float* * const "const float* *" -%typemap(cppouttype) unsigned float * const "unsigned float *" -%typemap(cppouttype) unsigned float* * const "unsigned float* *" -%typemap(cppouttype) const unsigned float* * const "const unsigned float* *" +%typemap(cppouttype) const float* * const "float* *" // double %typemap(cppouttype) double, const double "double" @@ -1093,10 +1066,7 @@ // constant pointers %typemap(cppouttype) double * const "double *" %typemap(cppouttype) double* * const "double* *" -%typemap(cppouttype) const double* * const "const double* *" -%typemap(cppouttype) unsigned double * const "unsigned double *" -%typemap(cppouttype) unsigned double* * const "unsigned double* *" -%typemap(cppouttype) const unsigned double* * const "const unsigned double* *" +%typemap(cppouttype) const double* * const "double* *" // size_t %typemap(cppouttype) size_t, const size_t "size_t" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-16 12:48:06
|
Revision: 13626 http://swig.svn.sourceforge.net/swig/?rev=13626&view=rev Author: leiflm Date: 2012-08-16 12:48:00 +0000 (Thu, 16 Aug 2012) Log Message: ----------- Workaround issue with swig casting to wrong (not const) type in wrapper's C++ function call, by setting variables to non const. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:47:49 UTC (rev 13625) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-16 12:48:00 UTC (rev 13626) @@ -528,7 +528,7 @@ // constant pointers %typemap(couttype) void * const "void * const" %typemap(couttype) void* * const * const "void* *" -%typemap(couttype) const void* * const "const void* *" +%typemap(couttype) const void* * const "void* *" // short %typemap(couttype) short, const short "short" @@ -545,10 +545,10 @@ // constant pointers %typemap(couttype) short * const "short *" %typemap(couttype) short* * const "short* *" -%typemap(couttype) const short* * const "const short* *" +%typemap(couttype) const short* * const "short* *" %typemap(couttype) unsigned short * const "unsigned short *" %typemap(couttype) unsigned short* * const "unsigned short* *" -%typemap(couttype) const unsigned short* * const "const unsigned short* *" +%typemap(couttype) const unsigned short* * const "unsigned short* *" // int %typemap(couttype) int, const int "int" @@ -565,10 +565,10 @@ // constant pointers %typemap(couttype) int * const "int *" %typemap(couttype) int* * const "int* *" -%typemap(couttype) const int* * const "const int* *" +%typemap(couttype) const int* * const "int* *" %typemap(couttype) unsigned int * const "unsigned int *" %typemap(couttype) unsigned int* * const "unsigned int* *" -%typemap(couttype) const unsigned int* * const "const unsigned int* *" +%typemap(couttype) const unsigned int* * const "unsigned int* *" // long %typemap(couttype) long, const long "long" @@ -585,10 +585,10 @@ // constant pointers %typemap(couttype) long * const "long *" %typemap(couttype) long* * const "long* *" -%typemap(couttype) const long* * const "const long* *" +%typemap(couttype) const long* * const "long* *" %typemap(couttype) unsigned long * const "unsigned long *" %typemap(couttype) unsigned long* * const "unsigned long* *" -%typemap(couttype) const unsigned long* * const "const unsigned long* *" +%typemap(couttype) const unsigned long* * const "unsigned long* *" // long long %typemap(couttype) long long, const long long "long long" @@ -605,10 +605,10 @@ // constant pointers %typemap(couttype) long long * const "long long *" %typemap(couttype) long long* * const "long long* *" -%typemap(couttype) const long long* * const "const long long* *" +%typemap(couttype) const long long* * const "long long* *" %typemap(couttype) unsigned long long * const "unsigned long long *" %typemap(couttype) unsigned long long* * const "unsigned long long* *" -%typemap(couttype) const unsigned long long* * const "const unsigned long long* *" +%typemap(couttype) const unsigned long long* * const "unsigned long long* *" // char: signed/unsigned %typemap(couttype) char, const char "char" @@ -631,10 +631,10 @@ // constant pointers %typemap(couttype) char * const "char *" %typemap(couttype) char* * const "char* *" -%typemap(couttype) const char* * const "const char* *" +%typemap(couttype) const char* * const "char* *" %typemap(couttype) unsigned char * const "unsigned char *" %typemap(couttype) unsigned char* * const "unsigned char* *" -%typemap(couttype) const unsigned char* * const "const unsigned char* *" +%typemap(couttype) const unsigned char* * const "unsigned char* *" // float %typemap(couttype) float, const float "float" @@ -667,7 +667,7 @@ // constant pointers %typemap(couttype) size_t * const "size_t *" %typemap(couttype) size_t* * const "size_t* *" -%typemap(couttype) const size_t* * const "const size_t* *" +%typemap(couttype) const size_t* * const "size_t* *" // objects %typemap(couttype) SWIGTYPE "SwigObj *" @@ -975,10 +975,10 @@ // constant pointers %typemap(cppouttype) int * const "int *" %typemap(cppouttype) int* * const "int* *" -%typemap(cppouttype) const int* * const "const int* *" +%typemap(cppouttype) const int* * const "int* *" %typemap(cppouttype) unsigned int * const "unsigned int *" %typemap(cppouttype) unsigned int* * const "unsigned int* *" -%typemap(cppouttype) const unsigned int* * const "const unsigned int* *" +%typemap(cppouttype) const unsigned int* * const "unsigned int* *" // long %typemap(cppouttype) long, const long "long" @@ -995,10 +995,10 @@ // constant pointers %typemap(cppouttype) long * const "long *" %typemap(cppouttype) long* * const "long* *" -%typemap(cppouttype) const long* * const "const long* *" +%typemap(cppouttype) const long* * const "long* *" %typemap(cppouttype) unsigned long * const "unsigned long *" %typemap(cppouttype) unsigned long* * const "unsigned long* *" -%typemap(cppouttype) const unsigned long* * const "const unsigned long* *" +%typemap(cppouttype) const unsigned long* * const "unsigned long* *" // long long %typemap(cppouttype) long long, const long long "long long" @@ -1015,10 +1015,10 @@ // constant pointers %typemap(cppouttype) long long * const "long long *" %typemap(cppouttype) long long* * const "long long* *" -%typemap(cppouttype) const long long* * const "const long long* *" +%typemap(cppouttype) const long long* * const "long long* *" %typemap(cppouttype) unsigned long long * const "unsigned long long *" %typemap(cppouttype) unsigned long long* * const "unsigned long long* *" -%typemap(cppouttype) const unsigned long long* * const "const unsigned long long* *" +%typemap(cppouttype) const unsigned long long* * const "unsigned long long* *" // char: signed/unsigned %typemap(cppouttype) char, const char "char" @@ -1041,10 +1041,10 @@ // constant pointers %typemap(cppouttype) char * const "char *" %typemap(cppouttype) char* * const "char* *" -%typemap(cppouttype) const char* * const "const char* *" +%typemap(cppouttype) const char* * const "char* *" %typemap(cppouttype) unsigned char * const "unsigned char *" %typemap(cppouttype) unsigned char* * const "unsigned char* *" -%typemap(cppouttype) const unsigned char* * const "const unsigned char* *" +%typemap(cppouttype) const unsigned char* * const "unsigned char* *" // float %typemap(cppouttype) float, const float "float" @@ -1077,7 +1077,7 @@ // constant pointers %typemap(cppouttype) size_t * const "size_t *" %typemap(cppouttype) size_t* * const "size_t* *" -%typemap(cppouttype) const size_t* * const "const size_t* *" +%typemap(cppouttype) const size_t* * const "size_t* *" %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-18 23:30:00
|
Revision: 13653 http://swig.svn.sourceforge.net/swig/?rev=13653&view=rev Author: leiflm Date: 2012-08-18 23:29:53 +0000 (Sat, 18 Aug 2012) Log Message: ----------- Macrofy 'proxy' typemap. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 15:14:34 UTC (rev 13652) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 23:29:53 UTC (rev 13653) @@ -29,6 +29,18 @@ // typemaps for proxy function parameters +%define explicit_same_type(TM, T) +%typemap(TM) T, const T "T" +%typemap(TM) T*, T&, T[ANY], T[] "T *" +%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *" +%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **" +%typemap(TM) const T**, const T*&, const T*[ANY], const T[ANY][ANY] "const T **" +// constant pointers +%typemap(TM) T * const "T * const" +%typemap(TM) T* * const "T* * const" +%typemap(TM) const T* * const "const T* * const" +%enddef + // void %typemap(proxy) void "void" %typemap(proxy) void*, void&, void[ANY], void[] "void *" @@ -39,145 +51,21 @@ %typemap(proxy) void* * const "void* * const" %typemap(proxy) const void* * const "const void* * const" -// short -%typemap(proxy) short, const short "short" -%typemap(proxy) short*, short&, short[ANY], short[] "short *" -%typemap(proxy) const short&, const short*, const short[ANY], const short[] "const short *" -%typemap(proxy) unsigned short "unsigned short" -%typemap(proxy) const unsigned short "const unsigned short" -%typemap(proxy) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" -%typemap(proxy) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" -%typemap(proxy) short**, short*&, short*[ANY], short[ANY][ANY] "short **" -%typemap(proxy) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" -%typemap(proxy) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" -%typemap(proxy) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -// constant pointers -%typemap(proxy) short * const "short * const" -%typemap(proxy) short* * const "short* * const" -%typemap(proxy) const short* * const "const short* * const" -%typemap(proxy) unsigned short * const "unsigned short * const" -%typemap(proxy) unsigned short* * const "unsigned short* * const" -%typemap(proxy) const unsigned short* * const "const unsigned short* * const" +explicit_same_type(proxy, short); +explicit_same_type(proxy, unsigned short); +explicit_same_type(proxy, int); +explicit_same_type(proxy, unsigned int); +explicit_same_type(proxy, long); +explicit_same_type(proxy, unsigned long); +explicit_same_type(proxy, long long); +explicit_same_type(proxy, unsigned long long); +explicit_same_type(proxy, char); +explicit_same_type(proxy, signed char); +explicit_same_type(proxy, unsigned char); +explicit_same_type(proxy, float); +explicit_same_type(proxy, double); +explicit_same_type(proxy, size_t); -// int -%typemap(proxy) int, const int "int" -%typemap(proxy) int*, int&, int[ANY], int[] "int *" -%typemap(proxy) const int&, const int*, const int[ANY], const int[] "const int *" -%typemap(proxy) unsigned int "unsigned int" -%typemap(proxy) const unsigned int "unsigned int" -%typemap(proxy) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" -%typemap(proxy) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" -%typemap(proxy) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(proxy) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" -%typemap(proxy) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" -%typemap(proxy) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" -// constant pointers -%typemap(proxy) int * const "int * const" -%typemap(proxy) int* * const "int* * const" -%typemap(proxy) const int* * const "const int* * const" -%typemap(proxy) unsigned int * const "unsigned int * const" -%typemap(proxy) unsigned int* * const "unsigned int* * const" -%typemap(proxy) const unsigned int* * const "const unsigned int* * const" - -// long -%typemap(proxy) long, const long "long" -%typemap(proxy) long*, long&, long[ANY], long[] "long *" -%typemap(proxy) const long&, const long*, const long[ANY], const long[] "const long *" -%typemap(proxy) unsigned long "unsigned long" -%typemap(proxy) const unsigned long "const unsigned long" -%typemap(proxy) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" -%typemap(proxy) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" -%typemap(proxy) long**, long*&, long*[ANY], long[ANY][ANY] "long **" -%typemap(proxy) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" -%typemap(proxy) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" -%typemap(proxy) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" -// constant pointers -%typemap(proxy) long * const "long * const" -%typemap(proxy) long* * const "long* * const" -%typemap(proxy) const long* * const "const long* * const" -%typemap(proxy) unsigned long * const "unsigned long * const" -%typemap(proxy) unsigned long* * const "unsigned long* * const" -%typemap(proxy) const unsigned long* * const "const unsigned long* * const" - -// long long -%typemap(proxy) long long, const long long "long long" -%typemap(proxy) long long*, long long&, long long[ANY], long long[] "long long *" -%typemap(proxy) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" -%typemap(proxy) unsigned long long "unsigned long long" -%typemap(proxy) const unsigned long long "const unsigned long long" -%typemap(proxy) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" -%typemap(proxy) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" -%typemap(proxy) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" -%typemap(proxy) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" -%typemap(proxy) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" -%typemap(proxy) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" -// constant pointers -%typemap(proxy) long long * const "long long * const" -%typemap(proxy) long long* * const "long long* * const" -%typemap(proxy) const long long* * const "const long long* * const" -%typemap(proxy) unsigned long long * const "unsigned long long * const" -%typemap(proxy) unsigned long long* * const "unsigned long long* * const" -%typemap(proxy) const unsigned long long* * const "const unsigned long long* * const" - -// char: signed/unsigned -%typemap(proxy) char, const char "char" -%typemap(proxy) char*, char&, char[ANY], char[] "char *" -%typemap(proxy) const char&, const char*, const char[ANY], const char[] "const char *" -%typemap(proxy) char**, char*&, char*[ANY], char[ANY][ANY] "char **" -%typemap(proxy) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" -%typemap(proxy) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" -%typemap(proxy) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" -%typemap(proxy) signed char "signed char" -%typemap(proxy) const signed char "const signed char" -%typemap(proxy) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" -%typemap(proxy) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" -%typemap(proxy) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" -%typemap(proxy) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" -%typemap(proxy) unsigned char "unsigned char" -%typemap(proxy) const unsigned char "const unsigned char" -%typemap(proxy) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" -%typemap(proxy) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" -// constant pointers -%typemap(proxy) char * const "char * const" -%typemap(proxy) char* * const "char* * const" -%typemap(proxy) const char* * const "const char* * const" -%typemap(proxy) unsigned char * const "unsigned char * const" -%typemap(proxy) unsigned char* * const "unsigned char* * const" -%typemap(proxy) const unsigned char* * const "const unsigned char* * const" - -// float -%typemap(proxy) float, const float "float" -%typemap(proxy) float*, float&, float[ANY], float[] "float *" -%typemap(proxy) const float&, const float*, const float[ANY], const float[] "const float *" -%typemap(proxy) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" -%typemap(proxy) const float**, const float*[ANY], const float[ANY][ANY] "const float **" -// constant pointers -%typemap(proxy) float * const "float * const" -%typemap(proxy) float* * const "float* * const" -%typemap(proxy) const float* * const "const float* * const" - -// double -%typemap(proxy) double, const double "double" -%typemap(proxy) double*, double&, double[ANY], double[] "double *" -%typemap(proxy) const double&, const double*, const double[ANY], const double[] "const double *" -%typemap(proxy) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" -%typemap(proxy) const double**, const double*[ANY], const double[ANY][ANY] "const double **" -// constant pointers -%typemap(proxy) double * const "double * const" -%typemap(proxy) double* * const "double* * const" -%typemap(proxy) const double* * const "const double* * const" - -// size_t -%typemap(proxy) size_t, const size_t "size_t" -%typemap(proxy) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" -%typemap(proxy) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" -%typemap(proxy) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" -%typemap(proxy) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -// constant pointers -%typemap(proxy) size_t * const "size_t * const" -%typemap(proxy) size_t* * const "size_t* * const" -%typemap(proxy) const size_t* * const "const size_t* * const" - // objects %typemap(proxy) SWIGTYPE "$&resolved_type*" %typemap(proxy) SWIGTYPE * "$resolved_type*" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-18 23:30:15
|
Revision: 13654 http://swig.svn.sourceforge.net/swig/?rev=13654&view=rev Author: leiflm Date: 2012-08-18 23:30:09 +0000 (Sat, 18 Aug 2012) Log Message: ----------- Macrofy 'ctype' typemap Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 23:29:53 UTC (rev 13653) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 23:30:09 UTC (rev 13654) @@ -93,145 +93,22 @@ %typemap(ctype) void* * const "void* * const" %typemap(ctype) const void* * const "const void* * const" -// short -%typemap(ctype) short, const short "short" -%typemap(ctype) short*, short&, short[ANY], short[] "short *" -%typemap(ctype) const short&, const short*, const short[ANY], const short[] "const short *" -%typemap(ctype) unsigned short "unsigned short" -%typemap(ctype) const unsigned short "const unsigned short" -%typemap(ctype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" -%typemap(ctype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" -%typemap(ctype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" -%typemap(ctype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" -%typemap(ctype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" -%typemap(ctype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -// constant pointers -%typemap(ctype) short * const "short * const" -%typemap(ctype) short* * const "short* * const" -%typemap(ctype) const short* * const "const short* * const" -%typemap(ctype) unsigned short * const "unsigned short * const" -%typemap(ctype) unsigned short* * const "unsigned short* * const" -%typemap(ctype) const unsigned short* * const "const unsigned short* * const" -// int -%typemap(ctype) int, const int "int" -%typemap(ctype) int*, int&, int[ANY], int[] "int *" -%typemap(ctype) const int&, const int*, const int[ANY], const int[] "const int *" -%typemap(ctype) unsigned int "unsigned int" -%typemap(ctype) const unsigned int "unsigned int" -%typemap(ctype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" -%typemap(ctype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" -%typemap(ctype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(ctype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" -%typemap(ctype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" -%typemap(ctype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" -// constant pointers -%typemap(ctype) int * const "int * const" -%typemap(ctype) int* * const "int* * const" -%typemap(ctype) const int* * const "const int* * const" -%typemap(ctype) unsigned int * const "unsigned int * const" -%typemap(ctype) unsigned int* * const "unsigned int* * const" -%typemap(ctype) const unsigned int* * const "const unsigned int* * const" +explicit_same_type(ctype, short); +explicit_same_type(ctype, unsigned short); +explicit_same_type(ctype, int); +explicit_same_type(ctype, unsigned int); +explicit_same_type(ctype, long); +explicit_same_type(ctype, unsigned long); +explicit_same_type(ctype, long long); +explicit_same_type(ctype, unsigned long long); +explicit_same_type(ctype, char); +explicit_same_type(ctype, signed char); +explicit_same_type(ctype, unsigned char); +explicit_same_type(ctype, float); +explicit_same_type(ctype, double); +explicit_same_type(ctype, size_t); -// long -%typemap(ctype) long, const long "long" -%typemap(ctype) long*, long&, long[ANY], long[] "long *" -%typemap(ctype) const long&, const long*, const long[ANY], const long[] "const long *" -%typemap(ctype) unsigned long "unsigned long" -%typemap(ctype) const unsigned long "const unsigned long" -%typemap(ctype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" -%typemap(ctype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" -%typemap(ctype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" -%typemap(ctype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" -%typemap(ctype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" -%typemap(ctype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" -// constant pointers -%typemap(ctype) long * const "long * const" -%typemap(ctype) long* * const "long* * const" -%typemap(ctype) const long* * const "const long* * const" -%typemap(ctype) unsigned long * const "unsigned long * const" -%typemap(ctype) unsigned long* * const "unsigned long* * const" -%typemap(ctype) const unsigned long* * const "const unsigned long* * const" - -// long long -%typemap(ctype) long long, const long long "long long" -%typemap(ctype) long long*, long long&, long long[ANY], long long[] "long long *" -%typemap(ctype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" -%typemap(ctype) unsigned long long "unsigned long long" -%typemap(ctype) const unsigned long long "const unsigned long long" -%typemap(ctype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" -%typemap(ctype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" -%typemap(ctype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" -%typemap(ctype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" -%typemap(ctype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" -%typemap(ctype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" -// constant pointers -%typemap(ctype) long long * const "long long * const" -%typemap(ctype) long long* * const "long long* * const" -%typemap(ctype) const long long* * const "const long long* * const" -%typemap(ctype) unsigned long long * const "unsigned long long * const" -%typemap(ctype) unsigned long long* * const "unsigned long long* * const" -%typemap(ctype) const unsigned long long* * const "const unsigned long long* * const" - -// char: signed/unsigned -%typemap(ctype) char, const char "char" -%typemap(ctype) char*, char&, char[ANY], char[] "char *" -%typemap(ctype) const char&, const char*, const char[ANY], const char[] "const char *" -%typemap(ctype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" -%typemap(ctype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" -%typemap(ctype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" -%typemap(ctype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" -%typemap(ctype) signed char "signed char" -%typemap(ctype) const signed char "const signed char" -%typemap(ctype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" -%typemap(ctype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" -%typemap(ctype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" -%typemap(ctype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" -%typemap(ctype) unsigned char "unsigned char" -%typemap(ctype) const unsigned char "const unsigned char" -%typemap(ctype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" -%typemap(ctype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" -// constant pointers -%typemap(ctype) char * const "char * const" -%typemap(ctype) char* * const "char* * const" -%typemap(ctype) const char* * const "const char* * const" -%typemap(ctype) unsigned char * const "unsigned char * const" -%typemap(ctype) unsigned char* * const "unsigned char* * const" -%typemap(ctype) const unsigned char* * const "const unsigned char* * const" - -// float -%typemap(ctype) float, const float "float" -%typemap(ctype) float*, float&, float[ANY], float[] "float *" -%typemap(ctype) const float&, const float*, const float[ANY], const float[] "const float *" -%typemap(ctype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" -%typemap(ctype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" -// constant pointers -%typemap(ctype) float * const "float * const" -%typemap(ctype) float* * const "float* * const" -%typemap(ctype) const float* * const "const float* * const" - -// double -%typemap(ctype) double, const double "double" -%typemap(ctype) double*, double&, double[ANY], double[] "double *" -%typemap(ctype) const double&, const double*, const double[ANY], const double[] "const double *" -%typemap(ctype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" -%typemap(ctype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" -// constant pointers -%typemap(ctype) double * const "double * const" -%typemap(ctype) double* * const "double* * const" -%typemap(ctype) const double* * const "const double* * const" - -// size_t -%typemap(ctype) size_t, const size_t "size_t" -%typemap(ctype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" -%typemap(ctype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" -%typemap(ctype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" -%typemap(ctype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -// constant pointers -%typemap(ctype) size_t * const "size_t * const" -%typemap(ctype) size_t* * const "size_t* * const" -%typemap(ctype) const size_t* * const "const size_t* * const" - // special cases of array passing - does not intended to be used for objects %typemap(ctype) SWIGTYPE [] "$1_ltype" %typemap(ctype) SWIGTYPE ((&)[ANY]) "$1_basetype **" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <le...@us...> - 2012-08-18 23:30:26
|
Revision: 13655 http://swig.svn.sourceforge.net/swig/?rev=13655&view=rev Author: leiflm Date: 2012-08-18 23:30:19 +0000 (Sat, 18 Aug 2012) Log Message: ----------- Macrofy more typemaps. Does not work yet, because SWIG's preprocessor seems to have problems with empty args of macros. Modified Paths: -------------- branches/gsoc2012-c/Lib/c/c.swg Modified: branches/gsoc2012-c/Lib/c/c.swg =================================================================== --- branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 23:30:09 UTC (rev 13654) +++ branches/gsoc2012-c/Lib/c/c.swg 2012-08-18 23:30:19 UTC (rev 13655) @@ -128,19 +128,44 @@ %typemap(ctype, fragment="stdbool_inc") bool & "$1_ltype" %typemap(ctype, fragment="stdbool_inc") const bool & "$1_ltype const" -%typemap(in) short, int, long, long long, char, float, double "$1 = ($1_ltype) $input;" -%typemap(in) void *, short *, int *, long *, long long *, char *, float *, double * "$1 = ($1_ltype) $input;" -%typemap(in) void **, short **, int **, long **, long long **, char **, float **, double ** "$1 = ($1_basetype **) $input;" -%typemap(in) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char * "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short **, unsigned int **, unsigned long **, unsigned long long **, unsigned char ** "$1 = ($1_ltype) $input;" -%typemap(in) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$1 = ($1_ltype) $input;" -%typemap(in) const unsigned short *, const unsigned int *, const unsigned long *, const unsigned long long *, const unsigned char * "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char "$1 = ($1_ltype) $input;" -%typemap(in) short &, int &, long &, long long &, char &, float &, double &, bool & "$1 = ($1_ltype) $input;" -%typemap(in) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$1 = ($1_ltype) $input;" -%typemap(in) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char & "$1 = ($1_ltype) $input;" -%typemap(in) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char & "$1 = ($1_ltype) $input;" +%define in_assignment_cast(PRE, POST) +PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$1 = ($1_ltype) $input;" +%enddef + +//this macro is necessary, because 'unsigned double' is not allowed. +%define in_assignment_cast_unsigned_only(PRE, POST) +PRE float POST, PRE double POST "$1 = ($1_ltype) $input;" +%enddef + +%define in_assignment_group(PRE) +in_assignment_cast(,); +in_assignment_cast(,*); +in_assignment_cast(,&); +in_assignment_cast(,[ANY]); +in_assignment_cast(,*&); +in_assignment_cast(,**); +%enddef + +in_assignment_group(); +in_assignment_group(const); +in_assignment_group(signed); +in_assignment_group(signed const); +in_assignment_group(unsigned); +in_assignment_group(unsigned const); + +in_assignment_cast_unsigned_only(,); +in_assignment_cast_unsigned_only(,*); +in_assignment_cast_unsigned_only(,&); +in_assignment_cast_unsigned_only(,[ANY]); +in_assignment_cast_unsigned_only(,**); +in_assignment_cast_unsigned_only(,*&); +in_assignment_cast_unsigned_only(const,); +in_assignment_cast_unsigned_only(const,*); +in_assignment_cast_unsigned_only(const,&); +in_assignment_cast_unsigned_only(const,[ANY]); +in_assignment_cast_unsigned_only(const,*&); + %typemap(in) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$1 = ($1_ltype) $input;" %typemap(in) const short *&, const int *&, const long *&, const long *&, const char *&, const float *&, const double *& "$1 = ($1_ltype) $input;" %typemap(in) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY] "$1 = ($1_basetype *) $input;" @@ -250,145 +275,34 @@ %typemap(couttype) void* * const * const "void* *" %typemap(couttype) const void* * const "void* *" -// short -%typemap(couttype) short, const short "short" -%typemap(couttype) short*, short&, short[ANY], short[] "short *" -%typemap(couttype) const short&, const short*, const short[ANY], const short[] "const short *" -%typemap(couttype) unsigned short "unsigned short" -%typemap(couttype) const unsigned short "const unsigned short" -%typemap(couttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" -%typemap(couttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" -%typemap(couttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" -%typemap(couttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" -%typemap(couttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" -%typemap(couttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" +//unconsted types are necessary, because some the methods using this declare variables of the resolved type first and assign their values later +%define explicit_same_type_unconsted(TM, T) +%typemap(TM) T, const T "T" +%typemap(TM) T*, T&, T[ANY], T[] "T *" +%typemap(TM) const T&, const T*, const T[ANY], const T[] "const T *" +%typemap(TM) T**, T*&, T*[ANY], T[ANY][ANY] "T **" +%typemap(TM) const T**, const T*&, T *const &, const T*[ANY], const T[ANY][ANY] "const T **" // constant pointers -%typemap(couttype) short * const "short *" -%typemap(couttype) short* * const "short* *" -%typemap(couttype) const short* * const "short* *" -%typemap(couttype) unsigned short * const "unsigned short *" -%typemap(couttype) unsigned short* * const "unsigned short* *" -%typemap(couttype) const unsigned short* * const "unsigned short* *" +%typemap(TM) T * const "T *" +%typemap(TM) T* * const "T* *" +%typemap(TM) const T* * const "const T* *" +%enddef -// int -%typemap(couttype) int, const int "int" -%typemap(couttype) int*, int&, int[ANY], int[] "int *" -%typemap(couttype) const int&, const int*, const int[ANY], const int[] "const int *" -%typemap(couttype) unsigned int "unsigned int" -%typemap(couttype) const unsigned int "unsigned int" -%typemap(couttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" -%typemap(couttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" -%typemap(couttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(couttype) const int**, const int*&, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" -%typemap(couttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" -%typemap(couttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" -// constant pointers -%typemap(couttype) int * const "int *" -%typemap(couttype) int* * const "int* *" -%typemap(couttype) const int* * const "int* *" -%typemap(couttype) unsigned int * const "unsigned int *" -%typemap(couttype) unsigned int* * const "unsigned int* *" -%typemap(couttype) const unsigned int* * const "unsigned int* *" +explicit_same_type_unconsted(couttype, short); +explicit_same_type_unconsted(couttype, unsigned short); +explicit_same_type_unconsted(couttype, int); +explicit_same_type_unconsted(couttype, unsigned int); +explicit_same_type_unconsted(couttype, long); +explicit_same_type_unconsted(couttype, unsigned long); +explicit_same_type_unconsted(couttype, long long); +explicit_same_type_unconsted(couttype, unsigned long long); +explicit_same_type_unconsted(couttype, char); +explicit_same_type_unconsted(couttype, signed char); +explicit_same_type_unconsted(couttype, unsigned char); +explicit_same_type_unconsted(couttype, float); +explicit_same_type_unconsted(couttype, double); +explicit_same_type_unconsted(couttype, size_t); -// long -%typemap(couttype) long, const long "long" -%typemap(couttype) long*, long&, long[ANY], long[] "long *" -%typemap(couttype) const long&, const long*, const long[ANY], const long[] "const long *" -%typemap(couttype) unsigned long "unsigned long" -%typemap(couttype) const unsigned long "const unsigned long" -%typemap(couttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" -%typemap(couttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" -%typemap(couttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" -%typemap(couttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" -%typemap(couttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" -%typemap(couttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" -// constant pointers -%typemap(couttype) long * const "long *" -%typemap(couttype) long* * const "long* *" -%typemap(couttype) const long* * const "long* *" -%typemap(couttype) unsigned long * const "unsigned long *" -%typemap(couttype) unsigned long* * const "unsigned long* *" -%typemap(couttype) const unsigned long* * const "unsigned long* *" - -// long long -%typemap(couttype) long long, const long long "long long" -%typemap(couttype) long long*, long long&, long long[ANY], long long[] "long long *" -%typemap(couttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" -%typemap(couttype) unsigned long long "unsigned long long" -%typemap(couttype) const unsigned long long "const unsigned long long" -%typemap(couttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" -%typemap(couttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" -%typemap(couttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" -%typemap(couttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" -%typemap(couttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" -%typemap(couttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" -// constant pointers -%typemap(couttype) long long * const "long long *" -%typemap(couttype) long long* * const "long long* *" -%typemap(couttype) const long long* * const "long long* *" -%typemap(couttype) unsigned long long * const "unsigned long long *" -%typemap(couttype) unsigned long long* * const "unsigned long long* *" -%typemap(couttype) const unsigned long long* * const "unsigned long long* *" - -// char: signed/unsigned -%typemap(couttype) char, const char "char" -%typemap(couttype) char*, char&, char[ANY], char[] "char *" -%typemap(couttype) const char&, const char*, const char[ANY], const char[] "const char *" -%typemap(couttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" -%typemap(couttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" -%typemap(couttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" -%typemap(couttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" -%typemap(couttype) signed char "signed char" -%typemap(couttype) const signed char "const signed char" -%typemap(couttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" -%typemap(couttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" -%typemap(couttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" -%typemap(couttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" -%typemap(couttype) unsigned char "unsigned char" -%typemap(couttype) const unsigned char "const unsigned char" -%typemap(couttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" -%typemap(couttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" -// constant pointers -%typemap(couttype) char * const "char *" -%typemap(couttype) char* * const "char* *" -%typemap(couttype) const char* * const "char* *" -%typemap(couttype) unsigned char * const "unsigned char *" -%typemap(couttype) unsigned char* * const "unsigned char* *" -%typemap(couttype) const unsigned char* * const "unsigned char* *" - -// float -%typemap(couttype) float, const float "float" -%typemap(couttype) float*, float&, float[ANY], float[] "float *" -%typemap(couttype) const float&, const float*, const float[ANY], const float[] "const float *" -%typemap(couttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" -%typemap(couttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" -// constant pointers -%typemap(couttype) float * const "float *" -%typemap(couttype) float* * const "float* *" -%typemap(couttype) const float* * const "float* *" - -// double -%typemap(couttype) double, const double "double" -%typemap(couttype) double*, double&, double[ANY], double[] "double *" -%typemap(couttype) const double&, const double*, const double[ANY], const double[] "const double *" -%typemap(couttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" -%typemap(couttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" -// constant pointers -%typemap(couttype) double * const "double *" -%typemap(couttype) double* * const "double* *" -%typemap(couttype) const double* * const "double* *" - -// size_t -%typemap(couttype) size_t, const size_t "size_t" -%typemap(couttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" -%typemap(couttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" -%typemap(couttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" -%typemap(couttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -// constant pointers -%typemap(couttype) size_t * const "size_t *" -%typemap(couttype) size_t* * const "size_t* *" -%typemap(couttype) const size_t* * const "size_t* *" - // objects %typemap(couttype) SWIGTYPE "SwigObj *" %typemap(couttype) SWIGTYPE * "/*aaaaaa*/SwigObj *" @@ -414,145 +328,21 @@ %typemap(proxycouttype) void* * const "void* * const" %typemap(proxycouttype) const void* * const "const void* * const" -// short -%typemap(proxycouttype) short, const short "short" -%typemap(proxycouttype) short*, short&, short[ANY], short[] "short *" -%typemap(proxycouttype) const short&, const short*, const short[ANY], const short[] "const short *" -%typemap(proxycouttype) unsigned short "unsigned short" -%typemap(proxycouttype) const unsigned short "const unsigned short" -%typemap(proxycouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" -%typemap(proxycouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" -%typemap(proxycouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" -%typemap(proxycouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" -%typemap(proxycouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" -%typemap(proxycouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -// constant pointers -%typemap(proxycouttype) short * const "short * const" -%typemap(proxycouttype) short* * const "short* * const" -%typemap(proxycouttype) const short* * const "const short* * const" -%typemap(proxycouttype) unsigned short * const "unsigned short * const" -%typemap(proxycouttype) unsigned short* * const "unsigned short* * const" -%typemap(proxycouttype) const unsigned short* * const "const unsigned short* * const" +explicit_same_type(proxyccouttype, short); +explicit_same_type(proxyccouttype, unsigned short); +explicit_same_type(proxyccouttypeccouttype, int); +explicit_same_type(proxyccouttype, unsigned int); +explicit_same_type(proxyccouttype, long); +explicit_same_type(proxyccouttype, unsigned long); +explicit_same_type(proxyccouttype, long long); +explicit_same_type(proxyccouttype, unsigned long long); +explicit_same_type(proxyccouttype, char); +explicit_same_type(proxyccouttype, signed char); +explicit_same_type(proxyccouttype, unsigned char); +explicit_same_type(proxyccouttype, float); +explicit_same_type(proxyccouttype, double); +explicit_same_type(proxyccouttype, size_t) -// int -%typemap(proxycouttype) int, const int "int" -%typemap(proxycouttype) int*, int&, int[ANY], int[] "int *" -%typemap(proxycouttype) const int&, const int*, const int[ANY], const int[] "const int *" -%typemap(proxycouttype) unsigned int "unsigned int" -%typemap(proxycouttype) const unsigned int "unsigned int" -%typemap(proxycouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" -%typemap(proxycouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" -%typemap(proxycouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(proxycouttype) const int**, const int*&, const int*[ANY], const int[ANY][ANY] "const int **" -%typemap(proxycouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" -%typemap(proxycouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" -// constant pointers -%typemap(proxycouttype) int * const "int * const" -%typemap(proxycouttype) int* * const "int* * const" -%typemap(proxycouttype) const int* * const "const int* * const" -%typemap(proxycouttype) unsigned int * const "unsigned int * const" -%typemap(proxycouttype) unsigned int* * const "unsigned int* * const" -%typemap(proxycouttype) const unsigned int* * const "const unsigned int* * const" - -// long -%typemap(proxycouttype) long, const long "long" -%typemap(proxycouttype) long*, long&, long[ANY], long[] "long *" -%typemap(proxycouttype) const long&, const long*, const long[ANY], const long[] "const long *" -%typemap(proxycouttype) unsigned long "unsigned long" -%typemap(proxycouttype) const unsigned long "const unsigned long" -%typemap(proxycouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" -%typemap(proxycouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" -%typemap(proxycouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" -%typemap(proxycouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" -%typemap(proxycouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" -%typemap(proxycouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" -// constant pointers -%typemap(proxycouttype) long * const "long * const" -%typemap(proxycouttype) long* * const "long* * const" -%typemap(proxycouttype) const long* * const "const long* * const" -%typemap(proxycouttype) unsigned long * const "unsigned long * const" -%typemap(proxycouttype) unsigned long* * const "unsigned long* * const" -%typemap(proxycouttype) const unsigned long* * const "const unsigned long* * const" - -// long long -%typemap(proxycouttype) long long, const long long "long long" -%typemap(proxycouttype) long long*, long long&, long long[ANY], long long[] "long long *" -%typemap(proxycouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" -%typemap(proxycouttype) unsigned long long "unsigned long long" -%typemap(proxycouttype) const unsigned long long "const unsigned long long" -%typemap(proxycouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" -%typemap(proxycouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" -%typemap(proxycouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" -%typemap(proxycouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" -%typemap(proxycouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" -%typemap(proxycouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" -// constant pointers -%typemap(proxycouttype) long long * const "long long * const" -%typemap(proxycouttype) long long* * const "long long* * const" -%typemap(proxycouttype) const long long* * const "const long long* * const" -%typemap(proxycouttype) unsigned long long * const "unsigned long long * const" -%typemap(proxycouttype) unsigned long long* * const "unsigned long long* * const" -%typemap(proxycouttype) const unsigned long long* * const "const unsigned long long* * const" - -// char: signed/unsigned -%typemap(proxycouttype) char, const char "char" -%typemap(proxycouttype) char*, char&, char[ANY], char[] "char *" -%typemap(proxycouttype) const char&, const char*, const char[ANY], const char[] "const char *" -%typemap(proxycouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" -%typemap(proxycouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" -%typemap(proxycouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" -%typemap(proxycouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" -%typemap(proxycouttype) signed char "signed char" -%typemap(proxycouttype) const signed char "const signed char" -%typemap(proxycouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" -%typemap(proxycouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" -%typemap(proxycouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" -%typemap(proxycouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" -%typemap(proxycouttype) unsigned char "unsigned char" -%typemap(proxycouttype) const unsigned char "const unsigned char" -%typemap(proxycouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" -%typemap(proxycouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" -// constant pointers -%typemap(proxycouttype) char * const "char * const" -%typemap(proxycouttype) char* * const "char* * const" -%typemap(proxycouttype) const char* * const "const char* * const" -%typemap(proxycouttype) unsigned char * const "unsigned char * const" -%typemap(proxycouttype) unsigned char* * const "unsigned char* * const" -%typemap(proxycouttype) const unsigned char* * const "const unsigned char* * const" - -// float -%typemap(proxycouttype) float, const float "float" -%typemap(proxycouttype) float*, float&, float[ANY], float[] "float *" -%typemap(proxycouttype) const float&, const float*, const float[ANY], const float[] "const float *" -%typemap(proxycouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" -%typemap(proxycouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" -// constant pointers -%typemap(proxycouttype) float * const "float * const" -%typemap(proxycouttype) float* * const "float* * const" -%typemap(proxycouttype) const float* * const "const float* * const" - -// double -%typemap(proxycouttype) double, const double "double" -%typemap(proxycouttype) double*, double&, double[ANY], double[] "double *" -%typemap(proxycouttype) const double&, const double*, const double[ANY], const double[] "const double *" -%typemap(proxycouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" -%typemap(proxycouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" -// constant pointers -%typemap(proxycouttype) double * const "double * const" -%typemap(proxycouttype) double* * const "double* * const" -%typemap(proxycouttype) const double* * const "const double* * const" - -// size_t -%typemap(proxycouttype) size_t, const size_t "size_t" -%typemap(proxycouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" -%typemap(proxycouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" -%typemap(proxycouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" -%typemap(proxycouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -// constant pointers -%typemap(proxycouttype) size_t * const "size_t * const" -%typemap(proxycouttype) size_t* * const "size_t* * const" -%typemap(proxycouttype) const size_t* * const "const size_t* * const" - // objects %typemap(proxycouttype) SWIGTYPE "$&resolved_type*" %typemap(proxycouttype) SWIGTYPE * "$resolved_type*" @@ -569,21 +359,44 @@ %typemap(proxycouttype, fragment="stdbool_inc") bool & "$1_basetype*" %typemap(proxycouttype, fragment="stdbool_inc") const bool & "$1_basetype const *" -%typemap(out) short, int, long, long long, char, float, double "$result = $1;" -%typemap(out) void*, short*, int*, long*, long long *, char*, float*, double* "$result = $1;" -%typemap(out) const short, const int, const long, const long long, const char, const float, const double "$result = ($1_ltype) $1;" -%typemap(out) const void *, const short *, const int *, const long *, const long long *, const char *, const float *, const double * "$result = ($1_ltype) $1;" -%typemap(out) unsigned short, unsigned int, unsigned long, unsigned long long, unsigned char, signed char "$result = $1;" -%typemap(out) unsigned short *, unsigned int *, unsigned long *, unsigned long long *, unsigned char *, signed char * "$result = $1;" -%typemap(out) short &, int &, long &, long long &, char &, float &, double & "$result = $1;" -%typemap(out) unsigned short &, unsigned int &, unsigned long &, unsigned long long &, unsigned char &, signed char & "$result = $1;" -%typemap(out) const short &, const int &, const long &, const long long &, const char &, const float &, const double & "$result = $1;" -%typemap(out) const unsigned short &, const unsigned int &, const unsigned long &, const unsigned long long &, const unsigned char &, const signed char & "$result = $1;" -%typemap(out) short *&, int *&, long *&, long long *&, char *&, float *&, double *& "$result = $1;" -%typemap(out) const short *&, const int *&, const long *&, const long long *&, const char *&, const float *&, const double *& "$result = $1;" -%typemap(out) short [ANY], int [ANY], long [ANY], long long [ANY], char [ANY], float [ANY], double [ANY], unsigned char [ANY], signed char [ANY], unsigned int [ANY] "$result = $1;" -%typemap(out) short * [ANY], int * [ANY], long * [ANY], long long * [ANY], char * [ANY], float * [ANY], double * [ANY] "$result = $1;" -%typemap(out) short **, int **, long **, long long **, char **, float **, double ** "$result = $1;" + +%define out_assignment_no_cast(PRE, POST) +PRE short POST, PRE int POST, PRE long POST, PRE long long POST, PRE char POST, PRE float POST, PRE double POST "$result = $1;" +%enddef + +//this macro is necessary, because 'unsigned double' is not allowed. +%define out_assignment_no_cast_unsigned_only(PRE, POST) +PRE float POST, PRE double POST "$result = $1;" +%enddef + +%define out_assignment_group(PRE) +out_assignment_no_cast(,); +out_assignment_no_cast(,*); +out_assignment_no_cast(,&); +out_assignment_no_cast(,[ANY]); +out_assignment_no_cast(,*&); +out_assignment_no_cast(,**); +%enddef + +out_assignment_group(); +out_assignment_group(const); +out_assignment_group(signed); +out_assignment_group(signed const); +out_assignment_group(unsigned); +out_assignment_group(unsigned const); + +out_assignment_no_cast_unsigned_only(,); +out_assignment_no_cast_unsigned_only(,*); +out_assignment_no_cast_unsigned_only(,&); +out_assignment_no_cast_unsigned_only(,[ANY]); +out_assignment_no_cast_unsigned_only(,**); +out_assignment_no_cast_unsigned_only(,*&); +out_assignment_no_cast_unsigned_only(const,); +out_assignment_no_cast_unsigned_only(const,*); +out_assignment_no_cast_unsigned_only(const,&); +out_assignment_no_cast_unsigned_only(const,[ANY]); +out_assignment_no_cast_unsigned_only(const,*&); + %typemap(out) void "" // constant pointers @@ -660,145 +473,21 @@ %typemap(cppouttype) void* * const * const "void* *" %typemap(cppouttype) const void* * const "const void* *" -// short -%typemap(cppouttype) short, const short "short" -%typemap(cppouttype) short*, short&, short[ANY], short[] "short *" -%typemap(cppouttype) const short&, const short*, const short[ANY], const short[] "const short *" -%typemap(cppouttype) unsigned short "unsigned short" -%typemap(cppouttype) const unsigned short "const unsigned short" -%typemap(cppouttype) unsigned short*, unsigned short&, unsigned short*, unsigned short[ANY], unsigned short[] "unsigned short *" -%typemap(cppouttype) const unsigned short*, const unsigned short&, const unsigned short[ANY], const unsigned short[] "const unsigned short *" -%typemap(cppouttype) short**, short*&, short*[ANY], short[ANY][ANY] "short **" -%typemap(cppouttype) const short**, const short*&, const short*[ANY], const short[ANY][ANY] "const short **" -%typemap(cppouttype) unsigned short**, unsigned short*&, unsigned short*[ANY], unsigned short[ANY][ANY] "unsigned short **" -%typemap(cppouttype) const unsigned short**,const unsigned short*&, const unsigned short[ANY][ANY] "const unsigned short **" -// constant pointers -%typemap(cppouttype) short * const "short *" -%typemap(cppouttype) short* * const "short* *" -%typemap(cppouttype) const short* * const "const short* *" -%typemap(cppouttype) unsigned short * const "unsigned short *" -%typemap(cppouttype) unsigned short* * const "unsigned short* *" -%typemap(cppouttype) const unsigned short* * const "const unsigned short* *" +explicit_same_type_unconsted(cppouttype, short); +explicit_same_type_unconsted(cppouttype, unsigned short); +explicit_same_type_unconsted(cppouttype, int); +explicit_same_type_unconsted(cppouttype, unsigned int); +explicit_same_type_unconsted(cppouttype, long); +explicit_same_type_unconsted(cppouttype, unsigned long); +explicit_same_type_unconsted(cppouttype, long long); +explicit_same_type_unconsted(cppouttype, unsigned long long); +explicit_same_type_unconsted(cppouttype, char); +explicit_same_type_unconsted(cppouttype, signed char); +explicit_same_type_unconsted(cppouttype, unsigned char); +explicit_same_type_unconsted(cppouttype, float); +explicit_same_type_unconsted(cppouttype, double); +explicit_same_type_unconsted(cppouttype, size_t); -// int -%typemap(cppouttype) int, const int "int" -%typemap(cppouttype) int*, int&, int[ANY], int[] "int *" -%typemap(cppouttype) const int&, const int*, const int[ANY], const int[] "const int *" -%typemap(cppouttype) unsigned int "unsigned int" -%typemap(cppouttype) const unsigned int "unsigned int" -%typemap(cppouttype) unsigned int*, unsigned int&, unsigned int*, unsigned int[ANY], unsigned int[] "unsigned int *" -%typemap(cppouttype) const unsigned int*, const unsigned int&, const unsigned int[ANY], const unsigned int[] "const unsigned int *" -%typemap(cppouttype) int**, int*&, int*[ANY], int[ANY][ANY] "int **" -%typemap(cppouttype) const int**, const int*&, int const **, int *const &, const int*[ANY], const int[ANY][ANY] "const int **" -%typemap(cppouttype) unsigned int**, unsigned int*&, unsigned int*[ANY], unsigned int[ANY][ANY] "unsigned int **" -%typemap(cppouttype) const unsigned int**,const unsigned int*&, const unsigned int[ANY][ANY] "const unsigned int **" -// constant pointers -%typemap(cppouttype) int * const "int *" -%typemap(cppouttype) int* * const "int* *" -%typemap(cppouttype) const int* * const "int* *" -%typemap(cppouttype) unsigned int * const "unsigned int *" -%typemap(cppouttype) unsigned int* * const "unsigned int* *" -%typemap(cppouttype) const unsigned int* * const "unsigned int* *" - -// long -%typemap(cppouttype) long, const long "long" -%typemap(cppouttype) long*, long&, long[ANY], long[] "long *" -%typemap(cppouttype) const long&, const long*, const long[ANY], const long[] "const long *" -%typemap(cppouttype) unsigned long "unsigned long" -%typemap(cppouttype) const unsigned long "const unsigned long" -%typemap(cppouttype) unsigned long*, unsigned long&, unsigned long*, unsigned long[ANY], unsigned long[] "unsigned long *" -%typemap(cppouttype) const unsigned long*, const unsigned long&, const unsigned long[ANY], const unsigned long[] "const unsigned long *" -%typemap(cppouttype) long**, long*&, long*[ANY], long[ANY][ANY] "long **" -%typemap(cppouttype) const long**, const long*&, const long*[ANY], const long[ANY][ANY] "const long **" -%typemap(cppouttype) unsigned long**, unsigned long*&, unsigned long*[ANY], unsigned long[ANY][ANY] "unsigned long **" -%typemap(cppouttype) const unsigned long**,const unsigned long*&, const unsigned long[ANY][ANY] "const unsigned long **" -// constant pointers -%typemap(cppouttype) long * const "long *" -%typemap(cppouttype) long* * const "long* *" -%typemap(cppouttype) const long* * const "long* *" -%typemap(cppouttype) unsigned long * const "unsigned long *" -%typemap(cppouttype) unsigned long* * const "unsigned long* *" -%typemap(cppouttype) const unsigned long* * const "unsigned long* *" - -// long long -%typemap(cppouttype) long long, const long long "long long" -%typemap(cppouttype) long long*, long long&, long long[ANY], long long[] "long long *" -%typemap(cppouttype) const long long&, const long long*, const long long[ANY], const long long[] "const long long *" -%typemap(cppouttype) unsigned long long "unsigned long long" -%typemap(cppouttype) const unsigned long long "const unsigned long long" -%typemap(cppouttype) unsigned long long*, unsigned long long&, unsigned long long*, unsigned long long[ANY], unsigned long long[] "unsigned long long *" -%typemap(cppouttype) const unsigned long long*, const unsigned long long&, const unsigned long long[ANY], const unsigned long long[] "const unsigned long long *" -%typemap(cppouttype) long long**, long long*&, long long*[ANY], long long[ANY][ANY] "long long **" -%typemap(cppouttype) const long long**, const long long*&, const long long*[ANY], const long long[ANY][ANY] "const long long **" -%typemap(cppouttype) unsigned long long**, unsigned long long*&, unsigned long long*[ANY], unsigned long long[ANY][ANY] "unsigned long long **" -%typemap(cppouttype) const unsigned long long**,const unsigned long long*&, const unsigned long long[ANY][ANY] "const unsigned long long **" -// constant pointers -%typemap(cppouttype) long long * const "long long *" -%typemap(cppouttype) long long* * const "long long* *" -%typemap(cppouttype) const long long* * const "long long* *" -%typemap(cppouttype) unsigned long long * const "unsigned long long *" -%typemap(cppouttype) unsigned long long* * const "unsigned long long* *" -%typemap(cppouttype) const unsigned long long* * const "unsigned long long* *" - -// char: signed/unsigned -%typemap(cppouttype) char, const char "char" -%typemap(cppouttype) char*, char&, char[ANY], char[] "char *" -%typemap(cppouttype) const char&, const char*, const char[ANY], const char[] "const char *" -%typemap(cppouttype) char**, char*&, char*[ANY], char[ANY][ANY] "char **" -%typemap(cppouttype) const char**, const char*&, const char*[ANY], const char[ANY][ANY] "char **" -%typemap(cppouttype) signed char**, signed char*&, signed char*[ANY], signed char[ANY][ANY] "signed char **" -%typemap(cppouttype) const signed char**, const signed char*&, const signed char[ANY][ANY] "const signed char **" -%typemap(cppouttype) signed char "signed char" -%typemap(cppouttype) const signed char "const signed char" -%typemap(cppouttype) signed char*, signed char&, signed char*, signed char[ANY], signed char[] "signed char *" -%typemap(cppouttype) const signed char*, const signed char&, const signed char[ANY], const signed char[] "const $1_ltype" -%typemap(cppouttype) unsigned char**, unsigned char*&, unsigned char*[ANY], unsigned char[ANY][ANY] "unsigned char **" -%typemap(cppouttype) const unsigned char**, const unsigned char*&, const unsigned char[ANY][ANY] "const unsigned char **" -%typemap(cppouttype) unsigned char "unsigned char" -%typemap(cppouttype) const unsigned char "const unsigned char" -%typemap(cppouttype) unsigned char*, unsigned char&, unsigned char*, unsigned char[ANY], unsigned char[] "unsigned char *" -%typemap(cppouttype) const unsigned char*, const unsigned char&, const unsigned char[ANY], const unsigned char[] "const unsigned char *" -// constant pointers -%typemap(cppouttype) char * const "char *" -%typemap(cppouttype) char* * const "char* *" -%typemap(cppouttype) const char* * const "char* *" -%typemap(cppouttype) unsigned char * const "unsigned char *" -%typemap(cppouttype) unsigned char* * const "unsigned char* *" -%typemap(cppouttype) const unsigned char* * const "unsigned char* *" - -// float -%typemap(cppouttype) float, const float "float" -%typemap(cppouttype) float*, float&, float[ANY], float[] "float *" -%typemap(cppouttype) const float&, const float*, const float[ANY], const float[] "const float *" -%typemap(cppouttype) float**, float*&, const float*&, float*[ANY], float[ANY][ANY] "float **" -%typemap(cppouttype) const float**, const float*[ANY], const float[ANY][ANY] "const float **" -// constant pointers -%typemap(cppouttype) float * const "float *" -%typemap(cppouttype) float* * const "float* *" -%typemap(cppouttype) const float* * const "float* *" - -// double -%typemap(cppouttype) double, const double "double" -%typemap(cppouttype) double*, double&, double[ANY], double[] "double *" -%typemap(cppouttype) const double&, const double*, const double[ANY], const double[] "const double *" -%typemap(cppouttype) double**, double*&, const double*&, double*[ANY], double[ANY][ANY] "double **" -%typemap(cppouttype) const double**, const double*[ANY], const double[ANY][ANY] "const double **" -// constant pointers -%typemap(cppouttype) double * const "double *" -%typemap(cppouttype) double* * const "double* *" -%typemap(cppouttype) const double* * const "double* *" - -// size_t -%typemap(cppouttype) size_t, const size_t "size_t" -%typemap(cppouttype) size_t*, size_t&, size_t[ANY], size_t[] "size_t *" -%typemap(cppouttype) const size_t&, const size_t*, const size_t[ANY], const size_t[] "const size_t *" -%typemap(cppouttype) size_t**, size_t*&, size_t*[ANY], size_t[ANY][ANY] "size_t **" -%typemap(cppouttype) const size_t**, const size_t*&, const size_t*[ANY], const size_t[ANY][ANY] "const size_t **" -// constant pointers -%typemap(cppouttype) size_t * const "size_t *" -%typemap(cppouttype) size_t* * const "size_t* *" -%typemap(cppouttype) const size_t* * const "size_t* *" - %typemap(cppouttype, retobj="1") SWIGTYPE "$1_ltype *" %typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |