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

Revert "Javascript: support null pointers."

Browse source 
This reverts commit 11963788e0.
This commit is contained in:
Oliver Buchtala 2014-05-19 11:46:21 +02:00
commit 7cc617a19d
3 changed files with 7 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/test-suite/javascript/null_pointer_runme.js
View file

@ -1,9 +0,0 @@
var null_pointer = require("null_pointer");
if (!null_pointer.func(null)) {
throw new Error("Javascript 'null' should be converted into NULL.");
}
if (null_pointer.getnull() != null) {
throw new Error("NULL should be converted into Javascript 'null'.");
}

16
Lib/javascript/jsc/javascriptrun.swg
View file

@ -99,9 +99,7 @@ SWIGRUNTIME JSClassRef _SwigObject_classRef;
SWIGRUNTIME int SWIG_JSC_ConvertInstancePtr(JSContextRef context, JSObjectRef objRef, void** ptr, swig_type_info *info, int flags) { SWIGRUNTIME int SWIG_JSC_ConvertInstancePtr(JSContextRef context, JSObjectRef objRef, void** ptr, swig_type_info *info, int flags) {
SwigPrivData *cdata; SwigPrivData *cdata = (SwigPrivData *) JSObjectGetPrivate(objRef);
cdata = (SwigPrivData *) JSObjectGetPrivate(objRef);
if(cdata == NULL) { if(cdata == NULL) {
return SWIG_ERROR; return SWIG_ERROR;
} }
@ -151,23 +149,17 @@ SWIGRUNTIME int SWIG_JSC_ConvertPtr(JSContextRef context, JSValueRef valRef, voi
} }
SWIGRUNTIME JSObjectRef SWIG_JSC_NewPointerObj(JSContextRef context, void *ptr, swig_type_info *info, int flags) { SWIGRUNTIME JSObjectRef SWIG_JSC_NewPointerObj(JSContextRef context, void *ptr, swig_type_info *info, int flags) {
JSClassRef classRef; JSClassRef classRef;
JSObjectRef result;
SwigPrivData *cdata;
if (ptr == NULL) {
return JSValueToObject(context, JSValueMakeNull(context), 0);
}
if(info->clientdata == NULL) { if(info->clientdata == NULL) {
classRef = _SwigObject_classRef; classRef = _SwigObject_classRef;
} else { } else {
classRef = (JSClassRef) info->clientdata; classRef = (JSClassRef) info->clientdata;
} }
result = JSObjectMake(context, classRef, NULL); JSObjectRef result = JSObjectMake(context, classRef, NULL);
cdata = (SwigPrivData*) malloc(sizeof(SwigPrivData)); SwigPrivData* cdata = (SwigPrivData*) malloc(sizeof(SwigPrivData));
cdata->swigCObject = ptr; cdata->swigCObject = ptr;
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0; cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info; cdata->info = info;

12
Lib/javascript/v8/javascriptrun.swg
View file

@ -220,11 +220,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) { int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) {
v8::HandleScope scope; v8::HandleScope scope;
/* special case: JavaScript null => C NULL pointer */
if(valRef->IsNull()) {
*ptr=0;
return SWIG_OK;
}
if(!valRef->IsObject()) { if(!valRef->IsObject()) {
return SWIG_TypeError; return SWIG_TypeError;
} }
@ -232,14 +228,10 @@ int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info
return SWIG_V8_ConvertInstancePtr(objRef, ptr, info, flags); return SWIG_V8_ConvertInstancePtr(objRef, ptr, info, flags);
} }
v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) { v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::FunctionTemplate> class_templ; v8::Handle<v8::FunctionTemplate> class_templ;
if (ptr == NULL) {
return scope.Close(v8::Null());
}
#if (SWIG_V8_VERSION < 0x031900) #if (SWIG_V8_VERSION < 0x031900)
if(info->clientdata != 0) { if(info->clientdata != 0) {
class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ; class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ;