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

[ruby] * rewrite SWIG_AsWCharPtrAndSize and SWIG_FromWCharPtrAndSize

Browse source 
* use UTF-32LE and UTF-16LE to avoid BOM
       * add tests
This commit is contained in:
Takashi Tamura 2017-02-20 17:00:52 +09:00
commit 4009da3588
4 changed files with 64 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/ruby/rubywstrings.swg
View file

@ -8,11 +8,28 @@
SWIGINTERN int
SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
{
VALUE tmp = rb_str_conv_enc(obj, rb_enc_get(obj),
rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )) );
*alloc = SWIG_NEWOBJ;
return SWIG_AsCharPtrAndSize(tmp, (char**)cptr, psize, alloc);
if (TYPE(obj) == T_STRING) {
VALUE tmp = rb_str_conv_enc(obj, rb_enc_get(obj),
rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )) );
wchar_t* cstr = (wchar_t*) StringValuePtr(tmp);
size_t size = RSTRING_LEN(tmp) / sizeof(wchar_t) + 1;
if( RSTRING_LEN(tmp) % sizeof(wchar_t) != 0 ) {
rb_raise(rb_eRuntimeError,
"The length of the byte sequence of converted string is not a multiplier of sizeof(wchar_t). Invalid byte sequence is given. Or invalid SWIG_RUBY_WSTRING_ENCODING is given when compiling this binding.");
}
if (cptr && alloc) {
*alloc = SWIG_NEWOBJ;
*cptr = %new_array(size, wchar_t);
memmove(*cptr, cstr, RSTRING_LEN(tmp));
}
if(psize) *psize = size;
return SWIG_OK;
} else {
return SWIG_TypeError;
}
}
}
@ -20,15 +37,19 @@ SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
SWIGINTERNINLINE VALUE
SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size)
{
VALUE ret = SWIG_FromCharPtrAndSize( (const char*)carray, size);
rb_encoding* enc = rb_default_internal_encoding();
if (carray && size <= LONG_MAX) {
VALUE ret = rb_str_new( (const char*)carray, %numeric_cast(size*sizeof(wchar_t),long) );
rb_encoding* new_enc = rb_default_internal_encoding();
rb_enc_associate(ret, rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )) );
rb_enc_associate(ret, rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )) );
if( !enc ) {
enc = rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_INTERNAL_ENCODING ));
if( !new_enc ) {
new_enc = rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_INTERNAL_ENCODING ));
}
return rb_str_conv_enc(ret, rb_enc_get(ret), new_enc);
} else {
return Qnil;
}
return rb_str_conv_enc(ret, rb_enc_get(ret), enc);
}
}

4
Lib/ruby/std_wstring.i
View file

@ -15,9 +15,9 @@ extern "C" {
#ifndef SWIG_RUBY_WSTRING_ENCODING
#if WCHAR_MAX == 0x7fff || WCHAR_MAX == 0xffff
#define SWIG_RUBY_WSTRING_ENCODING "UTF-16"
#define SWIG_RUBY_WSTRING_ENCODING "UTF-16LE"
#elif WCHAR_MAX == 0x7fffffff || WCHAR_MAX == 0xffffffff
#define SWIG_RUBY_WSTRING_ENCODING "UTF-32"
#define SWIG_RUBY_WSTRING_ENCODING "UTF-32LE"
#else
#error unsupported wchar_t size. SWIG_RUBY_WSTRING_ENCODING must be given.
#endif