eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dukky: Change from specifically named generics 

Instead of specifically having to extract each generic by name,
such as makeListProxy, instead support the entire generics table
and use `dukky_push_generics()` to gain access to it.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-05-05 21:53:08 +01:00
parent 8474c5d4c0
commit 8b4ec11b89
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ prologue Document()
#include "content/urldb.h"
#define HANDLER_MAGIC MAGIC(HANDLER_MAP)
#define LIST_PROXY_MAGIC MAGIC(LIST_PROXY)
#define GENERICS_MAGIC MAGIC(GENERICS_TABLE)
%}
@ -345,7 +345,7 @@ method Document::getElementsByTagName()
if (nodes == NULL) return 0; /* coerced to undefined */
duk_get_global_string(ctx, LIST_PROXY_MAGIC);
dukky_push_generics(ctx, "makeListProxy");
duk_push_pointer(ctx, nodes);
dukky_create_object(ctx, PROTO_NAME(NODELIST), 1);

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

@ -48,7 +48,7 @@
#define HANDLER_LISTENER_MAGIC MAGIC(HANDLER_LISTENER_MAP)
#define HANDLER_MAGIC MAGIC(HANDLER_MAP)
#define EVENT_LISTENER_JS_MAGIC MAGIC(EVENT_LISTENER_JS_MAP)
#define LIST_PROXY_MAGIC MAGIC(LIST_PROXY)
#define GENERICS_MAGIC MAGIC(GENERICS_TABLE)
static duk_ret_t dukky_populate_object(duk_context *ctx, void *udata)
{
@ -663,11 +663,7 @@ jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
/* ..., Win */
duk_get_prop_string(CTX, -1, "NetSurf");
/* ..., Win, NetSurf */
duk_get_prop_string(CTX, -1, "makeListProxy");
/* ..., Win, NetSurf, MLP */
duk_put_global_string(CTX, LIST_PROXY_MAGIC);
/* ..., Win, NetSurf */
duk_pop(CTX);
duk_put_global_string(CTX, GENERICS_MAGIC);
/* ..., Win */
duk_del_prop_string(CTX, -1, "NetSurf");
duk_pop(CTX);
@ -754,6 +750,17 @@ duk_int_t dukky_pcall(duk_context *ctx, duk_size_t argc, bool reset_timeout)
}
void dukky_push_generics(duk_context *ctx, const char *generic)
{
/* ... */
duk_get_global_string(ctx, GENERICS_MAGIC);
/* ..., generics */
duk_get_prop_string(ctx, -1, generic);
/* ..., generics, generic */
duk_remove(ctx, -2);
/* ..., generic */
}
bool js_exec(jscontext *ctx, const char *txt, size_t txtlen, const char *name)
{
assert(ctx);

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

@ -51,4 +51,7 @@ void dukky_shuffle_array(duk_context *ctx, duk_uarridx_t idx);
/* pcall something, and if it errored, also dump the error to the log */
duk_int_t dukky_pcall(duk_context *ctx, duk_size_t argc, bool reset_timeout);
/* Push a generics function onto the stack */
void dukky_push_generics(duk_context *ctx, const char *generic);
#endif