mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Duktape 2.X: duk_error now returns a duk_ret_t

Browse Source 
https://github.com/svaarala/duktape/blob/master/doc/release-notes-v2-0.rst#duk_error-duk_error_va-duk_throw-duk_fatal-have-a-return-value

This also changes Console.bnd to return on error, rather than ignoring it.
This commit is contained in:
Michael Drake 2017-03-22 15:44:53 +00:00 committed by Michael Drake
parent ff8e5c99a0
commit 5d39972b9f
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/handlers/javascript/duktape/Console.bnd
View File

@ -110,7 +110,7 @@ method Console::time()
return 0;
if (!duk_is_string(ctx, 0)) {
duk_error(ctx, DUK_ERR_ERROR, "Console.time() takes a string");
return duk_error(ctx, DUK_ERR_ERROR, "Console.time() takes a string");
}
duk_set_top(ctx, 1);
@ -136,7 +136,7 @@ method Console::timeEnd()
return 0;
if (!duk_is_string(ctx, 0)) {
duk_error(ctx, DUK_ERR_ERROR, "Console.time() takes a string");
return duk_error(ctx, DUK_ERR_ERROR, "Console.time() takes a string");
}
duk_set_top(ctx, 1);

9
content/handlers/javascript/duktape/Window.bnd
View File

@ -72,8 +72,7 @@ getter Window::console()
if (duk_is_undefined(ctx, -1)) {
duk_pop(ctx);
if (dukky_create_object(ctx, PROTO_NAME(CONSOLE), 0) != DUK_EXEC_SUCCESS) {
duk_error(ctx, DUK_ERR_ERROR, "Unable to create console object");
return 0;
return duk_error(ctx, DUK_ERR_ERROR, "Unable to create console object");
}
duk_dup(ctx, -1);
duk_put_prop_string(ctx, -3, MAGIC(Console));
@ -91,8 +90,7 @@ getter Window::location()
duk_push_pointer(ctx, llcache_handle_get_url(priv->htmlc->base.llcache));
if (dukky_create_object(ctx, PROTO_NAME(LOCATION), 1) != DUK_EXEC_SUCCESS) {
duk_error(ctx, DUK_ERR_ERROR, "Unable to create location object");
return 0;
return duk_error(ctx, DUK_ERR_ERROR, "Unable to create location object");
}
duk_dup(ctx, -1);
duk_put_prop_string(ctx, -3, MAGIC(Location));
@ -110,10 +108,9 @@ getter Window::navigator()
if (dukky_create_object(ctx,
PROTO_NAME(NAVIGATOR),
0) != DUK_EXEC_SUCCESS) {
duk_error(ctx,
return duk_error(ctx,
DUK_ERR_ERROR,
"Unable to create navigator object");
return 0;
}
duk_dup(ctx, -1);
duk_put_prop_string(ctx, -3, MAGIC(Navigator));

3
content/handlers/javascript/duktape/dukky.c
View File

@ -474,8 +474,7 @@ dukky_push_node(duk_context *ctx, struct dom_node *node)
static duk_ret_t
dukky_bad_constructor(duk_context *ctx)
{
duk_error(ctx, DUK_ERR_ERROR, "Bad constructor");
return 0;
return duk_error(ctx, DUK_ERR_ERROR, "Bad constructor");
}
void