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

add missing typecheck codes and Char typemaps

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8216 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-04 21:46:27 +00:00
commit 6374f6824a
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SWIG/Lib/typemaps/string.swg
View file

@ -19,5 +19,6 @@ SWIG_pchar_descriptor()
%include <typemaps/strings.swg>
%typemaps_string(char, Char, SWIG_AsCharPtrAndSize, SWIG_FromCharPtrAndSize, strlen,
%typemaps_string(%checkcode(STRING), %checkcode(CHAR),
char, Char, SWIG_AsCharPtrAndSize, SWIG_FromCharPtrAndSize, strlen,
"<limits.h>", CHAR_MIN, CHAR_MAX)

24
SWIG/Lib/typemaps/strings.swg
View file

@ -17,7 +17,8 @@
* String typemaps for type Char (char or wchar_t)
* ------------------------------------------------------------ */
%define %_typemap_string(Char,
%define %_typemap_string(StringCode,
Char,
SWIG_AsCharPtrAndSize,
SWIG_FromCharPtrAndSize,
SWIG_CharPtrLen,
@ -198,7 +199,7 @@
/* typecheck */
%typemap(typecheck,noblock=1,precedence=SWIG_TYPECHECK_STRING,
%typemap(typecheck,noblock=1,precedence=StringCode,
fragment=#SWIG_AsCharPtr) Char *, Char const*& {
int res = SWIG_AsCharPtr($input, 0, 0);
$1 = SWIG_CheckState(res);
@ -337,7 +338,7 @@
/* typecheck */
%typemap(typecheck,noblock=1,precedence=SWIG_TYPECHECK_STRING,
%typemap(typecheck,noblock=1,precedence=StringCode,
fragment=#SWIG_AsCharArray)
Char [ANY], const Char[ANY] {
int res = SWIG_AsCharArray($input, (Char *)0, $1_dim0);
@ -477,12 +478,13 @@
* ------------------------------------------------------------ */
%define %typemaps_string(Char, CharName,
SWIG_AsCharPtrAndSize,
SWIG_FromCharPtrAndSize,
SWIG_CharPtrLen,
FragLimits, CHAR_MIN, CHAR_MAX)
%define %typemaps_string(StringCode, CharCode,
Char, CharName,
SWIG_AsCharPtrAndSize,
SWIG_FromCharPtrAndSize,
SWIG_CharPtrLen,
FragLimits, CHAR_MIN, CHAR_MAX)
%fragment("SWIG_From"#CharName"Ptr","header",fragment=#SWIG_FromCharPtrAndSize) {
SWIGINTERNINLINE SWIG_Object
SWIG_From##CharName##Ptr(const Char *cptr)
@ -561,8 +563,10 @@ SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val)
}
}
%typemaps_asvalfromn(CharCode, Char);
%_typemap_string(Char,
%_typemap_string(StringCode,
Char,
SWIG_AsCharPtrAndSize,
SWIG_FromCharPtrAndSize,
SWIG_CharPtrLen,

3
SWIG/Lib/typemaps/wstring.swg
View file

@ -19,6 +19,7 @@ SWIG_pwchar_descriptor()
}
%include <typemaps/strings.swg>
%typemaps_string(wchar_t, WChar, SWIG_AsWCharPtrAndSize, SWIG_FromWCharPtrAndSize, wcslen,
%typemaps_string(%checkcode(UNISTRING), %checkcode(UNICHAR),
wchar_t, WChar, SWIG_AsWCharPtrAndSize, SWIG_FromWCharPtrAndSize, wcslen,
"<wchar.h>", WCHAR_MIN, WCHAR_MAX)