aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[smjs] fixed spidermonkey error reporting for mozjs52

Browse Source
This commit is contained in:
nobody@earth.com 2021-02-22 17:26:45 +01:00
parent 7f1d718993
commit 7148c15150
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/ecmascript/spidermonkey.c
View File

@ -179,8 +179,13 @@ error_reporter(JSContext *ctx, JSErrorReport *report)
"document raised the following%s%s%s%s", term), "document raised the following%s%s%s%s", term),
strict, exception, warning, error); strict, exception, warning, error);
add_to_string(&msg, ":\n\n"); /* Report message and line number of SpiderMonkey error */
/* Sometimes the line number is zero */
add_to_string(&msg, "\n\n");
add_to_string(&msg, report->message().c_str()); add_to_string(&msg, report->message().c_str());
char str_lineno[256]="";
sprintf(str_lineno,"\n at line: %d",report->lineno);
add_to_string(&msg, str_lineno);
info_box(term, MSGBOX_FREE_TEXT, N_("JavaScript Error"), ALIGN_CENTER, info_box(term, MSGBOX_FREE_TEXT, N_("JavaScript Error"), ALIGN_CENTER,
msg.source); msg.source);
@ -224,12 +229,14 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
interpreter->backend_data = ctx; interpreter->backend_data = ctx;
interpreter->ar = new JSAutoRequest(ctx); interpreter->ar = new JSAutoRequest(ctx);
//JSAutoRequest ar(ctx); // JSAutoRequest ar(ctx);
// JS_SetContextPrivate(ctx, interpreter); // JS_SetContextPrivate(ctx, interpreter);
// JS_SetOptions(main_ctx, JSOPTION_VAROBJFIX | JS_METHODJIT);
/* This is obsolete since mozjs52 */
//JS::SetWarningReporter(ctx, error_reporter);
//JS_SetOptions(main_ctx, JSOPTION_VAROBJFIX | JS_METHODJIT);
JS::SetWarningReporter(ctx, error_reporter);
JS_AddInterruptCallback(ctx, heartbeat_callback); JS_AddInterruptCallback(ctx, heartbeat_callback);
JS::CompartmentOptions options; JS::CompartmentOptions options;
@ -357,6 +364,35 @@ spidermonkey_put_interpreter(struct ecmascript_interpreter *interpreter)
interpreter->ar = nullptr; interpreter->ar = nullptr;
} }
void
spidermonkey_check_for_exception(JSContext *ctx) {
if (JS_IsExceptionPending(ctx))
{
JS::RootedValue exception(ctx);
if(JS_GetPendingException(ctx,&exception) && exception.isObject()) {
JS::AutoSaveExceptionState savedExc(ctx);
JS::Rooted<JSObject*> exceptionObject(ctx, &exception.toObject());
JSErrorReport *report = JS_ErrorFromException(ctx,exceptionObject);
if(report) {
if (report->lineno>0) {
/* Somehow the reporter alway reports first error
* Undefined and with line 0. Let's filter this. */
/* Optional printing javascript error to file */
//FILE *f = fopen("js.err","a");
//PrintError(ctx, f, report->message(), report, true);
/* Send the error to the tui */
error_reporter(ctx, report);
//DBG("file: %s",report->filename);
//DBG("file: %s",report->message());
//DBG("file: %d",(int) report->lineno);
}
}
//JS_ClearPendingException(ctx);
}
}
}
void void
spidermonkey_eval(struct ecmascript_interpreter *interpreter, spidermonkey_eval(struct ecmascript_interpreter *interpreter,
@ -381,6 +417,9 @@ spidermonkey_eval(struct ecmascript_interpreter *interpreter,
JS::CompileOptions options(ctx); JS::CompileOptions options(ctx);
JS::Evaluate(ctx, options, code->source, code->length, &r_val); JS::Evaluate(ctx, options, code->source, code->length, &r_val);
spidermonkey_check_for_exception(ctx);
done_heartbeat(interpreter->heartbeat); done_heartbeat(interpreter->heartbeat);
JS_LeaveCompartment(ctx, comp); JS_LeaveCompartment(ctx, comp);
JS_EndRequest(ctx); JS_EndRequest(ctx);