nsgenbind: branch vince/interfacemap updated. release/0.1.0-23-gd67501b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/d67501b49bb147ac878...
...commit http://git.netsurf-browser.org/nsgenbind.git/commit/d67501b49bb147ac87846...
...tree http://git.netsurf-browser.org/nsgenbind.git/tree/d67501b49bb147ac8784618...
The branch, vince/interfacemap has been updated
via d67501b49bb147ac8784618906c024906ae25cbc (commit)
from ef1eb5b59df798dc9a3e8df93fe46500aa4244e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=d67501b49bb147ac8...
commit d67501b49bb147ac8784618906c024906ae25cbc
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Add prototype generation
diff --git a/src/duk-libdom.c b/src/duk-libdom.c
index ee45eaf..b372df7 100644
--- a/src/duk-libdom.c
+++ b/src/duk-libdom.c
@@ -186,9 +186,11 @@ static int output_ducky_safe_get_private(FILE* outf, char *class_name, int idx)
static int
output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
{
+ int init_argc;
+
/* constructor definition */
fprintf(outf,
- "duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
+ "static duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
DLPFX, interfacee->class_name);
fprintf(outf,"{\n");
@@ -196,8 +198,15 @@ output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
/* generate call to initialisor */
fprintf(outf,
- "\t%s_%s___init(ctx, priv, duk_get_pointer(ctx, 1));\n",
+ "\t%s_%s___init(ctx, priv",
DLPFX, interfacee->class_name);
+ for (init_argc = 1;
+ init_argc <= interfacee->class_init_argc;
+ init_argc++) {
+ fprintf(outf, ", duk_get_pointer(ctx, %d)", init_argc);
+ }
+ fprintf(outf, ");\n");
+
fprintf(outf, "\tduk_set_top(ctx, 1);\n");
fprintf(outf, "\treturn 1;\n");
@@ -215,7 +224,7 @@ output_interface_destructor(FILE* outf, struct interface_map_entry *interfacee)
{
/* destructor definition */
fprintf(outf,
- "duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
+ "static duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
DLPFX, interfacee->class_name);
fprintf(outf,"{\n");
@@ -351,11 +360,15 @@ output_interface_init(FILE* outf,
"void %s_%s___init(duk_context *ctx, %s_private_t *priv",
DLPFX, interfacee->class_name, interfacee->class_name);
+ /* count the number of arguments on the initializer */
+ interfacee->class_init_argc = 0;
+
/* output the paramters on the method (if any) */
param_node = genbind_node_find_type(
genbind_node_getnode(init_node),
NULL, GENBIND_NODE_TYPE_PARAMETER);
while (param_node != NULL) {
+ interfacee->class_init_argc++;
fprintf(outf, ", ");
output_cdata(outf, param_node, GENBIND_NODE_TYPE_TYPE);
output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
@@ -402,8 +415,8 @@ output_interface_fini(FILE* outf,
/* finaliser definition */
fprintf(outf,
- "void dukky_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
- interfacee->class_name, interfacee->class_name);
+ "void %s_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
+ DLPFX, interfacee->class_name, interfacee->class_name);
fprintf(outf,"{\n");
/* generate log statement */
@@ -418,14 +431,107 @@ output_interface_fini(FILE* outf,
/* if this interface inherits ensure we call its finaliser */
if (inherite != NULL) {
fprintf(outf,
- "\tdukky_%s___fini(ctx, &priv->parent);\n",
- inherite->class_name);
+ "\t%s_%s___fini(ctx, &priv->parent);\n",
+ DLPFX, inherite->class_name);
}
fprintf(outf, "}\n\n");
return 0;
}
+/**
+ * generate code that gets a prototype by name
+ */
+static int output_get_prototype(FILE* outf, const char *interface_name)
+{
+ char *proto_name;
+ int pnamelen;
+
+ /* duplicate the interface name in upper case */
+ pnamelen = strlen(interface_name) + 1; /* allow for null byte */
+ proto_name = malloc(pnamelen);
+ for ( ; pnamelen >= 0; pnamelen--) {
+ proto_name[pnamelen] = toupper(interface_name[pnamelen]);
+ }
+
+ fprintf(outf,"\tduk_get_global_string(ctx, PROTO_MAGIC);\n");
+ fprintf(outf,"\tduk_get_prop_string(ctx, -1, PROTO_NAME(%s));\n",
+ proto_name);
+ fprintf(outf,"\tduk_replace(ctx, -2);\n");
+
+ free(proto_name);
+
+ return 0;
+}
+
+/**
+ * generate code that sets a destructor in a prototype
+ */
+static int output_set_destructor(FILE* outf, char *class_name, int idx)
+{
+ fprintf(outf, "\t/* Set the destructor */\n");
+ fprintf(outf, "\tduk_dup(ctx, %d);\n", idx);
+ fprintf(outf, "\tduk_push_c_function(ctx, %s_%s___destructor, 1);\n",
+ DLPFX, class_name);
+ fprintf(outf, "\tduk_set_finalizer(ctx, -2);\n");
+ fprintf(outf, "\tduk_pop(ctx);\n\n");
+
+ return 0;
+}
+
+/**
+ * generate code that sets a constructor in a prototype
+ */
+static int
+output_set_constructor(FILE* outf, char *class_name, int idx, int argc)
+{
+ fprintf(outf, "\t/* Set the constructor */\n");
+ fprintf(outf, "\tduk_dup(ctx, %d);\n", idx);
+ fprintf(outf, "\tduk_push_c_function(ctx, %s_%s___constructor, %d);\n",
+ DLPFX, class_name, 1 + argc);
+ fprintf(outf, "\tduk_put_prop_string(ctx, -2, INIT_MAGIC);\n");
+ fprintf(outf, "\tduk_pop(ctx);\n\n");
+
+ return 0;
+}
+
+/**
+ * generate the interface prototype creator
+ */
+static int
+output_interface_prototype(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ /* prototype definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___proto(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ /* generate prototype chaining if interface has a parent */
+ if (inherite != NULL) {
+ fprintf(outf,
+ "\t/* Set this prototype's prototype (left-parent) */\n");
+ output_get_prototype(outf, inherite->name);
+ fprintf(outf, "\tduk_set_prototype(ctx, 0);\n\n");
+ }
+
+ /* generate setting of destructor */
+ output_set_destructor(outf, interfacee->class_name, 0);
+
+ /* generate setting of constructor */
+ output_set_constructor(outf,
+ interfacee->class_name,
+ 0,
+ interfacee->class_init_argc);
+
+ fprintf(outf,"\treturn 1; /* The prototype object */\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
/**
* generate a source file to implement an interface using duk and libdom.
@@ -494,6 +600,9 @@ static int output_interface(struct genbind_node *genbind,
/* destructor */
output_interface_destructor(ifacef, interfacee);
+ /* prototype */
+ output_interface_prototype(ifacef, interfacee, inherite);
+
fprintf(ifacef, "\n");
/* class epilogue */
diff --git a/src/interface-map.h b/src/interface-map.h
index 8a6ac05..7373580 100644
--- a/src/interface-map.h
+++ b/src/interface-map.h
@@ -38,6 +38,9 @@ struct interface_map_entry {
* might lowercase the name or add underscores
* instead of caps
*/
+ int class_init_argc; /**< The number of parameters on the class
+ * initializer.
+ */
};
struct interface_map {
-----------------------------------------------------------------------
Summary of changes:
src/duk-libdom.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++---
src/interface-map.h | 3 ++
2 files changed, 119 insertions(+), 7 deletions(-)
diff --git a/src/duk-libdom.c b/src/duk-libdom.c
index ee45eaf..b372df7 100644
--- a/src/duk-libdom.c
+++ b/src/duk-libdom.c
@@ -186,9 +186,11 @@ static int output_ducky_safe_get_private(FILE* outf, char *class_name, int idx)
static int
output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
{
+ int init_argc;
+
/* constructor definition */
fprintf(outf,
- "duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
+ "static duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
DLPFX, interfacee->class_name);
fprintf(outf,"{\n");
@@ -196,8 +198,15 @@ output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
/* generate call to initialisor */
fprintf(outf,
- "\t%s_%s___init(ctx, priv, duk_get_pointer(ctx, 1));\n",
+ "\t%s_%s___init(ctx, priv",
DLPFX, interfacee->class_name);
+ for (init_argc = 1;
+ init_argc <= interfacee->class_init_argc;
+ init_argc++) {
+ fprintf(outf, ", duk_get_pointer(ctx, %d)", init_argc);
+ }
+ fprintf(outf, ");\n");
+
fprintf(outf, "\tduk_set_top(ctx, 1);\n");
fprintf(outf, "\treturn 1;\n");
@@ -215,7 +224,7 @@ output_interface_destructor(FILE* outf, struct interface_map_entry *interfacee)
{
/* destructor definition */
fprintf(outf,
- "duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
+ "static duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
DLPFX, interfacee->class_name);
fprintf(outf,"{\n");
@@ -351,11 +360,15 @@ output_interface_init(FILE* outf,
"void %s_%s___init(duk_context *ctx, %s_private_t *priv",
DLPFX, interfacee->class_name, interfacee->class_name);
+ /* count the number of arguments on the initializer */
+ interfacee->class_init_argc = 0;
+
/* output the paramters on the method (if any) */
param_node = genbind_node_find_type(
genbind_node_getnode(init_node),
NULL, GENBIND_NODE_TYPE_PARAMETER);
while (param_node != NULL) {
+ interfacee->class_init_argc++;
fprintf(outf, ", ");
output_cdata(outf, param_node, GENBIND_NODE_TYPE_TYPE);
output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
@@ -402,8 +415,8 @@ output_interface_fini(FILE* outf,
/* finaliser definition */
fprintf(outf,
- "void dukky_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
- interfacee->class_name, interfacee->class_name);
+ "void %s_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
+ DLPFX, interfacee->class_name, interfacee->class_name);
fprintf(outf,"{\n");
/* generate log statement */
@@ -418,14 +431,107 @@ output_interface_fini(FILE* outf,
/* if this interface inherits ensure we call its finaliser */
if (inherite != NULL) {
fprintf(outf,
- "\tdukky_%s___fini(ctx, &priv->parent);\n",
- inherite->class_name);
+ "\t%s_%s___fini(ctx, &priv->parent);\n",
+ DLPFX, inherite->class_name);
}
fprintf(outf, "}\n\n");
return 0;
}
+/**
+ * generate code that gets a prototype by name
+ */
+static int output_get_prototype(FILE* outf, const char *interface_name)
+{
+ char *proto_name;
+ int pnamelen;
+
+ /* duplicate the interface name in upper case */
+ pnamelen = strlen(interface_name) + 1; /* allow for null byte */
+ proto_name = malloc(pnamelen);
+ for ( ; pnamelen >= 0; pnamelen--) {
+ proto_name[pnamelen] = toupper(interface_name[pnamelen]);
+ }
+
+ fprintf(outf,"\tduk_get_global_string(ctx, PROTO_MAGIC);\n");
+ fprintf(outf,"\tduk_get_prop_string(ctx, -1, PROTO_NAME(%s));\n",
+ proto_name);
+ fprintf(outf,"\tduk_replace(ctx, -2);\n");
+
+ free(proto_name);
+
+ return 0;
+}
+
+/**
+ * generate code that sets a destructor in a prototype
+ */
+static int output_set_destructor(FILE* outf, char *class_name, int idx)
+{
+ fprintf(outf, "\t/* Set the destructor */\n");
+ fprintf(outf, "\tduk_dup(ctx, %d);\n", idx);
+ fprintf(outf, "\tduk_push_c_function(ctx, %s_%s___destructor, 1);\n",
+ DLPFX, class_name);
+ fprintf(outf, "\tduk_set_finalizer(ctx, -2);\n");
+ fprintf(outf, "\tduk_pop(ctx);\n\n");
+
+ return 0;
+}
+
+/**
+ * generate code that sets a constructor in a prototype
+ */
+static int
+output_set_constructor(FILE* outf, char *class_name, int idx, int argc)
+{
+ fprintf(outf, "\t/* Set the constructor */\n");
+ fprintf(outf, "\tduk_dup(ctx, %d);\n", idx);
+ fprintf(outf, "\tduk_push_c_function(ctx, %s_%s___constructor, %d);\n",
+ DLPFX, class_name, 1 + argc);
+ fprintf(outf, "\tduk_put_prop_string(ctx, -2, INIT_MAGIC);\n");
+ fprintf(outf, "\tduk_pop(ctx);\n\n");
+
+ return 0;
+}
+
+/**
+ * generate the interface prototype creator
+ */
+static int
+output_interface_prototype(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ /* prototype definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___proto(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ /* generate prototype chaining if interface has a parent */
+ if (inherite != NULL) {
+ fprintf(outf,
+ "\t/* Set this prototype's prototype (left-parent) */\n");
+ output_get_prototype(outf, inherite->name);
+ fprintf(outf, "\tduk_set_prototype(ctx, 0);\n\n");
+ }
+
+ /* generate setting of destructor */
+ output_set_destructor(outf, interfacee->class_name, 0);
+
+ /* generate setting of constructor */
+ output_set_constructor(outf,
+ interfacee->class_name,
+ 0,
+ interfacee->class_init_argc);
+
+ fprintf(outf,"\treturn 1; /* The prototype object */\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
/**
* generate a source file to implement an interface using duk and libdom.
@@ -494,6 +600,9 @@ static int output_interface(struct genbind_node *genbind,
/* destructor */
output_interface_destructor(ifacef, interfacee);
+ /* prototype */
+ output_interface_prototype(ifacef, interfacee, inherite);
+
fprintf(ifacef, "\n");
/* class epilogue */
diff --git a/src/interface-map.h b/src/interface-map.h
index 8a6ac05..7373580 100644
--- a/src/interface-map.h
+++ b/src/interface-map.h
@@ -38,6 +38,9 @@ struct interface_map_entry {
* might lowercase the name or add underscores
* instead of caps
*/
+ int class_init_argc; /**< The number of parameters on the class
+ * initializer.
+ */
};
struct interface_map {
--
NetSurf Generator for JavaScript bindings
8 years, 4 months
- 1
- 0
netsurf-website: branch master updated. 53f616ee0105b71a24f918cd7e079ab7397f9e65
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/53f616ee0105b...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/53f616ee0105b71...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/53f616ee0105b71a2...
The branch, master has been updated
via 53f616ee0105b71a24f918cd7e079ab7397f9e65 (commit)
via 386b719857789ba7dc71fadf99f6427e8c5eaf1e (commit)
from 185e9f5e9ceb27a950bd578770d71065e98d8341 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=53f616ee010...
commit 53f616ee0105b71a24f918cd7e079ab7397f9e65
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Update news.
diff --git a/about/news.html b/about/news.html
index b499a7a..9c63229 100644
--- a/about/news.html
+++ b/about/news.html
@@ -58,6 +58,8 @@
<h1>News</h1>
<dl class="news">
+<dt><a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">Developer weekend</a> <span>27 Jul 2015</span></dt>
+<dd>NetSurf's core developers met up at <a href="http://www.codethink.co.uk/">Codethink</a>'s office in Manchester to make some progress on a couple of the big areas we've been planning for some time. We made a start at changing to use <a href="http://duktape.org/">Duktape</a> as the JavaScript engine, and started outlining the shape of our <a href="http://source.netsurf-browser.org/libnslayout.git/">new layout engine</a>. For more details, see Vince's <a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">write-up</a>.</dd>
<dt><a href="/downloads/">NetSurf 3.3 released</a> <span>15 Mar 2015</span></dt>
<dd>NetSurf 3.3 is primarily a bug-fix release. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the AmigaOS front ends has gained the beginnings of support for AmigaOS 3. We recommend all users upgrade.</dd>
<dt><a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">Developer weekend</a> <span>17 Nov 2014</span></dt>
diff --git a/index.html b/index.html
index 4b0d970..eaeaada 100644
--- a/index.html
+++ b/index.html
@@ -147,12 +147,12 @@
<h2 id="news">Latest news</h2>
<dl class="frontnews">
+<dt><a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">Developer weekend</a> <span>27 Jul 2015</span></dt>
+<dd>NetSurf's core developers met up at <a href="http://www.codethink.co.uk/">Codethink</a>'s office in Manchester to make some progress on a couple of the big areas we've been planning for some time. We made a start at changing to use <a href="http://duktape.org/">Duktape</a> as the JavaScript engine, and started outlining the shape of our <a href="http://source.netsurf-browser.org/libnslayout.git/">new layout engine</a>. For more details, see Vince's <a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">write-up</a>.</dd>
<dt><a href="/downloads/">NetSurf 3.3 released</a> <span>15 Mar 2015</span></dt>
<dd>NetSurf 3.3 is primarily a bug-fix release. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the AmigaOS front ends has gained the beginnings of support for AmigaOS 3. We recommend all users upgrade.</dd>
<dt><a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">Developer weekend</a> <span>17 Nov 2014</span></dt>
<dd>The core NetSurf developers gathered in Manchester, UK to discuss the future direction of the project, and to make some progress in key areas. Vince has <a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">written up an account</a> of the event, and a <a href="http://wiki.netsurf-browser.org/Developer_Weekend_%28Nov_2014%29#Discussions">record of our discussions</a> has been posted on the wiki. Many thanks to <a href="http://www.codethink.co.uk/">Codethink</a> for hosting our developer weekend.</dd>
-<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
-<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
</dl>
<p class="more"><a href="/about/news" class="seemore">See more news</a></p>
commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=386b7198577...
commit 386b719857789ba7dc71fadf99f6427e8c5eaf1e
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Ignore ~ backups.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
about/news.html | 2 ++
index.html | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/about/news.html b/about/news.html
index b499a7a..9c63229 100644
--- a/about/news.html
+++ b/about/news.html
@@ -58,6 +58,8 @@
<h1>News</h1>
<dl class="news">
+<dt><a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">Developer weekend</a> <span>27 Jul 2015</span></dt>
+<dd>NetSurf's core developers met up at <a href="http://www.codethink.co.uk/">Codethink</a>'s office in Manchester to make some progress on a couple of the big areas we've been planning for some time. We made a start at changing to use <a href="http://duktape.org/">Duktape</a> as the JavaScript engine, and started outlining the shape of our <a href="http://source.netsurf-browser.org/libnslayout.git/">new layout engine</a>. For more details, see Vince's <a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">write-up</a>.</dd>
<dt><a href="/downloads/">NetSurf 3.3 released</a> <span>15 Mar 2015</span></dt>
<dd>NetSurf 3.3 is primarily a bug-fix release. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the AmigaOS front ends has gained the beginnings of support for AmigaOS 3. We recommend all users upgrade.</dd>
<dt><a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">Developer weekend</a> <span>17 Nov 2014</span></dt>
diff --git a/index.html b/index.html
index 4b0d970..eaeaada 100644
--- a/index.html
+++ b/index.html
@@ -147,12 +147,12 @@
<h2 id="news">Latest news</h2>
<dl class="frontnews">
+<dt><a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">Developer weekend</a> <span>27 Jul 2015</span></dt>
+<dd>NetSurf's core developers met up at <a href="http://www.codethink.co.uk/">Codethink</a>'s office in Manchester to make some progress on a couple of the big areas we've been planning for some time. We made a start at changing to use <a href="http://duktape.org/">Duktape</a> as the JavaScript engine, and started outlining the shape of our <a href="http://source.netsurf-browser.org/libnslayout.git/">new layout engine</a>. For more details, see Vince's <a href="http://vincentsanders.blogspot.co.uk/2015/07/netsurf-developers-and-order...">write-up</a>.</dd>
<dt><a href="/downloads/">NetSurf 3.3 released</a> <span>15 Mar 2015</span></dt>
<dd>NetSurf 3.3 is primarily a bug-fix release. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the AmigaOS front ends has gained the beginnings of support for AmigaOS 3. We recommend all users upgrade.</dd>
<dt><a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">Developer weekend</a> <span>17 Nov 2014</span></dt>
<dd>The core NetSurf developers gathered in Manchester, UK to discuss the future direction of the project, and to make some progress in key areas. Vince has <a href="http://vincentsanders.blogspot.co.uk/2014/11/netsurf-developer-workshop-i...">written up an account</a> of the event, and a <a href="http://wiki.netsurf-browser.org/Developer_Weekend_%28Nov_2014%29#Discussions">record of our discussions</a> has been posted on the wiki. Many thanks to <a href="http://www.codethink.co.uk/">Codethink</a> for hosting our developer weekend.</dd>
-<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
-<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
</dl>
<p class="more"><a href="/about/news" class="seemore">See more news</a></p>
--
NetSurf website source for *.netsurf-browser.org
8 years, 4 months
- 1
- 0
netsurf: branch chris/display-idna updated. release/3.3-244-g860b983
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/860b983c7a54713907a91...
...commit http://git.netsurf-browser.org/netsurf.git/commit/860b983c7a54713907a915b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/860b983c7a54713907a915bd3...
The branch, chris/display-idna has been updated
via 860b983c7a54713907a915bd340257536132423c (commit)
via 7d4160c7d703ba4994afc5e6f4a613bf07108130 (commit)
from b178721ad0f71d32db91cd7b96be04778c9c2102 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=860b983c7a54713907a...
commit 860b983c7a54713907a915bd340257536132423c
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update RISC OS frontend to new API
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index ef1b4ad..a9904de 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -2345,7 +2345,6 @@ nserror gui_window_set_url(struct gui_window *gw, nsurl *url)
struct nsgtk_scaffolding *g;
size_t idn_url_l;
char *idn_url_s = NULL;
- nserror err;
g = nsgtk_get_scaffold(gw);
if (g->top_level == gw) {
diff --git a/riscos/window.c b/riscos/window.c
index dbed46d..59c24ac 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1038,16 +1038,20 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
/* exported function documented in riscos/window.h */
nserror ro_gui_window_set_url(struct gui_window *g, nsurl *url)
{
- char *idn_url = NULL;
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
if (g->toolbar) {
- if (nsoption_bool(display_decoded_idn) == false) {
- ro_toolbar_set_url(g->toolbar, nsurl_access(url), true, false);
- } else {
- idn_url = nsurl_access_utf8(url);
- ro_toolbar_set_url(g->toolbar, idn_url, true, false);
- free(idn_url);
+ if (nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) != NSERROR_OK)
+ idn_url_s = NULL;
}
+
+ ro_toolbar_set_url(g->toolbar, idn_url_s ? idn_url_s : nsurl_access(url), true, false);
+
+ if (idn_url_s)
+ free(idn_url_s);
+
ro_gui_url_complete_start(g->toolbar);
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7d4160c7d703ba4994a...
commit 7d4160c7d703ba4994afc5e6f4a613bf07108130
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update gtk frontend to new API
diff --git a/amiga/gui.c b/amiga/gui.c
index f491480..207a496 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4999,7 +4999,7 @@ static nserror gui_window_set_url(struct gui_window *g, nsurl *url)
if(!g) return NSERROR_OK;
- if (g == g->shared->gw) {
+ if(g == g->shared->gw) {
if(nsoption_bool(display_decoded_idn) == true) {
if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
url_lc = ami_utf8_easy(idn_url_s);
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index dc03d94..ef1b4ad 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -2343,16 +2343,22 @@ void nsgtk_window_set_title(struct gui_window *gw, const char *title)
nserror gui_window_set_url(struct gui_window *gw, nsurl *url)
{
struct nsgtk_scaffolding *g;
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
+ nserror err;
g = nsgtk_get_scaffold(gw);
if (g->top_level == gw) {
- if (nsoption_bool(display_decoded_idn) == false) {
- gtk_entry_set_text(GTK_ENTRY(g->url_bar), nsurl_access(url));
- } else {
- char *idn_url = nsurl_access_utf8(url);
- gtk_entry_set_text(GTK_ENTRY(g->url_bar), idn_url);
- free(idn_url);
+ if (nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) != NSERROR_OK)
+ idn_url_s = NULL;
}
+
+ gtk_entry_set_text(GTK_ENTRY(g->url_bar), idn_url_s ? idn_url_s : nsurl_access(url));
+
+ if(idn_url_s)
+ free(idn_url_s);
+
gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1);
}
return NSERROR_OK;
diff --git a/utils/nsurl.h b/utils/nsurl.h
index 383b357..85e46df 100644
--- a/utils/nsurl.h
+++ b/utils/nsurl.h
@@ -183,7 +183,7 @@ const char *nsurl_access(const nsurl *url);
/**
* Access a NetSurf URL object as a UTF-8 string (for human readable IDNs)
*
- * \param url NetSurf URL to retrieve a string pointer for.
+ * \param url NetSurf URL object
* \param url_s Returns a url string
* \param url_l Returns length of url_s
* \return NSERROR_OK on success, appropriate error otherwise
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 2 +-
gtk/scaffolding.c | 17 +++++++++++------
riscos/window.c | 18 +++++++++++-------
utils/nsurl.h | 2 +-
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index f491480..207a496 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4999,7 +4999,7 @@ static nserror gui_window_set_url(struct gui_window *g, nsurl *url)
if(!g) return NSERROR_OK;
- if (g == g->shared->gw) {
+ if(g == g->shared->gw) {
if(nsoption_bool(display_decoded_idn) == true) {
if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
url_lc = ami_utf8_easy(idn_url_s);
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index dc03d94..a9904de 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -2343,16 +2343,21 @@ void nsgtk_window_set_title(struct gui_window *gw, const char *title)
nserror gui_window_set_url(struct gui_window *gw, nsurl *url)
{
struct nsgtk_scaffolding *g;
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
g = nsgtk_get_scaffold(gw);
if (g->top_level == gw) {
- if (nsoption_bool(display_decoded_idn) == false) {
- gtk_entry_set_text(GTK_ENTRY(g->url_bar), nsurl_access(url));
- } else {
- char *idn_url = nsurl_access_utf8(url);
- gtk_entry_set_text(GTK_ENTRY(g->url_bar), idn_url);
- free(idn_url);
+ if (nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) != NSERROR_OK)
+ idn_url_s = NULL;
}
+
+ gtk_entry_set_text(GTK_ENTRY(g->url_bar), idn_url_s ? idn_url_s : nsurl_access(url));
+
+ if(idn_url_s)
+ free(idn_url_s);
+
gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1);
}
return NSERROR_OK;
diff --git a/riscos/window.c b/riscos/window.c
index dbed46d..59c24ac 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1038,16 +1038,20 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
/* exported function documented in riscos/window.h */
nserror ro_gui_window_set_url(struct gui_window *g, nsurl *url)
{
- char *idn_url = NULL;
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
if (g->toolbar) {
- if (nsoption_bool(display_decoded_idn) == false) {
- ro_toolbar_set_url(g->toolbar, nsurl_access(url), true, false);
- } else {
- idn_url = nsurl_access_utf8(url);
- ro_toolbar_set_url(g->toolbar, idn_url, true, false);
- free(idn_url);
+ if (nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) != NSERROR_OK)
+ idn_url_s = NULL;
}
+
+ ro_toolbar_set_url(g->toolbar, idn_url_s ? idn_url_s : nsurl_access(url), true, false);
+
+ if (idn_url_s)
+ free(idn_url_s);
+
ro_gui_url_complete_start(g->toolbar);
}
diff --git a/utils/nsurl.h b/utils/nsurl.h
index 383b357..85e46df 100644
--- a/utils/nsurl.h
+++ b/utils/nsurl.h
@@ -183,7 +183,7 @@ const char *nsurl_access(const nsurl *url);
/**
* Access a NetSurf URL object as a UTF-8 string (for human readable IDNs)
*
- * \param url NetSurf URL to retrieve a string pointer for.
+ * \param url NetSurf URL object
* \param url_s Returns a url string
* \param url_l Returns length of url_s
* \return NSERROR_OK on success, appropriate error otherwise
--
NetSurf Browser
8 years, 4 months
- 1
- 0
nsgenbind: branch vince/interfacemap updated. release/0.1.0-22-gef1eb5b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/ef1eb5b59df798dc9a3...
...commit http://git.netsurf-browser.org/nsgenbind.git/commit/ef1eb5b59df798dc9a3e8...
...tree http://git.netsurf-browser.org/nsgenbind.git/tree/ef1eb5b59df798dc9a3e8df...
The branch, vince/interfacemap has been updated
via ef1eb5b59df798dc9a3e8df93fe46500aa4244e9 (commit)
via 13be4238314d1a9903b037ab749074575ef0d1eb (commit)
from 6406dae8c4da597da888345cf145f366b8297d7c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=ef1eb5b59df798dc9...
commit ef1eb5b59df798dc9a3e8df93fe46500aa4244e9
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make the duktape libdom generator output initializers
diff --git a/README b/README
index 039bd6a..eb42c83 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-genjsbind
+nsgenbind
=========
-This is a tool to generate javascript to dom bindings from w3c webidl
+This is a tool to generate JavaScript to DOM bindings from w3c webidl
files and a binding configuration file.
building
@@ -16,7 +16,7 @@ nsgenbind [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir
-v
The verbose switch makes the tool verbose about what operations it is
-performing instead of teh default of only reporting errors.
+performing instead of the default of only reporting errors.
-g
The generated code will be augmented with runtime debug logging so it
@@ -40,15 +40,15 @@ which to place its output.
Debug output
------------
-as well as the generated source the tool will output seevral debugging
-files with the -D switch in use.
+In addition to the generated source the tool will output several
+ debugging files with the -D switch in use.
interface.dot
The interfaces IDL dot file contains all the interfaces and their
relationship. graphviz can be used to convert this into a visual
representation which is sometimes useful to help in debugging
- missing or incorrect IDL inheritance.
+ missing or incorrect interface inheritance.
Processing the dot file with graphviz can produce very large files
so care must be taken with options. Some examples that produce
@@ -65,17 +65,17 @@ Web IDL
-------
The IDL is specified in a w3c document[1] but the second edition is in
-draft[2] and covers many of the features actually used in the whatwg
-dom and html spec.
+ draft[2] and covers many of the features actually used in the whatwg
+ dom and HTML spec.
The principal usage of the IDL is to define the interface between
-scripts and a browsers internal state. For example the DOM[3] and
-HTML[4] specs contain all the IDL for acessing the DOM and interacting
-with a web browser (this not strictly true as there are several
-interfaces simply not in the standards such as console).
+ scripts and a browsers internal state. For example the DOM[3] and
+ HTML[4] specs contain all the IDL for accessing the DOM and interacting
+ with a web browser (this not strictly true as there are several
+ interfaces simply not in the standards such as console).
The IDL uses some slightly strange names than other object orientated
-systems.
+ systems.
IDL | JS | OOP | Notes
-----------+------------------+----------------+----------------------------
@@ -88,6 +88,209 @@ systems.
attribute | property | property | Variables set per instance
-----------+------------------+----------------+----------------------------
+
+Binding file
+------------
+
+The binding file controls how the code generator constructs its
+output. It is deliberately similar to c++ in syntax and uses OOP
+nomenclature to describe the annotations (class, method, etc. instead
+of interface, operation, etc.)
+
+The binding file consists of three types of element:
+
+ binding
+
+ The binding element has an identifier controlling which type of
+ output is produced (currently duk_libdom and jsapi_libdom).
+
+ The binding block may contain one or more directives which
+ control overall generation behaviour:
+
+ webidl
+
+ This takes a quoted string which identifies a WebIDL file to
+ process. There may be many of these directives as required
+ but without at least one the binding is not very useful as
+ it will generate no output.
+
+ preface
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The preface is emitted in every generated source file before
+ any other output and generally is used for copyright
+ comments and similar. It is immediately followed by the
+ binding tools preamble comments.
+
+ prologue
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The prologue is emitted in every generated source file after
+ the class preface has been generated. It is often used for
+ include directives required across all modules.
+
+ epilogue
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The epilogue is emitted after the generated code and the
+ class epilogue
+
+ postface
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The postface is emitted as the very last element of the
+ generated source files.
+
+
+ class
+
+ The class controls the generation of source for an IDL interface
+ private member variables are declared here and header and
+ footer elements specific to this class.
+
+ private
+
+ variables added to the private structure for the class.
+
+ preface
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The preface is emitted in every generated source file after
+ the binding preface and tool preamble.
+
+ prologue
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The prologue is emitted in every generated source file after
+ the binding prologue has been generated.
+
+ epilogue
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The epilogue is emitted after the generated code and before
+ the binding epilogue
+
+ postface
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The postface is emitted after the binding epilogue.
+
+
+ methods
+
+ The methods allow a binding to provide code to be inserted in
+ the output and to control the class initializer and finalizer
+ (note not the constructor/destructor)
+
+ All these are in the syntax of:
+
+ methodtype declarator ( parameters )
+
+ They may optionally be followed by a cdata block which will be
+ added to the appropriate method in the output. A semicolon may
+ be used instead of the cdata block but this is not obviously
+ useful except in the case of the init type.
+
+ methods and getters/setters for properties must specify both
+ class and name using the c++ style double colon separated
+ identifiers i.e. class::identifier
+
+ Note: the class names must match the IDL interface names in the
+ binding but they will almost certainly have to be translated
+ into more suitable class names for generated output.
+
+ init
+
+ The declarator for this method type need only identify the
+ class (an identifier may be provided but will be ignored).
+
+ TODO: should it become necessary to defeat the automated
+ generation of an initializer altogether the identifier can
+ be checked and if set to the class name (like a
+ constructor) output body simply becomes a verbatim copy of
+ the cdata block.
+
+ The parameter list may be empty or contain type/identifier
+ tuples. If there is a parent interface it will be called
+ with the parameters necessary for its initializer, hence the
+ entire ancestry will be initialised.
+
+ The parameters passed to the parent are identified by
+ matching the identifier with the parents initializer
+ parameter identifier, if the type does not match a type
+ cast is inserted.
+
+ It is sometimes desirable for the parent initializer
+ identifier to be different from the childs identifier. In
+ this case the identifier may have an alias added by having
+ a double colon followed by a second identifier.
+
+ For example consider the case below where HTMLElement
+ inherits from Element which inherits from Node.
+
+ init Node("struct dom_node *" node);
+ init Element("struct dom_element *" element::node);
+ init HTMLElement("struct dom_html_element *" html_element::element);
+
+ The three initializers have parameters with different
+ identifiers but specify the identifier as it appears in
+ their parents parameter list. This allows for differing
+ parameter ordering and identifier naming while allowing the
+ automated enforcement of correct initializer calling
+ chains.
+
+
+ fini
+
+ The declarator for this method type need only identify the
+ class (an identifier may be provided but will be ignored).
+
+ The cdata block is output.
+
+ The parent finalizer is called (finalizers have no parameters
+ so do not need the complexity of initializers.
+
+ method
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+ getter
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+ setter
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+
+References
+----------
+
[1] http://www.w3.org/TR/WebIDL/
[2] https://heycam.github.io/webidl/
[3] https://dom.spec.whatwg.org/
diff --git a/src/duk-libdom.c b/src/duk-libdom.c
index 4d8ecf5..ee45eaf 100644
--- a/src/duk-libdom.c
+++ b/src/duk-libdom.c
@@ -22,6 +22,9 @@
#include "interface-map.h"
#include "duk-libdom.h"
+/** prefix for all generated functions */
+#define DLPFX "duckky"
+
#define NSGENBIND_PREAMBLE \
"/* Generated by nsgenbind\n" \
" *\n" \
@@ -95,6 +98,40 @@ static char *gen_class_name(struct interface_map_entry *interfacee)
}
/**
+ * find method by type on class
+ */
+static struct genbind_node *
+find_class_method(struct genbind_node *node,
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype)
+{
+ struct genbind_node *res_node;
+
+ res_node = genbind_node_find_type(
+ genbind_node_getnode(node),
+ prev, GENBIND_NODE_TYPE_METHOD);
+ while (res_node != NULL) {
+ struct genbind_node *type_node;
+ enum genbind_node_type *type;
+
+ type_node = genbind_node_find_type(
+ genbind_node_getnode(res_node),
+ NULL, GENBIND_NODE_TYPE_METHOD_TYPE);
+
+ type = (enum genbind_node_type *)genbind_node_getint(type_node);
+ if (*type == nodetype) {
+ break;
+ }
+
+ res_node = genbind_node_find_type(
+ genbind_node_getnode(node),
+ res_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ return res_node;
+}
+
+/**
* output character data of node of given type.
*
* used for pre/pro/epi/post sections
@@ -110,19 +147,258 @@ output_cdata(FILE* outf,
genbind_node_getnode(node),
NULL, nodetype));
if (cdata != NULL) {
- fprintf(outf, "%s\n", cdata);
+ fprintf(outf, "%s", cdata);
+ }
+ return 0;
+}
+
+/**
+ * Output code to create a private structure
+ *
+ */
+static int output_duckky_create_private(FILE* outf, char *class_name)
+{
+ fprintf(outf, "\t%s_private_t *priv = calloc(1, sizeof(*priv));\n",
+ class_name);
+ fprintf(outf, "\tif (priv == NULL) return 0;\n");
+ fprintf(outf, "\tduk_push_pointer(ctx, priv);\n");
+ fprintf(outf, "\tduk_put_prop_string(ctx, 0, PRIVATE_MAGIC)\n\n");
+
+ return 0;
+}
+
+/**
+ * generate code that gets a private pointer
+ */
+static int output_ducky_safe_get_private(FILE* outf, char *class_name, int idx)
+{
+ fprintf(outf,
+ "\t%s_private_t *priv = dukky_get_private(ctx, %d);\n",
+ class_name, idx);
+ fprintf(outf, "\tif (priv == NULL) return 0;\n\n");
+ return 0;
+}
+
+
+/**
+ * generate the interface constructor
+ */
+static int
+output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
+{
+ /* constructor definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ output_duckky_create_private(outf, interfacee->class_name);
+
+ /* generate call to initialisor */
+ fprintf(outf,
+ "\t%s_%s___init(ctx, priv, duk_get_pointer(ctx, 1));\n",
+ DLPFX, interfacee->class_name);
+
+ fprintf(outf, "\tduk_set_top(ctx, 1);\n");
+ fprintf(outf, "\treturn 1;\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
+
+/**
+ * generate the interface destructor
+ */
+static int
+output_interface_destructor(FILE* outf, struct interface_map_entry *interfacee)
+{
+ /* destructor definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ output_ducky_safe_get_private(outf, interfacee->class_name, 0);
+
+ /* generate call to finaliser */
+ fprintf(outf,
+ "\t%s_%s___fini(ctx, priv);\n",
+ DLPFX, interfacee->class_name);
+
+ fprintf(outf,"\tfree(priv);\n");
+ fprintf(outf,"\treturn 0;\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
+
+/**
+ * generate an initialisor call to parent interface
+ */
+static int
+output_interface_inherit_init(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *init_node;
+ struct genbind_node *inh_init_node;
+ struct genbind_node *param_node;
+ struct genbind_node *inh_param_node;
+
+ /* only need to call parent initialisor if there is one */
+ if (inherite == NULL) {
+ return 0;
}
+
+ /* find the initialisor method on the class (if any) */
+ init_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+
+ inh_init_node = find_class_method(inherite->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+
+
+ fprintf(outf, "\t%s_%s___init(ctx, &priv->parent",
+ DLPFX, inherite->class_name);
+
+ /* for each parameter in the parent find a matching named
+ * parameter to pass and cast if necessary
+ */
+
+ inh_param_node = genbind_node_find_type(
+ genbind_node_getnode(inh_init_node),
+ NULL, GENBIND_NODE_TYPE_PARAMETER);
+ while (inh_param_node != NULL) {
+ char *param_name;
+ param_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(inh_param_node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ param_node = genbind_node_find_type_ident(
+ genbind_node_getnode(init_node),
+ NULL,
+ GENBIND_NODE_TYPE_PARAMETER,
+ param_name);
+ if (param_node == NULL) {
+ fprintf(stderr, "class \"%s\" (interface %s) parent class \"%s\" (interface %s) initialisor requires a parameter \"%s\" with compatible identifier\n",
+ interfacee->class_name,
+ interfacee->name,
+ inherite->class_name,
+ inherite->name,
+ param_name);
+ return -1;
+ } else {
+ char *param_type;
+ char *inh_param_type;
+
+ fprintf(outf, ", ");
+
+ /* cast the parameter if required */
+ param_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(param_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ inh_param_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(inh_param_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ if (strcmp(param_type, inh_param_type) != 0) {
+ fprintf(outf, "(%s)", inh_param_type);
+ }
+
+ /* output the parameter identifier */
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
+ }
+
+ inh_param_node = genbind_node_find_type(
+ genbind_node_getnode(inh_init_node),
+ inh_param_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ fprintf(outf, ");\n");
+
return 0;
}
static int
+output_interface_init(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *init_node;
+ struct genbind_node *param_node;
+ int res;
+
+ /* find the initialisor method on the class (if any) */
+ init_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+ /* initialisor definition */
+ fprintf(outf,
+ "void %s_%s___init(duk_context *ctx, %s_private_t *priv",
+ DLPFX, interfacee->class_name, interfacee->class_name);
+
+ /* output the paramters on the method (if any) */
+ param_node = genbind_node_find_type(
+ genbind_node_getnode(init_node),
+ NULL, GENBIND_NODE_TYPE_PARAMETER);
+ while (param_node != NULL) {
+ fprintf(outf, ", ");
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_TYPE);
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
+
+ param_node = genbind_node_find_type(
+ genbind_node_getnode(init_node),
+ param_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ fprintf(outf,")\n{\n");
+
+ /* if this interface inherits ensure we call its initialisor */
+ res = output_interface_inherit_init(outf, interfacee, inherite);
+ if (res != 0) {
+ return res;
+ }
+
+ /* generate log statement */
+ if (options->dbglog) {
+ fprintf(outf,
+ "\tLOG(\"Initialise %%p (priv=%%p)\", duk_get_heapptr(ctx, 0), priv);\n" );
+ }
+
+ /* output the initaliser code from the binding */
+ output_cdata(outf, init_node, GENBIND_NODE_TYPE_CDATA);
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+
+}
+
+static int
output_interface_fini(FILE* outf,
struct interface_map_entry *interfacee,
struct interface_map_entry *inherite)
{
struct genbind_node *fini_node;
- struct genbind_node *type_node;
- int *type;
+
+ /* find the finaliser method on the class (if any) */
+ fini_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_FINI);
/* finaliser definition */
fprintf(outf,
@@ -136,24 +412,7 @@ output_interface_fini(FILE* outf,
"\tLOG(\"Finalise %%p\", duk_get_heapptr(ctx, 0));\n" );
}
- /* find the finaliser method on the class (if any) */
- fini_node = genbind_node_find_type(
- genbind_node_getnode(interfacee->class),
- NULL, GENBIND_NODE_TYPE_METHOD);
- while (fini_node != NULL) {
- type_node = genbind_node_find_type(
- genbind_node_getnode(fini_node),
- NULL, GENBIND_NODE_TYPE_METHOD_TYPE);
-
- type = genbind_node_getint(type_node);
- if (*type == GENBIND_METHOD_TYPE_FINI) {
- break;
- }
-
- fini_node = genbind_node_find_type(
- genbind_node_getnode(interfacee->class),
- fini_node, GENBIND_NODE_TYPE_METHOD);
- }
+ /* output the finialisor code from the binding */
output_cdata(outf, fini_node, GENBIND_NODE_TYPE_CDATA);
/* if this interface inherits ensure we call its finaliser */
@@ -162,7 +421,7 @@ output_interface_fini(FILE* outf,
"\tdukky_%s___fini(ctx, &priv->parent);\n",
inherite->class_name);
}
- fprintf(outf, "}\n");
+ fprintf(outf, "}\n\n");
return 0;
}
@@ -180,7 +439,9 @@ static int output_interface(struct genbind_node *genbind,
int ifacenamelen;
struct genbind_node *binding_node;
struct interface_map_entry *inherite;
+ int res = 0;
+ /* compute clas name */
interfacee->class_name = gen_class_name(interfacee);
/* generate source filename */
@@ -198,15 +459,15 @@ static int output_interface(struct genbind_node *genbind,
/* find parent interface entry */
inherite = interface_map_inherit_entry(interface_map, interfacee);
- /* nsgenbind preamble */
- fprintf(ifacef, "%s\n", NSGENBIND_PREAMBLE);
-
binding_node = genbind_node_find_type(genbind, NULL,
GENBIND_NODE_TYPE_BINDING);
/* binding preface */
output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_PREFACE);
+ /* nsgenbind preamble */
+ fprintf(ifacef, "\n%s\n", NSGENBIND_PREAMBLE);
+
/* class preface */
output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PREFACE);
@@ -216,14 +477,24 @@ static int output_interface(struct genbind_node *genbind,
/* class prologue */
output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PROLOGUE);
+ fprintf(ifacef, "\n");
+
/* initialisor */
- //output_interface_init();
+ res = output_interface_init(ifacef, interfacee, inherite);
+ if (res != 0) {
+ goto op_error;
+ }
/* finaliser */
output_interface_fini(ifacef, interfacee, inherite);
/* constructor */
+ output_interface_constructor(ifacef, interfacee);
+
/* destructor */
+ output_interface_destructor(ifacef, interfacee);
+
+ fprintf(ifacef, "\n");
/* class epilogue */
output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_EPILOGUE);
@@ -237,9 +508,10 @@ static int output_interface(struct genbind_node *genbind,
/* binding postface */
output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_POSTFACE);
+op_error:
fclose(ifacef);
- return 0;
+ return res;
}
int duk_libdom_output(struct genbind_node *genbind,
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index 454fb56..456decb 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -32,6 +32,65 @@ static void nsgenbind_error(YYLTYPE *locp,
errtxt = strdup(str);
}
+static struct genbind_node *
+add_method(struct genbind_node **genbind_ast,
+ long methodtype,
+ struct genbind_node *declarator,
+ char *cdata)
+{
+ struct genbind_node *res_node;
+ struct genbind_node *method_node;
+ struct genbind_node *class_node;
+ struct genbind_node *cdata_node;
+ char *class_name;
+
+ /* extract the class name from the declarator */
+ class_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(
+ genbind_node_find_type(
+ declarator,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS)),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ if (cdata == NULL) {
+ cdata_node = declarator;
+ } else {
+ cdata_node = genbind_new_node(GENBIND_NODE_TYPE_CDATA,
+ declarator,
+ cdata);
+ }
+
+ /* generate method node */
+ method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
+ NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
+ cdata_node,
+ (void *)methodtype));
+
+ class_node = genbind_node_find_type_ident(*genbind_ast,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS,
+ class_name);
+ if (class_node == NULL) {
+ /* no existing class so manufacture one and attach method */
+ res_node = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ method_node,
+ class_name));
+
+ } else {
+ /* update the existing class */
+
+ /* link member node into class_node */
+ genbind_node_add(class_node, method_node);
+
+ res_node = NULL; /* updating so no need to add a new node */
+ }
+ return res_node;
+}
%}
@@ -199,6 +258,17 @@ TypeIdent
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
genbind_new_node(GENBIND_NODE_TYPE_TYPE, NULL, $1), $2);
}
+ |
+ TOK_STRING_LITERAL TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE,
+ NULL,
+ $1),
+ $2),
+ $4);
+ }
;
Preface
@@ -330,54 +400,14 @@ Method
:
MethodType MethodDeclarator CBlock
{
- struct genbind_node *declarator;
- struct genbind_node *method_node;
- struct genbind_node *class_node;
- char *class_name;
-
- declarator = $2;
-
- /* extract the class name from the declarator */
- class_name = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(
- genbind_node_find_type(
- declarator,
- NULL,
- GENBIND_NODE_TYPE_CLASS)),
- NULL,
- GENBIND_NODE_TYPE_IDENT));
-
- /* generate method node */
- method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
- genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- declarator, $3),
- (void *)$1));
-
-
-
- class_node = genbind_node_find_type_ident(*genbind_ast,
- NULL,
- GENBIND_NODE_TYPE_CLASS,
- class_name);
- if (class_node == NULL) {
- /* no existing class so manufacture one and attach method */
- $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- method_node,
- class_name));
-
- } else {
- /* update the existing class */
-
- /* link member node into class_node */
- genbind_node_add(class_node, method_node);
-
- $$ = NULL; /* updating so no need to add a new node */
- }
+ $$ = add_method(genbind_ast, $1, $2, $3);
}
-
+ |
+ MethodType MethodDeclarator ';'
+ {
+ $$ = add_method(genbind_ast, $1, $2, NULL);
+ }
+ ;
Class
:
diff --git a/test/data/bindings/HTMLUnknownElement.bnd b/test/data/bindings/HTMLUnknownElement.bnd
index 376a823..faabaec 100644
--- a/test/data/bindings/HTMLUnknownElement.bnd
+++ b/test/data/bindings/HTMLUnknownElement.bnd
@@ -15,3 +15,5 @@ class HTMLUnknownElement {
/* class post */
%};
}
+
+init HTMLUnknownElement("struct dom_html_element *" html_unknown_element::html_element);
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
index 273eae9..392f652 100644
--- a/test/data/bindings/browser-duk.bnd
+++ b/test/data/bindings/browser-duk.bnd
@@ -39,31 +39,112 @@ binding duk_libdom {
#include "HTMLUnknownElement.bnd"
+/* specialisations of html_element */
+init HTMLFontElement("struct dom_html_element *" html_font_element::html_element);
+init HTMLDirectoryElement("struct dom_html_element *" html_directory_element::html_element);
+init HTMLFrameElement("struct dom_html_element *" html_frame_element::html_element);
+init HTMLFrameSetElement("struct dom_html_element *" html_frame_set_element::html_element);
+init HTMLMarqueeElement("struct dom_html_element *" html_marquee_element::html_element);
+init HTMLAppletElement("struct dom_html_element *" html_applet_element::html_element);
+init HTMLCanvasElement("struct dom_html_element *" html_canvas_element::html_element);
+init HTMLTemplateElement("struct dom_html_element *" html_template_element::html_element);
+init HTMLScriptElement("struct dom_html_element *" html_script_element::html_element);
+init HTMLDialogElement("struct dom_html_element *" html_dialog_element::html_element);
+init HTMLMenuItemElement("struct dom_html_element *" html_menu_item_element::html_element);
+init HTMLMenuElement("struct dom_html_element *" html_menu_element::html_element);
+init HTMLDetailsElement("struct dom_html_element *" html_details_element::html_element);
+init HTMLLegendElement("struct dom_html_element *" html_legend_element::html_element);
+init HTMLFieldSetElement("struct dom_html_element *" html_field_set_element::html_element);
+init HTMLMeterElement("struct dom_html_element *" html_meter_element::html_element);
+init HTMLProgressElement("struct dom_html_element *" html_progress_element::html_element);
+init HTMLOutputElement("struct dom_html_element *" html_output_element::html_element);
+init HTMLKeygenElement("struct dom_html_element *" html_keygen_element::html_element);
+init HTMLTextAreaElement("struct dom_html_element *" html_text_area_element::html_element);
+init HTMLOptionElement("struct dom_html_element *" html_option_element::html_element);
+init HTMLOptGroupElement("struct dom_html_element *" html_opt_group_element::html_element);
+init HTMLDataListElement("struct dom_html_element *" html_data_list_element::html_element);
+init HTMLSelectElement("struct dom_html_element *" html_select_element::html_element);
+init HTMLButtonElement("struct dom_html_element *" html_button_element::html_element);
+init HTMLInputElement("struct dom_html_element *" html_input_element::html_element);
+init HTMLLabelElement("struct dom_html_element *" html_label_element::html_element);
+init HTMLFormElement("struct dom_html_element *" html_form_element::html_element);
+init HTMLTableCellElement("struct dom_html_element *" html_table_cell_element::html_element);
+init HTMLTableRowElement("struct dom_html_element *" html_table_row_element::html_element);
+init HTMLTableSectionElement("struct dom_html_element *" html_table_section_element::html_element);
+init HTMLTableColElement("struct dom_html_element *" html_table_col_element::html_element);
+init HTMLTableCaptionElement("struct dom_html_element *" html_table_caption_element::html_element);
+init HTMLTableElement("struct dom_html_element *" html_table_element::html_element);
+init HTMLAreaElement("struct dom_html_element *" html_area_element::html_element);
+init HTMLMapElement("struct dom_html_element *" html_map_element::html_element);
+init HTMLMediaElement("struct dom_html_element *" html_media_element::html_element);
+init HTMLTrackElement("struct dom_html_element *" html_track_element::html_element);
+init HTMLParamElement("struct dom_html_element *" html_param_element::html_element);
+init HTMLObjectElement("struct dom_html_element *" html_object_element::html_element);
+init HTMLEmbedElement("struct dom_html_element *" html_embed_element::html_element);
+init HTMLIFrameElement("struct dom_html_element *" html_i_frame_element::html_element);
+init HTMLImageElement("struct dom_html_element *" html_image_element::html_element);
+init HTMLSourceElement("struct dom_html_element *" html_source_element::html_element);
+init HTMLPictureElement("struct dom_html_element *" html_picture_element::html_element);
+init HTMLModElement("struct dom_html_element *" html_mod_element::html_element);
+init HTMLBRElement("struct dom_html_element *" html_br_element::html_element);
+init HTMLSpanElement("struct dom_html_element *" html_span_element::html_element);
+init HTMLTimeElement("struct dom_html_element *" html_time_element::html_element);
+init HTMLDataElement("struct dom_html_element *" html_data_element::html_element);
+init HTMLAnchorElement("struct dom_html_element *" html_anchor_element::html_element);
+init HTMLDivElement("struct dom_html_element *" html_div_element::html_element);
+init HTMLDListElement("struct dom_html_element *" html_d_list_element::html_element);
+init HTMLLIElement("struct dom_html_element *" html_li_element::html_element);
+init HTMLUListElement("struct dom_html_element *" html_u_list_element::html_element);
+init HTMLOListElement("struct dom_html_element *" html_o_list_element::html_element);
+init HTMLQuoteElement("struct dom_html_element *" html_quote_element::html_element);
+init HTMLPreElement("struct dom_html_element *" html_pre_element::html_element);
+init HTMLHRElement("struct dom_html_element *" html_hr_element::html_element);
+init HTMLParagraphElement("struct dom_html_element *" html_paragraph_element::html_element);
+init HTMLHeadingElement("struct dom_html_element *" html_heading_element::html_element);
+init HTMLBodyElement("struct dom_html_element *" html_body_element::html_element);
+init HTMLStyleElement("struct dom_html_element *" html_style_element::html_element);
+init HTMLMetaElement("struct dom_html_element *" html_meta_element::html_element);
+init HTMLLinkElement("struct dom_html_element *" html_link_element::html_element);
+init HTMLBaseElement("struct dom_html_element *" html_base_element::html_element);
+init HTMLTitleElement("struct dom_html_element *" html_title_element::html_element);
+init HTMLHeadElement("struct dom_html_element *" html_head_element::html_element);
+init HTMLHtmlElement("struct dom_html_element *" html_html_element::html_element);
+
+/* specialisations of HTMLTableCellElement */
+init HTMLTableHeaderCellElement("struct dom_html_element *" html_table_header_cell_element::html_table_cell_element);
+init HTMLTableDataCellElement("struct dom_html_element *" html_table_data_cell_element::html_table_cell_element);
+
+/* specialisations of html_media_element */
+init HTMLAudioElement("struct dom_html_element *" html_audio_element::html_media_element);
+init HTMLVideoElement("struct dom_html_element *" html_video_element::html_media_element);
+
+init HTMLElement("struct dom_html_element *" html_element::element);
+
+init Text("struct dom_node_text *" text::character_data);
+init Comment("struct dom_node_comment *" comment::character_data);
+init ProcessingInstruction("struct dom_node_text *" text::character_data);
+
+init XMLDocument("struct dom_document *" document);
+
+init Element("struct dom_element *" element::node);
+init CharacterData("struct dom_node_character_data *" character_data::node);
+init DocumentFragment("struct dom_document *" document::node);
+init DocumentType("struct dom_document *" document::node);
+init Document("struct dom_document *" document::node);
+
class Node {
private "dom_node *" node;
-
- preface %{
- %};
-
- prologue %{
- %};
-
- epilogue %{
- %};
-
- postface %{
- %};
}
-init Node("dom_node *" node)
+init Node("struct dom_node *" node)
%{
- private->node = node;
- dom_node_ref(node);
+ priv->node = node;
+ dom_node_ref(node);
%}
fini Node()
%{
- dom_node_unref(private->node);
+ dom_node_unref(priv->node);
%}
method Node::AppendChild()
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=13be4238314d1a990...
commit 13be4238314d1a9903b037ab749074575ef0d1eb
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
initial duktape libdom generator
This generator creates all the output files and generates the
finalisers for every class.
diff --git a/src/Makefile b/src/Makefile
index b7b142a..8b034fe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,8 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c interface-map.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c \
+ interface-map.c duk-libdom.c
# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/duk-libdom.c b/src/duk-libdom.c
new file mode 100644
index 0000000..4d8ecf5
--- /dev/null
+++ b/src/duk-libdom.c
@@ -0,0 +1,268 @@
+/* duktape binding generation implementation
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "options.h"
+#include "utils.h"
+#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
+#include "interface-map.h"
+#include "duk-libdom.h"
+
+#define NSGENBIND_PREAMBLE \
+"/* Generated by nsgenbind\n" \
+" *\n" \
+" * nsgenbind is published under the MIT Licence.\n" \
+" * nsgenbind is similar to a compiler is a purely transformative tool which\n"\
+" * explicitly makes no copyright claim on this generated output\n"\
+" */"
+
+/**
+ * Generate a C class name for the interface.
+ *
+ * The IDL interface names are camelcase and not similar to libdom naming so it
+ * is necessary to convert them to a libdom compatible class name. This
+ * implementation is simple ASCII capable only and cannot cope with multibyte
+ * codepoints.
+ *
+ * The algorithm is:
+ * - copy characters to output lowering their case
+ * - if the previous character in the input name was uppercase and the current
+ * one is lowercase insert an underscore before the *previous* character.
+ */
+static char *gen_class_name(struct interface_map_entry *interfacee)
+{
+ const char *inc;
+ char *outc;
+ char *name;
+ int wasupper;
+
+ /* enpty strings are a bad idea */
+ if ((interfacee->name == NULL) || (interfacee->name[0] == 0)) {
+ return NULL;
+ }
+
+ /* allocate result buffer as twice the input length as thats the
+ * absolute worst case.
+ */
+ name = calloc(2, strlen(interfacee->name));
+
+ outc = name;
+ inc = interfacee->name;
+ wasupper = 0;
+
+ /* first character handled separately as inserting a leading underscore
+ * is undesirable
+ */
+ *outc++ = tolower(*inc++);
+ /* copy input to output */
+ while (*inc != 0) {
+ /* ugly hack as html IDL is always prefixed uppercase and needs
+ * an underscore there
+ */
+ if ((inc == (interfacee->name + 4)) &&
+ (interfacee->name[0] == 'H') &&
+ (interfacee->name[1] == 'T') &&
+ (interfacee->name[2] == 'M') &&
+ (interfacee->name[3] == 'L') &&
+ (islower(inc[1]) == 0)) {
+ *outc++ = '_';
+ }
+ if ((islower(*inc) != 0) && (wasupper != 0)) {
+ *outc = *(outc - 1);
+ *(outc - 1) = '_';
+ outc++;
+ wasupper = 0;
+ } else {
+ wasupper = isupper(*inc);
+ }
+ *outc++ = tolower(*inc++);
+ }
+ return name;
+}
+
+/**
+ * output character data of node of given type.
+ *
+ * used for pre/pro/epi/post sections
+ */
+static int
+output_cdata(FILE* outf,
+ struct genbind_node *node,
+ enum genbind_node_type nodetype)
+{
+ char *cdata;
+ cdata = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(node),
+ NULL, nodetype));
+ if (cdata != NULL) {
+ fprintf(outf, "%s\n", cdata);
+ }
+ return 0;
+}
+
+static int
+output_interface_fini(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *fini_node;
+ struct genbind_node *type_node;
+ int *type;
+
+ /* finaliser definition */
+ fprintf(outf,
+ "void dukky_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
+ interfacee->class_name, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ /* generate log statement */
+ if (options->dbglog) {
+ fprintf(outf,
+ "\tLOG(\"Finalise %%p\", duk_get_heapptr(ctx, 0));\n" );
+ }
+
+ /* find the finaliser method on the class (if any) */
+ fini_node = genbind_node_find_type(
+ genbind_node_getnode(interfacee->class),
+ NULL, GENBIND_NODE_TYPE_METHOD);
+ while (fini_node != NULL) {
+ type_node = genbind_node_find_type(
+ genbind_node_getnode(fini_node),
+ NULL, GENBIND_NODE_TYPE_METHOD_TYPE);
+
+ type = genbind_node_getint(type_node);
+ if (*type == GENBIND_METHOD_TYPE_FINI) {
+ break;
+ }
+
+ fini_node = genbind_node_find_type(
+ genbind_node_getnode(interfacee->class),
+ fini_node, GENBIND_NODE_TYPE_METHOD);
+ }
+ output_cdata(outf, fini_node, GENBIND_NODE_TYPE_CDATA);
+
+ /* if this interface inherits ensure we call its finaliser */
+ if (inherite != NULL) {
+ fprintf(outf,
+ "\tdukky_%s___fini(ctx, &priv->parent);\n",
+ inherite->class_name);
+ }
+ fprintf(outf, "}\n");
+
+ return 0;
+}
+
+
+/**
+ * generate a source file to implement an interface using duk and libdom.
+ */
+static int output_interface(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map,
+ struct interface_map_entry *interfacee)
+{
+ FILE *ifacef;
+ int ifacenamelen;
+ struct genbind_node *binding_node;
+ struct interface_map_entry *inherite;
+
+ interfacee->class_name = gen_class_name(interfacee);
+
+ /* generate source filename */
+ ifacenamelen = strlen(interfacee->class_name) + 4;
+ interfacee->filename = malloc(ifacenamelen);
+ snprintf(interfacee->filename, ifacenamelen,
+ "%s.c", interfacee->class_name);
+
+ /* open output file */
+ ifacef = genb_fopen(interfacee->filename, "w");
+ if (ifacef == NULL) {
+ return -1;
+ }
+
+ /* find parent interface entry */
+ inherite = interface_map_inherit_entry(interface_map, interfacee);
+
+ /* nsgenbind preamble */
+ fprintf(ifacef, "%s\n", NSGENBIND_PREAMBLE);
+
+ binding_node = genbind_node_find_type(genbind, NULL,
+ GENBIND_NODE_TYPE_BINDING);
+
+ /* binding preface */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_PREFACE);
+
+ /* class preface */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PREFACE);
+
+ /* binding prologue */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_PROLOGUE);
+
+ /* class prologue */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PROLOGUE);
+
+ /* initialisor */
+ //output_interface_init();
+
+ /* finaliser */
+ output_interface_fini(ifacef, interfacee, inherite);
+
+ /* constructor */
+ /* destructor */
+
+ /* class epilogue */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_EPILOGUE);
+
+ /* binding epilogue */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_EPILOGUE);
+
+ /* class postface */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_POSTFACE);
+
+ /* binding postface */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_POSTFACE);
+
+ fclose(ifacef);
+
+ return 0;
+}
+
+int duk_libdom_output(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map)
+{
+ int idx;
+ int res = 0;
+
+ /* generate interfaces */
+ for (idx = 0; idx < interface_map->entryc; idx++) {
+ res = output_interface(genbind, webidl, interface_map,
+ &interface_map->entries[idx]);
+ if (res != 0) {
+ break;
+ }
+ }
+
+ /* generate header */
+ /** \todo implement header */
+
+ /* generate makefile fragment */
+ /** \todo implement makefile generation */
+
+ return res;
+}
diff --git a/src/duk-libdom.h b/src/duk-libdom.h
new file mode 100644
index 0000000..8e86d74
--- /dev/null
+++ b/src/duk-libdom.h
@@ -0,0 +1,16 @@
+/* DukTape binding generation
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_duk_libdom_h
+#define nsgenbind_duk_libdom_h
+
+int duk_libdom_output(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map);
+
+#endif
diff --git a/src/interface-map.c b/src/interface-map.c
index aef697e..44ece42 100644
--- a/src/interface-map.c
+++ b/src/interface-map.c
@@ -290,3 +290,16 @@ int interface_map_dumpdot(struct interface_map *index)
return 0;
}
+
+struct interface_map_entry *
+interface_map_inherit_entry(struct interface_map *map,
+ struct interface_map_entry *entry)
+{
+ struct interface_map_entry *res = NULL;
+
+ if ((entry != NULL) &&
+ (entry->inherit_idx != -1)) {
+ res = &map->entries[entry->inherit_idx];
+ }
+ return res;
+}
diff --git a/src/interface-map.h b/src/interface-map.h
index c9dd654..8a6ac05 100644
--- a/src/interface-map.h
+++ b/src/interface-map.h
@@ -25,19 +25,39 @@ struct interface_map_entry {
* interface
*/
struct genbind_node *class; /**< class from binding (if any) */
+
+ /* The variables are created and used by the output generation but
+ * rtaher than have another allocation and pointer the data they are
+ * just inline here.
+ */
+
+ char *filename; /**< filename used for output */
+
+ char *class_name; /**< the interface name converted to output
+ * appropriate value. e.g. generators targetting c
+ * might lowercase the name or add underscores
+ * instead of caps
+ */
};
struct interface_map {
- int entryc; /**< count of interfaces */
- struct interface_map_entry *entries;
+ int entryc; /**< count of interfaces */
+ struct interface_map_entry *entries;
};
int interface_map_new(struct genbind_node *genbind,
- struct webidl_node *webidl,
- struct interface_map **index_out);
+ struct webidl_node *webidl,
+ struct interface_map **index_out);
-int interface_map_dump(struct interface_map *index);
+int interface_map_dump(struct interface_map *map);
-int interface_map_dumpdot(struct interface_map *index);
+int interface_map_dumpdot(struct interface_map *map);
+
+/**
+ * interface map parent entry
+ *
+ * \return inherit entry or NULL if there is not one
+ */
+struct interface_map_entry *interface_map_inherit_entry(struct interface_map *map, struct interface_map_entry *entry);
#endif
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 18db196..b3191ba 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -17,8 +17,9 @@
#include "options.h"
#include "nsgenbind-ast.h"
#include "webidl-ast.h"
-#include "jsapi-libdom.h"
#include "interface-map.h"
+#include "jsapi-libdom.h"
+#include "duk-libdom.h"
struct options *options;
@@ -85,28 +86,6 @@ static struct options* process_cmdline(int argc, char **argv)
}
-static int generate_binding(struct genbind_node *binding_node, void *ctx)
-{
- struct genbind_node *genbind_root = ctx;
- char *type;
- int res = 10;
-
- type = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(binding_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE));
-
- if (strcmp(type, "jsapi_libdom") == 0) {
- res = jsapi_libdom_output(options, genbind_root, binding_node);
- } else {
- fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
- }
-
- return res;
-}
-
-
static int webidl_file_cb(struct genbind_node *node, void *ctx)
{
struct webidl_node **webidl_ast = ctx;
@@ -237,24 +216,17 @@ int main(int argc, char **argv)
/* dump the interface mapping */
interface_map_dump(interface_map);
interface_map_dumpdot(interface_map);
-#if 0
- /* generate output for each binding */
- res = genbind_node_foreach_type(genbind_root,
- GENBIND_NODE_TYPE_BINDING,
- generate_binding,
- genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: output failed with code %d\n", res);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- if (options->hdrfilename != NULL) {
- unlink(options->hdrfilename);
- }
- return res;
+ /* generate binding */
+ switch (bindingtype) {
+ case BINDINGTYPE_DUK_LIBDOM:
+ res = duk_libdom_output(genbind_root, webidl_root, interface_map);
+ break;
+
+ default:
+ fprintf(stderr, "Unable to generate binding of this type\n");
+ res = 7;
}
-#endif
- return 0;
+ return res;
}
diff --git a/src/options.h b/src/options.h
index 68a4bc1..85f107e 100644
--- a/src/options.h
+++ b/src/options.h
@@ -13,10 +13,6 @@
struct options {
char *infilename; /**< binding source */
char *outdirname; /**< output directory */
-FILE *hdrfilehandle;
-char *hdrfilename;
-char *outfilename;
-FILE *outfilehandle;
char *idlpath; /**< path to IDL files */
bool verbose; /**< verbose processing */
diff --git a/test/data/bindings/HTMLUnknownElement.bnd b/test/data/bindings/HTMLUnknownElement.bnd
new file mode 100644
index 0000000..376a823
--- /dev/null
+++ b/test/data/bindings/HTMLUnknownElement.bnd
@@ -0,0 +1,17 @@
+class HTMLUnknownElement {
+ preface %{
+/* class pre */
+ %};
+
+ prologue %{
+/* class pro */
+ %};
+
+ epilogue %{
+/* class epi */
+ %};
+
+ postface %{
+/* class post */
+ %};
+}
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
index 4e06d23..273eae9 100644
--- a/test/data/bindings/browser-duk.bnd
+++ b/test/data/bindings/browser-duk.bnd
@@ -15,18 +15,30 @@ binding duk_libdom {
webidl "console.idl";
preface %{
+/* DukTape JavaScript bindings for NetSurf browser
+ *
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ * Released under the terms of the MIT License,
+ * http://www.opensource.org/licenses/mit-license
+ */
%};
prologue %{
+/* binding prologue */
%};
epilogue %{
+/* binding epilogue */
%};
postface %{
+/* binding postface */
%};
}
+#include "HTMLUnknownElement.bnd"
+
class Node {
private "dom_node *" node;
-----------------------------------------------------------------------
Summary of changes:
README | 229 +++++++++++-
src/Makefile | 3 +-
src/duk-libdom.c | 540 +++++++++++++++++++++++++++++
src/duk-libdom.h | 16 +
src/interface-map.c | 13 +
src/interface-map.h | 32 +-
src/nsgenbind-parser.y | 124 ++++---
src/nsgenbind.c | 52 +--
src/options.h | 4 -
test/data/bindings/HTMLUnknownElement.bnd | 19 +
test/data/bindings/browser-duk.bnd | 121 ++++++-
11 files changed, 1028 insertions(+), 125 deletions(-)
create mode 100644 src/duk-libdom.c
create mode 100644 src/duk-libdom.h
create mode 100644 test/data/bindings/HTMLUnknownElement.bnd
diff --git a/README b/README
index 039bd6a..eb42c83 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-genjsbind
+nsgenbind
=========
-This is a tool to generate javascript to dom bindings from w3c webidl
+This is a tool to generate JavaScript to DOM bindings from w3c webidl
files and a binding configuration file.
building
@@ -16,7 +16,7 @@ nsgenbind [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir
-v
The verbose switch makes the tool verbose about what operations it is
-performing instead of teh default of only reporting errors.
+performing instead of the default of only reporting errors.
-g
The generated code will be augmented with runtime debug logging so it
@@ -40,15 +40,15 @@ which to place its output.
Debug output
------------
-as well as the generated source the tool will output seevral debugging
-files with the -D switch in use.
+In addition to the generated source the tool will output several
+ debugging files with the -D switch in use.
interface.dot
The interfaces IDL dot file contains all the interfaces and their
relationship. graphviz can be used to convert this into a visual
representation which is sometimes useful to help in debugging
- missing or incorrect IDL inheritance.
+ missing or incorrect interface inheritance.
Processing the dot file with graphviz can produce very large files
so care must be taken with options. Some examples that produce
@@ -65,17 +65,17 @@ Web IDL
-------
The IDL is specified in a w3c document[1] but the second edition is in
-draft[2] and covers many of the features actually used in the whatwg
-dom and html spec.
+ draft[2] and covers many of the features actually used in the whatwg
+ dom and HTML spec.
The principal usage of the IDL is to define the interface between
-scripts and a browsers internal state. For example the DOM[3] and
-HTML[4] specs contain all the IDL for acessing the DOM and interacting
-with a web browser (this not strictly true as there are several
-interfaces simply not in the standards such as console).
+ scripts and a browsers internal state. For example the DOM[3] and
+ HTML[4] specs contain all the IDL for accessing the DOM and interacting
+ with a web browser (this not strictly true as there are several
+ interfaces simply not in the standards such as console).
The IDL uses some slightly strange names than other object orientated
-systems.
+ systems.
IDL | JS | OOP | Notes
-----------+------------------+----------------+----------------------------
@@ -88,6 +88,209 @@ systems.
attribute | property | property | Variables set per instance
-----------+------------------+----------------+----------------------------
+
+Binding file
+------------
+
+The binding file controls how the code generator constructs its
+output. It is deliberately similar to c++ in syntax and uses OOP
+nomenclature to describe the annotations (class, method, etc. instead
+of interface, operation, etc.)
+
+The binding file consists of three types of element:
+
+ binding
+
+ The binding element has an identifier controlling which type of
+ output is produced (currently duk_libdom and jsapi_libdom).
+
+ The binding block may contain one or more directives which
+ control overall generation behaviour:
+
+ webidl
+
+ This takes a quoted string which identifies a WebIDL file to
+ process. There may be many of these directives as required
+ but without at least one the binding is not very useful as
+ it will generate no output.
+
+ preface
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The preface is emitted in every generated source file before
+ any other output and generally is used for copyright
+ comments and similar. It is immediately followed by the
+ binding tools preamble comments.
+
+ prologue
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The prologue is emitted in every generated source file after
+ the class preface has been generated. It is often used for
+ include directives required across all modules.
+
+ epilogue
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The epilogue is emitted after the generated code and the
+ class epilogue
+
+ postface
+
+ This takes a cdata block. There may only be one of these per
+ binding, subsequent directives will be ignored.
+
+ The postface is emitted as the very last element of the
+ generated source files.
+
+
+ class
+
+ The class controls the generation of source for an IDL interface
+ private member variables are declared here and header and
+ footer elements specific to this class.
+
+ private
+
+ variables added to the private structure for the class.
+
+ preface
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The preface is emitted in every generated source file after
+ the binding preface and tool preamble.
+
+ prologue
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The prologue is emitted in every generated source file after
+ the binding prologue has been generated.
+
+ epilogue
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The epilogue is emitted after the generated code and before
+ the binding epilogue
+
+ postface
+
+ This takes a cdata block. There may only be one of these per
+ class, subsequent directives will be ignored.
+
+ The postface is emitted after the binding epilogue.
+
+
+ methods
+
+ The methods allow a binding to provide code to be inserted in
+ the output and to control the class initializer and finalizer
+ (note not the constructor/destructor)
+
+ All these are in the syntax of:
+
+ methodtype declarator ( parameters )
+
+ They may optionally be followed by a cdata block which will be
+ added to the appropriate method in the output. A semicolon may
+ be used instead of the cdata block but this is not obviously
+ useful except in the case of the init type.
+
+ methods and getters/setters for properties must specify both
+ class and name using the c++ style double colon separated
+ identifiers i.e. class::identifier
+
+ Note: the class names must match the IDL interface names in the
+ binding but they will almost certainly have to be translated
+ into more suitable class names for generated output.
+
+ init
+
+ The declarator for this method type need only identify the
+ class (an identifier may be provided but will be ignored).
+
+ TODO: should it become necessary to defeat the automated
+ generation of an initializer altogether the identifier can
+ be checked and if set to the class name (like a
+ constructor) output body simply becomes a verbatim copy of
+ the cdata block.
+
+ The parameter list may be empty or contain type/identifier
+ tuples. If there is a parent interface it will be called
+ with the parameters necessary for its initializer, hence the
+ entire ancestry will be initialised.
+
+ The parameters passed to the parent are identified by
+ matching the identifier with the parents initializer
+ parameter identifier, if the type does not match a type
+ cast is inserted.
+
+ It is sometimes desirable for the parent initializer
+ identifier to be different from the childs identifier. In
+ this case the identifier may have an alias added by having
+ a double colon followed by a second identifier.
+
+ For example consider the case below where HTMLElement
+ inherits from Element which inherits from Node.
+
+ init Node("struct dom_node *" node);
+ init Element("struct dom_element *" element::node);
+ init HTMLElement("struct dom_html_element *" html_element::element);
+
+ The three initializers have parameters with different
+ identifiers but specify the identifier as it appears in
+ their parents parameter list. This allows for differing
+ parameter ordering and identifier naming while allowing the
+ automated enforcement of correct initializer calling
+ chains.
+
+
+ fini
+
+ The declarator for this method type need only identify the
+ class (an identifier may be provided but will be ignored).
+
+ The cdata block is output.
+
+ The parent finalizer is called (finalizers have no parameters
+ so do not need the complexity of initializers.
+
+ method
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+ getter
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+ setter
+
+ The declarator for this method type must contain both the
+ class and the identifier.
+
+ The cdata block is output.
+
+
+References
+----------
+
[1] http://www.w3.org/TR/WebIDL/
[2] https://heycam.github.io/webidl/
[3] https://dom.spec.whatwg.org/
diff --git a/src/Makefile b/src/Makefile
index b7b142a..8b034fe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,8 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c interface-map.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c \
+ interface-map.c duk-libdom.c
# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/duk-libdom.c b/src/duk-libdom.c
new file mode 100644
index 0000000..ee45eaf
--- /dev/null
+++ b/src/duk-libdom.c
@@ -0,0 +1,540 @@
+/* duktape binding generation implementation
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "options.h"
+#include "utils.h"
+#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
+#include "interface-map.h"
+#include "duk-libdom.h"
+
+/** prefix for all generated functions */
+#define DLPFX "duckky"
+
+#define NSGENBIND_PREAMBLE \
+"/* Generated by nsgenbind\n" \
+" *\n" \
+" * nsgenbind is published under the MIT Licence.\n" \
+" * nsgenbind is similar to a compiler is a purely transformative tool which\n"\
+" * explicitly makes no copyright claim on this generated output\n"\
+" */"
+
+/**
+ * Generate a C class name for the interface.
+ *
+ * The IDL interface names are camelcase and not similar to libdom naming so it
+ * is necessary to convert them to a libdom compatible class name. This
+ * implementation is simple ASCII capable only and cannot cope with multibyte
+ * codepoints.
+ *
+ * The algorithm is:
+ * - copy characters to output lowering their case
+ * - if the previous character in the input name was uppercase and the current
+ * one is lowercase insert an underscore before the *previous* character.
+ */
+static char *gen_class_name(struct interface_map_entry *interfacee)
+{
+ const char *inc;
+ char *outc;
+ char *name;
+ int wasupper;
+
+ /* enpty strings are a bad idea */
+ if ((interfacee->name == NULL) || (interfacee->name[0] == 0)) {
+ return NULL;
+ }
+
+ /* allocate result buffer as twice the input length as thats the
+ * absolute worst case.
+ */
+ name = calloc(2, strlen(interfacee->name));
+
+ outc = name;
+ inc = interfacee->name;
+ wasupper = 0;
+
+ /* first character handled separately as inserting a leading underscore
+ * is undesirable
+ */
+ *outc++ = tolower(*inc++);
+ /* copy input to output */
+ while (*inc != 0) {
+ /* ugly hack as html IDL is always prefixed uppercase and needs
+ * an underscore there
+ */
+ if ((inc == (interfacee->name + 4)) &&
+ (interfacee->name[0] == 'H') &&
+ (interfacee->name[1] == 'T') &&
+ (interfacee->name[2] == 'M') &&
+ (interfacee->name[3] == 'L') &&
+ (islower(inc[1]) == 0)) {
+ *outc++ = '_';
+ }
+ if ((islower(*inc) != 0) && (wasupper != 0)) {
+ *outc = *(outc - 1);
+ *(outc - 1) = '_';
+ outc++;
+ wasupper = 0;
+ } else {
+ wasupper = isupper(*inc);
+ }
+ *outc++ = tolower(*inc++);
+ }
+ return name;
+}
+
+/**
+ * find method by type on class
+ */
+static struct genbind_node *
+find_class_method(struct genbind_node *node,
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype)
+{
+ struct genbind_node *res_node;
+
+ res_node = genbind_node_find_type(
+ genbind_node_getnode(node),
+ prev, GENBIND_NODE_TYPE_METHOD);
+ while (res_node != NULL) {
+ struct genbind_node *type_node;
+ enum genbind_node_type *type;
+
+ type_node = genbind_node_find_type(
+ genbind_node_getnode(res_node),
+ NULL, GENBIND_NODE_TYPE_METHOD_TYPE);
+
+ type = (enum genbind_node_type *)genbind_node_getint(type_node);
+ if (*type == nodetype) {
+ break;
+ }
+
+ res_node = genbind_node_find_type(
+ genbind_node_getnode(node),
+ res_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ return res_node;
+}
+
+/**
+ * output character data of node of given type.
+ *
+ * used for pre/pro/epi/post sections
+ */
+static int
+output_cdata(FILE* outf,
+ struct genbind_node *node,
+ enum genbind_node_type nodetype)
+{
+ char *cdata;
+ cdata = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(node),
+ NULL, nodetype));
+ if (cdata != NULL) {
+ fprintf(outf, "%s", cdata);
+ }
+ return 0;
+}
+
+/**
+ * Output code to create a private structure
+ *
+ */
+static int output_duckky_create_private(FILE* outf, char *class_name)
+{
+ fprintf(outf, "\t%s_private_t *priv = calloc(1, sizeof(*priv));\n",
+ class_name);
+ fprintf(outf, "\tif (priv == NULL) return 0;\n");
+ fprintf(outf, "\tduk_push_pointer(ctx, priv);\n");
+ fprintf(outf, "\tduk_put_prop_string(ctx, 0, PRIVATE_MAGIC)\n\n");
+
+ return 0;
+}
+
+/**
+ * generate code that gets a private pointer
+ */
+static int output_ducky_safe_get_private(FILE* outf, char *class_name, int idx)
+{
+ fprintf(outf,
+ "\t%s_private_t *priv = dukky_get_private(ctx, %d);\n",
+ class_name, idx);
+ fprintf(outf, "\tif (priv == NULL) return 0;\n\n");
+ return 0;
+}
+
+
+/**
+ * generate the interface constructor
+ */
+static int
+output_interface_constructor(FILE* outf, struct interface_map_entry *interfacee)
+{
+ /* constructor definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___constructor(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ output_duckky_create_private(outf, interfacee->class_name);
+
+ /* generate call to initialisor */
+ fprintf(outf,
+ "\t%s_%s___init(ctx, priv, duk_get_pointer(ctx, 1));\n",
+ DLPFX, interfacee->class_name);
+
+ fprintf(outf, "\tduk_set_top(ctx, 1);\n");
+ fprintf(outf, "\treturn 1;\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
+
+/**
+ * generate the interface destructor
+ */
+static int
+output_interface_destructor(FILE* outf, struct interface_map_entry *interfacee)
+{
+ /* destructor definition */
+ fprintf(outf,
+ "duk_ret_t %s_%s___destructor(duk_context *ctx)\n",
+ DLPFX, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ output_ducky_safe_get_private(outf, interfacee->class_name, 0);
+
+ /* generate call to finaliser */
+ fprintf(outf,
+ "\t%s_%s___fini(ctx, priv);\n",
+ DLPFX, interfacee->class_name);
+
+ fprintf(outf,"\tfree(priv);\n");
+ fprintf(outf,"\treturn 0;\n");
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
+
+/**
+ * generate an initialisor call to parent interface
+ */
+static int
+output_interface_inherit_init(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *init_node;
+ struct genbind_node *inh_init_node;
+ struct genbind_node *param_node;
+ struct genbind_node *inh_param_node;
+
+ /* only need to call parent initialisor if there is one */
+ if (inherite == NULL) {
+ return 0;
+ }
+
+ /* find the initialisor method on the class (if any) */
+ init_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+
+ inh_init_node = find_class_method(inherite->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+
+
+ fprintf(outf, "\t%s_%s___init(ctx, &priv->parent",
+ DLPFX, inherite->class_name);
+
+ /* for each parameter in the parent find a matching named
+ * parameter to pass and cast if necessary
+ */
+
+ inh_param_node = genbind_node_find_type(
+ genbind_node_getnode(inh_init_node),
+ NULL, GENBIND_NODE_TYPE_PARAMETER);
+ while (inh_param_node != NULL) {
+ char *param_name;
+ param_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(inh_param_node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ param_node = genbind_node_find_type_ident(
+ genbind_node_getnode(init_node),
+ NULL,
+ GENBIND_NODE_TYPE_PARAMETER,
+ param_name);
+ if (param_node == NULL) {
+ fprintf(stderr, "class \"%s\" (interface %s) parent class \"%s\" (interface %s) initialisor requires a parameter \"%s\" with compatible identifier\n",
+ interfacee->class_name,
+ interfacee->name,
+ inherite->class_name,
+ inherite->name,
+ param_name);
+ return -1;
+ } else {
+ char *param_type;
+ char *inh_param_type;
+
+ fprintf(outf, ", ");
+
+ /* cast the parameter if required */
+ param_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(param_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ inh_param_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(inh_param_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ if (strcmp(param_type, inh_param_type) != 0) {
+ fprintf(outf, "(%s)", inh_param_type);
+ }
+
+ /* output the parameter identifier */
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
+ }
+
+ inh_param_node = genbind_node_find_type(
+ genbind_node_getnode(inh_init_node),
+ inh_param_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ fprintf(outf, ");\n");
+
+ return 0;
+}
+
+static int
+output_interface_init(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *init_node;
+ struct genbind_node *param_node;
+ int res;
+
+ /* find the initialisor method on the class (if any) */
+ init_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_INIT);
+
+ /* initialisor definition */
+ fprintf(outf,
+ "void %s_%s___init(duk_context *ctx, %s_private_t *priv",
+ DLPFX, interfacee->class_name, interfacee->class_name);
+
+ /* output the paramters on the method (if any) */
+ param_node = genbind_node_find_type(
+ genbind_node_getnode(init_node),
+ NULL, GENBIND_NODE_TYPE_PARAMETER);
+ while (param_node != NULL) {
+ fprintf(outf, ", ");
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_TYPE);
+ output_cdata(outf, param_node, GENBIND_NODE_TYPE_IDENT);
+
+ param_node = genbind_node_find_type(
+ genbind_node_getnode(init_node),
+ param_node, GENBIND_NODE_TYPE_METHOD);
+ }
+
+ fprintf(outf,")\n{\n");
+
+ /* if this interface inherits ensure we call its initialisor */
+ res = output_interface_inherit_init(outf, interfacee, inherite);
+ if (res != 0) {
+ return res;
+ }
+
+ /* generate log statement */
+ if (options->dbglog) {
+ fprintf(outf,
+ "\tLOG(\"Initialise %%p (priv=%%p)\", duk_get_heapptr(ctx, 0), priv);\n" );
+ }
+
+ /* output the initaliser code from the binding */
+ output_cdata(outf, init_node, GENBIND_NODE_TYPE_CDATA);
+
+ fprintf(outf, "}\n\n");
+
+ return 0;
+
+}
+
+static int
+output_interface_fini(FILE* outf,
+ struct interface_map_entry *interfacee,
+ struct interface_map_entry *inherite)
+{
+ struct genbind_node *fini_node;
+
+ /* find the finaliser method on the class (if any) */
+ fini_node = find_class_method(interfacee->class,
+ NULL,
+ GENBIND_METHOD_TYPE_FINI);
+
+ /* finaliser definition */
+ fprintf(outf,
+ "void dukky_%s___fini(duk_context *ctx, %s_private_t *priv)\n",
+ interfacee->class_name, interfacee->class_name);
+ fprintf(outf,"{\n");
+
+ /* generate log statement */
+ if (options->dbglog) {
+ fprintf(outf,
+ "\tLOG(\"Finalise %%p\", duk_get_heapptr(ctx, 0));\n" );
+ }
+
+ /* output the finialisor code from the binding */
+ output_cdata(outf, fini_node, GENBIND_NODE_TYPE_CDATA);
+
+ /* if this interface inherits ensure we call its finaliser */
+ if (inherite != NULL) {
+ fprintf(outf,
+ "\tdukky_%s___fini(ctx, &priv->parent);\n",
+ inherite->class_name);
+ }
+ fprintf(outf, "}\n\n");
+
+ return 0;
+}
+
+
+/**
+ * generate a source file to implement an interface using duk and libdom.
+ */
+static int output_interface(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map,
+ struct interface_map_entry *interfacee)
+{
+ FILE *ifacef;
+ int ifacenamelen;
+ struct genbind_node *binding_node;
+ struct interface_map_entry *inherite;
+ int res = 0;
+
+ /* compute clas name */
+ interfacee->class_name = gen_class_name(interfacee);
+
+ /* generate source filename */
+ ifacenamelen = strlen(interfacee->class_name) + 4;
+ interfacee->filename = malloc(ifacenamelen);
+ snprintf(interfacee->filename, ifacenamelen,
+ "%s.c", interfacee->class_name);
+
+ /* open output file */
+ ifacef = genb_fopen(interfacee->filename, "w");
+ if (ifacef == NULL) {
+ return -1;
+ }
+
+ /* find parent interface entry */
+ inherite = interface_map_inherit_entry(interface_map, interfacee);
+
+ binding_node = genbind_node_find_type(genbind, NULL,
+ GENBIND_NODE_TYPE_BINDING);
+
+ /* binding preface */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_PREFACE);
+
+ /* nsgenbind preamble */
+ fprintf(ifacef, "\n%s\n", NSGENBIND_PREAMBLE);
+
+ /* class preface */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PREFACE);
+
+ /* binding prologue */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_PROLOGUE);
+
+ /* class prologue */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_PROLOGUE);
+
+ fprintf(ifacef, "\n");
+
+ /* initialisor */
+ res = output_interface_init(ifacef, interfacee, inherite);
+ if (res != 0) {
+ goto op_error;
+ }
+
+ /* finaliser */
+ output_interface_fini(ifacef, interfacee, inherite);
+
+ /* constructor */
+ output_interface_constructor(ifacef, interfacee);
+
+ /* destructor */
+ output_interface_destructor(ifacef, interfacee);
+
+ fprintf(ifacef, "\n");
+
+ /* class epilogue */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_EPILOGUE);
+
+ /* binding epilogue */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_EPILOGUE);
+
+ /* class postface */
+ output_cdata(ifacef, interfacee->class, GENBIND_NODE_TYPE_POSTFACE);
+
+ /* binding postface */
+ output_cdata(ifacef, binding_node, GENBIND_NODE_TYPE_POSTFACE);
+
+op_error:
+ fclose(ifacef);
+
+ return res;
+}
+
+int duk_libdom_output(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map)
+{
+ int idx;
+ int res = 0;
+
+ /* generate interfaces */
+ for (idx = 0; idx < interface_map->entryc; idx++) {
+ res = output_interface(genbind, webidl, interface_map,
+ &interface_map->entries[idx]);
+ if (res != 0) {
+ break;
+ }
+ }
+
+ /* generate header */
+ /** \todo implement header */
+
+ /* generate makefile fragment */
+ /** \todo implement makefile generation */
+
+ return res;
+}
diff --git a/src/duk-libdom.h b/src/duk-libdom.h
new file mode 100644
index 0000000..8e86d74
--- /dev/null
+++ b/src/duk-libdom.h
@@ -0,0 +1,16 @@
+/* DukTape binding generation
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_duk_libdom_h
+#define nsgenbind_duk_libdom_h
+
+int duk_libdom_output(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map *interface_map);
+
+#endif
diff --git a/src/interface-map.c b/src/interface-map.c
index aef697e..44ece42 100644
--- a/src/interface-map.c
+++ b/src/interface-map.c
@@ -290,3 +290,16 @@ int interface_map_dumpdot(struct interface_map *index)
return 0;
}
+
+struct interface_map_entry *
+interface_map_inherit_entry(struct interface_map *map,
+ struct interface_map_entry *entry)
+{
+ struct interface_map_entry *res = NULL;
+
+ if ((entry != NULL) &&
+ (entry->inherit_idx != -1)) {
+ res = &map->entries[entry->inherit_idx];
+ }
+ return res;
+}
diff --git a/src/interface-map.h b/src/interface-map.h
index c9dd654..8a6ac05 100644
--- a/src/interface-map.h
+++ b/src/interface-map.h
@@ -25,19 +25,39 @@ struct interface_map_entry {
* interface
*/
struct genbind_node *class; /**< class from binding (if any) */
+
+ /* The variables are created and used by the output generation but
+ * rtaher than have another allocation and pointer the data they are
+ * just inline here.
+ */
+
+ char *filename; /**< filename used for output */
+
+ char *class_name; /**< the interface name converted to output
+ * appropriate value. e.g. generators targetting c
+ * might lowercase the name or add underscores
+ * instead of caps
+ */
};
struct interface_map {
- int entryc; /**< count of interfaces */
- struct interface_map_entry *entries;
+ int entryc; /**< count of interfaces */
+ struct interface_map_entry *entries;
};
int interface_map_new(struct genbind_node *genbind,
- struct webidl_node *webidl,
- struct interface_map **index_out);
+ struct webidl_node *webidl,
+ struct interface_map **index_out);
-int interface_map_dump(struct interface_map *index);
+int interface_map_dump(struct interface_map *map);
-int interface_map_dumpdot(struct interface_map *index);
+int interface_map_dumpdot(struct interface_map *map);
+
+/**
+ * interface map parent entry
+ *
+ * \return inherit entry or NULL if there is not one
+ */
+struct interface_map_entry *interface_map_inherit_entry(struct interface_map *map, struct interface_map_entry *entry);
#endif
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index 454fb56..456decb 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -32,6 +32,65 @@ static void nsgenbind_error(YYLTYPE *locp,
errtxt = strdup(str);
}
+static struct genbind_node *
+add_method(struct genbind_node **genbind_ast,
+ long methodtype,
+ struct genbind_node *declarator,
+ char *cdata)
+{
+ struct genbind_node *res_node;
+ struct genbind_node *method_node;
+ struct genbind_node *class_node;
+ struct genbind_node *cdata_node;
+ char *class_name;
+
+ /* extract the class name from the declarator */
+ class_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(
+ genbind_node_find_type(
+ declarator,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS)),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ if (cdata == NULL) {
+ cdata_node = declarator;
+ } else {
+ cdata_node = genbind_new_node(GENBIND_NODE_TYPE_CDATA,
+ declarator,
+ cdata);
+ }
+
+ /* generate method node */
+ method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
+ NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
+ cdata_node,
+ (void *)methodtype));
+
+ class_node = genbind_node_find_type_ident(*genbind_ast,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS,
+ class_name);
+ if (class_node == NULL) {
+ /* no existing class so manufacture one and attach method */
+ res_node = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ method_node,
+ class_name));
+
+ } else {
+ /* update the existing class */
+
+ /* link member node into class_node */
+ genbind_node_add(class_node, method_node);
+
+ res_node = NULL; /* updating so no need to add a new node */
+ }
+ return res_node;
+}
%}
@@ -199,6 +258,17 @@ TypeIdent
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
genbind_new_node(GENBIND_NODE_TYPE_TYPE, NULL, $1), $2);
}
+ |
+ TOK_STRING_LITERAL TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE,
+ NULL,
+ $1),
+ $2),
+ $4);
+ }
;
Preface
@@ -330,54 +400,14 @@ Method
:
MethodType MethodDeclarator CBlock
{
- struct genbind_node *declarator;
- struct genbind_node *method_node;
- struct genbind_node *class_node;
- char *class_name;
-
- declarator = $2;
-
- /* extract the class name from the declarator */
- class_name = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(
- genbind_node_find_type(
- declarator,
- NULL,
- GENBIND_NODE_TYPE_CLASS)),
- NULL,
- GENBIND_NODE_TYPE_IDENT));
-
- /* generate method node */
- method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
- genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- declarator, $3),
- (void *)$1));
-
-
-
- class_node = genbind_node_find_type_ident(*genbind_ast,
- NULL,
- GENBIND_NODE_TYPE_CLASS,
- class_name);
- if (class_node == NULL) {
- /* no existing class so manufacture one and attach method */
- $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- method_node,
- class_name));
-
- } else {
- /* update the existing class */
-
- /* link member node into class_node */
- genbind_node_add(class_node, method_node);
-
- $$ = NULL; /* updating so no need to add a new node */
- }
+ $$ = add_method(genbind_ast, $1, $2, $3);
}
-
+ |
+ MethodType MethodDeclarator ';'
+ {
+ $$ = add_method(genbind_ast, $1, $2, NULL);
+ }
+ ;
Class
:
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 18db196..b3191ba 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -17,8 +17,9 @@
#include "options.h"
#include "nsgenbind-ast.h"
#include "webidl-ast.h"
-#include "jsapi-libdom.h"
#include "interface-map.h"
+#include "jsapi-libdom.h"
+#include "duk-libdom.h"
struct options *options;
@@ -85,28 +86,6 @@ static struct options* process_cmdline(int argc, char **argv)
}
-static int generate_binding(struct genbind_node *binding_node, void *ctx)
-{
- struct genbind_node *genbind_root = ctx;
- char *type;
- int res = 10;
-
- type = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(binding_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE));
-
- if (strcmp(type, "jsapi_libdom") == 0) {
- res = jsapi_libdom_output(options, genbind_root, binding_node);
- } else {
- fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
- }
-
- return res;
-}
-
-
static int webidl_file_cb(struct genbind_node *node, void *ctx)
{
struct webidl_node **webidl_ast = ctx;
@@ -237,24 +216,17 @@ int main(int argc, char **argv)
/* dump the interface mapping */
interface_map_dump(interface_map);
interface_map_dumpdot(interface_map);
-#if 0
- /* generate output for each binding */
- res = genbind_node_foreach_type(genbind_root,
- GENBIND_NODE_TYPE_BINDING,
- generate_binding,
- genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: output failed with code %d\n", res);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- if (options->hdrfilename != NULL) {
- unlink(options->hdrfilename);
- }
- return res;
+ /* generate binding */
+ switch (bindingtype) {
+ case BINDINGTYPE_DUK_LIBDOM:
+ res = duk_libdom_output(genbind_root, webidl_root, interface_map);
+ break;
+
+ default:
+ fprintf(stderr, "Unable to generate binding of this type\n");
+ res = 7;
}
-#endif
- return 0;
+ return res;
}
diff --git a/src/options.h b/src/options.h
index 68a4bc1..85f107e 100644
--- a/src/options.h
+++ b/src/options.h
@@ -13,10 +13,6 @@
struct options {
char *infilename; /**< binding source */
char *outdirname; /**< output directory */
-FILE *hdrfilehandle;
-char *hdrfilename;
-char *outfilename;
-FILE *outfilehandle;
char *idlpath; /**< path to IDL files */
bool verbose; /**< verbose processing */
diff --git a/test/data/bindings/HTMLUnknownElement.bnd b/test/data/bindings/HTMLUnknownElement.bnd
new file mode 100644
index 0000000..faabaec
--- /dev/null
+++ b/test/data/bindings/HTMLUnknownElement.bnd
@@ -0,0 +1,19 @@
+class HTMLUnknownElement {
+ preface %{
+/* class pre */
+ %};
+
+ prologue %{
+/* class pro */
+ %};
+
+ epilogue %{
+/* class epi */
+ %};
+
+ postface %{
+/* class post */
+ %};
+}
+
+init HTMLUnknownElement("struct dom_html_element *" html_unknown_element::html_element);
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
index 4e06d23..392f652 100644
--- a/test/data/bindings/browser-duk.bnd
+++ b/test/data/bindings/browser-duk.bnd
@@ -15,43 +15,136 @@ binding duk_libdom {
webidl "console.idl";
preface %{
+/* DukTape JavaScript bindings for NetSurf browser
+ *
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ * Released under the terms of the MIT License,
+ * http://www.opensource.org/licenses/mit-license
+ */
%};
prologue %{
+/* binding prologue */
%};
epilogue %{
+/* binding epilogue */
%};
postface %{
+/* binding postface */
%};
}
-class Node {
- private "dom_node *" node;
+#include "HTMLUnknownElement.bnd"
- preface %{
- %};
+/* specialisations of html_element */
+init HTMLFontElement("struct dom_html_element *" html_font_element::html_element);
+init HTMLDirectoryElement("struct dom_html_element *" html_directory_element::html_element);
+init HTMLFrameElement("struct dom_html_element *" html_frame_element::html_element);
+init HTMLFrameSetElement("struct dom_html_element *" html_frame_set_element::html_element);
+init HTMLMarqueeElement("struct dom_html_element *" html_marquee_element::html_element);
+init HTMLAppletElement("struct dom_html_element *" html_applet_element::html_element);
+init HTMLCanvasElement("struct dom_html_element *" html_canvas_element::html_element);
+init HTMLTemplateElement("struct dom_html_element *" html_template_element::html_element);
+init HTMLScriptElement("struct dom_html_element *" html_script_element::html_element);
+init HTMLDialogElement("struct dom_html_element *" html_dialog_element::html_element);
+init HTMLMenuItemElement("struct dom_html_element *" html_menu_item_element::html_element);
+init HTMLMenuElement("struct dom_html_element *" html_menu_element::html_element);
+init HTMLDetailsElement("struct dom_html_element *" html_details_element::html_element);
+init HTMLLegendElement("struct dom_html_element *" html_legend_element::html_element);
+init HTMLFieldSetElement("struct dom_html_element *" html_field_set_element::html_element);
+init HTMLMeterElement("struct dom_html_element *" html_meter_element::html_element);
+init HTMLProgressElement("struct dom_html_element *" html_progress_element::html_element);
+init HTMLOutputElement("struct dom_html_element *" html_output_element::html_element);
+init HTMLKeygenElement("struct dom_html_element *" html_keygen_element::html_element);
+init HTMLTextAreaElement("struct dom_html_element *" html_text_area_element::html_element);
+init HTMLOptionElement("struct dom_html_element *" html_option_element::html_element);
+init HTMLOptGroupElement("struct dom_html_element *" html_opt_group_element::html_element);
+init HTMLDataListElement("struct dom_html_element *" html_data_list_element::html_element);
+init HTMLSelectElement("struct dom_html_element *" html_select_element::html_element);
+init HTMLButtonElement("struct dom_html_element *" html_button_element::html_element);
+init HTMLInputElement("struct dom_html_element *" html_input_element::html_element);
+init HTMLLabelElement("struct dom_html_element *" html_label_element::html_element);
+init HTMLFormElement("struct dom_html_element *" html_form_element::html_element);
+init HTMLTableCellElement("struct dom_html_element *" html_table_cell_element::html_element);
+init HTMLTableRowElement("struct dom_html_element *" html_table_row_element::html_element);
+init HTMLTableSectionElement("struct dom_html_element *" html_table_section_element::html_element);
+init HTMLTableColElement("struct dom_html_element *" html_table_col_element::html_element);
+init HTMLTableCaptionElement("struct dom_html_element *" html_table_caption_element::html_element);
+init HTMLTableElement("struct dom_html_element *" html_table_element::html_element);
+init HTMLAreaElement("struct dom_html_element *" html_area_element::html_element);
+init HTMLMapElement("struct dom_html_element *" html_map_element::html_element);
+init HTMLMediaElement("struct dom_html_element *" html_media_element::html_element);
+init HTMLTrackElement("struct dom_html_element *" html_track_element::html_element);
+init HTMLParamElement("struct dom_html_element *" html_param_element::html_element);
+init HTMLObjectElement("struct dom_html_element *" html_object_element::html_element);
+init HTMLEmbedElement("struct dom_html_element *" html_embed_element::html_element);
+init HTMLIFrameElement("struct dom_html_element *" html_i_frame_element::html_element);
+init HTMLImageElement("struct dom_html_element *" html_image_element::html_element);
+init HTMLSourceElement("struct dom_html_element *" html_source_element::html_element);
+init HTMLPictureElement("struct dom_html_element *" html_picture_element::html_element);
+init HTMLModElement("struct dom_html_element *" html_mod_element::html_element);
+init HTMLBRElement("struct dom_html_element *" html_br_element::html_element);
+init HTMLSpanElement("struct dom_html_element *" html_span_element::html_element);
+init HTMLTimeElement("struct dom_html_element *" html_time_element::html_element);
+init HTMLDataElement("struct dom_html_element *" html_data_element::html_element);
+init HTMLAnchorElement("struct dom_html_element *" html_anchor_element::html_element);
+init HTMLDivElement("struct dom_html_element *" html_div_element::html_element);
+init HTMLDListElement("struct dom_html_element *" html_d_list_element::html_element);
+init HTMLLIElement("struct dom_html_element *" html_li_element::html_element);
+init HTMLUListElement("struct dom_html_element *" html_u_list_element::html_element);
+init HTMLOListElement("struct dom_html_element *" html_o_list_element::html_element);
+init HTMLQuoteElement("struct dom_html_element *" html_quote_element::html_element);
+init HTMLPreElement("struct dom_html_element *" html_pre_element::html_element);
+init HTMLHRElement("struct dom_html_element *" html_hr_element::html_element);
+init HTMLParagraphElement("struct dom_html_element *" html_paragraph_element::html_element);
+init HTMLHeadingElement("struct dom_html_element *" html_heading_element::html_element);
+init HTMLBodyElement("struct dom_html_element *" html_body_element::html_element);
+init HTMLStyleElement("struct dom_html_element *" html_style_element::html_element);
+init HTMLMetaElement("struct dom_html_element *" html_meta_element::html_element);
+init HTMLLinkElement("struct dom_html_element *" html_link_element::html_element);
+init HTMLBaseElement("struct dom_html_element *" html_base_element::html_element);
+init HTMLTitleElement("struct dom_html_element *" html_title_element::html_element);
+init HTMLHeadElement("struct dom_html_element *" html_head_element::html_element);
+init HTMLHtmlElement("struct dom_html_element *" html_html_element::html_element);
- prologue %{
- %};
+/* specialisations of HTMLTableCellElement */
+init HTMLTableHeaderCellElement("struct dom_html_element *" html_table_header_cell_element::html_table_cell_element);
+init HTMLTableDataCellElement("struct dom_html_element *" html_table_data_cell_element::html_table_cell_element);
- epilogue %{
- %};
+/* specialisations of html_media_element */
+init HTMLAudioElement("struct dom_html_element *" html_audio_element::html_media_element);
+init HTMLVideoElement("struct dom_html_element *" html_video_element::html_media_element);
- postface %{
- %};
+init HTMLElement("struct dom_html_element *" html_element::element);
+
+init Text("struct dom_node_text *" text::character_data);
+init Comment("struct dom_node_comment *" comment::character_data);
+init ProcessingInstruction("struct dom_node_text *" text::character_data);
+
+init XMLDocument("struct dom_document *" document);
+
+init Element("struct dom_element *" element::node);
+init CharacterData("struct dom_node_character_data *" character_data::node);
+init DocumentFragment("struct dom_document *" document::node);
+init DocumentType("struct dom_document *" document::node);
+init Document("struct dom_document *" document::node);
+
+class Node {
+ private "dom_node *" node;
}
-init Node("dom_node *" node)
+init Node("struct dom_node *" node)
%{
- private->node = node;
- dom_node_ref(node);
+ priv->node = node;
+ dom_node_ref(node);
%}
fini Node()
%{
- dom_node_unref(private->node);
+ dom_node_unref(priv->node);
%}
method Node::AppendChild()
--
NetSurf Generator for JavaScript bindings
8 years, 4 months
- 1
- 0
nsgenbind: branch vince/interfacemap updated. release/0.1.0-20-g6406dae
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/6406dae8c4da597da88...
...commit http://git.netsurf-browser.org/nsgenbind.git/commit/6406dae8c4da597da8883...
...tree http://git.netsurf-browser.org/nsgenbind.git/tree/6406dae8c4da597da888345...
The branch, vince/interfacemap has been updated
via 6406dae8c4da597da888345cf145f366b8297d7c (commit)
from d36c21c4f53270f9ba8137bb1e84a7de45fea0f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=6406dae8c4da597da...
commit 6406dae8c4da597da888345cf145f366b8297d7c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Build interface map allowing for correct dependency generation
This constructs an ordered list of all interfaces in their dependency
order. The topological sort ordering is derived from the interfaces
inheritance.
The resulting table allows the generation phase to easily map
interfaces to classes defined in the binding with a useful ordering.
Additionally it was noticed that the uievent IDL was missing so that
has now been added and allows for a much more complete graph of
interfaces to be constructed.
diff --git a/README b/README
index e260642..039bd6a 100644
--- a/README
+++ b/README
@@ -37,6 +37,30 @@ The tool requires a binding file as input and an output directory in
which to place its output.
+Debug output
+------------
+
+as well as the generated source the tool will output seevral debugging
+files with the -D switch in use.
+
+interface.dot
+
+ The interfaces IDL dot file contains all the interfaces and their
+ relationship. graphviz can be used to convert this into a visual
+ representation which is sometimes useful to help in debugging
+ missing or incorrect IDL inheritance.
+
+ Processing the dot file with graphviz can produce very large files
+ so care must be taken with options. Some examples that produce
+ adequate output:
+
+ # classical tree
+ dot -O -Tsvg interface.dot
+
+ # radial output
+ twopi -Granksep=10.0 -Gnodesep=1.0 -Groot=0009 -O -Tsvg interface.dot
+
+
Web IDL
-------
diff --git a/src/Makefile b/src/Makefile
index 3e5b8af..b7b142a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c interface-map.c
# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/interface-map.c b/src/interface-map.c
new file mode 100644
index 0000000..aef697e
--- /dev/null
+++ b/src/interface-map.c
@@ -0,0 +1,292 @@
+/* interface mapping
+ *
+ * This file is part of nsgenbind.
+ * Published under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "options.h"
+#include "utils.h"
+#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
+#include "interface-map.h"
+
+/** count the number of nodes of a given type on an interface */
+static int
+enumerate_interface_type(struct webidl_node *interface_node,
+ enum webidl_node_type node_type)
+{
+ int count = 0;
+ struct webidl_node *members_node;
+
+ members_node = webidl_node_find_type(
+ webidl_node_getnode(interface_node),
+ NULL,
+ WEBIDL_NODE_TYPE_LIST);
+ while (members_node != NULL) {
+ count += webidl_node_enumerate_type(
+ webidl_node_getnode(members_node),
+ node_type);
+
+ members_node = webidl_node_find_type(
+ webidl_node_getnode(interface_node),
+ members_node,
+ WEBIDL_NODE_TYPE_LIST);
+ }
+
+ return count;
+}
+
+/* find index of inherited node if it is one of those listed in the
+ * binding also maintain refcounts
+ */
+static void
+compute_inherit_refcount(struct interface_map_entry *entries, int entryc)
+{
+ int idx;
+ int inf;
+
+ for (idx = 0; idx < entryc; idx++ ) {
+ entries[idx].inherit_idx = -1;
+ for (inf = 0; inf < entryc; inf++ ) {
+ /* cannot inherit from self and name must match */
+ if ((inf != idx) &&
+ (entries[idx].inherit_name != NULL ) &&
+ (strcmp(entries[idx].inherit_name,
+ entries[inf].name) == 0)) {
+ entries[idx].inherit_idx = inf;
+ entries[inf].refcount++;
+ break;
+ }
+ }
+ }
+}
+
+/** Topoligical sort based on the refcount
+ *
+ * do not need to consider loops as constructed graph is a acyclic
+ *
+ * alloc a second copy of the map
+ * repeat until all entries copied:
+ * walk source mapping until first entry with zero refcount
+ * put the entry at the end of the output map
+ * reduce refcount on inherit index if !=-1
+ * remove entry from source map
+ */
+static struct interface_map_entry *
+interface_topoligical_sort(struct interface_map_entry *srcinf, int infc)
+{
+ struct interface_map_entry *dstinf;
+ int idx;
+ int inf;
+
+ dstinf = calloc(infc, sizeof(struct interface_map_entry));
+ if (dstinf == NULL) {
+ return NULL;
+ }
+
+ for (idx = infc - 1; idx >= 0; idx--) {
+ /* walk source map until first valid entry with zero refcount */
+ inf = 0;
+ while ((inf < infc) &&
+ ((srcinf[inf].name == NULL) ||
+ (srcinf[inf].refcount > 0))) {
+ inf++;
+ }
+ if (inf == infc) {
+ free(dstinf);
+ return NULL;
+ }
+
+ /* copy entry to the end of the output map */
+ dstinf[idx].name = srcinf[inf].name;
+ dstinf[idx].node = srcinf[inf].node;
+ dstinf[idx].inherit_name = srcinf[inf].inherit_name;
+ dstinf[idx].operations = srcinf[inf].operations;
+ dstinf[idx].attributes = srcinf[inf].attributes;
+ dstinf[idx].class = srcinf[inf].class;
+
+ /* reduce refcount on inherit index if !=-1 */
+ if (srcinf[inf].inherit_idx != -1) {
+ srcinf[srcinf[inf].inherit_idx].refcount--;
+ }
+
+ /* remove entry from source map */
+ srcinf[inf].name = NULL;
+ }
+
+ return dstinf;
+}
+
+int interface_map_new(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map **index_out)
+{
+ int interfacec;
+ struct interface_map_entry *entries;
+ struct interface_map_entry *sorted_entries;
+ struct interface_map_entry *ecur;
+ struct webidl_node *node;
+ struct interface_map *index;
+
+ interfacec = webidl_node_enumerate_type(webidl,
+ WEBIDL_NODE_TYPE_INTERFACE);
+
+ if (options->verbose) {
+ printf("Indexing %d interfaces\n", interfacec);
+ }
+
+ entries = calloc(interfacec, sizeof(struct interface_map_entry));
+ if (entries == NULL) {
+ return -1;
+ }
+
+ /* for each interface populate an entry in the index */
+ ecur = entries;
+ node = webidl_node_find_type(webidl, NULL, WEBIDL_NODE_TYPE_INTERFACE);
+ while (node != NULL) {
+
+ /* fill index entry */
+ ecur->node = node;
+
+ /* name of interface */
+ ecur->name = webidl_node_gettext(
+ webidl_node_find_type(
+ webidl_node_getnode(node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ /* name of the inherited interface (if any) */
+ ecur->inherit_name = webidl_node_gettext(
+ webidl_node_find_type(
+ webidl_node_getnode(node),
+ NULL,
+ WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE));
+
+
+ /* enumerate the number of operations */
+ ecur->operations = enumerate_interface_type(node,
+ WEBIDL_NODE_TYPE_OPERATION);
+
+ /* enumerate the number of attributes */
+ ecur->attributes = enumerate_interface_type(node,
+ WEBIDL_NODE_TYPE_ATTRIBUTE);
+
+
+ /* matching class from binding */
+ ecur->class = genbind_node_find_type_ident(genbind,
+ NULL, GENBIND_NODE_TYPE_CLASS, ecur->name);
+
+ /* move to next interface */
+ node = webidl_node_find_type(webidl, node,
+ WEBIDL_NODE_TYPE_INTERFACE);
+ ecur++;
+ }
+
+ /* compute inheritance and refcounts on map */
+ compute_inherit_refcount(entries, interfacec);
+
+ /* sort interfaces to ensure correct ordering */
+ sorted_entries = interface_topoligical_sort(entries, interfacec);
+ free(entries);
+ if (sorted_entries == NULL) {
+ return -1;
+ }
+
+ /* compute inheritance and refcounts on sorted map */
+ compute_inherit_refcount(sorted_entries, interfacec);
+
+ index = malloc(sizeof(struct interface_map));
+ index->entryc = interfacec;
+ index->entries = sorted_entries;
+
+ *index_out = index;
+
+ return 0;
+}
+
+int interface_map_dump(struct interface_map *index)
+{
+ FILE *dumpf;
+ int eidx;
+ struct interface_map_entry *ecur;
+ const char *inherit_name;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("interface-index", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ inherit_name = ecur->inherit_name;
+ if (inherit_name == NULL) {
+ inherit_name = "";
+ }
+ fprintf(dumpf, "%d %s %s i:%d a:%d %p\n", eidx, ecur->name,
+ inherit_name, ecur->operations, ecur->attributes,
+ ecur->class);
+ ecur++;
+ }
+
+ fclose(dumpf);
+
+ return 0;
+}
+
+int interface_map_dumpdot(struct interface_map *index)
+{
+ FILE *dumpf;
+ int eidx;
+ struct interface_map_entry *ecur;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("interface.dot", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ fprintf(dumpf, "digraph interfaces {\n");
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ if (ecur->class != NULL) {
+ /* interfaces bound to a class are shown in blue */
+ fprintf(dumpf, "%04d [label=\"%s\" fontcolor=\"blue\"];\n", eidx, ecur->name);
+ } else {
+ fprintf(dumpf, "%04d [label=\"%s\"];\n", eidx, ecur->name);
+ }
+ ecur++;
+ }
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ if (index->entries[eidx].inherit_idx != -1) {
+ fprintf(dumpf, "%04d -> %04d;\n",
+ eidx, index->entries[eidx].inherit_idx);
+ }
+ }
+
+ fprintf(dumpf, "}\n");
+
+ fclose(dumpf);
+
+ return 0;
+}
diff --git a/src/interface-map.h b/src/interface-map.h
new file mode 100644
index 0000000..c9dd654
--- /dev/null
+++ b/src/interface-map.h
@@ -0,0 +1,43 @@
+/* Interface mapping
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_interface_map_h
+#define nsgenbind_interface_map_h
+
+struct genbind_node;
+struct webidl_node;
+
+struct interface_map_entry {
+ const char *name; /** interface name */
+ struct webidl_node *node; /**< AST interface node */
+ const char *inherit_name; /**< Name of interface inhertited from */
+ int operations; /**< number of operations on interface */
+ int attributes; /**< number of attributes on interface */
+ int inherit_idx; /**< index into map of inherited interface or -1 for
+ * not in map
+ */
+ int refcount; /**< number of interfacess in map that refer to this
+ * interface
+ */
+ struct genbind_node *class; /**< class from binding (if any) */
+};
+
+struct interface_map {
+ int entryc; /**< count of interfaces */
+ struct interface_map_entry *entries;
+};
+
+int interface_map_new(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map **index_out);
+
+int interface_map_dump(struct interface_map *index);
+
+int interface_map_dumpdot(struct interface_map *index);
+
+#endif
diff --git a/src/jsapi-libdom-infmap.c b/src/jsapi-libdom-infmap.c
deleted file mode 100644
index 09fce1e..0000000
--- a/src/jsapi-libdom-infmap.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* interface map builder
- *
- * This file is part of nsgenbind.
- * Published under the MIT License,
- * http://www.opensource.org/licenses/mit-license.php
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- */
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "options.h"
-#include "nsgenbind-ast.h"
-#include "webidl-ast.h"
-#include "jsapi-libdom.h"
-
-/** count the number of methods or properties for an interface */
-static int
-enumerate_interface_own(struct webidl_node *interface_node,
- enum webidl_node_type node_type)
-{
- int count = 0;
- struct webidl_node *members_node;
-
- members_node = webidl_node_find_type(
- webidl_node_getnode(interface_node),
- NULL,
- WEBIDL_NODE_TYPE_LIST);
- while (members_node != NULL) {
- count += webidl_node_enumerate_type(
- webidl_node_getnode(members_node),
- node_type);
-
- members_node = webidl_node_find_type(
- webidl_node_getnode(interface_node),
- members_node,
- WEBIDL_NODE_TYPE_LIST);
- }
-
- return count;
-}
-
-static int
-fill_binding_interface(struct webidl_node *webidl_ast,
- struct binding_interface *interface)
-{
- /* get web IDL node for interface */
- interface->widl_node = webidl_node_find_type_ident(
- webidl_ast,
- WEBIDL_NODE_TYPE_INTERFACE,
- interface->name);
- if (interface->widl_node == NULL) {
- return -1;
- }
-
- /* enumerate the number of functions */
- interface->own_functions = enumerate_interface_own(
- interface->widl_node,
- WEBIDL_NODE_TYPE_OPERATION);
-
- /* enumerate the number of properties */
- interface->own_properties = enumerate_interface_own(
- interface->widl_node,
- WEBIDL_NODE_TYPE_ATTRIBUTE);
-
- /* extract the name of the inherited interface (if any) */
- interface->inherit_name = webidl_node_gettext(
- webidl_node_find_type(
- webidl_node_getnode(interface->widl_node),
- NULL,
- WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE));
-
- return 0;
-}
-
-/* find index of inherited node if it is one of those listed in the
- * binding also maintain refcounts
- */
-static void
-compute_inherit_refcount(struct binding_interface *interfaces,
- int interfacec)
-{
- int idx;
- int inf;
-
- for (idx = 0; idx < interfacec; idx++ ) {
- interfaces[idx].inherit_idx = -1;
- for (inf = 0; inf < interfacec; inf++ ) {
- /* cannot inherit from self and name must match */
- if ((inf != idx) &&
- (interfaces[idx].inherit_name != NULL ) &&
- (strcmp(interfaces[idx].inherit_name,
- interfaces[inf].name) == 0)) {
- interfaces[idx].inherit_idx = inf;
- interfaces[inf].refcount++;
- break;
- }
- }
- }
-}
-
-/** Topoligical sort based on the refcount
- *
- * do not need to consider loops as constructed graph is a acyclic
- *
- * alloc a second copy of the map
- * repeat until all entries copied:
- * walk source mapping until first entry with zero refcount
- * put the entry at the end of the output map
- * reduce refcount on inherit index if !=-1
- * remove entry from source map
- */
-static struct binding_interface *
-interface_topoligical_sort(struct binding_interface *srcinf, int infc)
-{
- struct binding_interface *dstinf;
- int idx;
- int inf;
-
- dstinf = calloc(infc, sizeof(struct binding_interface));
- if (dstinf == NULL) {
- return NULL;
- }
-
- for (idx = infc - 1; idx >= 0; idx--) {
- /* walk source map until first valid entry with zero refcount */
- inf = 0;
- while ((inf < infc) &&
- ((srcinf[inf].name == NULL) ||
- (srcinf[inf].refcount > 0))) {
- inf++;
- }
- if (inf == infc) {
- free(dstinf);
- return NULL;
- }
-
- /* copy entry to the end of the output map */
- dstinf[idx].name = srcinf[inf].name;
- dstinf[idx].node = srcinf[inf].node;
- dstinf[idx].widl_node = srcinf[inf].widl_node;
- dstinf[idx].inherit_name = srcinf[inf].inherit_name;
- dstinf[idx].own_properties = srcinf[inf].own_properties;
- dstinf[idx].own_functions = srcinf[inf].own_functions;
-
- /* reduce refcount on inherit index if !=-1 */
- if (srcinf[inf].inherit_idx != -1) {
- srcinf[srcinf[inf].inherit_idx].refcount--;
- }
-
- /* remove entry from source map */
- srcinf[inf].name = NULL;
- }
-
- return dstinf;
-}
-
-/* exported interface documented in jsapi-libdom.h */
-int build_interface_map(struct genbind_node *binding_node,
- struct webidl_node *webidl_ast,
- int *interfacec_out,
- struct binding_interface **interfaces_out)
-{
- int interfacec;
- int inf; /* interface loop counter */
- int idx; /* map index counter */
- struct binding_interface *interfaces;
- struct genbind_node *node = NULL;
- struct binding_interface *reinterfaces;
-
- /* count number of interfaces listed in binding */
- interfacec = genbind_node_enumerate_type(
- genbind_node_getnode(binding_node),
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
-
- if (interfacec == 0) {
- return -1;
- }
- if (options->verbose) {
- printf("Binding has %d interfaces\n", interfacec);
- }
-
- interfaces = calloc(interfacec, sizeof(struct binding_interface));
- if (interfaces == NULL) {
- return -1;
- }
-
- /* fill in map with binding node data */
- idx = 0;
- node = genbind_node_find_type(genbind_node_getnode(binding_node),
- node,
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
- while (node != NULL) {
-
- /* binding node */
- interfaces[idx].node = node;
-
- /* get interface name */
- interfaces[idx].name = genbind_node_gettext(
- genbind_node_find_type(genbind_node_getnode(node),
- NULL,
- GENBIND_NODE_TYPE_IDENT));
- if (interfaces[idx].name == NULL) {
- free(interfaces);
- return -1;
- }
-
- /* get interface info from webidl */
- if (fill_binding_interface(webidl_ast, interfaces + idx) == -1) {
- free(interfaces);
- return -1;
- }
-
- interfaces[idx].refcount = 0;
-
- /* ensure it is not a duplicate */
- for (inf = 0; inf < idx; inf++) {
- if (strcmp(interfaces[inf].name, interfaces[idx].name) == 0) {
- break;
- }
- }
- if (inf != idx) {
- WARN(WARNING_DUPLICATED,
- "interface %s duplicated in binding",
- interfaces[idx].name);
- } else {
- idx++;
- }
-
- /* next node */
- node = genbind_node_find_type(
- genbind_node_getnode(binding_node),
- node,
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
- }
-
- /* update count which may have changed if there were duplicates */
- interfacec = idx;
-
- /* compute inheritance and refcounts on map */
- compute_inherit_refcount(interfaces, interfacec);
-
- /* the map must be augmented with all the interfaces not in
- * the binding but in the dependancy chain
- */
- for (idx = 0; idx < interfacec; idx++ ) {
- if ((interfaces[idx].inherit_idx == -1) &&
- (interfaces[idx].inherit_name != NULL)) {
- /* interface inherits but not currently in map */
-
- /* grow map */
- reinterfaces = realloc(interfaces,
- (interfacec + 1) * sizeof(struct binding_interface));
- if (reinterfaces == NULL) {
- fprintf(stderr,"Unable to grow interface map\n");
- free(interfaces);
- return -1;
- }
- interfaces = reinterfaces;
-
- /* setup all fields in new interface */
-
- /* this interface is not in the binding and
- * will not be exported
- */
- interfaces[interfacec].node = NULL;
-
- interfaces[interfacec].name = interfaces[idx].inherit_name;
-
- if (fill_binding_interface(webidl_ast,
- interfaces + interfacec) == -1) {
- fprintf(stderr,
- "Interface %s inherits from %s which is not in the WebIDL\n",
- interfaces[idx].name,
- interfaces[idx].inherit_name);
- free(interfaces);
- return -1;
- }
-
- interfaces[interfacec].inherit_idx = -1;
- interfaces[interfacec].refcount = 0;
-
- /* update dependancy info and refcount */
- for (inf = 0; inf < interfacec; inf++) {
- if (strcmp(interfaces[inf].inherit_name,
- interfaces[interfacec].name) == 0) {
- interfaces[inf].inherit_idx = interfacec;
- interfaces[interfacec].refcount++;
- }
- }
-
- /* update interface count in map */
- interfacec++;
-
- }
- }
-
- /* sort interfaces to ensure correct ordering */
- reinterfaces = interface_topoligical_sort(interfaces, interfacec);
- free(interfaces);
- if (reinterfaces == NULL) {
- return -1;
- }
- interfaces = reinterfaces;
-
- /* compute inheritance and refcounts on sorted map */
- compute_inherit_refcount(interfaces, interfacec);
-
- /* setup output index values */
- inf = 0;
- for (idx = 0; idx < interfacec; idx++ ) {
- if (interfaces[idx].node == NULL) {
- interfaces[idx].output_idx = -1;
- } else {
- interfaces[idx].output_idx = inf;
- inf++;
- }
- }
-
- /* show the interface map */
- if (options->verbose) {
- for (idx = 0; idx < interfacec; idx++ ) {
- printf("interface num:%d\n"
- " name:%s node:%p widl:%p\n"
- " inherit:%s inherit idx:%d refcount:%d\n"
- " own functions:%d own properties:%d output idx:%d\n",
- idx,
- interfaces[idx].name,
- interfaces[idx].node,
- interfaces[idx].widl_node,
- interfaces[idx].inherit_name,
- interfaces[idx].inherit_idx,
- interfaces[idx].refcount,
- interfaces[idx].own_functions,
- interfaces[idx].own_properties,
- interfaces[idx].output_idx);
- }
- }
-
- *interfacec_out = interfacec;
- *interfaces_out = interfaces;
-
- return 0;
-}
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index e7215b1..9c564b9 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -130,7 +130,7 @@ genbind_node_enumerate_type(struct genbind_node *node,
enum genbind_node_type type);
/** Depth first left hand search returning nodes of the specified type
- * and a ident child node with matching text
+ * with an ident child node with matching text
*
* @param node The node to start the search from
* @param prev The node at which to stop the search, either NULL to
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 914f58e..18db196 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -14,10 +14,11 @@
#include <getopt.h>
#include <errno.h>
+#include "options.h"
#include "nsgenbind-ast.h"
#include "webidl-ast.h"
#include "jsapi-libdom.h"
-#include "options.h"
+#include "interface-map.h"
struct options *options;
@@ -194,6 +195,7 @@ int main(int argc, char **argv)
int res;
struct genbind_node *genbind_root = NULL;
struct webidl_node *webidl_root = NULL;
+ struct interface_map *interface_map = NULL;
enum bindingtype_e bindingtype;
options = process_cmdline(argc, argv);
@@ -226,6 +228,15 @@ int main(int argc, char **argv)
/* debug dump of web idl AST */
webidl_dump_ast(webidl_root);
+ /* generate index of interfaces in idl sorted by inheritance */
+ res = interface_map_new(genbind_root, webidl_root, &interface_map);
+ if (res != 0) {
+ return 5;
+ }
+
+ /* dump the interface mapping */
+ interface_map_dump(interface_map);
+ interface_map_dumpdot(interface_map);
#if 0
/* generate output for each binding */
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
index c32f6a3..4e06d23 100644
--- a/test/data/bindings/browser-duk.bnd
+++ b/test/data/bindings/browser-duk.bnd
@@ -11,6 +11,7 @@
binding duk_libdom {
webidl "dom.idl";
webidl "html.idl";
+ webidl "uievents.idl";
webidl "console.idl";
preface %{
diff --git a/test/data/idl/uievents.idl b/test/data/idl/uievents.idl
new file mode 100644
index 0000000..3f339f3
--- /dev/null
+++ b/test/data/idl/uievents.idl
@@ -0,0 +1,185 @@
+// Retrived from
+// Thu Jul 23 21:40:07 BST 2015
+
+
+[Constructor(DOMString type, optional UIEventInit eventInitDict)]
+interface UIEvent : Event {
+ readonly attribute Window? view;
+ readonly attribute long detail;
+};
+
+dictionary UIEventInit : EventInit {
+ Window? view = null;
+ long detail = 0;
+};
+
+[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict)]
+interface FocusEvent : UIEvent {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary FocusEventInit : UIEventInit {
+ EventTarget? relatedTarget = null;
+};
+
+[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
+interface MouseEvent : UIEvent {
+ readonly attribute long screenX;
+ readonly attribute long screenY;
+ readonly attribute long clientX;
+ readonly attribute long clientY;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute short button;
+ readonly attribute EventTarget? relatedTarget;
+ // Introduced in this specification
+ readonly attribute unsigned short buttons;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary MouseEventInit : EventModifierInit {
+ long screenX = 0;
+ long screenY = 0;
+ long clientX = 0;
+ long clientY = 0;
+ short button = 0;
+ unsigned short buttons = 0;
+ EventTarget? relatedTarget = null;
+};
+
+dictionary EventModifierInit : UIEventInit {
+ boolean ctrlKey = false;
+ boolean shiftKey = false;
+ boolean altKey = false;
+ boolean metaKey = false;
+ boolean modifierAltGraph = false;
+ boolean modifierCapsLock = false;
+ boolean modifierFn = false;
+ boolean modifierFnLock = false;
+ boolean modifierHyper = false;
+ boolean modifierNumLock = false;
+ boolean modifierOS = false;
+ boolean modifierScrollLock = false;
+ boolean modifierSuper = false;
+ boolean modifierSymbol = false;
+ boolean modifierSymbolLock = false;
+};
+
+[Constructor(DOMString typeArg, optional WheelEventInit wheelEventInitDict)]
+interface WheelEvent : MouseEvent {
+ // DeltaModeCode
+ const unsigned long DOM_DELTA_PIXEL = 0x00;
+ const unsigned long DOM_DELTA_LINE = 0x01;
+ const unsigned long DOM_DELTA_PAGE = 0x02;
+ readonly attribute double deltaX;
+ readonly attribute double deltaY;
+ readonly attribute double deltaZ;
+ readonly attribute unsigned long deltaMode;
+};
+
+dictionary WheelEventInit : MouseEventInit {
+ double deltaX = 0.0;
+ double deltaY = 0.0;
+ double deltaZ = 0.0;
+ unsigned long deltaMode = 0;
+};
+
+[Constructor(DOMString typeArg, optional KeyboardEventInit keyboardEventInitDict)]
+interface KeyboardEvent : UIEvent {
+ // KeyLocationCode
+ const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
+ const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
+ const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
+ const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
+ readonly attribute DOMString key;
+ readonly attribute DOMString code;
+ readonly attribute unsigned long location;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute boolean repeat;
+ readonly attribute boolean isComposing;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary KeyboardEventInit : EventModifierInit {
+ DOMString key = "";
+ DOMString code = "";
+ unsigned long location = 0;
+ boolean repeat = false;
+ boolean isComposing = false;
+};
+
+[Constructor(DOMString typeArg, optional CompositionEventInit compositionEventInitDict)]
+interface CompositionEvent : UIEvent {
+ readonly attribute DOMString data;
+};
+
+dictionary CompositionEventInit : UIEventInit {
+ DOMString data = "";
+};
+
+partial interface CustomEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCustomEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, any detailArg);
+};
+
+partial interface UIEvent {
+ // Deprecated in this specification
+ void initUIEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg);
+};
+
+partial interface FocusEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initFocusEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, EventTarget? relatedTargetArg);
+};
+
+partial interface MouseEvent {
+ // Deprecated in this specification
+ void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, EventTarget? relatedTargetArg);
+};
+
+partial interface WheelEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initWheelEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, short buttonArg, EventTarget? relatedTargetArg, DOMString modifiersListArg, double deltaXArg, double deltaYArg, double deltaZArg, unsigned long deltaMode);
+};
+
+partial interface KeyboardEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg, boolean repeat, DOMString locale);
+};
+
+partial interface CompositionEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCompositionEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString dataArg, DOMString locale);
+};
+
+partial interface KeyboardEvent {
+ // The following support legacy user agents
+ readonly attribute unsigned long charCode;
+ readonly attribute unsigned long keyCode;
+ readonly attribute unsigned long which;
+};
+
+partial dictionary KeyboardEventInit {
+ unsigned long charCode = 0;
+ unsigned long keyCode = 0;
+ unsigned long which = 0;
+};
+
+interface MutationEvent : Event {
+ // attrChangeType
+ const unsigned short MODIFICATION = 1;
+ const unsigned short ADDITION = 2;
+ const unsigned short REMOVAL = 3;
+ readonly attribute Node? relatedNode;
+ readonly attribute DOMString prevValue;
+ readonly attribute DOMString newValue;
+ readonly attribute DOMString attrName;
+ readonly attribute unsigned short attrChange;
+ void initMutationEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Node? relatedNodeArg, DOMString prevValueArg, DOMString newValueArg, DOMString attrNameArg, unsigned short attrChangeArg);
+};
+
-----------------------------------------------------------------------
Summary of changes:
README | 24 +++
src/Makefile | 2 +-
src/interface-map.c | 292 ++++++++++++++++++++++++++++++
src/interface-map.h | 43 +++++
src/jsapi-libdom-infmap.c | 348 ------------------------------------
src/nsgenbind-ast.h | 2 +-
src/nsgenbind.c | 13 +-
test/data/bindings/browser-duk.bnd | 1 +
test/data/idl/uievents.idl | 185 +++++++++++++++++++
9 files changed, 559 insertions(+), 351 deletions(-)
create mode 100644 src/interface-map.c
create mode 100644 src/interface-map.h
delete mode 100644 src/jsapi-libdom-infmap.c
create mode 100644 test/data/idl/uievents.idl
diff --git a/README b/README
index e260642..039bd6a 100644
--- a/README
+++ b/README
@@ -37,6 +37,30 @@ The tool requires a binding file as input and an output directory in
which to place its output.
+Debug output
+------------
+
+as well as the generated source the tool will output seevral debugging
+files with the -D switch in use.
+
+interface.dot
+
+ The interfaces IDL dot file contains all the interfaces and their
+ relationship. graphviz can be used to convert this into a visual
+ representation which is sometimes useful to help in debugging
+ missing or incorrect IDL inheritance.
+
+ Processing the dot file with graphviz can produce very large files
+ so care must be taken with options. Some examples that produce
+ adequate output:
+
+ # classical tree
+ dot -O -Tsvg interface.dot
+
+ # radial output
+ twopi -Granksep=10.0 -Gnodesep=1.0 -Groot=0009 -O -Tsvg interface.dot
+
+
Web IDL
-------
diff --git a/src/Makefile b/src/Makefile
index 3e5b8af..b7b142a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c interface-map.c
# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/interface-map.c b/src/interface-map.c
new file mode 100644
index 0000000..aef697e
--- /dev/null
+++ b/src/interface-map.c
@@ -0,0 +1,292 @@
+/* interface mapping
+ *
+ * This file is part of nsgenbind.
+ * Published under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "options.h"
+#include "utils.h"
+#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
+#include "interface-map.h"
+
+/** count the number of nodes of a given type on an interface */
+static int
+enumerate_interface_type(struct webidl_node *interface_node,
+ enum webidl_node_type node_type)
+{
+ int count = 0;
+ struct webidl_node *members_node;
+
+ members_node = webidl_node_find_type(
+ webidl_node_getnode(interface_node),
+ NULL,
+ WEBIDL_NODE_TYPE_LIST);
+ while (members_node != NULL) {
+ count += webidl_node_enumerate_type(
+ webidl_node_getnode(members_node),
+ node_type);
+
+ members_node = webidl_node_find_type(
+ webidl_node_getnode(interface_node),
+ members_node,
+ WEBIDL_NODE_TYPE_LIST);
+ }
+
+ return count;
+}
+
+/* find index of inherited node if it is one of those listed in the
+ * binding also maintain refcounts
+ */
+static void
+compute_inherit_refcount(struct interface_map_entry *entries, int entryc)
+{
+ int idx;
+ int inf;
+
+ for (idx = 0; idx < entryc; idx++ ) {
+ entries[idx].inherit_idx = -1;
+ for (inf = 0; inf < entryc; inf++ ) {
+ /* cannot inherit from self and name must match */
+ if ((inf != idx) &&
+ (entries[idx].inherit_name != NULL ) &&
+ (strcmp(entries[idx].inherit_name,
+ entries[inf].name) == 0)) {
+ entries[idx].inherit_idx = inf;
+ entries[inf].refcount++;
+ break;
+ }
+ }
+ }
+}
+
+/** Topoligical sort based on the refcount
+ *
+ * do not need to consider loops as constructed graph is a acyclic
+ *
+ * alloc a second copy of the map
+ * repeat until all entries copied:
+ * walk source mapping until first entry with zero refcount
+ * put the entry at the end of the output map
+ * reduce refcount on inherit index if !=-1
+ * remove entry from source map
+ */
+static struct interface_map_entry *
+interface_topoligical_sort(struct interface_map_entry *srcinf, int infc)
+{
+ struct interface_map_entry *dstinf;
+ int idx;
+ int inf;
+
+ dstinf = calloc(infc, sizeof(struct interface_map_entry));
+ if (dstinf == NULL) {
+ return NULL;
+ }
+
+ for (idx = infc - 1; idx >= 0; idx--) {
+ /* walk source map until first valid entry with zero refcount */
+ inf = 0;
+ while ((inf < infc) &&
+ ((srcinf[inf].name == NULL) ||
+ (srcinf[inf].refcount > 0))) {
+ inf++;
+ }
+ if (inf == infc) {
+ free(dstinf);
+ return NULL;
+ }
+
+ /* copy entry to the end of the output map */
+ dstinf[idx].name = srcinf[inf].name;
+ dstinf[idx].node = srcinf[inf].node;
+ dstinf[idx].inherit_name = srcinf[inf].inherit_name;
+ dstinf[idx].operations = srcinf[inf].operations;
+ dstinf[idx].attributes = srcinf[inf].attributes;
+ dstinf[idx].class = srcinf[inf].class;
+
+ /* reduce refcount on inherit index if !=-1 */
+ if (srcinf[inf].inherit_idx != -1) {
+ srcinf[srcinf[inf].inherit_idx].refcount--;
+ }
+
+ /* remove entry from source map */
+ srcinf[inf].name = NULL;
+ }
+
+ return dstinf;
+}
+
+int interface_map_new(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map **index_out)
+{
+ int interfacec;
+ struct interface_map_entry *entries;
+ struct interface_map_entry *sorted_entries;
+ struct interface_map_entry *ecur;
+ struct webidl_node *node;
+ struct interface_map *index;
+
+ interfacec = webidl_node_enumerate_type(webidl,
+ WEBIDL_NODE_TYPE_INTERFACE);
+
+ if (options->verbose) {
+ printf("Indexing %d interfaces\n", interfacec);
+ }
+
+ entries = calloc(interfacec, sizeof(struct interface_map_entry));
+ if (entries == NULL) {
+ return -1;
+ }
+
+ /* for each interface populate an entry in the index */
+ ecur = entries;
+ node = webidl_node_find_type(webidl, NULL, WEBIDL_NODE_TYPE_INTERFACE);
+ while (node != NULL) {
+
+ /* fill index entry */
+ ecur->node = node;
+
+ /* name of interface */
+ ecur->name = webidl_node_gettext(
+ webidl_node_find_type(
+ webidl_node_getnode(node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ /* name of the inherited interface (if any) */
+ ecur->inherit_name = webidl_node_gettext(
+ webidl_node_find_type(
+ webidl_node_getnode(node),
+ NULL,
+ WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE));
+
+
+ /* enumerate the number of operations */
+ ecur->operations = enumerate_interface_type(node,
+ WEBIDL_NODE_TYPE_OPERATION);
+
+ /* enumerate the number of attributes */
+ ecur->attributes = enumerate_interface_type(node,
+ WEBIDL_NODE_TYPE_ATTRIBUTE);
+
+
+ /* matching class from binding */
+ ecur->class = genbind_node_find_type_ident(genbind,
+ NULL, GENBIND_NODE_TYPE_CLASS, ecur->name);
+
+ /* move to next interface */
+ node = webidl_node_find_type(webidl, node,
+ WEBIDL_NODE_TYPE_INTERFACE);
+ ecur++;
+ }
+
+ /* compute inheritance and refcounts on map */
+ compute_inherit_refcount(entries, interfacec);
+
+ /* sort interfaces to ensure correct ordering */
+ sorted_entries = interface_topoligical_sort(entries, interfacec);
+ free(entries);
+ if (sorted_entries == NULL) {
+ return -1;
+ }
+
+ /* compute inheritance and refcounts on sorted map */
+ compute_inherit_refcount(sorted_entries, interfacec);
+
+ index = malloc(sizeof(struct interface_map));
+ index->entryc = interfacec;
+ index->entries = sorted_entries;
+
+ *index_out = index;
+
+ return 0;
+}
+
+int interface_map_dump(struct interface_map *index)
+{
+ FILE *dumpf;
+ int eidx;
+ struct interface_map_entry *ecur;
+ const char *inherit_name;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("interface-index", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ inherit_name = ecur->inherit_name;
+ if (inherit_name == NULL) {
+ inherit_name = "";
+ }
+ fprintf(dumpf, "%d %s %s i:%d a:%d %p\n", eidx, ecur->name,
+ inherit_name, ecur->operations, ecur->attributes,
+ ecur->class);
+ ecur++;
+ }
+
+ fclose(dumpf);
+
+ return 0;
+}
+
+int interface_map_dumpdot(struct interface_map *index)
+{
+ FILE *dumpf;
+ int eidx;
+ struct interface_map_entry *ecur;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("interface.dot", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ fprintf(dumpf, "digraph interfaces {\n");
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ if (ecur->class != NULL) {
+ /* interfaces bound to a class are shown in blue */
+ fprintf(dumpf, "%04d [label=\"%s\" fontcolor=\"blue\"];\n", eidx, ecur->name);
+ } else {
+ fprintf(dumpf, "%04d [label=\"%s\"];\n", eidx, ecur->name);
+ }
+ ecur++;
+ }
+
+ ecur = index->entries;
+ for (eidx = 0; eidx < index->entryc; eidx++) {
+ if (index->entries[eidx].inherit_idx != -1) {
+ fprintf(dumpf, "%04d -> %04d;\n",
+ eidx, index->entries[eidx].inherit_idx);
+ }
+ }
+
+ fprintf(dumpf, "}\n");
+
+ fclose(dumpf);
+
+ return 0;
+}
diff --git a/src/interface-map.h b/src/interface-map.h
new file mode 100644
index 0000000..c9dd654
--- /dev/null
+++ b/src/interface-map.h
@@ -0,0 +1,43 @@
+/* Interface mapping
+ *
+ * This file is part of nsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_interface_map_h
+#define nsgenbind_interface_map_h
+
+struct genbind_node;
+struct webidl_node;
+
+struct interface_map_entry {
+ const char *name; /** interface name */
+ struct webidl_node *node; /**< AST interface node */
+ const char *inherit_name; /**< Name of interface inhertited from */
+ int operations; /**< number of operations on interface */
+ int attributes; /**< number of attributes on interface */
+ int inherit_idx; /**< index into map of inherited interface or -1 for
+ * not in map
+ */
+ int refcount; /**< number of interfacess in map that refer to this
+ * interface
+ */
+ struct genbind_node *class; /**< class from binding (if any) */
+};
+
+struct interface_map {
+ int entryc; /**< count of interfaces */
+ struct interface_map_entry *entries;
+};
+
+int interface_map_new(struct genbind_node *genbind,
+ struct webidl_node *webidl,
+ struct interface_map **index_out);
+
+int interface_map_dump(struct interface_map *index);
+
+int interface_map_dumpdot(struct interface_map *index);
+
+#endif
diff --git a/src/jsapi-libdom-infmap.c b/src/jsapi-libdom-infmap.c
deleted file mode 100644
index 09fce1e..0000000
--- a/src/jsapi-libdom-infmap.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* interface map builder
- *
- * This file is part of nsgenbind.
- * Published under the MIT License,
- * http://www.opensource.org/licenses/mit-license.php
- * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
- */
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "options.h"
-#include "nsgenbind-ast.h"
-#include "webidl-ast.h"
-#include "jsapi-libdom.h"
-
-/** count the number of methods or properties for an interface */
-static int
-enumerate_interface_own(struct webidl_node *interface_node,
- enum webidl_node_type node_type)
-{
- int count = 0;
- struct webidl_node *members_node;
-
- members_node = webidl_node_find_type(
- webidl_node_getnode(interface_node),
- NULL,
- WEBIDL_NODE_TYPE_LIST);
- while (members_node != NULL) {
- count += webidl_node_enumerate_type(
- webidl_node_getnode(members_node),
- node_type);
-
- members_node = webidl_node_find_type(
- webidl_node_getnode(interface_node),
- members_node,
- WEBIDL_NODE_TYPE_LIST);
- }
-
- return count;
-}
-
-static int
-fill_binding_interface(struct webidl_node *webidl_ast,
- struct binding_interface *interface)
-{
- /* get web IDL node for interface */
- interface->widl_node = webidl_node_find_type_ident(
- webidl_ast,
- WEBIDL_NODE_TYPE_INTERFACE,
- interface->name);
- if (interface->widl_node == NULL) {
- return -1;
- }
-
- /* enumerate the number of functions */
- interface->own_functions = enumerate_interface_own(
- interface->widl_node,
- WEBIDL_NODE_TYPE_OPERATION);
-
- /* enumerate the number of properties */
- interface->own_properties = enumerate_interface_own(
- interface->widl_node,
- WEBIDL_NODE_TYPE_ATTRIBUTE);
-
- /* extract the name of the inherited interface (if any) */
- interface->inherit_name = webidl_node_gettext(
- webidl_node_find_type(
- webidl_node_getnode(interface->widl_node),
- NULL,
- WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE));
-
- return 0;
-}
-
-/* find index of inherited node if it is one of those listed in the
- * binding also maintain refcounts
- */
-static void
-compute_inherit_refcount(struct binding_interface *interfaces,
- int interfacec)
-{
- int idx;
- int inf;
-
- for (idx = 0; idx < interfacec; idx++ ) {
- interfaces[idx].inherit_idx = -1;
- for (inf = 0; inf < interfacec; inf++ ) {
- /* cannot inherit from self and name must match */
- if ((inf != idx) &&
- (interfaces[idx].inherit_name != NULL ) &&
- (strcmp(interfaces[idx].inherit_name,
- interfaces[inf].name) == 0)) {
- interfaces[idx].inherit_idx = inf;
- interfaces[inf].refcount++;
- break;
- }
- }
- }
-}
-
-/** Topoligical sort based on the refcount
- *
- * do not need to consider loops as constructed graph is a acyclic
- *
- * alloc a second copy of the map
- * repeat until all entries copied:
- * walk source mapping until first entry with zero refcount
- * put the entry at the end of the output map
- * reduce refcount on inherit index if !=-1
- * remove entry from source map
- */
-static struct binding_interface *
-interface_topoligical_sort(struct binding_interface *srcinf, int infc)
-{
- struct binding_interface *dstinf;
- int idx;
- int inf;
-
- dstinf = calloc(infc, sizeof(struct binding_interface));
- if (dstinf == NULL) {
- return NULL;
- }
-
- for (idx = infc - 1; idx >= 0; idx--) {
- /* walk source map until first valid entry with zero refcount */
- inf = 0;
- while ((inf < infc) &&
- ((srcinf[inf].name == NULL) ||
- (srcinf[inf].refcount > 0))) {
- inf++;
- }
- if (inf == infc) {
- free(dstinf);
- return NULL;
- }
-
- /* copy entry to the end of the output map */
- dstinf[idx].name = srcinf[inf].name;
- dstinf[idx].node = srcinf[inf].node;
- dstinf[idx].widl_node = srcinf[inf].widl_node;
- dstinf[idx].inherit_name = srcinf[inf].inherit_name;
- dstinf[idx].own_properties = srcinf[inf].own_properties;
- dstinf[idx].own_functions = srcinf[inf].own_functions;
-
- /* reduce refcount on inherit index if !=-1 */
- if (srcinf[inf].inherit_idx != -1) {
- srcinf[srcinf[inf].inherit_idx].refcount--;
- }
-
- /* remove entry from source map */
- srcinf[inf].name = NULL;
- }
-
- return dstinf;
-}
-
-/* exported interface documented in jsapi-libdom.h */
-int build_interface_map(struct genbind_node *binding_node,
- struct webidl_node *webidl_ast,
- int *interfacec_out,
- struct binding_interface **interfaces_out)
-{
- int interfacec;
- int inf; /* interface loop counter */
- int idx; /* map index counter */
- struct binding_interface *interfaces;
- struct genbind_node *node = NULL;
- struct binding_interface *reinterfaces;
-
- /* count number of interfaces listed in binding */
- interfacec = genbind_node_enumerate_type(
- genbind_node_getnode(binding_node),
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
-
- if (interfacec == 0) {
- return -1;
- }
- if (options->verbose) {
- printf("Binding has %d interfaces\n", interfacec);
- }
-
- interfaces = calloc(interfacec, sizeof(struct binding_interface));
- if (interfaces == NULL) {
- return -1;
- }
-
- /* fill in map with binding node data */
- idx = 0;
- node = genbind_node_find_type(genbind_node_getnode(binding_node),
- node,
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
- while (node != NULL) {
-
- /* binding node */
- interfaces[idx].node = node;
-
- /* get interface name */
- interfaces[idx].name = genbind_node_gettext(
- genbind_node_find_type(genbind_node_getnode(node),
- NULL,
- GENBIND_NODE_TYPE_IDENT));
- if (interfaces[idx].name == NULL) {
- free(interfaces);
- return -1;
- }
-
- /* get interface info from webidl */
- if (fill_binding_interface(webidl_ast, interfaces + idx) == -1) {
- free(interfaces);
- return -1;
- }
-
- interfaces[idx].refcount = 0;
-
- /* ensure it is not a duplicate */
- for (inf = 0; inf < idx; inf++) {
- if (strcmp(interfaces[inf].name, interfaces[idx].name) == 0) {
- break;
- }
- }
- if (inf != idx) {
- WARN(WARNING_DUPLICATED,
- "interface %s duplicated in binding",
- interfaces[idx].name);
- } else {
- idx++;
- }
-
- /* next node */
- node = genbind_node_find_type(
- genbind_node_getnode(binding_node),
- node,
- GENBIND_NODE_TYPE_BINDING_INTERFACE);
- }
-
- /* update count which may have changed if there were duplicates */
- interfacec = idx;
-
- /* compute inheritance and refcounts on map */
- compute_inherit_refcount(interfaces, interfacec);
-
- /* the map must be augmented with all the interfaces not in
- * the binding but in the dependancy chain
- */
- for (idx = 0; idx < interfacec; idx++ ) {
- if ((interfaces[idx].inherit_idx == -1) &&
- (interfaces[idx].inherit_name != NULL)) {
- /* interface inherits but not currently in map */
-
- /* grow map */
- reinterfaces = realloc(interfaces,
- (interfacec + 1) * sizeof(struct binding_interface));
- if (reinterfaces == NULL) {
- fprintf(stderr,"Unable to grow interface map\n");
- free(interfaces);
- return -1;
- }
- interfaces = reinterfaces;
-
- /* setup all fields in new interface */
-
- /* this interface is not in the binding and
- * will not be exported
- */
- interfaces[interfacec].node = NULL;
-
- interfaces[interfacec].name = interfaces[idx].inherit_name;
-
- if (fill_binding_interface(webidl_ast,
- interfaces + interfacec) == -1) {
- fprintf(stderr,
- "Interface %s inherits from %s which is not in the WebIDL\n",
- interfaces[idx].name,
- interfaces[idx].inherit_name);
- free(interfaces);
- return -1;
- }
-
- interfaces[interfacec].inherit_idx = -1;
- interfaces[interfacec].refcount = 0;
-
- /* update dependancy info and refcount */
- for (inf = 0; inf < interfacec; inf++) {
- if (strcmp(interfaces[inf].inherit_name,
- interfaces[interfacec].name) == 0) {
- interfaces[inf].inherit_idx = interfacec;
- interfaces[interfacec].refcount++;
- }
- }
-
- /* update interface count in map */
- interfacec++;
-
- }
- }
-
- /* sort interfaces to ensure correct ordering */
- reinterfaces = interface_topoligical_sort(interfaces, interfacec);
- free(interfaces);
- if (reinterfaces == NULL) {
- return -1;
- }
- interfaces = reinterfaces;
-
- /* compute inheritance and refcounts on sorted map */
- compute_inherit_refcount(interfaces, interfacec);
-
- /* setup output index values */
- inf = 0;
- for (idx = 0; idx < interfacec; idx++ ) {
- if (interfaces[idx].node == NULL) {
- interfaces[idx].output_idx = -1;
- } else {
- interfaces[idx].output_idx = inf;
- inf++;
- }
- }
-
- /* show the interface map */
- if (options->verbose) {
- for (idx = 0; idx < interfacec; idx++ ) {
- printf("interface num:%d\n"
- " name:%s node:%p widl:%p\n"
- " inherit:%s inherit idx:%d refcount:%d\n"
- " own functions:%d own properties:%d output idx:%d\n",
- idx,
- interfaces[idx].name,
- interfaces[idx].node,
- interfaces[idx].widl_node,
- interfaces[idx].inherit_name,
- interfaces[idx].inherit_idx,
- interfaces[idx].refcount,
- interfaces[idx].own_functions,
- interfaces[idx].own_properties,
- interfaces[idx].output_idx);
- }
- }
-
- *interfacec_out = interfacec;
- *interfaces_out = interfaces;
-
- return 0;
-}
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index e7215b1..9c564b9 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -130,7 +130,7 @@ genbind_node_enumerate_type(struct genbind_node *node,
enum genbind_node_type type);
/** Depth first left hand search returning nodes of the specified type
- * and a ident child node with matching text
+ * with an ident child node with matching text
*
* @param node The node to start the search from
* @param prev The node at which to stop the search, either NULL to
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 914f58e..18db196 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -14,10 +14,11 @@
#include <getopt.h>
#include <errno.h>
+#include "options.h"
#include "nsgenbind-ast.h"
#include "webidl-ast.h"
#include "jsapi-libdom.h"
-#include "options.h"
+#include "interface-map.h"
struct options *options;
@@ -194,6 +195,7 @@ int main(int argc, char **argv)
int res;
struct genbind_node *genbind_root = NULL;
struct webidl_node *webidl_root = NULL;
+ struct interface_map *interface_map = NULL;
enum bindingtype_e bindingtype;
options = process_cmdline(argc, argv);
@@ -226,6 +228,15 @@ int main(int argc, char **argv)
/* debug dump of web idl AST */
webidl_dump_ast(webidl_root);
+ /* generate index of interfaces in idl sorted by inheritance */
+ res = interface_map_new(genbind_root, webidl_root, &interface_map);
+ if (res != 0) {
+ return 5;
+ }
+
+ /* dump the interface mapping */
+ interface_map_dump(interface_map);
+ interface_map_dumpdot(interface_map);
#if 0
/* generate output for each binding */
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
index c32f6a3..4e06d23 100644
--- a/test/data/bindings/browser-duk.bnd
+++ b/test/data/bindings/browser-duk.bnd
@@ -11,6 +11,7 @@
binding duk_libdom {
webidl "dom.idl";
webidl "html.idl";
+ webidl "uievents.idl";
webidl "console.idl";
preface %{
diff --git a/test/data/idl/uievents.idl b/test/data/idl/uievents.idl
new file mode 100644
index 0000000..3f339f3
--- /dev/null
+++ b/test/data/idl/uievents.idl
@@ -0,0 +1,185 @@
+// Retrived from
+// Thu Jul 23 21:40:07 BST 2015
+
+
+[Constructor(DOMString type, optional UIEventInit eventInitDict)]
+interface UIEvent : Event {
+ readonly attribute Window? view;
+ readonly attribute long detail;
+};
+
+dictionary UIEventInit : EventInit {
+ Window? view = null;
+ long detail = 0;
+};
+
+[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict)]
+interface FocusEvent : UIEvent {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary FocusEventInit : UIEventInit {
+ EventTarget? relatedTarget = null;
+};
+
+[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
+interface MouseEvent : UIEvent {
+ readonly attribute long screenX;
+ readonly attribute long screenY;
+ readonly attribute long clientX;
+ readonly attribute long clientY;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute short button;
+ readonly attribute EventTarget? relatedTarget;
+ // Introduced in this specification
+ readonly attribute unsigned short buttons;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary MouseEventInit : EventModifierInit {
+ long screenX = 0;
+ long screenY = 0;
+ long clientX = 0;
+ long clientY = 0;
+ short button = 0;
+ unsigned short buttons = 0;
+ EventTarget? relatedTarget = null;
+};
+
+dictionary EventModifierInit : UIEventInit {
+ boolean ctrlKey = false;
+ boolean shiftKey = false;
+ boolean altKey = false;
+ boolean metaKey = false;
+ boolean modifierAltGraph = false;
+ boolean modifierCapsLock = false;
+ boolean modifierFn = false;
+ boolean modifierFnLock = false;
+ boolean modifierHyper = false;
+ boolean modifierNumLock = false;
+ boolean modifierOS = false;
+ boolean modifierScrollLock = false;
+ boolean modifierSuper = false;
+ boolean modifierSymbol = false;
+ boolean modifierSymbolLock = false;
+};
+
+[Constructor(DOMString typeArg, optional WheelEventInit wheelEventInitDict)]
+interface WheelEvent : MouseEvent {
+ // DeltaModeCode
+ const unsigned long DOM_DELTA_PIXEL = 0x00;
+ const unsigned long DOM_DELTA_LINE = 0x01;
+ const unsigned long DOM_DELTA_PAGE = 0x02;
+ readonly attribute double deltaX;
+ readonly attribute double deltaY;
+ readonly attribute double deltaZ;
+ readonly attribute unsigned long deltaMode;
+};
+
+dictionary WheelEventInit : MouseEventInit {
+ double deltaX = 0.0;
+ double deltaY = 0.0;
+ double deltaZ = 0.0;
+ unsigned long deltaMode = 0;
+};
+
+[Constructor(DOMString typeArg, optional KeyboardEventInit keyboardEventInitDict)]
+interface KeyboardEvent : UIEvent {
+ // KeyLocationCode
+ const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
+ const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
+ const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
+ const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
+ readonly attribute DOMString key;
+ readonly attribute DOMString code;
+ readonly attribute unsigned long location;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute boolean repeat;
+ readonly attribute boolean isComposing;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary KeyboardEventInit : EventModifierInit {
+ DOMString key = "";
+ DOMString code = "";
+ unsigned long location = 0;
+ boolean repeat = false;
+ boolean isComposing = false;
+};
+
+[Constructor(DOMString typeArg, optional CompositionEventInit compositionEventInitDict)]
+interface CompositionEvent : UIEvent {
+ readonly attribute DOMString data;
+};
+
+dictionary CompositionEventInit : UIEventInit {
+ DOMString data = "";
+};
+
+partial interface CustomEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCustomEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, any detailArg);
+};
+
+partial interface UIEvent {
+ // Deprecated in this specification
+ void initUIEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg);
+};
+
+partial interface FocusEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initFocusEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, EventTarget? relatedTargetArg);
+};
+
+partial interface MouseEvent {
+ // Deprecated in this specification
+ void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, EventTarget? relatedTargetArg);
+};
+
+partial interface WheelEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initWheelEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, short buttonArg, EventTarget? relatedTargetArg, DOMString modifiersListArg, double deltaXArg, double deltaYArg, double deltaZArg, unsigned long deltaMode);
+};
+
+partial interface KeyboardEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg, boolean repeat, DOMString locale);
+};
+
+partial interface CompositionEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCompositionEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString dataArg, DOMString locale);
+};
+
+partial interface KeyboardEvent {
+ // The following support legacy user agents
+ readonly attribute unsigned long charCode;
+ readonly attribute unsigned long keyCode;
+ readonly attribute unsigned long which;
+};
+
+partial dictionary KeyboardEventInit {
+ unsigned long charCode = 0;
+ unsigned long keyCode = 0;
+ unsigned long which = 0;
+};
+
+interface MutationEvent : Event {
+ // attrChangeType
+ const unsigned short MODIFICATION = 1;
+ const unsigned short ADDITION = 2;
+ const unsigned short REMOVAL = 3;
+ readonly attribute Node? relatedNode;
+ readonly attribute DOMString prevValue;
+ readonly attribute DOMString newValue;
+ readonly attribute DOMString attrName;
+ readonly attribute unsigned short attrChange;
+ void initMutationEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Node? relatedNodeArg, DOMString prevValueArg, DOMString newValueArg, DOMString attrNameArg, unsigned short attrChangeArg);
+};
+
--
NetSurf Generator for JavaScript bindings
8 years, 4 months
- 1
- 0
netsurf: branch master updated. release/3.3-234-gc5a834f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c5a834f5279581a00fddc...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c5a834f5279581a00fddc95...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c5a834f5279581a00fddc959c...
The branch, master has been updated
via c5a834f5279581a00fddc959c5f8bc12c07d3483 (commit)
from bdd9f59573d3c34ed9bf4bd029ca17a846c3602a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c5a834f5279581a00fd...
commit c5a834f5279581a00fddc959c5f8bc12c07d3483
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
retrive the correct uievents spec and process it appropriately
diff --git a/javascript/WebIDL/Makefile b/javascript/WebIDL/Makefile
index cebc708..1f9abec 100644
--- a/javascript/WebIDL/Makefile
+++ b/javascript/WebIDL/Makefile
@@ -14,8 +14,9 @@
all: dom.idl html.idl uievents.idl
-.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
-
+.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html
+.INTERMEDIATE:html-spec.html html-spec.xml html-idl.html
+.INTERMEDIATE:uievents-spec.html uievents-spec.xml uievents-idl.html
dom-spec.html:
curl -s https://dom.spec.whatwg.org/ -o $@
@@ -24,14 +25,11 @@ html-spec.html:
curl -s https://html.spec.whatwg.org/ -o $@
uievents-spec.html:
- curl -s https://w3c.github.io/uievents/ -o $@
+ curl -s http://www.w3.org/TR/uievents/ -o $@
%-spec.xml: %-spec.html
-tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption,section -o $@ -asxml $<
-uievents-idl.html: uievents-spec.xml
- hxselect 'dl.idl' < $< | hxremove 'p' >> $@
-
%-idl.html: %-spec.xml
hxselect 'pre[class="idl"]' < $< > $@
@@ -44,4 +42,4 @@ uievents-idl.html: uievents-spec.xml
clean:
- ${RM} dom.idl html.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
+ ${RM} dom.idl html.idl uievents.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html uievents-spec.html uievents-spec.xml uievents-idl.html uievents-spec.xml.errors
diff --git a/javascript/WebIDL/uievents.idl b/javascript/WebIDL/uievents.idl
new file mode 100644
index 0000000..3f339f3
--- /dev/null
+++ b/javascript/WebIDL/uievents.idl
@@ -0,0 +1,185 @@
+// Retrived from
+// Thu Jul 23 21:40:07 BST 2015
+
+
+[Constructor(DOMString type, optional UIEventInit eventInitDict)]
+interface UIEvent : Event {
+ readonly attribute Window? view;
+ readonly attribute long detail;
+};
+
+dictionary UIEventInit : EventInit {
+ Window? view = null;
+ long detail = 0;
+};
+
+[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict)]
+interface FocusEvent : UIEvent {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary FocusEventInit : UIEventInit {
+ EventTarget? relatedTarget = null;
+};
+
+[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
+interface MouseEvent : UIEvent {
+ readonly attribute long screenX;
+ readonly attribute long screenY;
+ readonly attribute long clientX;
+ readonly attribute long clientY;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute short button;
+ readonly attribute EventTarget? relatedTarget;
+ // Introduced in this specification
+ readonly attribute unsigned short buttons;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary MouseEventInit : EventModifierInit {
+ long screenX = 0;
+ long screenY = 0;
+ long clientX = 0;
+ long clientY = 0;
+ short button = 0;
+ unsigned short buttons = 0;
+ EventTarget? relatedTarget = null;
+};
+
+dictionary EventModifierInit : UIEventInit {
+ boolean ctrlKey = false;
+ boolean shiftKey = false;
+ boolean altKey = false;
+ boolean metaKey = false;
+ boolean modifierAltGraph = false;
+ boolean modifierCapsLock = false;
+ boolean modifierFn = false;
+ boolean modifierFnLock = false;
+ boolean modifierHyper = false;
+ boolean modifierNumLock = false;
+ boolean modifierOS = false;
+ boolean modifierScrollLock = false;
+ boolean modifierSuper = false;
+ boolean modifierSymbol = false;
+ boolean modifierSymbolLock = false;
+};
+
+[Constructor(DOMString typeArg, optional WheelEventInit wheelEventInitDict)]
+interface WheelEvent : MouseEvent {
+ // DeltaModeCode
+ const unsigned long DOM_DELTA_PIXEL = 0x00;
+ const unsigned long DOM_DELTA_LINE = 0x01;
+ const unsigned long DOM_DELTA_PAGE = 0x02;
+ readonly attribute double deltaX;
+ readonly attribute double deltaY;
+ readonly attribute double deltaZ;
+ readonly attribute unsigned long deltaMode;
+};
+
+dictionary WheelEventInit : MouseEventInit {
+ double deltaX = 0.0;
+ double deltaY = 0.0;
+ double deltaZ = 0.0;
+ unsigned long deltaMode = 0;
+};
+
+[Constructor(DOMString typeArg, optional KeyboardEventInit keyboardEventInitDict)]
+interface KeyboardEvent : UIEvent {
+ // KeyLocationCode
+ const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
+ const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
+ const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
+ const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
+ readonly attribute DOMString key;
+ readonly attribute DOMString code;
+ readonly attribute unsigned long location;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute boolean repeat;
+ readonly attribute boolean isComposing;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary KeyboardEventInit : EventModifierInit {
+ DOMString key = "";
+ DOMString code = "";
+ unsigned long location = 0;
+ boolean repeat = false;
+ boolean isComposing = false;
+};
+
+[Constructor(DOMString typeArg, optional CompositionEventInit compositionEventInitDict)]
+interface CompositionEvent : UIEvent {
+ readonly attribute DOMString data;
+};
+
+dictionary CompositionEventInit : UIEventInit {
+ DOMString data = "";
+};
+
+partial interface CustomEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCustomEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, any detailArg);
+};
+
+partial interface UIEvent {
+ // Deprecated in this specification
+ void initUIEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg);
+};
+
+partial interface FocusEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initFocusEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, EventTarget? relatedTargetArg);
+};
+
+partial interface MouseEvent {
+ // Deprecated in this specification
+ void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, EventTarget? relatedTargetArg);
+};
+
+partial interface WheelEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initWheelEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, short buttonArg, EventTarget? relatedTargetArg, DOMString modifiersListArg, double deltaXArg, double deltaYArg, double deltaZArg, unsigned long deltaMode);
+};
+
+partial interface KeyboardEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg, boolean repeat, DOMString locale);
+};
+
+partial interface CompositionEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCompositionEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString dataArg, DOMString locale);
+};
+
+partial interface KeyboardEvent {
+ // The following support legacy user agents
+ readonly attribute unsigned long charCode;
+ readonly attribute unsigned long keyCode;
+ readonly attribute unsigned long which;
+};
+
+partial dictionary KeyboardEventInit {
+ unsigned long charCode = 0;
+ unsigned long keyCode = 0;
+ unsigned long which = 0;
+};
+
+interface MutationEvent : Event {
+ // attrChangeType
+ const unsigned short MODIFICATION = 1;
+ const unsigned short ADDITION = 2;
+ const unsigned short REMOVAL = 3;
+ readonly attribute Node? relatedNode;
+ readonly attribute DOMString prevValue;
+ readonly attribute DOMString newValue;
+ readonly attribute DOMString attrName;
+ readonly attribute unsigned short attrChange;
+ void initMutationEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Node? relatedNodeArg, DOMString prevValueArg, DOMString newValueArg, DOMString attrNameArg, unsigned short attrChangeArg);
+};
+
-----------------------------------------------------------------------
Summary of changes:
javascript/WebIDL/Makefile | 12 ++-
javascript/WebIDL/uievents.idl | 185 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 190 insertions(+), 7 deletions(-)
create mode 100644 javascript/WebIDL/uievents.idl
diff --git a/javascript/WebIDL/Makefile b/javascript/WebIDL/Makefile
index cebc708..1f9abec 100644
--- a/javascript/WebIDL/Makefile
+++ b/javascript/WebIDL/Makefile
@@ -14,8 +14,9 @@
all: dom.idl html.idl uievents.idl
-.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
-
+.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html
+.INTERMEDIATE:html-spec.html html-spec.xml html-idl.html
+.INTERMEDIATE:uievents-spec.html uievents-spec.xml uievents-idl.html
dom-spec.html:
curl -s https://dom.spec.whatwg.org/ -o $@
@@ -24,14 +25,11 @@ html-spec.html:
curl -s https://html.spec.whatwg.org/ -o $@
uievents-spec.html:
- curl -s https://w3c.github.io/uievents/ -o $@
+ curl -s http://www.w3.org/TR/uievents/ -o $@
%-spec.xml: %-spec.html
-tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption,section -o $@ -asxml $<
-uievents-idl.html: uievents-spec.xml
- hxselect 'dl.idl' < $< | hxremove 'p' >> $@
-
%-idl.html: %-spec.xml
hxselect 'pre[class="idl"]' < $< > $@
@@ -44,4 +42,4 @@ uievents-idl.html: uievents-spec.xml
clean:
- ${RM} dom.idl html.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
+ ${RM} dom.idl html.idl uievents.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html uievents-spec.html uievents-spec.xml uievents-idl.html uievents-spec.xml.errors
diff --git a/javascript/WebIDL/uievents.idl b/javascript/WebIDL/uievents.idl
new file mode 100644
index 0000000..3f339f3
--- /dev/null
+++ b/javascript/WebIDL/uievents.idl
@@ -0,0 +1,185 @@
+// Retrived from
+// Thu Jul 23 21:40:07 BST 2015
+
+
+[Constructor(DOMString type, optional UIEventInit eventInitDict)]
+interface UIEvent : Event {
+ readonly attribute Window? view;
+ readonly attribute long detail;
+};
+
+dictionary UIEventInit : EventInit {
+ Window? view = null;
+ long detail = 0;
+};
+
+[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict)]
+interface FocusEvent : UIEvent {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary FocusEventInit : UIEventInit {
+ EventTarget? relatedTarget = null;
+};
+
+[Constructor(DOMString typeArg, optional MouseEventInit mouseEventInitDict)]
+interface MouseEvent : UIEvent {
+ readonly attribute long screenX;
+ readonly attribute long screenY;
+ readonly attribute long clientX;
+ readonly attribute long clientY;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute short button;
+ readonly attribute EventTarget? relatedTarget;
+ // Introduced in this specification
+ readonly attribute unsigned short buttons;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary MouseEventInit : EventModifierInit {
+ long screenX = 0;
+ long screenY = 0;
+ long clientX = 0;
+ long clientY = 0;
+ short button = 0;
+ unsigned short buttons = 0;
+ EventTarget? relatedTarget = null;
+};
+
+dictionary EventModifierInit : UIEventInit {
+ boolean ctrlKey = false;
+ boolean shiftKey = false;
+ boolean altKey = false;
+ boolean metaKey = false;
+ boolean modifierAltGraph = false;
+ boolean modifierCapsLock = false;
+ boolean modifierFn = false;
+ boolean modifierFnLock = false;
+ boolean modifierHyper = false;
+ boolean modifierNumLock = false;
+ boolean modifierOS = false;
+ boolean modifierScrollLock = false;
+ boolean modifierSuper = false;
+ boolean modifierSymbol = false;
+ boolean modifierSymbolLock = false;
+};
+
+[Constructor(DOMString typeArg, optional WheelEventInit wheelEventInitDict)]
+interface WheelEvent : MouseEvent {
+ // DeltaModeCode
+ const unsigned long DOM_DELTA_PIXEL = 0x00;
+ const unsigned long DOM_DELTA_LINE = 0x01;
+ const unsigned long DOM_DELTA_PAGE = 0x02;
+ readonly attribute double deltaX;
+ readonly attribute double deltaY;
+ readonly attribute double deltaZ;
+ readonly attribute unsigned long deltaMode;
+};
+
+dictionary WheelEventInit : MouseEventInit {
+ double deltaX = 0.0;
+ double deltaY = 0.0;
+ double deltaZ = 0.0;
+ unsigned long deltaMode = 0;
+};
+
+[Constructor(DOMString typeArg, optional KeyboardEventInit keyboardEventInitDict)]
+interface KeyboardEvent : UIEvent {
+ // KeyLocationCode
+ const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
+ const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
+ const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
+ const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
+ readonly attribute DOMString key;
+ readonly attribute DOMString code;
+ readonly attribute unsigned long location;
+ readonly attribute boolean ctrlKey;
+ readonly attribute boolean shiftKey;
+ readonly attribute boolean altKey;
+ readonly attribute boolean metaKey;
+ readonly attribute boolean repeat;
+ readonly attribute boolean isComposing;
+ boolean getModifierState (DOMString keyArg);
+};
+
+dictionary KeyboardEventInit : EventModifierInit {
+ DOMString key = "";
+ DOMString code = "";
+ unsigned long location = 0;
+ boolean repeat = false;
+ boolean isComposing = false;
+};
+
+[Constructor(DOMString typeArg, optional CompositionEventInit compositionEventInitDict)]
+interface CompositionEvent : UIEvent {
+ readonly attribute DOMString data;
+};
+
+dictionary CompositionEventInit : UIEventInit {
+ DOMString data = "";
+};
+
+partial interface CustomEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCustomEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, any detailArg);
+};
+
+partial interface UIEvent {
+ // Deprecated in this specification
+ void initUIEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg);
+};
+
+partial interface FocusEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initFocusEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, EventTarget? relatedTargetArg);
+};
+
+partial interface MouseEvent {
+ // Deprecated in this specification
+ void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, EventTarget? relatedTargetArg);
+};
+
+partial interface WheelEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initWheelEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, short buttonArg, EventTarget? relatedTargetArg, DOMString modifiersListArg, double deltaXArg, double deltaYArg, double deltaZArg, unsigned long deltaMode);
+};
+
+partial interface KeyboardEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg, boolean repeat, DOMString locale);
+};
+
+partial interface CompositionEvent {
+ // Originally introduced (and deprecated) in this specification
+ void initCompositionEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString dataArg, DOMString locale);
+};
+
+partial interface KeyboardEvent {
+ // The following support legacy user agents
+ readonly attribute unsigned long charCode;
+ readonly attribute unsigned long keyCode;
+ readonly attribute unsigned long which;
+};
+
+partial dictionary KeyboardEventInit {
+ unsigned long charCode = 0;
+ unsigned long keyCode = 0;
+ unsigned long which = 0;
+};
+
+interface MutationEvent : Event {
+ // attrChangeType
+ const unsigned short MODIFICATION = 1;
+ const unsigned short ADDITION = 2;
+ const unsigned short REMOVAL = 3;
+ readonly attribute Node? relatedNode;
+ readonly attribute DOMString prevValue;
+ readonly attribute DOMString newValue;
+ readonly attribute DOMString attrName;
+ readonly attribute unsigned short attrChange;
+ void initMutationEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Node? relatedNodeArg, DOMString prevValueArg, DOMString newValueArg, DOMString attrNameArg, unsigned short attrChangeArg);
+};
+
--
NetSurf Browser
8 years, 4 months
- 1
- 0
netsurf: branch master updated. release/3.3-233-gbdd9f59
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/bdd9f59573d3c34ed9bf4...
...commit http://git.netsurf-browser.org/netsurf.git/commit/bdd9f59573d3c34ed9bf4bd...
...tree http://git.netsurf-browser.org/netsurf.git/tree/bdd9f59573d3c34ed9bf4bd02...
The branch, master has been updated
via bdd9f59573d3c34ed9bf4bd029ca17a846c3602a (commit)
from 70fd706e65ba0470ac7d289646efa6b785c91ccb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bdd9f59573d3c34ed9b...
commit bdd9f59573d3c34ed9bf4bd029ca17a846c3602a
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Attempt to extract the uievents IDL
diff --git a/javascript/WebIDL/Makefile b/javascript/WebIDL/Makefile
index d53446a..cebc708 100644
--- a/javascript/WebIDL/Makefile
+++ b/javascript/WebIDL/Makefile
@@ -12,7 +12,7 @@
.PHONY:all clean
-all: dom.idl html.idl
+all: dom.idl html.idl uievents.idl
.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
@@ -23,8 +23,14 @@ dom-spec.html:
html-spec.html:
curl -s https://html.spec.whatwg.org/ -o $@
+uievents-spec.html:
+ curl -s https://w3c.github.io/uievents/ -o $@
+
%-spec.xml: %-spec.html
- -tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption -o $@ -asxml $<
+ -tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption,section -o $@ -asxml $<
+
+uievents-idl.html: uievents-spec.xml
+ hxselect 'dl.idl' < $< | hxremove 'p' >> $@
%-idl.html: %-spec.xml
hxselect 'pre[class="idl"]' < $< > $@
@@ -37,6 +43,5 @@ html-spec.html:
cat $< | w3m -dump -T text/html >>$@
-
clean:
${RM} dom.idl html.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
-----------------------------------------------------------------------
Summary of changes:
javascript/WebIDL/Makefile | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/javascript/WebIDL/Makefile b/javascript/WebIDL/Makefile
index d53446a..cebc708 100644
--- a/javascript/WebIDL/Makefile
+++ b/javascript/WebIDL/Makefile
@@ -12,7 +12,7 @@
.PHONY:all clean
-all: dom.idl html.idl
+all: dom.idl html.idl uievents.idl
.INTERMEDIATE:dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
@@ -23,8 +23,14 @@ dom-spec.html:
html-spec.html:
curl -s https://html.spec.whatwg.org/ -o $@
+uievents-spec.html:
+ curl -s https://w3c.github.io/uievents/ -o $@
+
%-spec.xml: %-spec.html
- -tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption -o $@ -asxml $<
+ -tidy -q -f $@.errors --new-blocklevel-tags header,hgroup,figure,time,main,nav,svg,rect,text,image,mark,figcaption,section -o $@ -asxml $<
+
+uievents-idl.html: uievents-spec.xml
+ hxselect 'dl.idl' < $< | hxremove 'p' >> $@
%-idl.html: %-spec.xml
hxselect 'pre[class="idl"]' < $< > $@
@@ -37,6 +43,5 @@ html-spec.html:
cat $< | w3m -dump -T text/html >>$@
-
clean:
${RM} dom.idl html.idl dom-spec.html dom-spec.xml dom-idl.html html-spec.html html-spec.xml html-idl.html
--
NetSurf Browser
8 years, 4 months
- 1
- 0
netsurf: branch chris/display-idna updated. release/3.3-242-gb178721
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b178721ad0f71d32db91c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b178721ad0f71d32db91cd7...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b178721ad0f71d32db91cd7b9...
The branch, chris/display-idna has been updated
via b178721ad0f71d32db91cd7b96be04778c9c2102 (commit)
via 2baaddd7d1d7e725fba2f44d014f24de4e48411c (commit)
via 70fd706e65ba0470ac7d289646efa6b785c91ccb (commit)
from 3de0e15b0fe18143fb8556793e4739819b10fce3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b178721ad0f71d32db9...
commit b178721ad0f71d32db91cd7b96be04778c9c2102
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Rework IDN URL retrieval to return an nserror
diff --git a/amiga/gui.c b/amiga/gui.c
index dc49a69..f491480 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4993,23 +4993,27 @@ static void gui_window_set_status(struct gui_window *g, const char *text)
static nserror gui_window_set_url(struct gui_window *g, nsurl *url)
{
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
+ char *url_lc = NULL;
+
if(!g) return NSERROR_OK;
if (g == g->shared->gw) {
- if(nsoption_bool(display_decoded_idn) == false) {
- RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
- g->shared->win, NULL,
- STRINGA_TextVal, nsurl_access(url),
- TAG_DONE);
- } else {
- char *idn_url = nsurl_access_utf8(url);
- char *idn_url_lc = ami_utf8_easy(idn_url);
- RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
- g->shared->win, NULL,
- STRINGA_TextVal, idn_url_lc,
- TAG_DONE);
- free(idn_url);
- ami_utf8_free(idn_url_lc);
+ if(nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
+ url_lc = ami_utf8_easy(idn_url_s);
+ }
+ }
+
+ RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
+ g->shared->win, NULL,
+ STRINGA_TextVal, url_lc ? url_lc : nsurl_access(url),
+ TAG_DONE);
+
+ if(url_lc) {
+ ami_utf8_free(url_lc);
+ if(idn_url_s) free(idn_url_s);
}
}
diff --git a/render/html_interaction.c b/render/html_interaction.c
index af84174..1b2e5b9 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -300,7 +300,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
enum { ACTION_NONE, ACTION_SUBMIT, ACTION_GO } action = ACTION_NONE;
const char *title = 0;
nsurl *url = 0;
- char *idn_url = NULL;
+ char *url_s = NULL;
+ size_t url_l = 0;
const char *target = 0;
char status_buffer[200];
const char *status = 0;
@@ -816,21 +817,25 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
}
} else if (url) {
if (nsoption_bool(display_decoded_idn) == true) {
- idn_url = nsurl_access_utf8(url);
+ if (nsurl_access_utf8(url, &url_s, &url_l) != NSERROR_OK) {
+ /* Unable to obtain a decoded IDN. This is not a fatal error.
+ * Ensure the string pointer is NULL so we use the encoded version. */
+ url_s = NULL;
+ }
}
if (title) {
snprintf(status_buffer, sizeof status_buffer, "%s: %s",
- idn_url ? idn_url : nsurl_access(url), title);
+ url_s ? url_s : nsurl_access(url), title);
} else {
snprintf(status_buffer, sizeof status_buffer, "%s",
- idn_url ? idn_url : nsurl_access(url));
+ url_s ? url_s : nsurl_access(url));
}
status = status_buffer;
- if (idn_url != NULL)
- free(idn_url);
+ if (url_s != NULL)
+ free(url_s);
pointer = get_pointer_shape(url_box, imagemap);
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 78647b4..ed6d896 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -1698,8 +1698,11 @@ const char *nsurl_access(const nsurl *url)
return url->string;
}
-char *nsurl_access_utf8(const nsurl *url)
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_access_utf8(const nsurl *url, char **url_s, size_t *url_l)
{
+ nserror err;
lwc_string *host;
char *idna_host;
size_t idna_host_len;
@@ -1707,45 +1710,43 @@ char *nsurl_access_utf8(const nsurl *url)
size_t scheme_len;
char *path;
size_t path_len;
- char *idna_url;
- size_t idna_url_len;
assert(url != NULL);
host = nsurl_get_component(url, NSURL_HOST);
- if(host == NULL) {
- return strdup(url->string);
- }
+ if(host == NULL)
+ return NSERROR_BAD_URL;
- if (idna_decode(lwc_string_data(host), lwc_string_length(host),
- &idna_host, &idna_host_len) != NSERROR_OK) {
- lwc_string_unref(host);
- return strdup(url->string);
- }
+ err = idna_decode(lwc_string_data(host), lwc_string_length(host),
+ &idna_host, &idna_host_len);
lwc_string_unref(host);
- if (nsurl_get(url, NSURL_SCHEME | NSURL_CREDENTIALS,
- &scheme, &scheme_len) != NSERROR_OK) {
- return strdup(url->string);
- }
+ if (err != NSERROR_OK)
+ return err;
- if (nsurl_get(url, NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
- &path, &path_len) != NSERROR_OK) {
- return strdup(url->string);
- }
+ err = nsurl_get(url, NSURL_SCHEME | NSURL_CREDENTIALS,
+ &scheme, &scheme_len);
- idna_url_len = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
- idna_url = malloc(idna_url_len);
+ if (err != NSERROR_OK)
+ return err;
- if (idna_url == NULL) {
- return strdup(url->string);
- }
+ err = nsurl_get(url, NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
+ &path, &path_len);
+
+ if (err != NSERROR_OK)
+ return err;
+
+ *url_l = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
+ *url_s = malloc(*url_l);
- snprintf(idna_url, idna_url_len, "%s%s%s", scheme, idna_host, path);
+ if (*url_s == NULL)
+ return NSERROR_NOMEM;
+
+ snprintf(*url_s, *url_l, "%s%s%s", scheme, idna_host, path);
- return(idna_url);
+ return NSERROR_OK;
}
diff --git a/utils/nsurl.h b/utils/nsurl.h
index 07d73f1..383b357 100644
--- a/utils/nsurl.h
+++ b/utils/nsurl.h
@@ -181,17 +181,21 @@ const char *nsurl_access(const nsurl *url);
/**
- * Access a NetSurf URL object as a UTF-8 string (for human readable IDNA)
+ * Access a NetSurf URL object as a UTF-8 string (for human readable IDNs)
*
* \param url NetSurf URL to retrieve a string pointer for.
- * \return the required string
+ * \param url_s Returns a url string
+ * \param url_l Returns length of url_s
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * If return value != NSERROR_OK, nothing will be returned in url_s or url_l.
*
- * It is up to the client to free the returned string when they have
- * finished with it.
+ * The string returned in url_s is owned by the client and it is up to them
+ * to free it. It includes a trailing '\0'.
*
- * The returned string has a trailing '\0'.
+ * The length returned in url_l excludes the trailing '\0'.
*/
-char *nsurl_access_utf8(const nsurl *url);
+nserror nsurl_access_utf8(const nsurl *url, char **url_s, size_t *url_l);
/**
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2baaddd7d1d7e725fba...
commit 2baaddd7d1d7e725fba2f44d014f24de4e48411c
Merge: 3de0e15 70fd706
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/display-idna
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 32 +++++++++++++++------------
amiga/iff_dr2d.c | 4 ++--
render/html_interaction.c | 17 ++++++++++-----
utils/nsurl.c | 53 +++++++++++++++++++++++----------------------
utils/nsurl.h | 16 +++++++++-----
5 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index dc49a69..f491480 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4993,23 +4993,27 @@ static void gui_window_set_status(struct gui_window *g, const char *text)
static nserror gui_window_set_url(struct gui_window *g, nsurl *url)
{
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
+ char *url_lc = NULL;
+
if(!g) return NSERROR_OK;
if (g == g->shared->gw) {
- if(nsoption_bool(display_decoded_idn) == false) {
- RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
- g->shared->win, NULL,
- STRINGA_TextVal, nsurl_access(url),
- TAG_DONE);
- } else {
- char *idn_url = nsurl_access_utf8(url);
- char *idn_url_lc = ami_utf8_easy(idn_url);
- RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
- g->shared->win, NULL,
- STRINGA_TextVal, idn_url_lc,
- TAG_DONE);
- free(idn_url);
- ami_utf8_free(idn_url_lc);
+ if(nsoption_bool(display_decoded_idn) == true) {
+ if (nsurl_access_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
+ url_lc = ami_utf8_easy(idn_url_s);
+ }
+ }
+
+ RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL],
+ g->shared->win, NULL,
+ STRINGA_TextVal, url_lc ? url_lc : nsurl_access(url),
+ TAG_DONE);
+
+ if(url_lc) {
+ ami_utf8_free(url_lc);
+ if(idn_url_s) free(idn_url_s);
}
}
diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c
index 32a49ca..0d4d77e 100644
--- a/amiga/iff_dr2d.c
+++ b/amiga/iff_dr2d.c
@@ -280,8 +280,8 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer,
fons = AllocVecTagList(sizeof(struct fons_struct), NULL);
if(!(PushChunk(iffh,0,ID_FONS,IFFSIZE_UNKNOWN)))
{
- WriteChunkBytes(iffh,fons,sizeof(struct fons_struct));
- WriteChunkBytes(iffh,"Topaz",5);
+ WriteChunkBytes(iffh, fons, sizeof(struct fons_struct));
+ WriteChunkBytes(iffh, "Topaz\0", 6);
PopChunk(iffh);
}
FreeVec(fons);
diff --git a/render/html_interaction.c b/render/html_interaction.c
index af84174..1b2e5b9 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -300,7 +300,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
enum { ACTION_NONE, ACTION_SUBMIT, ACTION_GO } action = ACTION_NONE;
const char *title = 0;
nsurl *url = 0;
- char *idn_url = NULL;
+ char *url_s = NULL;
+ size_t url_l = 0;
const char *target = 0;
char status_buffer[200];
const char *status = 0;
@@ -816,21 +817,25 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
}
} else if (url) {
if (nsoption_bool(display_decoded_idn) == true) {
- idn_url = nsurl_access_utf8(url);
+ if (nsurl_access_utf8(url, &url_s, &url_l) != NSERROR_OK) {
+ /* Unable to obtain a decoded IDN. This is not a fatal error.
+ * Ensure the string pointer is NULL so we use the encoded version. */
+ url_s = NULL;
+ }
}
if (title) {
snprintf(status_buffer, sizeof status_buffer, "%s: %s",
- idn_url ? idn_url : nsurl_access(url), title);
+ url_s ? url_s : nsurl_access(url), title);
} else {
snprintf(status_buffer, sizeof status_buffer, "%s",
- idn_url ? idn_url : nsurl_access(url));
+ url_s ? url_s : nsurl_access(url));
}
status = status_buffer;
- if (idn_url != NULL)
- free(idn_url);
+ if (url_s != NULL)
+ free(url_s);
pointer = get_pointer_shape(url_box, imagemap);
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 78647b4..ed6d896 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -1698,8 +1698,11 @@ const char *nsurl_access(const nsurl *url)
return url->string;
}
-char *nsurl_access_utf8(const nsurl *url)
+
+/* exported interface, documented in nsurl.h */
+nserror nsurl_access_utf8(const nsurl *url, char **url_s, size_t *url_l)
{
+ nserror err;
lwc_string *host;
char *idna_host;
size_t idna_host_len;
@@ -1707,45 +1710,43 @@ char *nsurl_access_utf8(const nsurl *url)
size_t scheme_len;
char *path;
size_t path_len;
- char *idna_url;
- size_t idna_url_len;
assert(url != NULL);
host = nsurl_get_component(url, NSURL_HOST);
- if(host == NULL) {
- return strdup(url->string);
- }
+ if(host == NULL)
+ return NSERROR_BAD_URL;
- if (idna_decode(lwc_string_data(host), lwc_string_length(host),
- &idna_host, &idna_host_len) != NSERROR_OK) {
- lwc_string_unref(host);
- return strdup(url->string);
- }
+ err = idna_decode(lwc_string_data(host), lwc_string_length(host),
+ &idna_host, &idna_host_len);
lwc_string_unref(host);
- if (nsurl_get(url, NSURL_SCHEME | NSURL_CREDENTIALS,
- &scheme, &scheme_len) != NSERROR_OK) {
- return strdup(url->string);
- }
+ if (err != NSERROR_OK)
+ return err;
- if (nsurl_get(url, NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
- &path, &path_len) != NSERROR_OK) {
- return strdup(url->string);
- }
+ err = nsurl_get(url, NSURL_SCHEME | NSURL_CREDENTIALS,
+ &scheme, &scheme_len);
- idna_url_len = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
- idna_url = malloc(idna_url_len);
+ if (err != NSERROR_OK)
+ return err;
- if (idna_url == NULL) {
- return strdup(url->string);
- }
+ err = nsurl_get(url, NSURL_PORT | NSURL_PATH | NSURL_QUERY | NSURL_FRAGMENT,
+ &path, &path_len);
+
+ if (err != NSERROR_OK)
+ return err;
+
+ *url_l = scheme_len + idna_host_len + path_len + 1; /* +1 for \0 */
+ *url_s = malloc(*url_l);
- snprintf(idna_url, idna_url_len, "%s%s%s", scheme, idna_host, path);
+ if (*url_s == NULL)
+ return NSERROR_NOMEM;
+
+ snprintf(*url_s, *url_l, "%s%s%s", scheme, idna_host, path);
- return(idna_url);
+ return NSERROR_OK;
}
diff --git a/utils/nsurl.h b/utils/nsurl.h
index 07d73f1..383b357 100644
--- a/utils/nsurl.h
+++ b/utils/nsurl.h
@@ -181,17 +181,21 @@ const char *nsurl_access(const nsurl *url);
/**
- * Access a NetSurf URL object as a UTF-8 string (for human readable IDNA)
+ * Access a NetSurf URL object as a UTF-8 string (for human readable IDNs)
*
* \param url NetSurf URL to retrieve a string pointer for.
- * \return the required string
+ * \param url_s Returns a url string
+ * \param url_l Returns length of url_s
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ * If return value != NSERROR_OK, nothing will be returned in url_s or url_l.
*
- * It is up to the client to free the returned string when they have
- * finished with it.
+ * The string returned in url_s is owned by the client and it is up to them
+ * to free it. It includes a trailing '\0'.
*
- * The returned string has a trailing '\0'.
+ * The length returned in url_l excludes the trailing '\0'.
*/
-char *nsurl_access_utf8(const nsurl *url);
+nserror nsurl_access_utf8(const nsurl *url, char **url_s, size_t *url_l);
/**
--
NetSurf Browser
8 years, 4 months
- 1
- 0
nsgenbind: branch vince/interfacemap updated. release/0.1.0-19-gd36c21c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/d36c21c4f53270f9ba8...
...commit http://git.netsurf-browser.org/nsgenbind.git/commit/d36c21c4f53270f9ba813...
...tree http://git.netsurf-browser.org/nsgenbind.git/tree/d36c21c4f53270f9ba8137b...
The branch, vince/interfacemap has been updated
via d36c21c4f53270f9ba8137bb1e84a7de45fea0f3 (commit)
via 8bc392a91daf4cc1a27a8e6777af1a29ed24e3c4 (commit)
from 1288d8c535edd2ce29eebdc4acca6b2beab89841 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=d36c21c4f53270f9b...
commit d36c21c4f53270f9ba8137bb1e84a7de45fea0f3
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Load the WebIDL files specified in the binding
This loads the WebIDL specified in the bindings into an Abstract
Syntax Tree (AST) and performs the mixin operations for implements.
Additionally the specs now use a slightly extended IDL syntax. Instead
of wholesale implementing the second edition of the IDL spec the
parser has been updated to cope with iterator and Promise keywords as
those are the only changes used in the dom and html specifications.
A bug was also fixed in the lexer where negative int literals were
not recognised.
diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
index 1b5f53c..c1acee1 100644
--- a/src/nsgenbind-ast.c
+++ b/src/nsgenbind-ast.c
@@ -20,6 +20,11 @@
#include "nsgenbind-ast.h"
#include "options.h"
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *genbind_parsetracef;
+
/* parser and lexer interface */
extern int nsgenbind_debug;
extern int nsgenbind__flex_debug;
@@ -448,23 +453,23 @@ static int genbind_ast_dump(FILE *dfile, struct genbind_node *node, int indent)
/* exported interface documented in nsgenbind-ast.h */
int genbind_dump_ast(struct genbind_node *node)
{
- FILE *dumpf;
+ FILE *dumpf;
- /* only dump AST to file if required */
- if (!options->debug) {
- return 0;
- }
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
- dumpf = genb_fopen("binding-ast", "w");
- if (dumpf == NULL) {
- return 2;
- }
+ dumpf = genb_fopen("binding-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
- genbind_ast_dump(dumpf, node, 0);
+ genbind_ast_dump(dumpf, node, 0);
- fclose(dumpf);
+ fclose(dumpf);
- return 0;
+ return 0;
}
FILE *genbindopen(const char *filename)
@@ -545,10 +550,6 @@ FILE *genbindopen(const char *filename)
return genfile;
}
-/**
- * standard IO handle for parse trace logging.
- */
-static FILE *genbind_parsetracef;
int genbind_parsefile(char *infilename, struct genbind_node **ast)
{
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 8d83d13..914f58e 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -15,6 +15,7 @@
#include <errno.h>
#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
#include "jsapi-libdom.h"
#include "options.h"
@@ -104,6 +105,51 @@ static int generate_binding(struct genbind_node *binding_node, void *ctx)
return res;
}
+
+static int webidl_file_cb(struct genbind_node *node, void *ctx)
+{
+ struct webidl_node **webidl_ast = ctx;
+ char *filename;
+
+ filename = genbind_node_gettext(node);
+
+ if (options->verbose) {
+ printf("Opening IDL file \"%s\"\n", filename);
+ }
+
+ return webidl_parsefile(filename, webidl_ast);
+}
+
+static int genbind_load_idl(struct genbind_node *genbind,
+ struct webidl_node **webidl_out)
+{
+ int res;
+ struct genbind_node *binding_node;
+
+ binding_node = genbind_node_find_type(genbind, NULL,
+ GENBIND_NODE_TYPE_BINDING);
+
+ /* walk AST and load any web IDL files required */
+ res = genbind_node_foreach_type(
+ genbind_node_getnode(binding_node),
+ GENBIND_NODE_TYPE_WEBIDL,
+ webidl_file_cb,
+ webidl_out);
+ if (res != 0) {
+ fprintf(stderr, "Error: failed reading Web IDL\n");
+ return -1;
+ }
+
+ /* implements are implemented as mixins so intercalate them */
+ res = webidl_intercalate_implements(*webidl_out);
+ if (res != 0) {
+ fprintf(stderr, "Error: Failed to intercalate implements\n");
+ return -1;
+ }
+
+ return 0;
+}
+
/**
* get the type of binding
*/
@@ -147,6 +193,7 @@ int main(int argc, char **argv)
{
int res;
struct genbind_node *genbind_root = NULL;
+ struct webidl_node *webidl_root = NULL;
enum bindingtype_e bindingtype;
options = process_cmdline(argc, argv);
@@ -170,8 +217,16 @@ int main(int argc, char **argv)
return 3;
}
+ /* load the IDL files specified in the binding */
+ res = genbind_load_idl(genbind_root, &webidl_root);
+ if (res != 0) {
+ return 4;
+ }
+
+ /* debug dump of web idl AST */
+ webidl_dump_ast(webidl_root);
+
#if 0
- genbind_load_idl(genbind_root);
/* generate output for each binding */
res = genbind_node_foreach_type(genbind_root,
diff --git a/src/webidl-ast.c b/src/webidl-ast.c
index 945b5fa..6c24c41 100644
--- a/src/webidl-ast.c
+++ b/src/webidl-ast.c
@@ -11,10 +11,17 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <stdarg.h>
+#include "utils.h"
#include "webidl-ast.h"
#include "options.h"
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *webidl_parsetracef;
+
extern int webidl_debug;
extern int webidl__flex_debug;
extern void webidl_restart(FILE*);
@@ -386,13 +393,16 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type)
}
-
-/* exported interface defined in webidl-ast.h */
-int webidl_ast_dump(struct webidl_node *node, int indent)
+/**
+ * Recursively dump the AST nodes increasing indent as appropriate
+ */
+static int webidl_ast_dump(FILE *dumpf, struct webidl_node *node, int indent)
{
- const char *SPACES=" "; char *txt;
+ const char *SPACES=" ";
+ char *txt;
while (node != NULL) {
- printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type));
+ fprintf(dumpf, "%.*s%s", indent, SPACES,
+ webidl_node_type_to_str(node->type));
txt = webidl_node_gettext(node);
if (txt == NULL) {
@@ -401,20 +411,43 @@ int webidl_ast_dump(struct webidl_node *node, int indent)
next = webidl_node_getnode(node);
if (next != NULL) {
- printf("\n");
- webidl_ast_dump(next, indent + 2);
+ fprintf(dumpf, "\n");
+ webidl_ast_dump(dumpf, next, indent + 2);
} else {
/* not txt or node has to be an int */
- printf(": %d\n", webidl_node_getint(node));
+ fprintf(dumpf, ": %d\n",
+ webidl_node_getint(node));
}
} else {
- printf(": \"%s\"\n", txt);
+ fprintf(dumpf, ": \"%s\"\n", txt);
}
node = node->l;
}
return 0;
}
+/* exported interface documented in webidl-ast.h */
+int webidl_dump_ast(struct webidl_node *node)
+{
+ FILE *dumpf;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("webidl-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ webidl_ast_dump(dumpf, node, 0);
+
+ fclose(dumpf);
+
+ return 0;
+}
+
/* exported interface defined in webidl-ast.h */
static FILE *idlopen(const char *filename)
{
@@ -444,8 +477,8 @@ static FILE *idlopen(const char *filename)
/* exported interface defined in webidl-ast.h */
int webidl_parsefile(char *filename, struct webidl_node **webidl_ast)
{
-
FILE *idlfile;
+ int ret;
idlfile = idlopen(filename);
if (!idlfile) {
@@ -455,16 +488,51 @@ int webidl_parsefile(char *filename, struct webidl_node **webidl_ast)
return 2;
}
- if (options->debug) {
+ /* if debugging enabled enable parser tracing and send to file */
+ if (options->debug) {
+ char *tracename;
+ int tracenamelen;
webidl_debug = 1;
webidl__flex_debug = 1;
- }
+
+ tracenamelen = SLEN("webidl--trace") + strlen(filename) + 1;
+ tracename = malloc(tracenamelen);
+ snprintf(tracename, tracenamelen,"webidl-%s-trace", filename);
+ webidl_parsetracef = genb_fopen(tracename, "w");
+ free(tracename);
+ } else {
+ webidl_parsetracef = NULL;
+ }
/* set flex to read from file */
webidl_restart(idlfile);
/* parse the file */
- return webidl_parse(webidl_ast);
+ ret = webidl_parse(webidl_ast);
+
+ /* close tracefile if open */
+ if (webidl_parsetracef != NULL) {
+ fclose(webidl_parsetracef);
+ }
+ return ret;
+}
+
+/* exported interface defined in webidl-ast.h */
+int webidl_fprintf(FILE *stream, const char *format, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, format);
+
+ if (webidl_parsetracef == NULL) {
+ ret = vfprintf(stream, format, ap);
+ } else {
+ ret = vfprintf(webidl_parsetracef, format, ap);
+ }
+ va_end(ap);
+
+ return ret;
}
/* unlink a child node from a parent */
diff --git a/src/webidl-ast.h b/src/webidl-ast.h
index a494f4e..5d0cbc0 100644
--- a/src/webidl-ast.h
+++ b/src/webidl-ast.h
@@ -90,17 +90,25 @@ int webidl_node_getint(struct webidl_node *node);
enum webidl_node_type webidl_node_gettype(struct webidl_node *node);
/* node searches */
+
+/**
+ * Iterate nodes children matching their type.
+ *
+ * For each child node where the type is matched the callback function is
+ * called with a context value.
+ */
int webidl_node_for_each_type(struct webidl_node *node,
- enum webidl_node_type type,
- webidl_callback_t *cb,
+ enum webidl_node_type type,
+ webidl_callback_t *cb,
void *ctx);
-int webidl_node_enumerate_type(struct webidl_node *node, enum webidl_node_type type);
+int webidl_node_enumerate_type(struct webidl_node *node,
+ enum webidl_node_type type);
struct webidl_node *
webidl_node_find(struct webidl_node *node,
- struct webidl_node *prev,
- webidl_callback_t *cb,
+ struct webidl_node *prev,
+ webidl_callback_t *cb,
void *ctx);
struct webidl_node *
@@ -114,13 +122,26 @@ webidl_node_find_type_ident(struct webidl_node *root_node,
const char *ident);
-/* debug dump */
-int webidl_ast_dump(struct webidl_node *node, int indent);
-/** parse web idl file */
+/**
+ * parse web idl file into Abstract Syntax Tree
+ */
int webidl_parsefile(char *filename, struct webidl_node **webidl_ast);
-/** perform replacement of implements elements with copies of ast data */
+/**
+ * dump AST to file
+ */
+int webidl_dump_ast(struct webidl_node *node);
+
+/**
+ * perform replacement of implements elements with copies of ast data
+ */
int webidl_intercalate_implements(struct webidl_node *node);
+/**
+ * formatted printf to allow webidl trace data to be written to file.
+ */
+int webidl_fprintf(FILE *stream, const char *format, ...);
+
+
#endif
diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l
index 74b9bb8..e49b813 100644
--- a/src/webidl-lexer.l
+++ b/src/webidl-lexer.l
@@ -86,7 +86,7 @@ lineend ([\n\r]|{LS}|{PS})
hexdigit [0-9A-Fa-f]
hexint 0(x|X){hexdigit}+
-decimalint 0|([1-9][0-9]*)
+decimalint 0|([\+\-]?[1-9][0-9]*)
octalint (0[0-8]+)
@@ -207,6 +207,11 @@ void return TOK_VOID;
readonly return TOK_READONLY;
+Promise return TOK_PROMISE;
+
+iterable return TOK_ITERABLE;
+
+legacyiterable return TOK_LEGACYITERABLE;
{identifier} {
/* A leading "_" is used to escape an identifier from
diff --git a/src/webidl-parser.y b/src/webidl-parser.y
index 9324212..9717b8c 100644
--- a/src/webidl-parser.y
+++ b/src/webidl-parser.y
@@ -9,6 +9,9 @@
*
* Derived from the the grammar in apendix A of W3C WEB IDL
* http://www.w3.org/TR/WebIDL/
+ *
+ * WebIDL now has a second edition draft (mid 2015) that the dom and
+ * html specs are using. https://heycam.github.io/webidl
*/
#include <stdio.h>
@@ -17,11 +20,17 @@
#include <stdint.h>
#include <math.h>
-#include "webidl-ast.h"
+#define YYFPRINTF webidl_fprintf
+#define YY_LOCATION_PRINT(File, Loc) \
+ webidl_fprintf(File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
#include "webidl-parser.h"
#include "webidl-lexer.h"
+#include "webidl-ast.h"
+
char *errtxt;
static void
@@ -77,6 +86,8 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_INFINITY
%token TOK_INHERIT
%token TOK_INTERFACE
+%token TOK_ITERABLE
+%token TOK_LEGACYITERABLE
%token TOK_LONG
%token TOK_MODULE
%token TOK_NAN
@@ -88,6 +99,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_OPTIONAL
%token TOK_OR
%token TOK_PARTIAL
+%token TOK_PROMISE
%token TOK_RAISES
%token TOK_READONLY
%token TOK_SETRAISES
@@ -105,12 +117,12 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_POUND_SIGN
-%token <text> TOK_IDENTIFIER
-%token <value> TOK_INT_LITERAL
-%token <text> TOK_FLOAT_LITERAL
-%token <text> TOK_STRING_LITERAL
-%token <text> TOK_OTHER_LITERAL
-%token <text> TOK_JAVADOC
+%token <text> TOK_IDENTIFIER
+%token <value> TOK_INT_LITERAL
+%token <text> TOK_FLOAT_LITERAL
+%token <text> TOK_STRING_LITERAL
+%token <text> TOK_OTHER_LITERAL
+%token <text> TOK_JAVADOC
%type <text> Inheritance
@@ -153,6 +165,8 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%type <text> ArgumentName
%type <text> ArgumentNameKeyword
%type <node> Ellipsis
+%type <node> Iterable
+%type <node> OptionalType
%type <node> Type
%type <node> ReturnType
@@ -165,6 +179,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%type <node> FloatType
%type <node> UnsignedIntegerType
%type <node> IntegerType
+%type <node> PromiseType
%type <node> TypeSuffix
%type <node> TypeSuffixStartingWithArray
@@ -356,7 +371,7 @@ InterfaceMembers:
if (ident_node == NULL) {
/* something with no ident - possibly constructors? */
- /* @todo understand this abtter */
+ /* @todo understand this better */
$$ = webidl_node_prepend($1, $3);
@@ -389,11 +404,17 @@ InterfaceMembers:
}
;
- /* [10] */
+ /* [10]
+ * SE[10]
+ * Second edition actually splits up AttributeOrOperation completely
+ * here we "just" add Iterable as thats what the specs use
+ */
InterfaceMember:
Const
|
AttributeOrOperation
+ |
+ Iterable
;
/* [11] */
@@ -474,18 +495,28 @@ Enum:
}
;
-/* [21] */
+ /* Second edition changes enumeration rules to allow trailing comma */
+
+ /* SE[20] */
EnumValueList:
- TOK_STRING_LITERAL EnumValues
+ TOK_STRING_LITERAL EnumValueListComma
;
-/* [22] */
-EnumValues:
+ /* SE[21] */
+EnumValueListComma:
+ ',' EnumValueListString
+ |
/* empty */
+ ;
+
+ /* SE[22] */
+EnumValueListString:
+ TOK_STRING_LITERAL EnumValueListComma
|
- ',' TOK_STRING_LITERAL EnumValues
+ /* empty */
;
+
/* [23] - bug in w3c grammar? it doesnt list the equals as a terminal */
CallbackRest:
TOK_IDENTIFIER '=' ReturnType '(' ArgumentList ')' ';'
@@ -835,6 +866,32 @@ Ellipsis:
}
;
+ /* SE[59] */
+Iterable:
+ TOK_ITERABLE '<' Type OptionalType '>' ';'
+ {
+ $$ = NULL;
+ }
+ |
+ TOK_LEGACYITERABLE '<' Type '>' ';'
+ {
+ $$ = NULL;
+ }
+ ;
+
+ /* SE[60] */
+OptionalType:
+ /* empty */
+ {
+ $$ = NULL;
+ }
+ |
+ ',' Type
+ {
+ $$ = NULL;
+ }
+ ;
+
/* [47] */
ExceptionMember:
Const
@@ -1301,13 +1358,22 @@ UnionMemberTypes:
TOK_OR UnionMemberType UnionMemberTypes
;
- /* [62] */
+ /* [62]
+ * SE[78]
+ * Second edition adds several types
+ */
NonAnyType:
PrimitiveType TypeSuffix
{
$$ = webidl_node_prepend($1, $2);
}
|
+ PromiseType TypeSuffix
+ {
+ /* second edition adds promise types */
+ $$ = webidl_node_prepend($1, $2);
+ }
+ |
TOK_STRING TypeSuffix
{
$$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_STRING);
@@ -1442,6 +1508,14 @@ OptionalLong:
}
;
+/* SE[87] */
+PromiseType:
+ TOK_PROMISE '<' ReturnType '>'
+ {
+ $$ = NULL;
+ }
+ ;
+
/* [70] */
TypeSuffix:
/* empty */
diff --git a/test/data/idl/dom.idl b/test/data/idl/dom.idl
index 6a4a95e..1c9e75b 100644
--- a/test/data/idl/dom.idl
+++ b/test/data/idl/dom.idl
@@ -107,10 +107,10 @@ DocumentType implements ChildNode;
Element implements ChildNode;
CharacterData implements ChildNode;
-class Elements extends Array {
- Element? query(DOMString relativeSelectors);
- Elements queryAll(DOMString relativeSelectors);
-};
+//class Elements extends Array {
+// Element? query(DOMString relativeSelectors);
+// Elements queryAll(DOMString relativeSelectors);
+//};
[Exposed=Window]
interface NodeList {
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=8bc392a91daf4cc1a...
commit 8bc392a91daf4cc1a27a8e6777af1a29ed24e3c4
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
chnage binding AST to put methds inside class nodes
diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
index 49477cf..1b5f53c 100644
--- a/src/nsgenbind-ast.c
+++ b/src/nsgenbind-ast.c
@@ -38,6 +38,63 @@ struct genbind_node {
} r;
};
+/* insert node(s) at beginning of a list */
+struct genbind_node *
+genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst)
+{
+ struct genbind_node *end = inst;
+
+ if (inst == NULL) {
+ return list; /* no node to prepend - return existing list */
+ }
+
+ /* find end of inserted node list */
+ while (end->l != NULL) {
+ end = end->l;
+ }
+
+ end->l = list;
+
+ return inst;
+}
+
+/* prepend list to a nodes list
+ *
+ * inserts a list into the beginning of a nodes r list
+ *
+ * CAUTION: if the \a node element is not a node type the node will not be added
+ */
+struct genbind_node *
+genbind_node_add(struct genbind_node *node, struct genbind_node *list)
+{
+ if (node == NULL) {
+ return list;
+ }
+
+ /* this does not use genbind_node_getnode() as it cannot
+ * determine between an empty node and a node which is not a
+ * list type
+ */
+ switch (node->type) {
+ case GENBIND_NODE_TYPE_BINDING:
+ case GENBIND_NODE_TYPE_CLASS:
+ case GENBIND_NODE_TYPE_PRIVATE:
+ case GENBIND_NODE_TYPE_INTERNAL:
+ case GENBIND_NODE_TYPE_PROPERTY:
+ case GENBIND_NODE_TYPE_FLAGS:
+ case GENBIND_NODE_TYPE_METHOD:
+ case GENBIND_NODE_TYPE_PARAMETER:
+ break;
+
+ default:
+ /* not a node type */
+ return list;
+ }
+
+ node->r.node = genbind_node_prepend(node->r.node, list);
+
+ return node;
+}
char *genbind_strapp(char *a, char *b)
{
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index f6800fb..e7215b1 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -70,6 +70,10 @@ char *genbind_strapp(char *a, char *b);
struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
+struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst);
+
+struct genbind_node *genbind_node_add(struct genbind_node *node, struct genbind_node *list);
+
/**
* Dump the binding AST to file
*
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index c8e5154..454fb56 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -128,7 +128,7 @@ Statements
|
Statements Statement
{
- $$ = genbind_node_link($2, $1);
+ $$ = *genbind_ast = genbind_node_prepend($2, $1);
}
|
error ';'
@@ -330,11 +330,52 @@ Method
:
MethodType MethodDeclarator CBlock
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
+ struct genbind_node *declarator;
+ struct genbind_node *method_node;
+ struct genbind_node *class_node;
+ char *class_name;
+
+ declarator = $2;
+
+ /* extract the class name from the declarator */
+ class_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(
+ genbind_node_find_type(
+ declarator,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS)),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ /* generate method node */
+ method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- $2, $3),
+ declarator, $3),
(void *)$1));
+
+
+
+ class_node = genbind_node_find_type_ident(*genbind_ast,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS,
+ class_name);
+ if (class_node == NULL) {
+ /* no existing class so manufacture one and attach method */
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ method_node,
+ class_name));
+
+ } else {
+ /* update the existing class */
+
+ /* link member node into class_node */
+ genbind_node_add(class_node, method_node);
+
+ $$ = NULL; /* updating so no need to add a new node */
+ }
}
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 3174fa0..8d83d13 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -20,6 +20,12 @@
struct options *options;
+enum bindingtype_e {
+ BINDINGTYPE_UNKNOWN,
+ BINDINGTYPE_JSAPI_LIBDOM,
+ BINDINGTYPE_DUK_LIBDOM,
+};
+
static struct options* process_cmdline(int argc, char **argv)
{
int opt;
@@ -98,12 +104,6 @@ static int generate_binding(struct genbind_node *binding_node, void *ctx)
return res;
}
-enum bindingtype_e {
- BINDINGTYPE_UNKNOWN,
- BINDINGTYPE_JSAPI_LIBDOM,
- BINDINGTYPE_DUK_LIBDOM,
-};
-
/**
* get the type of binding
*/
@@ -146,7 +146,7 @@ static enum bindingtype_e genbind_get_type(struct genbind_node *node)
int main(int argc, char **argv)
{
int res;
- struct genbind_node *genbind_root;
+ struct genbind_node *genbind_root = NULL;
enum bindingtype_e bindingtype;
options = process_cmdline(argc, argv);
@@ -154,17 +154,17 @@ int main(int argc, char **argv)
return 1; /* bad commandline */
}
- /* parse input and generate dependancy */
+ /* parse binding */
res = genbind_parsefile(options->infilename, &genbind_root);
if (res != 0) {
fprintf(stderr, "Error: parse failed with code %d\n", res);
return res;
}
- /* dump the AST */
+ /* dump the binding AST */
genbind_dump_ast(genbind_root);
- /* get bindingtype */
+ /* get type of binding */
bindingtype = genbind_get_type(genbind_root);
if (bindingtype == BINDINGTYPE_UNKNOWN) {
return 3;
-----------------------------------------------------------------------
Summary of changes:
src/nsgenbind-ast.c | 90 +++++++++++++++++++++++++++++++++--------
src/nsgenbind-ast.h | 4 ++
src/nsgenbind-parser.y | 47 ++++++++++++++++++++--
src/nsgenbind.c | 75 +++++++++++++++++++++++++++++-----
src/webidl-ast.c | 94 +++++++++++++++++++++++++++++++++++++------
src/webidl-ast.h | 39 +++++++++++++-----
src/webidl-lexer.l | 7 +++-
src/webidl-parser.y | 104 +++++++++++++++++++++++++++++++++++++++++-------
test/data/idl/dom.idl | 8 ++--
9 files changed, 397 insertions(+), 71 deletions(-)
diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
index 49477cf..c1acee1 100644
--- a/src/nsgenbind-ast.c
+++ b/src/nsgenbind-ast.c
@@ -20,6 +20,11 @@
#include "nsgenbind-ast.h"
#include "options.h"
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *genbind_parsetracef;
+
/* parser and lexer interface */
extern int nsgenbind_debug;
extern int nsgenbind__flex_debug;
@@ -38,6 +43,63 @@ struct genbind_node {
} r;
};
+/* insert node(s) at beginning of a list */
+struct genbind_node *
+genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst)
+{
+ struct genbind_node *end = inst;
+
+ if (inst == NULL) {
+ return list; /* no node to prepend - return existing list */
+ }
+
+ /* find end of inserted node list */
+ while (end->l != NULL) {
+ end = end->l;
+ }
+
+ end->l = list;
+
+ return inst;
+}
+
+/* prepend list to a nodes list
+ *
+ * inserts a list into the beginning of a nodes r list
+ *
+ * CAUTION: if the \a node element is not a node type the node will not be added
+ */
+struct genbind_node *
+genbind_node_add(struct genbind_node *node, struct genbind_node *list)
+{
+ if (node == NULL) {
+ return list;
+ }
+
+ /* this does not use genbind_node_getnode() as it cannot
+ * determine between an empty node and a node which is not a
+ * list type
+ */
+ switch (node->type) {
+ case GENBIND_NODE_TYPE_BINDING:
+ case GENBIND_NODE_TYPE_CLASS:
+ case GENBIND_NODE_TYPE_PRIVATE:
+ case GENBIND_NODE_TYPE_INTERNAL:
+ case GENBIND_NODE_TYPE_PROPERTY:
+ case GENBIND_NODE_TYPE_FLAGS:
+ case GENBIND_NODE_TYPE_METHOD:
+ case GENBIND_NODE_TYPE_PARAMETER:
+ break;
+
+ default:
+ /* not a node type */
+ return list;
+ }
+
+ node->r.node = genbind_node_prepend(node->r.node, list);
+
+ return node;
+}
char *genbind_strapp(char *a, char *b)
{
@@ -391,23 +453,23 @@ static int genbind_ast_dump(FILE *dfile, struct genbind_node *node, int indent)
/* exported interface documented in nsgenbind-ast.h */
int genbind_dump_ast(struct genbind_node *node)
{
- FILE *dumpf;
+ FILE *dumpf;
- /* only dump AST to file if required */
- if (!options->debug) {
- return 0;
- }
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
- dumpf = genb_fopen("binding-ast", "w");
- if (dumpf == NULL) {
- return 2;
- }
+ dumpf = genb_fopen("binding-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
- genbind_ast_dump(dumpf, node, 0);
+ genbind_ast_dump(dumpf, node, 0);
- fclose(dumpf);
+ fclose(dumpf);
- return 0;
+ return 0;
}
FILE *genbindopen(const char *filename)
@@ -488,10 +550,6 @@ FILE *genbindopen(const char *filename)
return genfile;
}
-/**
- * standard IO handle for parse trace logging.
- */
-static FILE *genbind_parsetracef;
int genbind_parsefile(char *infilename, struct genbind_node **ast)
{
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index f6800fb..e7215b1 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -70,6 +70,10 @@ char *genbind_strapp(char *a, char *b);
struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
+struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst);
+
+struct genbind_node *genbind_node_add(struct genbind_node *node, struct genbind_node *list);
+
/**
* Dump the binding AST to file
*
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index c8e5154..454fb56 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -128,7 +128,7 @@ Statements
|
Statements Statement
{
- $$ = genbind_node_link($2, $1);
+ $$ = *genbind_ast = genbind_node_prepend($2, $1);
}
|
error ';'
@@ -330,11 +330,52 @@ Method
:
MethodType MethodDeclarator CBlock
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
+ struct genbind_node *declarator;
+ struct genbind_node *method_node;
+ struct genbind_node *class_node;
+ char *class_name;
+
+ declarator = $2;
+
+ /* extract the class name from the declarator */
+ class_name = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(
+ genbind_node_find_type(
+ declarator,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS)),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT));
+
+ /* generate method node */
+ method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- $2, $3),
+ declarator, $3),
(void *)$1));
+
+
+
+ class_node = genbind_node_find_type_ident(*genbind_ast,
+ NULL,
+ GENBIND_NODE_TYPE_CLASS,
+ class_name);
+ if (class_node == NULL) {
+ /* no existing class so manufacture one and attach method */
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ method_node,
+ class_name));
+
+ } else {
+ /* update the existing class */
+
+ /* link member node into class_node */
+ genbind_node_add(class_node, method_node);
+
+ $$ = NULL; /* updating so no need to add a new node */
+ }
}
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index 3174fa0..914f58e 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -15,11 +15,18 @@
#include <errno.h>
#include "nsgenbind-ast.h"
+#include "webidl-ast.h"
#include "jsapi-libdom.h"
#include "options.h"
struct options *options;
+enum bindingtype_e {
+ BINDINGTYPE_UNKNOWN,
+ BINDINGTYPE_JSAPI_LIBDOM,
+ BINDINGTYPE_DUK_LIBDOM,
+};
+
static struct options* process_cmdline(int argc, char **argv)
{
int opt;
@@ -98,11 +105,50 @@ static int generate_binding(struct genbind_node *binding_node, void *ctx)
return res;
}
-enum bindingtype_e {
- BINDINGTYPE_UNKNOWN,
- BINDINGTYPE_JSAPI_LIBDOM,
- BINDINGTYPE_DUK_LIBDOM,
-};
+
+static int webidl_file_cb(struct genbind_node *node, void *ctx)
+{
+ struct webidl_node **webidl_ast = ctx;
+ char *filename;
+
+ filename = genbind_node_gettext(node);
+
+ if (options->verbose) {
+ printf("Opening IDL file \"%s\"\n", filename);
+ }
+
+ return webidl_parsefile(filename, webidl_ast);
+}
+
+static int genbind_load_idl(struct genbind_node *genbind,
+ struct webidl_node **webidl_out)
+{
+ int res;
+ struct genbind_node *binding_node;
+
+ binding_node = genbind_node_find_type(genbind, NULL,
+ GENBIND_NODE_TYPE_BINDING);
+
+ /* walk AST and load any web IDL files required */
+ res = genbind_node_foreach_type(
+ genbind_node_getnode(binding_node),
+ GENBIND_NODE_TYPE_WEBIDL,
+ webidl_file_cb,
+ webidl_out);
+ if (res != 0) {
+ fprintf(stderr, "Error: failed reading Web IDL\n");
+ return -1;
+ }
+
+ /* implements are implemented as mixins so intercalate them */
+ res = webidl_intercalate_implements(*webidl_out);
+ if (res != 0) {
+ fprintf(stderr, "Error: Failed to intercalate implements\n");
+ return -1;
+ }
+
+ return 0;
+}
/**
* get the type of binding
@@ -146,7 +192,8 @@ static enum bindingtype_e genbind_get_type(struct genbind_node *node)
int main(int argc, char **argv)
{
int res;
- struct genbind_node *genbind_root;
+ struct genbind_node *genbind_root = NULL;
+ struct webidl_node *webidl_root = NULL;
enum bindingtype_e bindingtype;
options = process_cmdline(argc, argv);
@@ -154,24 +201,32 @@ int main(int argc, char **argv)
return 1; /* bad commandline */
}
- /* parse input and generate dependancy */
+ /* parse binding */
res = genbind_parsefile(options->infilename, &genbind_root);
if (res != 0) {
fprintf(stderr, "Error: parse failed with code %d\n", res);
return res;
}
- /* dump the AST */
+ /* dump the binding AST */
genbind_dump_ast(genbind_root);
- /* get bindingtype */
+ /* get type of binding */
bindingtype = genbind_get_type(genbind_root);
if (bindingtype == BINDINGTYPE_UNKNOWN) {
return 3;
}
+ /* load the IDL files specified in the binding */
+ res = genbind_load_idl(genbind_root, &webidl_root);
+ if (res != 0) {
+ return 4;
+ }
+
+ /* debug dump of web idl AST */
+ webidl_dump_ast(webidl_root);
+
#if 0
- genbind_load_idl(genbind_root);
/* generate output for each binding */
res = genbind_node_foreach_type(genbind_root,
diff --git a/src/webidl-ast.c b/src/webidl-ast.c
index 945b5fa..6c24c41 100644
--- a/src/webidl-ast.c
+++ b/src/webidl-ast.c
@@ -11,10 +11,17 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <stdarg.h>
+#include "utils.h"
#include "webidl-ast.h"
#include "options.h"
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *webidl_parsetracef;
+
extern int webidl_debug;
extern int webidl__flex_debug;
extern void webidl_restart(FILE*);
@@ -386,13 +393,16 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type)
}
-
-/* exported interface defined in webidl-ast.h */
-int webidl_ast_dump(struct webidl_node *node, int indent)
+/**
+ * Recursively dump the AST nodes increasing indent as appropriate
+ */
+static int webidl_ast_dump(FILE *dumpf, struct webidl_node *node, int indent)
{
- const char *SPACES=" "; char *txt;
+ const char *SPACES=" ";
+ char *txt;
while (node != NULL) {
- printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type));
+ fprintf(dumpf, "%.*s%s", indent, SPACES,
+ webidl_node_type_to_str(node->type));
txt = webidl_node_gettext(node);
if (txt == NULL) {
@@ -401,20 +411,43 @@ int webidl_ast_dump(struct webidl_node *node, int indent)
next = webidl_node_getnode(node);
if (next != NULL) {
- printf("\n");
- webidl_ast_dump(next, indent + 2);
+ fprintf(dumpf, "\n");
+ webidl_ast_dump(dumpf, next, indent + 2);
} else {
/* not txt or node has to be an int */
- printf(": %d\n", webidl_node_getint(node));
+ fprintf(dumpf, ": %d\n",
+ webidl_node_getint(node));
}
} else {
- printf(": \"%s\"\n", txt);
+ fprintf(dumpf, ": \"%s\"\n", txt);
}
node = node->l;
}
return 0;
}
+/* exported interface documented in webidl-ast.h */
+int webidl_dump_ast(struct webidl_node *node)
+{
+ FILE *dumpf;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("webidl-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ webidl_ast_dump(dumpf, node, 0);
+
+ fclose(dumpf);
+
+ return 0;
+}
+
/* exported interface defined in webidl-ast.h */
static FILE *idlopen(const char *filename)
{
@@ -444,8 +477,8 @@ static FILE *idlopen(const char *filename)
/* exported interface defined in webidl-ast.h */
int webidl_parsefile(char *filename, struct webidl_node **webidl_ast)
{
-
FILE *idlfile;
+ int ret;
idlfile = idlopen(filename);
if (!idlfile) {
@@ -455,16 +488,51 @@ int webidl_parsefile(char *filename, struct webidl_node **webidl_ast)
return 2;
}
- if (options->debug) {
+ /* if debugging enabled enable parser tracing and send to file */
+ if (options->debug) {
+ char *tracename;
+ int tracenamelen;
webidl_debug = 1;
webidl__flex_debug = 1;
- }
+
+ tracenamelen = SLEN("webidl--trace") + strlen(filename) + 1;
+ tracename = malloc(tracenamelen);
+ snprintf(tracename, tracenamelen,"webidl-%s-trace", filename);
+ webidl_parsetracef = genb_fopen(tracename, "w");
+ free(tracename);
+ } else {
+ webidl_parsetracef = NULL;
+ }
/* set flex to read from file */
webidl_restart(idlfile);
/* parse the file */
- return webidl_parse(webidl_ast);
+ ret = webidl_parse(webidl_ast);
+
+ /* close tracefile if open */
+ if (webidl_parsetracef != NULL) {
+ fclose(webidl_parsetracef);
+ }
+ return ret;
+}
+
+/* exported interface defined in webidl-ast.h */
+int webidl_fprintf(FILE *stream, const char *format, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, format);
+
+ if (webidl_parsetracef == NULL) {
+ ret = vfprintf(stream, format, ap);
+ } else {
+ ret = vfprintf(webidl_parsetracef, format, ap);
+ }
+ va_end(ap);
+
+ return ret;
}
/* unlink a child node from a parent */
diff --git a/src/webidl-ast.h b/src/webidl-ast.h
index a494f4e..5d0cbc0 100644
--- a/src/webidl-ast.h
+++ b/src/webidl-ast.h
@@ -90,17 +90,25 @@ int webidl_node_getint(struct webidl_node *node);
enum webidl_node_type webidl_node_gettype(struct webidl_node *node);
/* node searches */
+
+/**
+ * Iterate nodes children matching their type.
+ *
+ * For each child node where the type is matched the callback function is
+ * called with a context value.
+ */
int webidl_node_for_each_type(struct webidl_node *node,
- enum webidl_node_type type,
- webidl_callback_t *cb,
+ enum webidl_node_type type,
+ webidl_callback_t *cb,
void *ctx);
-int webidl_node_enumerate_type(struct webidl_node *node, enum webidl_node_type type);
+int webidl_node_enumerate_type(struct webidl_node *node,
+ enum webidl_node_type type);
struct webidl_node *
webidl_node_find(struct webidl_node *node,
- struct webidl_node *prev,
- webidl_callback_t *cb,
+ struct webidl_node *prev,
+ webidl_callback_t *cb,
void *ctx);
struct webidl_node *
@@ -114,13 +122,26 @@ webidl_node_find_type_ident(struct webidl_node *root_node,
const char *ident);
-/* debug dump */
-int webidl_ast_dump(struct webidl_node *node, int indent);
-/** parse web idl file */
+/**
+ * parse web idl file into Abstract Syntax Tree
+ */
int webidl_parsefile(char *filename, struct webidl_node **webidl_ast);
-/** perform replacement of implements elements with copies of ast data */
+/**
+ * dump AST to file
+ */
+int webidl_dump_ast(struct webidl_node *node);
+
+/**
+ * perform replacement of implements elements with copies of ast data
+ */
int webidl_intercalate_implements(struct webidl_node *node);
+/**
+ * formatted printf to allow webidl trace data to be written to file.
+ */
+int webidl_fprintf(FILE *stream, const char *format, ...);
+
+
#endif
diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l
index 74b9bb8..e49b813 100644
--- a/src/webidl-lexer.l
+++ b/src/webidl-lexer.l
@@ -86,7 +86,7 @@ lineend ([\n\r]|{LS}|{PS})
hexdigit [0-9A-Fa-f]
hexint 0(x|X){hexdigit}+
-decimalint 0|([1-9][0-9]*)
+decimalint 0|([\+\-]?[1-9][0-9]*)
octalint (0[0-8]+)
@@ -207,6 +207,11 @@ void return TOK_VOID;
readonly return TOK_READONLY;
+Promise return TOK_PROMISE;
+
+iterable return TOK_ITERABLE;
+
+legacyiterable return TOK_LEGACYITERABLE;
{identifier} {
/* A leading "_" is used to escape an identifier from
diff --git a/src/webidl-parser.y b/src/webidl-parser.y
index 9324212..9717b8c 100644
--- a/src/webidl-parser.y
+++ b/src/webidl-parser.y
@@ -9,6 +9,9 @@
*
* Derived from the the grammar in apendix A of W3C WEB IDL
* http://www.w3.org/TR/WebIDL/
+ *
+ * WebIDL now has a second edition draft (mid 2015) that the dom and
+ * html specs are using. https://heycam.github.io/webidl
*/
#include <stdio.h>
@@ -17,11 +20,17 @@
#include <stdint.h>
#include <math.h>
-#include "webidl-ast.h"
+#define YYFPRINTF webidl_fprintf
+#define YY_LOCATION_PRINT(File, Loc) \
+ webidl_fprintf(File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
#include "webidl-parser.h"
#include "webidl-lexer.h"
+#include "webidl-ast.h"
+
char *errtxt;
static void
@@ -77,6 +86,8 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_INFINITY
%token TOK_INHERIT
%token TOK_INTERFACE
+%token TOK_ITERABLE
+%token TOK_LEGACYITERABLE
%token TOK_LONG
%token TOK_MODULE
%token TOK_NAN
@@ -88,6 +99,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_OPTIONAL
%token TOK_OR
%token TOK_PARTIAL
+%token TOK_PROMISE
%token TOK_RAISES
%token TOK_READONLY
%token TOK_SETRAISES
@@ -105,12 +117,12 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%token TOK_POUND_SIGN
-%token <text> TOK_IDENTIFIER
-%token <value> TOK_INT_LITERAL
-%token <text> TOK_FLOAT_LITERAL
-%token <text> TOK_STRING_LITERAL
-%token <text> TOK_OTHER_LITERAL
-%token <text> TOK_JAVADOC
+%token <text> TOK_IDENTIFIER
+%token <value> TOK_INT_LITERAL
+%token <text> TOK_FLOAT_LITERAL
+%token <text> TOK_STRING_LITERAL
+%token <text> TOK_OTHER_LITERAL
+%token <text> TOK_JAVADOC
%type <text> Inheritance
@@ -153,6 +165,8 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%type <text> ArgumentName
%type <text> ArgumentNameKeyword
%type <node> Ellipsis
+%type <node> Iterable
+%type <node> OptionalType
%type <node> Type
%type <node> ReturnType
@@ -165,6 +179,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str)
%type <node> FloatType
%type <node> UnsignedIntegerType
%type <node> IntegerType
+%type <node> PromiseType
%type <node> TypeSuffix
%type <node> TypeSuffixStartingWithArray
@@ -356,7 +371,7 @@ InterfaceMembers:
if (ident_node == NULL) {
/* something with no ident - possibly constructors? */
- /* @todo understand this abtter */
+ /* @todo understand this better */
$$ = webidl_node_prepend($1, $3);
@@ -389,11 +404,17 @@ InterfaceMembers:
}
;
- /* [10] */
+ /* [10]
+ * SE[10]
+ * Second edition actually splits up AttributeOrOperation completely
+ * here we "just" add Iterable as thats what the specs use
+ */
InterfaceMember:
Const
|
AttributeOrOperation
+ |
+ Iterable
;
/* [11] */
@@ -474,18 +495,28 @@ Enum:
}
;
-/* [21] */
+ /* Second edition changes enumeration rules to allow trailing comma */
+
+ /* SE[20] */
EnumValueList:
- TOK_STRING_LITERAL EnumValues
+ TOK_STRING_LITERAL EnumValueListComma
;
-/* [22] */
-EnumValues:
+ /* SE[21] */
+EnumValueListComma:
+ ',' EnumValueListString
+ |
/* empty */
+ ;
+
+ /* SE[22] */
+EnumValueListString:
+ TOK_STRING_LITERAL EnumValueListComma
|
- ',' TOK_STRING_LITERAL EnumValues
+ /* empty */
;
+
/* [23] - bug in w3c grammar? it doesnt list the equals as a terminal */
CallbackRest:
TOK_IDENTIFIER '=' ReturnType '(' ArgumentList ')' ';'
@@ -835,6 +866,32 @@ Ellipsis:
}
;
+ /* SE[59] */
+Iterable:
+ TOK_ITERABLE '<' Type OptionalType '>' ';'
+ {
+ $$ = NULL;
+ }
+ |
+ TOK_LEGACYITERABLE '<' Type '>' ';'
+ {
+ $$ = NULL;
+ }
+ ;
+
+ /* SE[60] */
+OptionalType:
+ /* empty */
+ {
+ $$ = NULL;
+ }
+ |
+ ',' Type
+ {
+ $$ = NULL;
+ }
+ ;
+
/* [47] */
ExceptionMember:
Const
@@ -1301,13 +1358,22 @@ UnionMemberTypes:
TOK_OR UnionMemberType UnionMemberTypes
;
- /* [62] */
+ /* [62]
+ * SE[78]
+ * Second edition adds several types
+ */
NonAnyType:
PrimitiveType TypeSuffix
{
$$ = webidl_node_prepend($1, $2);
}
|
+ PromiseType TypeSuffix
+ {
+ /* second edition adds promise types */
+ $$ = webidl_node_prepend($1, $2);
+ }
+ |
TOK_STRING TypeSuffix
{
$$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_STRING);
@@ -1442,6 +1508,14 @@ OptionalLong:
}
;
+/* SE[87] */
+PromiseType:
+ TOK_PROMISE '<' ReturnType '>'
+ {
+ $$ = NULL;
+ }
+ ;
+
/* [70] */
TypeSuffix:
/* empty */
diff --git a/test/data/idl/dom.idl b/test/data/idl/dom.idl
index 6a4a95e..1c9e75b 100644
--- a/test/data/idl/dom.idl
+++ b/test/data/idl/dom.idl
@@ -107,10 +107,10 @@ DocumentType implements ChildNode;
Element implements ChildNode;
CharacterData implements ChildNode;
-class Elements extends Array {
- Element? query(DOMString relativeSelectors);
- Elements queryAll(DOMString relativeSelectors);
-};
+//class Elements extends Array {
+// Element? query(DOMString relativeSelectors);
+// Elements queryAll(DOMString relativeSelectors);
+//};
[Exposed=Window]
interface NodeList {
--
NetSurf Generator for JavaScript bindings
8 years, 4 months
- 1
- 0
nsgenbind: branch vince/interfacemap updated. release/0.1.0-17-g1288d8c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/1288d8c535edd2ce29e...
...commit http://git.netsurf-browser.org/nsgenbind.git/commit/1288d8c535edd2ce29eeb...
...tree http://git.netsurf-browser.org/nsgenbind.git/tree/1288d8c535edd2ce29eebdc...
The branch, vince/interfacemap has been updated
via 1288d8c535edd2ce29eebdc4acca6b2beab89841 (commit)
from 94137186a3e2270e9b96f243a82a77a590c17f01 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=1288d8c535edd2ce2...
commit 1288d8c535edd2ce29eebdc4acca6b2beab89841
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Change binding grammar to new approach.
diff --git a/README b/README
index 70d224f..e260642 100644
--- a/README
+++ b/README
@@ -7,4 +7,64 @@ files and a binding configuration file.
building
--------
-The tool requires bison and flex as pre-requisites
\ No newline at end of file
+The tool requires bison and flex as pre-requisites
+
+Commandline
+-----------
+
+nsgenbind [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir
+
+-v
+The verbose switch makes the tool verbose about what operations it is
+performing instead of teh default of only reporting errors.
+
+-g
+The generated code will be augmented with runtime debug logging so it
+can be traced
+
+-D
+The tool will generate output to allow debugging of output conversion.
+This includes dumps of the binding and IDL files AST
+
+-W
+This switch will make the tool generate warnings about various issues
+with the binding or IDL files being processed.
+
+-I
+An additional search path may be given so idl files can be located.
+
+The tool requires a binding file as input and an output directory in
+which to place its output.
+
+
+Web IDL
+-------
+
+The IDL is specified in a w3c document[1] but the second edition is in
+draft[2] and covers many of the features actually used in the whatwg
+dom and html spec.
+
+The principal usage of the IDL is to define the interface between
+scripts and a browsers internal state. For example the DOM[3] and
+HTML[4] specs contain all the IDL for acessing the DOM and interacting
+with a web browser (this not strictly true as there are several
+interfaces simply not in the standards such as console).
+
+The IDL uses some slightly strange names than other object orientated
+systems.
+
+ IDL | JS | OOP | Notes
+-----------+------------------+----------------+----------------------------
+ interface | prototype | class | The data definition of
+ | | | the object
+ constants | read-only value | class variable | Belong to class, one copy
+ | property on the | |
+ | prototype | |
+ operation | method | method | functions that can be called
+ attribute | property | property | Variables set per instance
+-----------+------------------+----------------+----------------------------
+
+[1] http://www.w3.org/TR/WebIDL/
+[2] https://heycam.github.io/webidl/
+[3] https://dom.spec.whatwg.org/
+[4] https://html.spec.whatwg.org/
diff --git a/src/Makefile b/src/Makefile
index e93cb99..3e5b8af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,8 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c webidl-ast.c nsgenbind-ast.c jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c
+# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
index 2f630b7..49477cf 100644
--- a/src/nsgenbind-ast.c
+++ b/src/nsgenbind-ast.c
@@ -14,7 +14,9 @@
#include <stdlib.h>
#include <errno.h>
#include <string.h>
+#include <stdarg.h>
+#include "utils.h"
#include "nsgenbind-ast.h"
#include "options.h"
@@ -26,478 +28,521 @@ extern int nsgenbind_parse(struct genbind_node **genbind_ast);
/* terminal nodes have a value only */
struct genbind_node {
- enum genbind_node_type type;
- struct genbind_node *l;
- union {
- void *value;
- struct genbind_node *node;
- char *text;
- int number; /* node data is an integer */
- } r;
+ enum genbind_node_type type;
+ struct genbind_node *l;
+ union {
+ void *value;
+ struct genbind_node *node;
+ char *text;
+ int number; /* node data is an integer */
+ } r;
};
char *genbind_strapp(char *a, char *b)
{
- char *fullstr;
- int fulllen;
- fulllen = strlen(a) + strlen(b) + 1;
- fullstr = malloc(fulllen);
- snprintf(fullstr, fulllen, "%s%s", a, b);
- free(a);
- free(b);
- return fullstr;
+ char *fullstr;
+ int fulllen;
+ fulllen = strlen(a) + strlen(b) + 1;
+ fullstr = malloc(fulllen);
+ snprintf(fullstr, fulllen, "%s%s", a, b);
+ free(a);
+ free(b);
+ return fullstr;
}
struct genbind_node *
genbind_node_link(struct genbind_node *tgt, struct genbind_node *src)
{
- tgt->l = src;
- return tgt;
+ tgt->l = src;
+ return tgt;
}
struct genbind_node *
genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r)
{
- struct genbind_node *nn;
- nn = calloc(1, sizeof(struct genbind_node));
- nn->type = type;
- nn->l = l;
- nn->r.value = r;
- return nn;
+ struct genbind_node *nn;
+ nn = calloc(1, sizeof(struct genbind_node));
+ nn->type = type;
+ nn->l = l;
+ nn->r.value = r;
+ return nn;
}
/* exported interface defined in nsgenbind-ast.h */
int
genbind_node_foreach_type(struct genbind_node *node,
- enum genbind_node_type type,
- genbind_callback_t *cb,
- void *ctx)
+ enum genbind_node_type type,
+ genbind_callback_t *cb,
+ void *ctx)
{
- int ret;
-
- if (node == NULL) {
- return -1;
- }
- if (node->l != NULL) {
- ret = genbind_node_foreach_type(node->l, type, cb, ctx);
- if (ret != 0) {
- return ret;
- }
- }
- if (node->type == type) {
- return cb(node, ctx);
- }
-
- return 0;
+ int ret;
+
+ if (node == NULL) {
+ return -1;
+ }
+ if (node->l != NULL) {
+ ret = genbind_node_foreach_type(node->l, type, cb, ctx);
+ if (ret != 0) {
+ return ret;
+ }
+ }
+ if (node->type == type) {
+ return cb(node, ctx);
+ }
+
+ return 0;
}
static int genbind_enumerate_node(struct genbind_node *node, void *ctx)
{
- node = node;
- (*((int *)ctx))++;
- return 0;
+ node = node;
+ (*((int *)ctx))++;
+ return 0;
}
/* exported interface defined in nsgenbind-ast.h */
int
genbind_node_enumerate_type(struct genbind_node *node,
- enum genbind_node_type type)
+ enum genbind_node_type type)
{
- int count = 0;
- genbind_node_foreach_type(node,
- type,
- genbind_enumerate_node,
- &count);
- return count;
+ int count = 0;
+ genbind_node_foreach_type(node,
+ type,
+ genbind_enumerate_node,
+ &count);
+ return count;
}
/* exported interface defined in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find(struct genbind_node *node,
- struct genbind_node *prev,
- genbind_callback_t *cb,
- void *ctx)
+ struct genbind_node *prev,
+ genbind_callback_t *cb,
+ void *ctx)
{
- struct genbind_node *ret;
+ struct genbind_node *ret;
- if ((node == NULL) || (node == prev)) {
- return NULL;
- }
+ if ((node == NULL) || (node == prev)) {
+ return NULL;
+ }
- if (node->l != prev) {
- ret = genbind_node_find(node->l, prev, cb, ctx);
- if (ret != NULL) {
- return ret;
- }
- }
+ if (node->l != prev) {
+ ret = genbind_node_find(node->l, prev, cb, ctx);
+ if (ret != NULL) {
+ return ret;
+ }
+ }
- if (cb(node, ctx) != 0) {
- return node;
- }
+ if (cb(node, ctx) != 0) {
+ return node;
+ }
- return NULL;
+ return NULL;
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type)
+ struct genbind_node *prev,
+ enum genbind_node_type type)
{
- return genbind_node_find(node,
- prev,
- genbind_cmp_node_type,
- (void *)type);
+ return genbind_node_find(node,
+ prev,
+ genbind_cmp_node_type,
+ (void *)type);
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type_ident(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type,
- const char *ident)
+ struct genbind_node *prev,
+ enum genbind_node_type type,
+ const char *ident)
{
- struct genbind_node *found_node;
- struct genbind_node *ident_node;
-
- if (ident == NULL) {
- return NULL;
- }
-
- found_node = genbind_node_find_type(node, prev, type);
-
- while (found_node != NULL) {
- /* look for an ident node */
- ident_node = genbind_node_find_type(
- genbind_node_getnode(found_node),
- NULL,
- GENBIND_NODE_TYPE_IDENT);
-
- while (ident_node != NULL) {
- /* check for matching text */
- if (strcmp(ident_node->r.text, ident) == 0) {
- return found_node;
- }
-
- ident_node = genbind_node_find_type(
- genbind_node_getnode(found_node),
- ident_node,
- GENBIND_NODE_TYPE_IDENT);
- }
-
-
- /* look for next matching node */
- found_node = genbind_node_find_type(node, found_node, type);
- }
- return found_node;
+ struct genbind_node *found_node;
+ struct genbind_node *ident_node;
+
+ if (ident == NULL) {
+ return NULL;
+ }
+
+ found_node = genbind_node_find_type(node, prev, type);
+
+ while (found_node != NULL) {
+ /* look for an ident node */
+ ident_node = genbind_node_find_type(
+ genbind_node_getnode(found_node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT);
+
+ while (ident_node != NULL) {
+ /* check for matching text */
+ if (strcmp(ident_node->r.text, ident) == 0) {
+ return found_node;
+ }
+
+ ident_node = genbind_node_find_type(
+ genbind_node_getnode(found_node),
+ ident_node,
+ GENBIND_NODE_TYPE_IDENT);
+ }
+
+
+ /* look for next matching node */
+ found_node = genbind_node_find_type(node, found_node, type);
+ }
+ return found_node;
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type,
- const char *ident)
+ struct genbind_node *prev,
+ enum genbind_node_type type,
+ const char *ident)
{
- struct genbind_node *found_node;
- struct genbind_node *ident_node;
-
- found_node = genbind_node_find_type(node, prev, type);
-
-
- while (found_node != NULL) {
- /* look for a type node */
- ident_node = genbind_node_find_type(genbind_node_getnode(found_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE);
- if (ident_node != NULL) {
- if (strcmp(ident_node->r.text, ident) == 0)
- break;
- }
-
- /* look for next matching node */
- found_node = genbind_node_find_type(node, found_node, type);
- }
- return found_node;
+ struct genbind_node *found_node;
+ struct genbind_node *ident_node;
+
+ found_node = genbind_node_find_type(node, prev, type);
+
+
+ while (found_node != NULL) {
+ /* look for a type node */
+ ident_node = genbind_node_find_type(genbind_node_getnode(found_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE);
+ if (ident_node != NULL) {
+ if (strcmp(ident_node->r.text, ident) == 0)
+ break;
+ }
+
+ /* look for next matching node */
+ found_node = genbind_node_find_type(node, found_node, type);
+ }
+ return found_node;
}
int genbind_cmp_node_type(struct genbind_node *node, void *ctx)
{
- if (node->type == (enum genbind_node_type)ctx)
- return 1;
- return 0;
+ if (node->type == (enum genbind_node_type)ctx)
+ return 1;
+ return 0;
}
char *genbind_node_gettext(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_WEBIDLFILE:
- case GENBIND_NODE_TYPE_STRING:
- case GENBIND_NODE_TYPE_PREAMBLE:
- case GENBIND_NODE_TYPE_PROLOGUE:
- case GENBIND_NODE_TYPE_EPILOGUE:
- case GENBIND_NODE_TYPE_IDENT:
- case GENBIND_NODE_TYPE_TYPE:
- case GENBIND_NODE_TYPE_CBLOCK:
- return node->r.text;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_WEBIDL:
+ case GENBIND_NODE_TYPE_STRING:
+ case GENBIND_NODE_TYPE_PREFACE:
+ case GENBIND_NODE_TYPE_PROLOGUE:
+ case GENBIND_NODE_TYPE_EPILOGUE:
+ case GENBIND_NODE_TYPE_POSTFACE:
+ case GENBIND_NODE_TYPE_IDENT:
+ case GENBIND_NODE_TYPE_TYPE:
+ case GENBIND_NODE_TYPE_CDATA:
+ return node->r.text;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
struct genbind_node *genbind_node_getnode(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_HDRCOMMENT:
- case GENBIND_NODE_TYPE_BINDING:
- case GENBIND_NODE_TYPE_BINDING_PRIVATE:
- case GENBIND_NODE_TYPE_BINDING_INTERNAL:
- case GENBIND_NODE_TYPE_BINDING_PROPERTY:
- case GENBIND_NODE_TYPE_BINDING_INTERFACE:
- case GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS:
- case GENBIND_NODE_TYPE_OPERATION:
- case GENBIND_NODE_TYPE_API:
- case GENBIND_NODE_TYPE_GETTER:
- case GENBIND_NODE_TYPE_SETTER:
- return node->r.node;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_BINDING:
+ case GENBIND_NODE_TYPE_CLASS:
+ case GENBIND_NODE_TYPE_PRIVATE:
+ case GENBIND_NODE_TYPE_INTERNAL:
+ case GENBIND_NODE_TYPE_PROPERTY:
+ case GENBIND_NODE_TYPE_FLAGS:
+ case GENBIND_NODE_TYPE_METHOD:
+ case GENBIND_NODE_TYPE_PARAMETER:
+ return node->r.node;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
int *genbind_node_getint(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_MODIFIER:
- return &node->r.number;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_METHOD_TYPE:
+ case GENBIND_NODE_TYPE_MODIFIER:
+ return &node->r.number;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
static const char *genbind_node_type_to_str(enum genbind_node_type type)
{
- switch(type) {
- case GENBIND_NODE_TYPE_IDENT:
- return "Ident";
+ switch(type) {
+ case GENBIND_NODE_TYPE_IDENT:
+ return "Ident";
- case GENBIND_NODE_TYPE_ROOT:
- return "Root";
+ case GENBIND_NODE_TYPE_ROOT:
+ return "Root";
- case GENBIND_NODE_TYPE_WEBIDLFILE:
- return "webidlfile";
+ case GENBIND_NODE_TYPE_WEBIDL:
+ return "webidl";
- case GENBIND_NODE_TYPE_HDRCOMMENT:
- return "HdrComment";
+ case GENBIND_NODE_TYPE_STRING:
+ return "String";
- case GENBIND_NODE_TYPE_STRING:
- return "String";
+ case GENBIND_NODE_TYPE_PREFACE:
+ return "Preface";
- case GENBIND_NODE_TYPE_PREAMBLE:
- return "Preamble";
+ case GENBIND_NODE_TYPE_POSTFACE:
+ return "Postface";
- case GENBIND_NODE_TYPE_BINDING:
- return "Binding";
+ case GENBIND_NODE_TYPE_PROLOGUE:
+ return "Prologue";
- case GENBIND_NODE_TYPE_TYPE:
- return "Type";
+ case GENBIND_NODE_TYPE_EPILOGUE:
+ return "Epilogue";
- case GENBIND_NODE_TYPE_BINDING_PRIVATE:
- return "Private";
+ case GENBIND_NODE_TYPE_BINDING:
+ return "Binding";
- case GENBIND_NODE_TYPE_BINDING_INTERNAL:
- return "Internal";
+ case GENBIND_NODE_TYPE_TYPE:
+ return "Type";
- case GENBIND_NODE_TYPE_BINDING_INTERFACE:
- return "Interface";
+ case GENBIND_NODE_TYPE_PRIVATE:
+ return "Private";
- case GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS:
- return "Flags";
+ case GENBIND_NODE_TYPE_INTERNAL:
+ return "Internal";
- case GENBIND_NODE_TYPE_BINDING_PROPERTY:
- return "Property";
+ case GENBIND_NODE_TYPE_CLASS:
+ return "Class";
- case GENBIND_NODE_TYPE_OPERATION:
- return "Operation";
+ case GENBIND_NODE_TYPE_FLAGS:
+ return "Flags";
- case GENBIND_NODE_TYPE_API:
- return "API";
+ case GENBIND_NODE_TYPE_PROPERTY:
+ return "Property";
- case GENBIND_NODE_TYPE_GETTER:
- return "Getter";
+ case GENBIND_NODE_TYPE_METHOD:
+ return "Method";
- case GENBIND_NODE_TYPE_SETTER:
- return "Setter";
+ case GENBIND_NODE_TYPE_METHOD_TYPE:
+ return "Type";
- case GENBIND_NODE_TYPE_CBLOCK:
- return "CBlock";
+ case GENBIND_NODE_TYPE_PARAMETER:
+ return "Parameter";
- default:
- return "Unknown";
- }
+ case GENBIND_NODE_TYPE_CDATA:
+ return "CBlock";
+
+ default:
+ return "Unknown";
+ }
}
-int genbind_ast_dump(struct genbind_node *node, int indent)
+/** dump ast node to file at indent level */
+static int genbind_ast_dump(FILE *dfile, struct genbind_node *node, int indent)
{
- const char *SPACES=" ";
- char *txt;
-
- while (node != NULL) {
- printf("%.*s%s", indent, SPACES, genbind_node_type_to_str(node->type));
-
- txt = genbind_node_gettext(node);
- if (txt == NULL) {
- printf("\n");
- genbind_ast_dump(genbind_node_getnode(node), indent + 2);
- } else {
- printf(": \"%.*s\"\n", 75 - indent, txt);
- }
- node = node->l;
- }
- return 0;
+ const char *SPACES=" ";
+ char *txt;
+ int *val;
+
+ while (node != NULL) {
+ fprintf(dfile, "%.*s%s", indent, SPACES,
+ genbind_node_type_to_str(node->type));
+
+ txt = genbind_node_gettext(node);
+ if (txt == NULL) {
+ val = genbind_node_getint(node);
+ if (val == NULL) {
+ fprintf(dfile, "\n");
+ genbind_ast_dump(dfile,
+ genbind_node_getnode(node),
+ indent + 2);
+ } else {
+ fprintf(dfile, ": %d\n", *val);
+ }
+ } else {
+ fprintf(dfile, ": \"%.*s\"\n", 75 - indent, txt);
+ }
+ node = node->l;
+ }
+ return 0;
}
-FILE *genbindopen(const char *filename)
+
+/* exported interface documented in nsgenbind-ast.h */
+int genbind_dump_ast(struct genbind_node *node)
{
- FILE *genfile;
- char *fullname;
- int fulllen;
- static char *prevfilepath = NULL;
-
- /* try filename raw */
- genfile = fopen(filename, "r");
- if (genfile != NULL) {
- if (options->verbose) {
- printf("Opened Genbind file %s\n", filename);
- }
- if (prevfilepath == NULL) {
- fullname = strrchr(filename, '/');
- if (fullname == NULL) {
- fulllen = strlen(filename);
- } else {
- fulllen = fullname - filename;
- }
- prevfilepath = strndup(filename,fulllen);
- }
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- filename);
- }
- return genfile;
- }
-
- /* try based on previous filename */
- if (prevfilepath != NULL) {
- fulllen = strlen(prevfilepath) + strlen(filename) + 2;
- fullname = malloc(fulllen);
- snprintf(fullname, fulllen, "%s/%s", prevfilepath, filename);
- if (options->debug) {
- printf("Attempting to open Genbind file %s\n", fullname);
- }
- genfile = fopen(fullname, "r");
- if (genfile != NULL) {
- if (options->verbose) {
- printf("Opened Genbind file %s\n", fullname);
- }
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- fullname);
- }
- free(fullname);
- return genfile;
- }
- free(fullname);
- }
-
- /* try on idl path */
- if (options->idlpath != NULL) {
- fulllen = strlen(options->idlpath) + strlen(filename) + 2;
- fullname = malloc(fulllen);
- snprintf(fullname, fulllen, "%s/%s", options->idlpath, filename);
- genfile = fopen(fullname, "r");
- if ((genfile != NULL) && options->verbose) {
- printf("Opend Genbind file %s\n", fullname);
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- fullname);
- }
- }
-
- free(fullname);
- }
-
- return genfile;
+ FILE *dumpf;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("binding-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ genbind_ast_dump(dumpf, node, 0);
+
+ fclose(dumpf);
+
+ return 0;
}
-int genbind_parsefile(char *infilename, struct genbind_node **ast)
+FILE *genbindopen(const char *filename)
{
- FILE *infile;
-
- /* open input file */
- if ((infilename[0] == '-') &&
- (infilename[1] == 0)) {
- if (options->verbose) {
- printf("Using stdin for input\n");
- }
- infile = stdin;
- } else {
- infile = genbindopen(infilename);
- }
-
- if (!infile) {
- fprintf(stderr, "Error opening %s: %s\n",
- infilename,
- strerror(errno));
- return 3;
- }
-
- if (options->debug) {
- nsgenbind_debug = 1;
- nsgenbind__flex_debug = 1;
- }
-
- /* set flex to read from file */
- nsgenbind_restart(infile);
-
- /* process binding */
- return nsgenbind_parse(ast);
+ FILE *genfile;
+ char *fullname;
+ int fulllen;
+ static char *prevfilepath = NULL;
+
+ /* try filename raw */
+ genfile = fopen(filename, "r");
+ if (genfile != NULL) {
+ if (options->verbose) {
+ printf("Opened Genbind file %s\n", filename);
+ }
+ if (prevfilepath == NULL) {
+ fullname = strrchr(filename, '/');
+ if (fullname == NULL) {
+ fulllen = strlen(filename);
+ } else {
+ fulllen = fullname - filename;
+ }
+ prevfilepath = strndup(filename,fulllen);
+ }
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ filename);
+ }
+#endif
+ return genfile;
+ }
+
+ /* try based on previous filename */
+ if (prevfilepath != NULL) {
+ fulllen = strlen(prevfilepath) + strlen(filename) + 2;
+ fullname = malloc(fulllen);
+ snprintf(fullname, fulllen, "%s/%s", prevfilepath, filename);
+ if (options->debug) {
+ printf("Attempting to open Genbind file %s\n", fullname);
+ }
+ genfile = fopen(fullname, "r");
+ if (genfile != NULL) {
+ if (options->verbose) {
+ printf("Opened Genbind file %s\n", fullname);
+ }
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ fullname);
+ }
+#endif
+ free(fullname);
+ return genfile;
+ }
+ free(fullname);
+ }
+
+ /* try on idl path */
+ if (options->idlpath != NULL) {
+ fulllen = strlen(options->idlpath) + strlen(filename) + 2;
+ fullname = malloc(fulllen);
+ snprintf(fullname, fulllen, "%s/%s", options->idlpath, filename);
+ genfile = fopen(fullname, "r");
+ if ((genfile != NULL) && options->verbose) {
+ printf("Opend Genbind file %s\n", fullname);
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ fullname);
+ }
+#endif
+ }
+
+ free(fullname);
+ }
+ return genfile;
}
-#ifdef NEED_STRNDUP
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *genbind_parsetracef;
-char *strndup(const char *s, size_t n)
+int genbind_parsefile(char *infilename, struct genbind_node **ast)
{
- size_t len;
- char *s2;
-
- for (len = 0; len != n && s[len]; len++)
- continue;
+ FILE *infile;
+ int ret;
+
+ /* open input file */
+ infile = genbindopen(infilename);
+ if (!infile) {
+ fprintf(stderr, "Error opening %s: %s\n",
+ infilename,
+ strerror(errno));
+ return 3;
+ }
+
+ /* if debugging enabled enable parser tracing and send to file */
+ if (options->debug) {
+ nsgenbind_debug = 1;
+ nsgenbind__flex_debug = 1;
+ genbind_parsetracef = genb_fopen("binding-trace", "w");
+ } else {
+ genbind_parsetracef = NULL;
+ }
+
+ /* set flex to read from file */
+ nsgenbind_restart(infile);
+
+ /* process binding */
+ ret = nsgenbind_parse(ast);
+
+ /* close tracefile if open */
+ if (genbind_parsetracef != NULL) {
+ fclose(genbind_parsetracef);
+ }
+
+ return ret;
+}
- s2 = malloc(len + 1);
- if (!s2)
- return 0;
+int genbind_fprintf(FILE *stream, const char *format, ...)
+{
+ va_list ap;
+ int ret;
- memcpy(s2, s, len);
- s2[len] = 0;
- return s2;
-}
+ va_start(ap, format);
-#endif
+ if (genbind_parsetracef == NULL) {
+ ret = vfprintf(stream, format, ap);
+ } else {
+ ret = vfprintf(genbind_parsetracef, format, ap);
+ }
+ va_end(ap);
+ return ret;
+}
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index 4911f5a..f6800fb 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -10,36 +10,46 @@
#define nsgenbind_nsgenbind_ast_h
enum genbind_node_type {
- GENBIND_NODE_TYPE_ROOT = 0,
- GENBIND_NODE_TYPE_IDENT, /**< generic identifier string */
- GENBIND_NODE_TYPE_TYPE, /**< generic type string */
- GENBIND_NODE_TYPE_MODIFIER, /**< node modifier */
-
- GENBIND_NODE_TYPE_CBLOCK,
- GENBIND_NODE_TYPE_WEBIDLFILE,
- GENBIND_NODE_TYPE_HDRCOMMENT,
- GENBIND_NODE_TYPE_STRING,
- GENBIND_NODE_TYPE_PREAMBLE,
- GENBIND_NODE_TYPE_PROLOGUE,
- GENBIND_NODE_TYPE_EPILOGUE,
- GENBIND_NODE_TYPE_BINDING,
- GENBIND_NODE_TYPE_BINDING_PRIVATE,
- GENBIND_NODE_TYPE_BINDING_INTERNAL,
- GENBIND_NODE_TYPE_BINDING_INTERFACE,
- GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS,
- GENBIND_NODE_TYPE_BINDING_PROPERTY,
- GENBIND_NODE_TYPE_API,
- GENBIND_NODE_TYPE_OPERATION,
- GENBIND_NODE_TYPE_GETTER,
- GENBIND_NODE_TYPE_SETTER,
+ GENBIND_NODE_TYPE_ROOT = 0,
+ GENBIND_NODE_TYPE_IDENT, /**< generic identifier string */
+ GENBIND_NODE_TYPE_TYPE, /**< generic type string */
+ GENBIND_NODE_TYPE_MODIFIER, /**< node modifier */
+ GENBIND_NODE_TYPE_CDATA, /**< verbatim block of character data */
+ GENBIND_NODE_TYPE_STRING, /**< text string */
+
+ GENBIND_NODE_TYPE_BINDING,
+ GENBIND_NODE_TYPE_WEBIDL,
+ GENBIND_NODE_TYPE_PREFACE,
+ GENBIND_NODE_TYPE_PROLOGUE,
+ GENBIND_NODE_TYPE_EPILOGUE,
+ GENBIND_NODE_TYPE_POSTFACE,
+
+ GENBIND_NODE_TYPE_CLASS, /**< class definition */
+ GENBIND_NODE_TYPE_PRIVATE,
+ GENBIND_NODE_TYPE_INTERNAL,
+ GENBIND_NODE_TYPE_PROPERTY,
+ GENBIND_NODE_TYPE_FLAGS,
+
+ GENBIND_NODE_TYPE_METHOD, /**< binding method */
+ GENBIND_NODE_TYPE_METHOD_TYPE, /**< binding method type */
+ GENBIND_NODE_TYPE_PARAMETER, /**< method parameter */
};
/* modifier flags */
enum genbind_type_modifier {
- GENBIND_TYPE_NONE = 0,
- GENBIND_TYPE_TYPE = 1, /**< identifies a type handler */
- GENBIND_TYPE_UNSHARED = 2, /**< unshared item */
- GENBIND_TYPE_TYPE_UNSHARED = 3, /**< identifies a unshared type handler */
+ GENBIND_TYPE_NONE = 0,
+ GENBIND_TYPE_TYPE = 1, /**< identifies a type handler */
+ GENBIND_TYPE_UNSHARED = 2, /**< unshared item */
+ GENBIND_TYPE_TYPE_UNSHARED = 3, /**< identifies a unshared type handler */
+};
+
+/* binding method types */
+enum genbind_method_type {
+ GENBIND_METHOD_TYPE_INIT = 0,
+ GENBIND_METHOD_TYPE_FINI = 1, /**< */
+ GENBIND_METHOD_TYPE_METHOD = 2, /**< */
+ GENBIND_METHOD_TYPE_GETTER = 3, /**< */
+ GENBIND_METHOD_TYPE_SETTER = 4, /**< */
};
struct genbind_node;
@@ -47,6 +57,8 @@ struct genbind_node;
/** callback for search and iteration routines */
typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx);
+int genbind_fprintf(FILE *stream, const char *format, ...);
+
int genbind_cmp_node_type(struct genbind_node *node, void *ctx);
FILE *genbindopen(const char *filename);
@@ -58,9 +70,19 @@ char *genbind_strapp(char *a, char *b);
struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
-int genbind_ast_dump(struct genbind_node *ast, int indent);
+/**
+ * Dump the binding AST to file
+ *
+ * If the debug flag has been set this causes the binding AST to be written to
+ * a binding-ast output file
+ *
+ * \param node Node of the tree to start dumping from (usually tree root)
+ * \return 0 on sucess or non zero on faliure and error message printed.
+ */
+int genbind_dump_ast(struct genbind_node *node);
-/** Depth first left hand search using user provided comparison
+/**
+ *Depth first left hand search using user provided comparison
*
* @param node The node to start the search from
* @param prev The node at which to stop the search, either NULL to
@@ -71,9 +93,9 @@ int genbind_ast_dump(struct genbind_node *ast, int indent);
*/
struct genbind_node *
genbind_node_find(struct genbind_node *node,
- struct genbind_node *prev,
- genbind_callback_t *cb,
- void *ctx);
+ struct genbind_node *prev,
+ genbind_callback_t *cb,
+ void *ctx);
/** Depth first left hand search returning nodes of the specified type
*
@@ -86,8 +108,8 @@ genbind_node_find(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype);
/** count how many nodes of a specified type.
*
@@ -101,7 +123,7 @@ genbind_node_find_type(struct genbind_node *node,
*/
int
genbind_node_enumerate_type(struct genbind_node *node,
- enum genbind_node_type type);
+ enum genbind_node_type type);
/** Depth first left hand search returning nodes of the specified type
* and a ident child node with matching text
@@ -115,9 +137,9 @@ genbind_node_enumerate_type(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type_ident(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype,
- const char *ident);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype,
+ const char *ident);
/** Returning node of the specified type with a GENBIND_NODE_TYPE_TYPE
* subnode with matching text.
@@ -137,9 +159,9 @@ genbind_node_find_type_ident(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype,
- const char *type_text);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype,
+ const char *type_text);
/** Iterate all nodes of a certian type from a node with a callback.
*
@@ -149,9 +171,9 @@ genbind_node_find_type_type(struct genbind_node *node,
* @param node The node to start the search from.
*/
int genbind_node_foreach_type(struct genbind_node *node,
- enum genbind_node_type type,
- genbind_callback_t *cb,
- void *ctx);
+ enum genbind_node_type type,
+ genbind_callback_t *cb,
+ void *ctx);
/** get a nodes node list content
*
@@ -176,9 +198,4 @@ char *genbind_node_gettext(struct genbind_node *node);
*/
int *genbind_node_getint(struct genbind_node *node);
-#ifdef _WIN32
-#define NEED_STRNDUP 1
-char *strndup(const char *s, size_t n);
-#endif
-
#endif
diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l
index 4b5e225..f7b6528 100644
--- a/src/nsgenbind-lexer.l
+++ b/src/nsgenbind-lexer.l
@@ -72,7 +72,9 @@ cblockopen \%\{
cblockclose \%\}
/* used for #include directive */
-poundsign ^{whitespace}*#
+poundsign ^{whitespace}*#
+
+dblcolon \:\:
%x cblock
@@ -88,44 +90,55 @@ poundsign ^{whitespace}*#
yylloc->last_column = 0;
}
- /* terminals */
+ /* binding terminals */
-webidlfile return TOK_IDLFILE;
+binding return TOK_BINDING;
-hdrcomment return TOK_HDR_COMMENT;
+webidl return TOK_WEBIDL;
-preamble return TOK_PREAMBLE;
+preface return TOK_PREFACE;
prologue return TOK_PROLOGUE;
epilogue return TOK_EPILOGUE;
-binding return TOK_BINDING;
+postface return TOK_POSTFACE;
-interface return TOK_INTERFACE;
-flags return TOK_FLAGS;
+ /* class member terminals */
-type return TOK_TYPE;
+class return TOK_CLASS;
private return TOK_PRIVATE;
internal return TOK_INTERNAL;
+flags return TOK_FLAGS;
+
+type return TOK_TYPE;
+
unshared return TOK_UNSHARED;
shared return TOK_SHARED;
property return TOK_PROPERTY;
-operation return TOK_OPERATION;
+ /* implementation terminals */
+
+init return TOK_INIT;
-api return TOK_API;
+fini return TOK_FINI;
+
+method return TOK_METHOD;
getter return TOK_GETTER;
setter return TOK_SETTER;
+ /* other terminals */
+
+{dblcolon} return TOK_DBLCOLON;
+
{cblockopen} BEGIN(cblock);
{identifier} {
@@ -140,7 +153,7 @@ setter return TOK_SETTER;
{multicomment} /* nothing */
-{poundsign}include BEGIN(incl);
+{poundsign}include BEGIN(incl);
{other} return (int) yytext[0];
@@ -151,7 +164,7 @@ setter return TOK_SETTER;
<cblock>\% yylval->text = strdup(yytext); return TOK_CCODE_LITERAL;
-<incl>[ \t]*\" /* eat the whitespace and open quotes */
+<incl>[ \t]*\" /* eat the whitespace and open quotes */
<incl>[^\t\n\"]+ {
/* got the include file name */
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index b37ab9d..c8e5154 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -10,6 +10,12 @@
#include <stdio.h>
#include <string.h>
+#define YYFPRINTF genbind_fprintf
+#define YY_LOCATION_PRINT(File, Loc) \
+ genbind_fprintf(File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+
#include "nsgenbind-parser.h"
#include "nsgenbind-lexer.h"
#include "webidl-ast.h"
@@ -17,7 +23,9 @@
char *errtxt;
- static void nsgenbind_error(YYLTYPE *locp, struct genbind_node **genbind_ast, const char *str)
+static void nsgenbind_error(YYLTYPE *locp,
+ struct genbind_node **genbind_ast,
+ const char *str)
{
locp = locp;
genbind_ast = genbind_ast;
@@ -37,31 +45,36 @@ char *errtxt;
%union
{
- char* text;
+ char *text;
struct genbind_node *node;
long value;
}
-%token TOK_IDLFILE
-%token TOK_HDR_COMMENT
-%token TOK_PREAMBLE
-%token TOK_PROLOGUE;
-%token TOK_EPILOGUE;
-
-%token TOK_API
%token TOK_BINDING
-%token TOK_OPERATION
-%token TOK_GETTER
-%token TOK_SETTER
-%token TOK_INTERFACE
-%token TOK_FLAGS
-%token TOK_TYPE
+%token TOK_WEBIDL
+%token TOK_PREFACE
+%token TOK_PROLOGUE
+%token TOK_EPILOGUE
+%token TOK_POSTFACE
+
+%token TOK_CLASS
%token TOK_PRIVATE
%token TOK_INTERNAL
+%token TOK_FLAGS
+%token TOK_TYPE
%token TOK_UNSHARED
%token TOK_SHARED
%token TOK_PROPERTY
+ /* method types */
+%token TOK_INIT
+%token TOK_FINI
+%token TOK_METHOD
+%token TOK_GETTER
+%token TOK_SETTER
+
+%token TOK_DBLCOLON
+
%token <text> TOK_IDENTIFIER
%token <text> TOK_STRING_LITERAL
%token <text> TOK_CCODE_LITERAL
@@ -73,28 +86,30 @@ char *errtxt;
%type <node> Statement
%type <node> Statements
-%type <node> IdlFile
-%type <node> Preamble
-%type <node> Prologue
-%type <node> Epilogue
-%type <node> HdrComment
-%type <node> Strings
%type <node> Binding
%type <node> BindingArgs
%type <node> BindingArg
+%type <node> Class
+%type <node> ClassArgs
+%type <node> ClassArg
+%type <node> ClassFlag
+%type <node> ClassFlags
+
+%type <node> Method
+%type <node> MethodDeclarator
+%type <value> MethodType
+
+%type <node> WebIDL
+%type <node> Preface
+%type <node> Prologue
+%type <node> Epilogue
+%type <node> Postface
%type <node> Private
%type <node> Internal
-%type <node> Interface
-%type <node> InterfaceArgs
-%type <node> InterfaceArg
-%type <node> InterfaceFlags
%type <node> Property
-%type <node> Operation
-%type <node> Api
-%type <node> Getter
-%type <node> Setter
-
+%type <node> ParameterList
+%type <node> TypeIdent
%%
@@ -126,68 +141,77 @@ Statements
Statement
:
- IdlFile
- |
- HdrComment
- |
- Preamble
- |
- Prologue
- |
- Epilogue
- |
Binding
|
- Operation
- |
- Api
+ Class
|
- Getter
- |
- Setter
+ Method
;
- /* [3] load a web IDL file */
-IdlFile
- :
- TOK_IDLFILE TOK_STRING_LITERAL ';'
+Binding
+ :
+ TOK_BINDING TOK_IDENTIFIER '{' BindingArgs '}'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_WEBIDLFILE, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING,
+ NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE, $4, $2));
}
;
-HdrComment
- :
- TOK_HDR_COMMENT Strings ';'
+BindingArgs
+ :
+ BindingArg
+ |
+ BindingArgs BindingArg
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_HDRCOMMENT, NULL, $2);
+ $$ = genbind_node_link($2, $1);
}
;
-Strings
+BindingArg
:
- TOK_STRING_LITERAL
+ WebIDL
+ |
+ Preface
+ |
+ Prologue
+ |
+ Epilogue
+ |
+ Postface
+ ;
+
+ /* [3] a web IDL file specifier */
+WebIDL
+ :
+ TOK_WEBIDL TOK_STRING_LITERAL ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $1);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_WEBIDL, NULL, $2);
}
- |
- Strings TOK_STRING_LITERAL
+ ;
+
+
+ /* type and identifier of a variable */
+TypeIdent
+ :
+ TOK_STRING_LITERAL TOK_IDENTIFIER
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_STRING, $1, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE, NULL, $1), $2);
}
;
-Preamble
+Preface
:
- TOK_PREAMBLE CBlock
+ TOK_PREFACE CBlock ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_PREAMBLE, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PREFACE, NULL, $2);
}
;
Prologue
:
- TOK_PROLOGUE CBlock
+ TOK_PROLOGUE CBlock ';'
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_PROLOGUE, NULL, $2);
}
@@ -195,173 +219,196 @@ Prologue
Epilogue
:
- TOK_EPILOGUE CBlock
+ TOK_EPILOGUE CBlock ';'
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_EPILOGUE, NULL, $2);
}
;
+Postface
+ :
+ TOK_POSTFACE CBlock ';'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_POSTFACE, NULL, $2);
+ }
+ ;
+
CBlock
- :
+ :
TOK_CCODE_LITERAL
- |
- CBlock TOK_CCODE_LITERAL
+ |
+ CBlock TOK_CCODE_LITERAL
{
$$ = genbind_strapp($1, $2);
}
;
-Operation
+MethodType
:
- TOK_OPERATION TOK_IDENTIFIER CBlock
+ TOK_INIT
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_OPERATION,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = GENBIND_METHOD_TYPE_INIT;
}
+ |
+ TOK_FINI
+ {
+ $$ = GENBIND_METHOD_TYPE_FINI;
+ }
+ |
+ TOK_METHOD
+ {
+ $$ = GENBIND_METHOD_TYPE_METHOD;
+ }
+ |
+ TOK_GETTER
+ {
+ $$ = GENBIND_METHOD_TYPE_GETTER;
+ }
+ |
+ TOK_SETTER
+ {
+ $$ = GENBIND_METHOD_TYPE_SETTER;
+ }
+ ;
-Api
+ParameterList
:
- TOK_API TOK_IDENTIFIER CBlock
+ TypeIdent
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PARAMETER, NULL, $1);
+ }
+ |
+ ParameterList ',' TypeIdent
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_API,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_node_link($3, $1);
}
+ ;
-Getter
+MethodDeclarator
:
- TOK_GETTER TOK_IDENTIFIER CBlock
+ TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER '(' ParameterList ')'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_GETTER,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ $5,
+ $3),
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
}
+ |
+ TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER '(' ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $3),
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ |
+ TOK_IDENTIFIER '(' ParameterList ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ $3,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ |
+ TOK_IDENTIFIER '(' ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ ;
-Setter
+Method
:
- TOK_SETTER TOK_IDENTIFIER CBlock
+ MethodType MethodDeclarator CBlock
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_SETTER,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
+ genbind_new_node(GENBIND_NODE_TYPE_CDATA,
+ $2, $3),
+ (void *)$1));
}
-Binding
+
+Class
:
- TOK_BINDING TOK_IDENTIFIER '{' BindingArgs '}'
+ TOK_CLASS TOK_IDENTIFIER '{' ClassArgs '}'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_TYPE, $4, $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT, $4, $2));
}
;
-BindingArgs
+ClassArgs
:
- BindingArg
+ ClassArg
|
- BindingArgs BindingArg
+ ClassArgs ClassArg
{
- $$ = genbind_node_link($2, $1);
+ $$ = genbind_node_link($2, $1);
}
;
-BindingArg
- :
+ClassArg
+ :
Private
|
Internal
|
- Interface
- |
Property
+ |
+ ClassFlag
+ |
+ Preface
+ |
+ Prologue
+ |
+ Epilogue
+ |
+ Postface
;
+
Private
:
- TOK_PRIVATE TOK_STRING_LITERAL TOK_IDENTIFIER ';'
+ TOK_PRIVATE TypeIdent ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_PRIVATE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $2), $3));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PRIVATE, NULL, $2);
}
;
Internal
:
- TOK_INTERNAL TOK_STRING_LITERAL TOK_IDENTIFIER ';'
+ TOK_INTERNAL TypeIdent ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERNAL, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $2), $3));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_INTERNAL, NULL, $2);
}
;
-Interface
- :
- TOK_INTERFACE TOK_IDENTIFIER ';'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $2));
- }
- |
- TOK_INTERFACE TOK_IDENTIFIER '{' '}'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $2));
- }
- |
- TOK_INTERFACE TOK_IDENTIFIER '{' InterfaceArgs '}'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, $4, $2));
- }
- ;
-
-InterfaceArgs
+ClassFlag
:
- InterfaceArg
- |
- InterfaceArgs InterfaceArg
- {
- $$ = genbind_node_link($2, $1);
- }
- ;
-
-InterfaceArg
- :
- TOK_FLAGS InterfaceFlags ';'
+ TOK_FLAGS ClassFlags ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_FLAGS, NULL, $2);
}
;
-InterfaceFlags
+ClassFlags
:
TOK_IDENTIFIER
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $1);
}
|
- InterfaceFlags ',' TOK_IDENTIFIER
+ ClassFlags ',' TOK_IDENTIFIER
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT, $1, $3);
}
@@ -371,13 +418,12 @@ Property
:
TOK_PROPERTY Modifiers TOK_IDENTIFIER ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_PROPERTY,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- NULL,
- $3),
- (void *)$2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $3),
+ (void *)$2));
}
;
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index d81f30f..3174fa0 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -22,201 +22,173 @@ struct options *options;
static struct options* process_cmdline(int argc, char **argv)
{
- int opt;
+ int opt;
- options = calloc(1,sizeof(struct options));
- if (options == NULL) {
- fprintf(stderr, "Allocation error\n");
- return NULL;
- }
+ options = calloc(1,sizeof(struct options));
+ if (options == NULL) {
+ fprintf(stderr, "Allocation error\n");
+ return NULL;
+ }
- while ((opt = getopt(argc, argv, "vgDW::d:I:o:h:")) != -1) {
- switch (opt) {
- case 'I':
- options->idlpath = strdup(optarg);
- break;
+ while ((opt = getopt(argc, argv, "vgDW::I:")) != -1) {
+ switch (opt) {
+ case 'I':
+ options->idlpath = strdup(optarg);
+ break;
- case 'o':
- options->outfilename = strdup(optarg);
- break;
+ case 'v':
+ options->verbose = true;
+ break;
- case 'h':
- options->hdrfilename = strdup(optarg);
- break;
+ case 'D':
+ options->debug = true;
+ break;
- case 'd':
- options->depfilename = strdup(optarg);
- break;
+ case 'g':
+ options->dbglog = true;
+ break;
- case 'v':
- options->verbose = true;
- break;
+ case 'W':
+ options->warnings = 1; /* warning flags */
+ break;
- case 'D':
- options->debug = true;
- break;
+ default: /* '?' */
+ fprintf(stderr,
+ "Usage: %s [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir\n",
+ argv[0]);
+ free(options);
+ return NULL;
- case 'g':
- options->dbglog = true;
- break;
+ }
+ }
- case 'W':
- options->warnings = 1; /* warning flags */
- break;
+ if (optind > (argc - 2)) {
+ fprintf(stderr,
+ "Error: expected input filename and output directory\n");
+ free(options);
+ return NULL;
+ }
- default: /* '?' */
- fprintf(stderr,
- "Usage: %s [-v] [-g] [-D] [-W] [-d depfilename] [-I idlpath] [-o filename] [-h headerfile] inputfile\n",
- argv[0]);
- free(options);
- return NULL;
+ options->infilename = strdup(argv[optind]);
- }
- }
+ options->outdirname = strdup(argv[optind + 1]);
- if (optind >= argc) {
- fprintf(stderr, "Error: expected input filename\n");
- free(options);
- return NULL;
- }
-
- options->infilename = strdup(argv[optind]);
-
- return options;
+ return options;
}
static int generate_binding(struct genbind_node *binding_node, void *ctx)
{
- struct genbind_node *genbind_root = ctx;
- char *type;
- int res = 10;
-
- type = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(binding_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE));
-
- if (strcmp(type, "jsapi_libdom") == 0) {
- res = jsapi_libdom_output(options, genbind_root, binding_node);
- } else {
- fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
- }
-
- return res;
+ struct genbind_node *genbind_root = ctx;
+ char *type;
+ int res = 10;
+
+ type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(binding_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ if (strcmp(type, "jsapi_libdom") == 0) {
+ res = jsapi_libdom_output(options, genbind_root, binding_node);
+ } else {
+ fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
+ }
+
+ return res;
+}
+
+enum bindingtype_e {
+ BINDINGTYPE_UNKNOWN,
+ BINDINGTYPE_JSAPI_LIBDOM,
+ BINDINGTYPE_DUK_LIBDOM,
+};
+
+/**
+ * get the type of binding
+ */
+static enum bindingtype_e genbind_get_type(struct genbind_node *node)
+{
+ struct genbind_node *binding_node;
+ const char *binding_type;
+
+ binding_node = genbind_node_find_type(node,
+ NULL,
+ GENBIND_NODE_TYPE_BINDING);
+ if (binding_node == NULL) {
+ /* binding entry is missing which is invalid */
+ return BINDINGTYPE_UNKNOWN;
+ }
+
+ binding_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(binding_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+ if (binding_type == NULL) {
+ fprintf(stderr, "Error: missing binding type\n");
+ return BINDINGTYPE_UNKNOWN;
+ }
+
+ if (strcmp(binding_type, "jsapi_libdom") == 0) {
+ return BINDINGTYPE_JSAPI_LIBDOM;
+ }
+
+ if (strcmp(binding_type, "duk_libdom") == 0) {
+ return BINDINGTYPE_DUK_LIBDOM;
+ }
+
+ fprintf(stderr, "Error: unsupported binding type \"%s\"\n", binding_type);
+
+ return BINDINGTYPE_UNKNOWN;
}
int main(int argc, char **argv)
{
- int res;
- struct genbind_node *genbind_root;
-
- options = process_cmdline(argc, argv);
- if (options == NULL) {
- return 1; /* bad commandline */
- }
-
- if (options->verbose &&
- (options->outfilename == NULL)) {
- fprintf(stderr,
- "Error: output to stdout with verbose logging would fail\n");
- return 2;
- }
-
- if (options->depfilename != NULL &&
- options->outfilename == NULL) {
- fprintf(stderr,
- "Error: output to stdout with dep generation would fail\n");
- return 3;
- }
-
- if (options->depfilename != NULL &&
- options->infilename == NULL) {
- fprintf(stderr,
- "Error: input from stdin with dep generation would fail\n");
- return 3;
- }
-
- /* open dependancy file */
- if (options->depfilename != NULL) {
- options->depfilehandle = fopen(options->depfilename, "w");
- if (options->depfilehandle == NULL) {
- fprintf(stderr,
- "Error: unable to open dep file\n");
- return 4;
- }
- fprintf(options->depfilehandle,
- "%s %s :", options->depfilename,
- options->outfilename);
- }
-
- /* parse input and generate dependancy */
- res = genbind_parsefile(options->infilename, &genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: parse failed with code %d\n", res);
- return res;
- }
-
- /* dependancy generation complete */
- if (options->depfilehandle != NULL) {
- fputc('\n', options->depfilehandle);
- fclose(options->depfilehandle);
- }
-
-
- /* open output file */
- if (options->outfilename == NULL) {
- options->outfilehandle = stdout;
- } else {
- options->outfilehandle = fopen(options->outfilename, "w");
- }
- if (options->outfilehandle == NULL) {
- fprintf(stderr, "Error opening source output %s: %s\n",
- options->outfilename,
- strerror(errno));
- return 5;
- }
-
- /* open output header file if required */
- if (options->hdrfilename != NULL) {
- options->hdrfilehandle = fopen(options->hdrfilename, "w");
- if (options->hdrfilehandle == NULL) {
- fprintf(stderr, "Error opening header output %s: %s\n",
- options->hdrfilename,
- strerror(errno));
- /* close and unlink output file */
- fclose(options->outfilehandle);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- return 6;
- }
- } else {
- options->hdrfilehandle = NULL;
- }
-
- /* dump the AST */
- if (options->verbose) {
- genbind_ast_dump(genbind_root, 0);
- }
-
- /* generate output for each binding */
- res = genbind_node_foreach_type(genbind_root,
- GENBIND_NODE_TYPE_BINDING,
- generate_binding,
- genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: output failed with code %d\n", res);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- if (options->hdrfilename != NULL) {
- unlink(options->hdrfilename);
- }
- return res;
- }
-
-
- return 0;
+ int res;
+ struct genbind_node *genbind_root;
+ enum bindingtype_e bindingtype;
+
+ options = process_cmdline(argc, argv);
+ if (options == NULL) {
+ return 1; /* bad commandline */
+ }
+
+ /* parse input and generate dependancy */
+ res = genbind_parsefile(options->infilename, &genbind_root);
+ if (res != 0) {
+ fprintf(stderr, "Error: parse failed with code %d\n", res);
+ return res;
+ }
+
+ /* dump the AST */
+ genbind_dump_ast(genbind_root);
+
+ /* get bindingtype */
+ bindingtype = genbind_get_type(genbind_root);
+ if (bindingtype == BINDINGTYPE_UNKNOWN) {
+ return 3;
+ }
+
+#if 0
+ genbind_load_idl(genbind_root);
+
+ /* generate output for each binding */
+ res = genbind_node_foreach_type(genbind_root,
+ GENBIND_NODE_TYPE_BINDING,
+ generate_binding,
+ genbind_root);
+ if (res != 0) {
+ fprintf(stderr, "Error: output failed with code %d\n", res);
+ if (options->outfilename != NULL) {
+ unlink(options->outfilename);
+ }
+ if (options->hdrfilename != NULL) {
+ unlink(options->hdrfilename);
+ }
+ return res;
+ }
+
+#endif
+ return 0;
}
diff --git a/src/options.h b/src/options.h
index cbac9a3..68a4bc1 100644
--- a/src/options.h
+++ b/src/options.h
@@ -12,16 +12,11 @@
/** global options */
struct options {
char *infilename; /**< binding source */
-
- char *outfilename; /**< output source file */
- FILE *outfilehandle; /**< output file handle */
-
- char *hdrfilename; /**< output header file */
- FILE *hdrfilehandle; /**< output file handle */
-
- char *depfilename; /**< dependancy output*/
- FILE *depfilehandle; /**< dependancy file handle */
-
+ char *outdirname; /**< output directory */
+FILE *hdrfilehandle;
+char *hdrfilename;
+char *outfilename;
+FILE *outfilehandle;
char *idlpath; /**< path to IDL files */
bool verbose; /**< verbose processing */
diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..7bab058
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "options.h"
+#include "utils.h"
+
+FILE *genb_fopen(const char *fname, const char *mode)
+{
+ char *fpath;
+ int fpathl;
+ FILE *filef;
+
+ fpathl = strlen(options->outdirname) + strlen(fname) + 2;
+ fpath = malloc(fpathl);
+ snprintf(fpath, fpathl, "%s/%s", options->outdirname, fname);
+
+ filef = fopen(fpath, mode);
+ if (filef == NULL) {
+ fprintf(stderr, "Error: unable to open file %s (%s)\n",
+ fpath, strerror(errno));
+ free(fpath);
+ return NULL;
+ }
+ free(fpath);
+
+ return filef;
+}
+
+#ifdef NEED_STRNDUP
+
+char *strndup(const char *s, size_t n)
+{
+ size_t len;
+ char *s2;
+
+ for (len = 0; len != n && s[len]; len++)
+ continue;
+
+ s2 = malloc(len + 1);
+ if (!s2)
+ return 0;
+
+ memcpy(s2, s, len);
+ s2[len] = 0;
+ return s2;
+}
+
+#endif
+
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..98a4c6b
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,21 @@
+/* utility helpers
+ *
+ * This file is part of nsnsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_utils_h
+#define nsgenbind_utils_h
+
+FILE *genb_fopen(const char *fname, const char *mode);
+
+#ifdef _WIN32
+#define NEED_STRNDUP 1
+char *strndup(const char *s, size_t n);
+#endif
+
+#define SLEN(x) (sizeof((x)) - 1)
+
+#endif
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
new file mode 100644
index 0000000..c32f6a3
--- /dev/null
+++ b/test/data/bindings/browser-duk.bnd
@@ -0,0 +1,66 @@
+/* Binding for browser using ductape and libdom
+ *
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+binding duk_libdom {
+ webidl "dom.idl";
+ webidl "html.idl";
+ webidl "console.idl";
+
+ preface %{
+ %};
+
+ prologue %{
+ %};
+
+ epilogue %{
+ %};
+
+ postface %{
+ %};
+}
+
+class Node {
+ private "dom_node *" node;
+
+ preface %{
+ %};
+
+ prologue %{
+ %};
+
+ epilogue %{
+ %};
+
+ postface %{
+ %};
+}
+
+init Node("dom_node *" node)
+%{
+ private->node = node;
+ dom_node_ref(node);
+%}
+
+fini Node()
+%{
+ dom_node_unref(private->node);
+%}
+
+method Node::AppendChild()
+%{
+%}
+
+getter Node::aprop()
+%{
+%}
+
+setter Node::aprop()
+%{
+%}
diff --git a/test/data/idl/console.idl b/test/data/idl/console.idl
new file mode 100644
index 0000000..5a3d9eb
--- /dev/null
+++ b/test/data/idl/console.idl
@@ -0,0 +1,24 @@
+// de facto set of features for console object
+// https://developer.mozilla.org/en-US/docs/DOM/console
+// http://msdn.microsoft.com/en-us/library/dd565625%28v=vs.85%29.aspx#consol...
+// 31st October
+// Yay for non-standard standards
+
+interface Console {
+ void debug(DOMString msg, Substitition... subst);
+ void dir(JSObject object);
+ void error(DOMString msg, Substitition... subst);
+ void group();
+ void groupCollapsed();
+ void groupEnd();
+ void info(DOMString msg, Substitition... subst);
+ void log(DOMString msg, Substitition... subst);
+ void time(DOMString timerName);
+ void timeEnd(DOMString timerName);
+ void trace();
+ void warn(DOMString msg, Substitition... subst);
+};
+
+partial interface Window {
+ readonly attribute Console console;
+};
\ No newline at end of file
diff --git a/test/data/idl/dom.idl b/test/data/idl/dom.idl
index 6ba870c..6a4a95e 100644
--- a/test/data/idl/dom.idl
+++ b/test/data/idl/dom.idl
@@ -1,43 +1,10 @@
-// DOM core WebIDL
-// retrived from http://dom.spec.whatwg.org/
-// 23rd October 2012
-
-
-
-exception DOMException {
- const unsigned short INDEX_SIZE_ERR = 1;
- const unsigned short DOMSTRING_SIZE_ERR = 2; // historical
- const unsigned short HIERARCHY_REQUEST_ERR = 3;
- const unsigned short WRONG_DOCUMENT_ERR = 4;
- const unsigned short INVALID_CHARACTER_ERR = 5;
- const unsigned short NO_DATA_ALLOWED_ERR = 6; // historical
- const unsigned short NO_MODIFICATION_ALLOWED_ERR = 7;
- const unsigned short NOT_FOUND_ERR = 8;
- const unsigned short NOT_SUPPORTED_ERR = 9;
- const unsigned short INUSE_ATTRIBUTE_ERR = 10; // historical
- const unsigned short INVALID_STATE_ERR = 11;
- const unsigned short SYNTAX_ERR = 12;
- const unsigned short INVALID_MODIFICATION_ERR = 13;
- const unsigned short NAMESPACE_ERR = 14;
- const unsigned short INVALID_ACCESS_ERR = 15;
- const unsigned short VALIDATION_ERR = 16; // historical
- const unsigned short TYPE_MISMATCH_ERR = 17;
- const unsigned short SECURITY_ERR = 18;
- const unsigned short NETWORK_ERR = 19;
- const unsigned short ABORT_ERR = 20;
- const unsigned short URL_MISMATCH_ERR = 21;
- const unsigned short QUOTA_EXCEEDED_ERR = 22;
- const unsigned short TIMEOUT_ERR = 23;
- const unsigned short INVALID_NODE_TYPE_ERR = 24;
- const unsigned short DATA_CLONE_ERR = 25;
- unsigned short code;
-};
-
-interface DOMError {
- readonly attribute DOMString name;
-};
+// DOM web IDL
+// Retrived from https://dom.spec.whatwg.org/
+// Sat Jul 18 2015
+
-[Constructor(DOMString type, optional EventInit eventInitDict)]
+[Constructor(DOMString type, optional EventInit eventInitDict),
+ Exposed=(Window,Worker)]
interface Event {
readonly attribute DOMString type;
readonly attribute EventTarget? target;
@@ -57,26 +24,30 @@ interface Event {
void preventDefault();
readonly attribute boolean defaultPrevented;
- readonly attribute boolean isTrusted;
+ [Unforgeable] readonly attribute boolean isTrusted;
readonly attribute DOMTimeStamp timeStamp;
void initEvent(DOMString type, boolean bubbles, boolean cancelable);
};
dictionary EventInit {
- boolean bubbles;
- boolean cancelable;
+ boolean bubbles = false;
+ boolean cancelable = false;
};
-[Constructor(DOMString type, optional CustomEventInit eventInitDict)]
+[Constructor(DOMString type, optional CustomEventInit eventInitDict),
+ Exposed=(Window,Worker)]
interface CustomEvent : Event {
readonly attribute any detail;
+
+ void initCustomEvent(DOMString type, boolean bubbles, boolean cancelable, any detail);
};
dictionary CustomEventInit : EventInit {
- any detail;
+ any detail = null;
};
+[Exposed=(Window,Worker)]
interface EventTarget {
void addEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
void removeEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
@@ -87,6 +58,74 @@ callback interface EventListener {
void handleEvent(Event event);
};
+[NoInterfaceObject,
+ Exposed=Window]
+interface NonElementParentNode {
+ Element? getElementById(DOMString elementId);
+};
+Document implements NonElementParentNode;
+DocumentFragment implements NonElementParentNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface ParentNode {
+ [SameObject] readonly attribute HTMLCollection children;
+ readonly attribute Element? firstElementChild;
+ readonly attribute Element? lastElementChild;
+ readonly attribute unsigned long childElementCount;
+
+ [Unscopeable] void prepend((Node or DOMString)... nodes);
+ [Unscopeable] void append((Node or DOMString)... nodes);
+
+ [Unscopeable] Element? query(DOMString relativeSelectors);
+ [NewObject, Unscopeable] Elements queryAll(DOMString relativeSelectors);
+ Element? querySelector(DOMString selectors);
+ [NewObject] NodeList querySelectorAll(DOMString selectors);
+};
+Document implements ParentNode;
+DocumentFragment implements ParentNode;
+Element implements ParentNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface NonDocumentTypeChildNode {
+ readonly attribute Element? previousElementSibling;
+ readonly attribute Element? nextElementSibling;
+};
+Element implements NonDocumentTypeChildNode;
+CharacterData implements NonDocumentTypeChildNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface ChildNode {
+ [Unscopeable] void before((Node or DOMString)... nodes);
+ [Unscopeable] void after((Node or DOMString)... nodes);
+ [Unscopeable] void replaceWith((Node or DOMString)... nodes);
+ [Unscopeable] void remove();
+};
+DocumentType implements ChildNode;
+Element implements ChildNode;
+CharacterData implements ChildNode;
+
+class Elements extends Array {
+ Element? query(DOMString relativeSelectors);
+ Elements queryAll(DOMString relativeSelectors);
+};
+
+[Exposed=Window]
+interface NodeList {
+ getter Node? item(unsigned long index);
+ readonly attribute unsigned long length;
+ iterable<Node>;
+};
+
+[Exposed=Window]
+interface HTMLCollection {
+ readonly attribute unsigned long length;
+ getter Element? item(unsigned long index);
+ getter Element? namedItem(DOMString name);
+};
+
[Constructor(MutationCallback callback)]
interface MutationObserver {
void observe(Node target, MutationObserverInit options);
@@ -97,20 +136,21 @@ interface MutationObserver {
callback MutationCallback = void (sequence<MutationRecord> mutations, MutationObserver observer);
dictionary MutationObserverInit {
- boolean childList;
+ boolean childList = false;
boolean attributes;
boolean characterData;
- boolean subtree;
+ boolean subtree = false;
boolean attributeOldValue;
boolean characterDataOldValue;
sequence<DOMString> attributeFilter;
};
+[Exposed=Window]
interface MutationRecord {
readonly attribute DOMString type;
readonly attribute Node target;
- readonly attribute NodeList addedNodes;
- readonly attribute NodeList removedNodes;
+ [SameObject] readonly attribute NodeList addedNodes;
+ [SameObject] readonly attribute NodeList removedNodes;
readonly attribute Node? previousSibling;
readonly attribute Node? nextSibling;
readonly attribute DOMString? attributeName;
@@ -118,6 +158,7 @@ interface MutationRecord {
readonly attribute DOMString? oldValue;
};
+[Exposed=Window]
interface Node : EventTarget {
const unsigned short ELEMENT_NODE = 1;
const unsigned short ATTRIBUTE_NODE = 2; // historical
@@ -140,7 +181,7 @@ interface Node : EventTarget {
readonly attribute Node? parentNode;
readonly attribute Element? parentElement;
boolean hasChildNodes();
- readonly attribute NodeList childNodes;
+ [SameObject] readonly attribute NodeList childNodes;
readonly attribute Node? firstChild;
readonly attribute Node? lastChild;
readonly attribute Node? previousSibling;
@@ -148,37 +189,40 @@ interface Node : EventTarget {
attribute DOMString? nodeValue;
attribute DOMString? textContent;
- Node insertBefore(Node node, Node? child);
- Node appendChild(Node node);
- Node replaceChild(Node node, Node child);
- Node removeChild(Node child);
void normalize();
-
-Node cloneNode(optional boolean deep = true);
- boolean isEqualNode(Node? node);
+ [NewObject] Node cloneNode(optional boolean deep = false);
+ boolean isEqualNode(Node? otherNode);
const unsigned short DOCUMENT_POSITION_DISCONNECTED = 0x01;
const unsigned short DOCUMENT_POSITION_PRECEDING = 0x02;
const unsigned short DOCUMENT_POSITION_FOLLOWING = 0x04;
const unsigned short DOCUMENT_POSITION_CONTAINS = 0x08;
const unsigned short DOCUMENT_POSITION_CONTAINED_BY = 0x10;
- const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20; // historical
+ const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
unsigned short compareDocumentPosition(Node other);
boolean contains(Node? other);
DOMString? lookupPrefix(DOMString? namespace);
DOMString? lookupNamespaceURI(DOMString? prefix);
boolean isDefaultNamespace(DOMString? namespace);
+
+ Node insertBefore(Node node, Node? child);
+ Node appendChild(Node node);
+ Node replaceChild(Node node, Node child);
+ Node removeChild(Node child);
};
-[Constructor]
+[Constructor,
+ Exposed=Window]
interface Document : Node {
- readonly attribute DOMImplementation implementation;
+ [SameObject] readonly attribute DOMImplementation implementation;
readonly attribute DOMString URL;
readonly attribute DOMString documentURI;
+ readonly attribute DOMString origin;
readonly attribute DOMString compatMode;
readonly attribute DOMString characterSet;
+ readonly attribute DOMString inputEncoding; // legacy alias of .characterSet
readonly attribute DOMString contentType;
readonly attribute DocumentType? doctype;
@@ -186,59 +230,54 @@ interface Document : Node {
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
HTMLCollection getElementsByClassName(DOMString classNames);
- Element? getElementById(DOMString elementId);
- Element createElement(DOMString localName);
- Element createElementNS(DOMString? namespace, DOMString qualifiedName);
- DocumentFragment createDocumentFragment();
- Text createTextNode(DOMString data);
- Comment createComment(DOMString data);
- ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
+ [NewObject] Element createElement(DOMString localName);
+ [NewObject] Element createElementNS(DOMString? namespace, DOMString qualifiedName);
+ [NewObject] DocumentFragment createDocumentFragment();
+ [NewObject] Text createTextNode(DOMString data);
+ [NewObject] Comment createComment(DOMString data);
+ [NewObject] ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
- Node importNode(Node node, optional boolean deep = true);
+ [NewObject] Node importNode(Node node, optional boolean deep = false);
Node adoptNode(Node node);
- Event createEvent(DOMString interface);
+ [NewObject] Attr createAttribute(DOMString localName);
+ [NewObject] Attr createAttributeNS(DOMString? namespace, DOMString name);
- Range createRange();
+ [NewObject] Event createEvent(DOMString interface);
- // NodeFilter.SHOW_ALL = 0xFFFFFFFF
- NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
- TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+ [NewObject] Range createRange();
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
+ // NodeFilter.SHOW_ALL = 0xFFFFFFFF
+ [NewObject] NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+ [NewObject] TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
};
+[Exposed=Window]
interface XMLDocument : Document {};
+[Exposed=Window]
interface DOMImplementation {
- DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
- XMLDocument createDocument(DOMString? namespace, [TreatNullAs=EmptyString] DOMString qualifiedName, DocumentType? doctype);
- Document createHTMLDocument(optional DOMString title);
+ [NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
+ [NewObject] XMLDocument createDocument(DOMString? namespace, [TreatNullAs=EmptyString] DOMString qualifiedName, optional DocumentType? doctype = null);
+ [NewObject] Document createHTMLDocument(optional DOMString title);
- boolean hasFeature(DOMString feature, [TreatNullAs=EmptyString] DOMString version);
+ boolean hasFeature(); // useless; always returns true
};
+[Constructor,
+ Exposed=Window]
interface DocumentFragment : Node {
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
};
+[Exposed=Window]
interface DocumentType : Node {
readonly attribute DOMString name;
readonly attribute DOMString publicId;
readonly attribute DOMString systemId;
-
- // NEW
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
};
+[Exposed=Window]
interface Element : Node {
readonly attribute DOMString? namespaceURI;
readonly attribute DOMString? prefix;
@@ -247,9 +286,10 @@ interface Element : Node {
attribute DOMString id;
attribute DOMString className;
- readonly attribute DOMTokenList classList;
+ [SameObject] readonly attribute DOMTokenList classList;
- readonly attribute Attr[] attributes;
+ boolean hasAttributes();
+ [SameObject] readonly attribute NamedNodeMap attributes;
DOMString? getAttribute(DOMString name);
DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
void setAttribute(DOMString name, DOMString value);
@@ -259,36 +299,46 @@ interface Element : Node {
boolean hasAttribute(DOMString name);
boolean hasAttributeNS(DOMString? namespace, DOMString localName);
+ Attr? getAttributeNode(DOMString name);
+ Attr? getAttributeNodeNS(DOMString? namespace, DOMString localName);
+ Attr? setAttributeNode(Attr attr);
+ Attr? setAttributeNodeNS(Attr attr);
+ Attr removeAttributeNode(Attr attr);
+
+ Element? closest(DOMString selectors);
+ boolean matches(DOMString selectors);
+
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
HTMLCollection getElementsByClassName(DOMString classNames);
-
- readonly attribute HTMLCollection children;
- readonly attribute Element? firstElementChild;
- readonly attribute Element? lastElementChild;
- readonly attribute Element? previousElementSibling;
- readonly attribute Element? nextElementSibling;
- readonly attribute unsigned long childElementCount;
-
-
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
+};
+[Exposed=Window]
+interface NamedNodeMap {
+ readonly attribute unsigned long length;
+ getter Attr? item(unsigned long index);
+ getter Attr? getNamedItem(DOMString name);
+ Attr? getNamedItemNS(DOMString? namespace, DOMString localName);
+ Attr? setNamedItem(Attr attr);
+ Attr? setNamedItemNS(Attr attr);
+ Attr removeNamedItem(DOMString name);
+ Attr removeNamedItemNS(DOMString? namespace, DOMString localName);
};
+[Exposed=Window]
interface Attr {
- readonly attribute DOMString name;
- attribute DOMString value;
-
readonly attribute DOMString? namespaceURI;
readonly attribute DOMString? prefix;
readonly attribute DOMString localName;
-};
+ readonly attribute DOMString name;
+ attribute DOMString value;
+ [TreatNullAs=EmptyString] attribute DOMString nodeValue; // legacy alias of .value
+ [TreatNullAs=EmptyString] attribute DOMString textContent; // legacy alias of .value
+
+ readonly attribute Element? ownerElement;
+ readonly attribute boolean specified; // useless; always returns true
+};
+[Exposed=Window]
interface CharacterData : Node {
[TreatNullAs=EmptyString] attribute DOMString data;
readonly attribute unsigned long length;
@@ -297,26 +347,25 @@ interface CharacterData : Node {
void insertData(unsigned long offset, DOMString data);
void deleteData(unsigned long offset, unsigned long count);
void replaceData(unsigned long offset, unsigned long count, DOMString data);
-
- // NEW
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
};
+[Constructor(optional DOMString data = ""),
+ Exposed=Window]
interface Text : CharacterData {
- Text splitText(unsigned long offset);
+ [NewObject] Text splitText(unsigned long offset);
readonly attribute DOMString wholeText;
};
-
+[Exposed=Window]
interface ProcessingInstruction : CharacterData {
readonly attribute DOMString target;
};
-
+[Constructor(optional DOMString data = ""),
+ Exposed=Window]
interface Comment : CharacterData {
};
+[Constructor,
+ Exposed=Window]
interface Range {
readonly attribute Node startContainer;
readonly attribute unsigned long startOffset;
@@ -325,15 +374,15 @@ interface Range {
readonly attribute boolean collapsed;
readonly attribute Node commonAncestorContainer;
- void setStart(Node refNode, unsigned long offset);
- void setEnd(Node refNode, unsigned long offset);
- void setStartBefore(Node refNode);
- void setStartAfter(Node refNode);
- void setEndBefore(Node refNode);
- void setEndAfter(Node refNode);
- void collapse(boolean toStart);
- void selectNode(Node refNode);
- void selectNodeContents(Node refNode);
+ void setStart(Node node, unsigned long offset);
+ void setEnd(Node node, unsigned long offset);
+ void setStartBefore(Node node);
+ void setStartAfter(Node node);
+ void setEndBefore(Node node);
+ void setEndAfter(Node node);
+ void collapse(optional boolean toStart = false);
+ void selectNode(Node node);
+ void selectNodeContents(Node node);
const unsigned short START_TO_START = 0;
const unsigned short START_TO_END = 1;
@@ -342,12 +391,12 @@ interface Range {
short compareBoundaryPoints(unsigned short how, Range sourceRange);
void deleteContents();
- DocumentFragment extractContents();
- DocumentFragment cloneContents();
+ [NewObject] DocumentFragment extractContents();
+ [NewObject] DocumentFragment cloneContents();
void insertNode(Node node);
void surroundContents(Node newParent);
- Range cloneRange();
+ [NewObject] Range cloneRange();
void detach();
boolean isPointInRange(Node node, unsigned long offset);
@@ -358,9 +407,10 @@ interface Range {
stringifier;
};
+[Exposed=Window]
interface NodeIterator {
- readonly attribute Node root;
- readonly attribute Node? referenceNode;
+ [SameObject] readonly attribute Node root;
+ readonly attribute Node referenceNode;
readonly attribute boolean pointerBeforeReferenceNode;
readonly attribute unsigned long whatToShow;
readonly attribute NodeFilter? filter;
@@ -371,11 +421,11 @@ interface NodeIterator {
void detach();
};
+[Exposed=Window]
interface TreeWalker {
- readonly attribute Node root;
+ [SameObject] readonly attribute Node root;
readonly attribute unsigned long whatToShow;
readonly attribute NodeFilter? filter;
-
attribute Node currentNode;
Node? parentNode();
@@ -386,7 +436,7 @@ interface TreeWalker {
Node? previousNode();
Node? nextNode();
};
-
+[Exposed=Window]
callback interface NodeFilter {
// Constants for acceptNode()
const unsigned short FILTER_ACCEPT = 1;
@@ -411,25 +461,6 @@ callback interface NodeFilter {
unsigned short acceptNode(Node node);
};
-[ArrayClass]
-interface NodeList {
- getter Node? item(unsigned long index);
- readonly attribute unsigned long length;
-};
-
-interface HTMLCollection {
- readonly attribute unsigned long length;
- getter Element? item(unsigned long index);
- getter object? namedItem(DOMString name); // only returns Element
-};
-
-[NoInterfaceObject]
-interface DOMStringList {
- readonly attribute unsigned long length;
- getter DOMString? item(unsigned long index);
- boolean contains(DOMString string);
-};
-
interface DOMTokenList {
readonly attribute unsigned long length;
getter DOMString? item(unsigned long index);
@@ -438,9 +469,11 @@ interface DOMTokenList {
void remove(DOMString... tokens);
boolean toggle(DOMString token, optional boolean force);
stringifier;
+ iterable<DOMString>;
};
interface DOMSettableTokenList : DOMTokenList {
attribute DOMString value;
};
+
diff --git a/test/data/idl/html.idl b/test/data/idl/html.idl
index d4264c5..62d4967 100644
--- a/test/data/idl/html.idl
+++ b/test/data/idl/html.idl
@@ -1,37 +1,44 @@
-// HTML WebIDL
-// retrived from http://www.whatwg.org/specs/web-apps/current-work/
-// 23rd October 2012
+// HTML web IDL
+// Retrived from https://html.spec.whatwg.org/
+// Sat Jul 18 2015
+typedef (Int8Array or Uint8Array or Uint8ClampedArray or
+ Int16Array or Uint16Array or
+ Int32Array or Uint32Array or
+ Float32Array or Float64Array or
+ DataView) ArrayBufferView;
+
interface HTMLAllCollection : HTMLCollection {
- // inherits length and item()
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
- HTMLAllCollection tags(DOMString tagName);
+ // inherits length and 'getter'
+ Element? item(unsigned long index);
+ (HTMLCollection or Element)? item(DOMString name);
+ legacycaller getter (HTMLCollection or Element)? namedItem(DOMString name); // shadows inherited namedItem()
};
interface HTMLFormControlsCollection : HTMLCollection {
// inherits length and item()
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
+ legacycaller getter (RadioNodeList or Element)? namedItem(DOMString name); // shadows inherited namedItem()
};
interface RadioNodeList : NodeList {
- attribute DOMString value;
+ attribute DOMString value;
};
interface HTMLOptionsCollection : HTMLCollection {
// inherits item()
- attribute unsigned long length; // overrides inherited length
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
+ attribute unsigned long length; // shadows inherited length
+ legacycaller HTMLOptionElement? (DOMString name);
setter creator void (unsigned long index, HTMLOptionElement? option);
void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
void remove(long index);
- attribute long selectedIndex;
+ attribute long selectedIndex;
};
interface HTMLPropertiesCollection : HTMLCollection {
// inherits length and item()
- getter PropertyNodeList? namedItem(DOMString name); // overrides inherited namedItem()
- readonly attribute DOMString[] names;
+ getter PropertyNodeList? namedItem(DOMString name); // shadows inherited namedItem()
+ [SameObject] readonly attribute DOMString[] names;
};
typedef sequence<any> PropertyValueArray;
@@ -40,52 +47,55 @@ interface PropertyNodeList : NodeList {
PropertyValueArray getValues();
};
+[OverrideBuiltins, Exposed=(Window,Worker)]
interface DOMStringMap {
getter DOMString (DOMString name);
- setter void (DOMString name, DOMString value);
- creator void (DOMString name, DOMString value);
+ setter creator void (DOMString name, DOMString value);
deleter void (DOMString name);
};
interface DOMElementMap {
getter Element (DOMString name);
- setter void (DOMString name, Element value);
- creator void (DOMString name, Element value);
+ setter creator void (DOMString name, Element value);
deleter void (DOMString name);
};
-[NoInterfaceObject]
-interface Transferable { };
+typedef (ArrayBuffer or CanvasProxy or MessagePort) Transferable;
+
+callback FileCallback = void (File file);
+
+enum DocumentReadyState { "loading", "interactive", "complete" };
[OverrideBuiltins]
-partial interface Document {
+partial /*sealed*/ interface Document {
// resource metadata management
- [PutForwards=href] readonly attribute Location? location;
- attribute DOMString domain;
+ [PutForwards=href, Unforgeable] readonly attribute Location? location;
+ attribute DOMString domain;
readonly attribute DOMString referrer;
- attribute DOMString cookie;
+ attribute DOMString cookie;
readonly attribute DOMString lastModified;
- readonly attribute DOMString readyState;
+ readonly attribute DocumentReadyState readyState;
// DOM tree accessors
getter object (DOMString name);
- attribute DOMString title;
- attribute DOMString dir;
- attribute HTMLElement? body;
+ attribute DOMString title;
+ attribute DOMString dir;
+ attribute HTMLElement? body;
readonly attribute HTMLHeadElement? head;
- readonly attribute HTMLCollection images;
- readonly attribute HTMLCollection embeds;
- readonly attribute HTMLCollection plugins;
- readonly attribute HTMLCollection links;
- readonly attribute HTMLCollection forms;
- readonly attribute HTMLCollection scripts;
+ [SameObject] readonly attribute HTMLCollection images;
+ [SameObject] readonly attribute HTMLCollection embeds;
+ [SameObject] readonly attribute HTMLCollection plugins;
+ [SameObject] readonly attribute HTMLCollection links;
+ [SameObject] readonly attribute HTMLCollection forms;
+ [SameObject] readonly attribute HTMLCollection scripts;
NodeList getElementsByName(DOMString elementName);
- NodeList getItems(optional DOMString typeNames); // microdata
- readonly attribute DOMElementMap cssElementMap;
+ NodeList getItems(optional DOMString typeNames = ""); // microdata
+ [SameObject] readonly attribute DOMElementMap cssElementMap;
+ readonly attribute HTMLScriptElement? currentScript;
// dynamic markup insertion
- Document open(optional DOMString type, optional DOMString replace);
- WindowProxy open(DOMString url, DOMString name, DOMString features, optional boolean replace);
+ Document open(optional DOMString type = "text/html", optional DOMString replace = "");
+ WindowProxy open(DOMString url, DOMString name, DOMString features, optional boolean replace = false);
void close();
void write(DOMString... text);
void writeln(DOMString... text);
@@ -94,10 +104,8 @@ partial interface Document {
readonly attribute WindowProxy? defaultView;
readonly attribute Element? activeElement;
boolean hasFocus();
- attribute DOMString designMode;
- boolean execCommand(DOMString commandId);
- boolean execCommand(DOMString commandId, boolean showUI);
- boolean execCommand(DOMString commandId, boolean showUI, DOMString value);
+ attribute DOMString designMode;
+ boolean execCommand(DOMString commandId, optional boolean showUI = false, optional DOMString value = "");
boolean queryCommandEnabled(DOMString commandId);
boolean queryCommandIndeterm(DOMString commandId);
boolean queryCommandState(DOMString commandId);
@@ -105,66 +113,12 @@ partial interface Document {
DOMString queryCommandValue(DOMString commandId);
readonly attribute HTMLCollection commands;
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
-
// special event handler IDL attributes that only apply to Document objects
[LenientThis] attribute EventHandler onreadystatechange;
+
+ // also has obsolete members
};
+Document implements GlobalEventHandlers;
partial interface XMLDocument {
boolean load(DOMString url);
@@ -172,35 +126,33 @@ partial interface XMLDocument {
interface HTMLElement : Element {
// metadata attributes
- attribute DOMString title;
- attribute DOMString lang;
- attribute boolean translate;
- attribute DOMString dir;
- readonly attribute DOMStringMap dataset;
+ attribute DOMString title;
+ attribute DOMString lang;
+ attribute boolean translate;
+ attribute DOMString dir;
+ [SameObject] readonly attribute DOMStringMap dataset;
// microdata
- attribute boolean itemScope;
+ attribute boolean itemScope;
[PutForwards=value] readonly attribute DOMSettableTokenList itemType;
- attribute DOMString itemId;
+ attribute DOMString itemId;
[PutForwards=value] readonly attribute DOMSettableTokenList itemRef;
[PutForwards=value] readonly attribute DOMSettableTokenList itemProp;
readonly attribute HTMLPropertiesCollection properties;
- attribute any itemValue; // acts as DOMString on setting
+ attribute any itemValue; // acts as DOMString on setting
// user interaction
- attribute boolean hidden;
+ attribute boolean hidden;
void click();
- attribute long tabIndex;
+ attribute long tabIndex;
void focus();
void blur();
- attribute DOMString accessKey;
+ attribute DOMString accessKey;
readonly attribute DOMString accessKeyLabel;
- attribute boolean draggable;
+ attribute boolean draggable;
[PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
- attribute DOMString contentEditable;
- readonly attribute boolean isContentEditable;
- attribute HTMLMenuElement? contextMenu;
- attribute boolean spellcheck;
+ attribute HTMLMenuElement? contextMenu;
+ attribute boolean spellcheck;
void forceSpellCheck();
// command API
@@ -210,217 +162,157 @@ interface HTMLElement : Element {
readonly attribute boolean? commandHidden;
readonly attribute boolean? commandDisabled;
readonly attribute boolean? commandChecked;
-
- // styling
- readonly attribute CSSStyleDeclaration style;
-
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
};
+HTMLElement implements GlobalEventHandlers;
+HTMLElement implements ElementContentEditable;
interface HTMLUnknownElement : HTMLElement { };
-interface HTMLHtmlElement : HTMLElement {};
+interface HTMLHtmlElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLHeadElement : HTMLElement {};
interface HTMLTitleElement : HTMLElement {
- attribute DOMString text;
+ attribute DOMString text;
};
interface HTMLBaseElement : HTMLElement {
- attribute DOMString href;
- attribute DOMString target;
+ attribute DOMString href;
+ attribute DOMString target;
};
interface HTMLLinkElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString href;
- attribute DOMString rel;
+ attribute DOMString href;
+ attribute DOMString? crossOrigin;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString media;
+ attribute DOMString hreflang;
+ attribute DOMString type;
[PutForwards=value] readonly attribute DOMSettableTokenList sizes;
+
+ // also has obsolete members
};
HTMLLinkElement implements LinkStyle;
interface HTMLMetaElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString httpEquiv;
- attribute DOMString content;
+ attribute DOMString name;
+ attribute DOMString httpEquiv;
+ attribute DOMString content;
+
+ // also has obsolete members
};
interface HTMLStyleElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString media;
- attribute DOMString type;
- attribute boolean scoped;
+ attribute DOMString media;
+ attribute DOMString type;
+ attribute boolean scoped;
};
HTMLStyleElement implements LinkStyle;
-interface HTMLScriptElement : HTMLElement {
- attribute DOMString src;
- attribute boolean async;
- attribute boolean defer;
- attribute DOMString type;
- attribute DOMString charset;
- attribute DOMString text;
+interface HTMLBodyElement : HTMLElement {
+
+ // also has obsolete members
};
+HTMLBodyElement implements WindowEventHandlers;
-interface HTMLBodyElement : HTMLElement {
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler onload;
- attribute EventHandler onmessage;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpopstate;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onstorage;
- attribute EventHandler onunload;
-};
-
-interface HTMLHeadingElement : HTMLElement {};
-
-interface HTMLParagraphElement : HTMLElement {};
-
-interface HTMLHRElement : HTMLElement {};
-
-interface HTMLPreElement : HTMLElement {};
+interface HTMLHeadingElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLParagraphElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLHRElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLPreElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLQuoteElement : HTMLElement {
- attribute DOMString cite;
+ attribute DOMString cite;
};
interface HTMLOListElement : HTMLElement {
- attribute boolean reversed;
- attribute long start;
- attribute DOMString type;
+ attribute boolean reversed;
+ attribute long start;
+ attribute DOMString type;
+
+ // also has obsolete members
};
-interface HTMLUListElement : HTMLElement {};
+interface HTMLUListElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLLIElement : HTMLElement {
- attribute long value;
+ attribute long value;
+
+ // also has obsolete members
};
-interface HTMLDListElement : HTMLElement {};
+interface HTMLDListElement : HTMLElement {
+ // also has obsolete members
+};
-interface HTMLDivElement : HTMLElement {};
+interface HTMLDivElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLAnchorElement : HTMLElement {
- stringifier attribute DOMString href;
- attribute DOMString target;
-
- attribute DOMString download;
- attribute DOMString ping;
-
- attribute DOMString rel;
+ attribute DOMString target;
+ attribute DOMString download;
+ [PutForwards=value] attribute DOMSettableTokenList ping;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString hreflang;
+ attribute DOMString type;
- attribute DOMString text;
+ attribute DOMString text;
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ // also has obsolete members
};
+HTMLAnchorElement implements URLUtils;
interface HTMLDataElement : HTMLElement {
- attribute DOMString value;
+ attribute DOMString value;
};
interface HTMLTimeElement : HTMLElement {
- attribute DOMString datetime;
+ attribute DOMString dateTime;
};
interface HTMLSpanElement : HTMLElement {};
-interface HTMLBRElement : HTMLElement {};
+interface HTMLBRElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLModElement : HTMLElement {
- attribute DOMString cite;
- attribute DOMString dateTime;
+ attribute DOMString cite;
+ attribute DOMString dateTime;
+};
+
+interface HTMLPictureElement : HTMLElement {};
+
+partial interface HTMLSourceElement {
+ attribute DOMString srcset;
+ attribute DOMString sizes;
+ attribute DOMString media;
};
-[NamedConstructor=Image(),
- NamedConstructor=Image(unsigned long width),
- NamedConstructor=Image(unsigned long width, unsigned long height)]
+[NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
interface HTMLImageElement : HTMLElement {
attribute DOMString alt;
attribute DOMString src;
attribute DOMString srcset;
- attribute DOMString crossOrigin;
+ attribute DOMString sizes;
+ attribute DOMString? crossOrigin;
attribute DOMString useMap;
attribute boolean isMap;
attribute unsigned long width;
@@ -428,78 +320,94 @@ interface HTMLImageElement : HTMLElement {
readonly attribute unsigned long naturalWidth;
readonly attribute unsigned long naturalHeight;
readonly attribute boolean complete;
+ readonly attribute DOMString currentSrc;
+
+ // also has obsolete members
};
interface HTMLIFrameElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString srcdoc;
- attribute DOMString name;
+ attribute DOMString src;
+ attribute DOMString srcdoc;
+ attribute DOMString name;
[PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
- attribute boolean seamless;
- attribute DOMString width;
- attribute DOMString height;
+ attribute boolean seamless;
+ attribute boolean allowFullscreen;
+ attribute DOMString width;
+ attribute DOMString height;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
+ Document? getSVGDocument();
+
+ // also has obsolete members
};
interface HTMLEmbedElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString type;
- attribute DOMString width;
- attribute DOMString height;
+ attribute DOMString src;
+ attribute DOMString type;
+ attribute DOMString width;
+ attribute DOMString height;
+ Document? getSVGDocument();
legacycaller any (any... arguments);
+
+ // also has obsolete members
};
interface HTMLObjectElement : HTMLElement {
- attribute DOMString data;
- attribute DOMString type;
- attribute boolean typeMustMatch;
- attribute DOMString name;
- attribute DOMString useMap;
+ attribute DOMString data;
+ attribute DOMString type;
+ attribute boolean typeMustMatch;
+ attribute DOMString name;
+ attribute DOMString useMap;
readonly attribute HTMLFormElement? form;
- attribute DOMString width;
- attribute DOMString height;
+ attribute DOMString width;
+ attribute DOMString height;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
+ Document? getSVGDocument();
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
legacycaller any (any... arguments);
+
+ // also has obsolete members
};
interface HTMLParamElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString value;
+ attribute DOMString name;
+ attribute DOMString value;
+
+ // also has obsolete members
};
interface HTMLVideoElement : HTMLMediaElement {
- attribute unsigned long width;
- attribute unsigned long height;
+ attribute unsigned long width;
+ attribute unsigned long height;
readonly attribute unsigned long videoWidth;
readonly attribute unsigned long videoHeight;
- attribute DOMString poster;
+ attribute DOMString poster;
};
-[NamedConstructor=Audio(),
- NamedConstructor=Audio(DOMString src)]
+[NamedConstructor=Audio(optional DOMString src)]
interface HTMLAudioElement : HTMLMediaElement {};
interface HTMLSourceElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString type;
- attribute DOMString media;
+ attribute DOMString src;
+ attribute DOMString type;
+
+ // also has obsolete members
};
interface HTMLTrackElement : HTMLElement {
- attribute DOMString kind;
- attribute DOMString src;
- attribute DOMString srclang;
- attribute DOMString label;
- attribute boolean default;
+ attribute DOMString kind;
+ attribute DOMString src;
+ attribute DOMString srclang;
+ attribute DOMString label;
+ attribute boolean default;
const unsigned short NONE = 0;
const unsigned short LOADING = 1;
@@ -510,24 +418,27 @@ interface HTMLTrackElement : HTMLElement {
readonly attribute TextTrack track;
};
+enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" };
+typedef (MediaStream or MediaSource or Blob) MediaProvider;
interface HTMLMediaElement : HTMLElement {
// error state
readonly attribute MediaError? error;
// network state
- attribute DOMString src;
+ attribute DOMString src;
+ attribute MediaProvider? srcObject;
readonly attribute DOMString currentSrc;
- attribute DOMString crossOrigin;
+ attribute DOMString? crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
const unsigned short NETWORK_LOADING = 2;
const unsigned short NETWORK_NO_SOURCE = 3;
readonly attribute unsigned short networkState;
- attribute DOMString preload;
+ attribute DOMString preload;
readonly attribute TimeRanges buffered;
void load();
- DOMString canPlayType(DOMString type);
+ CanPlayTypeResult canPlayType(DOMString type);
// ready state
const unsigned short HAVE_NOTHING = 0;
@@ -539,36 +450,36 @@ interface HTMLMediaElement : HTMLElement {
readonly attribute boolean seeking;
// playback state
- attribute double currentTime;
+ attribute double currentTime;
void fastSeek(double time);
readonly attribute unrestricted double duration;
- readonly attribute Date startDate;
+ Date getStartDate();
readonly attribute boolean paused;
- attribute double defaultPlaybackRate;
- attribute double playbackRate;
+ attribute double defaultPlaybackRate;
+ attribute double playbackRate;
readonly attribute TimeRanges played;
readonly attribute TimeRanges seekable;
readonly attribute boolean ended;
- attribute boolean autoplay;
- attribute boolean loop;
+ attribute boolean autoplay;
+ attribute boolean loop;
void play();
void pause();
// media controller
- attribute DOMString mediaGroup;
- attribute MediaController? controller;
+ attribute DOMString mediaGroup;
+ attribute MediaController? controller;
// controls
- attribute boolean controls;
- attribute double volume;
- attribute boolean muted;
- attribute boolean defaultMuted;
+ attribute boolean controls;
+ attribute double volume;
+ attribute boolean muted;
+ attribute boolean defaultMuted;
// tracks
- readonly attribute AudioTrackList audioTracks;
- readonly attribute VideoTrackList videoTracks;
- readonly attribute TextTrackList textTracks;
- TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
+ [SameObject] readonly attribute AudioTrackList audioTracks;
+ [SameObject] readonly attribute VideoTrackList videoTracks;
+ [SameObject] readonly attribute TextTrackList textTracks;
+ TextTrack addTextTrack(TextTrackKind kind, optional DOMString label = "", optional DOMString language = "");
};
interface MediaError {
@@ -584,9 +495,9 @@ interface AudioTrackList : EventTarget {
getter AudioTrack (unsigned long index);
AudioTrack? getTrackById(DOMString id);
- attribute EventHandler onchange;
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
interface AudioTrack {
@@ -594,7 +505,7 @@ interface AudioTrack {
readonly attribute DOMString kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
- attribute boolean enabled;
+ attribute boolean enabled;
};
interface VideoTrackList : EventTarget {
@@ -603,9 +514,9 @@ interface VideoTrackList : EventTarget {
VideoTrack? getTrackById(DOMString id);
readonly attribute long selectedIndex;
- attribute EventHandler onchange;
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
interface VideoTrack {
@@ -613,7 +524,7 @@ interface VideoTrack {
readonly attribute DOMString kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
- attribute boolean selected;
+ attribute boolean selected;
};
enum MediaControllerPlaybackState { "waiting", "playing", "ended" };
@@ -624,7 +535,7 @@ interface MediaController : EventTarget {
readonly attribute TimeRanges buffered;
readonly attribute TimeRanges seekable;
readonly attribute unrestricted double duration;
- attribute double currentTime;
+ attribute double currentTime;
readonly attribute boolean paused;
readonly attribute MediaControllerPlaybackState playbackState;
@@ -633,45 +544,50 @@ interface MediaController : EventTarget {
void unpause();
void play(); // calls play() on all media elements as well
- attribute double defaultPlaybackRate;
- attribute double playbackRate;
+ attribute double defaultPlaybackRate;
+ attribute double playbackRate;
- attribute double volume;
- attribute boolean muted;
+ attribute double volume;
+ attribute boolean muted;
- attribute EventHandler onemptied;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadeddata;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onplaying;
- attribute EventHandler onended;
- attribute EventHandler onwaiting;
+ attribute EventHandler onemptied;
+ attribute EventHandler onloadedmetadata;
+ attribute EventHandler onloadeddata;
+ attribute EventHandler oncanplay;
+ attribute EventHandler oncanplaythrough;
+ attribute EventHandler onplaying;
+ attribute EventHandler onended;
+ attribute EventHandler onwaiting;
- attribute EventHandler ondurationchange;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onplay;
- attribute EventHandler onpause;
- attribute EventHandler onratechange;
- attribute EventHandler onvolumechange;
+ attribute EventHandler ondurationchange;
+ attribute EventHandler ontimeupdate;
+ attribute EventHandler onplay;
+ attribute EventHandler onpause;
+ attribute EventHandler onratechange;
+ attribute EventHandler onvolumechange;
};
interface TextTrackList : EventTarget {
readonly attribute unsigned long length;
getter TextTrack (unsigned long index);
+ TextTrack? getTrackById(DOMString id);
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
-enum TextTrackMode { "disabled", "hidden", "showing" };
+enum TextTrackMode { "disabled", "hidden", "showing" };
+enum TextTrackKind { "subtitles", "captions", "descriptions", "chapters", "metadata" };
interface TextTrack : EventTarget {
- readonly attribute DOMString kind;
+ readonly attribute TextTrackKind kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
+
+ readonly attribute DOMString id;
readonly attribute DOMString inBandMetadataTrackDispatchType;
- attribute TextTrackMode mode;
+ attribute TextTrackMode mode;
readonly attribute TextTrackCueList? cues;
readonly attribute TextTrackCueList? activeCues;
@@ -679,7 +595,7 @@ interface TextTrack : EventTarget {
void addCue(TextTrackCue cue);
void removeCue(TextTrackCue cue);
- attribute EventHandler oncuechange;
+ attribute EventHandler oncuechange;
};
interface TextTrackCueList {
@@ -688,26 +604,16 @@ interface TextTrackCueList {
TextTrackCue? getCueById(DOMString id);
};
-enum AutoKeyword { "auto" };
-[Constructor(double startTime, double endTime, DOMString text)]
interface TextTrackCue : EventTarget {
readonly attribute TextTrack? track;
- attribute DOMString id;
- attribute double startTime;
- attribute double endTime;
- attribute boolean pauseOnExit;
- attribute DOMString vertical;
- attribute boolean snapToLines;
- attribute (long or AutoKeyword) line;
- attribute long position;
- attribute long size;
- attribute DOMString align;
- attribute DOMString text;
- DocumentFragment getCueAsHTML();
+ attribute DOMString id;
+ attribute double startTime;
+ attribute double endTime;
+ attribute boolean pauseOnExit;
- attribute EventHandler onenter;
- attribute EventHandler onexit;
+ attribute EventHandler onenter;
+ attribute EventHandler onexit;
};
interface TimeRanges {
@@ -718,465 +624,254 @@ interface TimeRanges {
[Constructor(DOMString type, optional TrackEventInit eventInitDict)]
interface TrackEvent : Event {
- readonly attribute object? track;
+ readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
};
dictionary TrackEventInit : EventInit {
- object? track;
-};
-
-interface HTMLCanvasElement : HTMLElement {
- attribute unsigned long width;
- attribute unsigned long height;
-
- DOMString toDataURL(optional DOMString type, any... arguments);
- DOMString toDataURLHD(optional DOMString type, any... arguments);
- void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
- void toBlobHD(FileCallback? _callback, optional DOMString type, any... arguments);
-
- object? getContext(DOMString contextId, any... arguments);
- boolean supportsContext(DOMString contextId, any... arguments);
-};
-
-interface CanvasRenderingContext2D {
-
- // back-reference to the canvas
- readonly attribute HTMLCanvasElement canvas;
-
- // state
- void save(); // push state on state stack
- void restore(); // pop state stack and restore state
-
- // transformations (default transform is the identity matrix)
- attribute SVGMatrix currentTransform;
- void scale(unrestricted double x, unrestricted double y);
- void rotate(unrestricted double angle);
- void translate(unrestricted double x, unrestricted double y);
- void transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
- void setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
- void resetTransform();
-
- // compositing
- attribute unrestricted double globalAlpha; // (default 1.0)
- attribute DOMString globalCompositeOperation; // (default source-over)
-
- // image smoothing
- attribute boolean imageSmoothingEnabled; // (default true)
-
- // colors and styles (see also the CanvasDrawingStyles interface)
- attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
- attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
- CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
- CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
- CanvasPattern createPattern((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, DOMString repetition);
-
- // shadows
- attribute unrestricted double shadowOffsetX; // (default 0)
- attribute unrestricted double shadowOffsetY; // (default 0)
- attribute unrestricted double shadowBlur; // (default 0)
- attribute DOMString shadowColor; // (default transparent black)
-
- // rects
- void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-
- // path API (see also CanvasPathMethods)
- void beginPath();
- void fill();
- void fill(Path path);
- void stroke();
- void stroke(Path path);
- void drawSystemFocusRing(Element element);
- void drawSystemFocusRing(Path path, Element element);
- boolean drawCustomFocusRing(Element element);
- boolean drawCustomFocusRing(Path path, Element element);
- void scrollPathIntoView();
- void scrollPathIntoView(Path path);
- void clip();
- void clip(Path path);
- void resetClip();
- boolean isPointInPath(unrestricted double x, unrestricted double y);
- boolean isPointInPath(Path path, unrestricted double x, unrestricted double y);
-
- // text (see also the CanvasDrawingStyles interface)
- void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- TextMetrics measureText(DOMString text);
-
- // drawing images
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double dx, unrestricted double dy);
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
-
- // hit regions
- void addHitRegion(HitRegionOptions options);
- void removeHitRegion(HitRegionOptions options);
-
- // pixel manipulation
- ImageData createImageData(double sw, double sh);
- ImageData createImageData(ImageData imagedata);
- ImageData createImageDataHD(double sw, double sh);
- ImageData getImageData(double sx, double sy, double sw, double sh);
- ImageData getImageDataHD(double sx, double sy, double sw, double sh);
- void putImageData(ImageData imagedata, double dx, double dy);
- void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
- void putImageDataHD(ImageData imagedata, double dx, double dy);
- void putImageDataHD(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
-};
-CanvasRenderingContext2D implements CanvasDrawingStyles;
-CanvasRenderingContext2D implements CanvasPathMethods;
-
-[NoInterfaceObject]
-interface CanvasDrawingStyles {
- // line caps/joins
- attribute unrestricted double lineWidth; // (default 1)
- attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
- attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
- attribute unrestricted double miterLimit; // (default 10)
-
- // dashed lines
- void setLineDash(sequence<unrestricted double> segments); // default empty
- sequence<unrestricted double> getLineDash();
- attribute unrestricted double lineDashOffset;
-
- // text
- attribute DOMString font; // (default 10px sans-serif)
- attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
- attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
-};
-
-[NoInterfaceObject]
-interface CanvasPathMethods {
- // shared path API methods
- void closePath();
- void moveTo(unrestricted double x, unrestricted double y);
- void lineTo(unrestricted double x, unrestricted double y);
- void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
- void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
- void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
- void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation);
- void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
- void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, boolean anticlockwise);
-};
-
-interface CanvasGradient {
- // opaque object
- void addColorStop(double offset, DOMString color);
-};
-
-interface CanvasPattern {
- // opaque object
- void setTransform(SVGMatrix transform);
-};
-
-interface TextMetrics {
- // x-direction
- readonly attribute double width; // advance width
- readonly attribute double actualBoundingBoxLeft;
- readonly attribute double actualBoundingBoxRight;
-
- // y-direction
- readonly attribute double fontBoundingBoxAscent;
- readonly attribute double fontBoundingBoxDescent;
- readonly attribute double actualBoundingBoxAscent;
- readonly attribute double actualBoundingBoxDescent;
- readonly attribute double emHeightAscent;
- readonly attribute double emHeightDescent;
- readonly attribute double hangingBaseline;
- readonly attribute double alphabeticBaseline;
- readonly attribute double ideographicBaseline;
-};
-
-dictionary HitRegionOptions {
- Path? path = null;
- DOMString id = "";
- DOMString? parentID = null;
- DOMString cursor = "inherit";
- // for control-backed regions:
- Element? control = null;
- // for unbacked regions:
- DOMString? label = null;
- DOMString? role = null;
-};
-
-interface ImageData {
- readonly attribute unsigned long width;
- readonly attribute unsigned long height;
- readonly attribute Uint8ClampedArray data;
-};
-
-[Constructor(optional Element scope)]
-interface DrawingStyle { };
-DrawingStyle implements CanvasDrawingStyles;
-
-[Constructor,
- Constructor(Path path),
- Constructor(DOMString d)]
-interface Path {
- void addPath(Path path, SVGMatrix? transformation);
- void addPathByStrokingPath(Path path, CanvasDrawingStyles styles, SVGMatrix? transformation);
- void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path path, optional unrestricted double maxWidth);
- void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path path, optional unrestricted double maxWidth);
-};
-Path implements CanvasPathMethods;
-
-partial interface Screen {
- readonly attribute double canvasResolution;
-};
-
-partial interface MouseEvent {
- readonly attribute DOMString? region;
-};
-
-partial dictionary MouseEventInit {
- DOMString? region;
+ (VideoTrack or AudioTrack or TextTrack)? track;
};
interface HTMLMapElement : HTMLElement {
- attribute DOMString name;
+ attribute DOMString name;
readonly attribute HTMLCollection areas;
readonly attribute HTMLCollection images;
};
interface HTMLAreaElement : HTMLElement {
- attribute DOMString alt;
- attribute DOMString coords;
- attribute DOMString shape;
- stringifier attribute DOMString href;
- attribute DOMString target;
-
- attribute DOMString download;
- attribute DOMString ping;
-
- attribute DOMString rel;
+ attribute DOMString alt;
+ attribute DOMString coords;
+ attribute DOMString shape;
+ attribute DOMString target;
+ attribute DOMString download;
+ [PutForwards=value] attribute DOMSettableTokenList ping;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString hreflang;
+ attribute DOMString type;
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ // also has obsolete members
};
+HTMLAreaElement implements URLUtils;
interface HTMLTableElement : HTMLElement {
- attribute HTMLTableCaptionElement? caption;
+ attribute HTMLTableCaptionElement? caption;
HTMLElement createCaption();
void deleteCaption();
- attribute HTMLTableSectionElement? tHead;
+ attribute HTMLTableSectionElement? tHead;
HTMLElement createTHead();
void deleteTHead();
- attribute HTMLTableSectionElement? tFoot;
+ attribute HTMLTableSectionElement? tFoot;
HTMLElement createTFoot();
void deleteTFoot();
readonly attribute HTMLCollection tBodies;
HTMLElement createTBody();
readonly attribute HTMLCollection rows;
- HTMLElement insertRow(optional long index);
+ HTMLElement insertRow(optional long index = -1);
void deleteRow(long index);
+ attribute boolean sortable;
+ void stopSorting();
+
+ // also has obsolete members
};
-interface HTMLTableCaptionElement : HTMLElement {};
+interface HTMLTableCaptionElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLTableColElement : HTMLElement {
- attribute unsigned long span;
+ attribute unsigned long span;
+
+ // also has obsolete members
};
interface HTMLTableSectionElement : HTMLElement {
readonly attribute HTMLCollection rows;
- HTMLElement insertRow(optional long index);
+ HTMLElement insertRow(optional long index = -1);
void deleteRow(long index);
+
+ // also has obsolete members
};
interface HTMLTableRowElement : HTMLElement {
readonly attribute long rowIndex;
readonly attribute long sectionRowIndex;
readonly attribute HTMLCollection cells;
- HTMLElement insertCell(optional long index);
+ HTMLElement insertCell(optional long index = -1);
void deleteCell(long index);
+
+ // also has obsolete members
};
-interface HTMLTableDataCellElement : HTMLTableCellElement {};
+interface HTMLTableDataCellElement : HTMLTableCellElement {
+ // also has obsolete members
+};
interface HTMLTableHeaderCellElement : HTMLTableCellElement {
- attribute DOMString scope;
- attribute DOMString abbr;
+ attribute DOMString scope;
+ attribute DOMString abbr;
+ attribute DOMString sorted;
+ void sort();
};
interface HTMLTableCellElement : HTMLElement {
- attribute unsigned long colSpan;
- attribute unsigned long rowSpan;
+ attribute unsigned long colSpan;
+ attribute unsigned long rowSpan;
[PutForwards=value] readonly attribute DOMSettableTokenList headers;
readonly attribute long cellIndex;
+
+ // also has obsolete members
};
[OverrideBuiltins]
interface HTMLFormElement : HTMLElement {
- attribute DOMString acceptCharset;
- attribute DOMString action;
- attribute DOMString autocomplete;
- attribute DOMString enctype;
- attribute DOMString encoding;
- attribute DOMString method;
- attribute DOMString name;
- attribute boolean noValidate;
- attribute DOMString target;
+ attribute DOMString acceptCharset;
+ attribute DOMString action;
+ attribute DOMString autocomplete;
+ attribute DOMString enctype;
+ attribute DOMString encoding;
+ attribute DOMString method;
+ attribute DOMString name;
+ attribute boolean noValidate;
+ attribute DOMString target;
readonly attribute HTMLFormControlsCollection elements;
readonly attribute long length;
getter Element (unsigned long index);
- getter object (DOMString name);
+ getter (RadioNodeList or Element) (DOMString name);
void submit();
void reset();
boolean checkValidity();
-};
-
-interface HTMLFieldSetElement : HTMLElement {
- attribute boolean disabled;
- readonly attribute HTMLFormElement? form;
- attribute DOMString name;
-
- readonly attribute DOMString type;
-
- readonly attribute HTMLFormControlsCollection elements;
-
- readonly attribute boolean willValidate;
- readonly attribute ValidityState validity;
- readonly attribute DOMString validationMessage;
- boolean checkValidity();
- void setCustomValidity(DOMString error);
-};
+ boolean reportValidity();
-interface HTMLLegendElement : HTMLElement {
- readonly attribute HTMLFormElement? form;
+ void requestAutocomplete();
};
interface HTMLLabelElement : HTMLElement {
readonly attribute HTMLFormElement? form;
- attribute DOMString htmlFor;
+ attribute DOMString htmlFor;
readonly attribute HTMLElement? control;
};
interface HTMLInputElement : HTMLElement {
- attribute DOMString accept;
- attribute DOMString alt;
- attribute DOMString autocomplete;
- attribute boolean autofocus;
- attribute boolean defaultChecked;
- attribute boolean checked;
- attribute DOMString dirName;
- attribute boolean disabled;
+ attribute DOMString accept;
+ attribute DOMString alt;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute boolean defaultChecked;
+ attribute boolean checked;
+ attribute DOMString dirName;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
readonly attribute FileList? files;
- attribute DOMString formAction;
- attribute DOMString formEnctype;
- attribute DOMString formMethod;
- attribute boolean formNoValidate;
- attribute DOMString formTarget;
- attribute unsigned long height;
- attribute boolean indeterminate;
- attribute DOMString inputMode;
+ attribute DOMString formAction;
+ attribute DOMString formEnctype;
+ attribute DOMString formMethod;
+ attribute boolean formNoValidate;
+ attribute DOMString formTarget;
+ attribute unsigned long height;
+ attribute boolean indeterminate;
+ attribute DOMString inputMode;
readonly attribute HTMLElement? list;
- attribute DOMString max;
- attribute long maxLength;
- attribute DOMString min;
- attribute boolean multiple;
- attribute DOMString name;
- attribute DOMString pattern;
- attribute DOMString placeholder;
- attribute boolean readOnly;
- attribute boolean required;
- attribute unsigned long size;
- attribute DOMString src;
- attribute DOMString step;
- attribute DOMString type;
- attribute DOMString defaultValue;
+ attribute DOMString max;
+ attribute long maxLength;
+ attribute DOMString min;
+ attribute long minLength;
+ attribute boolean multiple;
+ attribute DOMString name;
+ attribute DOMString pattern;
+ attribute DOMString placeholder;
+ attribute boolean readOnly;
+ attribute boolean required;
+ attribute unsigned long size;
+ attribute DOMString src;
+ attribute DOMString step;
+ attribute DOMString type;
+ attribute DOMString defaultValue;
[TreatNullAs=EmptyString] attribute DOMString value;
- attribute Date? valueAsDate;
- attribute unrestricted double valueAsNumber;
- attribute unsigned long width;
+ attribute Date? valueAsDate;
+ attribute unrestricted double valueAsNumber;
+ attribute double valueLow;
+ attribute double valueHigh;
+ attribute unsigned long width;
- void stepUp(optional long n);
- void stepDown(optional long n);
+ void stepUp(optional long n = 1);
+ void stepDown(optional long n = 1);
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
void select();
- attribute unsigned long selectionStart;
- attribute unsigned long selectionEnd;
- attribute DOMString selectionDirection;
-
+ attribute unsigned long selectionStart;
+ attribute unsigned long selectionEnd;
+ attribute DOMString selectionDirection;
void setRangeText(DOMString replacement);
- void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode);
-
+ void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+
+ // also has obsolete members
};
interface HTMLButtonElement : HTMLElement {
- attribute boolean autofocus;
- attribute boolean disabled;
+ attribute boolean autofocus;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString formAction;
- attribute DOMString formEnctype;
- attribute DOMString formMethod;
- attribute boolean formNoValidate;
- attribute DOMString formTarget;
- attribute DOMString name;
- attribute DOMString type;
- attribute DOMString value;
+ attribute DOMString formAction;
+ attribute DOMString formEnctype;
+ attribute DOMString formMethod;
+ attribute boolean formNoValidate;
+ attribute DOMString formTarget;
+ attribute DOMString name;
+ attribute DOMString type;
+ attribute DOMString value;
+ attribute HTMLMenuElement? menu;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
};
interface HTMLSelectElement : HTMLElement {
- attribute boolean autofocus;
- attribute boolean disabled;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute boolean multiple;
- attribute DOMString name;
- attribute boolean required;
- attribute unsigned long size;
+ attribute boolean multiple;
+ attribute DOMString name;
+ attribute boolean required;
+ attribute unsigned long size;
readonly attribute DOMString type;
readonly attribute HTMLOptionsCollection options;
- attribute unsigned long length;
- getter Element item(unsigned long index);
- object namedItem(DOMString name);
+ attribute unsigned long length;
+ getter Element? item(unsigned long index);
+ HTMLOptionElement? namedItem(DOMString name);
void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+ void remove(); // ChildNode overload
void remove(long index);
setter creator void (unsigned long index, HTMLOptionElement? option);
readonly attribute HTMLCollection selectedOptions;
- attribute long selectedIndex;
- attribute DOMString value;
+ attribute long selectedIndex;
+ attribute DOMString value;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
@@ -1187,45 +882,42 @@ interface HTMLDataListElement : HTMLElement {
};
interface HTMLOptGroupElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString label;
+ attribute boolean disabled;
+ attribute DOMString label;
};
-[NamedConstructor=Option(),
- NamedConstructor=Option(DOMString text),
- NamedConstructor=Option(DOMString text, DOMString value),
- NamedConstructor=Option(DOMString text, DOMString value, boolean defaultSelected),
- NamedConstructor=Option(DOMString text, DOMString value, boolean defaultSelected, boolean selected)]
+[NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
interface HTMLOptionElement : HTMLElement {
- attribute boolean disabled;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString label;
- attribute boolean defaultSelected;
- attribute boolean selected;
- attribute DOMString value;
+ attribute DOMString label;
+ attribute boolean defaultSelected;
+ attribute boolean selected;
+ attribute DOMString value;
- attribute DOMString text;
+ attribute DOMString text;
readonly attribute long index;
};
interface HTMLTextAreaElement : HTMLElement {
- attribute DOMString autocomplete;
- attribute boolean autofocus;
- attribute unsigned long cols;
- attribute DOMString dirName;
- attribute boolean disabled;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute unsigned long cols;
+ attribute DOMString dirName;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString inputMode;
- attribute long maxLength;
- attribute DOMString name;
- attribute DOMString placeholder;
- attribute boolean readOnly;
- attribute boolean required;
- attribute unsigned long rows;
- attribute DOMString wrap;
+ attribute DOMString inputMode;
+ attribute long maxLength;
+ attribute long minLength;
+ attribute DOMString name;
+ attribute DOMString placeholder;
+ attribute boolean readOnly;
+ attribute boolean required;
+ attribute unsigned long rows;
+ attribute DOMString wrap;
readonly attribute DOMString type;
- attribute DOMString defaultValue;
+ attribute DOMString defaultValue;
[TreatNullAs=EmptyString] attribute DOMString value;
readonly attribute unsigned long textLength;
@@ -1233,28 +925,27 @@ interface HTMLTextAreaElement : HTMLElement {
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
void select();
- attribute unsigned long selectionStart;
- attribute unsigned long selectionEnd;
- attribute DOMString selectionDirection;
-
+ attribute unsigned long selectionStart;
+ attribute unsigned long selectionEnd;
+ attribute DOMString selectionDirection;
void setRangeText(DOMString replacement);
- void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode);
-
+ void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
};
interface HTMLKeygenElement : HTMLElement {
- attribute boolean autofocus;
- attribute DOMString challenge;
- attribute boolean disabled;
+ attribute boolean autofocus;
+ attribute DOMString challenge;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString keytype;
- attribute DOMString name;
+ attribute DOMString keytype;
+ attribute DOMString name;
readonly attribute DOMString type;
@@ -1262,6 +953,7 @@ interface HTMLKeygenElement : HTMLElement {
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
@@ -1270,85 +962,453 @@ interface HTMLKeygenElement : HTMLElement {
interface HTMLOutputElement : HTMLElement {
[PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
readonly attribute HTMLFormElement? form;
- attribute DOMString name;
+ attribute DOMString name;
readonly attribute DOMString type;
- attribute DOMString defaultValue;
- attribute DOMString value;
+ attribute DOMString defaultValue;
+ attribute DOMString value;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
};
interface HTMLProgressElement : HTMLElement {
- attribute double value;
- attribute double max;
+ attribute double value;
+ attribute double max;
readonly attribute double position;
readonly attribute NodeList labels;
};
interface HTMLMeterElement : HTMLElement {
- attribute double value;
- attribute double min;
- attribute double max;
- attribute double low;
- attribute double high;
- attribute double optimum;
+ attribute double value;
+ attribute double min;
+ attribute double max;
+ attribute double low;
+ attribute double high;
+ attribute double optimum;
readonly attribute NodeList labels;
};
+interface HTMLFieldSetElement : HTMLElement {
+ attribute boolean disabled;
+ readonly attribute HTMLFormElement? form;
+ attribute DOMString name;
-interface ValidityState {
- readonly attribute boolean valueMissing;
+ readonly attribute DOMString type;
+
+ readonly attribute HTMLFormControlsCollection elements;
+
+ readonly attribute boolean willValidate;
+ [SameObject] readonly attribute ValidityState validity;
+ readonly attribute DOMString validationMessage;
+ boolean checkValidity();
+ boolean reportValidity();
+ void setCustomValidity(DOMString error);
+};
+
+interface HTMLLegendElement : HTMLElement {
+ readonly attribute HTMLFormElement? form;
+
+ // also has obsolete members
+};
+
+enum AutocompleteErrorReason { "" /* empty string */, "cancel", "disabled", "invalid" };
+
+[Constructor(DOMString type, optional AutocompleteErrorEventInit eventInitDict)]
+interface AutocompleteErrorEvent : Event {
+ readonly attribute AutocompleteErrorReason reason;
+};
+
+dictionary AutocompleteErrorEventInit : EventInit {
+ AutocompleteErrorReason reason;
+};
+
+enum SelectionMode {
+ "select",
+ "start",
+ "end",
+ "preserve", // default
+};
+
+interface ValidityState {
+ readonly attribute boolean valueMissing;
readonly attribute boolean typeMismatch;
readonly attribute boolean patternMismatch;
readonly attribute boolean tooLong;
+ readonly attribute boolean tooShort;
readonly attribute boolean rangeUnderflow;
readonly attribute boolean rangeOverflow;
readonly attribute boolean stepMismatch;
+ readonly attribute boolean badInput;
readonly attribute boolean customError;
readonly attribute boolean valid;
};
interface HTMLDetailsElement : HTMLElement {
- attribute boolean open;
+ attribute boolean open;
+};
+
+interface HTMLMenuElement : HTMLElement {
+ attribute DOMString type;
+ attribute DOMString label;
+
+ // also has obsolete members
};
-interface HTMLCommandElement : HTMLElement {
- attribute DOMString type;
- attribute DOMString label;
- attribute DOMString icon;
- attribute boolean disabled;
- attribute boolean checked;
- attribute DOMString radiogroup;
+interface HTMLMenuItemElement : HTMLElement {
+ attribute DOMString type;
+ attribute DOMString label;
+ attribute DOMString icon;
+ attribute boolean disabled;
+ attribute boolean checked;
+ attribute DOMString radiogroup;
+ attribute boolean default;
readonly attribute HTMLElement? command;
};
-interface HTMLMenuElement : HTMLElement {
- attribute DOMString type;
- attribute DOMString label;
+[Constructor(DOMString type, optional RelatedEventInit eventInitDict)]
+interface RelatedEvent : Event {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary RelatedEventInit : EventInit {
+ EventTarget? relatedTarget;
};
interface HTMLDialogElement : HTMLElement {
- attribute boolean open;
- attribute DOMString returnValue;
+ attribute boolean open;
+ attribute DOMString returnValue;
void show(optional (MouseEvent or Element) anchor);
void showModal(optional (MouseEvent or Element) anchor);
void close(optional DOMString returnValue);
};
-[NamedPropertiesObject]
-interface Window : EventTarget {
+interface HTMLScriptElement : HTMLElement {
+ attribute DOMString src;
+ attribute DOMString type;
+ attribute DOMString charset;
+ attribute boolean async;
+ attribute boolean defer;
+ attribute DOMString? crossOrigin;
+ attribute DOMString text;
+
+ // also has obsolete members
+};
+
+interface HTMLTemplateElement : HTMLElement {
+ readonly attribute DocumentFragment content;
+};
+
+typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
+
+interface HTMLCanvasElement : HTMLElement {
+ attribute unsigned long width;
+ attribute unsigned long height;
+
+ RenderingContext? getContext(DOMString contextId, any... arguments);
+ boolean probablySupportsContext(DOMString contextId, any... arguments);
+
+ void setContext(RenderingContext context);
+ CanvasProxy transferControlToProxy();
+
+ DOMString toDataURL(optional DOMString type, any... arguments);
+ void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasProxy {
+ void setContext(RenderingContext context);
+};
+// CanvasProxy implements Transferable;
+
+typedef (HTMLImageElement or
+ HTMLVideoElement or
+ HTMLCanvasElement or
+ CanvasRenderingContext2D or
+ ImageBitmap) CanvasImageSource;
+
+enum CanvasFillRule { "nonzero", "evenodd" };
+
+dictionary CanvasRenderingContext2DSettings {
+ boolean alpha = true;
+};
+
+[Constructor(),
+ Constructor(unsigned long width, unsigned long height),
+ Exposed=(Window,Worker)]
+interface CanvasRenderingContext2D {
+
+ // back-reference to the canvas
+ readonly attribute HTMLCanvasElement canvas;
+
+ // canvas dimensions
+ attribute unsigned long width;
+ attribute unsigned long height;
+
+ // for contexts that aren't directly fixed to a specific canvas
+ void commit(); // push the image to the output bitmap
+
+ // state
+ void save(); // push state on state stack
+ void restore(); // pop state stack and restore state
+
+ // transformations (default transform is the identity matrix)
+ attribute SVGMatrix currentTransform;
+ void scale(unrestricted double x, unrestricted double y);
+ void rotate(unrestricted double angle);
+ void translate(unrestricted double x, unrestricted double y);
+ void transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+ void setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+ void resetTransform();
+
+ // compositing
+ attribute unrestricted double globalAlpha; // (default 1.0)
+ attribute DOMString globalCompositeOperation; // (default source-over)
+
+ // image smoothing
+ attribute boolean imageSmoothingEnabled; // (default true)
+
+ // colours and styles (see also the CanvasDrawingStyles interface)
+ attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
+ attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
+ CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
+ CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
+ CanvasPattern createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition);
+
+ // shadows
+ attribute unrestricted double shadowOffsetX; // (default 0)
+ attribute unrestricted double shadowOffsetY; // (default 0)
+ attribute unrestricted double shadowBlur; // (default 0)
+ attribute DOMString shadowColor; // (default transparent black)
+
+ // rects
+ void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+
+ // path API (see also CanvasPathMethods)
+ void beginPath();
+ void fill(optional CanvasFillRule fillRule = "nonzero");
+ void fill(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+ void stroke();
+ void stroke(Path2D path);
+ void drawFocusIfNeeded(Element element);
+ void drawFocusIfNeeded(Path2D path, Element element);
+ void scrollPathIntoView();
+ void scrollPathIntoView(Path2D path);
+ void clip(optional CanvasFillRule fillRule = "nonzero");
+ void clip(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+ void resetClip();
+ boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
+ boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
+ boolean isPointInStroke(unrestricted double x, unrestricted double y);
+ boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
+
+ // text (see also the CanvasDrawingStyles interface)
+ void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ TextMetrics measureText(DOMString text);
+
+ // drawing images
+ void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy);
+ void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+ void drawImage(CanvasImageSource image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+
+ // hit regions
+ void addHitRegion(optional HitRegionOptions options);
+ void removeHitRegion(DOMString id);
+ void clearHitRegions();
+
+ // pixel manipulation
+ ImageData createImageData(double sw, double sh);
+ ImageData createImageData(ImageData imagedata);
+ ImageData getImageData(double sx, double sy, double sw, double sh);
+ void putImageData(ImageData imagedata, double dx, double dy);
+ void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
+};
+CanvasRenderingContext2D implements CanvasDrawingStyles;
+CanvasRenderingContext2D implements CanvasPathMethods;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface CanvasDrawingStyles {
+ // line caps/joins
+ attribute unrestricted double lineWidth; // (default 1)
+ attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
+ attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
+ attribute unrestricted double miterLimit; // (default 10)
+
+ // dashed lines
+ void setLineDash(sequence<unrestricted double> segments); // default empty
+ sequence<unrestricted double> getLineDash();
+ attribute unrestricted double lineDashOffset;
+
+ // text
+ attribute DOMString font; // (default 10px sans-serif)
+ attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
+ attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
+ attribute DOMString direction; // "ltr", "rtl", "inherit" (default: "inherit")
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface CanvasPathMethods {
+ // shared path API methods
+ void closePath();
+ void moveTo(unrestricted double x, unrestricted double y);
+ void lineTo(unrestricted double x, unrestricted double y);
+ void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
+ void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
+ void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
+ void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation);
+ void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+ void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasGradient {
+ // opaque object
+ void addColorStop(double offset, DOMString color);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasPattern {
+ // opaque object
+ void setTransform(SVGMatrix transform);
+};
+
+[Exposed=(Window,Worker)]
+interface TextMetrics {
+ // x-direction
+ readonly attribute double width; // advance width
+ readonly attribute double actualBoundingBoxLeft;
+ readonly attribute double actualBoundingBoxRight;
+
+ // y-direction
+ readonly attribute double fontBoundingBoxAscent;
+ readonly attribute double fontBoundingBoxDescent;
+ readonly attribute double actualBoundingBoxAscent;
+ readonly attribute double actualBoundingBoxDescent;
+ readonly attribute double emHeightAscent;
+ readonly attribute double emHeightDescent;
+ readonly attribute double hangingBaseline;
+ readonly attribute double alphabeticBaseline;
+ readonly attribute double ideographicBaseline;
+};
+
+dictionary HitRegionOptions {
+ Path2D? path = null;
+ CanvasFillRule fillRule = "nonzero";
+ DOMString id = "";
+ DOMString? parentID = null;
+ DOMString cursor = "inherit";
+ // for control-backed regions:
+ Element? control = null;
+ // for unbacked regions:
+ DOMString? label = null;
+ DOMString? role = null;
+};
+
+[Constructor(unsigned long sw, unsigned long sh),
+ Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh),
+ Exposed=(Window,Worker)]
+interface ImageData {
+ readonly attribute unsigned long width;
+ readonly attribute unsigned long height;
+ readonly attribute Uint8ClampedArray data;
+};
+
+[Constructor(optional Element scope), Exposed=(Window,Worker)]
+interface DrawingStyle { };
+DrawingStyle implements CanvasDrawingStyles;
+
+[Constructor,
+ Constructor(Path2D path),
+ Constructor(Path2D[] paths, optional CanvasFillRule fillRule = "nonzero"),
+ Constructor(DOMString d), Exposed=(Window,Worker)]
+interface Path2D {
+ void addPath(Path2D path, optional SVGMatrix? transformation = null);
+ void addPathByStrokingPath(Path2D path, CanvasDrawingStyles styles, optional SVGMatrix? transformation = null);
+ void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path2D path, optional unrestricted double maxWidth);
+ void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path2D path, optional unrestricted double maxWidth);
+};
+Path2D implements CanvasPathMethods;
+
+partial interface MouseEvent {
+ readonly attribute DOMString? region;
+};
+
+partial dictionary MouseEventInit {
+ DOMString? region;
+};
+
+partial interface Touch {
+ readonly attribute DOMString? region;
+};
+
+[NoInterfaceObject]
+interface ElementContentEditable {
+ attribute DOMString contentEditable;
+ readonly attribute boolean isContentEditable;
+};
+
+interface DataTransfer {
+ attribute DOMString dropEffect;
+ attribute DOMString effectAllowed;
+
+ [SameObject] readonly attribute DataTransferItemList items;
+
+ void setDragImage(Element image, long x, long y);
+
+ /* old interface */
+ [SameObject] readonly attribute DOMString[] types;
+ DOMString getData(DOMString format);
+ void setData(DOMString format, DOMString data);
+ void clearData(optional DOMString format);
+ [SameObject] readonly attribute FileList files;
+};
+
+interface DataTransferItemList {
+ readonly attribute unsigned long length;
+ getter DataTransferItem (unsigned long index);
+ DataTransferItem? add(DOMString data, DOMString type);
+ DataTransferItem? add(File data);
+ void remove(unsigned long index);
+ void clear();
+};
+
+interface DataTransferItem {
+ readonly attribute DOMString kind;
+ readonly attribute DOMString type;
+ void getAsString(FunctionStringCallback? _callback);
+ File? getAsFile();
+};
+
+callback FunctionStringCallback = void (DOMString data);
+
+[Constructor(DOMString type, optional DragEventInit eventInitDict)]
+interface DragEvent : MouseEvent {
+ readonly attribute DataTransfer? dataTransfer;
+};
+
+dictionary DragEventInit : MouseEventInit {
+ DataTransfer? dataTransfer;
+};
+
+[PrimaryGlobal]
+/*sealed*/ interface Window : EventTarget {
// the current browsing context
[Unforgeable] readonly attribute WindowProxy window;
[Replaceable] readonly attribute WindowProxy self;
[Unforgeable] readonly attribute Document document;
- attribute DOMString name;
+ attribute DOMString name;
[PutForwards=href, Unforgeable] readonly attribute Location location;
readonly attribute History history;
[Replaceable] readonly attribute BarProp locationbar;
@@ -1357,8 +1417,9 @@ interface Window : EventTarget {
[Replaceable] readonly attribute BarProp scrollbars;
[Replaceable] readonly attribute BarProp statusbar;
[Replaceable] readonly attribute BarProp toolbar;
- attribute DOMString status;
+ attribute DOMString status;
void close();
+ readonly attribute boolean closed;
void stop();
void focus();
void blur();
@@ -1367,102 +1428,38 @@ interface Window : EventTarget {
[Replaceable] readonly attribute WindowProxy frames;
[Replaceable] readonly attribute unsigned long length;
[Unforgeable] readonly attribute WindowProxy top;
- attribute WindowProxy? opener;
- readonly attribute WindowProxy parent;
+ attribute any opener;
+ [Replaceable] readonly attribute WindowProxy parent;
readonly attribute Element? frameElement;
- WindowProxy open(optional DOMString url, optional DOMString target, optional DOMString features, optional boolean replace);
+ WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank", [TreatNullAs=EmptyString] optional DOMString features = "", optional boolean replace = false);
getter WindowProxy (unsigned long index);
getter object (DOMString name);
// the user agent
readonly attribute Navigator navigator;
-
- readonly attribute External external;
+ [Replaceable, SameObject] readonly attribute External external;
readonly attribute ApplicationCache applicationCache;
// user prompts
+ void alert();
void alert(DOMString message);
- boolean confirm(DOMString message);
- DOMString? prompt(DOMString message, optional DOMString default);
+ boolean confirm(optional DOMString message = "");
+ DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
void print();
- any showModalDialog(DOMString url, optional any argument);
+ any showModalDialog(DOMString url, optional any argument); // deprecated
+
+ long requestAnimationFrame(FrameRequestCallback callback);
+ void cancelAnimationFrame(long handle);
- // cross-document messaging
void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmessage;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onpopstate;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onstorage;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onunload;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
+ // also has obsolete members
};
+Window implements GlobalEventHandlers;
+Window implements WindowEventHandlers;
interface BarProp {
- attribute boolean visible;
+ attribute boolean visible;
};
interface History {
@@ -1471,27 +1468,20 @@ interface History {
void go(optional long delta);
void back();
void forward();
- void pushState(any data, DOMString title, optional DOMString url);
- void replaceState(any data, DOMString title, optional DOMString url);
+ void pushState(any data, DOMString title, optional DOMString? url = null);
+ void replaceState(any data, DOMString title, optional DOMString? url = null);
};
-interface Location {
- stringifier attribute DOMString href;
+[Unforgeable] interface Location {
void assign(DOMString url);
void replace(DOMString url);
void reload();
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ [SameObject] readonly attribute DOMString[] ancestorOrigins;
};
+Location implements URLUtils;
-[Constructor(DOMString type, optional PopStateEventInit eventInitDict)]
+[Constructor(DOMString type, optional PopStateEventInit eventInitDict), Exposed=(Window,Worker)]
interface PopStateEvent : Event {
readonly attribute any state;
};
@@ -1500,7 +1490,7 @@ dictionary PopStateEventInit : EventInit {
any state;
};
-[Constructor(DOMString type, optional HashChangeEventInit eventInitDict)]
+[Constructor(DOMString type, optional HashChangeEventInit eventInitDict), Exposed=(Window,Worker)]
interface HashChangeEvent : Event {
readonly attribute DOMString oldURL;
readonly attribute DOMString newURL;
@@ -1511,7 +1501,7 @@ dictionary HashChangeEventInit : EventInit {
DOMString newURL;
};
-[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict)]
+[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict), Exposed=(Window,Worker)]
interface PageTransitionEvent : Event {
readonly attribute boolean persisted;
};
@@ -1521,9 +1511,10 @@ dictionary PageTransitionEventInit : EventInit {
};
interface BeforeUnloadEvent : Event {
- attribute DOMString returnValue;
+ attribute DOMString returnValue;
};
+[Exposed=(Window,SharedWorker)]
interface ApplicationCache : EventTarget {
// update status
@@ -1541,66 +1532,184 @@ interface ApplicationCache : EventTarget {
void swapCache();
// events
- attribute EventHandler onchecking;
- attribute EventHandler onerror;
- attribute EventHandler onnoupdate;
- attribute EventHandler ondownloading;
- attribute EventHandler onprogress;
- attribute EventHandler onupdateready;
- attribute EventHandler oncached;
- attribute EventHandler onobsolete;
+ attribute EventHandler onchecking;
+ attribute EventHandler onerror;
+ attribute EventHandler onnoupdate;
+ attribute EventHandler ondownloading;
+ attribute EventHandler onprogress;
+ attribute EventHandler onupdateready;
+ attribute EventHandler oncached;
+ attribute EventHandler onobsolete;
};
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface NavigatorOnLine {
readonly attribute boolean onLine;
};
-[TreatNonCallableAsNull]
+[Constructor(DOMString type, optional ErrorEventInit eventInitDict), Exposed=(Window,Worker)]
+interface ErrorEvent : Event {
+ readonly attribute DOMString message;
+ readonly attribute DOMString filename;
+ readonly attribute unsigned long lineno;
+ readonly attribute unsigned long colno;
+ readonly attribute any error;
+};
+
+dictionary ErrorEventInit : EventInit {
+ DOMString message;
+ DOMString filename;
+ unsigned long lineno;
+ unsigned long colno;
+ any error;
+};
+
+[TreatNonObjectAsNull]
callback EventHandlerNonNull = any (Event event);
typedef EventHandlerNonNull? EventHandler;
-[TreatNonCallableAsNull]
-callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, DOMString source, unsigned long lineno, unsigned long column);
+[TreatNonObjectAsNull]
+callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
+[TreatNonObjectAsNull]
+callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
+typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
+
+[NoInterfaceObject]
+interface GlobalEventHandlers {
+ attribute EventHandler onabort;
+ attribute EventHandler onautocomplete;
+ attribute EventHandler onautocompleteerror;
+ attribute EventHandler onblur;
+ attribute EventHandler oncancel;
+ attribute EventHandler oncanplay;
+ attribute EventHandler oncanplaythrough;
+ attribute EventHandler onchange;
+ attribute EventHandler onclick;
+ attribute EventHandler onclose;
+ attribute EventHandler oncontextmenu;
+ attribute EventHandler oncuechange;
+ attribute EventHandler ondblclick;
+ attribute EventHandler ondrag;
+ attribute EventHandler ondragend;
+ attribute EventHandler ondragenter;
+ attribute EventHandler ondragexit;
+ attribute EventHandler ondragleave;
+ attribute EventHandler ondragover;
+ attribute EventHandler ondragstart;
+ attribute EventHandler ondrop;
+ attribute EventHandler ondurationchange;
+ attribute EventHandler onemptied;
+ attribute EventHandler onended;
+ attribute OnErrorEventHandler onerror;
+ attribute EventHandler onfocus;
+ attribute EventHandler oninput;
+ attribute EventHandler oninvalid;
+ attribute EventHandler onkeydown;
+ attribute EventHandler onkeypress;
+ attribute EventHandler onkeyup;
+ attribute EventHandler onload;
+ attribute EventHandler onloadeddata;
+ attribute EventHandler onloadedmetadata;
+ attribute EventHandler onloadstart;
+ attribute EventHandler onmousedown;
+ [LenientThis] attribute EventHandler onmouseenter;
+ [LenientThis] attribute EventHandler onmouseleave;
+ attribute EventHandler onmousemove;
+ attribute EventHandler onmouseout;
+ attribute EventHandler onmouseover;
+ attribute EventHandler onmouseup;
+ attribute EventHandler onmousewheel;
+ attribute EventHandler onpause;
+ attribute EventHandler onplay;
+ attribute EventHandler onplaying;
+ attribute EventHandler onprogress;
+ attribute EventHandler onratechange;
+ attribute EventHandler onreset;
+ attribute EventHandler onresize;
+ attribute EventHandler onscroll;
+ attribute EventHandler onseeked;
+ attribute EventHandler onseeking;
+ attribute EventHandler onselect;
+ attribute EventHandler onshow;
+ attribute EventHandler onsort;
+ attribute EventHandler onstalled;
+ attribute EventHandler onsubmit;
+ attribute EventHandler onsuspend;
+ attribute EventHandler ontimeupdate;
+ attribute EventHandler ontoggle;
+ attribute EventHandler onvolumechange;
+ attribute EventHandler onwaiting;
+};
+
[NoInterfaceObject]
+interface WindowEventHandlers {
+ attribute EventHandler onafterprint;
+ attribute EventHandler onbeforeprint;
+ attribute OnBeforeUnloadEventHandler onbeforeunload;
+ attribute EventHandler onhashchange;
+ attribute EventHandler onlanguagechange;
+ attribute EventHandler onmessage;
+ attribute EventHandler onoffline;
+ attribute EventHandler ononline;
+ attribute EventHandler onpagehide;
+ attribute EventHandler onpageshow;
+ attribute EventHandler onpopstate;
+ attribute EventHandler onstorage;
+ attribute EventHandler onunload;
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowBase64 {
DOMString btoa(DOMString btoa);
DOMString atob(DOMString atob);
};
Window implements WindowBase64;
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowTimers {
- long setTimeout(Function handler, optional long timeout, any... arguments);
- long setTimeout(DOMString handler, optional long timeout, any... arguments);
- void clearTimeout(long handle);
- long setInterval(Function handler, optional long timeout, any... arguments);
- long setInterval(DOMString handler, optional long timeout, any... arguments);
- void clearInterval(long handle);
+ long setTimeout(Function handler, optional long timeout = 0, any... arguments);
+ long setTimeout(DOMString handler, optional long timeout = 0, any... arguments);
+ void clearTimeout(optional long handle = 0);
+ long setInterval(Function handler, optional long timeout = 0, any... arguments);
+ long setInterval(DOMString handler, optional long timeout = 0, any... arguments);
+ void clearInterval(optional long handle = 0);
};
Window implements WindowTimers;
-[NoInterfaceObject] interface WindowModal {
+[NoInterfaceObject]
+interface WindowModal {
readonly attribute any dialogArguments;
- attribute DOMString returnValue;
+ attribute any returnValue;
};
interface Navigator {
// objects implementing this interface also implement the interfaces given below
};
Navigator implements NavigatorID;
+Navigator implements NavigatorLanguage;
Navigator implements NavigatorOnLine;
Navigator implements NavigatorContentUtils;
Navigator implements NavigatorStorageUtils;
+Navigator implements NavigatorPlugins;
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface NavigatorID {
+ readonly attribute DOMString appCodeName; // constant "Mozilla"
readonly attribute DOMString appName;
readonly attribute DOMString appVersion;
readonly attribute DOMString platform;
+ readonly attribute DOMString product; // constant "Gecko"
+ boolean taintEnabled(); // constant false
readonly attribute DOMString userAgent;
+ readonly attribute DOMString vendorSub;
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface NavigatorLanguage {
+ readonly attribute DOMString? language;
+ readonly attribute DOMString[] languages;
};
[NoInterfaceObject]
@@ -1616,162 +1725,93 @@ interface NavigatorContentUtils {
[NoInterfaceObject]
interface NavigatorStorageUtils {
+ readonly attribute boolean cookieEnabled;
void yieldForStorageUpdates();
};
-interface External {
- void AddSearchProvider(DOMString engineURL);
- unsigned long IsSearchProviderInstalled(DOMString engineURL);
-};
-
-interface DataTransfer {
- attribute DOMString dropEffect;
- attribute DOMString effectAllowed;
-
- readonly attribute DataTransferItemList items;
-
- void setDragImage(Element image, long x, long y);
-
- /* old interface */
- readonly attribute DOMString[] types;
- DOMString getData(DOMString format);
- void setData(DOMString format, DOMString data);
- void clearData(optional DOMString format);
- readonly attribute FileList files;
+[NoInterfaceObject]
+interface NavigatorPlugins {
+ [SameObject] readonly attribute PluginArray plugins;
+ [SameObject] readonly attribute MimeTypeArray mimeTypes;
+ readonly attribute boolean javaEnabled;
};
-interface DataTransferItemList {
+interface PluginArray {
+ void refresh(optional boolean reload = false);
readonly attribute unsigned long length;
- getter DataTransferItem (unsigned long index);
- deleter void (unsigned long index);
- void clear();
-
- DataTransferItem? add(DOMString data, DOMString type);
- DataTransferItem? add(File data);
-};
-
-interface DataTransferItem {
- readonly attribute DOMString kind;
- readonly attribute DOMString type;
- void getAsString(FunctionStringCallback? _callback);
-
- File? getAsFile();
-};
-
-[Callback, NoInterfaceObject]
-interface FunctionStringCallback {
- void handleEvent(DOMString data);
-};
-
-[Constructor(DOMString type, optional DragEventInit eventInitDict)]
-interface DragEvent : MouseEvent {
- readonly attribute DataTransfer? dataTransfer;
-};
-
-dictionary DragEventInit : MouseEventInit {
- DataTransfer? dataTransfer;
-};
-
-interface WorkerGlobalScope : EventTarget {
- readonly attribute WorkerGlobalScope self;
- readonly attribute WorkerLocation location;
-
- void close();
- attribute EventHandler onerror;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
+ getter Plugin? item(unsigned long index);
+ getter Plugin? namedItem(DOMString name);
};
-WorkerGlobalScope implements WorkerUtils;
-interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
- void postMessage(any message, optional sequence<Transferable> transfer);
- attribute EventHandler onmessage;
+interface MimeTypeArray {
+ readonly attribute unsigned long length;
+ getter MimeType? item(unsigned long index);
+ getter MimeType? namedItem(DOMString name);
};
-interface SharedWorkerGlobalScope : WorkerGlobalScope {
+interface Plugin {
readonly attribute DOMString name;
- readonly attribute ApplicationCache applicationCache;
- attribute EventHandler onconnect;
-};
-
-[Constructor(DOMString type, optional ErrorEventInit eventInitDict)]
-interface ErrorEvent : Event {
- readonly attribute DOMString message;
+ readonly attribute DOMString description;
readonly attribute DOMString filename;
- readonly attribute unsigned long lineno;
- readonly attribute unsigned long column;
-};
-
-dictionary ErrorEventInit : EventInit {
- DOMString message;
- DOMString filename;
- unsigned long lineno;
- unsigned long column;
+ readonly attribute unsigned long length;
+ getter MimeType? item(unsigned long index);
+ getter MimeType? namedItem(DOMString name);
};
-[NoInterfaceObject]
-interface AbstractWorker {
- attribute EventHandler onerror;
-
+interface MimeType {
+ readonly attribute DOMString type;
+ readonly attribute DOMString description;
+ readonly attribute DOMString suffixes; // comma-separated
+ readonly attribute Plugin enabledPlugin;
};
-[Constructor(DOMString scriptURL)]
-interface Worker : EventTarget {
- void terminate();
-
- void postMessage(any message, optional sequence<Transferable> transfer);
- attribute EventHandler onmessage;
-};
-Worker implements AbstractWorker;
-
-[Constructor(DOMString scriptURL, optional DOMString name)]
-interface SharedWorker : EventTarget {
- readonly attribute MessagePort port;
+interface External {
+ void AddSearchProvider(DOMString engineURL);
+ unsigned long IsSearchProviderInstalled(DOMString engineURL);
};
-SharedWorker implements AbstractWorker;
-[NoInterfaceObject]
-interface WorkerUtils {
- void importScripts(DOMString... urls);
- readonly attribute WorkerNavigator navigator;
+[Exposed=(Window,Worker)]
+interface ImageBitmap {
+ readonly attribute unsigned long width;
+ readonly attribute unsigned long height;
};
-WorkerUtils implements WindowTimers;
-WorkerUtils implements WindowBase64;
-interface WorkerNavigator {};
-WorkerNavigator implements NavigatorID;
-WorkerNavigator implements NavigatorOnLine;
+typedef (HTMLImageElement or
+ HTMLVideoElement or
+ HTMLCanvasElement or
+ Blob or
+ ImageData or
+ CanvasRenderingContext2D or
+ ImageBitmap) ImageBitmapSource;
-interface WorkerLocation {
- // URL decomposition IDL attributes
- stringifier readonly attribute DOMString href;
- readonly attribute DOMString protocol;
- readonly attribute DOMString host;
- readonly attribute DOMString hostname;
- readonly attribute DOMString port;
- readonly attribute DOMString pathname;
- readonly attribute DOMString search;
- readonly attribute DOMString hash;
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface ImageBitmapFactories {
+ Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image);
+ Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, long sx, long sy, long sw, long sh);
};
+Window implements ImageBitmapFactories;
+WorkerGlobalScope implements ImageBitmapFactories;
-[Constructor(DOMString type, optional MessageEventInit eventInitDict)]
+[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=(Window,Worker)]
interface MessageEvent : Event {
readonly attribute any data;
readonly attribute DOMString origin;
readonly attribute DOMString lastEventId;
readonly attribute (WindowProxy or MessagePort)? source;
readonly attribute MessagePort[]? ports;
+
+ void initMessageEvent(DOMString typeArg, boolean canBubbleArg, boolean cancelableArg, any dataArg, DOMString originArg, DOMString lastEventIdArg, (WindowProxy or MessagePort) sourceArg, sequence<MessagePort>? portsArg);
};
dictionary MessageEventInit : EventInit {
any data;
DOMString origin;
DOMString lastEventId;
- WindowProxy? source;
- MessagePort[]? ports;
+ (WindowProxy or MessagePort)? source;
+ sequence<MessagePort> ports;
};
-[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict)]
+[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict), Exposed=(Window,Worker)]
interface EventSource : EventTarget {
readonly attribute DOMString url;
readonly attribute boolean withCredentials;
@@ -1783,9 +1823,9 @@ interface EventSource : EventTarget {
readonly attribute unsigned short readyState;
// networking
- attribute EventHandler onopen;
- attribute EventHandler onmessage;
- attribute EventHandler onerror;
+ attribute EventHandler onopen;
+ attribute EventHandler onmessage;
+ attribute EventHandler onerror;
void close();
};
@@ -1794,7 +1834,7 @@ dictionary EventSourceInit {
};
enum BinaryType { "blob", "arraybuffer" };
-[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols)]
+[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols), Exposed=(Window,Worker)]
interface WebSocket : EventTarget {
readonly attribute DOMString url;
@@ -1807,23 +1847,23 @@ interface WebSocket : EventTarget {
readonly attribute unsigned long bufferedAmount;
// networking
- attribute EventHandler onopen;
- attribute EventHandler onerror;
- attribute EventHandler onclose;
+ attribute EventHandler onopen;
+ attribute EventHandler onerror;
+ attribute EventHandler onclose;
readonly attribute DOMString extensions;
readonly attribute DOMString protocol;
- void close([Clamp] optional unsigned short code, optional DOMString reason);
+ void close([Clamp] optional unsigned short code, optional USVString reason);
// messaging
- attribute EventHandler onmessage;
- attribute BinaryType binaryType;
- void send(DOMString data);
+ attribute EventHandler onmessage;
+ attribute BinaryType binaryType;
+ void send(USVString data);
void send(Blob data);
void send(ArrayBuffer data);
void send(ArrayBufferView data);
};
-[Constructor(DOMString type, optional CloseEventInit eventInitDict)]
+[Constructor(DOMString type, optional CloseEventInit eventInitDict), Exposed=(Window,Worker)]
interface CloseEvent : Event {
readonly attribute boolean wasClean;
readonly attribute unsigned short code;
@@ -1836,26 +1876,110 @@ dictionary CloseEventInit : EventInit {
DOMString reason;
};
-[Constructor]
+[Constructor, Exposed=(Window,Worker)]
interface MessageChannel {
readonly attribute MessagePort port1;
readonly attribute MessagePort port2;
};
+[Exposed=(Window,Worker)]
interface MessagePort : EventTarget {
void postMessage(any message, optional sequence<Transferable> transfer);
void start();
void close();
// event handlers
- attribute EventHandler onmessage;
+ attribute EventHandler onmessage;
+};
+// MessagePort implements Transferable;
+
+[Constructor, Exposed=(Window,Worker)]
+interface PortCollection {
+ void add(MessagePort port);
+ void remove(MessagePort port);
+ void clear();
+ void iterate(PortCollectionCallback callback);
+};
+
+callback PortCollectionCallback = void (MessagePort port);
+
+[Constructor(DOMString channel), Exposed=(Window,Worker)]
+interface BroadcastChannel : EventTarget {
+ readonly attribute DOMString name;
+ void postMessage(any message);
+ void close();
+ attribute EventHandler onmessage;
+};
+
+[Exposed=Worker]
+interface WorkerGlobalScope : EventTarget {
+ readonly attribute WorkerGlobalScope self;
+ readonly attribute WorkerLocation location;
+
+ void close();
+ attribute OnErrorEventHandler onerror;
+ attribute EventHandler onlanguagechange;
+ attribute EventHandler onoffline;
+ attribute EventHandler ononline;
+
+ // also has additional members in a partial interface
+};
+
+[Global=(Worker,DedicatedWorker),Exposed=DedicatedWorker]
+/*sealed*/ interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
+ void postMessage(any message, optional sequence<Transferable> transfer);
+ attribute EventHandler onmessage;
+};
+
+[Global=(Worker,SharedWorker),Exposed=SharedWorker]
+/*sealed*/ interface SharedWorkerGlobalScope : WorkerGlobalScope {
+ readonly attribute DOMString name;
+ readonly attribute ApplicationCache applicationCache;
+ attribute EventHandler onconnect;
};
-MessagePort implements Transferable;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface AbstractWorker {
+ attribute EventHandler onerror;
+};
+
+[Constructor(DOMString scriptURL), Exposed=(Window,Worker)]
+interface Worker : EventTarget {
+ void terminate();
+
+ void postMessage(any message, optional sequence<Transferable> transfer);
+ attribute EventHandler onmessage;
+};
+Worker implements AbstractWorker;
+
+[Constructor(DOMString scriptURL, optional DOMString name), Exposed=(Window,Worker)]
+interface SharedWorker : EventTarget {
+ readonly attribute MessagePort port;
+};
+SharedWorker implements AbstractWorker;
+
+[Exposed=Worker]
+partial interface WorkerGlobalScope { // not obsolete
+ void importScripts(DOMString... urls);
+ readonly attribute WorkerNavigator navigator;
+};
+WorkerGlobalScope implements WindowTimers;
+WorkerGlobalScope implements WindowBase64;
+
+[Exposed=Worker]
+interface WorkerNavigator {};
+WorkerNavigator implements NavigatorID;
+WorkerNavigator implements NavigatorLanguage;
+WorkerNavigator implements NavigatorOnLine;
+
+[Exposed=Worker]
+interface WorkerLocation { };
+WorkerLocation implements URLUtilsReadOnly;
interface Storage {
readonly attribute unsigned long length;
DOMString? key(unsigned long index);
- getter DOMString getItem(DOMString key);
+ getter DOMString? getItem(DOMString key);
setter creator void setItem(DOMString key, DOMString value);
deleter void removeItem(DOMString key);
void clear();
@@ -1891,70 +2015,53 @@ dictionary StorageEventInit : EventInit {
};
interface HTMLAppletElement : HTMLElement {
- attribute DOMString align;
- attribute DOMString alt;
- attribute DOMString archive;
- attribute DOMString code;
- attribute DOMString codeBase;
- attribute DOMString height;
- attribute unsigned long hspace;
- attribute DOMString name;
- attribute DOMString _object; // the underscore is not part of the identifier
- attribute unsigned long vspace;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString alt;
+ attribute DOMString archive;
+ attribute DOMString code;
+ attribute DOMString codeBase;
+ attribute DOMString height;
+ attribute unsigned long hspace;
+ attribute DOMString name;
+ attribute DOMString _object; // the underscore is not part of the identifier
+ attribute unsigned long vspace;
+ attribute DOMString width;
};
interface HTMLMarqueeElement : HTMLElement {
- attribute DOMString behavior;
- attribute DOMString bgColor;
- attribute DOMString direction;
- attribute DOMString height;
- attribute unsigned long hspace;
- attribute long loop;
- attribute unsigned long scrollAmount;
- attribute unsigned long scrollDelay;
- attribute boolean trueSpeed;
- attribute unsigned long vspace;
- attribute DOMString width;
-
- attribute EventHandler onbounce;
- attribute EventHandler onfinish;
- attribute EventHandler onstart;
+ attribute DOMString behavior;
+ attribute DOMString bgColor;
+ attribute DOMString direction;
+ attribute DOMString height;
+ attribute unsigned long hspace;
+ attribute long loop;
+ attribute unsigned long scrollAmount;
+ attribute unsigned long scrollDelay;
+ attribute boolean trueSpeed;
+ attribute unsigned long vspace;
+ attribute DOMString width;
+
+ attribute EventHandler onbounce;
+ attribute EventHandler onfinish;
+ attribute EventHandler onstart;
void start();
void stop();
};
interface HTMLFrameSetElement : HTMLElement {
- attribute DOMString cols;
- attribute DOMString rows;
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute EventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler onload;
- attribute EventHandler onmessage;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onpopstate;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onstorage;
- attribute EventHandler onunload;
+ attribute DOMString cols;
+ attribute DOMString rows;
};
+HTMLFrameSetElement implements WindowEventHandlers;
interface HTMLFrameElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString scrolling;
- attribute DOMString src;
- attribute DOMString frameBorder;
- attribute DOMString longDesc;
- attribute boolean noResize;
+ attribute DOMString name;
+ attribute DOMString scrolling;
+ attribute DOMString src;
+ attribute DOMString frameBorder;
+ attribute DOMString longDesc;
+ attribute boolean noResize;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
@@ -1963,22 +2070,15 @@ interface HTMLFrameElement : HTMLElement {
};
partial interface HTMLAnchorElement {
- attribute DOMString coords;
- attribute DOMString charset;
- attribute DOMString name;
- attribute DOMString rev;
- attribute DOMString shape;
+ attribute DOMString coords;
+ attribute DOMString charset;
+ attribute DOMString name;
+ attribute DOMString rev;
+ attribute DOMString shape;
};
partial interface HTMLAreaElement {
- attribute boolean noHref;
-};
-
-interface HTMLBaseFontElement : HTMLElement {
- attribute DOMString color;
- attribute DOMString face;
- attribute long size;
-
+ attribute boolean noHref;
};
partial interface HTMLBodyElement {
@@ -1987,155 +2087,155 @@ partial interface HTMLBodyElement {
[TreatNullAs=EmptyString] attribute DOMString vLink;
[TreatNullAs=EmptyString] attribute DOMString aLink;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
- attribute DOMString background;
+ attribute DOMString background;
};
partial interface HTMLBRElement {
- attribute DOMString clear;
+ attribute DOMString clear;
};
partial interface HTMLTableCaptionElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLTableColElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
+ attribute DOMString width;
};
interface HTMLDirectoryElement : HTMLElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLDivElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLDListElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLEmbedElement {
- attribute DOMString align;
- attribute DOMString name;
+ attribute DOMString align;
+ attribute DOMString name;
};
interface HTMLFontElement : HTMLElement {
[TreatNullAs=EmptyString] attribute DOMString color;
- attribute DOMString face;
- attribute DOMString size;
-
+ attribute DOMString face;
+ attribute DOMString size;
};
partial interface HTMLHeadingElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLHRElement {
- attribute DOMString align;
- attribute DOMString color;
- attribute boolean noShade;
- attribute DOMString size;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString color;
+ attribute boolean noShade;
+ attribute DOMString size;
+ attribute DOMString width;
};
partial interface HTMLHtmlElement {
- attribute DOMString version;
+ attribute DOMString version;
};
partial interface HTMLIFrameElement {
- attribute DOMString align;
- attribute DOMString scrolling;
- attribute DOMString frameBorder;
- attribute DOMString longDesc;
+ attribute DOMString align;
+ attribute DOMString scrolling;
+ attribute DOMString frameBorder;
+ attribute DOMString longDesc;
[TreatNullAs=EmptyString] attribute DOMString marginHeight;
[TreatNullAs=EmptyString] attribute DOMString marginWidth;
};
partial interface HTMLImageElement {
- attribute DOMString name;
- attribute DOMString align;
- attribute unsigned long hspace;
- attribute unsigned long vspace;
- attribute DOMString longDesc;
+ attribute DOMString name;
+ attribute DOMString lowsrc;
+ attribute DOMString align;
+ attribute unsigned long hspace;
+ attribute unsigned long vspace;
+ attribute DOMString longDesc;
[TreatNullAs=EmptyString] attribute DOMString border;
};
partial interface HTMLInputElement {
- attribute DOMString align;
- attribute DOMString useMap;
+ attribute DOMString align;
+ attribute DOMString useMap;
};
partial interface HTMLLegendElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLLIElement {
- attribute DOMString type;
+ attribute DOMString type;
};
partial interface HTMLLinkElement {
- attribute DOMString charset;
- attribute DOMString rev;
- attribute DOMString target;
+ attribute DOMString charset;
+ attribute DOMString rev;
+ attribute DOMString target;
};
partial interface HTMLMenuElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLMetaElement {
- attribute DOMString scheme;
+ attribute DOMString scheme;
};
partial interface HTMLObjectElement {
- attribute DOMString align;
- attribute DOMString archive;
- attribute DOMString code;
- attribute boolean declare;
- attribute unsigned long hspace;
- attribute DOMString standby;
- attribute unsigned long vspace;
- attribute DOMString codeBase;
- attribute DOMString codeType;
+ attribute DOMString align;
+ attribute DOMString archive;
+ attribute DOMString code;
+ attribute boolean declare;
+ attribute unsigned long hspace;
+ attribute DOMString standby;
+ attribute unsigned long vspace;
+ attribute DOMString codeBase;
+ attribute DOMString codeType;
[TreatNullAs=EmptyString] attribute DOMString border;
};
partial interface HTMLOListElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLParagraphElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLParamElement {
- attribute DOMString type;
- attribute DOMString valueType;
+ attribute DOMString type;
+ attribute DOMString valueType;
};
partial interface HTMLPreElement {
- attribute long width;
+ attribute long width;
};
partial interface HTMLScriptElement {
- attribute DOMString event;
- attribute DOMString htmlFor;
+ attribute DOMString event;
+ attribute DOMString htmlFor;
};
partial interface HTMLTableElement {
- attribute DOMString align;
- attribute DOMString border;
- attribute DOMString frame;
- attribute DOMString rules;
- attribute DOMString summary;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString border;
+ attribute DOMString frame;
+ attribute DOMString rules;
+ attribute DOMString summary;
+ attribute DOMString width;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
[TreatNullAs=EmptyString] attribute DOMString cellPadding;
@@ -2143,39 +2243,42 @@ partial interface HTMLTableElement {
};
partial interface HTMLTableSectionElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
};
partial interface HTMLTableCellElement {
- attribute DOMString abbr;
- attribute DOMString align;
- attribute DOMString axis;
- attribute DOMString height;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString axis;
+ attribute DOMString height;
+ attribute DOMString width;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute boolean noWrap;
- attribute DOMString vAlign;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute boolean noWrap;
+ attribute DOMString vAlign;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
};
+partial interface HTMLTableDataCellElement {
+ attribute DOMString abbr;
+};
+
partial interface HTMLTableRowElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
};
partial interface HTMLUListElement {
- attribute boolean compact;
- attribute DOMString type;
+ attribute boolean compact;
+ attribute DOMString type;
};
partial interface Document {
@@ -2189,7 +2292,14 @@ partial interface Document {
readonly attribute HTMLCollection applets;
void clear();
+ void captureEvents();
+ void releaseEvents();
readonly attribute HTMLAllCollection all;
};
+partial interface Window {
+ void captureEvents();
+ void releaseEvents();
+};
+
-----------------------------------------------------------------------
Summary of changes:
README | 62 +-
src/Makefile | 3 +-
src/nsgenbind-ast.c | 759 +++++------
src/nsgenbind-ast.h | 113 +-
src/nsgenbind-lexer.l | 39 +-
src/nsgenbind-parser.y | 386 +++---
src/nsgenbind.c | 324 +++--
src/options.h | 15 +-
src/utils.c | 52 +
src/utils.h | 21 +
test/data/bindings/browser-duk.bnd | 66 +
test/data/idl/console.idl | 24 +
test/data/idl/dom.idl | 343 ++---
test/data/idl/html.idl | 2450 +++++++++++++++++++-----------------
14 files changed, 2556 insertions(+), 2101 deletions(-)
create mode 100644 src/utils.c
create mode 100644 src/utils.h
create mode 100644 test/data/bindings/browser-duk.bnd
create mode 100644 test/data/idl/console.idl
diff --git a/README b/README
index 70d224f..e260642 100644
--- a/README
+++ b/README
@@ -7,4 +7,64 @@ files and a binding configuration file.
building
--------
-The tool requires bison and flex as pre-requisites
\ No newline at end of file
+The tool requires bison and flex as pre-requisites
+
+Commandline
+-----------
+
+nsgenbind [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir
+
+-v
+The verbose switch makes the tool verbose about what operations it is
+performing instead of teh default of only reporting errors.
+
+-g
+The generated code will be augmented with runtime debug logging so it
+can be traced
+
+-D
+The tool will generate output to allow debugging of output conversion.
+This includes dumps of the binding and IDL files AST
+
+-W
+This switch will make the tool generate warnings about various issues
+with the binding or IDL files being processed.
+
+-I
+An additional search path may be given so idl files can be located.
+
+The tool requires a binding file as input and an output directory in
+which to place its output.
+
+
+Web IDL
+-------
+
+The IDL is specified in a w3c document[1] but the second edition is in
+draft[2] and covers many of the features actually used in the whatwg
+dom and html spec.
+
+The principal usage of the IDL is to define the interface between
+scripts and a browsers internal state. For example the DOM[3] and
+HTML[4] specs contain all the IDL for acessing the DOM and interacting
+with a web browser (this not strictly true as there are several
+interfaces simply not in the standards such as console).
+
+The IDL uses some slightly strange names than other object orientated
+systems.
+
+ IDL | JS | OOP | Notes
+-----------+------------------+----------------+----------------------------
+ interface | prototype | class | The data definition of
+ | | | the object
+ constants | read-only value | class variable | Belong to class, one copy
+ | property on the | |
+ | prototype | |
+ operation | method | method | functions that can be called
+ attribute | property | property | Variables set per instance
+-----------+------------------+----------------+----------------------------
+
+[1] http://www.w3.org/TR/WebIDL/
+[2] https://heycam.github.io/webidl/
+[3] https://dom.spec.whatwg.org/
+[4] https://html.spec.whatwg.org/
diff --git a/src/Makefile b/src/Makefile
index e93cb99..3e5b8af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,8 @@
CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
# Sources in this directory
-DIR_SOURCES := nsgenbind.c webidl-ast.c nsgenbind-ast.c jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
+DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c
+# jsapi-libdom.c jsapi-libdom-function.c jsapi-libdom-property.c jsapi-libdom-init.c jsapi-libdom-new.c jsapi-libdom-infmap.c jsapi-libdom-jsclass.c
SOURCES := $(SOURCES) $(BUILDDIR)/nsgenbind-parser.c $(BUILDDIR)/nsgenbind-lexer.c $(BUILDDIR)/webidl-parser.c $(BUILDDIR)/webidl-lexer.c
diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
index 2f630b7..49477cf 100644
--- a/src/nsgenbind-ast.c
+++ b/src/nsgenbind-ast.c
@@ -14,7 +14,9 @@
#include <stdlib.h>
#include <errno.h>
#include <string.h>
+#include <stdarg.h>
+#include "utils.h"
#include "nsgenbind-ast.h"
#include "options.h"
@@ -26,478 +28,521 @@ extern int nsgenbind_parse(struct genbind_node **genbind_ast);
/* terminal nodes have a value only */
struct genbind_node {
- enum genbind_node_type type;
- struct genbind_node *l;
- union {
- void *value;
- struct genbind_node *node;
- char *text;
- int number; /* node data is an integer */
- } r;
+ enum genbind_node_type type;
+ struct genbind_node *l;
+ union {
+ void *value;
+ struct genbind_node *node;
+ char *text;
+ int number; /* node data is an integer */
+ } r;
};
char *genbind_strapp(char *a, char *b)
{
- char *fullstr;
- int fulllen;
- fulllen = strlen(a) + strlen(b) + 1;
- fullstr = malloc(fulllen);
- snprintf(fullstr, fulllen, "%s%s", a, b);
- free(a);
- free(b);
- return fullstr;
+ char *fullstr;
+ int fulllen;
+ fulllen = strlen(a) + strlen(b) + 1;
+ fullstr = malloc(fulllen);
+ snprintf(fullstr, fulllen, "%s%s", a, b);
+ free(a);
+ free(b);
+ return fullstr;
}
struct genbind_node *
genbind_node_link(struct genbind_node *tgt, struct genbind_node *src)
{
- tgt->l = src;
- return tgt;
+ tgt->l = src;
+ return tgt;
}
struct genbind_node *
genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r)
{
- struct genbind_node *nn;
- nn = calloc(1, sizeof(struct genbind_node));
- nn->type = type;
- nn->l = l;
- nn->r.value = r;
- return nn;
+ struct genbind_node *nn;
+ nn = calloc(1, sizeof(struct genbind_node));
+ nn->type = type;
+ nn->l = l;
+ nn->r.value = r;
+ return nn;
}
/* exported interface defined in nsgenbind-ast.h */
int
genbind_node_foreach_type(struct genbind_node *node,
- enum genbind_node_type type,
- genbind_callback_t *cb,
- void *ctx)
+ enum genbind_node_type type,
+ genbind_callback_t *cb,
+ void *ctx)
{
- int ret;
-
- if (node == NULL) {
- return -1;
- }
- if (node->l != NULL) {
- ret = genbind_node_foreach_type(node->l, type, cb, ctx);
- if (ret != 0) {
- return ret;
- }
- }
- if (node->type == type) {
- return cb(node, ctx);
- }
-
- return 0;
+ int ret;
+
+ if (node == NULL) {
+ return -1;
+ }
+ if (node->l != NULL) {
+ ret = genbind_node_foreach_type(node->l, type, cb, ctx);
+ if (ret != 0) {
+ return ret;
+ }
+ }
+ if (node->type == type) {
+ return cb(node, ctx);
+ }
+
+ return 0;
}
static int genbind_enumerate_node(struct genbind_node *node, void *ctx)
{
- node = node;
- (*((int *)ctx))++;
- return 0;
+ node = node;
+ (*((int *)ctx))++;
+ return 0;
}
/* exported interface defined in nsgenbind-ast.h */
int
genbind_node_enumerate_type(struct genbind_node *node,
- enum genbind_node_type type)
+ enum genbind_node_type type)
{
- int count = 0;
- genbind_node_foreach_type(node,
- type,
- genbind_enumerate_node,
- &count);
- return count;
+ int count = 0;
+ genbind_node_foreach_type(node,
+ type,
+ genbind_enumerate_node,
+ &count);
+ return count;
}
/* exported interface defined in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find(struct genbind_node *node,
- struct genbind_node *prev,
- genbind_callback_t *cb,
- void *ctx)
+ struct genbind_node *prev,
+ genbind_callback_t *cb,
+ void *ctx)
{
- struct genbind_node *ret;
+ struct genbind_node *ret;
- if ((node == NULL) || (node == prev)) {
- return NULL;
- }
+ if ((node == NULL) || (node == prev)) {
+ return NULL;
+ }
- if (node->l != prev) {
- ret = genbind_node_find(node->l, prev, cb, ctx);
- if (ret != NULL) {
- return ret;
- }
- }
+ if (node->l != prev) {
+ ret = genbind_node_find(node->l, prev, cb, ctx);
+ if (ret != NULL) {
+ return ret;
+ }
+ }
- if (cb(node, ctx) != 0) {
- return node;
- }
+ if (cb(node, ctx) != 0) {
+ return node;
+ }
- return NULL;
+ return NULL;
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type)
+ struct genbind_node *prev,
+ enum genbind_node_type type)
{
- return genbind_node_find(node,
- prev,
- genbind_cmp_node_type,
- (void *)type);
+ return genbind_node_find(node,
+ prev,
+ genbind_cmp_node_type,
+ (void *)type);
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type_ident(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type,
- const char *ident)
+ struct genbind_node *prev,
+ enum genbind_node_type type,
+ const char *ident)
{
- struct genbind_node *found_node;
- struct genbind_node *ident_node;
-
- if (ident == NULL) {
- return NULL;
- }
-
- found_node = genbind_node_find_type(node, prev, type);
-
- while (found_node != NULL) {
- /* look for an ident node */
- ident_node = genbind_node_find_type(
- genbind_node_getnode(found_node),
- NULL,
- GENBIND_NODE_TYPE_IDENT);
-
- while (ident_node != NULL) {
- /* check for matching text */
- if (strcmp(ident_node->r.text, ident) == 0) {
- return found_node;
- }
-
- ident_node = genbind_node_find_type(
- genbind_node_getnode(found_node),
- ident_node,
- GENBIND_NODE_TYPE_IDENT);
- }
-
-
- /* look for next matching node */
- found_node = genbind_node_find_type(node, found_node, type);
- }
- return found_node;
+ struct genbind_node *found_node;
+ struct genbind_node *ident_node;
+
+ if (ident == NULL) {
+ return NULL;
+ }
+
+ found_node = genbind_node_find_type(node, prev, type);
+
+ while (found_node != NULL) {
+ /* look for an ident node */
+ ident_node = genbind_node_find_type(
+ genbind_node_getnode(found_node),
+ NULL,
+ GENBIND_NODE_TYPE_IDENT);
+
+ while (ident_node != NULL) {
+ /* check for matching text */
+ if (strcmp(ident_node->r.text, ident) == 0) {
+ return found_node;
+ }
+
+ ident_node = genbind_node_find_type(
+ genbind_node_getnode(found_node),
+ ident_node,
+ GENBIND_NODE_TYPE_IDENT);
+ }
+
+
+ /* look for next matching node */
+ found_node = genbind_node_find_type(node, found_node, type);
+ }
+ return found_node;
}
/* exported interface documented in nsgenbind-ast.h */
struct genbind_node *
genbind_node_find_type_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type type,
- const char *ident)
+ struct genbind_node *prev,
+ enum genbind_node_type type,
+ const char *ident)
{
- struct genbind_node *found_node;
- struct genbind_node *ident_node;
-
- found_node = genbind_node_find_type(node, prev, type);
-
-
- while (found_node != NULL) {
- /* look for a type node */
- ident_node = genbind_node_find_type(genbind_node_getnode(found_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE);
- if (ident_node != NULL) {
- if (strcmp(ident_node->r.text, ident) == 0)
- break;
- }
-
- /* look for next matching node */
- found_node = genbind_node_find_type(node, found_node, type);
- }
- return found_node;
+ struct genbind_node *found_node;
+ struct genbind_node *ident_node;
+
+ found_node = genbind_node_find_type(node, prev, type);
+
+
+ while (found_node != NULL) {
+ /* look for a type node */
+ ident_node = genbind_node_find_type(genbind_node_getnode(found_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE);
+ if (ident_node != NULL) {
+ if (strcmp(ident_node->r.text, ident) == 0)
+ break;
+ }
+
+ /* look for next matching node */
+ found_node = genbind_node_find_type(node, found_node, type);
+ }
+ return found_node;
}
int genbind_cmp_node_type(struct genbind_node *node, void *ctx)
{
- if (node->type == (enum genbind_node_type)ctx)
- return 1;
- return 0;
+ if (node->type == (enum genbind_node_type)ctx)
+ return 1;
+ return 0;
}
char *genbind_node_gettext(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_WEBIDLFILE:
- case GENBIND_NODE_TYPE_STRING:
- case GENBIND_NODE_TYPE_PREAMBLE:
- case GENBIND_NODE_TYPE_PROLOGUE:
- case GENBIND_NODE_TYPE_EPILOGUE:
- case GENBIND_NODE_TYPE_IDENT:
- case GENBIND_NODE_TYPE_TYPE:
- case GENBIND_NODE_TYPE_CBLOCK:
- return node->r.text;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_WEBIDL:
+ case GENBIND_NODE_TYPE_STRING:
+ case GENBIND_NODE_TYPE_PREFACE:
+ case GENBIND_NODE_TYPE_PROLOGUE:
+ case GENBIND_NODE_TYPE_EPILOGUE:
+ case GENBIND_NODE_TYPE_POSTFACE:
+ case GENBIND_NODE_TYPE_IDENT:
+ case GENBIND_NODE_TYPE_TYPE:
+ case GENBIND_NODE_TYPE_CDATA:
+ return node->r.text;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
struct genbind_node *genbind_node_getnode(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_HDRCOMMENT:
- case GENBIND_NODE_TYPE_BINDING:
- case GENBIND_NODE_TYPE_BINDING_PRIVATE:
- case GENBIND_NODE_TYPE_BINDING_INTERNAL:
- case GENBIND_NODE_TYPE_BINDING_PROPERTY:
- case GENBIND_NODE_TYPE_BINDING_INTERFACE:
- case GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS:
- case GENBIND_NODE_TYPE_OPERATION:
- case GENBIND_NODE_TYPE_API:
- case GENBIND_NODE_TYPE_GETTER:
- case GENBIND_NODE_TYPE_SETTER:
- return node->r.node;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_BINDING:
+ case GENBIND_NODE_TYPE_CLASS:
+ case GENBIND_NODE_TYPE_PRIVATE:
+ case GENBIND_NODE_TYPE_INTERNAL:
+ case GENBIND_NODE_TYPE_PROPERTY:
+ case GENBIND_NODE_TYPE_FLAGS:
+ case GENBIND_NODE_TYPE_METHOD:
+ case GENBIND_NODE_TYPE_PARAMETER:
+ return node->r.node;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
int *genbind_node_getint(struct genbind_node *node)
{
- if (node != NULL) {
- switch(node->type) {
- case GENBIND_NODE_TYPE_MODIFIER:
- return &node->r.number;
-
- default:
- break;
- }
- }
- return NULL;
+ if (node != NULL) {
+ switch(node->type) {
+ case GENBIND_NODE_TYPE_METHOD_TYPE:
+ case GENBIND_NODE_TYPE_MODIFIER:
+ return &node->r.number;
+
+ default:
+ break;
+ }
+ }
+ return NULL;
}
static const char *genbind_node_type_to_str(enum genbind_node_type type)
{
- switch(type) {
- case GENBIND_NODE_TYPE_IDENT:
- return "Ident";
+ switch(type) {
+ case GENBIND_NODE_TYPE_IDENT:
+ return "Ident";
- case GENBIND_NODE_TYPE_ROOT:
- return "Root";
+ case GENBIND_NODE_TYPE_ROOT:
+ return "Root";
- case GENBIND_NODE_TYPE_WEBIDLFILE:
- return "webidlfile";
+ case GENBIND_NODE_TYPE_WEBIDL:
+ return "webidl";
- case GENBIND_NODE_TYPE_HDRCOMMENT:
- return "HdrComment";
+ case GENBIND_NODE_TYPE_STRING:
+ return "String";
- case GENBIND_NODE_TYPE_STRING:
- return "String";
+ case GENBIND_NODE_TYPE_PREFACE:
+ return "Preface";
- case GENBIND_NODE_TYPE_PREAMBLE:
- return "Preamble";
+ case GENBIND_NODE_TYPE_POSTFACE:
+ return "Postface";
- case GENBIND_NODE_TYPE_BINDING:
- return "Binding";
+ case GENBIND_NODE_TYPE_PROLOGUE:
+ return "Prologue";
- case GENBIND_NODE_TYPE_TYPE:
- return "Type";
+ case GENBIND_NODE_TYPE_EPILOGUE:
+ return "Epilogue";
- case GENBIND_NODE_TYPE_BINDING_PRIVATE:
- return "Private";
+ case GENBIND_NODE_TYPE_BINDING:
+ return "Binding";
- case GENBIND_NODE_TYPE_BINDING_INTERNAL:
- return "Internal";
+ case GENBIND_NODE_TYPE_TYPE:
+ return "Type";
- case GENBIND_NODE_TYPE_BINDING_INTERFACE:
- return "Interface";
+ case GENBIND_NODE_TYPE_PRIVATE:
+ return "Private";
- case GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS:
- return "Flags";
+ case GENBIND_NODE_TYPE_INTERNAL:
+ return "Internal";
- case GENBIND_NODE_TYPE_BINDING_PROPERTY:
- return "Property";
+ case GENBIND_NODE_TYPE_CLASS:
+ return "Class";
- case GENBIND_NODE_TYPE_OPERATION:
- return "Operation";
+ case GENBIND_NODE_TYPE_FLAGS:
+ return "Flags";
- case GENBIND_NODE_TYPE_API:
- return "API";
+ case GENBIND_NODE_TYPE_PROPERTY:
+ return "Property";
- case GENBIND_NODE_TYPE_GETTER:
- return "Getter";
+ case GENBIND_NODE_TYPE_METHOD:
+ return "Method";
- case GENBIND_NODE_TYPE_SETTER:
- return "Setter";
+ case GENBIND_NODE_TYPE_METHOD_TYPE:
+ return "Type";
- case GENBIND_NODE_TYPE_CBLOCK:
- return "CBlock";
+ case GENBIND_NODE_TYPE_PARAMETER:
+ return "Parameter";
- default:
- return "Unknown";
- }
+ case GENBIND_NODE_TYPE_CDATA:
+ return "CBlock";
+
+ default:
+ return "Unknown";
+ }
}
-int genbind_ast_dump(struct genbind_node *node, int indent)
+/** dump ast node to file at indent level */
+static int genbind_ast_dump(FILE *dfile, struct genbind_node *node, int indent)
{
- const char *SPACES=" ";
- char *txt;
-
- while (node != NULL) {
- printf("%.*s%s", indent, SPACES, genbind_node_type_to_str(node->type));
-
- txt = genbind_node_gettext(node);
- if (txt == NULL) {
- printf("\n");
- genbind_ast_dump(genbind_node_getnode(node), indent + 2);
- } else {
- printf(": \"%.*s\"\n", 75 - indent, txt);
- }
- node = node->l;
- }
- return 0;
+ const char *SPACES=" ";
+ char *txt;
+ int *val;
+
+ while (node != NULL) {
+ fprintf(dfile, "%.*s%s", indent, SPACES,
+ genbind_node_type_to_str(node->type));
+
+ txt = genbind_node_gettext(node);
+ if (txt == NULL) {
+ val = genbind_node_getint(node);
+ if (val == NULL) {
+ fprintf(dfile, "\n");
+ genbind_ast_dump(dfile,
+ genbind_node_getnode(node),
+ indent + 2);
+ } else {
+ fprintf(dfile, ": %d\n", *val);
+ }
+ } else {
+ fprintf(dfile, ": \"%.*s\"\n", 75 - indent, txt);
+ }
+ node = node->l;
+ }
+ return 0;
}
-FILE *genbindopen(const char *filename)
+
+/* exported interface documented in nsgenbind-ast.h */
+int genbind_dump_ast(struct genbind_node *node)
{
- FILE *genfile;
- char *fullname;
- int fulllen;
- static char *prevfilepath = NULL;
-
- /* try filename raw */
- genfile = fopen(filename, "r");
- if (genfile != NULL) {
- if (options->verbose) {
- printf("Opened Genbind file %s\n", filename);
- }
- if (prevfilepath == NULL) {
- fullname = strrchr(filename, '/');
- if (fullname == NULL) {
- fulllen = strlen(filename);
- } else {
- fulllen = fullname - filename;
- }
- prevfilepath = strndup(filename,fulllen);
- }
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- filename);
- }
- return genfile;
- }
-
- /* try based on previous filename */
- if (prevfilepath != NULL) {
- fulllen = strlen(prevfilepath) + strlen(filename) + 2;
- fullname = malloc(fulllen);
- snprintf(fullname, fulllen, "%s/%s", prevfilepath, filename);
- if (options->debug) {
- printf("Attempting to open Genbind file %s\n", fullname);
- }
- genfile = fopen(fullname, "r");
- if (genfile != NULL) {
- if (options->verbose) {
- printf("Opened Genbind file %s\n", fullname);
- }
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- fullname);
- }
- free(fullname);
- return genfile;
- }
- free(fullname);
- }
-
- /* try on idl path */
- if (options->idlpath != NULL) {
- fulllen = strlen(options->idlpath) + strlen(filename) + 2;
- fullname = malloc(fulllen);
- snprintf(fullname, fulllen, "%s/%s", options->idlpath, filename);
- genfile = fopen(fullname, "r");
- if ((genfile != NULL) && options->verbose) {
- printf("Opend Genbind file %s\n", fullname);
- if (options->depfilehandle != NULL) {
- fprintf(options->depfilehandle, " \\\n\t%s",
- fullname);
- }
- }
-
- free(fullname);
- }
-
- return genfile;
+ FILE *dumpf;
+
+ /* only dump AST to file if required */
+ if (!options->debug) {
+ return 0;
+ }
+
+ dumpf = genb_fopen("binding-ast", "w");
+ if (dumpf == NULL) {
+ return 2;
+ }
+
+ genbind_ast_dump(dumpf, node, 0);
+
+ fclose(dumpf);
+
+ return 0;
}
-int genbind_parsefile(char *infilename, struct genbind_node **ast)
+FILE *genbindopen(const char *filename)
{
- FILE *infile;
-
- /* open input file */
- if ((infilename[0] == '-') &&
- (infilename[1] == 0)) {
- if (options->verbose) {
- printf("Using stdin for input\n");
- }
- infile = stdin;
- } else {
- infile = genbindopen(infilename);
- }
-
- if (!infile) {
- fprintf(stderr, "Error opening %s: %s\n",
- infilename,
- strerror(errno));
- return 3;
- }
-
- if (options->debug) {
- nsgenbind_debug = 1;
- nsgenbind__flex_debug = 1;
- }
-
- /* set flex to read from file */
- nsgenbind_restart(infile);
-
- /* process binding */
- return nsgenbind_parse(ast);
+ FILE *genfile;
+ char *fullname;
+ int fulllen;
+ static char *prevfilepath = NULL;
+
+ /* try filename raw */
+ genfile = fopen(filename, "r");
+ if (genfile != NULL) {
+ if (options->verbose) {
+ printf("Opened Genbind file %s\n", filename);
+ }
+ if (prevfilepath == NULL) {
+ fullname = strrchr(filename, '/');
+ if (fullname == NULL) {
+ fulllen = strlen(filename);
+ } else {
+ fulllen = fullname - filename;
+ }
+ prevfilepath = strndup(filename,fulllen);
+ }
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ filename);
+ }
+#endif
+ return genfile;
+ }
+
+ /* try based on previous filename */
+ if (prevfilepath != NULL) {
+ fulllen = strlen(prevfilepath) + strlen(filename) + 2;
+ fullname = malloc(fulllen);
+ snprintf(fullname, fulllen, "%s/%s", prevfilepath, filename);
+ if (options->debug) {
+ printf("Attempting to open Genbind file %s\n", fullname);
+ }
+ genfile = fopen(fullname, "r");
+ if (genfile != NULL) {
+ if (options->verbose) {
+ printf("Opened Genbind file %s\n", fullname);
+ }
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ fullname);
+ }
+#endif
+ free(fullname);
+ return genfile;
+ }
+ free(fullname);
+ }
+
+ /* try on idl path */
+ if (options->idlpath != NULL) {
+ fulllen = strlen(options->idlpath) + strlen(filename) + 2;
+ fullname = malloc(fulllen);
+ snprintf(fullname, fulllen, "%s/%s", options->idlpath, filename);
+ genfile = fopen(fullname, "r");
+ if ((genfile != NULL) && options->verbose) {
+ printf("Opend Genbind file %s\n", fullname);
+#if 0
+ if (options->depfilehandle != NULL) {
+ fprintf(options->depfilehandle, " \\\n\t%s",
+ fullname);
+ }
+#endif
+ }
+
+ free(fullname);
+ }
+ return genfile;
}
-#ifdef NEED_STRNDUP
+/**
+ * standard IO handle for parse trace logging.
+ */
+static FILE *genbind_parsetracef;
-char *strndup(const char *s, size_t n)
+int genbind_parsefile(char *infilename, struct genbind_node **ast)
{
- size_t len;
- char *s2;
-
- for (len = 0; len != n && s[len]; len++)
- continue;
+ FILE *infile;
+ int ret;
+
+ /* open input file */
+ infile = genbindopen(infilename);
+ if (!infile) {
+ fprintf(stderr, "Error opening %s: %s\n",
+ infilename,
+ strerror(errno));
+ return 3;
+ }
+
+ /* if debugging enabled enable parser tracing and send to file */
+ if (options->debug) {
+ nsgenbind_debug = 1;
+ nsgenbind__flex_debug = 1;
+ genbind_parsetracef = genb_fopen("binding-trace", "w");
+ } else {
+ genbind_parsetracef = NULL;
+ }
+
+ /* set flex to read from file */
+ nsgenbind_restart(infile);
+
+ /* process binding */
+ ret = nsgenbind_parse(ast);
+
+ /* close tracefile if open */
+ if (genbind_parsetracef != NULL) {
+ fclose(genbind_parsetracef);
+ }
+
+ return ret;
+}
- s2 = malloc(len + 1);
- if (!s2)
- return 0;
+int genbind_fprintf(FILE *stream, const char *format, ...)
+{
+ va_list ap;
+ int ret;
- memcpy(s2, s, len);
- s2[len] = 0;
- return s2;
-}
+ va_start(ap, format);
-#endif
+ if (genbind_parsetracef == NULL) {
+ ret = vfprintf(stream, format, ap);
+ } else {
+ ret = vfprintf(genbind_parsetracef, format, ap);
+ }
+ va_end(ap);
+ return ret;
+}
diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
index 4911f5a..f6800fb 100644
--- a/src/nsgenbind-ast.h
+++ b/src/nsgenbind-ast.h
@@ -10,36 +10,46 @@
#define nsgenbind_nsgenbind_ast_h
enum genbind_node_type {
- GENBIND_NODE_TYPE_ROOT = 0,
- GENBIND_NODE_TYPE_IDENT, /**< generic identifier string */
- GENBIND_NODE_TYPE_TYPE, /**< generic type string */
- GENBIND_NODE_TYPE_MODIFIER, /**< node modifier */
-
- GENBIND_NODE_TYPE_CBLOCK,
- GENBIND_NODE_TYPE_WEBIDLFILE,
- GENBIND_NODE_TYPE_HDRCOMMENT,
- GENBIND_NODE_TYPE_STRING,
- GENBIND_NODE_TYPE_PREAMBLE,
- GENBIND_NODE_TYPE_PROLOGUE,
- GENBIND_NODE_TYPE_EPILOGUE,
- GENBIND_NODE_TYPE_BINDING,
- GENBIND_NODE_TYPE_BINDING_PRIVATE,
- GENBIND_NODE_TYPE_BINDING_INTERNAL,
- GENBIND_NODE_TYPE_BINDING_INTERFACE,
- GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS,
- GENBIND_NODE_TYPE_BINDING_PROPERTY,
- GENBIND_NODE_TYPE_API,
- GENBIND_NODE_TYPE_OPERATION,
- GENBIND_NODE_TYPE_GETTER,
- GENBIND_NODE_TYPE_SETTER,
+ GENBIND_NODE_TYPE_ROOT = 0,
+ GENBIND_NODE_TYPE_IDENT, /**< generic identifier string */
+ GENBIND_NODE_TYPE_TYPE, /**< generic type string */
+ GENBIND_NODE_TYPE_MODIFIER, /**< node modifier */
+ GENBIND_NODE_TYPE_CDATA, /**< verbatim block of character data */
+ GENBIND_NODE_TYPE_STRING, /**< text string */
+
+ GENBIND_NODE_TYPE_BINDING,
+ GENBIND_NODE_TYPE_WEBIDL,
+ GENBIND_NODE_TYPE_PREFACE,
+ GENBIND_NODE_TYPE_PROLOGUE,
+ GENBIND_NODE_TYPE_EPILOGUE,
+ GENBIND_NODE_TYPE_POSTFACE,
+
+ GENBIND_NODE_TYPE_CLASS, /**< class definition */
+ GENBIND_NODE_TYPE_PRIVATE,
+ GENBIND_NODE_TYPE_INTERNAL,
+ GENBIND_NODE_TYPE_PROPERTY,
+ GENBIND_NODE_TYPE_FLAGS,
+
+ GENBIND_NODE_TYPE_METHOD, /**< binding method */
+ GENBIND_NODE_TYPE_METHOD_TYPE, /**< binding method type */
+ GENBIND_NODE_TYPE_PARAMETER, /**< method parameter */
};
/* modifier flags */
enum genbind_type_modifier {
- GENBIND_TYPE_NONE = 0,
- GENBIND_TYPE_TYPE = 1, /**< identifies a type handler */
- GENBIND_TYPE_UNSHARED = 2, /**< unshared item */
- GENBIND_TYPE_TYPE_UNSHARED = 3, /**< identifies a unshared type handler */
+ GENBIND_TYPE_NONE = 0,
+ GENBIND_TYPE_TYPE = 1, /**< identifies a type handler */
+ GENBIND_TYPE_UNSHARED = 2, /**< unshared item */
+ GENBIND_TYPE_TYPE_UNSHARED = 3, /**< identifies a unshared type handler */
+};
+
+/* binding method types */
+enum genbind_method_type {
+ GENBIND_METHOD_TYPE_INIT = 0,
+ GENBIND_METHOD_TYPE_FINI = 1, /**< */
+ GENBIND_METHOD_TYPE_METHOD = 2, /**< */
+ GENBIND_METHOD_TYPE_GETTER = 3, /**< */
+ GENBIND_METHOD_TYPE_SETTER = 4, /**< */
};
struct genbind_node;
@@ -47,6 +57,8 @@ struct genbind_node;
/** callback for search and iteration routines */
typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx);
+int genbind_fprintf(FILE *stream, const char *format, ...);
+
int genbind_cmp_node_type(struct genbind_node *node, void *ctx);
FILE *genbindopen(const char *filename);
@@ -58,9 +70,19 @@ char *genbind_strapp(char *a, char *b);
struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
-int genbind_ast_dump(struct genbind_node *ast, int indent);
+/**
+ * Dump the binding AST to file
+ *
+ * If the debug flag has been set this causes the binding AST to be written to
+ * a binding-ast output file
+ *
+ * \param node Node of the tree to start dumping from (usually tree root)
+ * \return 0 on sucess or non zero on faliure and error message printed.
+ */
+int genbind_dump_ast(struct genbind_node *node);
-/** Depth first left hand search using user provided comparison
+/**
+ *Depth first left hand search using user provided comparison
*
* @param node The node to start the search from
* @param prev The node at which to stop the search, either NULL to
@@ -71,9 +93,9 @@ int genbind_ast_dump(struct genbind_node *ast, int indent);
*/
struct genbind_node *
genbind_node_find(struct genbind_node *node,
- struct genbind_node *prev,
- genbind_callback_t *cb,
- void *ctx);
+ struct genbind_node *prev,
+ genbind_callback_t *cb,
+ void *ctx);
/** Depth first left hand search returning nodes of the specified type
*
@@ -86,8 +108,8 @@ genbind_node_find(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype);
/** count how many nodes of a specified type.
*
@@ -101,7 +123,7 @@ genbind_node_find_type(struct genbind_node *node,
*/
int
genbind_node_enumerate_type(struct genbind_node *node,
- enum genbind_node_type type);
+ enum genbind_node_type type);
/** Depth first left hand search returning nodes of the specified type
* and a ident child node with matching text
@@ -115,9 +137,9 @@ genbind_node_enumerate_type(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type_ident(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype,
- const char *ident);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype,
+ const char *ident);
/** Returning node of the specified type with a GENBIND_NODE_TYPE_TYPE
* subnode with matching text.
@@ -137,9 +159,9 @@ genbind_node_find_type_ident(struct genbind_node *node,
*/
struct genbind_node *
genbind_node_find_type_type(struct genbind_node *node,
- struct genbind_node *prev,
- enum genbind_node_type nodetype,
- const char *type_text);
+ struct genbind_node *prev,
+ enum genbind_node_type nodetype,
+ const char *type_text);
/** Iterate all nodes of a certian type from a node with a callback.
*
@@ -149,9 +171,9 @@ genbind_node_find_type_type(struct genbind_node *node,
* @param node The node to start the search from.
*/
int genbind_node_foreach_type(struct genbind_node *node,
- enum genbind_node_type type,
- genbind_callback_t *cb,
- void *ctx);
+ enum genbind_node_type type,
+ genbind_callback_t *cb,
+ void *ctx);
/** get a nodes node list content
*
@@ -176,9 +198,4 @@ char *genbind_node_gettext(struct genbind_node *node);
*/
int *genbind_node_getint(struct genbind_node *node);
-#ifdef _WIN32
-#define NEED_STRNDUP 1
-char *strndup(const char *s, size_t n);
-#endif
-
#endif
diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l
index 4b5e225..f7b6528 100644
--- a/src/nsgenbind-lexer.l
+++ b/src/nsgenbind-lexer.l
@@ -72,7 +72,9 @@ cblockopen \%\{
cblockclose \%\}
/* used for #include directive */
-poundsign ^{whitespace}*#
+poundsign ^{whitespace}*#
+
+dblcolon \:\:
%x cblock
@@ -88,44 +90,55 @@ poundsign ^{whitespace}*#
yylloc->last_column = 0;
}
- /* terminals */
+ /* binding terminals */
-webidlfile return TOK_IDLFILE;
+binding return TOK_BINDING;
-hdrcomment return TOK_HDR_COMMENT;
+webidl return TOK_WEBIDL;
-preamble return TOK_PREAMBLE;
+preface return TOK_PREFACE;
prologue return TOK_PROLOGUE;
epilogue return TOK_EPILOGUE;
-binding return TOK_BINDING;
+postface return TOK_POSTFACE;
-interface return TOK_INTERFACE;
-flags return TOK_FLAGS;
+ /* class member terminals */
-type return TOK_TYPE;
+class return TOK_CLASS;
private return TOK_PRIVATE;
internal return TOK_INTERNAL;
+flags return TOK_FLAGS;
+
+type return TOK_TYPE;
+
unshared return TOK_UNSHARED;
shared return TOK_SHARED;
property return TOK_PROPERTY;
-operation return TOK_OPERATION;
+ /* implementation terminals */
+
+init return TOK_INIT;
-api return TOK_API;
+fini return TOK_FINI;
+
+method return TOK_METHOD;
getter return TOK_GETTER;
setter return TOK_SETTER;
+ /* other terminals */
+
+{dblcolon} return TOK_DBLCOLON;
+
{cblockopen} BEGIN(cblock);
{identifier} {
@@ -140,7 +153,7 @@ setter return TOK_SETTER;
{multicomment} /* nothing */
-{poundsign}include BEGIN(incl);
+{poundsign}include BEGIN(incl);
{other} return (int) yytext[0];
@@ -151,7 +164,7 @@ setter return TOK_SETTER;
<cblock>\% yylval->text = strdup(yytext); return TOK_CCODE_LITERAL;
-<incl>[ \t]*\" /* eat the whitespace and open quotes */
+<incl>[ \t]*\" /* eat the whitespace and open quotes */
<incl>[^\t\n\"]+ {
/* got the include file name */
diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
index b37ab9d..c8e5154 100644
--- a/src/nsgenbind-parser.y
+++ b/src/nsgenbind-parser.y
@@ -10,6 +10,12 @@
#include <stdio.h>
#include <string.h>
+#define YYFPRINTF genbind_fprintf
+#define YY_LOCATION_PRINT(File, Loc) \
+ genbind_fprintf(File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+
#include "nsgenbind-parser.h"
#include "nsgenbind-lexer.h"
#include "webidl-ast.h"
@@ -17,7 +23,9 @@
char *errtxt;
- static void nsgenbind_error(YYLTYPE *locp, struct genbind_node **genbind_ast, const char *str)
+static void nsgenbind_error(YYLTYPE *locp,
+ struct genbind_node **genbind_ast,
+ const char *str)
{
locp = locp;
genbind_ast = genbind_ast;
@@ -37,31 +45,36 @@ char *errtxt;
%union
{
- char* text;
+ char *text;
struct genbind_node *node;
long value;
}
-%token TOK_IDLFILE
-%token TOK_HDR_COMMENT
-%token TOK_PREAMBLE
-%token TOK_PROLOGUE;
-%token TOK_EPILOGUE;
-
-%token TOK_API
%token TOK_BINDING
-%token TOK_OPERATION
-%token TOK_GETTER
-%token TOK_SETTER
-%token TOK_INTERFACE
-%token TOK_FLAGS
-%token TOK_TYPE
+%token TOK_WEBIDL
+%token TOK_PREFACE
+%token TOK_PROLOGUE
+%token TOK_EPILOGUE
+%token TOK_POSTFACE
+
+%token TOK_CLASS
%token TOK_PRIVATE
%token TOK_INTERNAL
+%token TOK_FLAGS
+%token TOK_TYPE
%token TOK_UNSHARED
%token TOK_SHARED
%token TOK_PROPERTY
+ /* method types */
+%token TOK_INIT
+%token TOK_FINI
+%token TOK_METHOD
+%token TOK_GETTER
+%token TOK_SETTER
+
+%token TOK_DBLCOLON
+
%token <text> TOK_IDENTIFIER
%token <text> TOK_STRING_LITERAL
%token <text> TOK_CCODE_LITERAL
@@ -73,28 +86,30 @@ char *errtxt;
%type <node> Statement
%type <node> Statements
-%type <node> IdlFile
-%type <node> Preamble
-%type <node> Prologue
-%type <node> Epilogue
-%type <node> HdrComment
-%type <node> Strings
%type <node> Binding
%type <node> BindingArgs
%type <node> BindingArg
+%type <node> Class
+%type <node> ClassArgs
+%type <node> ClassArg
+%type <node> ClassFlag
+%type <node> ClassFlags
+
+%type <node> Method
+%type <node> MethodDeclarator
+%type <value> MethodType
+
+%type <node> WebIDL
+%type <node> Preface
+%type <node> Prologue
+%type <node> Epilogue
+%type <node> Postface
%type <node> Private
%type <node> Internal
-%type <node> Interface
-%type <node> InterfaceArgs
-%type <node> InterfaceArg
-%type <node> InterfaceFlags
%type <node> Property
-%type <node> Operation
-%type <node> Api
-%type <node> Getter
-%type <node> Setter
-
+%type <node> ParameterList
+%type <node> TypeIdent
%%
@@ -126,68 +141,77 @@ Statements
Statement
:
- IdlFile
- |
- HdrComment
- |
- Preamble
- |
- Prologue
- |
- Epilogue
- |
Binding
|
- Operation
- |
- Api
+ Class
|
- Getter
- |
- Setter
+ Method
;
- /* [3] load a web IDL file */
-IdlFile
- :
- TOK_IDLFILE TOK_STRING_LITERAL ';'
+Binding
+ :
+ TOK_BINDING TOK_IDENTIFIER '{' BindingArgs '}'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_WEBIDLFILE, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING,
+ NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE, $4, $2));
}
;
-HdrComment
- :
- TOK_HDR_COMMENT Strings ';'
+BindingArgs
+ :
+ BindingArg
+ |
+ BindingArgs BindingArg
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_HDRCOMMENT, NULL, $2);
+ $$ = genbind_node_link($2, $1);
}
;
-Strings
+BindingArg
:
- TOK_STRING_LITERAL
+ WebIDL
+ |
+ Preface
+ |
+ Prologue
+ |
+ Epilogue
+ |
+ Postface
+ ;
+
+ /* [3] a web IDL file specifier */
+WebIDL
+ :
+ TOK_WEBIDL TOK_STRING_LITERAL ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $1);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_WEBIDL, NULL, $2);
}
- |
- Strings TOK_STRING_LITERAL
+ ;
+
+
+ /* type and identifier of a variable */
+TypeIdent
+ :
+ TOK_STRING_LITERAL TOK_IDENTIFIER
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_STRING, $1, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ genbind_new_node(GENBIND_NODE_TYPE_TYPE, NULL, $1), $2);
}
;
-Preamble
+Preface
:
- TOK_PREAMBLE CBlock
+ TOK_PREFACE CBlock ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_PREAMBLE, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PREFACE, NULL, $2);
}
;
Prologue
:
- TOK_PROLOGUE CBlock
+ TOK_PROLOGUE CBlock ';'
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_PROLOGUE, NULL, $2);
}
@@ -195,173 +219,196 @@ Prologue
Epilogue
:
- TOK_EPILOGUE CBlock
+ TOK_EPILOGUE CBlock ';'
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_EPILOGUE, NULL, $2);
}
;
+Postface
+ :
+ TOK_POSTFACE CBlock ';'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_POSTFACE, NULL, $2);
+ }
+ ;
+
CBlock
- :
+ :
TOK_CCODE_LITERAL
- |
- CBlock TOK_CCODE_LITERAL
+ |
+ CBlock TOK_CCODE_LITERAL
{
$$ = genbind_strapp($1, $2);
}
;
-Operation
+MethodType
:
- TOK_OPERATION TOK_IDENTIFIER CBlock
+ TOK_INIT
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_OPERATION,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = GENBIND_METHOD_TYPE_INIT;
}
+ |
+ TOK_FINI
+ {
+ $$ = GENBIND_METHOD_TYPE_FINI;
+ }
+ |
+ TOK_METHOD
+ {
+ $$ = GENBIND_METHOD_TYPE_METHOD;
+ }
+ |
+ TOK_GETTER
+ {
+ $$ = GENBIND_METHOD_TYPE_GETTER;
+ }
+ |
+ TOK_SETTER
+ {
+ $$ = GENBIND_METHOD_TYPE_SETTER;
+ }
+ ;
-Api
+ParameterList
:
- TOK_API TOK_IDENTIFIER CBlock
+ TypeIdent
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PARAMETER, NULL, $1);
+ }
+ |
+ ParameterList ',' TypeIdent
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_API,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_node_link($3, $1);
}
+ ;
-Getter
+MethodDeclarator
:
- TOK_GETTER TOK_IDENTIFIER CBlock
+ TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER '(' ParameterList ')'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_GETTER,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ $5,
+ $3),
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
}
+ |
+ TOK_IDENTIFIER TOK_DBLCOLON TOK_IDENTIFIER '(' ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $3),
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ |
+ TOK_IDENTIFIER '(' ParameterList ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS,
+ $3,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ |
+ TOK_IDENTIFIER '(' ')'
+ {
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $1));
+ }
+ ;
-Setter
+Method
:
- TOK_SETTER TOK_IDENTIFIER CBlock
+ MethodType MethodDeclarator CBlock
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_SETTER,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_CBLOCK,
- NULL,
- $3),
- $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
+ genbind_new_node(GENBIND_NODE_TYPE_CDATA,
+ $2, $3),
+ (void *)$1));
}
-Binding
+
+Class
:
- TOK_BINDING TOK_IDENTIFIER '{' BindingArgs '}'
+ TOK_CLASS TOK_IDENTIFIER '{' ClassArgs '}'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_TYPE, $4, $2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_CLASS, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT, $4, $2));
}
;
-BindingArgs
+ClassArgs
:
- BindingArg
+ ClassArg
|
- BindingArgs BindingArg
+ ClassArgs ClassArg
{
- $$ = genbind_node_link($2, $1);
+ $$ = genbind_node_link($2, $1);
}
;
-BindingArg
- :
+ClassArg
+ :
Private
|
Internal
|
- Interface
- |
Property
+ |
+ ClassFlag
+ |
+ Preface
+ |
+ Prologue
+ |
+ Epilogue
+ |
+ Postface
;
+
Private
:
- TOK_PRIVATE TOK_STRING_LITERAL TOK_IDENTIFIER ';'
+ TOK_PRIVATE TypeIdent ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_PRIVATE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $2), $3));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PRIVATE, NULL, $2);
}
;
Internal
:
- TOK_INTERNAL TOK_STRING_LITERAL TOK_IDENTIFIER ';'
+ TOK_INTERNAL TypeIdent ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERNAL, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- genbind_new_node(GENBIND_NODE_TYPE_STRING, NULL, $2), $3));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_INTERNAL, NULL, $2);
}
;
-Interface
- :
- TOK_INTERFACE TOK_IDENTIFIER ';'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $2));
- }
- |
- TOK_INTERFACE TOK_IDENTIFIER '{' '}'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE, NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $2));
- }
- |
- TOK_INTERFACE TOK_IDENTIFIER '{' InterfaceArgs '}'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT, $4, $2));
- }
- ;
-
-InterfaceArgs
+ClassFlag
:
- InterfaceArg
- |
- InterfaceArgs InterfaceArg
- {
- $$ = genbind_node_link($2, $1);
- }
- ;
-
-InterfaceArg
- :
- TOK_FLAGS InterfaceFlags ';'
+ TOK_FLAGS ClassFlags ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_INTERFACE_FLAGS, NULL, $2);
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_FLAGS, NULL, $2);
}
;
-InterfaceFlags
+ClassFlags
:
TOK_IDENTIFIER
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT, NULL, $1);
}
|
- InterfaceFlags ',' TOK_IDENTIFIER
+ ClassFlags ',' TOK_IDENTIFIER
{
$$ = genbind_new_node(GENBIND_NODE_TYPE_IDENT, $1, $3);
}
@@ -371,13 +418,12 @@ Property
:
TOK_PROPERTY Modifiers TOK_IDENTIFIER ';'
{
- $$ = genbind_new_node(GENBIND_NODE_TYPE_BINDING_PROPERTY,
- NULL,
- genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- NULL,
- $3),
- (void *)$2));
+ $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL,
+ genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
+ genbind_new_node(GENBIND_NODE_TYPE_IDENT,
+ NULL,
+ $3),
+ (void *)$2));
}
;
diff --git a/src/nsgenbind.c b/src/nsgenbind.c
index d81f30f..3174fa0 100644
--- a/src/nsgenbind.c
+++ b/src/nsgenbind.c
@@ -22,201 +22,173 @@ struct options *options;
static struct options* process_cmdline(int argc, char **argv)
{
- int opt;
+ int opt;
- options = calloc(1,sizeof(struct options));
- if (options == NULL) {
- fprintf(stderr, "Allocation error\n");
- return NULL;
- }
+ options = calloc(1,sizeof(struct options));
+ if (options == NULL) {
+ fprintf(stderr, "Allocation error\n");
+ return NULL;
+ }
- while ((opt = getopt(argc, argv, "vgDW::d:I:o:h:")) != -1) {
- switch (opt) {
- case 'I':
- options->idlpath = strdup(optarg);
- break;
+ while ((opt = getopt(argc, argv, "vgDW::I:")) != -1) {
+ switch (opt) {
+ case 'I':
+ options->idlpath = strdup(optarg);
+ break;
- case 'o':
- options->outfilename = strdup(optarg);
- break;
+ case 'v':
+ options->verbose = true;
+ break;
- case 'h':
- options->hdrfilename = strdup(optarg);
- break;
+ case 'D':
+ options->debug = true;
+ break;
- case 'd':
- options->depfilename = strdup(optarg);
- break;
+ case 'g':
+ options->dbglog = true;
+ break;
- case 'v':
- options->verbose = true;
- break;
+ case 'W':
+ options->warnings = 1; /* warning flags */
+ break;
- case 'D':
- options->debug = true;
- break;
+ default: /* '?' */
+ fprintf(stderr,
+ "Usage: %s [-v] [-g] [-D] [-W] [-I idlpath] inputfile outputdir\n",
+ argv[0]);
+ free(options);
+ return NULL;
- case 'g':
- options->dbglog = true;
- break;
+ }
+ }
- case 'W':
- options->warnings = 1; /* warning flags */
- break;
+ if (optind > (argc - 2)) {
+ fprintf(stderr,
+ "Error: expected input filename and output directory\n");
+ free(options);
+ return NULL;
+ }
- default: /* '?' */
- fprintf(stderr,
- "Usage: %s [-v] [-g] [-D] [-W] [-d depfilename] [-I idlpath] [-o filename] [-h headerfile] inputfile\n",
- argv[0]);
- free(options);
- return NULL;
+ options->infilename = strdup(argv[optind]);
- }
- }
+ options->outdirname = strdup(argv[optind + 1]);
- if (optind >= argc) {
- fprintf(stderr, "Error: expected input filename\n");
- free(options);
- return NULL;
- }
-
- options->infilename = strdup(argv[optind]);
-
- return options;
+ return options;
}
static int generate_binding(struct genbind_node *binding_node, void *ctx)
{
- struct genbind_node *genbind_root = ctx;
- char *type;
- int res = 10;
-
- type = genbind_node_gettext(
- genbind_node_find_type(
- genbind_node_getnode(binding_node),
- NULL,
- GENBIND_NODE_TYPE_TYPE));
-
- if (strcmp(type, "jsapi_libdom") == 0) {
- res = jsapi_libdom_output(options, genbind_root, binding_node);
- } else {
- fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
- }
-
- return res;
+ struct genbind_node *genbind_root = ctx;
+ char *type;
+ int res = 10;
+
+ type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(binding_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+
+ if (strcmp(type, "jsapi_libdom") == 0) {
+ res = jsapi_libdom_output(options, genbind_root, binding_node);
+ } else {
+ fprintf(stderr, "Error: unsupported binding type \"%s\"\n", type);
+ }
+
+ return res;
+}
+
+enum bindingtype_e {
+ BINDINGTYPE_UNKNOWN,
+ BINDINGTYPE_JSAPI_LIBDOM,
+ BINDINGTYPE_DUK_LIBDOM,
+};
+
+/**
+ * get the type of binding
+ */
+static enum bindingtype_e genbind_get_type(struct genbind_node *node)
+{
+ struct genbind_node *binding_node;
+ const char *binding_type;
+
+ binding_node = genbind_node_find_type(node,
+ NULL,
+ GENBIND_NODE_TYPE_BINDING);
+ if (binding_node == NULL) {
+ /* binding entry is missing which is invalid */
+ return BINDINGTYPE_UNKNOWN;
+ }
+
+ binding_type = genbind_node_gettext(
+ genbind_node_find_type(
+ genbind_node_getnode(binding_node),
+ NULL,
+ GENBIND_NODE_TYPE_TYPE));
+ if (binding_type == NULL) {
+ fprintf(stderr, "Error: missing binding type\n");
+ return BINDINGTYPE_UNKNOWN;
+ }
+
+ if (strcmp(binding_type, "jsapi_libdom") == 0) {
+ return BINDINGTYPE_JSAPI_LIBDOM;
+ }
+
+ if (strcmp(binding_type, "duk_libdom") == 0) {
+ return BINDINGTYPE_DUK_LIBDOM;
+ }
+
+ fprintf(stderr, "Error: unsupported binding type \"%s\"\n", binding_type);
+
+ return BINDINGTYPE_UNKNOWN;
}
int main(int argc, char **argv)
{
- int res;
- struct genbind_node *genbind_root;
-
- options = process_cmdline(argc, argv);
- if (options == NULL) {
- return 1; /* bad commandline */
- }
-
- if (options->verbose &&
- (options->outfilename == NULL)) {
- fprintf(stderr,
- "Error: output to stdout with verbose logging would fail\n");
- return 2;
- }
-
- if (options->depfilename != NULL &&
- options->outfilename == NULL) {
- fprintf(stderr,
- "Error: output to stdout with dep generation would fail\n");
- return 3;
- }
-
- if (options->depfilename != NULL &&
- options->infilename == NULL) {
- fprintf(stderr,
- "Error: input from stdin with dep generation would fail\n");
- return 3;
- }
-
- /* open dependancy file */
- if (options->depfilename != NULL) {
- options->depfilehandle = fopen(options->depfilename, "w");
- if (options->depfilehandle == NULL) {
- fprintf(stderr,
- "Error: unable to open dep file\n");
- return 4;
- }
- fprintf(options->depfilehandle,
- "%s %s :", options->depfilename,
- options->outfilename);
- }
-
- /* parse input and generate dependancy */
- res = genbind_parsefile(options->infilename, &genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: parse failed with code %d\n", res);
- return res;
- }
-
- /* dependancy generation complete */
- if (options->depfilehandle != NULL) {
- fputc('\n', options->depfilehandle);
- fclose(options->depfilehandle);
- }
-
-
- /* open output file */
- if (options->outfilename == NULL) {
- options->outfilehandle = stdout;
- } else {
- options->outfilehandle = fopen(options->outfilename, "w");
- }
- if (options->outfilehandle == NULL) {
- fprintf(stderr, "Error opening source output %s: %s\n",
- options->outfilename,
- strerror(errno));
- return 5;
- }
-
- /* open output header file if required */
- if (options->hdrfilename != NULL) {
- options->hdrfilehandle = fopen(options->hdrfilename, "w");
- if (options->hdrfilehandle == NULL) {
- fprintf(stderr, "Error opening header output %s: %s\n",
- options->hdrfilename,
- strerror(errno));
- /* close and unlink output file */
- fclose(options->outfilehandle);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- return 6;
- }
- } else {
- options->hdrfilehandle = NULL;
- }
-
- /* dump the AST */
- if (options->verbose) {
- genbind_ast_dump(genbind_root, 0);
- }
-
- /* generate output for each binding */
- res = genbind_node_foreach_type(genbind_root,
- GENBIND_NODE_TYPE_BINDING,
- generate_binding,
- genbind_root);
- if (res != 0) {
- fprintf(stderr, "Error: output failed with code %d\n", res);
- if (options->outfilename != NULL) {
- unlink(options->outfilename);
- }
- if (options->hdrfilename != NULL) {
- unlink(options->hdrfilename);
- }
- return res;
- }
-
-
- return 0;
+ int res;
+ struct genbind_node *genbind_root;
+ enum bindingtype_e bindingtype;
+
+ options = process_cmdline(argc, argv);
+ if (options == NULL) {
+ return 1; /* bad commandline */
+ }
+
+ /* parse input and generate dependancy */
+ res = genbind_parsefile(options->infilename, &genbind_root);
+ if (res != 0) {
+ fprintf(stderr, "Error: parse failed with code %d\n", res);
+ return res;
+ }
+
+ /* dump the AST */
+ genbind_dump_ast(genbind_root);
+
+ /* get bindingtype */
+ bindingtype = genbind_get_type(genbind_root);
+ if (bindingtype == BINDINGTYPE_UNKNOWN) {
+ return 3;
+ }
+
+#if 0
+ genbind_load_idl(genbind_root);
+
+ /* generate output for each binding */
+ res = genbind_node_foreach_type(genbind_root,
+ GENBIND_NODE_TYPE_BINDING,
+ generate_binding,
+ genbind_root);
+ if (res != 0) {
+ fprintf(stderr, "Error: output failed with code %d\n", res);
+ if (options->outfilename != NULL) {
+ unlink(options->outfilename);
+ }
+ if (options->hdrfilename != NULL) {
+ unlink(options->hdrfilename);
+ }
+ return res;
+ }
+
+#endif
+ return 0;
}
diff --git a/src/options.h b/src/options.h
index cbac9a3..68a4bc1 100644
--- a/src/options.h
+++ b/src/options.h
@@ -12,16 +12,11 @@
/** global options */
struct options {
char *infilename; /**< binding source */
-
- char *outfilename; /**< output source file */
- FILE *outfilehandle; /**< output file handle */
-
- char *hdrfilename; /**< output header file */
- FILE *hdrfilehandle; /**< output file handle */
-
- char *depfilename; /**< dependancy output*/
- FILE *depfilehandle; /**< dependancy file handle */
-
+ char *outdirname; /**< output directory */
+FILE *hdrfilehandle;
+char *hdrfilename;
+char *outfilename;
+FILE *outfilehandle;
char *idlpath; /**< path to IDL files */
bool verbose; /**< verbose processing */
diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..7bab058
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "options.h"
+#include "utils.h"
+
+FILE *genb_fopen(const char *fname, const char *mode)
+{
+ char *fpath;
+ int fpathl;
+ FILE *filef;
+
+ fpathl = strlen(options->outdirname) + strlen(fname) + 2;
+ fpath = malloc(fpathl);
+ snprintf(fpath, fpathl, "%s/%s", options->outdirname, fname);
+
+ filef = fopen(fpath, mode);
+ if (filef == NULL) {
+ fprintf(stderr, "Error: unable to open file %s (%s)\n",
+ fpath, strerror(errno));
+ free(fpath);
+ return NULL;
+ }
+ free(fpath);
+
+ return filef;
+}
+
+#ifdef NEED_STRNDUP
+
+char *strndup(const char *s, size_t n)
+{
+ size_t len;
+ char *s2;
+
+ for (len = 0; len != n && s[len]; len++)
+ continue;
+
+ s2 = malloc(len + 1);
+ if (!s2)
+ return 0;
+
+ memcpy(s2, s, len);
+ s2[len] = 0;
+ return s2;
+}
+
+#endif
+
diff --git a/src/utils.h b/src/utils.h
new file mode 100644
index 0000000..98a4c6b
--- /dev/null
+++ b/src/utils.h
@@ -0,0 +1,21 @@
+/* utility helpers
+ *
+ * This file is part of nsnsgenbind.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ */
+
+#ifndef nsgenbind_utils_h
+#define nsgenbind_utils_h
+
+FILE *genb_fopen(const char *fname, const char *mode);
+
+#ifdef _WIN32
+#define NEED_STRNDUP 1
+char *strndup(const char *s, size_t n);
+#endif
+
+#define SLEN(x) (sizeof((x)) - 1)
+
+#endif
diff --git a/test/data/bindings/browser-duk.bnd b/test/data/bindings/browser-duk.bnd
new file mode 100644
index 0000000..c32f6a3
--- /dev/null
+++ b/test/data/bindings/browser-duk.bnd
@@ -0,0 +1,66 @@
+/* Binding for browser using ductape and libdom
+ *
+ * Copyright 2015 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ * http://www.opensource.org/licenses/mit-license
+ */
+
+binding duk_libdom {
+ webidl "dom.idl";
+ webidl "html.idl";
+ webidl "console.idl";
+
+ preface %{
+ %};
+
+ prologue %{
+ %};
+
+ epilogue %{
+ %};
+
+ postface %{
+ %};
+}
+
+class Node {
+ private "dom_node *" node;
+
+ preface %{
+ %};
+
+ prologue %{
+ %};
+
+ epilogue %{
+ %};
+
+ postface %{
+ %};
+}
+
+init Node("dom_node *" node)
+%{
+ private->node = node;
+ dom_node_ref(node);
+%}
+
+fini Node()
+%{
+ dom_node_unref(private->node);
+%}
+
+method Node::AppendChild()
+%{
+%}
+
+getter Node::aprop()
+%{
+%}
+
+setter Node::aprop()
+%{
+%}
diff --git a/test/data/idl/console.idl b/test/data/idl/console.idl
new file mode 100644
index 0000000..5a3d9eb
--- /dev/null
+++ b/test/data/idl/console.idl
@@ -0,0 +1,24 @@
+// de facto set of features for console object
+// https://developer.mozilla.org/en-US/docs/DOM/console
+// http://msdn.microsoft.com/en-us/library/dd565625%28v=vs.85%29.aspx#consol...
+// 31st October
+// Yay for non-standard standards
+
+interface Console {
+ void debug(DOMString msg, Substitition... subst);
+ void dir(JSObject object);
+ void error(DOMString msg, Substitition... subst);
+ void group();
+ void groupCollapsed();
+ void groupEnd();
+ void info(DOMString msg, Substitition... subst);
+ void log(DOMString msg, Substitition... subst);
+ void time(DOMString timerName);
+ void timeEnd(DOMString timerName);
+ void trace();
+ void warn(DOMString msg, Substitition... subst);
+};
+
+partial interface Window {
+ readonly attribute Console console;
+};
\ No newline at end of file
diff --git a/test/data/idl/dom.idl b/test/data/idl/dom.idl
index 6ba870c..6a4a95e 100644
--- a/test/data/idl/dom.idl
+++ b/test/data/idl/dom.idl
@@ -1,43 +1,10 @@
-// DOM core WebIDL
-// retrived from http://dom.spec.whatwg.org/
-// 23rd October 2012
-
-
-
-exception DOMException {
- const unsigned short INDEX_SIZE_ERR = 1;
- const unsigned short DOMSTRING_SIZE_ERR = 2; // historical
- const unsigned short HIERARCHY_REQUEST_ERR = 3;
- const unsigned short WRONG_DOCUMENT_ERR = 4;
- const unsigned short INVALID_CHARACTER_ERR = 5;
- const unsigned short NO_DATA_ALLOWED_ERR = 6; // historical
- const unsigned short NO_MODIFICATION_ALLOWED_ERR = 7;
- const unsigned short NOT_FOUND_ERR = 8;
- const unsigned short NOT_SUPPORTED_ERR = 9;
- const unsigned short INUSE_ATTRIBUTE_ERR = 10; // historical
- const unsigned short INVALID_STATE_ERR = 11;
- const unsigned short SYNTAX_ERR = 12;
- const unsigned short INVALID_MODIFICATION_ERR = 13;
- const unsigned short NAMESPACE_ERR = 14;
- const unsigned short INVALID_ACCESS_ERR = 15;
- const unsigned short VALIDATION_ERR = 16; // historical
- const unsigned short TYPE_MISMATCH_ERR = 17;
- const unsigned short SECURITY_ERR = 18;
- const unsigned short NETWORK_ERR = 19;
- const unsigned short ABORT_ERR = 20;
- const unsigned short URL_MISMATCH_ERR = 21;
- const unsigned short QUOTA_EXCEEDED_ERR = 22;
- const unsigned short TIMEOUT_ERR = 23;
- const unsigned short INVALID_NODE_TYPE_ERR = 24;
- const unsigned short DATA_CLONE_ERR = 25;
- unsigned short code;
-};
-
-interface DOMError {
- readonly attribute DOMString name;
-};
+// DOM web IDL
+// Retrived from https://dom.spec.whatwg.org/
+// Sat Jul 18 2015
+
-[Constructor(DOMString type, optional EventInit eventInitDict)]
+[Constructor(DOMString type, optional EventInit eventInitDict),
+ Exposed=(Window,Worker)]
interface Event {
readonly attribute DOMString type;
readonly attribute EventTarget? target;
@@ -57,26 +24,30 @@ interface Event {
void preventDefault();
readonly attribute boolean defaultPrevented;
- readonly attribute boolean isTrusted;
+ [Unforgeable] readonly attribute boolean isTrusted;
readonly attribute DOMTimeStamp timeStamp;
void initEvent(DOMString type, boolean bubbles, boolean cancelable);
};
dictionary EventInit {
- boolean bubbles;
- boolean cancelable;
+ boolean bubbles = false;
+ boolean cancelable = false;
};
-[Constructor(DOMString type, optional CustomEventInit eventInitDict)]
+[Constructor(DOMString type, optional CustomEventInit eventInitDict),
+ Exposed=(Window,Worker)]
interface CustomEvent : Event {
readonly attribute any detail;
+
+ void initCustomEvent(DOMString type, boolean bubbles, boolean cancelable, any detail);
};
dictionary CustomEventInit : EventInit {
- any detail;
+ any detail = null;
};
+[Exposed=(Window,Worker)]
interface EventTarget {
void addEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
void removeEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
@@ -87,6 +58,74 @@ callback interface EventListener {
void handleEvent(Event event);
};
+[NoInterfaceObject,
+ Exposed=Window]
+interface NonElementParentNode {
+ Element? getElementById(DOMString elementId);
+};
+Document implements NonElementParentNode;
+DocumentFragment implements NonElementParentNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface ParentNode {
+ [SameObject] readonly attribute HTMLCollection children;
+ readonly attribute Element? firstElementChild;
+ readonly attribute Element? lastElementChild;
+ readonly attribute unsigned long childElementCount;
+
+ [Unscopeable] void prepend((Node or DOMString)... nodes);
+ [Unscopeable] void append((Node or DOMString)... nodes);
+
+ [Unscopeable] Element? query(DOMString relativeSelectors);
+ [NewObject, Unscopeable] Elements queryAll(DOMString relativeSelectors);
+ Element? querySelector(DOMString selectors);
+ [NewObject] NodeList querySelectorAll(DOMString selectors);
+};
+Document implements ParentNode;
+DocumentFragment implements ParentNode;
+Element implements ParentNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface NonDocumentTypeChildNode {
+ readonly attribute Element? previousElementSibling;
+ readonly attribute Element? nextElementSibling;
+};
+Element implements NonDocumentTypeChildNode;
+CharacterData implements NonDocumentTypeChildNode;
+
+[NoInterfaceObject,
+ Exposed=Window]
+interface ChildNode {
+ [Unscopeable] void before((Node or DOMString)... nodes);
+ [Unscopeable] void after((Node or DOMString)... nodes);
+ [Unscopeable] void replaceWith((Node or DOMString)... nodes);
+ [Unscopeable] void remove();
+};
+DocumentType implements ChildNode;
+Element implements ChildNode;
+CharacterData implements ChildNode;
+
+class Elements extends Array {
+ Element? query(DOMString relativeSelectors);
+ Elements queryAll(DOMString relativeSelectors);
+};
+
+[Exposed=Window]
+interface NodeList {
+ getter Node? item(unsigned long index);
+ readonly attribute unsigned long length;
+ iterable<Node>;
+};
+
+[Exposed=Window]
+interface HTMLCollection {
+ readonly attribute unsigned long length;
+ getter Element? item(unsigned long index);
+ getter Element? namedItem(DOMString name);
+};
+
[Constructor(MutationCallback callback)]
interface MutationObserver {
void observe(Node target, MutationObserverInit options);
@@ -97,20 +136,21 @@ interface MutationObserver {
callback MutationCallback = void (sequence<MutationRecord> mutations, MutationObserver observer);
dictionary MutationObserverInit {
- boolean childList;
+ boolean childList = false;
boolean attributes;
boolean characterData;
- boolean subtree;
+ boolean subtree = false;
boolean attributeOldValue;
boolean characterDataOldValue;
sequence<DOMString> attributeFilter;
};
+[Exposed=Window]
interface MutationRecord {
readonly attribute DOMString type;
readonly attribute Node target;
- readonly attribute NodeList addedNodes;
- readonly attribute NodeList removedNodes;
+ [SameObject] readonly attribute NodeList addedNodes;
+ [SameObject] readonly attribute NodeList removedNodes;
readonly attribute Node? previousSibling;
readonly attribute Node? nextSibling;
readonly attribute DOMString? attributeName;
@@ -118,6 +158,7 @@ interface MutationRecord {
readonly attribute DOMString? oldValue;
};
+[Exposed=Window]
interface Node : EventTarget {
const unsigned short ELEMENT_NODE = 1;
const unsigned short ATTRIBUTE_NODE = 2; // historical
@@ -140,7 +181,7 @@ interface Node : EventTarget {
readonly attribute Node? parentNode;
readonly attribute Element? parentElement;
boolean hasChildNodes();
- readonly attribute NodeList childNodes;
+ [SameObject] readonly attribute NodeList childNodes;
readonly attribute Node? firstChild;
readonly attribute Node? lastChild;
readonly attribute Node? previousSibling;
@@ -148,37 +189,40 @@ interface Node : EventTarget {
attribute DOMString? nodeValue;
attribute DOMString? textContent;
- Node insertBefore(Node node, Node? child);
- Node appendChild(Node node);
- Node replaceChild(Node node, Node child);
- Node removeChild(Node child);
void normalize();
-
-Node cloneNode(optional boolean deep = true);
- boolean isEqualNode(Node? node);
+ [NewObject] Node cloneNode(optional boolean deep = false);
+ boolean isEqualNode(Node? otherNode);
const unsigned short DOCUMENT_POSITION_DISCONNECTED = 0x01;
const unsigned short DOCUMENT_POSITION_PRECEDING = 0x02;
const unsigned short DOCUMENT_POSITION_FOLLOWING = 0x04;
const unsigned short DOCUMENT_POSITION_CONTAINS = 0x08;
const unsigned short DOCUMENT_POSITION_CONTAINED_BY = 0x10;
- const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20; // historical
+ const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
unsigned short compareDocumentPosition(Node other);
boolean contains(Node? other);
DOMString? lookupPrefix(DOMString? namespace);
DOMString? lookupNamespaceURI(DOMString? prefix);
boolean isDefaultNamespace(DOMString? namespace);
+
+ Node insertBefore(Node node, Node? child);
+ Node appendChild(Node node);
+ Node replaceChild(Node node, Node child);
+ Node removeChild(Node child);
};
-[Constructor]
+[Constructor,
+ Exposed=Window]
interface Document : Node {
- readonly attribute DOMImplementation implementation;
+ [SameObject] readonly attribute DOMImplementation implementation;
readonly attribute DOMString URL;
readonly attribute DOMString documentURI;
+ readonly attribute DOMString origin;
readonly attribute DOMString compatMode;
readonly attribute DOMString characterSet;
+ readonly attribute DOMString inputEncoding; // legacy alias of .characterSet
readonly attribute DOMString contentType;
readonly attribute DocumentType? doctype;
@@ -186,59 +230,54 @@ interface Document : Node {
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
HTMLCollection getElementsByClassName(DOMString classNames);
- Element? getElementById(DOMString elementId);
- Element createElement(DOMString localName);
- Element createElementNS(DOMString? namespace, DOMString qualifiedName);
- DocumentFragment createDocumentFragment();
- Text createTextNode(DOMString data);
- Comment createComment(DOMString data);
- ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
+ [NewObject] Element createElement(DOMString localName);
+ [NewObject] Element createElementNS(DOMString? namespace, DOMString qualifiedName);
+ [NewObject] DocumentFragment createDocumentFragment();
+ [NewObject] Text createTextNode(DOMString data);
+ [NewObject] Comment createComment(DOMString data);
+ [NewObject] ProcessingInstruction createProcessingInstruction(DOMString target, DOMString data);
- Node importNode(Node node, optional boolean deep = true);
+ [NewObject] Node importNode(Node node, optional boolean deep = false);
Node adoptNode(Node node);
- Event createEvent(DOMString interface);
+ [NewObject] Attr createAttribute(DOMString localName);
+ [NewObject] Attr createAttributeNS(DOMString? namespace, DOMString name);
- Range createRange();
+ [NewObject] Event createEvent(DOMString interface);
- // NodeFilter.SHOW_ALL = 0xFFFFFFFF
- NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
- TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+ [NewObject] Range createRange();
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
+ // NodeFilter.SHOW_ALL = 0xFFFFFFFF
+ [NewObject] NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+ [NewObject] TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
};
+[Exposed=Window]
interface XMLDocument : Document {};
+[Exposed=Window]
interface DOMImplementation {
- DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
- XMLDocument createDocument(DOMString? namespace, [TreatNullAs=EmptyString] DOMString qualifiedName, DocumentType? doctype);
- Document createHTMLDocument(optional DOMString title);
+ [NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
+ [NewObject] XMLDocument createDocument(DOMString? namespace, [TreatNullAs=EmptyString] DOMString qualifiedName, optional DocumentType? doctype = null);
+ [NewObject] Document createHTMLDocument(optional DOMString title);
- boolean hasFeature(DOMString feature, [TreatNullAs=EmptyString] DOMString version);
+ boolean hasFeature(); // useless; always returns true
};
+[Constructor,
+ Exposed=Window]
interface DocumentFragment : Node {
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
};
+[Exposed=Window]
interface DocumentType : Node {
readonly attribute DOMString name;
readonly attribute DOMString publicId;
readonly attribute DOMString systemId;
-
- // NEW
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
};
+[Exposed=Window]
interface Element : Node {
readonly attribute DOMString? namespaceURI;
readonly attribute DOMString? prefix;
@@ -247,9 +286,10 @@ interface Element : Node {
attribute DOMString id;
attribute DOMString className;
- readonly attribute DOMTokenList classList;
+ [SameObject] readonly attribute DOMTokenList classList;
- readonly attribute Attr[] attributes;
+ boolean hasAttributes();
+ [SameObject] readonly attribute NamedNodeMap attributes;
DOMString? getAttribute(DOMString name);
DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
void setAttribute(DOMString name, DOMString value);
@@ -259,36 +299,46 @@ interface Element : Node {
boolean hasAttribute(DOMString name);
boolean hasAttributeNS(DOMString? namespace, DOMString localName);
+ Attr? getAttributeNode(DOMString name);
+ Attr? getAttributeNodeNS(DOMString? namespace, DOMString localName);
+ Attr? setAttributeNode(Attr attr);
+ Attr? setAttributeNodeNS(Attr attr);
+ Attr removeAttributeNode(Attr attr);
+
+ Element? closest(DOMString selectors);
+ boolean matches(DOMString selectors);
+
HTMLCollection getElementsByTagName(DOMString localName);
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
HTMLCollection getElementsByClassName(DOMString classNames);
-
- readonly attribute HTMLCollection children;
- readonly attribute Element? firstElementChild;
- readonly attribute Element? lastElementChild;
- readonly attribute Element? previousElementSibling;
- readonly attribute Element? nextElementSibling;
- readonly attribute unsigned long childElementCount;
-
-
- // NEW
- void prepend((Node or DOMString)... nodes);
- void append((Node or DOMString)... nodes);
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
+};
+[Exposed=Window]
+interface NamedNodeMap {
+ readonly attribute unsigned long length;
+ getter Attr? item(unsigned long index);
+ getter Attr? getNamedItem(DOMString name);
+ Attr? getNamedItemNS(DOMString? namespace, DOMString localName);
+ Attr? setNamedItem(Attr attr);
+ Attr? setNamedItemNS(Attr attr);
+ Attr removeNamedItem(DOMString name);
+ Attr removeNamedItemNS(DOMString? namespace, DOMString localName);
};
+[Exposed=Window]
interface Attr {
- readonly attribute DOMString name;
- attribute DOMString value;
-
readonly attribute DOMString? namespaceURI;
readonly attribute DOMString? prefix;
readonly attribute DOMString localName;
-};
+ readonly attribute DOMString name;
+ attribute DOMString value;
+ [TreatNullAs=EmptyString] attribute DOMString nodeValue; // legacy alias of .value
+ [TreatNullAs=EmptyString] attribute DOMString textContent; // legacy alias of .value
+
+ readonly attribute Element? ownerElement;
+ readonly attribute boolean specified; // useless; always returns true
+};
+[Exposed=Window]
interface CharacterData : Node {
[TreatNullAs=EmptyString] attribute DOMString data;
readonly attribute unsigned long length;
@@ -297,26 +347,25 @@ interface CharacterData : Node {
void insertData(unsigned long offset, DOMString data);
void deleteData(unsigned long offset, unsigned long count);
void replaceData(unsigned long offset, unsigned long count, DOMString data);
-
- // NEW
- void before((Node or DOMString)... nodes);
- void after((Node or DOMString)... nodes);
- void replace((Node or DOMString)... nodes);
- void remove();
};
+[Constructor(optional DOMString data = ""),
+ Exposed=Window]
interface Text : CharacterData {
- Text splitText(unsigned long offset);
+ [NewObject] Text splitText(unsigned long offset);
readonly attribute DOMString wholeText;
};
-
+[Exposed=Window]
interface ProcessingInstruction : CharacterData {
readonly attribute DOMString target;
};
-
+[Constructor(optional DOMString data = ""),
+ Exposed=Window]
interface Comment : CharacterData {
};
+[Constructor,
+ Exposed=Window]
interface Range {
readonly attribute Node startContainer;
readonly attribute unsigned long startOffset;
@@ -325,15 +374,15 @@ interface Range {
readonly attribute boolean collapsed;
readonly attribute Node commonAncestorContainer;
- void setStart(Node refNode, unsigned long offset);
- void setEnd(Node refNode, unsigned long offset);
- void setStartBefore(Node refNode);
- void setStartAfter(Node refNode);
- void setEndBefore(Node refNode);
- void setEndAfter(Node refNode);
- void collapse(boolean toStart);
- void selectNode(Node refNode);
- void selectNodeContents(Node refNode);
+ void setStart(Node node, unsigned long offset);
+ void setEnd(Node node, unsigned long offset);
+ void setStartBefore(Node node);
+ void setStartAfter(Node node);
+ void setEndBefore(Node node);
+ void setEndAfter(Node node);
+ void collapse(optional boolean toStart = false);
+ void selectNode(Node node);
+ void selectNodeContents(Node node);
const unsigned short START_TO_START = 0;
const unsigned short START_TO_END = 1;
@@ -342,12 +391,12 @@ interface Range {
short compareBoundaryPoints(unsigned short how, Range sourceRange);
void deleteContents();
- DocumentFragment extractContents();
- DocumentFragment cloneContents();
+ [NewObject] DocumentFragment extractContents();
+ [NewObject] DocumentFragment cloneContents();
void insertNode(Node node);
void surroundContents(Node newParent);
- Range cloneRange();
+ [NewObject] Range cloneRange();
void detach();
boolean isPointInRange(Node node, unsigned long offset);
@@ -358,9 +407,10 @@ interface Range {
stringifier;
};
+[Exposed=Window]
interface NodeIterator {
- readonly attribute Node root;
- readonly attribute Node? referenceNode;
+ [SameObject] readonly attribute Node root;
+ readonly attribute Node referenceNode;
readonly attribute boolean pointerBeforeReferenceNode;
readonly attribute unsigned long whatToShow;
readonly attribute NodeFilter? filter;
@@ -371,11 +421,11 @@ interface NodeIterator {
void detach();
};
+[Exposed=Window]
interface TreeWalker {
- readonly attribute Node root;
+ [SameObject] readonly attribute Node root;
readonly attribute unsigned long whatToShow;
readonly attribute NodeFilter? filter;
-
attribute Node currentNode;
Node? parentNode();
@@ -386,7 +436,7 @@ interface TreeWalker {
Node? previousNode();
Node? nextNode();
};
-
+[Exposed=Window]
callback interface NodeFilter {
// Constants for acceptNode()
const unsigned short FILTER_ACCEPT = 1;
@@ -411,25 +461,6 @@ callback interface NodeFilter {
unsigned short acceptNode(Node node);
};
-[ArrayClass]
-interface NodeList {
- getter Node? item(unsigned long index);
- readonly attribute unsigned long length;
-};
-
-interface HTMLCollection {
- readonly attribute unsigned long length;
- getter Element? item(unsigned long index);
- getter object? namedItem(DOMString name); // only returns Element
-};
-
-[NoInterfaceObject]
-interface DOMStringList {
- readonly attribute unsigned long length;
- getter DOMString? item(unsigned long index);
- boolean contains(DOMString string);
-};
-
interface DOMTokenList {
readonly attribute unsigned long length;
getter DOMString? item(unsigned long index);
@@ -438,9 +469,11 @@ interface DOMTokenList {
void remove(DOMString... tokens);
boolean toggle(DOMString token, optional boolean force);
stringifier;
+ iterable<DOMString>;
};
interface DOMSettableTokenList : DOMTokenList {
attribute DOMString value;
};
+
diff --git a/test/data/idl/html.idl b/test/data/idl/html.idl
index d4264c5..62d4967 100644
--- a/test/data/idl/html.idl
+++ b/test/data/idl/html.idl
@@ -1,37 +1,44 @@
-// HTML WebIDL
-// retrived from http://www.whatwg.org/specs/web-apps/current-work/
-// 23rd October 2012
+// HTML web IDL
+// Retrived from https://html.spec.whatwg.org/
+// Sat Jul 18 2015
+typedef (Int8Array or Uint8Array or Uint8ClampedArray or
+ Int16Array or Uint16Array or
+ Int32Array or Uint32Array or
+ Float32Array or Float64Array or
+ DataView) ArrayBufferView;
+
interface HTMLAllCollection : HTMLCollection {
- // inherits length and item()
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
- HTMLAllCollection tags(DOMString tagName);
+ // inherits length and 'getter'
+ Element? item(unsigned long index);
+ (HTMLCollection or Element)? item(DOMString name);
+ legacycaller getter (HTMLCollection or Element)? namedItem(DOMString name); // shadows inherited namedItem()
};
interface HTMLFormControlsCollection : HTMLCollection {
// inherits length and item()
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
+ legacycaller getter (RadioNodeList or Element)? namedItem(DOMString name); // shadows inherited namedItem()
};
interface RadioNodeList : NodeList {
- attribute DOMString value;
+ attribute DOMString value;
};
interface HTMLOptionsCollection : HTMLCollection {
// inherits item()
- attribute unsigned long length; // overrides inherited length
- legacycaller getter object? namedItem(DOMString name); // overrides inherited namedItem()
+ attribute unsigned long length; // shadows inherited length
+ legacycaller HTMLOptionElement? (DOMString name);
setter creator void (unsigned long index, HTMLOptionElement? option);
void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
void remove(long index);
- attribute long selectedIndex;
+ attribute long selectedIndex;
};
interface HTMLPropertiesCollection : HTMLCollection {
// inherits length and item()
- getter PropertyNodeList? namedItem(DOMString name); // overrides inherited namedItem()
- readonly attribute DOMString[] names;
+ getter PropertyNodeList? namedItem(DOMString name); // shadows inherited namedItem()
+ [SameObject] readonly attribute DOMString[] names;
};
typedef sequence<any> PropertyValueArray;
@@ -40,52 +47,55 @@ interface PropertyNodeList : NodeList {
PropertyValueArray getValues();
};
+[OverrideBuiltins, Exposed=(Window,Worker)]
interface DOMStringMap {
getter DOMString (DOMString name);
- setter void (DOMString name, DOMString value);
- creator void (DOMString name, DOMString value);
+ setter creator void (DOMString name, DOMString value);
deleter void (DOMString name);
};
interface DOMElementMap {
getter Element (DOMString name);
- setter void (DOMString name, Element value);
- creator void (DOMString name, Element value);
+ setter creator void (DOMString name, Element value);
deleter void (DOMString name);
};
-[NoInterfaceObject]
-interface Transferable { };
+typedef (ArrayBuffer or CanvasProxy or MessagePort) Transferable;
+
+callback FileCallback = void (File file);
+
+enum DocumentReadyState { "loading", "interactive", "complete" };
[OverrideBuiltins]
-partial interface Document {
+partial /*sealed*/ interface Document {
// resource metadata management
- [PutForwards=href] readonly attribute Location? location;
- attribute DOMString domain;
+ [PutForwards=href, Unforgeable] readonly attribute Location? location;
+ attribute DOMString domain;
readonly attribute DOMString referrer;
- attribute DOMString cookie;
+ attribute DOMString cookie;
readonly attribute DOMString lastModified;
- readonly attribute DOMString readyState;
+ readonly attribute DocumentReadyState readyState;
// DOM tree accessors
getter object (DOMString name);
- attribute DOMString title;
- attribute DOMString dir;
- attribute HTMLElement? body;
+ attribute DOMString title;
+ attribute DOMString dir;
+ attribute HTMLElement? body;
readonly attribute HTMLHeadElement? head;
- readonly attribute HTMLCollection images;
- readonly attribute HTMLCollection embeds;
- readonly attribute HTMLCollection plugins;
- readonly attribute HTMLCollection links;
- readonly attribute HTMLCollection forms;
- readonly attribute HTMLCollection scripts;
+ [SameObject] readonly attribute HTMLCollection images;
+ [SameObject] readonly attribute HTMLCollection embeds;
+ [SameObject] readonly attribute HTMLCollection plugins;
+ [SameObject] readonly attribute HTMLCollection links;
+ [SameObject] readonly attribute HTMLCollection forms;
+ [SameObject] readonly attribute HTMLCollection scripts;
NodeList getElementsByName(DOMString elementName);
- NodeList getItems(optional DOMString typeNames); // microdata
- readonly attribute DOMElementMap cssElementMap;
+ NodeList getItems(optional DOMString typeNames = ""); // microdata
+ [SameObject] readonly attribute DOMElementMap cssElementMap;
+ readonly attribute HTMLScriptElement? currentScript;
// dynamic markup insertion
- Document open(optional DOMString type, optional DOMString replace);
- WindowProxy open(DOMString url, DOMString name, DOMString features, optional boolean replace);
+ Document open(optional DOMString type = "text/html", optional DOMString replace = "");
+ WindowProxy open(DOMString url, DOMString name, DOMString features, optional boolean replace = false);
void close();
void write(DOMString... text);
void writeln(DOMString... text);
@@ -94,10 +104,8 @@ partial interface Document {
readonly attribute WindowProxy? defaultView;
readonly attribute Element? activeElement;
boolean hasFocus();
- attribute DOMString designMode;
- boolean execCommand(DOMString commandId);
- boolean execCommand(DOMString commandId, boolean showUI);
- boolean execCommand(DOMString commandId, boolean showUI, DOMString value);
+ attribute DOMString designMode;
+ boolean execCommand(DOMString commandId, optional boolean showUI = false, optional DOMString value = "");
boolean queryCommandEnabled(DOMString commandId);
boolean queryCommandIndeterm(DOMString commandId);
boolean queryCommandState(DOMString commandId);
@@ -105,66 +113,12 @@ partial interface Document {
DOMString queryCommandValue(DOMString commandId);
readonly attribute HTMLCollection commands;
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
-
// special event handler IDL attributes that only apply to Document objects
[LenientThis] attribute EventHandler onreadystatechange;
+
+ // also has obsolete members
};
+Document implements GlobalEventHandlers;
partial interface XMLDocument {
boolean load(DOMString url);
@@ -172,35 +126,33 @@ partial interface XMLDocument {
interface HTMLElement : Element {
// metadata attributes
- attribute DOMString title;
- attribute DOMString lang;
- attribute boolean translate;
- attribute DOMString dir;
- readonly attribute DOMStringMap dataset;
+ attribute DOMString title;
+ attribute DOMString lang;
+ attribute boolean translate;
+ attribute DOMString dir;
+ [SameObject] readonly attribute DOMStringMap dataset;
// microdata
- attribute boolean itemScope;
+ attribute boolean itemScope;
[PutForwards=value] readonly attribute DOMSettableTokenList itemType;
- attribute DOMString itemId;
+ attribute DOMString itemId;
[PutForwards=value] readonly attribute DOMSettableTokenList itemRef;
[PutForwards=value] readonly attribute DOMSettableTokenList itemProp;
readonly attribute HTMLPropertiesCollection properties;
- attribute any itemValue; // acts as DOMString on setting
+ attribute any itemValue; // acts as DOMString on setting
// user interaction
- attribute boolean hidden;
+ attribute boolean hidden;
void click();
- attribute long tabIndex;
+ attribute long tabIndex;
void focus();
void blur();
- attribute DOMString accessKey;
+ attribute DOMString accessKey;
readonly attribute DOMString accessKeyLabel;
- attribute boolean draggable;
+ attribute boolean draggable;
[PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
- attribute DOMString contentEditable;
- readonly attribute boolean isContentEditable;
- attribute HTMLMenuElement? contextMenu;
- attribute boolean spellcheck;
+ attribute HTMLMenuElement? contextMenu;
+ attribute boolean spellcheck;
void forceSpellCheck();
// command API
@@ -210,217 +162,157 @@ interface HTMLElement : Element {
readonly attribute boolean? commandHidden;
readonly attribute boolean? commandDisabled;
readonly attribute boolean? commandChecked;
-
- // styling
- readonly attribute CSSStyleDeclaration style;
-
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
};
+HTMLElement implements GlobalEventHandlers;
+HTMLElement implements ElementContentEditable;
interface HTMLUnknownElement : HTMLElement { };
-interface HTMLHtmlElement : HTMLElement {};
+interface HTMLHtmlElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLHeadElement : HTMLElement {};
interface HTMLTitleElement : HTMLElement {
- attribute DOMString text;
+ attribute DOMString text;
};
interface HTMLBaseElement : HTMLElement {
- attribute DOMString href;
- attribute DOMString target;
+ attribute DOMString href;
+ attribute DOMString target;
};
interface HTMLLinkElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString href;
- attribute DOMString rel;
+ attribute DOMString href;
+ attribute DOMString? crossOrigin;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString media;
+ attribute DOMString hreflang;
+ attribute DOMString type;
[PutForwards=value] readonly attribute DOMSettableTokenList sizes;
+
+ // also has obsolete members
};
HTMLLinkElement implements LinkStyle;
interface HTMLMetaElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString httpEquiv;
- attribute DOMString content;
+ attribute DOMString name;
+ attribute DOMString httpEquiv;
+ attribute DOMString content;
+
+ // also has obsolete members
};
interface HTMLStyleElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString media;
- attribute DOMString type;
- attribute boolean scoped;
+ attribute DOMString media;
+ attribute DOMString type;
+ attribute boolean scoped;
};
HTMLStyleElement implements LinkStyle;
-interface HTMLScriptElement : HTMLElement {
- attribute DOMString src;
- attribute boolean async;
- attribute boolean defer;
- attribute DOMString type;
- attribute DOMString charset;
- attribute DOMString text;
+interface HTMLBodyElement : HTMLElement {
+
+ // also has obsolete members
};
+HTMLBodyElement implements WindowEventHandlers;
-interface HTMLBodyElement : HTMLElement {
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler onload;
- attribute EventHandler onmessage;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpopstate;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onstorage;
- attribute EventHandler onunload;
-};
-
-interface HTMLHeadingElement : HTMLElement {};
-
-interface HTMLParagraphElement : HTMLElement {};
-
-interface HTMLHRElement : HTMLElement {};
-
-interface HTMLPreElement : HTMLElement {};
+interface HTMLHeadingElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLParagraphElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLHRElement : HTMLElement {
+ // also has obsolete members
+};
+
+interface HTMLPreElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLQuoteElement : HTMLElement {
- attribute DOMString cite;
+ attribute DOMString cite;
};
interface HTMLOListElement : HTMLElement {
- attribute boolean reversed;
- attribute long start;
- attribute DOMString type;
+ attribute boolean reversed;
+ attribute long start;
+ attribute DOMString type;
+
+ // also has obsolete members
};
-interface HTMLUListElement : HTMLElement {};
+interface HTMLUListElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLLIElement : HTMLElement {
- attribute long value;
+ attribute long value;
+
+ // also has obsolete members
};
-interface HTMLDListElement : HTMLElement {};
+interface HTMLDListElement : HTMLElement {
+ // also has obsolete members
+};
-interface HTMLDivElement : HTMLElement {};
+interface HTMLDivElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLAnchorElement : HTMLElement {
- stringifier attribute DOMString href;
- attribute DOMString target;
-
- attribute DOMString download;
- attribute DOMString ping;
-
- attribute DOMString rel;
+ attribute DOMString target;
+ attribute DOMString download;
+ [PutForwards=value] attribute DOMSettableTokenList ping;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString hreflang;
+ attribute DOMString type;
- attribute DOMString text;
+ attribute DOMString text;
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ // also has obsolete members
};
+HTMLAnchorElement implements URLUtils;
interface HTMLDataElement : HTMLElement {
- attribute DOMString value;
+ attribute DOMString value;
};
interface HTMLTimeElement : HTMLElement {
- attribute DOMString datetime;
+ attribute DOMString dateTime;
};
interface HTMLSpanElement : HTMLElement {};
-interface HTMLBRElement : HTMLElement {};
+interface HTMLBRElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLModElement : HTMLElement {
- attribute DOMString cite;
- attribute DOMString dateTime;
+ attribute DOMString cite;
+ attribute DOMString dateTime;
+};
+
+interface HTMLPictureElement : HTMLElement {};
+
+partial interface HTMLSourceElement {
+ attribute DOMString srcset;
+ attribute DOMString sizes;
+ attribute DOMString media;
};
-[NamedConstructor=Image(),
- NamedConstructor=Image(unsigned long width),
- NamedConstructor=Image(unsigned long width, unsigned long height)]
+[NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
interface HTMLImageElement : HTMLElement {
attribute DOMString alt;
attribute DOMString src;
attribute DOMString srcset;
- attribute DOMString crossOrigin;
+ attribute DOMString sizes;
+ attribute DOMString? crossOrigin;
attribute DOMString useMap;
attribute boolean isMap;
attribute unsigned long width;
@@ -428,78 +320,94 @@ interface HTMLImageElement : HTMLElement {
readonly attribute unsigned long naturalWidth;
readonly attribute unsigned long naturalHeight;
readonly attribute boolean complete;
+ readonly attribute DOMString currentSrc;
+
+ // also has obsolete members
};
interface HTMLIFrameElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString srcdoc;
- attribute DOMString name;
+ attribute DOMString src;
+ attribute DOMString srcdoc;
+ attribute DOMString name;
[PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
- attribute boolean seamless;
- attribute DOMString width;
- attribute DOMString height;
+ attribute boolean seamless;
+ attribute boolean allowFullscreen;
+ attribute DOMString width;
+ attribute DOMString height;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
+ Document? getSVGDocument();
+
+ // also has obsolete members
};
interface HTMLEmbedElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString type;
- attribute DOMString width;
- attribute DOMString height;
+ attribute DOMString src;
+ attribute DOMString type;
+ attribute DOMString width;
+ attribute DOMString height;
+ Document? getSVGDocument();
legacycaller any (any... arguments);
+
+ // also has obsolete members
};
interface HTMLObjectElement : HTMLElement {
- attribute DOMString data;
- attribute DOMString type;
- attribute boolean typeMustMatch;
- attribute DOMString name;
- attribute DOMString useMap;
+ attribute DOMString data;
+ attribute DOMString type;
+ attribute boolean typeMustMatch;
+ attribute DOMString name;
+ attribute DOMString useMap;
readonly attribute HTMLFormElement? form;
- attribute DOMString width;
- attribute DOMString height;
+ attribute DOMString width;
+ attribute DOMString height;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
+ Document? getSVGDocument();
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
legacycaller any (any... arguments);
+
+ // also has obsolete members
};
interface HTMLParamElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString value;
+ attribute DOMString name;
+ attribute DOMString value;
+
+ // also has obsolete members
};
interface HTMLVideoElement : HTMLMediaElement {
- attribute unsigned long width;
- attribute unsigned long height;
+ attribute unsigned long width;
+ attribute unsigned long height;
readonly attribute unsigned long videoWidth;
readonly attribute unsigned long videoHeight;
- attribute DOMString poster;
+ attribute DOMString poster;
};
-[NamedConstructor=Audio(),
- NamedConstructor=Audio(DOMString src)]
+[NamedConstructor=Audio(optional DOMString src)]
interface HTMLAudioElement : HTMLMediaElement {};
interface HTMLSourceElement : HTMLElement {
- attribute DOMString src;
- attribute DOMString type;
- attribute DOMString media;
+ attribute DOMString src;
+ attribute DOMString type;
+
+ // also has obsolete members
};
interface HTMLTrackElement : HTMLElement {
- attribute DOMString kind;
- attribute DOMString src;
- attribute DOMString srclang;
- attribute DOMString label;
- attribute boolean default;
+ attribute DOMString kind;
+ attribute DOMString src;
+ attribute DOMString srclang;
+ attribute DOMString label;
+ attribute boolean default;
const unsigned short NONE = 0;
const unsigned short LOADING = 1;
@@ -510,24 +418,27 @@ interface HTMLTrackElement : HTMLElement {
readonly attribute TextTrack track;
};
+enum CanPlayTypeResult { "" /* empty string */, "maybe", "probably" };
+typedef (MediaStream or MediaSource or Blob) MediaProvider;
interface HTMLMediaElement : HTMLElement {
// error state
readonly attribute MediaError? error;
// network state
- attribute DOMString src;
+ attribute DOMString src;
+ attribute MediaProvider? srcObject;
readonly attribute DOMString currentSrc;
- attribute DOMString crossOrigin;
+ attribute DOMString? crossOrigin;
const unsigned short NETWORK_EMPTY = 0;
const unsigned short NETWORK_IDLE = 1;
const unsigned short NETWORK_LOADING = 2;
const unsigned short NETWORK_NO_SOURCE = 3;
readonly attribute unsigned short networkState;
- attribute DOMString preload;
+ attribute DOMString preload;
readonly attribute TimeRanges buffered;
void load();
- DOMString canPlayType(DOMString type);
+ CanPlayTypeResult canPlayType(DOMString type);
// ready state
const unsigned short HAVE_NOTHING = 0;
@@ -539,36 +450,36 @@ interface HTMLMediaElement : HTMLElement {
readonly attribute boolean seeking;
// playback state
- attribute double currentTime;
+ attribute double currentTime;
void fastSeek(double time);
readonly attribute unrestricted double duration;
- readonly attribute Date startDate;
+ Date getStartDate();
readonly attribute boolean paused;
- attribute double defaultPlaybackRate;
- attribute double playbackRate;
+ attribute double defaultPlaybackRate;
+ attribute double playbackRate;
readonly attribute TimeRanges played;
readonly attribute TimeRanges seekable;
readonly attribute boolean ended;
- attribute boolean autoplay;
- attribute boolean loop;
+ attribute boolean autoplay;
+ attribute boolean loop;
void play();
void pause();
// media controller
- attribute DOMString mediaGroup;
- attribute MediaController? controller;
+ attribute DOMString mediaGroup;
+ attribute MediaController? controller;
// controls
- attribute boolean controls;
- attribute double volume;
- attribute boolean muted;
- attribute boolean defaultMuted;
+ attribute boolean controls;
+ attribute double volume;
+ attribute boolean muted;
+ attribute boolean defaultMuted;
// tracks
- readonly attribute AudioTrackList audioTracks;
- readonly attribute VideoTrackList videoTracks;
- readonly attribute TextTrackList textTracks;
- TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
+ [SameObject] readonly attribute AudioTrackList audioTracks;
+ [SameObject] readonly attribute VideoTrackList videoTracks;
+ [SameObject] readonly attribute TextTrackList textTracks;
+ TextTrack addTextTrack(TextTrackKind kind, optional DOMString label = "", optional DOMString language = "");
};
interface MediaError {
@@ -584,9 +495,9 @@ interface AudioTrackList : EventTarget {
getter AudioTrack (unsigned long index);
AudioTrack? getTrackById(DOMString id);
- attribute EventHandler onchange;
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
interface AudioTrack {
@@ -594,7 +505,7 @@ interface AudioTrack {
readonly attribute DOMString kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
- attribute boolean enabled;
+ attribute boolean enabled;
};
interface VideoTrackList : EventTarget {
@@ -603,9 +514,9 @@ interface VideoTrackList : EventTarget {
VideoTrack? getTrackById(DOMString id);
readonly attribute long selectedIndex;
- attribute EventHandler onchange;
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
interface VideoTrack {
@@ -613,7 +524,7 @@ interface VideoTrack {
readonly attribute DOMString kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
- attribute boolean selected;
+ attribute boolean selected;
};
enum MediaControllerPlaybackState { "waiting", "playing", "ended" };
@@ -624,7 +535,7 @@ interface MediaController : EventTarget {
readonly attribute TimeRanges buffered;
readonly attribute TimeRanges seekable;
readonly attribute unrestricted double duration;
- attribute double currentTime;
+ attribute double currentTime;
readonly attribute boolean paused;
readonly attribute MediaControllerPlaybackState playbackState;
@@ -633,45 +544,50 @@ interface MediaController : EventTarget {
void unpause();
void play(); // calls play() on all media elements as well
- attribute double defaultPlaybackRate;
- attribute double playbackRate;
+ attribute double defaultPlaybackRate;
+ attribute double playbackRate;
- attribute double volume;
- attribute boolean muted;
+ attribute double volume;
+ attribute boolean muted;
- attribute EventHandler onemptied;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadeddata;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onplaying;
- attribute EventHandler onended;
- attribute EventHandler onwaiting;
+ attribute EventHandler onemptied;
+ attribute EventHandler onloadedmetadata;
+ attribute EventHandler onloadeddata;
+ attribute EventHandler oncanplay;
+ attribute EventHandler oncanplaythrough;
+ attribute EventHandler onplaying;
+ attribute EventHandler onended;
+ attribute EventHandler onwaiting;
- attribute EventHandler ondurationchange;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onplay;
- attribute EventHandler onpause;
- attribute EventHandler onratechange;
- attribute EventHandler onvolumechange;
+ attribute EventHandler ondurationchange;
+ attribute EventHandler ontimeupdate;
+ attribute EventHandler onplay;
+ attribute EventHandler onpause;
+ attribute EventHandler onratechange;
+ attribute EventHandler onvolumechange;
};
interface TextTrackList : EventTarget {
readonly attribute unsigned long length;
getter TextTrack (unsigned long index);
+ TextTrack? getTrackById(DOMString id);
- attribute EventHandler onaddtrack;
- attribute EventHandler onremovetrack;
+ attribute EventHandler onchange;
+ attribute EventHandler onaddtrack;
+ attribute EventHandler onremovetrack;
};
-enum TextTrackMode { "disabled", "hidden", "showing" };
+enum TextTrackMode { "disabled", "hidden", "showing" };
+enum TextTrackKind { "subtitles", "captions", "descriptions", "chapters", "metadata" };
interface TextTrack : EventTarget {
- readonly attribute DOMString kind;
+ readonly attribute TextTrackKind kind;
readonly attribute DOMString label;
readonly attribute DOMString language;
+
+ readonly attribute DOMString id;
readonly attribute DOMString inBandMetadataTrackDispatchType;
- attribute TextTrackMode mode;
+ attribute TextTrackMode mode;
readonly attribute TextTrackCueList? cues;
readonly attribute TextTrackCueList? activeCues;
@@ -679,7 +595,7 @@ interface TextTrack : EventTarget {
void addCue(TextTrackCue cue);
void removeCue(TextTrackCue cue);
- attribute EventHandler oncuechange;
+ attribute EventHandler oncuechange;
};
interface TextTrackCueList {
@@ -688,26 +604,16 @@ interface TextTrackCueList {
TextTrackCue? getCueById(DOMString id);
};
-enum AutoKeyword { "auto" };
-[Constructor(double startTime, double endTime, DOMString text)]
interface TextTrackCue : EventTarget {
readonly attribute TextTrack? track;
- attribute DOMString id;
- attribute double startTime;
- attribute double endTime;
- attribute boolean pauseOnExit;
- attribute DOMString vertical;
- attribute boolean snapToLines;
- attribute (long or AutoKeyword) line;
- attribute long position;
- attribute long size;
- attribute DOMString align;
- attribute DOMString text;
- DocumentFragment getCueAsHTML();
+ attribute DOMString id;
+ attribute double startTime;
+ attribute double endTime;
+ attribute boolean pauseOnExit;
- attribute EventHandler onenter;
- attribute EventHandler onexit;
+ attribute EventHandler onenter;
+ attribute EventHandler onexit;
};
interface TimeRanges {
@@ -718,465 +624,254 @@ interface TimeRanges {
[Constructor(DOMString type, optional TrackEventInit eventInitDict)]
interface TrackEvent : Event {
- readonly attribute object? track;
+ readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
};
dictionary TrackEventInit : EventInit {
- object? track;
-};
-
-interface HTMLCanvasElement : HTMLElement {
- attribute unsigned long width;
- attribute unsigned long height;
-
- DOMString toDataURL(optional DOMString type, any... arguments);
- DOMString toDataURLHD(optional DOMString type, any... arguments);
- void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
- void toBlobHD(FileCallback? _callback, optional DOMString type, any... arguments);
-
- object? getContext(DOMString contextId, any... arguments);
- boolean supportsContext(DOMString contextId, any... arguments);
-};
-
-interface CanvasRenderingContext2D {
-
- // back-reference to the canvas
- readonly attribute HTMLCanvasElement canvas;
-
- // state
- void save(); // push state on state stack
- void restore(); // pop state stack and restore state
-
- // transformations (default transform is the identity matrix)
- attribute SVGMatrix currentTransform;
- void scale(unrestricted double x, unrestricted double y);
- void rotate(unrestricted double angle);
- void translate(unrestricted double x, unrestricted double y);
- void transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
- void setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
- void resetTransform();
-
- // compositing
- attribute unrestricted double globalAlpha; // (default 1.0)
- attribute DOMString globalCompositeOperation; // (default source-over)
-
- // image smoothing
- attribute boolean imageSmoothingEnabled; // (default true)
-
- // colors and styles (see also the CanvasDrawingStyles interface)
- attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
- attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
- CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
- CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
- CanvasPattern createPattern((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, DOMString repetition);
-
- // shadows
- attribute unrestricted double shadowOffsetX; // (default 0)
- attribute unrestricted double shadowOffsetY; // (default 0)
- attribute unrestricted double shadowBlur; // (default 0)
- attribute DOMString shadowColor; // (default transparent black)
-
- // rects
- void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-
- // path API (see also CanvasPathMethods)
- void beginPath();
- void fill();
- void fill(Path path);
- void stroke();
- void stroke(Path path);
- void drawSystemFocusRing(Element element);
- void drawSystemFocusRing(Path path, Element element);
- boolean drawCustomFocusRing(Element element);
- boolean drawCustomFocusRing(Path path, Element element);
- void scrollPathIntoView();
- void scrollPathIntoView(Path path);
- void clip();
- void clip(Path path);
- void resetClip();
- boolean isPointInPath(unrestricted double x, unrestricted double y);
- boolean isPointInPath(Path path, unrestricted double x, unrestricted double y);
-
- // text (see also the CanvasDrawingStyles interface)
- void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- TextMetrics measureText(DOMString text);
-
- // drawing images
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double dx, unrestricted double dy);
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
- void drawImage((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
-
- // hit regions
- void addHitRegion(HitRegionOptions options);
- void removeHitRegion(HitRegionOptions options);
-
- // pixel manipulation
- ImageData createImageData(double sw, double sh);
- ImageData createImageData(ImageData imagedata);
- ImageData createImageDataHD(double sw, double sh);
- ImageData getImageData(double sx, double sy, double sw, double sh);
- ImageData getImageDataHD(double sx, double sy, double sw, double sh);
- void putImageData(ImageData imagedata, double dx, double dy);
- void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
- void putImageDataHD(ImageData imagedata, double dx, double dy);
- void putImageDataHD(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
-};
-CanvasRenderingContext2D implements CanvasDrawingStyles;
-CanvasRenderingContext2D implements CanvasPathMethods;
-
-[NoInterfaceObject]
-interface CanvasDrawingStyles {
- // line caps/joins
- attribute unrestricted double lineWidth; // (default 1)
- attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
- attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
- attribute unrestricted double miterLimit; // (default 10)
-
- // dashed lines
- void setLineDash(sequence<unrestricted double> segments); // default empty
- sequence<unrestricted double> getLineDash();
- attribute unrestricted double lineDashOffset;
-
- // text
- attribute DOMString font; // (default 10px sans-serif)
- attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
- attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
-};
-
-[NoInterfaceObject]
-interface CanvasPathMethods {
- // shared path API methods
- void closePath();
- void moveTo(unrestricted double x, unrestricted double y);
- void lineTo(unrestricted double x, unrestricted double y);
- void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
- void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
- void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
- void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation);
- void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
- void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
- void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, boolean anticlockwise);
-};
-
-interface CanvasGradient {
- // opaque object
- void addColorStop(double offset, DOMString color);
-};
-
-interface CanvasPattern {
- // opaque object
- void setTransform(SVGMatrix transform);
-};
-
-interface TextMetrics {
- // x-direction
- readonly attribute double width; // advance width
- readonly attribute double actualBoundingBoxLeft;
- readonly attribute double actualBoundingBoxRight;
-
- // y-direction
- readonly attribute double fontBoundingBoxAscent;
- readonly attribute double fontBoundingBoxDescent;
- readonly attribute double actualBoundingBoxAscent;
- readonly attribute double actualBoundingBoxDescent;
- readonly attribute double emHeightAscent;
- readonly attribute double emHeightDescent;
- readonly attribute double hangingBaseline;
- readonly attribute double alphabeticBaseline;
- readonly attribute double ideographicBaseline;
-};
-
-dictionary HitRegionOptions {
- Path? path = null;
- DOMString id = "";
- DOMString? parentID = null;
- DOMString cursor = "inherit";
- // for control-backed regions:
- Element? control = null;
- // for unbacked regions:
- DOMString? label = null;
- DOMString? role = null;
-};
-
-interface ImageData {
- readonly attribute unsigned long width;
- readonly attribute unsigned long height;
- readonly attribute Uint8ClampedArray data;
-};
-
-[Constructor(optional Element scope)]
-interface DrawingStyle { };
-DrawingStyle implements CanvasDrawingStyles;
-
-[Constructor,
- Constructor(Path path),
- Constructor(DOMString d)]
-interface Path {
- void addPath(Path path, SVGMatrix? transformation);
- void addPathByStrokingPath(Path path, CanvasDrawingStyles styles, SVGMatrix? transformation);
- void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
- void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path path, optional unrestricted double maxWidth);
- void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path path, optional unrestricted double maxWidth);
-};
-Path implements CanvasPathMethods;
-
-partial interface Screen {
- readonly attribute double canvasResolution;
-};
-
-partial interface MouseEvent {
- readonly attribute DOMString? region;
-};
-
-partial dictionary MouseEventInit {
- DOMString? region;
+ (VideoTrack or AudioTrack or TextTrack)? track;
};
interface HTMLMapElement : HTMLElement {
- attribute DOMString name;
+ attribute DOMString name;
readonly attribute HTMLCollection areas;
readonly attribute HTMLCollection images;
};
interface HTMLAreaElement : HTMLElement {
- attribute DOMString alt;
- attribute DOMString coords;
- attribute DOMString shape;
- stringifier attribute DOMString href;
- attribute DOMString target;
-
- attribute DOMString download;
- attribute DOMString ping;
-
- attribute DOMString rel;
+ attribute DOMString alt;
+ attribute DOMString coords;
+ attribute DOMString shape;
+ attribute DOMString target;
+ attribute DOMString download;
+ [PutForwards=value] attribute DOMSettableTokenList ping;
+ attribute DOMString rel;
readonly attribute DOMTokenList relList;
- attribute DOMString media;
- attribute DOMString hreflang;
- attribute DOMString type;
+ attribute DOMString hreflang;
+ attribute DOMString type;
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ // also has obsolete members
};
+HTMLAreaElement implements URLUtils;
interface HTMLTableElement : HTMLElement {
- attribute HTMLTableCaptionElement? caption;
+ attribute HTMLTableCaptionElement? caption;
HTMLElement createCaption();
void deleteCaption();
- attribute HTMLTableSectionElement? tHead;
+ attribute HTMLTableSectionElement? tHead;
HTMLElement createTHead();
void deleteTHead();
- attribute HTMLTableSectionElement? tFoot;
+ attribute HTMLTableSectionElement? tFoot;
HTMLElement createTFoot();
void deleteTFoot();
readonly attribute HTMLCollection tBodies;
HTMLElement createTBody();
readonly attribute HTMLCollection rows;
- HTMLElement insertRow(optional long index);
+ HTMLElement insertRow(optional long index = -1);
void deleteRow(long index);
+ attribute boolean sortable;
+ void stopSorting();
+
+ // also has obsolete members
};
-interface HTMLTableCaptionElement : HTMLElement {};
+interface HTMLTableCaptionElement : HTMLElement {
+ // also has obsolete members
+};
interface HTMLTableColElement : HTMLElement {
- attribute unsigned long span;
+ attribute unsigned long span;
+
+ // also has obsolete members
};
interface HTMLTableSectionElement : HTMLElement {
readonly attribute HTMLCollection rows;
- HTMLElement insertRow(optional long index);
+ HTMLElement insertRow(optional long index = -1);
void deleteRow(long index);
+
+ // also has obsolete members
};
interface HTMLTableRowElement : HTMLElement {
readonly attribute long rowIndex;
readonly attribute long sectionRowIndex;
readonly attribute HTMLCollection cells;
- HTMLElement insertCell(optional long index);
+ HTMLElement insertCell(optional long index = -1);
void deleteCell(long index);
+
+ // also has obsolete members
};
-interface HTMLTableDataCellElement : HTMLTableCellElement {};
+interface HTMLTableDataCellElement : HTMLTableCellElement {
+ // also has obsolete members
+};
interface HTMLTableHeaderCellElement : HTMLTableCellElement {
- attribute DOMString scope;
- attribute DOMString abbr;
+ attribute DOMString scope;
+ attribute DOMString abbr;
+ attribute DOMString sorted;
+ void sort();
};
interface HTMLTableCellElement : HTMLElement {
- attribute unsigned long colSpan;
- attribute unsigned long rowSpan;
+ attribute unsigned long colSpan;
+ attribute unsigned long rowSpan;
[PutForwards=value] readonly attribute DOMSettableTokenList headers;
readonly attribute long cellIndex;
+
+ // also has obsolete members
};
[OverrideBuiltins]
interface HTMLFormElement : HTMLElement {
- attribute DOMString acceptCharset;
- attribute DOMString action;
- attribute DOMString autocomplete;
- attribute DOMString enctype;
- attribute DOMString encoding;
- attribute DOMString method;
- attribute DOMString name;
- attribute boolean noValidate;
- attribute DOMString target;
+ attribute DOMString acceptCharset;
+ attribute DOMString action;
+ attribute DOMString autocomplete;
+ attribute DOMString enctype;
+ attribute DOMString encoding;
+ attribute DOMString method;
+ attribute DOMString name;
+ attribute boolean noValidate;
+ attribute DOMString target;
readonly attribute HTMLFormControlsCollection elements;
readonly attribute long length;
getter Element (unsigned long index);
- getter object (DOMString name);
+ getter (RadioNodeList or Element) (DOMString name);
void submit();
void reset();
boolean checkValidity();
-};
-
-interface HTMLFieldSetElement : HTMLElement {
- attribute boolean disabled;
- readonly attribute HTMLFormElement? form;
- attribute DOMString name;
-
- readonly attribute DOMString type;
-
- readonly attribute HTMLFormControlsCollection elements;
-
- readonly attribute boolean willValidate;
- readonly attribute ValidityState validity;
- readonly attribute DOMString validationMessage;
- boolean checkValidity();
- void setCustomValidity(DOMString error);
-};
+ boolean reportValidity();
-interface HTMLLegendElement : HTMLElement {
- readonly attribute HTMLFormElement? form;
+ void requestAutocomplete();
};
interface HTMLLabelElement : HTMLElement {
readonly attribute HTMLFormElement? form;
- attribute DOMString htmlFor;
+ attribute DOMString htmlFor;
readonly attribute HTMLElement? control;
};
interface HTMLInputElement : HTMLElement {
- attribute DOMString accept;
- attribute DOMString alt;
- attribute DOMString autocomplete;
- attribute boolean autofocus;
- attribute boolean defaultChecked;
- attribute boolean checked;
- attribute DOMString dirName;
- attribute boolean disabled;
+ attribute DOMString accept;
+ attribute DOMString alt;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute boolean defaultChecked;
+ attribute boolean checked;
+ attribute DOMString dirName;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
readonly attribute FileList? files;
- attribute DOMString formAction;
- attribute DOMString formEnctype;
- attribute DOMString formMethod;
- attribute boolean formNoValidate;
- attribute DOMString formTarget;
- attribute unsigned long height;
- attribute boolean indeterminate;
- attribute DOMString inputMode;
+ attribute DOMString formAction;
+ attribute DOMString formEnctype;
+ attribute DOMString formMethod;
+ attribute boolean formNoValidate;
+ attribute DOMString formTarget;
+ attribute unsigned long height;
+ attribute boolean indeterminate;
+ attribute DOMString inputMode;
readonly attribute HTMLElement? list;
- attribute DOMString max;
- attribute long maxLength;
- attribute DOMString min;
- attribute boolean multiple;
- attribute DOMString name;
- attribute DOMString pattern;
- attribute DOMString placeholder;
- attribute boolean readOnly;
- attribute boolean required;
- attribute unsigned long size;
- attribute DOMString src;
- attribute DOMString step;
- attribute DOMString type;
- attribute DOMString defaultValue;
+ attribute DOMString max;
+ attribute long maxLength;
+ attribute DOMString min;
+ attribute long minLength;
+ attribute boolean multiple;
+ attribute DOMString name;
+ attribute DOMString pattern;
+ attribute DOMString placeholder;
+ attribute boolean readOnly;
+ attribute boolean required;
+ attribute unsigned long size;
+ attribute DOMString src;
+ attribute DOMString step;
+ attribute DOMString type;
+ attribute DOMString defaultValue;
[TreatNullAs=EmptyString] attribute DOMString value;
- attribute Date? valueAsDate;
- attribute unrestricted double valueAsNumber;
- attribute unsigned long width;
+ attribute Date? valueAsDate;
+ attribute unrestricted double valueAsNumber;
+ attribute double valueLow;
+ attribute double valueHigh;
+ attribute unsigned long width;
- void stepUp(optional long n);
- void stepDown(optional long n);
+ void stepUp(optional long n = 1);
+ void stepDown(optional long n = 1);
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
void select();
- attribute unsigned long selectionStart;
- attribute unsigned long selectionEnd;
- attribute DOMString selectionDirection;
-
+ attribute unsigned long selectionStart;
+ attribute unsigned long selectionEnd;
+ attribute DOMString selectionDirection;
void setRangeText(DOMString replacement);
- void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode);
-
+ void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+
+ // also has obsolete members
};
interface HTMLButtonElement : HTMLElement {
- attribute boolean autofocus;
- attribute boolean disabled;
+ attribute boolean autofocus;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString formAction;
- attribute DOMString formEnctype;
- attribute DOMString formMethod;
- attribute boolean formNoValidate;
- attribute DOMString formTarget;
- attribute DOMString name;
- attribute DOMString type;
- attribute DOMString value;
+ attribute DOMString formAction;
+ attribute DOMString formEnctype;
+ attribute DOMString formMethod;
+ attribute boolean formNoValidate;
+ attribute DOMString formTarget;
+ attribute DOMString name;
+ attribute DOMString type;
+ attribute DOMString value;
+ attribute HTMLMenuElement? menu;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
};
interface HTMLSelectElement : HTMLElement {
- attribute boolean autofocus;
- attribute boolean disabled;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute boolean multiple;
- attribute DOMString name;
- attribute boolean required;
- attribute unsigned long size;
+ attribute boolean multiple;
+ attribute DOMString name;
+ attribute boolean required;
+ attribute unsigned long size;
readonly attribute DOMString type;
readonly attribute HTMLOptionsCollection options;
- attribute unsigned long length;
- getter Element item(unsigned long index);
- object namedItem(DOMString name);
+ attribute unsigned long length;
+ getter Element? item(unsigned long index);
+ HTMLOptionElement? namedItem(DOMString name);
void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+ void remove(); // ChildNode overload
void remove(long index);
setter creator void (unsigned long index, HTMLOptionElement? option);
readonly attribute HTMLCollection selectedOptions;
- attribute long selectedIndex;
- attribute DOMString value;
+ attribute long selectedIndex;
+ attribute DOMString value;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
@@ -1187,45 +882,42 @@ interface HTMLDataListElement : HTMLElement {
};
interface HTMLOptGroupElement : HTMLElement {
- attribute boolean disabled;
- attribute DOMString label;
+ attribute boolean disabled;
+ attribute DOMString label;
};
-[NamedConstructor=Option(),
- NamedConstructor=Option(DOMString text),
- NamedConstructor=Option(DOMString text, DOMString value),
- NamedConstructor=Option(DOMString text, DOMString value, boolean defaultSelected),
- NamedConstructor=Option(DOMString text, DOMString value, boolean defaultSelected, boolean selected)]
+[NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
interface HTMLOptionElement : HTMLElement {
- attribute boolean disabled;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString label;
- attribute boolean defaultSelected;
- attribute boolean selected;
- attribute DOMString value;
+ attribute DOMString label;
+ attribute boolean defaultSelected;
+ attribute boolean selected;
+ attribute DOMString value;
- attribute DOMString text;
+ attribute DOMString text;
readonly attribute long index;
};
interface HTMLTextAreaElement : HTMLElement {
- attribute DOMString autocomplete;
- attribute boolean autofocus;
- attribute unsigned long cols;
- attribute DOMString dirName;
- attribute boolean disabled;
+ attribute DOMString autocomplete;
+ attribute boolean autofocus;
+ attribute unsigned long cols;
+ attribute DOMString dirName;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString inputMode;
- attribute long maxLength;
- attribute DOMString name;
- attribute DOMString placeholder;
- attribute boolean readOnly;
- attribute boolean required;
- attribute unsigned long rows;
- attribute DOMString wrap;
+ attribute DOMString inputMode;
+ attribute long maxLength;
+ attribute long minLength;
+ attribute DOMString name;
+ attribute DOMString placeholder;
+ attribute boolean readOnly;
+ attribute boolean required;
+ attribute unsigned long rows;
+ attribute DOMString wrap;
readonly attribute DOMString type;
- attribute DOMString defaultValue;
+ attribute DOMString defaultValue;
[TreatNullAs=EmptyString] attribute DOMString value;
readonly attribute unsigned long textLength;
@@ -1233,28 +925,27 @@ interface HTMLTextAreaElement : HTMLElement {
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
void select();
- attribute unsigned long selectionStart;
- attribute unsigned long selectionEnd;
- attribute DOMString selectionDirection;
-
+ attribute unsigned long selectionStart;
+ attribute unsigned long selectionEnd;
+ attribute DOMString selectionDirection;
void setRangeText(DOMString replacement);
- void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode);
-
+ void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
};
interface HTMLKeygenElement : HTMLElement {
- attribute boolean autofocus;
- attribute DOMString challenge;
- attribute boolean disabled;
+ attribute boolean autofocus;
+ attribute DOMString challenge;
+ attribute boolean disabled;
readonly attribute HTMLFormElement? form;
- attribute DOMString keytype;
- attribute DOMString name;
+ attribute DOMString keytype;
+ attribute DOMString name;
readonly attribute DOMString type;
@@ -1262,6 +953,7 @@ interface HTMLKeygenElement : HTMLElement {
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
@@ -1270,85 +962,453 @@ interface HTMLKeygenElement : HTMLElement {
interface HTMLOutputElement : HTMLElement {
[PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
readonly attribute HTMLFormElement? form;
- attribute DOMString name;
+ attribute DOMString name;
readonly attribute DOMString type;
- attribute DOMString defaultValue;
- attribute DOMString value;
+ attribute DOMString defaultValue;
+ attribute DOMString value;
readonly attribute boolean willValidate;
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
+ boolean reportValidity();
void setCustomValidity(DOMString error);
readonly attribute NodeList labels;
};
interface HTMLProgressElement : HTMLElement {
- attribute double value;
- attribute double max;
+ attribute double value;
+ attribute double max;
readonly attribute double position;
readonly attribute NodeList labels;
};
interface HTMLMeterElement : HTMLElement {
- attribute double value;
- attribute double min;
- attribute double max;
- attribute double low;
- attribute double high;
- attribute double optimum;
+ attribute double value;
+ attribute double min;
+ attribute double max;
+ attribute double low;
+ attribute double high;
+ attribute double optimum;
readonly attribute NodeList labels;
};
+interface HTMLFieldSetElement : HTMLElement {
+ attribute boolean disabled;
+ readonly attribute HTMLFormElement? form;
+ attribute DOMString name;
-interface ValidityState {
- readonly attribute boolean valueMissing;
+ readonly attribute DOMString type;
+
+ readonly attribute HTMLFormControlsCollection elements;
+
+ readonly attribute boolean willValidate;
+ [SameObject] readonly attribute ValidityState validity;
+ readonly attribute DOMString validationMessage;
+ boolean checkValidity();
+ boolean reportValidity();
+ void setCustomValidity(DOMString error);
+};
+
+interface HTMLLegendElement : HTMLElement {
+ readonly attribute HTMLFormElement? form;
+
+ // also has obsolete members
+};
+
+enum AutocompleteErrorReason { "" /* empty string */, "cancel", "disabled", "invalid" };
+
+[Constructor(DOMString type, optional AutocompleteErrorEventInit eventInitDict)]
+interface AutocompleteErrorEvent : Event {
+ readonly attribute AutocompleteErrorReason reason;
+};
+
+dictionary AutocompleteErrorEventInit : EventInit {
+ AutocompleteErrorReason reason;
+};
+
+enum SelectionMode {
+ "select",
+ "start",
+ "end",
+ "preserve", // default
+};
+
+interface ValidityState {
+ readonly attribute boolean valueMissing;
readonly attribute boolean typeMismatch;
readonly attribute boolean patternMismatch;
readonly attribute boolean tooLong;
+ readonly attribute boolean tooShort;
readonly attribute boolean rangeUnderflow;
readonly attribute boolean rangeOverflow;
readonly attribute boolean stepMismatch;
+ readonly attribute boolean badInput;
readonly attribute boolean customError;
readonly attribute boolean valid;
};
interface HTMLDetailsElement : HTMLElement {
- attribute boolean open;
+ attribute boolean open;
+};
+
+interface HTMLMenuElement : HTMLElement {
+ attribute DOMString type;
+ attribute DOMString label;
+
+ // also has obsolete members
};
-interface HTMLCommandElement : HTMLElement {
- attribute DOMString type;
- attribute DOMString label;
- attribute DOMString icon;
- attribute boolean disabled;
- attribute boolean checked;
- attribute DOMString radiogroup;
+interface HTMLMenuItemElement : HTMLElement {
+ attribute DOMString type;
+ attribute DOMString label;
+ attribute DOMString icon;
+ attribute boolean disabled;
+ attribute boolean checked;
+ attribute DOMString radiogroup;
+ attribute boolean default;
readonly attribute HTMLElement? command;
};
-interface HTMLMenuElement : HTMLElement {
- attribute DOMString type;
- attribute DOMString label;
+[Constructor(DOMString type, optional RelatedEventInit eventInitDict)]
+interface RelatedEvent : Event {
+ readonly attribute EventTarget? relatedTarget;
+};
+
+dictionary RelatedEventInit : EventInit {
+ EventTarget? relatedTarget;
};
interface HTMLDialogElement : HTMLElement {
- attribute boolean open;
- attribute DOMString returnValue;
+ attribute boolean open;
+ attribute DOMString returnValue;
void show(optional (MouseEvent or Element) anchor);
void showModal(optional (MouseEvent or Element) anchor);
void close(optional DOMString returnValue);
};
-[NamedPropertiesObject]
-interface Window : EventTarget {
+interface HTMLScriptElement : HTMLElement {
+ attribute DOMString src;
+ attribute DOMString type;
+ attribute DOMString charset;
+ attribute boolean async;
+ attribute boolean defer;
+ attribute DOMString? crossOrigin;
+ attribute DOMString text;
+
+ // also has obsolete members
+};
+
+interface HTMLTemplateElement : HTMLElement {
+ readonly attribute DocumentFragment content;
+};
+
+typedef (CanvasRenderingContext2D or WebGLRenderingContext) RenderingContext;
+
+interface HTMLCanvasElement : HTMLElement {
+ attribute unsigned long width;
+ attribute unsigned long height;
+
+ RenderingContext? getContext(DOMString contextId, any... arguments);
+ boolean probablySupportsContext(DOMString contextId, any... arguments);
+
+ void setContext(RenderingContext context);
+ CanvasProxy transferControlToProxy();
+
+ DOMString toDataURL(optional DOMString type, any... arguments);
+ void toBlob(FileCallback? _callback, optional DOMString type, any... arguments);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasProxy {
+ void setContext(RenderingContext context);
+};
+// CanvasProxy implements Transferable;
+
+typedef (HTMLImageElement or
+ HTMLVideoElement or
+ HTMLCanvasElement or
+ CanvasRenderingContext2D or
+ ImageBitmap) CanvasImageSource;
+
+enum CanvasFillRule { "nonzero", "evenodd" };
+
+dictionary CanvasRenderingContext2DSettings {
+ boolean alpha = true;
+};
+
+[Constructor(),
+ Constructor(unsigned long width, unsigned long height),
+ Exposed=(Window,Worker)]
+interface CanvasRenderingContext2D {
+
+ // back-reference to the canvas
+ readonly attribute HTMLCanvasElement canvas;
+
+ // canvas dimensions
+ attribute unsigned long width;
+ attribute unsigned long height;
+
+ // for contexts that aren't directly fixed to a specific canvas
+ void commit(); // push the image to the output bitmap
+
+ // state
+ void save(); // push state on state stack
+ void restore(); // pop state stack and restore state
+
+ // transformations (default transform is the identity matrix)
+ attribute SVGMatrix currentTransform;
+ void scale(unrestricted double x, unrestricted double y);
+ void rotate(unrestricted double angle);
+ void translate(unrestricted double x, unrestricted double y);
+ void transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+ void setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+ void resetTransform();
+
+ // compositing
+ attribute unrestricted double globalAlpha; // (default 1.0)
+ attribute DOMString globalCompositeOperation; // (default source-over)
+
+ // image smoothing
+ attribute boolean imageSmoothingEnabled; // (default true)
+
+ // colours and styles (see also the CanvasDrawingStyles interface)
+ attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black)
+ attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle; // (default black)
+ CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
+ CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
+ CanvasPattern createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition);
+
+ // shadows
+ attribute unrestricted double shadowOffsetX; // (default 0)
+ attribute unrestricted double shadowOffsetY; // (default 0)
+ attribute unrestricted double shadowBlur; // (default 0)
+ attribute DOMString shadowColor; // (default transparent black)
+
+ // rects
+ void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+
+ // path API (see also CanvasPathMethods)
+ void beginPath();
+ void fill(optional CanvasFillRule fillRule = "nonzero");
+ void fill(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+ void stroke();
+ void stroke(Path2D path);
+ void drawFocusIfNeeded(Element element);
+ void drawFocusIfNeeded(Path2D path, Element element);
+ void scrollPathIntoView();
+ void scrollPathIntoView(Path2D path);
+ void clip(optional CanvasFillRule fillRule = "nonzero");
+ void clip(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+ void resetClip();
+ boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
+ boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
+ boolean isPointInStroke(unrestricted double x, unrestricted double y);
+ boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
+
+ // text (see also the CanvasDrawingStyles interface)
+ void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ TextMetrics measureText(DOMString text);
+
+ // drawing images
+ void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy);
+ void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+ void drawImage(CanvasImageSource image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+
+ // hit regions
+ void addHitRegion(optional HitRegionOptions options);
+ void removeHitRegion(DOMString id);
+ void clearHitRegions();
+
+ // pixel manipulation
+ ImageData createImageData(double sw, double sh);
+ ImageData createImageData(ImageData imagedata);
+ ImageData getImageData(double sx, double sy, double sw, double sh);
+ void putImageData(ImageData imagedata, double dx, double dy);
+ void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
+};
+CanvasRenderingContext2D implements CanvasDrawingStyles;
+CanvasRenderingContext2D implements CanvasPathMethods;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface CanvasDrawingStyles {
+ // line caps/joins
+ attribute unrestricted double lineWidth; // (default 1)
+ attribute DOMString lineCap; // "butt", "round", "square" (default "butt")
+ attribute DOMString lineJoin; // "round", "bevel", "miter" (default "miter")
+ attribute unrestricted double miterLimit; // (default 10)
+
+ // dashed lines
+ void setLineDash(sequence<unrestricted double> segments); // default empty
+ sequence<unrestricted double> getLineDash();
+ attribute unrestricted double lineDashOffset;
+
+ // text
+ attribute DOMString font; // (default 10px sans-serif)
+ attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
+ attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
+ attribute DOMString direction; // "ltr", "rtl", "inherit" (default: "inherit")
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface CanvasPathMethods {
+ // shared path API methods
+ void closePath();
+ void moveTo(unrestricted double x, unrestricted double y);
+ void lineTo(unrestricted double x, unrestricted double y);
+ void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
+ void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
+ void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
+ void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation);
+ void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+ void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+ void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasGradient {
+ // opaque object
+ void addColorStop(double offset, DOMString color);
+};
+
+[Exposed=(Window,Worker)]
+interface CanvasPattern {
+ // opaque object
+ void setTransform(SVGMatrix transform);
+};
+
+[Exposed=(Window,Worker)]
+interface TextMetrics {
+ // x-direction
+ readonly attribute double width; // advance width
+ readonly attribute double actualBoundingBoxLeft;
+ readonly attribute double actualBoundingBoxRight;
+
+ // y-direction
+ readonly attribute double fontBoundingBoxAscent;
+ readonly attribute double fontBoundingBoxDescent;
+ readonly attribute double actualBoundingBoxAscent;
+ readonly attribute double actualBoundingBoxDescent;
+ readonly attribute double emHeightAscent;
+ readonly attribute double emHeightDescent;
+ readonly attribute double hangingBaseline;
+ readonly attribute double alphabeticBaseline;
+ readonly attribute double ideographicBaseline;
+};
+
+dictionary HitRegionOptions {
+ Path2D? path = null;
+ CanvasFillRule fillRule = "nonzero";
+ DOMString id = "";
+ DOMString? parentID = null;
+ DOMString cursor = "inherit";
+ // for control-backed regions:
+ Element? control = null;
+ // for unbacked regions:
+ DOMString? label = null;
+ DOMString? role = null;
+};
+
+[Constructor(unsigned long sw, unsigned long sh),
+ Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh),
+ Exposed=(Window,Worker)]
+interface ImageData {
+ readonly attribute unsigned long width;
+ readonly attribute unsigned long height;
+ readonly attribute Uint8ClampedArray data;
+};
+
+[Constructor(optional Element scope), Exposed=(Window,Worker)]
+interface DrawingStyle { };
+DrawingStyle implements CanvasDrawingStyles;
+
+[Constructor,
+ Constructor(Path2D path),
+ Constructor(Path2D[] paths, optional CanvasFillRule fillRule = "nonzero"),
+ Constructor(DOMString d), Exposed=(Window,Worker)]
+interface Path2D {
+ void addPath(Path2D path, optional SVGMatrix? transformation = null);
+ void addPathByStrokingPath(Path2D path, CanvasDrawingStyles styles, optional SVGMatrix? transformation = null);
+ void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+ void addText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path2D path, optional unrestricted double maxWidth);
+ void addPathByStrokingText(DOMString text, CanvasDrawingStyles styles, SVGMatrix? transformation, Path2D path, optional unrestricted double maxWidth);
+};
+Path2D implements CanvasPathMethods;
+
+partial interface MouseEvent {
+ readonly attribute DOMString? region;
+};
+
+partial dictionary MouseEventInit {
+ DOMString? region;
+};
+
+partial interface Touch {
+ readonly attribute DOMString? region;
+};
+
+[NoInterfaceObject]
+interface ElementContentEditable {
+ attribute DOMString contentEditable;
+ readonly attribute boolean isContentEditable;
+};
+
+interface DataTransfer {
+ attribute DOMString dropEffect;
+ attribute DOMString effectAllowed;
+
+ [SameObject] readonly attribute DataTransferItemList items;
+
+ void setDragImage(Element image, long x, long y);
+
+ /* old interface */
+ [SameObject] readonly attribute DOMString[] types;
+ DOMString getData(DOMString format);
+ void setData(DOMString format, DOMString data);
+ void clearData(optional DOMString format);
+ [SameObject] readonly attribute FileList files;
+};
+
+interface DataTransferItemList {
+ readonly attribute unsigned long length;
+ getter DataTransferItem (unsigned long index);
+ DataTransferItem? add(DOMString data, DOMString type);
+ DataTransferItem? add(File data);
+ void remove(unsigned long index);
+ void clear();
+};
+
+interface DataTransferItem {
+ readonly attribute DOMString kind;
+ readonly attribute DOMString type;
+ void getAsString(FunctionStringCallback? _callback);
+ File? getAsFile();
+};
+
+callback FunctionStringCallback = void (DOMString data);
+
+[Constructor(DOMString type, optional DragEventInit eventInitDict)]
+interface DragEvent : MouseEvent {
+ readonly attribute DataTransfer? dataTransfer;
+};
+
+dictionary DragEventInit : MouseEventInit {
+ DataTransfer? dataTransfer;
+};
+
+[PrimaryGlobal]
+/*sealed*/ interface Window : EventTarget {
// the current browsing context
[Unforgeable] readonly attribute WindowProxy window;
[Replaceable] readonly attribute WindowProxy self;
[Unforgeable] readonly attribute Document document;
- attribute DOMString name;
+ attribute DOMString name;
[PutForwards=href, Unforgeable] readonly attribute Location location;
readonly attribute History history;
[Replaceable] readonly attribute BarProp locationbar;
@@ -1357,8 +1417,9 @@ interface Window : EventTarget {
[Replaceable] readonly attribute BarProp scrollbars;
[Replaceable] readonly attribute BarProp statusbar;
[Replaceable] readonly attribute BarProp toolbar;
- attribute DOMString status;
+ attribute DOMString status;
void close();
+ readonly attribute boolean closed;
void stop();
void focus();
void blur();
@@ -1367,102 +1428,38 @@ interface Window : EventTarget {
[Replaceable] readonly attribute WindowProxy frames;
[Replaceable] readonly attribute unsigned long length;
[Unforgeable] readonly attribute WindowProxy top;
- attribute WindowProxy? opener;
- readonly attribute WindowProxy parent;
+ attribute any opener;
+ [Replaceable] readonly attribute WindowProxy parent;
readonly attribute Element? frameElement;
- WindowProxy open(optional DOMString url, optional DOMString target, optional DOMString features, optional boolean replace);
+ WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank", [TreatNullAs=EmptyString] optional DOMString features = "", optional boolean replace = false);
getter WindowProxy (unsigned long index);
getter object (DOMString name);
// the user agent
readonly attribute Navigator navigator;
-
- readonly attribute External external;
+ [Replaceable, SameObject] readonly attribute External external;
readonly attribute ApplicationCache applicationCache;
// user prompts
+ void alert();
void alert(DOMString message);
- boolean confirm(DOMString message);
- DOMString? prompt(DOMString message, optional DOMString default);
+ boolean confirm(optional DOMString message = "");
+ DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
void print();
- any showModalDialog(DOMString url, optional any argument);
+ any showModalDialog(DOMString url, optional any argument); // deprecated
+
+ long requestAnimationFrame(FrameRequestCallback callback);
+ void cancelAnimationFrame(long handle);
- // cross-document messaging
void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);
- // event handler IDL attributes
- attribute EventHandler onabort;
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute EventHandler oncancel;
- attribute EventHandler oncanplay;
- attribute EventHandler oncanplaythrough;
- attribute EventHandler onchange;
- attribute EventHandler onclick;
- attribute EventHandler onclose;
- attribute EventHandler oncontextmenu;
- attribute EventHandler oncuechange;
- attribute EventHandler ondblclick;
- attribute EventHandler ondrag;
- attribute EventHandler ondragend;
- attribute EventHandler ondragenter;
- attribute EventHandler ondragleave;
- attribute EventHandler ondragover;
- attribute EventHandler ondragstart;
- attribute EventHandler ondrop;
- attribute EventHandler ondurationchange;
- attribute EventHandler onemptied;
- attribute EventHandler onended;
- attribute OnErrorEventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler oninput;
- attribute EventHandler oninvalid;
- attribute EventHandler onkeydown;
- attribute EventHandler onkeypress;
- attribute EventHandler onkeyup;
- attribute EventHandler onload;
- attribute EventHandler onloadeddata;
- attribute EventHandler onloadedmetadata;
- attribute EventHandler onloadstart;
- attribute EventHandler onmessage;
- attribute EventHandler onmousedown;
- attribute EventHandler onmousemove;
- attribute EventHandler onmouseout;
- attribute EventHandler onmouseover;
- attribute EventHandler onmouseup;
- attribute EventHandler onmousewheel;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpause;
- attribute EventHandler onplay;
- attribute EventHandler onplaying;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onpopstate;
- attribute EventHandler onprogress;
- attribute EventHandler onratechange;
- attribute EventHandler onreset;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onseeked;
- attribute EventHandler onseeking;
- attribute EventHandler onselect;
- attribute EventHandler onshow;
- attribute EventHandler onstalled;
- attribute EventHandler onstorage;
- attribute EventHandler onsubmit;
- attribute EventHandler onsuspend;
- attribute EventHandler ontimeupdate;
- attribute EventHandler onunload;
- attribute EventHandler onvolumechange;
- attribute EventHandler onwaiting;
+ // also has obsolete members
};
+Window implements GlobalEventHandlers;
+Window implements WindowEventHandlers;
interface BarProp {
- attribute boolean visible;
+ attribute boolean visible;
};
interface History {
@@ -1471,27 +1468,20 @@ interface History {
void go(optional long delta);
void back();
void forward();
- void pushState(any data, DOMString title, optional DOMString url);
- void replaceState(any data, DOMString title, optional DOMString url);
+ void pushState(any data, DOMString title, optional DOMString? url = null);
+ void replaceState(any data, DOMString title, optional DOMString? url = null);
};
-interface Location {
- stringifier attribute DOMString href;
+[Unforgeable] interface Location {
void assign(DOMString url);
void replace(DOMString url);
void reload();
- // URL decomposition IDL attributes
- attribute DOMString protocol;
- attribute DOMString host;
- attribute DOMString hostname;
- attribute DOMString port;
- attribute DOMString pathname;
- attribute DOMString search;
- attribute DOMString hash;
+ [SameObject] readonly attribute DOMString[] ancestorOrigins;
};
+Location implements URLUtils;
-[Constructor(DOMString type, optional PopStateEventInit eventInitDict)]
+[Constructor(DOMString type, optional PopStateEventInit eventInitDict), Exposed=(Window,Worker)]
interface PopStateEvent : Event {
readonly attribute any state;
};
@@ -1500,7 +1490,7 @@ dictionary PopStateEventInit : EventInit {
any state;
};
-[Constructor(DOMString type, optional HashChangeEventInit eventInitDict)]
+[Constructor(DOMString type, optional HashChangeEventInit eventInitDict), Exposed=(Window,Worker)]
interface HashChangeEvent : Event {
readonly attribute DOMString oldURL;
readonly attribute DOMString newURL;
@@ -1511,7 +1501,7 @@ dictionary HashChangeEventInit : EventInit {
DOMString newURL;
};
-[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict)]
+[Constructor(DOMString type, optional PageTransitionEventInit eventInitDict), Exposed=(Window,Worker)]
interface PageTransitionEvent : Event {
readonly attribute boolean persisted;
};
@@ -1521,9 +1511,10 @@ dictionary PageTransitionEventInit : EventInit {
};
interface BeforeUnloadEvent : Event {
- attribute DOMString returnValue;
+ attribute DOMString returnValue;
};
+[Exposed=(Window,SharedWorker)]
interface ApplicationCache : EventTarget {
// update status
@@ -1541,66 +1532,184 @@ interface ApplicationCache : EventTarget {
void swapCache();
// events
- attribute EventHandler onchecking;
- attribute EventHandler onerror;
- attribute EventHandler onnoupdate;
- attribute EventHandler ondownloading;
- attribute EventHandler onprogress;
- attribute EventHandler onupdateready;
- attribute EventHandler oncached;
- attribute EventHandler onobsolete;
+ attribute EventHandler onchecking;
+ attribute EventHandler onerror;
+ attribute EventHandler onnoupdate;
+ attribute EventHandler ondownloading;
+ attribute EventHandler onprogress;
+ attribute EventHandler onupdateready;
+ attribute EventHandler oncached;
+ attribute EventHandler onobsolete;
};
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface NavigatorOnLine {
readonly attribute boolean onLine;
};
-[TreatNonCallableAsNull]
+[Constructor(DOMString type, optional ErrorEventInit eventInitDict), Exposed=(Window,Worker)]
+interface ErrorEvent : Event {
+ readonly attribute DOMString message;
+ readonly attribute DOMString filename;
+ readonly attribute unsigned long lineno;
+ readonly attribute unsigned long colno;
+ readonly attribute any error;
+};
+
+dictionary ErrorEventInit : EventInit {
+ DOMString message;
+ DOMString filename;
+ unsigned long lineno;
+ unsigned long colno;
+ any error;
+};
+
+[TreatNonObjectAsNull]
callback EventHandlerNonNull = any (Event event);
typedef EventHandlerNonNull? EventHandler;
-[TreatNonCallableAsNull]
-callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, DOMString source, unsigned long lineno, unsigned long column);
+[TreatNonObjectAsNull]
+callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
+[TreatNonObjectAsNull]
+callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
+typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
+
+[NoInterfaceObject]
+interface GlobalEventHandlers {
+ attribute EventHandler onabort;
+ attribute EventHandler onautocomplete;
+ attribute EventHandler onautocompleteerror;
+ attribute EventHandler onblur;
+ attribute EventHandler oncancel;
+ attribute EventHandler oncanplay;
+ attribute EventHandler oncanplaythrough;
+ attribute EventHandler onchange;
+ attribute EventHandler onclick;
+ attribute EventHandler onclose;
+ attribute EventHandler oncontextmenu;
+ attribute EventHandler oncuechange;
+ attribute EventHandler ondblclick;
+ attribute EventHandler ondrag;
+ attribute EventHandler ondragend;
+ attribute EventHandler ondragenter;
+ attribute EventHandler ondragexit;
+ attribute EventHandler ondragleave;
+ attribute EventHandler ondragover;
+ attribute EventHandler ondragstart;
+ attribute EventHandler ondrop;
+ attribute EventHandler ondurationchange;
+ attribute EventHandler onemptied;
+ attribute EventHandler onended;
+ attribute OnErrorEventHandler onerror;
+ attribute EventHandler onfocus;
+ attribute EventHandler oninput;
+ attribute EventHandler oninvalid;
+ attribute EventHandler onkeydown;
+ attribute EventHandler onkeypress;
+ attribute EventHandler onkeyup;
+ attribute EventHandler onload;
+ attribute EventHandler onloadeddata;
+ attribute EventHandler onloadedmetadata;
+ attribute EventHandler onloadstart;
+ attribute EventHandler onmousedown;
+ [LenientThis] attribute EventHandler onmouseenter;
+ [LenientThis] attribute EventHandler onmouseleave;
+ attribute EventHandler onmousemove;
+ attribute EventHandler onmouseout;
+ attribute EventHandler onmouseover;
+ attribute EventHandler onmouseup;
+ attribute EventHandler onmousewheel;
+ attribute EventHandler onpause;
+ attribute EventHandler onplay;
+ attribute EventHandler onplaying;
+ attribute EventHandler onprogress;
+ attribute EventHandler onratechange;
+ attribute EventHandler onreset;
+ attribute EventHandler onresize;
+ attribute EventHandler onscroll;
+ attribute EventHandler onseeked;
+ attribute EventHandler onseeking;
+ attribute EventHandler onselect;
+ attribute EventHandler onshow;
+ attribute EventHandler onsort;
+ attribute EventHandler onstalled;
+ attribute EventHandler onsubmit;
+ attribute EventHandler onsuspend;
+ attribute EventHandler ontimeupdate;
+ attribute EventHandler ontoggle;
+ attribute EventHandler onvolumechange;
+ attribute EventHandler onwaiting;
+};
+
[NoInterfaceObject]
+interface WindowEventHandlers {
+ attribute EventHandler onafterprint;
+ attribute EventHandler onbeforeprint;
+ attribute OnBeforeUnloadEventHandler onbeforeunload;
+ attribute EventHandler onhashchange;
+ attribute EventHandler onlanguagechange;
+ attribute EventHandler onmessage;
+ attribute EventHandler onoffline;
+ attribute EventHandler ononline;
+ attribute EventHandler onpagehide;
+ attribute EventHandler onpageshow;
+ attribute EventHandler onpopstate;
+ attribute EventHandler onstorage;
+ attribute EventHandler onunload;
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowBase64 {
DOMString btoa(DOMString btoa);
DOMString atob(DOMString atob);
};
Window implements WindowBase64;
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowTimers {
- long setTimeout(Function handler, optional long timeout, any... arguments);
- long setTimeout(DOMString handler, optional long timeout, any... arguments);
- void clearTimeout(long handle);
- long setInterval(Function handler, optional long timeout, any... arguments);
- long setInterval(DOMString handler, optional long timeout, any... arguments);
- void clearInterval(long handle);
+ long setTimeout(Function handler, optional long timeout = 0, any... arguments);
+ long setTimeout(DOMString handler, optional long timeout = 0, any... arguments);
+ void clearTimeout(optional long handle = 0);
+ long setInterval(Function handler, optional long timeout = 0, any... arguments);
+ long setInterval(DOMString handler, optional long timeout = 0, any... arguments);
+ void clearInterval(optional long handle = 0);
};
Window implements WindowTimers;
-[NoInterfaceObject] interface WindowModal {
+[NoInterfaceObject]
+interface WindowModal {
readonly attribute any dialogArguments;
- attribute DOMString returnValue;
+ attribute any returnValue;
};
interface Navigator {
// objects implementing this interface also implement the interfaces given below
};
Navigator implements NavigatorID;
+Navigator implements NavigatorLanguage;
Navigator implements NavigatorOnLine;
Navigator implements NavigatorContentUtils;
Navigator implements NavigatorStorageUtils;
+Navigator implements NavigatorPlugins;
-[NoInterfaceObject]
+[NoInterfaceObject, Exposed=(Window,Worker)]
interface NavigatorID {
+ readonly attribute DOMString appCodeName; // constant "Mozilla"
readonly attribute DOMString appName;
readonly attribute DOMString appVersion;
readonly attribute DOMString platform;
+ readonly attribute DOMString product; // constant "Gecko"
+ boolean taintEnabled(); // constant false
readonly attribute DOMString userAgent;
+ readonly attribute DOMString vendorSub;
+};
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface NavigatorLanguage {
+ readonly attribute DOMString? language;
+ readonly attribute DOMString[] languages;
};
[NoInterfaceObject]
@@ -1616,162 +1725,93 @@ interface NavigatorContentUtils {
[NoInterfaceObject]
interface NavigatorStorageUtils {
+ readonly attribute boolean cookieEnabled;
void yieldForStorageUpdates();
};
-interface External {
- void AddSearchProvider(DOMString engineURL);
- unsigned long IsSearchProviderInstalled(DOMString engineURL);
-};
-
-interface DataTransfer {
- attribute DOMString dropEffect;
- attribute DOMString effectAllowed;
-
- readonly attribute DataTransferItemList items;
-
- void setDragImage(Element image, long x, long y);
-
- /* old interface */
- readonly attribute DOMString[] types;
- DOMString getData(DOMString format);
- void setData(DOMString format, DOMString data);
- void clearData(optional DOMString format);
- readonly attribute FileList files;
+[NoInterfaceObject]
+interface NavigatorPlugins {
+ [SameObject] readonly attribute PluginArray plugins;
+ [SameObject] readonly attribute MimeTypeArray mimeTypes;
+ readonly attribute boolean javaEnabled;
};
-interface DataTransferItemList {
+interface PluginArray {
+ void refresh(optional boolean reload = false);
readonly attribute unsigned long length;
- getter DataTransferItem (unsigned long index);
- deleter void (unsigned long index);
- void clear();
-
- DataTransferItem? add(DOMString data, DOMString type);
- DataTransferItem? add(File data);
-};
-
-interface DataTransferItem {
- readonly attribute DOMString kind;
- readonly attribute DOMString type;
- void getAsString(FunctionStringCallback? _callback);
-
- File? getAsFile();
-};
-
-[Callback, NoInterfaceObject]
-interface FunctionStringCallback {
- void handleEvent(DOMString data);
-};
-
-[Constructor(DOMString type, optional DragEventInit eventInitDict)]
-interface DragEvent : MouseEvent {
- readonly attribute DataTransfer? dataTransfer;
-};
-
-dictionary DragEventInit : MouseEventInit {
- DataTransfer? dataTransfer;
-};
-
-interface WorkerGlobalScope : EventTarget {
- readonly attribute WorkerGlobalScope self;
- readonly attribute WorkerLocation location;
-
- void close();
- attribute EventHandler onerror;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
+ getter Plugin? item(unsigned long index);
+ getter Plugin? namedItem(DOMString name);
};
-WorkerGlobalScope implements WorkerUtils;
-interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
- void postMessage(any message, optional sequence<Transferable> transfer);
- attribute EventHandler onmessage;
+interface MimeTypeArray {
+ readonly attribute unsigned long length;
+ getter MimeType? item(unsigned long index);
+ getter MimeType? namedItem(DOMString name);
};
-interface SharedWorkerGlobalScope : WorkerGlobalScope {
+interface Plugin {
readonly attribute DOMString name;
- readonly attribute ApplicationCache applicationCache;
- attribute EventHandler onconnect;
-};
-
-[Constructor(DOMString type, optional ErrorEventInit eventInitDict)]
-interface ErrorEvent : Event {
- readonly attribute DOMString message;
+ readonly attribute DOMString description;
readonly attribute DOMString filename;
- readonly attribute unsigned long lineno;
- readonly attribute unsigned long column;
-};
-
-dictionary ErrorEventInit : EventInit {
- DOMString message;
- DOMString filename;
- unsigned long lineno;
- unsigned long column;
+ readonly attribute unsigned long length;
+ getter MimeType? item(unsigned long index);
+ getter MimeType? namedItem(DOMString name);
};
-[NoInterfaceObject]
-interface AbstractWorker {
- attribute EventHandler onerror;
-
+interface MimeType {
+ readonly attribute DOMString type;
+ readonly attribute DOMString description;
+ readonly attribute DOMString suffixes; // comma-separated
+ readonly attribute Plugin enabledPlugin;
};
-[Constructor(DOMString scriptURL)]
-interface Worker : EventTarget {
- void terminate();
-
- void postMessage(any message, optional sequence<Transferable> transfer);
- attribute EventHandler onmessage;
-};
-Worker implements AbstractWorker;
-
-[Constructor(DOMString scriptURL, optional DOMString name)]
-interface SharedWorker : EventTarget {
- readonly attribute MessagePort port;
+interface External {
+ void AddSearchProvider(DOMString engineURL);
+ unsigned long IsSearchProviderInstalled(DOMString engineURL);
};
-SharedWorker implements AbstractWorker;
-[NoInterfaceObject]
-interface WorkerUtils {
- void importScripts(DOMString... urls);
- readonly attribute WorkerNavigator navigator;
+[Exposed=(Window,Worker)]
+interface ImageBitmap {
+ readonly attribute unsigned long width;
+ readonly attribute unsigned long height;
};
-WorkerUtils implements WindowTimers;
-WorkerUtils implements WindowBase64;
-interface WorkerNavigator {};
-WorkerNavigator implements NavigatorID;
-WorkerNavigator implements NavigatorOnLine;
+typedef (HTMLImageElement or
+ HTMLVideoElement or
+ HTMLCanvasElement or
+ Blob or
+ ImageData or
+ CanvasRenderingContext2D or
+ ImageBitmap) ImageBitmapSource;
-interface WorkerLocation {
- // URL decomposition IDL attributes
- stringifier readonly attribute DOMString href;
- readonly attribute DOMString protocol;
- readonly attribute DOMString host;
- readonly attribute DOMString hostname;
- readonly attribute DOMString port;
- readonly attribute DOMString pathname;
- readonly attribute DOMString search;
- readonly attribute DOMString hash;
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface ImageBitmapFactories {
+ Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image);
+ Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, long sx, long sy, long sw, long sh);
};
+Window implements ImageBitmapFactories;
+WorkerGlobalScope implements ImageBitmapFactories;
-[Constructor(DOMString type, optional MessageEventInit eventInitDict)]
+[Constructor(DOMString type, optional MessageEventInit eventInitDict), Exposed=(Window,Worker)]
interface MessageEvent : Event {
readonly attribute any data;
readonly attribute DOMString origin;
readonly attribute DOMString lastEventId;
readonly attribute (WindowProxy or MessagePort)? source;
readonly attribute MessagePort[]? ports;
+
+ void initMessageEvent(DOMString typeArg, boolean canBubbleArg, boolean cancelableArg, any dataArg, DOMString originArg, DOMString lastEventIdArg, (WindowProxy or MessagePort) sourceArg, sequence<MessagePort>? portsArg);
};
dictionary MessageEventInit : EventInit {
any data;
DOMString origin;
DOMString lastEventId;
- WindowProxy? source;
- MessagePort[]? ports;
+ (WindowProxy or MessagePort)? source;
+ sequence<MessagePort> ports;
};
-[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict)]
+[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict), Exposed=(Window,Worker)]
interface EventSource : EventTarget {
readonly attribute DOMString url;
readonly attribute boolean withCredentials;
@@ -1783,9 +1823,9 @@ interface EventSource : EventTarget {
readonly attribute unsigned short readyState;
// networking
- attribute EventHandler onopen;
- attribute EventHandler onmessage;
- attribute EventHandler onerror;
+ attribute EventHandler onopen;
+ attribute EventHandler onmessage;
+ attribute EventHandler onerror;
void close();
};
@@ -1794,7 +1834,7 @@ dictionary EventSourceInit {
};
enum BinaryType { "blob", "arraybuffer" };
-[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols)]
+[Constructor(DOMString url, optional (DOMString or DOMString[]) protocols), Exposed=(Window,Worker)]
interface WebSocket : EventTarget {
readonly attribute DOMString url;
@@ -1807,23 +1847,23 @@ interface WebSocket : EventTarget {
readonly attribute unsigned long bufferedAmount;
// networking
- attribute EventHandler onopen;
- attribute EventHandler onerror;
- attribute EventHandler onclose;
+ attribute EventHandler onopen;
+ attribute EventHandler onerror;
+ attribute EventHandler onclose;
readonly attribute DOMString extensions;
readonly attribute DOMString protocol;
- void close([Clamp] optional unsigned short code, optional DOMString reason);
+ void close([Clamp] optional unsigned short code, optional USVString reason);
// messaging
- attribute EventHandler onmessage;
- attribute BinaryType binaryType;
- void send(DOMString data);
+ attribute EventHandler onmessage;
+ attribute BinaryType binaryType;
+ void send(USVString data);
void send(Blob data);
void send(ArrayBuffer data);
void send(ArrayBufferView data);
};
-[Constructor(DOMString type, optional CloseEventInit eventInitDict)]
+[Constructor(DOMString type, optional CloseEventInit eventInitDict), Exposed=(Window,Worker)]
interface CloseEvent : Event {
readonly attribute boolean wasClean;
readonly attribute unsigned short code;
@@ -1836,26 +1876,110 @@ dictionary CloseEventInit : EventInit {
DOMString reason;
};
-[Constructor]
+[Constructor, Exposed=(Window,Worker)]
interface MessageChannel {
readonly attribute MessagePort port1;
readonly attribute MessagePort port2;
};
+[Exposed=(Window,Worker)]
interface MessagePort : EventTarget {
void postMessage(any message, optional sequence<Transferable> transfer);
void start();
void close();
// event handlers
- attribute EventHandler onmessage;
+ attribute EventHandler onmessage;
+};
+// MessagePort implements Transferable;
+
+[Constructor, Exposed=(Window,Worker)]
+interface PortCollection {
+ void add(MessagePort port);
+ void remove(MessagePort port);
+ void clear();
+ void iterate(PortCollectionCallback callback);
+};
+
+callback PortCollectionCallback = void (MessagePort port);
+
+[Constructor(DOMString channel), Exposed=(Window,Worker)]
+interface BroadcastChannel : EventTarget {
+ readonly attribute DOMString name;
+ void postMessage(any message);
+ void close();
+ attribute EventHandler onmessage;
+};
+
+[Exposed=Worker]
+interface WorkerGlobalScope : EventTarget {
+ readonly attribute WorkerGlobalScope self;
+ readonly attribute WorkerLocation location;
+
+ void close();
+ attribute OnErrorEventHandler onerror;
+ attribute EventHandler onlanguagechange;
+ attribute EventHandler onoffline;
+ attribute EventHandler ononline;
+
+ // also has additional members in a partial interface
+};
+
+[Global=(Worker,DedicatedWorker),Exposed=DedicatedWorker]
+/*sealed*/ interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
+ void postMessage(any message, optional sequence<Transferable> transfer);
+ attribute EventHandler onmessage;
+};
+
+[Global=(Worker,SharedWorker),Exposed=SharedWorker]
+/*sealed*/ interface SharedWorkerGlobalScope : WorkerGlobalScope {
+ readonly attribute DOMString name;
+ readonly attribute ApplicationCache applicationCache;
+ attribute EventHandler onconnect;
};
-MessagePort implements Transferable;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface AbstractWorker {
+ attribute EventHandler onerror;
+};
+
+[Constructor(DOMString scriptURL), Exposed=(Window,Worker)]
+interface Worker : EventTarget {
+ void terminate();
+
+ void postMessage(any message, optional sequence<Transferable> transfer);
+ attribute EventHandler onmessage;
+};
+Worker implements AbstractWorker;
+
+[Constructor(DOMString scriptURL, optional DOMString name), Exposed=(Window,Worker)]
+interface SharedWorker : EventTarget {
+ readonly attribute MessagePort port;
+};
+SharedWorker implements AbstractWorker;
+
+[Exposed=Worker]
+partial interface WorkerGlobalScope { // not obsolete
+ void importScripts(DOMString... urls);
+ readonly attribute WorkerNavigator navigator;
+};
+WorkerGlobalScope implements WindowTimers;
+WorkerGlobalScope implements WindowBase64;
+
+[Exposed=Worker]
+interface WorkerNavigator {};
+WorkerNavigator implements NavigatorID;
+WorkerNavigator implements NavigatorLanguage;
+WorkerNavigator implements NavigatorOnLine;
+
+[Exposed=Worker]
+interface WorkerLocation { };
+WorkerLocation implements URLUtilsReadOnly;
interface Storage {
readonly attribute unsigned long length;
DOMString? key(unsigned long index);
- getter DOMString getItem(DOMString key);
+ getter DOMString? getItem(DOMString key);
setter creator void setItem(DOMString key, DOMString value);
deleter void removeItem(DOMString key);
void clear();
@@ -1891,70 +2015,53 @@ dictionary StorageEventInit : EventInit {
};
interface HTMLAppletElement : HTMLElement {
- attribute DOMString align;
- attribute DOMString alt;
- attribute DOMString archive;
- attribute DOMString code;
- attribute DOMString codeBase;
- attribute DOMString height;
- attribute unsigned long hspace;
- attribute DOMString name;
- attribute DOMString _object; // the underscore is not part of the identifier
- attribute unsigned long vspace;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString alt;
+ attribute DOMString archive;
+ attribute DOMString code;
+ attribute DOMString codeBase;
+ attribute DOMString height;
+ attribute unsigned long hspace;
+ attribute DOMString name;
+ attribute DOMString _object; // the underscore is not part of the identifier
+ attribute unsigned long vspace;
+ attribute DOMString width;
};
interface HTMLMarqueeElement : HTMLElement {
- attribute DOMString behavior;
- attribute DOMString bgColor;
- attribute DOMString direction;
- attribute DOMString height;
- attribute unsigned long hspace;
- attribute long loop;
- attribute unsigned long scrollAmount;
- attribute unsigned long scrollDelay;
- attribute boolean trueSpeed;
- attribute unsigned long vspace;
- attribute DOMString width;
-
- attribute EventHandler onbounce;
- attribute EventHandler onfinish;
- attribute EventHandler onstart;
+ attribute DOMString behavior;
+ attribute DOMString bgColor;
+ attribute DOMString direction;
+ attribute DOMString height;
+ attribute unsigned long hspace;
+ attribute long loop;
+ attribute unsigned long scrollAmount;
+ attribute unsigned long scrollDelay;
+ attribute boolean trueSpeed;
+ attribute unsigned long vspace;
+ attribute DOMString width;
+
+ attribute EventHandler onbounce;
+ attribute EventHandler onfinish;
+ attribute EventHandler onstart;
void start();
void stop();
};
interface HTMLFrameSetElement : HTMLElement {
- attribute DOMString cols;
- attribute DOMString rows;
- attribute EventHandler onafterprint;
- attribute EventHandler onbeforeprint;
- attribute EventHandler onbeforeunload;
- attribute EventHandler onblur;
- attribute EventHandler onerror;
- attribute EventHandler onfocus;
- attribute EventHandler onhashchange;
- attribute EventHandler onload;
- attribute EventHandler onmessage;
- attribute EventHandler onoffline;
- attribute EventHandler ononline;
- attribute EventHandler onpagehide;
- attribute EventHandler onpageshow;
- attribute EventHandler onpopstate;
- attribute EventHandler onresize;
- attribute EventHandler onscroll;
- attribute EventHandler onstorage;
- attribute EventHandler onunload;
+ attribute DOMString cols;
+ attribute DOMString rows;
};
+HTMLFrameSetElement implements WindowEventHandlers;
interface HTMLFrameElement : HTMLElement {
- attribute DOMString name;
- attribute DOMString scrolling;
- attribute DOMString src;
- attribute DOMString frameBorder;
- attribute DOMString longDesc;
- attribute boolean noResize;
+ attribute DOMString name;
+ attribute DOMString scrolling;
+ attribute DOMString src;
+ attribute DOMString frameBorder;
+ attribute DOMString longDesc;
+ attribute boolean noResize;
readonly attribute Document? contentDocument;
readonly attribute WindowProxy? contentWindow;
@@ -1963,22 +2070,15 @@ interface HTMLFrameElement : HTMLElement {
};
partial interface HTMLAnchorElement {
- attribute DOMString coords;
- attribute DOMString charset;
- attribute DOMString name;
- attribute DOMString rev;
- attribute DOMString shape;
+ attribute DOMString coords;
+ attribute DOMString charset;
+ attribute DOMString name;
+ attribute DOMString rev;
+ attribute DOMString shape;
};
partial interface HTMLAreaElement {
- attribute boolean noHref;
-};
-
-interface HTMLBaseFontElement : HTMLElement {
- attribute DOMString color;
- attribute DOMString face;
- attribute long size;
-
+ attribute boolean noHref;
};
partial interface HTMLBodyElement {
@@ -1987,155 +2087,155 @@ partial interface HTMLBodyElement {
[TreatNullAs=EmptyString] attribute DOMString vLink;
[TreatNullAs=EmptyString] attribute DOMString aLink;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
- attribute DOMString background;
+ attribute DOMString background;
};
partial interface HTMLBRElement {
- attribute DOMString clear;
+ attribute DOMString clear;
};
partial interface HTMLTableCaptionElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLTableColElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
+ attribute DOMString width;
};
interface HTMLDirectoryElement : HTMLElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLDivElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLDListElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLEmbedElement {
- attribute DOMString align;
- attribute DOMString name;
+ attribute DOMString align;
+ attribute DOMString name;
};
interface HTMLFontElement : HTMLElement {
[TreatNullAs=EmptyString] attribute DOMString color;
- attribute DOMString face;
- attribute DOMString size;
-
+ attribute DOMString face;
+ attribute DOMString size;
};
partial interface HTMLHeadingElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLHRElement {
- attribute DOMString align;
- attribute DOMString color;
- attribute boolean noShade;
- attribute DOMString size;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString color;
+ attribute boolean noShade;
+ attribute DOMString size;
+ attribute DOMString width;
};
partial interface HTMLHtmlElement {
- attribute DOMString version;
+ attribute DOMString version;
};
partial interface HTMLIFrameElement {
- attribute DOMString align;
- attribute DOMString scrolling;
- attribute DOMString frameBorder;
- attribute DOMString longDesc;
+ attribute DOMString align;
+ attribute DOMString scrolling;
+ attribute DOMString frameBorder;
+ attribute DOMString longDesc;
[TreatNullAs=EmptyString] attribute DOMString marginHeight;
[TreatNullAs=EmptyString] attribute DOMString marginWidth;
};
partial interface HTMLImageElement {
- attribute DOMString name;
- attribute DOMString align;
- attribute unsigned long hspace;
- attribute unsigned long vspace;
- attribute DOMString longDesc;
+ attribute DOMString name;
+ attribute DOMString lowsrc;
+ attribute DOMString align;
+ attribute unsigned long hspace;
+ attribute unsigned long vspace;
+ attribute DOMString longDesc;
[TreatNullAs=EmptyString] attribute DOMString border;
};
partial interface HTMLInputElement {
- attribute DOMString align;
- attribute DOMString useMap;
+ attribute DOMString align;
+ attribute DOMString useMap;
};
partial interface HTMLLegendElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLLIElement {
- attribute DOMString type;
+ attribute DOMString type;
};
partial interface HTMLLinkElement {
- attribute DOMString charset;
- attribute DOMString rev;
- attribute DOMString target;
+ attribute DOMString charset;
+ attribute DOMString rev;
+ attribute DOMString target;
};
partial interface HTMLMenuElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLMetaElement {
- attribute DOMString scheme;
+ attribute DOMString scheme;
};
partial interface HTMLObjectElement {
- attribute DOMString align;
- attribute DOMString archive;
- attribute DOMString code;
- attribute boolean declare;
- attribute unsigned long hspace;
- attribute DOMString standby;
- attribute unsigned long vspace;
- attribute DOMString codeBase;
- attribute DOMString codeType;
+ attribute DOMString align;
+ attribute DOMString archive;
+ attribute DOMString code;
+ attribute boolean declare;
+ attribute unsigned long hspace;
+ attribute DOMString standby;
+ attribute unsigned long vspace;
+ attribute DOMString codeBase;
+ attribute DOMString codeType;
[TreatNullAs=EmptyString] attribute DOMString border;
};
partial interface HTMLOListElement {
- attribute boolean compact;
+ attribute boolean compact;
};
partial interface HTMLParagraphElement {
- attribute DOMString align;
+ attribute DOMString align;
};
partial interface HTMLParamElement {
- attribute DOMString type;
- attribute DOMString valueType;
+ attribute DOMString type;
+ attribute DOMString valueType;
};
partial interface HTMLPreElement {
- attribute long width;
+ attribute long width;
};
partial interface HTMLScriptElement {
- attribute DOMString event;
- attribute DOMString htmlFor;
+ attribute DOMString event;
+ attribute DOMString htmlFor;
};
partial interface HTMLTableElement {
- attribute DOMString align;
- attribute DOMString border;
- attribute DOMString frame;
- attribute DOMString rules;
- attribute DOMString summary;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString border;
+ attribute DOMString frame;
+ attribute DOMString rules;
+ attribute DOMString summary;
+ attribute DOMString width;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
[TreatNullAs=EmptyString] attribute DOMString cellPadding;
@@ -2143,39 +2243,42 @@ partial interface HTMLTableElement {
};
partial interface HTMLTableSectionElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
};
partial interface HTMLTableCellElement {
- attribute DOMString abbr;
- attribute DOMString align;
- attribute DOMString axis;
- attribute DOMString height;
- attribute DOMString width;
+ attribute DOMString align;
+ attribute DOMString axis;
+ attribute DOMString height;
+ attribute DOMString width;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute boolean noWrap;
- attribute DOMString vAlign;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute boolean noWrap;
+ attribute DOMString vAlign;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
};
+partial interface HTMLTableDataCellElement {
+ attribute DOMString abbr;
+};
+
partial interface HTMLTableRowElement {
- attribute DOMString align;
- attribute DOMString ch;
- attribute DOMString chOff;
- attribute DOMString vAlign;
+ attribute DOMString align;
+ attribute DOMString ch;
+ attribute DOMString chOff;
+ attribute DOMString vAlign;
[TreatNullAs=EmptyString] attribute DOMString bgColor;
};
partial interface HTMLUListElement {
- attribute boolean compact;
- attribute DOMString type;
+ attribute boolean compact;
+ attribute DOMString type;
};
partial interface Document {
@@ -2189,7 +2292,14 @@ partial interface Document {
readonly attribute HTMLCollection applets;
void clear();
+ void captureEvents();
+ void releaseEvents();
readonly attribute HTMLAllCollection all;
};
+partial interface Window {
+ void captureEvents();
+ void releaseEvents();
+};
+
--
NetSurf Generator for JavaScript bindings
8 years, 4 months
- 1
- 0