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

Add test to check javascript unicode strings.

Browse source
This commit is contained in:
Oliver Buchtala 2013-01-18 15:33:04 +01:00
commit 04cdde0563
4 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/test-suite/javascript/Makefile.in
View file

@ -47,7 +47,8 @@ CPP_TEST_CASES = \
typemap_namespace \ typemap_namespace \
typemap_ns_using \ typemap_ns_using \
using1 \ using1 \
using2 using2 \
javascript_unicode
SKIP_CPP_CASES = @SKIP_CPP_CASES@ SKIP_CPP_CASES = @SKIP_CPP_CASES@
SKIP_C_CASES = @SKIP_C_CASES@ SKIP_C_CASES = @SKIP_C_CASES@
@ -94,7 +95,7 @@ run_testcase = \
# Clean # Clean
%.clean: %.clean:
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile javascript_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile javascript_clean

7
Examples/test-suite/javascript/javascript_unicode_runme.js Normal file
View file

@ -0,0 +1,7 @@
var str = "olé";
var copy = javascript_unicode.copy_string(str);
if (str !== copy) {
print("Error: copy is not equal: original="+str+", copy="+copy);
}

10
Examples/test-suite/javascript_unicode.i Normal file
View file

@ -0,0 +1,10 @@
%module javascript_unicode
%newobject copy_string;
%inline %{
#include <string.h>
const char* copy_string(const char* str) {
return strdup(str);
}
%}

38
Lib/javascript/jsc/javascriptstrings.swg
View file

@ -1,5 +1,5 @@
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* utility methods for char strings * utility methods for char strings
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") { %fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
SWIGINTERN int SWIGINTERN int
@ -8,14 +8,14 @@ SWIG_JSC_AsCharPtrAndSize(JSContextRef context, JSValueRef valRef, char** cptr,
if(JSValueIsString(context, valRef)) { if(JSValueIsString(context, valRef)) {
JSStringRef js_str = JSValueToStringCopy(context, valRef, NULL); JSStringRef js_str = JSValueToStringCopy(context, valRef, NULL);
size_t len = JSStringGetMaximumUTF8CStringSize(js_str); size_t len = JSStringGetMaximumUTF8CStringSize(js_str);
size_t abs_len = JSStringGetLength(js_str);
char* cstr = (char*) malloc(len * sizeof(char)); char* cstr = (char*) malloc(len * sizeof(char));
JSStringGetUTF8CString(js_str, cstr, len); /* JSStringGetUTF8CString returns the length including 0-terminator */
len = JSStringGetUTF8CString(js_str, cstr, len);
if(alloc) *alloc = SWIG_NEWOBJ; if(alloc) *alloc = SWIG_NEWOBJ;
if(psize) *psize = abs_len + 1; if(psize) *psize = len;
if(cptr) *cptr = cstr; if(cptr) *cptr = cstr;
return SWIG_OK; return SWIG_OK;
} else { } else {
if(JSValueIsObject(context, valRef)) { if(JSValueIsObject(context, valRef)) {
@ -47,7 +47,7 @@ SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t siz
if (size > INT_MAX) { if (size > INT_MAX) {
// TODO: handle extra long strings // TODO: handle extra long strings
//swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); //swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
//return pchar_descriptor ? //return pchar_descriptor ?
// SWIG_InternalNewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void(); // SWIG_InternalNewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void();
return JSValueMakeUndefined(context); return JSValueMakeUndefined(context);
} else { } else {
@ -58,7 +58,7 @@ SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t siz
for(i=0;i<size;++i) { for(i=0;i<size;++i) {
c[i] = carray[i]; c[i] = carray[i];
} }
c[size] = 0; c[size] = 0;
jsstring = JSStringCreateWithUTF8CString(c); jsstring = JSStringCreateWithUTF8CString(c);
} else { } else {
jsstring = JSStringCreateWithUTF8CString(carray); jsstring = JSStringCreateWithUTF8CString(carray);
@ -81,19 +81,19 @@ SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t siz
SWIG_NewCopyCharArray, SWIG_NewCopyCharArray,
SWIG_DeleteCharArray, SWIG_DeleteCharArray,
FragLimits, CHAR_MIN, CHAR_MAX) FragLimits, CHAR_MIN, CHAR_MAX)
%fragment("SWIG_From"#CharName"Ptr","header",fragment=#SWIG_FromCharPtrAndSize) { %fragment("SWIG_From"#CharName"Ptr","header",fragment=#SWIG_FromCharPtrAndSize) {
SWIGINTERNINLINE SWIG_Object SWIGINTERNINLINE SWIG_Object
SWIG_JSC_From##CharName##Ptr(JSContextRef context, const Char *cptr) SWIG_JSC_From##CharName##Ptr(JSContextRef context, const Char *cptr)
{ {
return SWIG_JSC_FromCharPtrAndSize(context, cptr, (cptr ? SWIG_CharPtrLen(cptr) : 0)); return SWIG_JSC_FromCharPtrAndSize(context, cptr, (cptr ? SWIG_CharPtrLen(cptr) : 0));
} }
} }
%fragment("SWIG_From"#CharName"Array","header",fragment=#SWIG_FromCharPtrAndSize) { %fragment("SWIG_From"#CharName"Array","header",fragment=#SWIG_FromCharPtrAndSize) {
SWIGINTERNINLINE SWIG_Object SWIGINTERNINLINE SWIG_Object
SWIG_JSC_From##CharName##Array(JSContextRef context, const Char *cptr, size_t size) SWIG_JSC_From##CharName##Array(JSContextRef context, const Char *cptr, size_t size)
{ {
return SWIG_JSC_FromCharPtrAndSize(context, cptr, size); return SWIG_JSC_FromCharPtrAndSize(context, cptr, size);
} }
} }
@ -105,7 +105,7 @@ SWIG_JSC_From##CharName##Array(JSContextRef context, const Char *cptr, size_t si
%fragment("SWIG_As" #CharName "Array","header",fragment=#SWIG_AsCharPtrAndSize) { %fragment("SWIG_As" #CharName "Array","header",fragment=#SWIG_AsCharPtrAndSize) {
SWIGINTERN int SWIGINTERN int
SWIG_JSC_As##CharName##Array(JSContextRef context, SWIG_Object obj, Char *val, size_t size) SWIG_JSC_As##CharName##Array(JSContextRef context, SWIG_Object obj, Char *val, size_t size)
{ {
Char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ; Char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
int res = SWIG_JSC_AsCharPtrAndSize(context, obj, &cptr, &csize, &alloc); int res = SWIG_JSC_AsCharPtrAndSize(context, obj, &cptr, &csize, &alloc);
if (SWIG_IsOK(res)) { if (SWIG_IsOK(res)) {
@ -118,7 +118,7 @@ SWIG_JSC_As##CharName##Array(JSContextRef context, SWIG_Object obj, Char *val, s
if (alloc == SWIG_NEWOBJ) { if (alloc == SWIG_NEWOBJ) {
SWIG_DeleteCharArray(cptr); SWIG_DeleteCharArray(cptr);
res = SWIG_DelNewMask(res); res = SWIG_DelNewMask(res);
} }
return res; return res;
} }
if (alloc == SWIG_NEWOBJ) SWIG_DeleteCharArray(cptr); if (alloc == SWIG_NEWOBJ) SWIG_DeleteCharArray(cptr);
@ -133,8 +133,8 @@ SWIG_JSC_As##CharName##Array(JSContextRef context, SWIG_Object obj, Char *val, s
%fragment(SWIG_From_frag(Char),"header",fragment=#SWIG_FromCharPtrAndSize) { %fragment(SWIG_From_frag(Char),"header",fragment=#SWIG_FromCharPtrAndSize) {
SWIGINTERNINLINE SWIG_Object SWIGINTERNINLINE SWIG_Object
SWIG_From_dec(Char)(Char c) SWIG_From_dec(Char)(Char c)
{ {
return SWIG_JSC_FromCharPtrAndSize(context, &c,1); return SWIG_JSC_FromCharPtrAndSize(context, &c,1);
} }
} }
@ -145,7 +145,7 @@ SWIG_From_dec(Char)(Char c)
fragment=SWIG_AsVal_frag(long)) { fragment=SWIG_AsVal_frag(long)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val) SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val)
{ {
int res = SWIG_As##CharName##Array(obj, val, 1); int res = SWIG_As##CharName##Array(obj, val, 1);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
long v; long v;
@ -162,7 +162,7 @@ SWIG_AsVal_dec(Char)(SWIG_Object obj, Char *val)
} }
} }
%_typemap_string(StringCode, %_typemap_string(StringCode,
Char, Char,
SWIG_AsCharPtrAndSize, SWIG_AsCharPtrAndSize,
SWIG_FromCharPtrAndSize, SWIG_FromCharPtrAndSize,