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

JavaScriptCore: Improved code that uses JSObjectMakeError instead of JSValueToObject to create the exception object.

Browse source 
JSObjectMakeError automatically populates the "message" field, and possibly other fields I don't know about. This seems to be the most robust way to create an exception object.

Thanks to Brian Barnes again for the tip on JSObjectMakeError.
This commit is contained in:
Eric Wing 2014-05-21 03:43:52 -07:00 • committed by Oliver Buchtala
commit 1766e67a1a
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,30 +8,24 @@
#define SWIG_fail goto fail
SWIGRUNTIME void SWIG_Javascript_Raise(JSContextRef context, JSValueRef *exception, const char* type) {
JSStringRef message = JSStringCreateWithUTF8CString(type);
JSStringRef message_property_key;
JSObjectRef exception_object;
JSValueRef exception_value;
JSValueRef message_value;
exception_value = JSValueMakeString(context, message);
/* Converting the result to an object will let JavascriptCore add "sourceURL" (file) and "line" (number) to the exception,
instead of just returning a raw string. This is extremely important for debugging your errors.
*/
exception_object = JSValueToObject(context, exception_value, NULL);
/* Additionally, JSCore uses "message" which contains the error description.
But it seems that unlike "sourceURL" and "line", converting to an object is not automatically doing this.
So we can add it ourselves.
JSStringRef message = JSStringCreateWithUTF8CString(type);
JSValueRef error_arguments[1];
JSObjectRef exception_object;
JSValueRef exception_value;
exception_value = JSValueMakeString(context, message);
/* Converting the result to an object will let JavascriptCore add
"sourceURL" (file) and "line" (number) and "message" to the exception,
instead of just returning a raw string. This is extremely important for debugging your errors.
Using JSObjectMakeError is better than JSValueToObject because the latter only populates
"sourceURL" and "line", but not "message" or any others I don't know about.
*/
message_property_key = JSStringCreateWithUTF8CString("message");
message_value = JSValueMakeString(context, message);
JSObjectSetProperty(context, exception_object, message_property_key, message_value, kJSClassAttributeNone, NULL);
/* Return the exception_object */
*exception = exception_object;
JSStringRelease(message_property_key);
JSStringRelease(message);
error_arguments[0] = exception_value;
exception_object = JSObjectMakeError(context, 1, error_arguments, NULL);
/* Return the exception_object */
*exception = exception_object;
JSStringRelease(message);
}
SWIGRUNTIME void SWIG_JSC_exception(JSContextRef context, JSValueRef *exception, int code, const char* msg) {