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

[ruby] fix support for std::wstring.

Browse source
This commit is contained in:
Takashi Tamura 2017-02-18 16:27:23 +09:00
commit 904bc2ad52
2 changed files with 39 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Lib/ruby/rubywstrings.swg
View file

@ -15,38 +15,17 @@
SWIGINTERN int
SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
{
return SWIG_AsCharPtrAndSize( obj, (char**)cptr, psize, alloc);
// VALUE tmp = 0;
// bool ok = false;
// if ( TYPE(obj) == T_STRING ) {
// if (cptr) {
// obj = tmp = SWIG_Unicode_FromObject(obj);
// ok = true;
// }
// }
// if (ok) {
// Py_ssize_t len = PyUnicode_GetSize(obj);
// rb_notimplement();
// if (cptr) {
// *cptr = %new_array(len + 1, wchar_t);
// SWIG_Unicode_AsWideChar((PyUnicodeObject *)obj, *cptr, len);
// (*cptr)[len] = 0;
// }
// if (psize) *psize = (size_t) len + 1;
// if (alloc) *alloc = cptr ? SWIG_NEWOBJ : 0;
// return SWIG_OK;
// } else {
// swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
// if (pwchar_descriptor) {
// void * vptr = 0;
// if (SWIG_ConvertPtr(obj, &vptr, pwchar_descriptor, 0) == SWIG_OK) {
// if (cptr) *cptr = (wchar_t *)vptr;
// if (psize) *psize = vptr ? (wcslen((wchar_t *)vptr) + 1) : 0;
// return SWIG_OK;
// }
// }
// }
// return SWIG_TypeError;
VALUE tmp;
*alloc = SWIG_NEWOBJ;
if(sizeof(wchar_t) == 4) {
tmp = rb_str_conv_enc(obj, rb_enc_get(obj), rb_to_encoding(rb_str_new_cstr("UTF-32")) );
} else if (sizeof(wchar_t) == 2) {
tmp = rb_str_conv_enc(obj, rb_enc_get(obj), rb_to_encoding(rb_str_new_cstr("UTF-16")) );
} else {
rb_raise(rb_eRuntimeError, "unsupported wchar_t size");
}
return SWIG_AsCharPtrAndSize( tmp, (char**)cptr, psize, alloc);
}
}
@ -54,18 +33,20 @@ SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
SWIGINTERNINLINE VALUE
SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size)
{
return SWIG_FromCharPtrAndSize( (const char*)carray, size);
// if (carray) {
// if (size > INT_MAX) {
// swig_type_info* pwchar_descriptor = SWIG_pwchar_descriptor();
// return pwchar_descriptor ?
// SWIG_NewPointerObj(%const_cast(carray,wchar_t *), pwchar_descriptor, 0) : Qnil;
// } else {
// return SWIG_Unicode_FromWideChar(carray, %numeric_cast(size,int));
// }
// } else {
// return Qnil;
// }
VALUE ret = SWIG_FromCharPtrAndSize( (const char*)carray, size);
rb_encoding* enc = rb_default_internal_encoding();
if(sizeof(wchar_t) == 4) {
rb_enc_associate(ret, rb_to_encoding(rb_str_new_cstr("UTF-32")));
} else if (sizeof(wchar_t) == 2) {
rb_enc_associate(ret, rb_to_encoding(rb_str_new_cstr("UTF-16")));
} else {
rb_raise(rb_eRuntimeError, "unsupported wchar_t size");
}
if( !enc ) {
enc = rb_to_encoding(rb_str_new_cstr("UTF-8"));
}
return rb_str_conv_enc(ret, rb_enc_get(ret), enc );
}
}

14
Lib/ruby/std_wstring.i
View file

@ -1,3 +1,17 @@
%{
#ifdef __cplusplus
extern "C" {
#endif
#ifdef HAVE_RUBY_ENCODING_H
#include "ruby/encoding.h"
#endif
#ifdef __cplusplus
}
#endif
%}
%include <rubywstrings.swg>
%include <typemaps/std_wstring.swg>