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

Fixes in std_string for JSC generator.

Browse source
This commit is contained in:
Oliver Buchtala 2012-12-02 23:51:47 +01:00
commit be06ceea26
1 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/javascript/jsc/std_string.i
View file

@ -15,8 +15,8 @@
std::string SWIGJSC_valueToString(JSContextRef context, JSValueRef value) { std::string SWIGJSC_valueToString(JSContextRef context, JSValueRef value) {
JSStringRef jsstring = JSValueToStringCopy(context, value, /* JSValueRef *exception */ 0); JSStringRef jsstring = JSValueToStringCopy(context, value, /* JSValueRef *exception */ 0);
unsigned int length = JSStringGetLength(jsstring); unsigned int length = JSStringGetLength(jsstring);
char *cstr = new char[length+1]; char *cstr = new char[length + 1];
JSStringGetUTF8CString(jsstring, cstr, length); JSStringGetUTF8CString(jsstring, cstr, length + 1);
// create a copy // create a copy
std::string result(cstr); std::string result(cstr);
@ -38,21 +38,34 @@ JSValueRef SWIGJSC_stringToValue(JSContextRef context, const std::string& s)
%} %}
namespace std { namespace std {
%naturalvar string;
%naturalvar string; class string;
class string;
// string %typemap(in) string
%{
%typemap(in) string, const string& $1 = SWIGJSC_valueToString(context, $input);
%{ %}
$1 = SWIGJSC_valueToString(context, $input);
%}
%typemap(out) string, const string& %typemap(in) const string &
%{ %{
$result = SWIGJSC_stringToValue(context, $1); $1 = new std::string(SWIGJSC_valueToString(context, $input));
%} %}
%typemap(freearg) const string &
%{
delete $1;
%}
%typemap(out) string
%{
$result = SWIGJSC_stringToValue(context, $1);
%}
%typemap(out) const string &
%{
$result = SWIGJSC_stringToValue(context, $1);
%}
} }