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

std_basic_string.i fixes

Browse source 
- Remove python code from octave's std_basic_string.i
- Correctly return an error to fix error handling when using std::basic_string in
  overloaded methods - issue #1171.
This commit is contained in:
William S Fulton 2018-01-04 07:00:26 +00:00
commit cd9b7c3c34
6 changed files with 92 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Examples/test-suite/li_std_string_extra.i
View file

@ -49,6 +49,14 @@ std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_
return x; return x;
} }
std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_basic_overload(std::basic_string<char,std::char_traits<char>,std::allocator<char> > x) {
return x;
}
std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_basic_overload(int) {
return "int";
}
#ifdef SWIGPYTHON_BUILTIN #ifdef SWIGPYTHON_BUILTIN
bool is_python_builtin() { return true; } bool is_python_builtin() { return true; }
#else #else

18
Examples/test-suite/python/li_std_string_extra_runme.py
View file

@ -87,6 +87,24 @@ if li_std_string_extra.test_value_basic2(x) != x:
if li_std_string_extra.test_value_basic3(x) != x: if li_std_string_extra.test_value_basic3(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string_extra.test_value_basic_overload(x) != x:
raise RuntimeError, "bad overload string"
if li_std_string_extra.test_value_basic_overload(123) != "int":
raise RuntimeError, "bad overload int"
try:
li_std_string_extra.test_value_basic_overload([x])
raise RuntimeError, "should throw NotImplementedError"
except NotImplementedError:
pass
try:
li_std_string_extra.test_value_basic_overload([123])
raise RuntimeError, "should throw NotImplementedError"
except NotImplementedError:
pass
# Global variables # Global variables
s = "initial string" s = "initial string"
if li_std_string_extra.cvar.GlobalString2 != "global string 2": if li_std_string_extra.cvar.GlobalString2 != "global string 2":

47
Lib/octave/std_basic_string.i
View file

@ -10,24 +10,20 @@
%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
fragment="SWIG_AsCharPtrAndSize") { fragment="SWIG_AsCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<char>)(octave_value obj, std::string **val) SWIG_AsPtr(std::basic_string<char>)(octave_value obj, std::string **val) {
{
if (obj.is_string()) { if (obj.is_string()) {
if (val) if (val)
*val = new std::string(obj.string_value()); *val = new std::string(obj.string_value());
return SWIG_NEWOBJ; return SWIG_NEWOBJ;
} }
if (val) return SWIG_ERROR;
error("a string is expected");
return 0;
} }
} }
%fragment(SWIG_From_frag(std::basic_string<char>),"header", %fragment(SWIG_From_frag(std::basic_string<char>),"header",
fragment="SWIG_FromCharPtrAndSize") { fragment="SWIG_FromCharPtrAndSize") {
SWIGINTERNINLINE octave_value SWIGINTERNINLINE octave_value
SWIG_From(std::basic_string<char>)(const std::string& s) SWIG_From(std::basic_string<char>)(const std::string& s) {
{
return SWIG_FromCharPtrAndSize(s.data(), s.size()); return SWIG_FromCharPtrAndSize(s.data(), s.size());
} }
} }
@ -45,41 +41,20 @@ SWIGINTERNINLINE octave_value
%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_AsWCharPtrAndSize") { fragment="SWIG_AsWCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<wchar_t>)(PyObject* obj, std::wstring **val) SWIG_AsPtr(std::basic_string<wchar_t>)(octave_value obj, std::wstring **val) {
{ if (obj.is_string()) {
static swig_type_info* string_info = if (val)
SWIG_TypeQuery("std::basic_string<wchar_t> *"); *val = new std::wstring(obj.string_value());
std::wstring *vptr; return SWIG_NEWOBJ;
if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
if (val) *val = vptr;
return SWIG_OLDOBJ;
} else {
PyErr_Clear();
wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) {
if (buf) {
if (val) *val = new std::wstring(buf, size - 1);
if (alloc == SWIG_NEWOBJ) %delete_array(buf);
return SWIG_NEWOBJ;
}
} else {
PyErr_Clear();
}
if (val) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_TypeError,"a wstring is expected");
SWIG_PYTHON_THREAD_END_BLOCK;
}
return 0;
}
} }
return SWIG_ERROR;
}
} }
%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_FromWCharPtrAndSize") { fragment="SWIG_FromWCharPtrAndSize") {
SWIGINTERNINLINE PyObject* SWIGINTERNINLINE PyObject*
SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) {
{
return SWIG_FromWCharPtrAndSize(s.data(), s.size()); return SWIG_FromWCharPtrAndSize(s.data(), s.size());
} }
} }

74
Lib/python/std_basic_string.i
View file

@ -9,41 +9,34 @@
%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
fragment="SWIG_AsCharPtrAndSize") { fragment="SWIG_AsCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<char>)(PyObject* obj, std::string **val) SWIG_AsPtr(std::basic_string<char>)(PyObject* obj, std::string **val) {
{ static swig_type_info* string_info = SWIG_TypeQuery("std::basic_string<char> *");
static swig_type_info* string_info = std::string *vptr;
SWIG_TypeQuery("std::basic_string<char> *"); if (SWIG_IsOK(SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0))) {
std::string *vptr;
if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
if (val) *val = vptr; if (val) *val = vptr;
return SWIG_OLDOBJ; return SWIG_OLDOBJ;
} else { } else {
PyErr_Clear(); PyErr_Clear();
char* buf = 0 ; size_t size = 0; int alloc = 0; char* buf = 0 ; size_t size = 0; int alloc = 0;
if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { if (SWIG_IsOK(SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc))) {
if (buf) { if (buf) {
if (val) *val = new std::string(buf, size - 1); if (val) *val = new std::string(buf, size - 1);
if (alloc == SWIG_NEWOBJ) %delete_array(buf); if (alloc == SWIG_NEWOBJ) %delete_array(buf);
return SWIG_NEWOBJ; return SWIG_NEWOBJ;
} else {
if (val) *val = 0;
return SWIG_OLDOBJ;
} }
} else {
PyErr_Clear();
}
if (val) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_TypeError,"a string is expected");
SWIG_PYTHON_THREAD_END_BLOCK;
} }
return 0; return SWIG_ERROR;
} }
} }
} }
%fragment(SWIG_From_frag(std::basic_string<char>),"header", %fragment(SWIG_From_frag(std::basic_string<char>),"header",
fragment="SWIG_FromCharPtrAndSize") { fragment="SWIG_FromCharPtrAndSize") {
SWIGINTERNINLINE PyObject* SWIGINTERNINLINE PyObject*
SWIG_From(std::basic_string<char>)(const std::string& s) SWIG_From(std::basic_string<char>)(const std::string& s) {
{
return SWIG_FromCharPtrAndSize(s.data(), s.size()); return SWIG_FromCharPtrAndSize(s.data(), s.size());
} }
} }
@ -59,41 +52,34 @@ SWIGINTERNINLINE PyObject*
%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_AsWCharPtrAndSize") { fragment="SWIG_AsWCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<wchar_t>)(PyObject* obj, std::wstring **val) SWIG_AsPtr(std::basic_string<wchar_t>)(PyObject* obj, std::wstring **val) {
{ static swig_type_info* string_info = SWIG_TypeQuery("std::basic_string<wchar_t> *");
static swig_type_info* string_info = std::wstring *vptr;
SWIG_TypeQuery("std::basic_string<wchar_t> *"); if (SWIG_IsOK(SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0))) {
std::wstring *vptr; if (val) *val = vptr;
if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) { return SWIG_OLDOBJ;
if (val) *val = vptr; } else {
return SWIG_OLDOBJ; PyErr_Clear();
} else { wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
PyErr_Clear(); if (SWIG_IsOK(SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc))) {
wchar_t *buf = 0 ; size_t size = 0; int alloc = 0; if (buf) {
if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { if (val) *val = new std::wstring(buf, size - 1);
if (buf) { if (alloc == SWIG_NEWOBJ) %delete_array(buf);
if (val) *val = new std::wstring(buf, size - 1); return SWIG_NEWOBJ;
if (alloc == SWIG_NEWOBJ) %delete_array(buf);
return SWIG_NEWOBJ;
}
} else { } else {
PyErr_Clear(); if (val) *val = 0;
} return SWIG_OLDOBJ;
if (val) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_TypeError,"a wstring is expected");
SWIG_PYTHON_THREAD_END_BLOCK;
} }
return 0;
} }
return SWIG_ERROR;
} }
} }
}
%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_FromWCharPtrAndSize") { fragment="SWIG_FromWCharPtrAndSize") {
SWIGINTERNINLINE PyObject* SWIGINTERNINLINE PyObject*
SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) {
{
return SWIG_FromWCharPtrAndSize(s.data(), s.size()); return SWIG_FromWCharPtrAndSize(s.data(), s.size());
} }
} }

60
Lib/ruby/std_basic_string.i
View file

@ -13,36 +13,30 @@
%fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<char>),"header",
fragment="SWIG_AsCharPtrAndSize") { fragment="SWIG_AsCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<char>)(VALUE obj, std::string **val) SWIG_AsPtr(std::basic_string<char>)(VALUE obj, std::string **val) {
{ static swig_type_info* string_info = SWIG_TypeQuery("std::basic_string<char> *");
static swig_type_info* string_info = std::string *vptr;
SWIG_TypeQuery("std::basic_string<char> *"); if (SWIG_IsOK(SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0))) {
std::string *vptr;
if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) {
if (val) *val = vptr; if (val) *val = vptr;
return SWIG_OLDOBJ; return SWIG_OLDOBJ;
} else { } else {
char* buf = 0 ; size_t size = 0; int alloc = 0; char* buf = 0 ; size_t size = 0; int alloc = 0;
if (SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { if (SWIG_IsOK(SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc))) {
if (buf) { if (buf) {
if (val) *val = new std::string(buf, size - 1); if (val) *val = new std::string(buf, size - 1);
if (alloc == SWIG_NEWOBJ) %delete_array(buf); if (alloc == SWIG_NEWOBJ) %delete_array(buf);
return SWIG_NEWOBJ; return SWIG_NEWOBJ;
} }
} }
if (val) { return SWIG_ERROR;
rb_raise( rb_eTypeError, "a string is expected");
}
return 0;
} }
} }
} }
%fragment(SWIG_From_frag(std::basic_string<char>),"header", %fragment(SWIG_From_frag(std::basic_string<char>),"header",
fragment="SWIG_FromCharPtrAndSize") { fragment="SWIG_FromCharPtrAndSize") {
SWIGINTERNINLINE VALUE SWIGINTERNINLINE VALUE
SWIG_From(std::basic_string<char>)(const std::string& s) SWIG_From(std::basic_string<char>)(const std::string& s) {
{
return SWIG_FromCharPtrAndSize(s.data(), s.size()); return SWIG_FromCharPtrAndSize(s.data(), s.size());
} }
} }
@ -65,36 +59,30 @@ SWIGINTERNINLINE VALUE
%fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_AsPtr_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_AsWCharPtrAndSize") { fragment="SWIG_AsWCharPtrAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsPtr(std::basic_string<wchar_t>)(VALUE obj, std::wstring **val) SWIG_AsPtr(std::basic_string<wchar_t>)(VALUE obj, std::wstring **val) {
{ static swig_type_info* string_info = SWIG_TypeQuery("std::basic_string<wchar_t> *");
static swig_type_info* string_info = std::wstring *vptr;
SWIG_TypeQuery("std::basic_string<wchar_t> *"); if (SWIG_IsOK(SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0))) {
std::wstring *vptr; if (val) *val = vptr;
if (SWIG_ConvertPtr(obj, (void**)&vptr, string_info, 0) == SWIG_OK) { return SWIG_OLDOBJ;
if (val) *val = vptr; } else {
return SWIG_OLDOBJ; wchar_t *buf = 0 ; size_t size = 0; int alloc = 0;
} else { if (SWIG_IsOK(SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc))) {
wchar_t *buf = 0 ; size_t size = 0; int alloc = 0; if (buf) {
if (SWIG_AsWCharPtrAndSize(obj, &buf, &size, &alloc) == SWIG_OK) { if (val) *val = new std::wstring(buf, size - 1);
if (buf) { if (alloc == SWIG_NEWOBJ) %delete_array(buf);
if (val) *val = new std::wstring(buf, size - 1); return SWIG_NEWOBJ;
if (alloc == SWIG_NEWOBJ) %delete_array(buf);
return SWIG_NEWOBJ;
}
} }
if (val) {
rb_raise( rb_eTypeError, "a string is expected");
}
return 0;
} }
return SWIG_ERROR;
} }
} }
}
%fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header", %fragment(SWIG_From_frag(std::basic_string<wchar_t>),"header",
fragment="SWIG_FromWCharPtrAndSize") { fragment="SWIG_FromWCharPtrAndSize") {
SWIGINTERNINLINE VALUE SWIGINTERNINLINE VALUE
SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) SWIG_From(std::basic_string<wchar_t>)(const std::wstring& s) {
{
return SWIG_FromWCharPtrAndSize(s.data(), s.size()); return SWIG_FromWCharPtrAndSize(s.data(), s.size());
} }
} }

3
Lib/scilab/std_basic_string.i
View file

@ -21,8 +21,7 @@ SWIG_AsPtr_dec(std::basic_string<char>)(int _iVar, std::basic_string<char> **_ps
delete[] buf; delete[] buf;
} }
return SWIG_NEWOBJ; return SWIG_NEWOBJ;
} } else {
else {
if (_pstValue) { if (_pstValue) {
*_pstValue = NULL; *_pstValue = NULL;
} }