netsurf-commits September 2012

netsurf-commits@netsurf-browser.org

1 participants
59 discussions

nsgenjsbind: branch master updated. d5c2e8d0843abd94e4fed57f25186147f56a3976

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/d5c2e8d0843abd94e... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/d5c2e8d0843abd94e4f... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/d5c2e8d0843abd94e4fed... The branch, master has been updated via d5c2e8d0843abd94e4fed57f25186147f56a3976 (commit) from cdd39954a238ec07224c3c9cff66a4f8f101d71c (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/nsgenjsbind.git/commitdiff/d5c2e8d0843abd9... commit d5c2e8d0843abd94e4fed57f25186147f56a3976 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> add search function diff --git a/src/genjsbind-ast.c b/src/genjsbind-ast.c index ebdb5b3..28208e0 100644 --- a/src/genjsbind-ast.c +++ b/src/genjsbind-ast.c @@ -89,6 +89,40 @@ genbind_node_for_each_type(struct genbind_node *node, return 0; } +/* exported interface defined in genjsbind-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 *ret; + + if (node == NULL) { + return NULL; + } + + 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; + } + + return NULL; +} + +int genbind_cmp_node_type(struct genbind_node *node, void *ctx) +{ + if (node->type == (enum genbind_node_type)ctx) + return 1; + return 0; +} + char *genbind_node_gettext(struct genbind_node *node) { switch(node->type) { diff --git a/src/genjsbind-ast.h b/src/genjsbind-ast.h index 27d5505..eaa42f9 100644 --- a/src/genjsbind-ast.h +++ b/src/genjsbind-ast.h @@ -30,6 +30,7 @@ struct genbind_node; /** callback for search and iteration routines */ typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); +int genbind_cmp_node_type(struct genbind_node *node, void *ctx); int genbind_parsefile(char *infilename, struct genbind_node **ast); @@ -38,11 +39,27 @@ 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); + +/** 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 + * search the full tree depth (initial search) or the result + * of a previous search to continue. + * @param cb Comparison callback + * @param ctx Context for callback + */ +struct genbind_node * +genbind_node_find(struct genbind_node *node, + struct genbind_node *prev, + genbind_callback_t *cb, + void *ctx); + int genbind_node_for_each_type(struct genbind_node *node, enum genbind_node_type type, genbind_callback_t *cb, void *ctx); char *genbind_node_gettext(struct genbind_node *node); struct genbind_node *genbind_node_getnode(struct genbind_node *node); -int genbind_ast_dump(struct genbind_node *ast); - #endif diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 3cae66f..505f115 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -82,10 +82,37 @@ static int webidl_file_cb(struct genbind_node *node, void *ctx) static int read_webidl(struct genbind_node *genbind_ast, struct webidl_node **webidl_ast) { - return genbind_node_for_each_type(genbind_ast, - GENBIND_NODE_TYPE_WEBIDLFILE, - webidl_file_cb, - webidl_ast); + int res; + + res = genbind_node_for_each_type(genbind_ast, + GENBIND_NODE_TYPE_WEBIDLFILE, + webidl_file_cb, + webidl_ast); + + /* debug dump of web idl AST */ + if (options->verbose) { + webidl_ast_dump(webidl_ast, 0); + } + return res; +} + +struct binding { + const char *name; /* name of the binding */ + const char *interface; /* webidl interface binding is for */ +}; + + +static struct binding *binding_new(struct genbind_node *genbind_ast) +{ + struct binding *nb; + nb = calloc(1, sizeof(struct binding)); + + struct genbind_node *binding_node; + + binding_node = genbind_node_find(genbind_ast, + NULL, + genbind_cmp_node_type, + GENBIND_NODE_TYPE_BINDING); } @@ -94,16 +121,17 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) FILE *outfile = NULL; struct webidl_node *webidl_ast = NULL; int res; + struct binding *binding; + /* walk ast and load any web IDL files required */ res = read_webidl(genbind_ast, &webidl_ast); if (res != 0) { fprintf(stderr, "Error reading Web IDL files\n"); return 5; } - if (options->verbose) { - webidl_ast_dump(webidl_ast, 0); - } + /* get general binding information used in output */ + binding = binding_new(genbind_ast); /* open output file */ if (outfilename == NULL) { @@ -123,10 +151,10 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) output_preamble(outfile, genbind_ast); - /* + //output_function_spec(outfile, genbind_ast); + + //output_property_spec(outfile, genbind_ast); - fprintf(outfile, " interface %s \n\n", genbind_ast->ifname); -*/ fclose(outfile); return 0; diff --git a/src/webidl-ast.c b/src/webidl-ast.c index fecf0da..810ac24 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -125,11 +125,11 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) } } -const char *SPACES=" "; + int webidl_ast_dump(struct webidl_node *node, int indent) { - char *txt; + const char *SPACES=" "; char *txt; while (node != NULL) { printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type)); ----------------------------------------------------------------------- Summary of changes: src/genjsbind-ast.c | 34 ++++++++++++++++++++++++++++++++++ src/genjsbind-ast.h | 21 +++++++++++++++++++-- src/jsapi-libdom.c | 48 ++++++++++++++++++++++++++++++++++++++---------- src/webidl-ast.c | 4 ++-- 4 files changed, 93 insertions(+), 14 deletions(-) diff --git a/src/genjsbind-ast.c b/src/genjsbind-ast.c index ebdb5b3..28208e0 100644 --- a/src/genjsbind-ast.c +++ b/src/genjsbind-ast.c @@ -89,6 +89,40 @@ genbind_node_for_each_type(struct genbind_node *node, return 0; } +/* exported interface defined in genjsbind-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 *ret; + + if (node == NULL) { + return NULL; + } + + 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; + } + + return NULL; +} + +int genbind_cmp_node_type(struct genbind_node *node, void *ctx) +{ + if (node->type == (enum genbind_node_type)ctx) + return 1; + return 0; +} + char *genbind_node_gettext(struct genbind_node *node) { switch(node->type) { diff --git a/src/genjsbind-ast.h b/src/genjsbind-ast.h index 27d5505..eaa42f9 100644 --- a/src/genjsbind-ast.h +++ b/src/genjsbind-ast.h @@ -30,6 +30,7 @@ struct genbind_node; /** callback for search and iteration routines */ typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); +int genbind_cmp_node_type(struct genbind_node *node, void *ctx); int genbind_parsefile(char *infilename, struct genbind_node **ast); @@ -38,11 +39,27 @@ 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); + +/** 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 + * search the full tree depth (initial search) or the result + * of a previous search to continue. + * @param cb Comparison callback + * @param ctx Context for callback + */ +struct genbind_node * +genbind_node_find(struct genbind_node *node, + struct genbind_node *prev, + genbind_callback_t *cb, + void *ctx); + int genbind_node_for_each_type(struct genbind_node *node, enum genbind_node_type type, genbind_callback_t *cb, void *ctx); char *genbind_node_gettext(struct genbind_node *node); struct genbind_node *genbind_node_getnode(struct genbind_node *node); -int genbind_ast_dump(struct genbind_node *ast); - #endif diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 3cae66f..505f115 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -82,10 +82,37 @@ static int webidl_file_cb(struct genbind_node *node, void *ctx) static int read_webidl(struct genbind_node *genbind_ast, struct webidl_node **webidl_ast) { - return genbind_node_for_each_type(genbind_ast, - GENBIND_NODE_TYPE_WEBIDLFILE, - webidl_file_cb, - webidl_ast); + int res; + + res = genbind_node_for_each_type(genbind_ast, + GENBIND_NODE_TYPE_WEBIDLFILE, + webidl_file_cb, + webidl_ast); + + /* debug dump of web idl AST */ + if (options->verbose) { + webidl_ast_dump(webidl_ast, 0); + } + return res; +} + +struct binding { + const char *name; /* name of the binding */ + const char *interface; /* webidl interface binding is for */ +}; + + +static struct binding *binding_new(struct genbind_node *genbind_ast) +{ + struct binding *nb; + nb = calloc(1, sizeof(struct binding)); + + struct genbind_node *binding_node; + + binding_node = genbind_node_find(genbind_ast, + NULL, + genbind_cmp_node_type, + GENBIND_NODE_TYPE_BINDING); } @@ -94,16 +121,17 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) FILE *outfile = NULL; struct webidl_node *webidl_ast = NULL; int res; + struct binding *binding; + /* walk ast and load any web IDL files required */ res = read_webidl(genbind_ast, &webidl_ast); if (res != 0) { fprintf(stderr, "Error reading Web IDL files\n"); return 5; } - if (options->verbose) { - webidl_ast_dump(webidl_ast, 0); - } + /* get general binding information used in output */ + binding = binding_new(genbind_ast); /* open output file */ if (outfilename == NULL) { @@ -123,10 +151,10 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) output_preamble(outfile, genbind_ast); - /* + //output_function_spec(outfile, genbind_ast); + + //output_property_spec(outfile, genbind_ast); - fprintf(outfile, " interface %s \n\n", genbind_ast->ifname); -*/ fclose(outfile); return 0; diff --git a/src/webidl-ast.c b/src/webidl-ast.c index fecf0da..810ac24 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -125,11 +125,11 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) } } -const char *SPACES=" "; + int webidl_ast_dump(struct webidl_node *node, int indent) { - char *txt; + const char *SPACES=" "; char *txt; while (node != NULL) { printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type)); -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

nsgenjsbind: branch master updated. cdd39954a238ec07224c3c9cff66a4f8f101d71c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/cdd39954a238ec072... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/cdd39954a238ec07224... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/cdd39954a238ec07224c3... The branch, master has been updated via cdd39954a238ec07224c3c9cff66a4f8f101d71c (commit) from 6ccbb7e3fe88c9a6ddb232c43f71b9c8cb80a884 (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/nsgenjsbind.git/commitdiff/cdd39954a238ec0... commit cdd39954a238ec07224c3c9cff66a4f8f101d71c Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk> Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk> add preamble output add operation nodes to webidl ast diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index e7c13d2..3cae66f 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -19,6 +19,25 @@ #define HDR_COMMENT_SEP "\n * " #define HDR_COMMENT_PREABLE "Generated by nsgenjsapi" +static int webidl_preamble_cb(struct genbind_node *node, void *ctx) +{ + FILE *outfile = ctx; + char *txt; + txt = genbind_node_gettext(node); + fprintf(outfile, "%s", txt); + return 0; +} + +static int +output_preamble(FILE *outfile, struct genbind_node *genbind_ast) +{ + genbind_node_for_each_type(genbind_ast, + GENBIND_NODE_TYPE_PREAMBLE, + webidl_preamble_cb, + outfile); + return 0; +} + static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) { FILE *outfile = ctx; @@ -102,9 +121,9 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) output_header_comments(outfile, genbind_ast); - /* fprintf(outfile, " %s\n \n\n", genbind_ast->hdr_comments); + output_preamble(outfile, genbind_ast); - fprintf(outfile, "%s", genbind_ast->preamble); + /* fprintf(outfile, " interface %s \n\n", genbind_ast->ifname); */ diff --git a/src/webidl-ast.c b/src/webidl-ast.c index 5ae52f0..fecf0da 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -88,6 +88,7 @@ struct webidl_node *webidl_node_getnode(struct webidl_node *node) case WEBIDL_NODE_TYPE_INTERFACE: case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: case WEBIDL_NODE_TYPE_ATTRIBUTE: + case WEBIDL_NODE_TYPE_OPERATION: return node->r.node; default: @@ -116,6 +117,9 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) case WEBIDL_NODE_TYPE_ATTRIBUTE: return "Attribute"; + case WEBIDL_NODE_TYPE_OPERATION: + return "Operation"; + default: return "Unknown"; } diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 04b49a9..8af3aeb 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -16,6 +16,7 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, WEBIDL_NODE_TYPE_ATTRIBUTE, + WEBIDL_NODE_TYPE_OPERATION, }; struct webidl_node { diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c4cfa56..f0f1830 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -134,8 +134,10 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> AttributeOrOperation %type <node> StringifierAttributeOrOperation %type <node> Const + %type <node> Operation %type <node> OperationRest +%type <node> OptionalIdentifier %% @@ -501,13 +503,20 @@ Special: OperationRest: ReturnType OptionalIdentifier '(' ArgumentList ')' ';' { - $$=NULL; + struct webidl_node *ident = NULL; + if ($2 != NULL) { + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, NULL, $2); + } + $$ = webidl_node_new(WEBIDL_NODE_TYPE_OPERATION, NULL, ident); } ; /* [40] */ OptionalIdentifier: /* empty */ + { + $$=NULL; + } | TOK_IDENTIFIER ; ----------------------------------------------------------------------- Summary of changes: src/jsapi-libdom.c | 23 +++++++++++++++++++++-- src/webidl-ast.c | 4 ++++ src/webidl-ast.h | 1 + src/webidl-parser.y | 11 ++++++++++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index e7c13d2..3cae66f 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -19,6 +19,25 @@ #define HDR_COMMENT_SEP "\n * " #define HDR_COMMENT_PREABLE "Generated by nsgenjsapi" +static int webidl_preamble_cb(struct genbind_node *node, void *ctx) +{ + FILE *outfile = ctx; + char *txt; + txt = genbind_node_gettext(node); + fprintf(outfile, "%s", txt); + return 0; +} + +static int +output_preamble(FILE *outfile, struct genbind_node *genbind_ast) +{ + genbind_node_for_each_type(genbind_ast, + GENBIND_NODE_TYPE_PREAMBLE, + webidl_preamble_cb, + outfile); + return 0; +} + static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) { FILE *outfile = ctx; @@ -102,9 +121,9 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) output_header_comments(outfile, genbind_ast); - /* fprintf(outfile, " %s\n \n\n", genbind_ast->hdr_comments); + output_preamble(outfile, genbind_ast); - fprintf(outfile, "%s", genbind_ast->preamble); + /* fprintf(outfile, " interface %s \n\n", genbind_ast->ifname); */ diff --git a/src/webidl-ast.c b/src/webidl-ast.c index 5ae52f0..fecf0da 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -88,6 +88,7 @@ struct webidl_node *webidl_node_getnode(struct webidl_node *node) case WEBIDL_NODE_TYPE_INTERFACE: case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: case WEBIDL_NODE_TYPE_ATTRIBUTE: + case WEBIDL_NODE_TYPE_OPERATION: return node->r.node; default: @@ -116,6 +117,9 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) case WEBIDL_NODE_TYPE_ATTRIBUTE: return "Attribute"; + case WEBIDL_NODE_TYPE_OPERATION: + return "Operation"; + default: return "Unknown"; } diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 04b49a9..8af3aeb 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -16,6 +16,7 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, WEBIDL_NODE_TYPE_ATTRIBUTE, + WEBIDL_NODE_TYPE_OPERATION, }; struct webidl_node { diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c4cfa56..f0f1830 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -134,8 +134,10 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> AttributeOrOperation %type <node> StringifierAttributeOrOperation %type <node> Const + %type <node> Operation %type <node> OperationRest +%type <node> OptionalIdentifier %% @@ -501,13 +503,20 @@ Special: OperationRest: ReturnType OptionalIdentifier '(' ArgumentList ')' ';' { - $$=NULL; + struct webidl_node *ident = NULL; + if ($2 != NULL) { + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, NULL, $2); + } + $$ = webidl_node_new(WEBIDL_NODE_TYPE_OPERATION, NULL, ident); } ; /* [40] */ OptionalIdentifier: /* empty */ + { + $$=NULL; + } | TOK_IDENTIFIER ; -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

nsgenjsbind: branch master updated. 6ccbb7e3fe88c9a6ddb232c43f71b9c8cb80a884

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/6ccbb7e3fe88c9a6d... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/6ccbb7e3fe88c9a6ddb... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/6ccbb7e3fe88c9a6ddb23... The branch, master has been updated via 6ccbb7e3fe88c9a6ddb232c43f71b9c8cb80a884 (commit) from 8b775d2a309a72729e08a0529717852605d82fe5 (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/nsgenjsbind.git/commitdiff/6ccbb7e3fe88c9a... commit 6ccbb7e3fe88c9a6ddb232c43f71b9c8cb80a884 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fixus interface memer attributes diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 0f4ebc4..e7c13d2 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -83,7 +83,7 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) } if (options->verbose) { - webidl_ast_dump(webidl_ast); + webidl_ast_dump(webidl_ast, 0); } /* open output file */ diff --git a/src/webidl-ast.c b/src/webidl-ast.c index be52490..5ae52f0 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -71,7 +71,7 @@ webidl_node_for_each_type(struct webidl_node *node, char *webidl_node_gettext(struct webidl_node *node) { switch(node->type) { - case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + case WEBIDL_NODE_TYPE_IDENT: case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: return node->r.text; @@ -87,6 +87,7 @@ struct webidl_node *webidl_node_getnode(struct webidl_node *node) case WEBIDL_NODE_TYPE_ROOT: case WEBIDL_NODE_TYPE_INTERFACE: case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + case WEBIDL_NODE_TYPE_ATTRIBUTE: return node->r.node; default: @@ -100,35 +101,40 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) case WEBIDL_NODE_TYPE_ROOT: return "root"; - case WEBIDL_NODE_TYPE_INTERFACE_IDENT: - return "Interface: Ident"; + case WEBIDL_NODE_TYPE_IDENT: + return "Ident"; case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: - return "Interface: Inherit"; + return "Inherit"; case WEBIDL_NODE_TYPE_INTERFACE: return "Interface"; case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: - return "Interface: Members"; + return "Members"; + + case WEBIDL_NODE_TYPE_ATTRIBUTE: + return "Attribute"; default: return "Unknown"; } } +const char *SPACES=" "; -int webidl_ast_dump(struct webidl_node *node) +int webidl_ast_dump(struct webidl_node *node, int indent) { char *txt; while (node != NULL) { - printf("%s\n", webidl_node_type_to_str(node->type)); + printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type)); txt = webidl_node_gettext(node); if (txt == NULL) { - webidl_ast_dump(webidl_node_getnode(node)); + printf("\n"); + webidl_ast_dump(webidl_node_getnode(node), indent + 2); } else { - printf(" %s\n", txt); + printf(": \"%s\"\n", txt); } node = node->l; } diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 9a516af..04b49a9 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -11,10 +11,11 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_ROOT = 0, + WEBIDL_NODE_TYPE_IDENT, WEBIDL_NODE_TYPE_INTERFACE, - WEBIDL_NODE_TYPE_INTERFACE_IDENT, WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, + WEBIDL_NODE_TYPE_ATTRIBUTE, }; struct webidl_node { @@ -46,7 +47,7 @@ int webidl_node_for_each_type(struct webidl_node *node, void *ctx); /* debug dump */ -int webidl_ast_dump(struct webidl_node *node); +int webidl_ast_dump(struct webidl_node *node, int indent); /** parse web idl file */ int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c899001..c4cfa56 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -130,6 +130,13 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> CallbackRest %type <node> CallbackRestOrInterface +%type <node> Attribute +%type <node> AttributeOrOperation +%type <node> StringifierAttributeOrOperation +%type <node> Const +%type <node> Operation +%type <node> OperationRest + %% /* default rule to add built AST to passed in one */ @@ -207,7 +214,7 @@ Interface: members = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, inheritance, $5); - ident = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_IDENT, members, $2); + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, members, $2); $$ = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE, NULL, ident); } @@ -245,7 +252,7 @@ InterfaceMembers: | InterfaceMembers ExtendedAttributeList InterfaceMember { - $$ = webidl_node_link($1, $3); + $$ = webidl_node_link($3, $1); } ; @@ -373,6 +380,9 @@ ImplementsStatement: /* [26] */ Const: TOK_CONST ConstType TOK_IDENTIFIER '=' ConstValue ';' + { + $$ = NULL; + } ; /* [27] */ @@ -423,12 +433,18 @@ StringifierAttributeOrOperation: OperationRest | ';' + { + $$=NULL; + } ; /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' { + struct webidl_node *ident; + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, NULL, $5); + $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE, NULL, ident);; } ; @@ -449,6 +465,9 @@ ReadOnly: /* [35] */ Operation: Qualifiers OperationRest + { + $$=$2; + } ; /* [36] */ @@ -481,6 +500,9 @@ Special: /* [39] */ OperationRest: ReturnType OptionalIdentifier '(' ArgumentList ')' ';' + { + $$=NULL; + } ; /* [40] */ ----------------------------------------------------------------------- Summary of changes: src/jsapi-libdom.c | 2 +- src/webidl-ast.c | 24 +++++++++++++++--------- src/webidl-ast.h | 5 +++-- src/webidl-parser.y | 26 ++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 0f4ebc4..e7c13d2 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -83,7 +83,7 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) } if (options->verbose) { - webidl_ast_dump(webidl_ast); + webidl_ast_dump(webidl_ast, 0); } /* open output file */ diff --git a/src/webidl-ast.c b/src/webidl-ast.c index be52490..5ae52f0 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -71,7 +71,7 @@ webidl_node_for_each_type(struct webidl_node *node, char *webidl_node_gettext(struct webidl_node *node) { switch(node->type) { - case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + case WEBIDL_NODE_TYPE_IDENT: case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: return node->r.text; @@ -87,6 +87,7 @@ struct webidl_node *webidl_node_getnode(struct webidl_node *node) case WEBIDL_NODE_TYPE_ROOT: case WEBIDL_NODE_TYPE_INTERFACE: case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + case WEBIDL_NODE_TYPE_ATTRIBUTE: return node->r.node; default: @@ -100,35 +101,40 @@ static const char *webidl_node_type_to_str(enum webidl_node_type type) case WEBIDL_NODE_TYPE_ROOT: return "root"; - case WEBIDL_NODE_TYPE_INTERFACE_IDENT: - return "Interface: Ident"; + case WEBIDL_NODE_TYPE_IDENT: + return "Ident"; case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: - return "Interface: Inherit"; + return "Inherit"; case WEBIDL_NODE_TYPE_INTERFACE: return "Interface"; case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: - return "Interface: Members"; + return "Members"; + + case WEBIDL_NODE_TYPE_ATTRIBUTE: + return "Attribute"; default: return "Unknown"; } } +const char *SPACES=" "; -int webidl_ast_dump(struct webidl_node *node) +int webidl_ast_dump(struct webidl_node *node, int indent) { char *txt; while (node != NULL) { - printf("%s\n", webidl_node_type_to_str(node->type)); + printf("%.*s%s", indent, SPACES, webidl_node_type_to_str(node->type)); txt = webidl_node_gettext(node); if (txt == NULL) { - webidl_ast_dump(webidl_node_getnode(node)); + printf("\n"); + webidl_ast_dump(webidl_node_getnode(node), indent + 2); } else { - printf(" %s\n", txt); + printf(": \"%s\"\n", txt); } node = node->l; } diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 9a516af..04b49a9 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -11,10 +11,11 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_ROOT = 0, + WEBIDL_NODE_TYPE_IDENT, WEBIDL_NODE_TYPE_INTERFACE, - WEBIDL_NODE_TYPE_INTERFACE_IDENT, WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, + WEBIDL_NODE_TYPE_ATTRIBUTE, }; struct webidl_node { @@ -46,7 +47,7 @@ int webidl_node_for_each_type(struct webidl_node *node, void *ctx); /* debug dump */ -int webidl_ast_dump(struct webidl_node *node); +int webidl_ast_dump(struct webidl_node *node, int indent); /** parse web idl file */ int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c899001..c4cfa56 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -130,6 +130,13 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> CallbackRest %type <node> CallbackRestOrInterface +%type <node> Attribute +%type <node> AttributeOrOperation +%type <node> StringifierAttributeOrOperation +%type <node> Const +%type <node> Operation +%type <node> OperationRest + %% /* default rule to add built AST to passed in one */ @@ -207,7 +214,7 @@ Interface: members = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, inheritance, $5); - ident = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_IDENT, members, $2); + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, members, $2); $$ = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE, NULL, ident); } @@ -245,7 +252,7 @@ InterfaceMembers: | InterfaceMembers ExtendedAttributeList InterfaceMember { - $$ = webidl_node_link($1, $3); + $$ = webidl_node_link($3, $1); } ; @@ -373,6 +380,9 @@ ImplementsStatement: /* [26] */ Const: TOK_CONST ConstType TOK_IDENTIFIER '=' ConstValue ';' + { + $$ = NULL; + } ; /* [27] */ @@ -423,12 +433,18 @@ StringifierAttributeOrOperation: OperationRest | ';' + { + $$=NULL; + } ; /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' { + struct webidl_node *ident; + ident = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, NULL, $5); + $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE, NULL, ident);; } ; @@ -449,6 +465,9 @@ ReadOnly: /* [35] */ Operation: Qualifiers OperationRest + { + $$=$2; + } ; /* [36] */ @@ -481,6 +500,9 @@ Special: /* [39] */ OperationRest: ReturnType OptionalIdentifier '(' ArgumentList ')' ';' + { + $$=NULL; + } ; /* [40] */ -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

nsgenjsbind: branch master updated. 8b775d2a309a72729e08a0529717852605d82fe5

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/8b775d2a309a72729... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/8b775d2a309a72729e0... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/8b775d2a309a72729e08a... The branch, master has been updated via 8b775d2a309a72729e08a0529717852605d82fe5 (commit) via deadfe6cfb87ee537ed38e0ce87601f492078aab (commit) from eeaa03bf10aa41656b798ef8df7f42140c66e766 (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/nsgenjsbind.git/commitdiff/8b775d2a309a727... commit 8b775d2a309a72729e08a0529717852605d82fe5 Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk> Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk> fix linking into global chain diff --git a/src/webidl-parser.y b/src/webidl-parser.y index 788aff4..c899001 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -124,6 +124,8 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> ImplementsStatement %type <node> Interface %type <node> InterfaceMembers +%type <node> InterfaceMember + %type <node> CallbackOrInterface %type <node> CallbackRest %type <node> CallbackRestOrInterface @@ -133,7 +135,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) /* default rule to add built AST to passed in one */ Input: Definitions - { *webidl_ast = webidl_node_link(*webidl_ast, $1); } + { *webidl_ast = webidl_node_link($1, *webidl_ast); } | error { @@ -243,7 +245,7 @@ InterfaceMembers: | InterfaceMembers ExtendedAttributeList InterfaceMember { - $$ = NULL; + $$ = webidl_node_link($1, $3); } ; @@ -405,6 +407,9 @@ FloatLiteral: /* [30] */ AttributeOrOperation: TOK_STRINGIFIER StringifierAttributeOrOperation + { + $$ = $2; + } | Attribute | @@ -423,6 +428,8 @@ StringifierAttributeOrOperation: /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' + { + } ; /* [33] */ commitdiff http://git.netsurf-browser.org/nsgenjsbind.git/commitdiff/deadfe6cfb87ee5... commit deadfe6cfb87ee537ed38e0ce87601f492078aab Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk> Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk> add debug dump to webidl diff --git a/src/genjsbind-ast.c b/src/genjsbind-ast.c index 1645f78..ebdb5b3 100644 --- a/src/genjsbind-ast.c +++ b/src/genjsbind-ast.c @@ -120,63 +120,56 @@ struct genbind_node *genbind_node_getnode(struct genbind_node *node) } } +static const char *genbind_node_type_to_str(enum genbind_node_type type) +{ + switch(type) { + case GENBIND_NODE_TYPE_ROOT: + return "Root"; + + case GENBIND_NODE_TYPE_WEBIDLFILE: + return "webidlfile"; + + case GENBIND_NODE_TYPE_HDRCOMMENT: + return "HdrComment"; + + case GENBIND_NODE_TYPE_STRING: + return "String"; + + case GENBIND_NODE_TYPE_PREAMBLE: + return "Preamble"; + + case GENBIND_NODE_TYPE_BINDING: + return "Binding"; + + case GENBIND_NODE_TYPE_BINDING_IDENT: + return "Binding: Ident"; + + case GENBIND_NODE_TYPE_TYPE: + return "Type"; + + case GENBIND_NODE_TYPE_TYPE_IDENT: + return "Type: Ident"; + + case GENBIND_NODE_TYPE_TYPE_NODE: + return "Type: Node"; + + case GENBIND_NODE_TYPE_TYPE_EXTRA: + return "Type: Extra"; + + case GENBIND_NODE_TYPE_TYPE_INTERFACE: + return "Type: Interface"; + + default: + return "Unknown"; + } +} + int genbind_ast_dump(struct genbind_node *node) { char *txt; while (node != NULL) { - switch(node->type) { - case GENBIND_NODE_TYPE_ROOT: - printf("root\n"); - break; - - case GENBIND_NODE_TYPE_WEBIDLFILE: - printf("webidlfile\n"); - break; - - case GENBIND_NODE_TYPE_HDRCOMMENT: - printf("hdrcomment\n"); - break; - - case GENBIND_NODE_TYPE_STRING: - printf("string\n"); - break; - - case GENBIND_NODE_TYPE_PREAMBLE: - printf("preamble\n"); - break; - - case GENBIND_NODE_TYPE_BINDING: - printf("binding\n"); - break; - - case GENBIND_NODE_TYPE_BINDING_IDENT: - printf("binding ident\n"); - break; - - case GENBIND_NODE_TYPE_TYPE: - printf("type\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_IDENT: - printf("type ident\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_NODE: - printf("type node\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_EXTRA: - printf("type extra\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_INTERFACE: - printf("\n"); - break; - - default: - printf("Unknown node type!\n"); - break; - } + + printf("%s\n", genbind_node_type_to_str(node->type)); txt = genbind_node_gettext(node); if (txt == NULL) { diff --git a/src/genjsbind-ast.h b/src/genjsbind-ast.h index 20ee028..27d5505 100644 --- a/src/genjsbind-ast.h +++ b/src/genjsbind-ast.h @@ -27,6 +27,10 @@ enum genbind_node_type { struct genbind_node; +/** callback for search and iteration routines */ +typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); + + int genbind_parsefile(char *infilename, struct genbind_node **ast); char *genbind_strapp(char *a, char *b); @@ -34,8 +38,6 @@ 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); -typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); - int genbind_node_for_each_type(struct genbind_node *node, enum genbind_node_type type, genbind_callback_t *cb, void *ctx); char *genbind_node_gettext(struct genbind_node *node); diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index d1ac37c..0f4ebc4 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -9,7 +9,9 @@ #include <stdio.h> #include <errno.h> #include <string.h> +#include <stdbool.h> +#include "options.h" #include "genjsbind-ast.h" #include "webidl-ast.h" #include "jsapi-libdom.h" @@ -17,35 +19,6 @@ #define HDR_COMMENT_SEP "\n * " #define HDR_COMMENT_PREABLE "Generated by nsgenjsapi" -/* -#define HDR_COMMENT_SEP_LEN 4 - -int genbind_header_comment(char *comment) -{ - char *fullstr; - int fulllen; - fulllen = strlen(genbind_ast->hdr_comments) + - strlen(comment) + HDR_COMMENT_SEP_LEN + 1; - fullstr = malloc(fulllen); - snprintf(fullstr, fulllen, "%s"HDR_COMMENT_SEP"%s", genbind_ast->hdr_comments , comment); - free(genbind_ast->hdr_comments); - free(comment); - genbind_ast->hdr_comments = fullstr; - - return 0; -} - -{ - if (webidl_parsefile($2) != 0) { - YYABORT; -} -} -*/ - /* initialise root IDL node */ -/* webidl_root = - -*/ - static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) { FILE *outfile = ctx; @@ -109,6 +82,10 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) return 5; } + if (options->verbose) { + webidl_ast_dump(webidl_ast); + } + /* open output file */ if (outfilename == NULL) { outfile = stdout; diff --git a/src/webidl-ast.c b/src/webidl-ast.c index e19fb80..be52490 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -21,6 +21,120 @@ extern void webidl_restart(FILE*); extern int webidl_parse(struct webidl_node **webidl_ast); + +struct webidl_node * +webidl_node_link(struct webidl_node *tgt, struct webidl_node *src) +{ + if (tgt != NULL) { + tgt->l = src; + return tgt; + } + return src; +} + +struct webidl_node *webidl_node_new(enum webidl_node_type type, struct webidl_node *l, void *r) +{ + struct webidl_node *nn; + nn = calloc(1, sizeof(struct webidl_node)); + nn->type = type; + nn->l = l; + nn->r.text = r; + return nn; +} + + +int +webidl_node_for_each_type(struct webidl_node *node, + enum webidl_node_type type, + webidl_callback_t *cb, + void *ctx) +{ + int ret; + + if (node == NULL) { + return -1; + } + if (node->l != NULL) { + ret = webidl_node_for_each_type(node->l, type, cb, ctx); + if (ret != 0) { + return ret; + } + } + if (node->type == type) { + return cb(node, ctx); + } + + return 0; +} + + +char *webidl_node_gettext(struct webidl_node *node) +{ + switch(node->type) { + case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: + + return node->r.text; + + default: + return NULL; + } +} + +struct webidl_node *webidl_node_getnode(struct webidl_node *node) +{ + switch(node->type) { + case WEBIDL_NODE_TYPE_ROOT: + case WEBIDL_NODE_TYPE_INTERFACE: + case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + return node->r.node; + + default: + return NULL; + } +} + +static const char *webidl_node_type_to_str(enum webidl_node_type type) +{ + switch(type) { + case WEBIDL_NODE_TYPE_ROOT: + return "root"; + + case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + return "Interface: Ident"; + + case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: + return "Interface: Inherit"; + + case WEBIDL_NODE_TYPE_INTERFACE: + return "Interface"; + + case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + return "Interface: Members"; + + default: + return "Unknown"; + } + +} + +int webidl_ast_dump(struct webidl_node *node) +{ + char *txt; + while (node != NULL) { + printf("%s\n", webidl_node_type_to_str(node->type)); + + txt = webidl_node_gettext(node); + if (txt == NULL) { + webidl_ast_dump(webidl_node_getnode(node)); + } else { + printf(" %s\n", txt); + } + node = node->l; + } + return 0; +} + static FILE *idlopen(const char *filename) { FILE *idlfile; @@ -44,27 +158,6 @@ static FILE *idlopen(const char *filename) return idlfile; } -struct webidl_node * -webidl_node_link(struct webidl_node *tgt, struct webidl_node *src) -{ - if (tgt != NULL) { - tgt->l = src; - return tgt; - } - return src; -} - -struct webidl_node *webidl_node_new(int type, struct webidl_node *l, void *r) -{ - struct webidl_node *nn; - nn = calloc(1, sizeof(struct webidl_node)); - nn->type = type; - nn->l = l; - nn->r.text = r; - return nn; -} - - int webidl_parsefile(char *filename, struct webidl_node **webidl_ast) { diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 2798fa6..9a516af 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -18,7 +18,7 @@ enum webidl_node_type { }; struct webidl_node { - int type; + enum webidl_node_type type; struct webidl_node *l; union { struct webidl_node *node; @@ -26,12 +26,29 @@ struct webidl_node { } r; }; +/** callback for search and iteration routines */ +typedef int (webidl_callback_t)(struct webidl_node *node, void *ctx); -/** parse web idl file */ -int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); -struct webidl_node *webidl_node_new(int type, struct webidl_node *l, void *r); +struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node *l, void *r); struct webidl_node *webidl_node_link(struct webidl_node *tgt, struct webidl_node *src); +/* node contents acessors */ +char *webidl_node_gettext(struct webidl_node *node); +struct webidl_node *webidl_node_getnode(struct webidl_node *node); + + +/* node searches */ +int webidl_node_for_each_type(struct webidl_node *node, + enum webidl_node_type type, + webidl_callback_t *cb, + void *ctx); + +/* debug dump */ +int webidl_ast_dump(struct webidl_node *node); + +/** parse web idl file */ +int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); + #endif diff --git a/src/webidl-parser.y b/src/webidl-parser.y index 2fd907f..788aff4 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -110,8 +110,14 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> Definitions %type <node> Definition + %type <node> Partial +%type <node> PartialDefinition +%type <node> PartialInterface + %type <node> Dictionary +%type <node> PartialDictionary + %type <node> Exception %type <node> Enum %type <node> Typedef @@ -208,6 +214,9 @@ Interface: /* [6] */ Partial: TOK_PARTIAL PartialDefinition + { + $$ = $2; + } ; /* [7] */ @@ -220,6 +229,9 @@ PartialDefinition: /* [8] */ PartialInterface: TOK_INTERFACE TOK_IDENTIFIER '{' InterfaceMembers '}' ';' + { + $$=NULL; + } ; /* [9] slightly altered from original grammar to be left recursive */ @@ -245,6 +257,9 @@ InterfaceMember: /* [11] */ Dictionary: TOK_DICTIONARY TOK_IDENTIFIER Inheritance '{' DictionaryMembers '}' ';' + { + $$ = NULL; + } ; /* [12] */ @@ -262,6 +277,9 @@ DictionaryMember: /* [14] */ PartialDictionary: TOK_DICTIONARY TOK_IDENTIFIER '{' DictionaryMembers '}' ';' + { + $$=NULL; + } /* [15] */ Default: @@ -281,6 +299,9 @@ DefaultValue: /* [17] */ Exception: TOK_EXCEPTION TOK_IDENTIFIER Inheritance '{' ExceptionMembers '}' ';' + { + $$ = NULL; + } ; /* [18] */ @@ -306,6 +327,9 @@ Inheritance: /* [20] */ Enum: TOK_ENUM TOK_IDENTIFIER '{' EnumValueList '}' ';' + { + $$ = NULL; + } ; /* [21] */ @@ -331,11 +355,17 @@ CallbackRest: /* [24] */ Typedef: TOK_TYPEDEF ExtendedAttributeList Type TOK_IDENTIFIER ';' + { + $$ = NULL; + } ; /* [25] */ ImplementsStatement: TOK_IDENTIFIER TOK_IMPLEMENTS TOK_IDENTIFIER ';' + { + $$ = NULL; + } ; /* [26] */ ----------------------------------------------------------------------- Summary of changes: src/genjsbind-ast.c | 99 +++++++++++++++++-------------------- src/genjsbind-ast.h | 6 ++- src/jsapi-libdom.c | 35 ++----------- src/webidl-ast.c | 135 +++++++++++++++++++++++++++++++++++++++++++-------- src/webidl-ast.h | 25 ++++++++-- src/webidl-parser.y | 41 +++++++++++++++- 6 files changed, 230 insertions(+), 111 deletions(-) diff --git a/src/genjsbind-ast.c b/src/genjsbind-ast.c index 1645f78..ebdb5b3 100644 --- a/src/genjsbind-ast.c +++ b/src/genjsbind-ast.c @@ -120,63 +120,56 @@ struct genbind_node *genbind_node_getnode(struct genbind_node *node) } } +static const char *genbind_node_type_to_str(enum genbind_node_type type) +{ + switch(type) { + case GENBIND_NODE_TYPE_ROOT: + return "Root"; + + case GENBIND_NODE_TYPE_WEBIDLFILE: + return "webidlfile"; + + case GENBIND_NODE_TYPE_HDRCOMMENT: + return "HdrComment"; + + case GENBIND_NODE_TYPE_STRING: + return "String"; + + case GENBIND_NODE_TYPE_PREAMBLE: + return "Preamble"; + + case GENBIND_NODE_TYPE_BINDING: + return "Binding"; + + case GENBIND_NODE_TYPE_BINDING_IDENT: + return "Binding: Ident"; + + case GENBIND_NODE_TYPE_TYPE: + return "Type"; + + case GENBIND_NODE_TYPE_TYPE_IDENT: + return "Type: Ident"; + + case GENBIND_NODE_TYPE_TYPE_NODE: + return "Type: Node"; + + case GENBIND_NODE_TYPE_TYPE_EXTRA: + return "Type: Extra"; + + case GENBIND_NODE_TYPE_TYPE_INTERFACE: + return "Type: Interface"; + + default: + return "Unknown"; + } +} + int genbind_ast_dump(struct genbind_node *node) { char *txt; while (node != NULL) { - switch(node->type) { - case GENBIND_NODE_TYPE_ROOT: - printf("root\n"); - break; - - case GENBIND_NODE_TYPE_WEBIDLFILE: - printf("webidlfile\n"); - break; - - case GENBIND_NODE_TYPE_HDRCOMMENT: - printf("hdrcomment\n"); - break; - - case GENBIND_NODE_TYPE_STRING: - printf("string\n"); - break; - - case GENBIND_NODE_TYPE_PREAMBLE: - printf("preamble\n"); - break; - - case GENBIND_NODE_TYPE_BINDING: - printf("binding\n"); - break; - - case GENBIND_NODE_TYPE_BINDING_IDENT: - printf("binding ident\n"); - break; - - case GENBIND_NODE_TYPE_TYPE: - printf("type\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_IDENT: - printf("type ident\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_NODE: - printf("type node\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_EXTRA: - printf("type extra\n"); - break; - - case GENBIND_NODE_TYPE_TYPE_INTERFACE: - printf("\n"); - break; - - default: - printf("Unknown node type!\n"); - break; - } + + printf("%s\n", genbind_node_type_to_str(node->type)); txt = genbind_node_gettext(node); if (txt == NULL) { diff --git a/src/genjsbind-ast.h b/src/genjsbind-ast.h index 20ee028..27d5505 100644 --- a/src/genjsbind-ast.h +++ b/src/genjsbind-ast.h @@ -27,6 +27,10 @@ enum genbind_node_type { struct genbind_node; +/** callback for search and iteration routines */ +typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); + + int genbind_parsefile(char *infilename, struct genbind_node **ast); char *genbind_strapp(char *a, char *b); @@ -34,8 +38,6 @@ 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); -typedef int (genbind_callback_t)(struct genbind_node *node, void *ctx); - int genbind_node_for_each_type(struct genbind_node *node, enum genbind_node_type type, genbind_callback_t *cb, void *ctx); char *genbind_node_gettext(struct genbind_node *node); diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index d1ac37c..0f4ebc4 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -9,7 +9,9 @@ #include <stdio.h> #include <errno.h> #include <string.h> +#include <stdbool.h> +#include "options.h" #include "genjsbind-ast.h" #include "webidl-ast.h" #include "jsapi-libdom.h" @@ -17,35 +19,6 @@ #define HDR_COMMENT_SEP "\n * " #define HDR_COMMENT_PREABLE "Generated by nsgenjsapi" -/* -#define HDR_COMMENT_SEP_LEN 4 - -int genbind_header_comment(char *comment) -{ - char *fullstr; - int fulllen; - fulllen = strlen(genbind_ast->hdr_comments) + - strlen(comment) + HDR_COMMENT_SEP_LEN + 1; - fullstr = malloc(fulllen); - snprintf(fullstr, fulllen, "%s"HDR_COMMENT_SEP"%s", genbind_ast->hdr_comments , comment); - free(genbind_ast->hdr_comments); - free(comment); - genbind_ast->hdr_comments = fullstr; - - return 0; -} - -{ - if (webidl_parsefile($2) != 0) { - YYABORT; -} -} -*/ - /* initialise root IDL node */ -/* webidl_root = - -*/ - static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) { FILE *outfile = ctx; @@ -109,6 +82,10 @@ int jsapi_libdom_output(char *outfilename, struct genbind_node *genbind_ast) return 5; } + if (options->verbose) { + webidl_ast_dump(webidl_ast); + } + /* open output file */ if (outfilename == NULL) { outfile = stdout; diff --git a/src/webidl-ast.c b/src/webidl-ast.c index e19fb80..be52490 100644 --- a/src/webidl-ast.c +++ b/src/webidl-ast.c @@ -21,6 +21,120 @@ extern void webidl_restart(FILE*); extern int webidl_parse(struct webidl_node **webidl_ast); + +struct webidl_node * +webidl_node_link(struct webidl_node *tgt, struct webidl_node *src) +{ + if (tgt != NULL) { + tgt->l = src; + return tgt; + } + return src; +} + +struct webidl_node *webidl_node_new(enum webidl_node_type type, struct webidl_node *l, void *r) +{ + struct webidl_node *nn; + nn = calloc(1, sizeof(struct webidl_node)); + nn->type = type; + nn->l = l; + nn->r.text = r; + return nn; +} + + +int +webidl_node_for_each_type(struct webidl_node *node, + enum webidl_node_type type, + webidl_callback_t *cb, + void *ctx) +{ + int ret; + + if (node == NULL) { + return -1; + } + if (node->l != NULL) { + ret = webidl_node_for_each_type(node->l, type, cb, ctx); + if (ret != 0) { + return ret; + } + } + if (node->type == type) { + return cb(node, ctx); + } + + return 0; +} + + +char *webidl_node_gettext(struct webidl_node *node) +{ + switch(node->type) { + case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: + + return node->r.text; + + default: + return NULL; + } +} + +struct webidl_node *webidl_node_getnode(struct webidl_node *node) +{ + switch(node->type) { + case WEBIDL_NODE_TYPE_ROOT: + case WEBIDL_NODE_TYPE_INTERFACE: + case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + return node->r.node; + + default: + return NULL; + } +} + +static const char *webidl_node_type_to_str(enum webidl_node_type type) +{ + switch(type) { + case WEBIDL_NODE_TYPE_ROOT: + return "root"; + + case WEBIDL_NODE_TYPE_INTERFACE_IDENT: + return "Interface: Ident"; + + case WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE: + return "Interface: Inherit"; + + case WEBIDL_NODE_TYPE_INTERFACE: + return "Interface"; + + case WEBIDL_NODE_TYPE_INTERFACE_MEMBERS: + return "Interface: Members"; + + default: + return "Unknown"; + } + +} + +int webidl_ast_dump(struct webidl_node *node) +{ + char *txt; + while (node != NULL) { + printf("%s\n", webidl_node_type_to_str(node->type)); + + txt = webidl_node_gettext(node); + if (txt == NULL) { + webidl_ast_dump(webidl_node_getnode(node)); + } else { + printf(" %s\n", txt); + } + node = node->l; + } + return 0; +} + static FILE *idlopen(const char *filename) { FILE *idlfile; @@ -44,27 +158,6 @@ static FILE *idlopen(const char *filename) return idlfile; } -struct webidl_node * -webidl_node_link(struct webidl_node *tgt, struct webidl_node *src) -{ - if (tgt != NULL) { - tgt->l = src; - return tgt; - } - return src; -} - -struct webidl_node *webidl_node_new(int type, struct webidl_node *l, void *r) -{ - struct webidl_node *nn; - nn = calloc(1, sizeof(struct webidl_node)); - nn->type = type; - nn->l = l; - nn->r.text = r; - return nn; -} - - int webidl_parsefile(char *filename, struct webidl_node **webidl_ast) { diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 2798fa6..9a516af 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -18,7 +18,7 @@ enum webidl_node_type { }; struct webidl_node { - int type; + enum webidl_node_type type; struct webidl_node *l; union { struct webidl_node *node; @@ -26,12 +26,29 @@ struct webidl_node { } r; }; +/** callback for search and iteration routines */ +typedef int (webidl_callback_t)(struct webidl_node *node, void *ctx); -/** parse web idl file */ -int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); -struct webidl_node *webidl_node_new(int type, struct webidl_node *l, void *r); +struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node *l, void *r); struct webidl_node *webidl_node_link(struct webidl_node *tgt, struct webidl_node *src); +/* node contents acessors */ +char *webidl_node_gettext(struct webidl_node *node); +struct webidl_node *webidl_node_getnode(struct webidl_node *node); + + +/* node searches */ +int webidl_node_for_each_type(struct webidl_node *node, + enum webidl_node_type type, + webidl_callback_t *cb, + void *ctx); + +/* debug dump */ +int webidl_ast_dump(struct webidl_node *node); + +/** parse web idl file */ +int webidl_parsefile(char *filename, struct webidl_node **webidl_ast); + #endif diff --git a/src/webidl-parser.y b/src/webidl-parser.y index 2fd907f..c899001 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -110,14 +110,22 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> Definitions %type <node> Definition + %type <node> Partial +%type <node> PartialDefinition +%type <node> PartialInterface + %type <node> Dictionary +%type <node> PartialDictionary + %type <node> Exception %type <node> Enum %type <node> Typedef %type <node> ImplementsStatement %type <node> Interface %type <node> InterfaceMembers +%type <node> InterfaceMember + %type <node> CallbackOrInterface %type <node> CallbackRest %type <node> CallbackRestOrInterface @@ -127,7 +135,7 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) /* default rule to add built AST to passed in one */ Input: Definitions - { *webidl_ast = webidl_node_link(*webidl_ast, $1); } + { *webidl_ast = webidl_node_link($1, *webidl_ast); } | error { @@ -208,6 +216,9 @@ Interface: /* [6] */ Partial: TOK_PARTIAL PartialDefinition + { + $$ = $2; + } ; /* [7] */ @@ -220,6 +231,9 @@ PartialDefinition: /* [8] */ PartialInterface: TOK_INTERFACE TOK_IDENTIFIER '{' InterfaceMembers '}' ';' + { + $$=NULL; + } ; /* [9] slightly altered from original grammar to be left recursive */ @@ -231,7 +245,7 @@ InterfaceMembers: | InterfaceMembers ExtendedAttributeList InterfaceMember { - $$ = NULL; + $$ = webidl_node_link($1, $3); } ; @@ -245,6 +259,9 @@ InterfaceMember: /* [11] */ Dictionary: TOK_DICTIONARY TOK_IDENTIFIER Inheritance '{' DictionaryMembers '}' ';' + { + $$ = NULL; + } ; /* [12] */ @@ -262,6 +279,9 @@ DictionaryMember: /* [14] */ PartialDictionary: TOK_DICTIONARY TOK_IDENTIFIER '{' DictionaryMembers '}' ';' + { + $$=NULL; + } /* [15] */ Default: @@ -281,6 +301,9 @@ DefaultValue: /* [17] */ Exception: TOK_EXCEPTION TOK_IDENTIFIER Inheritance '{' ExceptionMembers '}' ';' + { + $$ = NULL; + } ; /* [18] */ @@ -306,6 +329,9 @@ Inheritance: /* [20] */ Enum: TOK_ENUM TOK_IDENTIFIER '{' EnumValueList '}' ';' + { + $$ = NULL; + } ; /* [21] */ @@ -331,11 +357,17 @@ CallbackRest: /* [24] */ Typedef: TOK_TYPEDEF ExtendedAttributeList Type TOK_IDENTIFIER ';' + { + $$ = NULL; + } ; /* [25] */ ImplementsStatement: TOK_IDENTIFIER TOK_IMPLEMENTS TOK_IDENTIFIER ';' + { + $$ = NULL; + } ; /* [26] */ @@ -375,6 +407,9 @@ FloatLiteral: /* [30] */ AttributeOrOperation: TOK_STRINGIFIER StringifierAttributeOrOperation + { + $$ = $2; + } | Attribute | @@ -393,6 +428,8 @@ StringifierAttributeOrOperation: /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' + { + } ; /* [33] */ -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

nsgenjsbind: branch master updated. eeaa03bf10aa41656b798ef8df7f42140c66e766

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/eeaa03bf10aa41656... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/eeaa03bf10aa41656b7... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/eeaa03bf10aa41656b798... The branch, master has been updated via eeaa03bf10aa41656b798ef8df7f42140c66e766 (commit) from b19fd9d8772824d12d33a3236710a9b6e96bda76 (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/nsgenjsbind.git/commitdiff/eeaa03bf10aa416... commit eeaa03bf10aa41656b798ef8df7f42140c66e766 Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk> Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk> construct the interface target node diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 6c61de9..2798fa6 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -11,7 +11,10 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_ROOT = 0, - + WEBIDL_NODE_TYPE_INTERFACE, + WEBIDL_NODE_TYPE_INTERFACE_IDENT, + WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, + WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, }; struct webidl_node { diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c6d981f..2fd907f 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -7,7 +7,7 @@ * http://www.opensource.org/licenses/mit-license.php * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org> * - * Derived from the the grammar in apendix A of W3C WEB IDL + * Derived from the the grammar in apendix A of W3C WEB IDL * http://www.w3.org/TR/WebIDL/ */ @@ -21,7 +21,7 @@ char *errtxt; -static void +static void webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) { locp = locp; @@ -110,11 +110,11 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> Definitions %type <node> Definition -%type <node> Partial -%type <node> Dictionary -%type <node> Exception -%type <node> Enum -%type <node> Typedef +%type <node> Partial +%type <node> Dictionary +%type <node> Exception +%type <node> Enum +%type <node> Typedef %type <node> ImplementsStatement %type <node> Interface %type <node> InterfaceMembers @@ -126,11 +126,11 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) /* default rule to add built AST to passed in one */ Input: - Definitions + Definitions { *webidl_ast = webidl_node_link(*webidl_ast, $1); } - | - error - { + | + error + { fprintf(stderr, "%d: %s\n", yylloc.first_line, errtxt); free(errtxt); YYABORT ; @@ -140,30 +140,30 @@ Input: /* [1] altered from original grammar to be left recusive, */ Definitions: /* empty */ - { - $$ = NULL; + { + $$ = NULL; } | Definitions ExtendedAttributeList Definition - { - $$ = webidl_node_link($1, $3); + { + $$ = webidl_node_link($1, $3); } ; - + /* [2] */ -Definition: +Definition: CallbackOrInterface | - Partial - | - Dictionary - | - Exception - | - Enum - | - Typedef - | + Partial + | + Dictionary + | + Exception + | + Enum + | + Typedef + | ImplementsStatement ; @@ -189,7 +189,19 @@ CallbackRestOrInterface: Interface: TOK_INTERFACE TOK_IDENTIFIER Inheritance '{' InterfaceMembers '}' ';' { - $$ = NULL; + struct webidl_node *ident; + struct webidl_node *members; + struct webidl_node *inheritance = NULL; + + if ($3 != NULL) { + inheritance = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, NULL, $3); + } + + members = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, inheritance, $5); + + ident = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_IDENT, members, $2); + + $$ = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE, NULL, ident); } ; @@ -200,8 +212,8 @@ Partial: /* [7] */ PartialDefinition: - PartialInterface - | + PartialInterface + | PartialDictionary ; @@ -226,7 +238,7 @@ InterfaceMembers: /* [10] */ InterfaceMember: Const - | + | AttributeOrOperation ; @@ -255,13 +267,13 @@ PartialDictionary: Default: /* empty */ | - '=' DefaultValue + '=' DefaultValue ; /* [16] */ DefaultValue: - ConstValue + ConstValue | TOK_STRING_LITERAL ; @@ -276,7 +288,7 @@ ExceptionMembers: /* empty */ | ExtendedAttributeList ExceptionMember ExceptionMembers - ; + ; /* [19] returns a string */ Inheritance: @@ -333,64 +345,64 @@ Const: /* [27] */ ConstValue: - BooleanLiteral - | - FloatLiteral - | - TOK_INT_LITERAL - | + BooleanLiteral + | + FloatLiteral + | + TOK_INT_LITERAL + | TOK_NULL_LITERAL ; /* [28] */ BooleanLiteral: - TOK_TRUE - | + TOK_TRUE + | TOK_FALSE ; /* [29] */ FloatLiteral: TOK_FLOAT_LITERAL - | + | '-' TOK_INFINITY - | + | TOK_INFINITY | TOK_NAN ; - /* [30] */ + /* [30] */ AttributeOrOperation: - TOK_STRINGIFIER StringifierAttributeOrOperation - | - Attribute - | + TOK_STRINGIFIER StringifierAttributeOrOperation + | + Attribute + | Operation ; - /* [31] */ + /* [31] */ StringifierAttributeOrOperation: - Attribute - | - OperationRest - | + Attribute + | + OperationRest + | ';' ; - /* [32] */ + /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' ; - /* [33] */ + /* [33] */ Inherit: /* empty */ | TOK_INHERIT - ; + ; - /* [34] */ + /* [34] */ ReadOnly: /* empty */ | @@ -405,7 +417,7 @@ Operation: /* [36] */ Qualifiers: TOK_STATIC - | + | Specials ; @@ -413,7 +425,7 @@ Qualifiers: Specials: /* empty */ | - Special Specials + Special Specials ; /* [38] */ @@ -446,14 +458,14 @@ OptionalIdentifier: ArgumentList: /* empty */ | - Argument Arguments + Argument Arguments ; /* [42] */ Arguments: /* empty */ | - ',' Argument Arguments + ',' Argument Arguments ; @@ -464,15 +476,15 @@ Argument: /* [44] */ OptionalOrRequiredArgument: - TOK_OPTIONAL Type ArgumentName Default - | + TOK_OPTIONAL Type ArgumentName Default + | Type Ellipsis ArgumentName ; /* [45] */ ArgumentName: - ArgumentNameKeyword - | + ArgumentNameKeyword + | TOK_IDENTIFIER ; @@ -485,8 +497,8 @@ Ellipsis: /* [47] */ ExceptionMember: - Const - | + Const + | ExceptionField ; @@ -517,7 +529,7 @@ ExtendedAttribute: | '{' ExtendedAttributeInner '}' ExtendedAttributeRest | - Other ExtendedAttributeRest + Other ExtendedAttributeRest ; /* [52] extended attributes can be space separated too */ @@ -550,7 +562,7 @@ Other: | TOK_STRING_LITERAL | - TOK_OTHER_LITERAL + TOK_OTHER_LITERAL | '-' | @@ -665,15 +677,15 @@ OtherOrComma: /* [57] */ Type: - SingleType - | + SingleType + | UnionType TypeSuffix ; /* [58] */ SingleType: - NonAnyType - | + NonAnyType + | TOK_ANY TypeSuffixStartingWithArray ; @@ -684,10 +696,10 @@ UnionType: /* [60] */ UnionMemberType: - NonAnyType - | - UnionType TypeSuffix - | + NonAnyType + | + UnionType TypeSuffix + | TOK_ANY '[' ']' TypeSuffix ; @@ -695,48 +707,48 @@ UnionMemberType: UnionMemberTypes: /* empty */ | - TOK_OR UnionMemberType UnionMemberTypes + TOK_OR UnionMemberType UnionMemberTypes ; /* [62] */ NonAnyType: - PrimitiveType TypeSuffix - | - TOK_STRING TypeSuffix - | - TOK_IDENTIFIER TypeSuffix - | - TOK_SEQUENCE '<' Type '>' Null - | - TOK_OBJECT TypeSuffix - | + PrimitiveType TypeSuffix + | + TOK_STRING TypeSuffix + | + TOK_IDENTIFIER TypeSuffix + | + TOK_SEQUENCE '<' Type '>' Null + | + TOK_OBJECT TypeSuffix + | TOK_DATE TypeSuffix ; /* [63] */ ConstType: - PrimitiveType Null - | + PrimitiveType Null + | TOK_IDENTIFIER Null ; /* [64] */ PrimitiveType: - UnsignedIntegerType - | - UnrestrictedFloatType - | + UnsignedIntegerType + | + UnrestrictedFloatType + | TOK_BOOLEAN - | + | TOK_BYTE - | + | TOK_OCTET ; /* [65] */ UnrestrictedFloatType: - TOK_UNRESTRICTED FloatType - | + TOK_UNRESTRICTED FloatType + | FloatType ; @@ -749,15 +761,15 @@ FloatType: /* [67] */ UnsignedIntegerType: - TOK_UNSIGNED IntegerType - | + TOK_UNSIGNED IntegerType + | IntegerType ; /* [68] */ IntegerType: TOK_SHORT - | + | TOK_LONG OptionalLong ; @@ -766,18 +778,18 @@ OptionalLong: /* empty */ | TOK_LONG - ; + ; /* [70] */ TypeSuffix: /* empty */ | - '[' ']' TypeSuffix - | - '?' TypeSuffixStartingWithArray + '[' ']' TypeSuffix + | + '?' TypeSuffixStartingWithArray ; - /* [71] */ + /* [71] */ TypeSuffixStartingWithArray: /* empty */ | @@ -791,10 +803,10 @@ Null: '?' ; - /* [73] */ + /* [73] */ ReturnType: - Type - | + Type + | TOK_VOID ; ----------------------------------------------------------------------- Summary of changes: src/webidl-ast.h | 5 +- src/webidl-parser.y | 232 +++++++++++++++++++++++++++------------------------ 2 files changed, 126 insertions(+), 111 deletions(-) diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 6c61de9..2798fa6 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -11,7 +11,10 @@ enum webidl_node_type { WEBIDL_NODE_TYPE_ROOT = 0, - + WEBIDL_NODE_TYPE_INTERFACE, + WEBIDL_NODE_TYPE_INTERFACE_IDENT, + WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, + WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, }; struct webidl_node { diff --git a/src/webidl-parser.y b/src/webidl-parser.y index c6d981f..2fd907f 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -7,7 +7,7 @@ * http://www.opensource.org/licenses/mit-license.php * Copyright 2012 Vincent Sanders <vince(a)netsurf-browser.org> * - * Derived from the the grammar in apendix A of W3C WEB IDL + * Derived from the the grammar in apendix A of W3C WEB IDL * http://www.w3.org/TR/WebIDL/ */ @@ -21,7 +21,7 @@ char *errtxt; -static void +static void webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) { locp = locp; @@ -110,11 +110,11 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %type <node> Definitions %type <node> Definition -%type <node> Partial -%type <node> Dictionary -%type <node> Exception -%type <node> Enum -%type <node> Typedef +%type <node> Partial +%type <node> Dictionary +%type <node> Exception +%type <node> Enum +%type <node> Typedef %type <node> ImplementsStatement %type <node> Interface %type <node> InterfaceMembers @@ -126,11 +126,11 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) /* default rule to add built AST to passed in one */ Input: - Definitions + Definitions { *webidl_ast = webidl_node_link(*webidl_ast, $1); } - | - error - { + | + error + { fprintf(stderr, "%d: %s\n", yylloc.first_line, errtxt); free(errtxt); YYABORT ; @@ -140,30 +140,30 @@ Input: /* [1] altered from original grammar to be left recusive, */ Definitions: /* empty */ - { - $$ = NULL; + { + $$ = NULL; } | Definitions ExtendedAttributeList Definition - { - $$ = webidl_node_link($1, $3); + { + $$ = webidl_node_link($1, $3); } ; - + /* [2] */ -Definition: +Definition: CallbackOrInterface | - Partial - | - Dictionary - | - Exception - | - Enum - | - Typedef - | + Partial + | + Dictionary + | + Exception + | + Enum + | + Typedef + | ImplementsStatement ; @@ -189,7 +189,19 @@ CallbackRestOrInterface: Interface: TOK_INTERFACE TOK_IDENTIFIER Inheritance '{' InterfaceMembers '}' ';' { - $$ = NULL; + struct webidl_node *ident; + struct webidl_node *members; + struct webidl_node *inheritance = NULL; + + if ($3 != NULL) { + inheritance = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_INHERITANCE, NULL, $3); + } + + members = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_MEMBERS, inheritance, $5); + + ident = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE_IDENT, members, $2); + + $$ = webidl_node_new(WEBIDL_NODE_TYPE_INTERFACE, NULL, ident); } ; @@ -200,8 +212,8 @@ Partial: /* [7] */ PartialDefinition: - PartialInterface - | + PartialInterface + | PartialDictionary ; @@ -226,7 +238,7 @@ InterfaceMembers: /* [10] */ InterfaceMember: Const - | + | AttributeOrOperation ; @@ -255,13 +267,13 @@ PartialDictionary: Default: /* empty */ | - '=' DefaultValue + '=' DefaultValue ; /* [16] */ DefaultValue: - ConstValue + ConstValue | TOK_STRING_LITERAL ; @@ -276,7 +288,7 @@ ExceptionMembers: /* empty */ | ExtendedAttributeList ExceptionMember ExceptionMembers - ; + ; /* [19] returns a string */ Inheritance: @@ -333,64 +345,64 @@ Const: /* [27] */ ConstValue: - BooleanLiteral - | - FloatLiteral - | - TOK_INT_LITERAL - | + BooleanLiteral + | + FloatLiteral + | + TOK_INT_LITERAL + | TOK_NULL_LITERAL ; /* [28] */ BooleanLiteral: - TOK_TRUE - | + TOK_TRUE + | TOK_FALSE ; /* [29] */ FloatLiteral: TOK_FLOAT_LITERAL - | + | '-' TOK_INFINITY - | + | TOK_INFINITY | TOK_NAN ; - /* [30] */ + /* [30] */ AttributeOrOperation: - TOK_STRINGIFIER StringifierAttributeOrOperation - | - Attribute - | + TOK_STRINGIFIER StringifierAttributeOrOperation + | + Attribute + | Operation ; - /* [31] */ + /* [31] */ StringifierAttributeOrOperation: - Attribute - | - OperationRest - | + Attribute + | + OperationRest + | ';' ; - /* [32] */ + /* [32] */ Attribute: Inherit ReadOnly TOK_ATTRIBUTE Type TOK_IDENTIFIER ';' ; - /* [33] */ + /* [33] */ Inherit: /* empty */ | TOK_INHERIT - ; + ; - /* [34] */ + /* [34] */ ReadOnly: /* empty */ | @@ -405,7 +417,7 @@ Operation: /* [36] */ Qualifiers: TOK_STATIC - | + | Specials ; @@ -413,7 +425,7 @@ Qualifiers: Specials: /* empty */ | - Special Specials + Special Specials ; /* [38] */ @@ -446,14 +458,14 @@ OptionalIdentifier: ArgumentList: /* empty */ | - Argument Arguments + Argument Arguments ; /* [42] */ Arguments: /* empty */ | - ',' Argument Arguments + ',' Argument Arguments ; @@ -464,15 +476,15 @@ Argument: /* [44] */ OptionalOrRequiredArgument: - TOK_OPTIONAL Type ArgumentName Default - | + TOK_OPTIONAL Type ArgumentName Default + | Type Ellipsis ArgumentName ; /* [45] */ ArgumentName: - ArgumentNameKeyword - | + ArgumentNameKeyword + | TOK_IDENTIFIER ; @@ -485,8 +497,8 @@ Ellipsis: /* [47] */ ExceptionMember: - Const - | + Const + | ExceptionField ; @@ -517,7 +529,7 @@ ExtendedAttribute: | '{' ExtendedAttributeInner '}' ExtendedAttributeRest | - Other ExtendedAttributeRest + Other ExtendedAttributeRest ; /* [52] extended attributes can be space separated too */ @@ -550,7 +562,7 @@ Other: | TOK_STRING_LITERAL | - TOK_OTHER_LITERAL + TOK_OTHER_LITERAL | '-' | @@ -665,15 +677,15 @@ OtherOrComma: /* [57] */ Type: - SingleType - | + SingleType + | UnionType TypeSuffix ; /* [58] */ SingleType: - NonAnyType - | + NonAnyType + | TOK_ANY TypeSuffixStartingWithArray ; @@ -684,10 +696,10 @@ UnionType: /* [60] */ UnionMemberType: - NonAnyType - | - UnionType TypeSuffix - | + NonAnyType + | + UnionType TypeSuffix + | TOK_ANY '[' ']' TypeSuffix ; @@ -695,48 +707,48 @@ UnionMemberType: UnionMemberTypes: /* empty */ | - TOK_OR UnionMemberType UnionMemberTypes + TOK_OR UnionMemberType UnionMemberTypes ; /* [62] */ NonAnyType: - PrimitiveType TypeSuffix - | - TOK_STRING TypeSuffix - | - TOK_IDENTIFIER TypeSuffix - | - TOK_SEQUENCE '<' Type '>' Null - | - TOK_OBJECT TypeSuffix - | + PrimitiveType TypeSuffix + | + TOK_STRING TypeSuffix + | + TOK_IDENTIFIER TypeSuffix + | + TOK_SEQUENCE '<' Type '>' Null + | + TOK_OBJECT TypeSuffix + | TOK_DATE TypeSuffix ; /* [63] */ ConstType: - PrimitiveType Null - | + PrimitiveType Null + | TOK_IDENTIFIER Null ; /* [64] */ PrimitiveType: - UnsignedIntegerType - | - UnrestrictedFloatType - | + UnsignedIntegerType + | + UnrestrictedFloatType + | TOK_BOOLEAN - | + | TOK_BYTE - | + | TOK_OCTET ; /* [65] */ UnrestrictedFloatType: - TOK_UNRESTRICTED FloatType - | + TOK_UNRESTRICTED FloatType + | FloatType ; @@ -749,15 +761,15 @@ FloatType: /* [67] */ UnsignedIntegerType: - TOK_UNSIGNED IntegerType - | + TOK_UNSIGNED IntegerType + | IntegerType ; /* [68] */ IntegerType: TOK_SHORT - | + | TOK_LONG OptionalLong ; @@ -766,18 +778,18 @@ OptionalLong: /* empty */ | TOK_LONG - ; + ; /* [70] */ TypeSuffix: /* empty */ | - '[' ']' TypeSuffix - | - '?' TypeSuffixStartingWithArray + '[' ']' TypeSuffix + | + '?' TypeSuffixStartingWithArray ; - /* [71] */ + /* [71] */ TypeSuffixStartingWithArray: /* empty */ | @@ -791,10 +803,10 @@ Null: '?' ; - /* [73] */ + /* [73] */ ReturnType: - Type - | + Type + | TOK_VOID ; -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

libdom: branch master updated. 83ace96a3046ec0f6bdbd258280b50292a4e8caf

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/83ace96a3046ec0f6bdbd2... ...commit http://git.netsurf-browser.org/libdom.git/commit/83ace96a3046ec0f6bdbd258... ...tree http://git.netsurf-browser.org/libdom.git/tree/83ace96a3046ec0f6bdbd25828... The branch, master has been updated via 83ace96a3046ec0f6bdbd258280b50292a4e8caf (commit) from cf72f59cc342f98eb2322689d59e8d5c2462f965 (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/libdom.git/commitdiff/83ace96a3046ec0f6bdb... commit 83ace96a3046ec0f6bdbd258280b50292a4e8caf Author: Vincent Sanders <vince(a)netsurf-browser.org> Commit: Vincent Sanders <vince(a)netsurf-browser.org> fixup comment damage from automated type conversion diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 8cf1193..1077bc9 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -214,7 +214,7 @@ expat_xmlparser_cdata_handler(void *_parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -230,7 +230,7 @@ expat_xmlparser_cdata_handler(void *_parser, if (ins_cdata != NULL) dom_node_unref(ins_cdata); - /* No int32_ter interested in cdata section */ + /* No longer interested in cdata section */ dom_node_unref(cdata); } @@ -309,7 +309,7 @@ expat_xmlparser_comment_handler(void *_parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append comment to parent */ @@ -326,7 +326,7 @@ expat_xmlparser_comment_handler(void *_parser, if (ins_comment != NULL) dom_node_unref((struct dom_node *) ins_comment); - /* No int32_ter interested in comment */ + /* No longer interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -369,7 +369,7 @@ expat_xmlparser_start_doctype_decl_handler(void *_parser, if (ins_doctype != NULL) dom_node_unref((struct dom_node *) ins_doctype); - /* No int32_ter interested in doctype */ + /* No longer interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c index ddca1d4..1c2442a 100644 --- a/bindings/xml/libxml_xmlparser.c +++ b/bindings/xml/libxml_xmlparser.c @@ -672,7 +672,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need tag name */ + /* No longer need tag name */ dom_string_unref(tag_name); } else { /* Namespace */ @@ -727,7 +727,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need namespace / qname */ + /* No longer need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -764,7 +764,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No int32_ter need attribute name */ + /* No longer need attribute name */ dom_string_unref(name); } else { /* Attribute has namespace */ @@ -819,7 +819,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need namespace / qname */ + /* No longer need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -865,7 +865,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, if (prev_attr != NULL && prev_attr != attr) dom_node_unref((struct dom_node *) prev_attr); - /* We're no int32_ter interested in the attribute node */ + /* We're no longer interested in the attribute node */ dom_node_unref((struct dom_node *) attr); } @@ -890,13 +890,13 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No int32_ter interested in element node */ + /* No longer interested in element node */ dom_node_unref((struct dom_node *) el); return; cleanup: - /* No int32_ter want node (any attributes attached to it + /* No longer want node (any attributes attached to it * will be cleaned up with it) */ dom_node_unref((struct dom_node *) el); @@ -935,7 +935,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append text node to parent */ @@ -960,7 +960,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter interested in text node */ + /* No longer interested in text node */ dom_node_unref((struct dom_node *) text); } @@ -996,7 +996,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -1021,7 +1021,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No int32_ter interested in cdata section */ + /* No longer interested in cdata section */ dom_node_unref((struct dom_node *) cdata); } @@ -1059,7 +1059,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No int32_ter need name */ + /* No longer need name */ dom_string_unref(name); /* Mirror subtree (reference value) */ @@ -1089,7 +1089,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No int32_ter interested in entity reference */ + /* No longer interested in entity reference */ dom_node_unref((struct dom_node *) entity); } @@ -1133,7 +1133,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append comment to parent */ @@ -1158,7 +1158,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter interested in comment */ + /* No longer interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -1220,7 +1220,7 @@ void xml_parser_add_document_type(dom_xml_parser *parser, return; } - /* No int32_ter interested in doctype */ + /* No longer interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h index 67160d1..04c7f18 100644 --- a/include/dom/core/exceptions.h +++ b/include/dom/core/exceptions.h @@ -12,7 +12,7 @@ * Class of a DOM exception. * * The top 16 bits of a dom_exception are a bitfield - * indicating which class the exception beint32_ts to. + * indicating which class the exception belongs to. */ typedef enum { DOM_EXCEPTION_CLASS_NORMAL = 0, diff --git a/src/core/element.c b/src/core/element.c index df40eaf..cbdb6e1 100644 --- a/src/core/element.c +++ b/src/core/element.c @@ -739,7 +739,7 @@ dom_exception _dom_element_get_attribute_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -944,7 +944,7 @@ dom_exception _dom_element_get_attribute_node_ns(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to recieve previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1843,7 +1843,7 @@ dom_exception _dom_element_get_attr_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1869,7 +1869,7 @@ dom_exception _dom_element_set_attr_node(struct dom_element *element, /** \todo validate name */ - /* Ensure element and attribute beint32_t to the same document */ + /* Ensure element and attribute belong to the same document */ if (e->owner != attr_node->owner) return DOM_WRONG_DOCUMENT_ERR; diff --git a/src/core/node.c b/src/core/node.c index b14f4fa..ca8fd72 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -167,7 +167,7 @@ dom_exception _dom_node_initialise(dom_node_internal *node, node->previous = NULL; node->next = NULL; - /* Note: nodes do not reference the document to which they beint32_t, + /* Note: nodes do not reference the document to which they belong, * as this would result in the document never being destroyed once * the client has finished with it. The document will be aware of * any nodes that it owns through 2 mechanisms: @@ -783,7 +783,7 @@ dom_exception _dom_node_insert_before(dom_node_internal *node, * also need to set its owner. */ if (node->type == DOM_DOCUMENT_NODE && new_child->type == DOM_DOCUMENT_TYPE_NODE) { - /* See int32_t comment in _dom_node_initialise as to why + /* See long comment in _dom_node_initialise as to why * we don't ref the document here */ new_child->owner = (struct dom_document *) node; } @@ -1277,7 +1277,7 @@ dom_exception _dom_node_set_prefix(dom_node_internal *node, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - /* No int32_ter want existing prefix */ + /* No longer want existing prefix */ if (node->prefix != NULL) { dom_string_unref(node->prefix); } diff --git a/src/utils/hashtable.c b/src/utils/hashtable.c index fb7c84a..db6ece8 100644 --- a/src/utils/hashtable.c +++ b/src/utils/hashtable.c @@ -114,7 +114,7 @@ dom_hash_table *_dom_hash_clone(dom_hash_table *ht) * Destroys a hash table, freeing all memory associated with it. * * \param ht Hash table to destroy. After the function returns, this - * will noint32_ter be valid + * will nolonger be valid */ void _dom_hash_destroy(dom_hash_table *ht) { @@ -305,7 +305,7 @@ uint32_t _dom_hash_get_length(struct dom_hash_table *ht) * If you make changes to this hash table implementation, please rerun this * test, and if possible, through valgrind to make sure there are no memory * leaks or invalid memory accesses. If you add new functionality, please - * include a test for it that has good coverage aint32_t side the other tests. + * include a test for it that has good coverage along side the other tests. */ #ifdef TEST_RIG ----------------------------------------------------------------------- Summary of changes: bindings/xml/expat_xmlparser.c | 10 +++++----- bindings/xml/libxml_xmlparser.c | 32 ++++++++++++++++---------------- include/dom/core/exceptions.h | 2 +- src/core/element.c | 8 ++++---- src/core/node.c | 6 +++--- src/utils/hashtable.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 8cf1193..1077bc9 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -214,7 +214,7 @@ expat_xmlparser_cdata_handler(void *_parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -230,7 +230,7 @@ expat_xmlparser_cdata_handler(void *_parser, if (ins_cdata != NULL) dom_node_unref(ins_cdata); - /* No int32_ter interested in cdata section */ + /* No longer interested in cdata section */ dom_node_unref(cdata); } @@ -309,7 +309,7 @@ expat_xmlparser_comment_handler(void *_parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append comment to parent */ @@ -326,7 +326,7 @@ expat_xmlparser_comment_handler(void *_parser, if (ins_comment != NULL) dom_node_unref((struct dom_node *) ins_comment); - /* No int32_ter interested in comment */ + /* No longer interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -369,7 +369,7 @@ expat_xmlparser_start_doctype_decl_handler(void *_parser, if (ins_doctype != NULL) dom_node_unref((struct dom_node *) ins_doctype); - /* No int32_ter interested in doctype */ + /* No longer interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c index ddca1d4..1c2442a 100644 --- a/bindings/xml/libxml_xmlparser.c +++ b/bindings/xml/libxml_xmlparser.c @@ -672,7 +672,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need tag name */ + /* No longer need tag name */ dom_string_unref(tag_name); } else { /* Namespace */ @@ -727,7 +727,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need namespace / qname */ + /* No longer need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -764,7 +764,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No int32_ter need attribute name */ + /* No longer need attribute name */ dom_string_unref(name); } else { /* Attribute has namespace */ @@ -819,7 +819,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No int32_ter need namespace / qname */ + /* No longer need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -865,7 +865,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, if (prev_attr != NULL && prev_attr != attr) dom_node_unref((struct dom_node *) prev_attr); - /* We're no int32_ter interested in the attribute node */ + /* We're no longer interested in the attribute node */ dom_node_unref((struct dom_node *) attr); } @@ -890,13 +890,13 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No int32_ter interested in element node */ + /* No longer interested in element node */ dom_node_unref((struct dom_node *) el); return; cleanup: - /* No int32_ter want node (any attributes attached to it + /* No longer want node (any attributes attached to it * will be cleaned up with it) */ dom_node_unref((struct dom_node *) el); @@ -935,7 +935,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append text node to parent */ @@ -960,7 +960,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter interested in text node */ + /* No longer interested in text node */ dom_node_unref((struct dom_node *) text); } @@ -996,7 +996,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -1021,7 +1021,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No int32_ter interested in cdata section */ + /* No longer interested in cdata section */ dom_node_unref((struct dom_node *) cdata); } @@ -1059,7 +1059,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No int32_ter need name */ + /* No longer need name */ dom_string_unref(name); /* Mirror subtree (reference value) */ @@ -1089,7 +1089,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No int32_ter interested in entity reference */ + /* No longer interested in entity reference */ dom_node_unref((struct dom_node *) entity); } @@ -1133,7 +1133,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter need data */ + /* No longer need data */ dom_string_unref(data); /* Append comment to parent */ @@ -1158,7 +1158,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No int32_ter interested in comment */ + /* No longer interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -1220,7 +1220,7 @@ void xml_parser_add_document_type(dom_xml_parser *parser, return; } - /* No int32_ter interested in doctype */ + /* No longer interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h index 67160d1..04c7f18 100644 --- a/include/dom/core/exceptions.h +++ b/include/dom/core/exceptions.h @@ -12,7 +12,7 @@ * Class of a DOM exception. * * The top 16 bits of a dom_exception are a bitfield - * indicating which class the exception beint32_ts to. + * indicating which class the exception belongs to. */ typedef enum { DOM_EXCEPTION_CLASS_NORMAL = 0, diff --git a/src/core/element.c b/src/core/element.c index df40eaf..cbdb6e1 100644 --- a/src/core/element.c +++ b/src/core/element.c @@ -739,7 +739,7 @@ dom_exception _dom_element_get_attribute_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -944,7 +944,7 @@ dom_exception _dom_element_get_attribute_node_ns(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to recieve previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1843,7 +1843,7 @@ dom_exception _dom_element_get_attr_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1869,7 +1869,7 @@ dom_exception _dom_element_set_attr_node(struct dom_element *element, /** \todo validate name */ - /* Ensure element and attribute beint32_t to the same document */ + /* Ensure element and attribute belong to the same document */ if (e->owner != attr_node->owner) return DOM_WRONG_DOCUMENT_ERR; diff --git a/src/core/node.c b/src/core/node.c index b14f4fa..ca8fd72 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -167,7 +167,7 @@ dom_exception _dom_node_initialise(dom_node_internal *node, node->previous = NULL; node->next = NULL; - /* Note: nodes do not reference the document to which they beint32_t, + /* Note: nodes do not reference the document to which they belong, * as this would result in the document never being destroyed once * the client has finished with it. The document will be aware of * any nodes that it owns through 2 mechanisms: @@ -783,7 +783,7 @@ dom_exception _dom_node_insert_before(dom_node_internal *node, * also need to set its owner. */ if (node->type == DOM_DOCUMENT_NODE && new_child->type == DOM_DOCUMENT_TYPE_NODE) { - /* See int32_t comment in _dom_node_initialise as to why + /* See long comment in _dom_node_initialise as to why * we don't ref the document here */ new_child->owner = (struct dom_document *) node; } @@ -1277,7 +1277,7 @@ dom_exception _dom_node_set_prefix(dom_node_internal *node, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - /* No int32_ter want existing prefix */ + /* No longer want existing prefix */ if (node->prefix != NULL) { dom_string_unref(node->prefix); } diff --git a/src/utils/hashtable.c b/src/utils/hashtable.c index fb7c84a..db6ece8 100644 --- a/src/utils/hashtable.c +++ b/src/utils/hashtable.c @@ -114,7 +114,7 @@ dom_hash_table *_dom_hash_clone(dom_hash_table *ht) * Destroys a hash table, freeing all memory associated with it. * * \param ht Hash table to destroy. After the function returns, this - * will noint32_ter be valid + * will nolonger be valid */ void _dom_hash_destroy(dom_hash_table *ht) { @@ -305,7 +305,7 @@ uint32_t _dom_hash_get_length(struct dom_hash_table *ht) * If you make changes to this hash table implementation, please rerun this * test, and if possible, through valgrind to make sure there are no memory * leaks or invalid memory accesses. If you add new functionality, please - * include a test for it that has good coverage aint32_t side the other tests. + * include a test for it that has good coverage along side the other tests. */ #ifdef TEST_RIG -- Document Object Model library

10 years, 6 months

1
0
0 / 0

netsurf: branch master updated. ee9ab42f75213ea5905f43985de989f863b2165b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/ee9ab42f75213ea5905f4... ...commit http://git.netsurf-browser.org/netsurf.git/commit/ee9ab42f75213ea5905f439... ...tree http://git.netsurf-browser.org/netsurf.git/tree/ee9ab42f75213ea5905f43985... The branch, master has been updated via ee9ab42f75213ea5905f43985de989f863b2165b (commit) from f8b2e2233278e8087adece20908bec8e5823a900 (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/commitdiff/ee9ab42f75213ea5905... commit ee9ab42f75213ea5905f43985de989f863b2165b Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fixup for latest libdom. diff --git a/render/box_construct.c b/render/box_construct.c index fe0cc2a..5b22e99 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -3012,7 +3012,8 @@ bool box_embed(BOX_SPECIAL_PARAMS) struct object_params *params; struct object_param *param; dom_namednodemap *attrs; - unsigned long idx, num_attrs; + unsigned long idx; + uint32_t num_attrs; dom_string *src; dom_exception err; diff --git a/render/html_forms.c b/render/html_forms.c index f5c6600..2165dc8 100644 --- a/render/html_forms.c +++ b/render/html_forms.c @@ -121,7 +121,8 @@ struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc) dom_html_collection *forms; struct form *ret = NULL, *newf; dom_node *node; - unsigned long nforms, n; + unsigned long n; + uint32_t nforms; if (doc == NULL) return NULL; @@ -332,7 +333,7 @@ parse_input_element(struct form *forms, dom_html_input_element *input) if (control->type == GADGET_PASSWORD || control->type == GADGET_TEXTBOX) { - long maxlength; + int32_t maxlength; if (dom_html_input_element_get_max_length( input, &maxlength) != DOM_NO_ERR) { maxlength = -1; diff --git a/render/imagemap.c b/render/imagemap.c index ef79e35..9663a89 100644 --- a/render/imagemap.c +++ b/render/imagemap.c @@ -256,7 +256,8 @@ imagemap_extract(html_content *c) { dom_nodelist *nlist; dom_exception exc; - unsigned long maybe_maps, mapnr; + unsigned long mapnr; + uint32_t maybe_maps; exc = dom_document_get_elements_by_tag_name(c->document, corestring_dom_map, @@ -345,7 +346,8 @@ imagemap_extract_map_entries(dom_node *node, html_content *c, { dom_nodelist *nlist; dom_exception exc; - unsigned long tag_count, ent; + unsigned long ent; + uint32_t tag_count; exc = dom_element_get_elements_by_tag_name(node, tname, &nlist); if (exc != DOM_NO_ERR) { ----------------------------------------------------------------------- Summary of changes: render/box_construct.c | 3 ++- render/html_forms.c | 5 +++-- render/imagemap.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/render/box_construct.c b/render/box_construct.c index fe0cc2a..5b22e99 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -3012,7 +3012,8 @@ bool box_embed(BOX_SPECIAL_PARAMS) struct object_params *params; struct object_param *param; dom_namednodemap *attrs; - unsigned long idx, num_attrs; + unsigned long idx; + uint32_t num_attrs; dom_string *src; dom_exception err; diff --git a/render/html_forms.c b/render/html_forms.c index f5c6600..2165dc8 100644 --- a/render/html_forms.c +++ b/render/html_forms.c @@ -121,7 +121,8 @@ struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc) dom_html_collection *forms; struct form *ret = NULL, *newf; dom_node *node; - unsigned long nforms, n; + unsigned long n; + uint32_t nforms; if (doc == NULL) return NULL; @@ -332,7 +333,7 @@ parse_input_element(struct form *forms, dom_html_input_element *input) if (control->type == GADGET_PASSWORD || control->type == GADGET_TEXTBOX) { - long maxlength; + int32_t maxlength; if (dom_html_input_element_get_max_length( input, &maxlength) != DOM_NO_ERR) { maxlength = -1; diff --git a/render/imagemap.c b/render/imagemap.c index ef79e35..9663a89 100644 --- a/render/imagemap.c +++ b/render/imagemap.c @@ -256,7 +256,8 @@ imagemap_extract(html_content *c) { dom_nodelist *nlist; dom_exception exc; - unsigned long maybe_maps, mapnr; + unsigned long mapnr; + uint32_t maybe_maps; exc = dom_document_get_elements_by_tag_name(c->document, corestring_dom_map, @@ -345,7 +346,8 @@ imagemap_extract_map_entries(dom_node *node, html_content *c, { dom_nodelist *nlist; dom_exception exc; - unsigned long tag_count, ent; + unsigned long ent; + uint32_t tag_count; exc = dom_element_get_elements_by_tag_name(node, tname, &nlist); if (exc != DOM_NO_ERR) { -- NetSurf Browser

10 years, 6 months

1
0
0 / 0

libdom: branch master updated. cf72f59cc342f98eb2322689d59e8d5c2462f965

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/cf72f59cc342f98eb23226... ...commit http://git.netsurf-browser.org/libdom.git/commit/cf72f59cc342f98eb2322689... ...tree http://git.netsurf-browser.org/libdom.git/tree/cf72f59cc342f98eb2322689d5... The branch, master has been updated via cf72f59cc342f98eb2322689d59e8d5c2462f965 (commit) from a77488bab4732c30044b04e97d13707e03825bdf (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/libdom.git/commitdiff/cf72f59cc342f98eb232... commit cf72f59cc342f98eb2322689d59e8d5c2462f965 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix tests and disable test cases where we don't match in signedness. diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 890a8ff..5d11b62 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -30,8 +30,8 @@ our %native_interface = ( our %special_type = ( # Some of the type are not defined now! boolean => "bool ", - int => "unsigned long ", - "unsigned long" => "unsigned long ", + int => "int32_t ", + "unsigned long" => "uint32_t ", DOMString => "dom_string *", List => "list *", Collection => "list *", diff --git a/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml b/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml deleted file mode 100644 index 8a8ee4a..0000000 --- a/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="documentcreatedocumentfragment"> -<metadata> -<title>documentCreateDocumentFragment</title> -<creator>NIST</creator> -<description> - The "createDocumentFragment()" method creates an empty - DocumentFragment object. - Retrieve the entire DOM document and invoke its - "createDocumentFragment()" method. The content, name, - type and value of the newly created object are output. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-35CB..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="newDocFragment" type="DocumentFragment"/> -<var name="children" type="NodeList"/> -<var name="length" type="int"/> -<var name="newDocFragmentName" type="DOMString"/> -<var name="newDocFragmentType" type="int"/> -<var name="newDocFragmentValue" type="DOMString"/> -<load var="doc" href="staff" willBeModified="true"/> -<createDocumentFragment obj="doc" var="newDocFragment"/> -<childNodes obj="newDocFragment" var="children"/> -<length interface="NodeList" obj="children" var="length"/> -<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> -<nodeName obj="newDocFragment" var="newDocFragmentName"/> -<assertEquals actual="newDocFragmentName" expected=""#document-fragment"" ignoreCase="false" id="name"/> -<nodeType obj="newDocFragment" var="newDocFragmentType"/> -<assertEquals actual="newDocFragmentType" expected="11" ignoreCase="false" id="type"/> -<nodeValue obj="newDocFragment" var="newDocFragmentValue"/> -<assertNull actual="newDocFragmentValue" id="value"/> -</test> diff --git a/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken b/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken new file mode 100644 index 0000000..8a8ee4a --- /dev/null +++ b/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="documentcreatedocumentfragment"> +<metadata> +<title>documentCreateDocumentFragment</title> +<creator>NIST</creator> +<description> + The "createDocumentFragment()" method creates an empty + DocumentFragment object. + Retrieve the entire DOM document and invoke its + "createDocumentFragment()" method. The content, name, + type and value of the newly created object are output. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-35CB..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="newDocFragment" type="DocumentFragment"/> +<var name="children" type="NodeList"/> +<var name="length" type="int"/> +<var name="newDocFragmentName" type="DOMString"/> +<var name="newDocFragmentType" type="int"/> +<var name="newDocFragmentValue" type="DOMString"/> +<load var="doc" href="staff" willBeModified="true"/> +<createDocumentFragment obj="doc" var="newDocFragment"/> +<childNodes obj="newDocFragment" var="children"/> +<length interface="NodeList" obj="children" var="length"/> +<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> +<nodeName obj="newDocFragment" var="newDocFragmentName"/> +<assertEquals actual="newDocFragmentName" expected=""#document-fragment"" ignoreCase="false" id="name"/> +<nodeType obj="newDocFragment" var="newDocFragmentType"/> +<assertEquals actual="newDocFragmentType" expected="11" ignoreCase="false" id="type"/> +<nodeValue obj="newDocFragment" var="newDocFragmentValue"/> +<assertNull actual="newDocFragmentValue" id="value"/> +</test> diff --git a/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml b/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml deleted file mode 100644 index b4bb21a..0000000 --- a/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_documentcreatedocumentfragment"> -<metadata> -<title>hc_documentCreateDocumentFragment</title> -<creator>Curt Arnold</creator> -<description> - The "createDocumentFragment()" method creates an empty - DocumentFragment object. - Retrieve the entire DOM document and invoke its - "createDocumentFragment()" method. The content, name, - type and value of the newly created object are output. -</description> - -<date qualifier="created">2002-06-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-35CB..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="newDocFragment" type="DocumentFragment"/> -<var name="children" type="NodeList"/> -<var name="length" type="int"/> -<var name="newDocFragmentName" type="DOMString"/> -<var name="newDocFragmentType" type="int"/> -<var name="newDocFragmentValue" type="DOMString"/> -<load var="doc" href="hc_staff" willBeModified="true"/> -<createDocumentFragment obj="doc" var="newDocFragment"/> -<childNodes obj="newDocFragment" var="children"/> -<length interface="NodeList" obj="children" var="length"/> -<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> -<nodeName obj="newDocFragment" var="newDocFragmentName"/> -<assertEquals actual="newDocFragmentName" expected='"#document-fragment"' ignoreCase="false" id="strong"/> -<nodeType obj="newDocFragment" var="newDocFragmentType"/> -<assertEquals actual="newDocFragmentType" expected="11" ignoreCase="false" id="type"/> -<nodeValue obj="newDocFragment" var="newDocFragmentValue"/> -<assertNull actual="newDocFragmentValue" id="value"/> -</test> diff --git a/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken b/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken new file mode 100644 index 0000000..b4bb21a --- /dev/null +++ b/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_documentcreatedocumentfragment"> +<metadata> +<title>hc_documentCreateDocumentFragment</title> +<creator>Curt Arnold</creator> +<description> + The "createDocumentFragment()" method creates an empty + DocumentFragment object. + Retrieve the entire DOM document and invoke its + "createDocumentFragment()" method. The content, name, + type and value of the newly created object are output. +</description> + +<date qualifier="created">2002-06-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-35CB..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="newDocFragment" type="DocumentFragment"/> +<var name="children" type="NodeList"/> +<var name="length" type="int"/> +<var name="newDocFragmentName" type="DOMString"/> +<var name="newDocFragmentType" type="int"/> +<var name="newDocFragmentValue" type="DOMString"/> +<load var="doc" href="hc_staff" willBeModified="true"/> +<createDocumentFragment obj="doc" var="newDocFragment"/> +<childNodes obj="newDocFragment" var="children"/> +<length interface="NodeList" obj="children" var="length"/> +<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> +<nodeName obj="newDocFragment" var="newDocFragmentName"/> +<assertEquals actual="newDocFragmentName" expected='"#document-fragment"' ignoreCase="false" id="strong"/> +<nodeType obj="newDocFragment" var="newDocFragmentType"/> +<assertEquals actual="newDocFragmentType" expected="11" ignoreCase="false" id="type"/> +<nodeValue obj="newDocFragment" var="newDocFragmentValue"/> +<assertNull actual="newDocFragmentValue" id="value"/> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml b/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml deleted file mode 100644 index 1cc01da..0000000 --- a/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodechildnodesempty"> -<metadata> -<title>hc_nodeChildNodesEmpty</title> -<creator>Curt Arnold</creator> -<description> - The "getChildNodes()" method returns a NodeList - that contains all children of this node. If there - are not any children, this is a NodeList that does not - contain any nodes. - - Retrieve the character data of the second "em" node and - invoke the "getChildNodes()" method. The - NodeList returned should not have any nodes. -</description> - -<date qualifier="created">2002-06-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="childList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="textNode" type="Node"/> -<var name="length" type="int"/> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"em"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<firstChild var="textNode" obj="employeeNode"/> -<childNodes var="childList" obj="textNode"/> -<length var="length" obj="childList" interface="NodeList"/> -<assertEquals expected="0" actual="length" id="length_zero" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken b/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken new file mode 100644 index 0000000..1cc01da --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodechildnodesempty"> +<metadata> +<title>hc_nodeChildNodesEmpty</title> +<creator>Curt Arnold</creator> +<description> + The "getChildNodes()" method returns a NodeList + that contains all children of this node. If there + are not any children, this is a NodeList that does not + contain any nodes. + + Retrieve the character data of the second "em" node and + invoke the "getChildNodes()" method. The + NodeList returned should not have any nodes. +</description> + +<date qualifier="created">2002-06-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="childList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="textNode" type="Node"/> +<var name="length" type="int"/> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"em"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<firstChild var="textNode" obj="employeeNode"/> +<childNodes var="childList" obj="textNode"/> +<length var="length" obj="childList" interface="NodeList"/> +<assertEquals expected="0" actual="length" id="length_zero" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml b/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml deleted file mode 100644 index fd919fe..0000000 --- a/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodeclonenodefalse"> -<metadata> -<title>hc_nodeCloneNodeFalse</title> -<creator>Curt Arnold</creator> -<description> - The "cloneNode(deep)" method returns a copy of the node - only if deep=false. - - Retrieve the second employee and invoke the - "cloneNode(deep)" method with deep=false. The - method should only clone this node. The NodeName and - length of the NodeList are checked. The "getNodeName()" - method should return "employee" and the "getLength()" - method should return 0. -</description> - -<date qualifier="created">2002-06-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="clonedNode" type="Node"/> -<var name="cloneName" type="DOMString"/> -<var name="cloneChildren" type="NodeList"/> -<var name="length" type="int"/> -<load var="doc" href="hc_staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"p"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<cloneNode obj="employeeNode" deep="false" var="clonedNode"/> -<nodeName obj="clonedNode" var="cloneName"/> -<assertEquals actual="cloneName" expected='"p"' ignoreCase="auto" id="strong"/> -<childNodes obj="clonedNode" var="cloneChildren"/> -<length interface="NodeList" obj="cloneChildren" var="length"/> -<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken b/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken new file mode 100644 index 0000000..fd919fe --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodeclonenodefalse"> +<metadata> +<title>hc_nodeCloneNodeFalse</title> +<creator>Curt Arnold</creator> +<description> + The "cloneNode(deep)" method returns a copy of the node + only if deep=false. + + Retrieve the second employee and invoke the + "cloneNode(deep)" method with deep=false. The + method should only clone this node. The NodeName and + length of the NodeList are checked. The "getNodeName()" + method should return "employee" and the "getLength()" + method should return 0. +</description> + +<date qualifier="created">2002-06-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="clonedNode" type="Node"/> +<var name="cloneName" type="DOMString"/> +<var name="cloneChildren" type="NodeList"/> +<var name="length" type="int"/> +<load var="doc" href="hc_staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"p"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<cloneNode obj="employeeNode" deep="false" var="clonedNode"/> +<nodeName obj="clonedNode" var="cloneName"/> +<assertEquals actual="cloneName" expected='"p"' ignoreCase="auto" id="strong"/> +<childNodes obj="clonedNode" var="cloneChildren"/> +<length interface="NodeList" obj="cloneChildren" var="length"/> +<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml b/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml deleted file mode 100644 index 0b19fd5..0000000 --- a/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexequalzero"> -<metadata> -<title>hc_nodelistIndexEqualZero</title> -<creator>Curt Arnold</creator> -<description> - Create a list of all the children elements of the third - employee and access its first child by using an index - of 0. This should result in the whitspace before "em" being - selected (em when ignoring whitespace). - Further we evaluate its content(by using - the "getNodeName()" method) to ensure the proper - element was accessed. -</description> - -<date qualifier="created">2002-06-09</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<item interface="NodeList" obj="employeeList" var="child" index="0"/> -<nodeName obj="child" var="childName"/> -<if><equals expected='13' actual="length" ignoreCase="false"/> -<assertEquals actual="childName" expected='"#text"' ignoreCase="false" id="childName_w_whitespace"/> -<else> -<assertEquals actual="childName" expected='"em"' ignoreCase="auto" id="childName_wo_whitespace"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken b/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken new file mode 100644 index 0000000..0b19fd5 --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexequalzero"> +<metadata> +<title>hc_nodelistIndexEqualZero</title> +<creator>Curt Arnold</creator> +<description> + Create a list of all the children elements of the third + employee and access its first child by using an index + of 0. This should result in the whitspace before "em" being + selected (em when ignoring whitespace). + Further we evaluate its content(by using + the "getNodeName()" method) to ensure the proper + element was accessed. +</description> + +<date qualifier="created">2002-06-09</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<item interface="NodeList" obj="employeeList" var="child" index="0"/> +<nodeName obj="child" var="childName"/> +<if><equals expected='13' actual="length" ignoreCase="false"/> +<assertEquals actual="childName" expected='"#text"' ignoreCase="false" id="childName_w_whitespace"/> +<else> +<assertEquals actual="childName" expected='"em"' ignoreCase="auto" id="childName_wo_whitespace"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml b/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml deleted file mode 100644 index 65e05bb..0000000 --- a/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexgetlength"> -<metadata> -<title>hc_nodelistIndexGetLength</title> -<creator>Curt Arnold</creator> -<description> - The "getLength()" method returns the number of nodes - in the list. - - Create a list of all the children elements of the third - employee and invoke the "getLength()" method. - It should contain the value 13. -</description> - -<date qualifier="created">2002-06-09</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="length" type="int"/> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<if><equals actual="length" expected="6"/> -<assertEquals actual="length" expected="6" ignoreCase="false" id="length_wo_space"/> -<else> -<assertEquals actual="length" expected="13" ignoreCase="false" id="length_w_space"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken b/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken new file mode 100644 index 0000000..65e05bb --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexgetlength"> +<metadata> +<title>hc_nodelistIndexGetLength</title> +<creator>Curt Arnold</creator> +<description> + The "getLength()" method returns the number of nodes + in the list. + + Create a list of all the children elements of the third + employee and invoke the "getLength()" method. + It should contain the value 13. +</description> + +<date qualifier="created">2002-06-09</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="length" type="int"/> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<if><equals actual="length" expected="6"/> +<assertEquals actual="length" expected="6" ignoreCase="false" id="length_wo_space"/> +<else> +<assertEquals actual="length" expected="13" ignoreCase="false" id="length_w_space"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml b/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml deleted file mode 100644 index d75bb7f..0000000 --- a/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexgetlengthofemptylist"> -<metadata> -<title>hc_nodelistIndexGetLengthOfEmptyList</title> -<creator>Curt Arnold</creator> -<description> - The "getLength()" method returns the number of nodes - in the list.(Test for EMPTY list) - - Create a list of all the children of the Text node - inside the first child of the third employee and - invoke the "getLength()" method. It should contain - the value 0. -</description> - -<date qualifier="created">2002-06-09</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> -</metadata> -<var name="doc" type="Document"/> -<var name="emList" type="NodeList"/> -<var name="emNode" type="Node"/> -<var name="textNode" type="Node"/> -<var name="textList" type="NodeList"/> -<var name="length" type="int"/> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="emList" tagname='"em"'/> -<item interface="NodeList" obj="emList" var="emNode" index="2"/> -<firstChild var="textNode" obj="emNode"/> -<childNodes var="textList" obj="textNode"/> -<length var="length" obj="textList" interface="NodeList"/> -<assertEquals actual="length" expected="0" id="length" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken b/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken new file mode 100644 index 0000000..d75bb7f --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistindexgetlengthofemptylist"> +<metadata> +<title>hc_nodelistIndexGetLengthOfEmptyList</title> +<creator>Curt Arnold</creator> +<description> + The "getLength()" method returns the number of nodes + in the list.(Test for EMPTY list) + + Create a list of all the children of the Text node + inside the first child of the third employee and + invoke the "getLength()" method. It should contain + the value 0. +</description> + +<date qualifier="created">2002-06-09</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> +</metadata> +<var name="doc" type="Document"/> +<var name="emList" type="NodeList"/> +<var name="emNode" type="Node"/> +<var name="textNode" type="Node"/> +<var name="textList" type="NodeList"/> +<var name="length" type="int"/> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="emList" tagname='"em"'/> +<item interface="NodeList" obj="emList" var="emNode" index="2"/> +<firstChild var="textNode" obj="emNode"/> +<childNodes var="textList" obj="textNode"/> +<length var="length" obj="textList" interface="NodeList"/> +<assertEquals actual="length" expected="0" id="length" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml b/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml deleted file mode 100644 index f268f20..0000000 --- a/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistreturnlastitem"> -<metadata> -<title>hc_nodelistReturnLastItem</title> -<creator>Curt Arnold</creator> -<description> - Create a list of all the children elements of the third - employee and access its last child by invoking the - "item(index)" method with an index=length-1. This should - result in node with nodeName="#text" or acronym.</description> - -<date qualifier="created">2002-06-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="index" type="int"/> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="index" obj="employeeList" interface="NodeList"/> -<decrement var="index" value="1"/> -<item interface="NodeList" obj="employeeList" var="child" index="index"/> -<nodeName obj="child" var="childName"/> -<if><equals actual="index" expected="12"/> -<assertEquals actual="childName" expected='"#text"' id="lastNodeName_w_whitespace" ignoreCase="false"/> -<else> -<assertEquals actual="childName" expected='"acronym"' id="lastNodeName" ignoreCase="auto"/> -<assertEquals actual="index" expected="5" id="index" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken b/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken new file mode 100644 index 0000000..f268f20 --- /dev/null +++ b/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_nodelistreturnlastitem"> +<metadata> +<title>hc_nodelistReturnLastItem</title> +<creator>Curt Arnold</creator> +<description> + Create a list of all the children elements of the third + employee and access its last child by invoking the + "item(index)" method with an index=length-1. This should + result in node with nodeName="#text" or acronym.</description> + +<date qualifier="created">2002-06-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=246"/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="index" type="int"/> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"p"'/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="index" obj="employeeList" interface="NodeList"/> +<decrement var="index" value="1"/> +<item interface="NodeList" obj="employeeList" var="child" index="index"/> +<nodeName obj="child" var="childName"/> +<if><equals actual="index" expected="12"/> +<assertEquals actual="childName" expected='"#text"' id="lastNodeName_w_whitespace" ignoreCase="false"/> +<else> +<assertEquals actual="childName" expected='"acronym"' id="lastNodeName" ignoreCase="auto"/> +<assertEquals actual="index" expected="5" id="index" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml b/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml deleted file mode 100644 index 280b79c..0000000 --- a/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_textparseintolistofelements"> -<metadata> -<title>hc_textParseIntoListOfElements</title> -<creator>Curt Arnold</creator> -<description> - Retrieve the textual data from the last child of the - second employee. That node is composed of two - EntityReference nodes and two Text nodes. After - the content node is parsed, the "acronym" Element - should contain four children with each one of the - EntityReferences containing one child. -</description> - -<date qualifier="created">2002-06-09</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-11C9..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7455..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="addressNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="value" type="DOMString"/> -<var name="grandChild" type="Node"/> -<var name="length" type="int"/> -<var name="result" type="List"/> -<var name="expectedNormal" type="List"> -<member>"β"</member> -<member>" Dallas, "</member> -<member>"γ"</member> -<member>"\n 98554"</member> -</var> -<var name="expectedExpanded" type="List"> -<member>"β Dallas, γ\n 98554"</member> -</var> -<load var="doc" href="hc_staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"acronym"'/> -<item interface="NodeList" obj="elementList" var="addressNode" index="1"/> -<childNodes obj="addressNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<for-each collection="childList" member="child"> - <nodeValue obj="child" var="value"/> - <if> - <isNull obj="value"/> - <firstChild interface="Node" obj="child" var="grandChild"/> - <assertNotNull actual="grandChild" id="grandChildNotNull"/> - <nodeValue obj="grandChild" var="value"/> - <append collection="result" item="value"/> - <else> - <append collection="result" item="value"/> - </else> - </if> -</for-each> -<if><equals actual="length" expected="1" ignoreCase="false"/> - <assertEquals actual="result" expected="expectedExpanded" ignoreCase="false" id="assertEqCoalescing"/> - <else> - <assertEquals actual="result" expected="expectedNormal" ignoreCase="false" id="assertEqNormal"/> - </else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken b/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken new file mode 100644 index 0000000..280b79c --- /dev/null +++ b/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="hc_textparseintolistofelements"> +<metadata> +<title>hc_textParseIntoListOfElements</title> +<creator>Curt Arnold</creator> +<description> + Retrieve the textual data from the last child of the + second employee. That node is composed of two + EntityReference nodes and two Text nodes. After + the content node is parsed, the "acronym" Element + should contain four children with each one of the + EntityReferences containing one child. +</description> + +<date qualifier="created">2002-06-09</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-11C9..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7455..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="addressNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="value" type="DOMString"/> +<var name="grandChild" type="Node"/> +<var name="length" type="int"/> +<var name="result" type="List"/> +<var name="expectedNormal" type="List"> +<member>"β"</member> +<member>" Dallas, "</member> +<member>"γ"</member> +<member>"\n 98554"</member> +</var> +<var name="expectedExpanded" type="List"> +<member>"β Dallas, γ\n 98554"</member> +</var> +<load var="doc" href="hc_staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"acronym"'/> +<item interface="NodeList" obj="elementList" var="addressNode" index="1"/> +<childNodes obj="addressNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<for-each collection="childList" member="child"> + <nodeValue obj="child" var="value"/> + <if> + <isNull obj="value"/> + <firstChild interface="Node" obj="child" var="grandChild"/> + <assertNotNull actual="grandChild" id="grandChildNotNull"/> + <nodeValue obj="grandChild" var="value"/> + <append collection="result" item="value"/> + <else> + <append collection="result" item="value"/> + </else> + </if> +</for-each> +<if><equals actual="length" expected="1" ignoreCase="false"/> + <assertEquals actual="result" expected="expectedExpanded" ignoreCase="false" id="assertEqCoalescing"/> + <else> + <assertEquals actual="result" expected="expectedNormal" ignoreCase="false" id="assertEqNormal"/> + </else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/namednodemapchildnoderange.xml b/test/testcases/tests/level1/core/namednodemapchildnoderange.xml deleted file mode 100644 index 12dbd09..0000000 --- a/test/testcases/tests/level1/core/namednodemapchildnoderange.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="namednodemapchildnoderange"> -<metadata> -<title>namednodemapChildNodeRange</title> -<creator>NIST</creator> -<description> - The range of valid child node indices is 0 to Length -1. - - Create a NamedNodeMap object from the attributes of the - last child of the third employee and traverse the - list from index 0 thru length -1. All indices should - be valid. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-84CF096"/> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3494..."/> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-6D0F..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="testEmployee" type="Node"/> -<var name="attributes" type="NamedNodeMap"/> -<var name="child" type="Node"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""address""/> -<item interface="NodeList" obj="elementList" var="testEmployee" index="2"/> -<attributes obj="testEmployee" var="attributes"/> -<length var="length" obj="attributes" interface="NamedNodeMap"/> -<assertEquals actual="length" expected="2" id="length" ignoreCase="false"/> -<item var="child" index="0" obj="attributes" interface="NamedNodeMap"/> -<item var="child" index="1" obj="attributes" interface="NamedNodeMap"/> -</test> diff --git a/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken b/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken new file mode 100644 index 0000000..12dbd09 --- /dev/null +++ b/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="namednodemapchildnoderange"> +<metadata> +<title>namednodemapChildNodeRange</title> +<creator>NIST</creator> +<description> + The range of valid child node indices is 0 to Length -1. + + Create a NamedNodeMap object from the attributes of the + last child of the third employee and traverse the + list from index 0 thru length -1. All indices should + be valid. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-84CF096"/> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3494..."/> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-6D0F..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="testEmployee" type="Node"/> +<var name="attributes" type="NamedNodeMap"/> +<var name="child" type="Node"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""address""/> +<item interface="NodeList" obj="elementList" var="testEmployee" index="2"/> +<attributes obj="testEmployee" var="attributes"/> +<length var="length" obj="attributes" interface="NamedNodeMap"/> +<assertEquals actual="length" expected="2" id="length" ignoreCase="false"/> +<item var="child" index="0" obj="attributes" interface="NamedNodeMap"/> +<item var="child" index="1" obj="attributes" interface="NamedNodeMap"/> +</test> diff --git a/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml b/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml deleted file mode 100644 index 03c61f5..0000000 --- a/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="namednodemapnumberofnodes"> -<metadata> -<title>namednodemapNumberOfNodes</title> -<creator>NIST</creator> -<description> - The "getLength()" method returns the number of nodes - in the map. - - Retrieve the second employee and create a NamedNodeMap - listing of the attributes of the last child. Once the - list is created an invocation of the "getLength()" - method is executed. The number of nodes should be 2. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-84CF096"/> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-6D0F..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="testEmployee" type="Node"/> -<var name="attributes" type="NamedNodeMap"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""address""/> -<item interface="NodeList" obj="elementList" var="testEmployee" index="2"/> -<attributes obj="testEmployee" var="attributes"/> -<length var="length" obj="attributes" interface="NamedNodeMap"/> -<assertEquals actual="length" expected="2" id="length" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken b/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken new file mode 100644 index 0000000..03c61f5 --- /dev/null +++ b/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="namednodemapnumberofnodes"> +<metadata> +<title>namednodemapNumberOfNodes</title> +<creator>NIST</creator> +<description> + The "getLength()" method returns the number of nodes + in the map. + + Retrieve the second employee and create a NamedNodeMap + listing of the attributes of the last child. Once the + list is created an invocation of the "getLength()" + method is executed. The number of nodes should be 2. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-84CF096"/> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-6D0F..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="testEmployee" type="Node"/> +<var name="attributes" type="NamedNodeMap"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""address""/> +<item interface="NodeList" obj="elementList" var="testEmployee" index="2"/> +<attributes obj="testEmployee" var="attributes"/> +<length var="length" obj="attributes" interface="NamedNodeMap"/> +<assertEquals actual="length" expected="2" id="length" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/nodechildnodesappendchild.xml b/test/testcases/tests/level1/core/nodechildnodesappendchild.xml deleted file mode 100644 index 8297b0a..0000000 --- a/test/testcases/tests/level1/core/nodechildnodesappendchild.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodechildnodesappendchild"> -<metadata> -<title>nodechildnodesappendchild</title> -<creator>NIST</creator> -<description> -Add an element and check that the previously retrieved childNodes NodeList -is live. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-184E..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="createdNode" type="Node"/> -<var name="expectedLength" type="int"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="expectedLength" obj="childList" interface="NodeList"/> -<increment var="expectedLength" value="1"/> -<createElement obj="doc" var="createdNode" tagName='"text3"'/> -<appendChild obj="employeeNode" newChild="createdNode" var="employeeNode"/> -<length var="length" obj="childList" interface="NodeList"/> -<assertEquals actual="length" expected="expectedLength" ignoreCase="false" id="childNodeLength"/> -</test> diff --git a/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken b/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken new file mode 100644 index 0000000..8297b0a --- /dev/null +++ b/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodechildnodesappendchild"> +<metadata> +<title>nodechildnodesappendchild</title> +<creator>NIST</creator> +<description> +Add an element and check that the previously retrieved childNodes NodeList +is live. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1451..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-184E..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="createdNode" type="Node"/> +<var name="expectedLength" type="int"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="expectedLength" obj="childList" interface="NodeList"/> +<increment var="expectedLength" value="1"/> +<createElement obj="doc" var="createdNode" tagName='"text3"'/> +<appendChild obj="employeeNode" newChild="createdNode" var="employeeNode"/> +<length var="length" obj="childList" interface="NodeList"/> +<assertEquals actual="length" expected="expectedLength" ignoreCase="false" id="childNodeLength"/> +</test> diff --git a/test/testcases/tests/level1/core/nodeclonenodefalse.xml b/test/testcases/tests/level1/core/nodeclonenodefalse.xml deleted file mode 100644 index e51c7d0..0000000 --- a/test/testcases/tests/level1/core/nodeclonenodefalse.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeclonenodefalse"> -<metadata> -<title>nodeCloneNodeFalse</title> -<creator>NIST</creator> -<description> - The "cloneNode(deep)" method returns a copy of the node - only if deep=false. - - Retrieve the second employee and invoke the - "cloneNode(deep)" method with deep=false. The - method should only clone this node. The NodeName and - length of the NodeList are checked. The "getNodeName()" - method should return "employee" and the "getLength()" - method should return 0. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="clonedNode" type="Node"/> -<var name="cloneName" type="DOMString"/> -<var name="cloneChildren" type="NodeList"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<cloneNode obj="employeeNode" deep="false" var="clonedNode"/> -<nodeName obj="clonedNode" var="cloneName"/> -<assertEquals actual="cloneName" expected=""employee"" ignoreCase="false" id="name"/> -<childNodes obj="clonedNode" var="cloneChildren"/> -<length interface="NodeList" obj="cloneChildren" var="length"/> -<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> -</test> diff --git a/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken b/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken new file mode 100644 index 0000000..e51c7d0 --- /dev/null +++ b/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeclonenodefalse"> +<metadata> +<title>nodeCloneNodeFalse</title> +<creator>NIST</creator> +<description> + The "cloneNode(deep)" method returns a copy of the node + only if deep=false. + + Retrieve the second employee and invoke the + "cloneNode(deep)" method with deep=false. The + method should only clone this node. The NodeName and + length of the NodeList are checked. The "getNodeName()" + method should return "employee" and the "getLength()" + method should return 0. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="clonedNode" type="Node"/> +<var name="cloneName" type="DOMString"/> +<var name="cloneChildren" type="NodeList"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<cloneNode obj="employeeNode" deep="false" var="clonedNode"/> +<nodeName obj="clonedNode" var="cloneName"/> +<assertEquals actual="cloneName" expected=""employee"" ignoreCase="false" id="name"/> +<childNodes obj="clonedNode" var="cloneChildren"/> +<length interface="NodeList" obj="cloneChildren" var="length"/> +<assertEquals actual="length" expected="0" ignoreCase="false" id="length"/> +</test> diff --git a/test/testcases/tests/level1/core/nodeclonenodetrue.xml b/test/testcases/tests/level1/core/nodeclonenodetrue.xml deleted file mode 100644 index 812e235..0000000 --- a/test/testcases/tests/level1/core/nodeclonenodetrue.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeclonenodetrue"> -<metadata> -<title>nodeCloneNodeTrue</title> -<creator>NIST</creator> -<description> - The "cloneNode(deep)" method returns a copy of the node - and the subtree under it if deep=true. - - Retrieve the second employee and invoke the - "cloneNode(deep)" method with deep=true. The - method should clone this node and the subtree under it. - The NodeName of each child in the returned node is - checked to insure the entire subtree under the second - employee was cloned. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="clonedNode" type="Node"/> -<var name="clonedList" type="NodeList"/> -<var name="clonedChild" type="Node"/> -<var name="clonedChildName" type="DOMString"/> -<var name="length" type="int"/> -<var name="result" type="List"/> -<var name="expectedWhitespace" type="List"> -<member>"#text"</member> -<member>"employeeId"</member> -<member>"#text"</member> -<member>"name"</member> -<member>"#text"</member> -<member>"position"</member> -<member>"#text"</member> -<member>"salary"</member> -<member>"#text"</member> -<member>"gender"</member> -<member>"#text"</member> -<member>"address"</member> -<member>"#text"</member> -</var> -<var name="expectedNoWhitespace" type="List"> -<member>"employeeId"</member> -<member>"name"</member> -<member>"position"</member> -<member>"salary"</member> -<member>"gender"</member> -<member>"address"</member> -</var> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes var="childList" obj="employeeNode"/> -<length var="length" obj="childList" interface="NodeList"/> -<cloneNode obj="employeeNode" deep="true" var="clonedNode"/> -<childNodes obj="clonedNode" var="clonedList"/> -<for-each collection="clonedList" member="clonedChild"> -<nodeName obj="clonedChild" var="clonedChildName"/> -<append collection="result" item="clonedChildName"/> -</for-each> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <assertEquals actual="result" expected="expectedNoWhitespace" id="nowhitespace" ignoreCase="false"/> -<else> - <assertEquals actual="result" expected="expectedWhitespace" id="whitespace" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken b/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken new file mode 100644 index 0000000..812e235 --- /dev/null +++ b/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeclonenodetrue"> +<metadata> +<title>nodeCloneNodeTrue</title> +<creator>NIST</creator> +<description> + The "cloneNode(deep)" method returns a copy of the node + and the subtree under it if deep=true. + + Retrieve the second employee and invoke the + "cloneNode(deep)" method with deep=true. The + method should clone this node and the subtree under it. + The NodeName of each child in the returned node is + checked to insure the entire subtree under the second + employee was cloned. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-3A0E..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="clonedNode" type="Node"/> +<var name="clonedList" type="NodeList"/> +<var name="clonedChild" type="Node"/> +<var name="clonedChildName" type="DOMString"/> +<var name="length" type="int"/> +<var name="result" type="List"/> +<var name="expectedWhitespace" type="List"> +<member>"#text"</member> +<member>"employeeId"</member> +<member>"#text"</member> +<member>"name"</member> +<member>"#text"</member> +<member>"position"</member> +<member>"#text"</member> +<member>"salary"</member> +<member>"#text"</member> +<member>"gender"</member> +<member>"#text"</member> +<member>"address"</member> +<member>"#text"</member> +</var> +<var name="expectedNoWhitespace" type="List"> +<member>"employeeId"</member> +<member>"name"</member> +<member>"position"</member> +<member>"salary"</member> +<member>"gender"</member> +<member>"address"</member> +</var> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes var="childList" obj="employeeNode"/> +<length var="length" obj="childList" interface="NodeList"/> +<cloneNode obj="employeeNode" deep="true" var="clonedNode"/> +<childNodes obj="clonedNode" var="clonedList"/> +<for-each collection="clonedList" member="clonedChild"> +<nodeName obj="clonedChild" var="clonedChildName"/> +<append collection="result" item="clonedChildName"/> +</for-each> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <assertEquals actual="result" expected="expectedNoWhitespace" id="nowhitespace" ignoreCase="false"/> +<else> + <assertEquals actual="result" expected="expectedWhitespace" id="whitespace" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/nodeinsertbefore.xml b/test/testcases/tests/level1/core/nodeinsertbefore.xml deleted file mode 100644 index 810b427..0000000 --- a/test/testcases/tests/level1/core/nodeinsertbefore.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeinsertbefore"> -<metadata> -<title>nodeInsertBefore</title> -<creator>NIST</creator> -<description> - The "insertBefore(newChild,refChild)" method inserts the - node "newChild" before the node "refChild". - - Insert a newly created Element node before the eigth - child of the second employee and check the "newChild" - and "refChild" after insertion for correct placement. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-9522..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="refChild" type="Node"/> -<var name="newChild" type="Node"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<var name="insertedNode" type="Node"/> -<var name="actual" type="List"/> -<var name="expectedWithWhitespace" type="List"> -<member>"#text"</member> -<member>"employeeId"</member> -<member>"#text"</member> -<member>"name"</member> -<member>"#text"</member> -<member>"position"</member> -<member>"#text"</member> -<member>"newChild"</member> -<member>"salary"</member> -<member>"#text"</member> -<member>"gender"</member> -<member>"#text"</member> -<member>"address"</member> -<member>"#text"</member> -</var> -<var name="expectedWithoutWhitespace" type="List"> -<member>"employeeId"</member> -<member>"name"</member> -<member>"position"</member> -<member>"newChild"</member> -<member>"salary"</member> -<member>"gender"</member> -<member>"address"</member> -</var> -<var name="expected" type="List"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <item interface="NodeList" obj="childList" index="3" var="refChild"/> - <assign var="expected" value="expectedWithoutWhitespace"/> - <else> - <item interface="NodeList" obj="childList" index="7" var="refChild"/> - <assign var="expected" value="expectedWithWhitespace"/> - </else> -</if> -<createElement obj="doc" tagName='"newChild"' var="newChild"/> -<insertBefore var="insertedNode" obj="employeeNode" newChild="newChild" refChild="refChild"/> -<for-each collection="childList" member="child"> - <nodeName obj="child" var="childName"/> - <append collection="actual" item="childName"/> -</for-each> -<assertEquals actual="actual" expected="expected" id="nodeNames" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken b/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken new file mode 100644 index 0000000..810b427 --- /dev/null +++ b/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeinsertbefore"> +<metadata> +<title>nodeInsertBefore</title> +<creator>NIST</creator> +<description> + The "insertBefore(newChild,refChild)" method inserts the + node "newChild" before the node "refChild". + + Insert a newly created Element node before the eigth + child of the second employee and check the "newChild" + and "refChild" after insertion for correct placement. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-9522..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="refChild" type="Node"/> +<var name="newChild" type="Node"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<var name="insertedNode" type="Node"/> +<var name="actual" type="List"/> +<var name="expectedWithWhitespace" type="List"> +<member>"#text"</member> +<member>"employeeId"</member> +<member>"#text"</member> +<member>"name"</member> +<member>"#text"</member> +<member>"position"</member> +<member>"#text"</member> +<member>"newChild"</member> +<member>"salary"</member> +<member>"#text"</member> +<member>"gender"</member> +<member>"#text"</member> +<member>"address"</member> +<member>"#text"</member> +</var> +<var name="expectedWithoutWhitespace" type="List"> +<member>"employeeId"</member> +<member>"name"</member> +<member>"position"</member> +<member>"newChild"</member> +<member>"salary"</member> +<member>"gender"</member> +<member>"address"</member> +</var> +<var name="expected" type="List"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <item interface="NodeList" obj="childList" index="3" var="refChild"/> + <assign var="expected" value="expectedWithoutWhitespace"/> + <else> + <item interface="NodeList" obj="childList" index="7" var="refChild"/> + <assign var="expected" value="expectedWithWhitespace"/> + </else> +</if> +<createElement obj="doc" tagName='"newChild"' var="newChild"/> +<insertBefore var="insertedNode" obj="employeeNode" newChild="newChild" refChild="refChild"/> +<for-each collection="childList" member="child"> + <nodeName obj="child" var="childName"/> + <append collection="actual" item="childName"/> +</for-each> +<assertEquals actual="actual" expected="expected" id="nodeNames" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml b/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml deleted file mode 100644 index c202d0f..0000000 --- a/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeinsertbeforenewchildexists"> -<metadata> -<title>nodeInsertBeforeNewChildExists</title> -<creator>NIST</creator> -<description> - If the "newChild" is already in the tree, the - "insertBefore(newChild,refChild)" method must first - remove it before the insertion takes place. - - Insert a node Element ("employeeId") that is already - present in the tree. The existing node should be - removed first and the new one inserted. The node is - inserted at a different position in the tree to assure - that it was indeed inserted. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-9522..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="refChild" type="Node"/> -<var name="newChild" type="Node"/> -<var name="child" type="Node"/> -<var name="length" type="int"/> -<var name="childName" type="DOMString"/> -<var name="insertedNode" type="Node"/> -<var name="expectedWhitespace" type="List"> -<member>"#text"</member> -<member>"#text"</member> -<member>"name"</member> -<member>"#text"</member> -<member>"position"</member> -<member>"#text"</member> -<member>"salary"</member> -<member>"#text"</member> -<member>"gender"</member> -<member>"#text"</member> -<member>"employeeId"</member> -<member>"address"</member> -<member>"#text"</member> -</var> -<var name="expectedNoWhitespace" type="List"> -<member>"name"</member> -<member>"position"</member> -<member>"salary"</member> -<member>"gender"</member> -<member>"employeeId"</member> -<member>"address"</member> -</var> -<var name="expected" type="List"/> -<var name="result" type="List"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <assign var="expected" value="expectedNoWhitespace"/> - <item interface="NodeList" obj="childList" index="5" var="refChild"/> - <item interface="NodeList" obj="childList" index="0" var="newChild"/> - <else> - <assign var="expected" value="expectedWhitespace"/> - <item interface="NodeList" obj="childList" index="11" var="refChild"/> - <item interface="NodeList" obj="childList" index="1" var="newChild"/> - </else> -</if> -<insertBefore var="insertedNode" obj="employeeNode" newChild="newChild" refChild="refChild"/> -<for-each collection="childList" member="child"> - <nodeName obj="child" var="childName"/> - <append collection="result" item="childName"/> -</for-each> -<assertEquals id="childNames" actual="result" expected="expected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken b/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken new file mode 100644 index 0000000..c202d0f --- /dev/null +++ b/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodeinsertbeforenewchildexists"> +<metadata> +<title>nodeInsertBeforeNewChildExists</title> +<creator>NIST</creator> +<description> + If the "newChild" is already in the tree, the + "insertBefore(newChild,refChild)" method must first + remove it before the insertion takes place. + + Insert a node Element ("employeeId") that is already + present in the tree. The existing node should be + removed first and the new one inserted. The node is + inserted at a different position in the tree to assure + that it was indeed inserted. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-9522..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="refChild" type="Node"/> +<var name="newChild" type="Node"/> +<var name="child" type="Node"/> +<var name="length" type="int"/> +<var name="childName" type="DOMString"/> +<var name="insertedNode" type="Node"/> +<var name="expectedWhitespace" type="List"> +<member>"#text"</member> +<member>"#text"</member> +<member>"name"</member> +<member>"#text"</member> +<member>"position"</member> +<member>"#text"</member> +<member>"salary"</member> +<member>"#text"</member> +<member>"gender"</member> +<member>"#text"</member> +<member>"employeeId"</member> +<member>"address"</member> +<member>"#text"</member> +</var> +<var name="expectedNoWhitespace" type="List"> +<member>"name"</member> +<member>"position"</member> +<member>"salary"</member> +<member>"gender"</member> +<member>"employeeId"</member> +<member>"address"</member> +</var> +<var name="expected" type="List"/> +<var name="result" type="List"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <assign var="expected" value="expectedNoWhitespace"/> + <item interface="NodeList" obj="childList" index="5" var="refChild"/> + <item interface="NodeList" obj="childList" index="0" var="newChild"/> + <else> + <assign var="expected" value="expectedWhitespace"/> + <item interface="NodeList" obj="childList" index="11" var="refChild"/> + <item interface="NodeList" obj="childList" index="1" var="newChild"/> + </else> +</if> +<insertBefore var="insertedNode" obj="employeeNode" newChild="newChild" refChild="refChild"/> +<for-each collection="childList" member="child"> + <nodeName obj="child" var="childName"/> + <append collection="result" item="childName"/> +</for-each> +<assertEquals id="childNames" actual="result" expected="expected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/nodelistindexgetlength.xml b/test/testcases/tests/level1/core/nodelistindexgetlength.xml deleted file mode 100644 index bd32f4f..0000000 --- a/test/testcases/tests/level1/core/nodelistindexgetlength.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistindexgetlength"> -<metadata> -<title>nodelistIndexGetLength</title> -<creator>NIST</creator> -<description> - The "getLength()" method returns the number of nodes - in the list should be 6 (no whitespace) or 13. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="length" type="int"/> -<var name="expectedCount" type="int" value="0"/> -<load var="doc" href="staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<assertTrue id="lengthIs6or13"> - <or> - <equals actual="length" expected="6" ignoreCase="false"/> - <equals actual="length" expected="13" ignoreCase="false"/> - </or> -</assertTrue> -</test> diff --git a/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken b/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken new file mode 100644 index 0000000..bd32f4f --- /dev/null +++ b/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistindexgetlength"> +<metadata> +<title>nodelistIndexGetLength</title> +<creator>NIST</creator> +<description> + The "getLength()" method returns the number of nodes + in the list should be 6 (no whitespace) or 13. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="length" type="int"/> +<var name="expectedCount" type="int" value="0"/> +<load var="doc" href="staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<assertTrue id="lengthIs6or13"> + <or> + <equals actual="length" expected="6" ignoreCase="false"/> + <equals actual="length" expected="13" ignoreCase="false"/> + </or> +</assertTrue> +</test> diff --git a/test/testcases/tests/level1/core/nodelistindexnotzero.xml b/test/testcases/tests/level1/core/nodelistindexnotzero.xml deleted file mode 100644 index f0331f0..0000000 --- a/test/testcases/tests/level1/core/nodelistindexnotzero.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistindexnotzero"> -<metadata> -<title>nodelistIndexNotZero</title> -<creator>NIST</creator> -<description> - Create a list of all the children elements of the third - employee and access its fourth child by using an index - of 3. This should result in "name" being - selected. Further we evaluate its content(by using - the "getNodeName()" method) to ensure the proper - element was accessed. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="length" type="int"/> -<var name="childName" type="DOMString"/> -<load var="doc" href="staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <item interface="NodeList" obj="employeeList" var="child" index="1"/> -<else> - <item interface="NodeList" obj="employeeList" var="child" index="3"/> -</else> -</if> -<nodeName obj="child" var="childName"/> -<assertEquals actual="childName" expected='"name"' - id="nodeName" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken b/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken new file mode 100644 index 0000000..f0331f0 --- /dev/null +++ b/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistindexnotzero"> +<metadata> +<title>nodelistIndexNotZero</title> +<creator>NIST</creator> +<description> + Create a list of all the children elements of the third + employee and access its fourth child by using an index + of 3. This should result in "name" being + selected. Further we evaluate its content(by using + the "getNodeName()" method) to ensure the proper + element was accessed. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="length" type="int"/> +<var name="childName" type="DOMString"/> +<load var="doc" href="staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <item interface="NodeList" obj="employeeList" var="child" index="1"/> +<else> + <item interface="NodeList" obj="employeeList" var="child" index="3"/> +</else> +</if> +<nodeName obj="child" var="childName"/> +<assertEquals actual="childName" expected='"name"' + id="nodeName" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml b/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml deleted file mode 100644 index 177c8e3..0000000 --- a/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistreturnfirstitem"> -<metadata> -<title>nodelistReturnFirstItem</title> -<creator>NIST</creator> -<description> -Get the first child of the third employee using NodeList.item(0) -which will either be a Text node (whitespace) or employeeId element. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"employee"'/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<item interface="NodeList" obj="employeeList" var="child" index="0"/> -<nodeName obj="child" var="childName"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> -<assertEquals actual="childName" expected='"employeeId"' ignoreCase="true" id="firstChildNoWhitespace"/> -<else> -<assertEquals actual="childName" expected='"#text"' ignoreCase="true" id="firstChildWithWhitespace"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken b/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken new file mode 100644 index 0000000..177c8e3 --- /dev/null +++ b/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistreturnfirstitem"> +<metadata> +<title>nodelistReturnFirstItem</title> +<creator>NIST</creator> +<description> +Get the first child of the third employee using NodeList.item(0) +which will either be a Text node (whitespace) or employeeId element. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname='"employee"'/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<item interface="NodeList" obj="employeeList" var="child" index="0"/> +<nodeName obj="child" var="childName"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> +<assertEquals actual="childName" expected='"employeeId"' ignoreCase="true" id="firstChildNoWhitespace"/> +<else> +<assertEquals actual="childName" expected='"#text"' ignoreCase="true" id="firstChildWithWhitespace"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/nodelistreturnlastitem.xml b/test/testcases/tests/level1/core/nodelistreturnlastitem.xml deleted file mode 100644 index fcf0700..0000000 --- a/test/testcases/tests/level1/core/nodelistreturnlastitem.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistreturnlastitem"> -<metadata> -<title>nodelistReturnLastItem</title> -<creator>NIST</creator> -<description> -Get this last child of the third employee using NodeList.item(NodeList.length - 1) -and check that it is either a Text element (with whitespace) or an address element. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <item interface="NodeList" obj="employeeList" var="child" index="5"/> - <nodeName obj="child" var="childName"/> - <assertEquals actual="childName" expected='"address"' id="nodeName1" ignoreCase="false"/> -<else> - <item interface="NodeList" obj="employeeList" var="child" index="12"/> - <nodeName obj="child" var="childName"/> - <assertEquals actual="childName" expected='"#text"' id="nodeName2" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken b/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken new file mode 100644 index 0000000..fcf0700 --- /dev/null +++ b/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelistreturnlastitem"> +<metadata> +<title>nodelistReturnLastItem</title> +<creator>NIST</creator> +<description> +Get this last child of the third employee using NodeList.item(NodeList.length - 1) +and check that it is either a Text element (with whitespace) or an address element. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <item interface="NodeList" obj="employeeList" var="child" index="5"/> + <nodeName obj="child" var="childName"/> + <assertEquals actual="childName" expected='"address"' id="nodeName1" ignoreCase="false"/> +<else> + <item interface="NodeList" obj="employeeList" var="child" index="12"/> + <nodeName obj="child" var="childName"/> + <assertEquals actual="childName" expected='"#text"' id="nodeName2" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/nodelisttraverselist.xml b/test/testcases/tests/level1/core/nodelisttraverselist.xml deleted file mode 100644 index abbcd40..0000000 --- a/test/testcases/tests/level1/core/nodelisttraverselist.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelisttraverselist"> -<metadata> -<title>nodelistTraverseList</title> -<creator>NIST</creator> -<description> - The range of valid child node indices is 0 thru length -1 - - Create a list of all the children elements of the third - employee and traverse the list from index=0 thru - length -1. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> - -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="employeeList" type="NodeList"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="result" type="List"/> -<var name="length" type="int"/> -<var name="expectedWhitespace" type="List"> -<member>"#text"</member> -<member>"employeeId"</member> -<member>"#text"</member> -<member>"name"</member> -<member>"#text"</member> -<member>"position"</member> -<member>"#text"</member> -<member>"salary"</member> -<member>"#text"</member> -<member>"gender"</member> -<member>"#text"</member> -<member>"address"</member> -<member>"#text"</member> -</var> -<var name="expectedNoWhitespace" type="List"> -<member>"employeeId"</member> -<member>"name"</member> -<member>"position"</member> -<member>"salary"</member> -<member>"gender"</member> -<member>"address"</member> -</var> -<load var="doc" href="staff" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> -<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> -<childNodes obj="employeeNode" var="employeeList"/> -<length var="length" obj="employeeList" interface="NodeList"/> -<for-each collection="employeeList" member="child"> - <nodeName obj="child" var="childName"/> - <append collection="result" item="childName"/> -</for-each> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <assertEquals actual="result" expected="expectedNoWhitespace" id="nowhitespace" ignoreCase="false"/> -<else> - <assertEquals actual="result" expected="expectedWhitespace" id="whitespace" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken b/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken new file mode 100644 index 0000000..abbcd40 --- /dev/null +++ b/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodelisttraverselist"> +<metadata> +<title>nodelistTraverseList</title> +<creator>NIST</creator> +<description> + The range of valid child node indices is 0 thru length -1 + + Create a list of all the children elements of the third + employee and traverse the list from index=0 thru + length -1. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-2035..."/> + +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-8443..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="employeeList" type="NodeList"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="result" type="List"/> +<var name="length" type="int"/> +<var name="expectedWhitespace" type="List"> +<member>"#text"</member> +<member>"employeeId"</member> +<member>"#text"</member> +<member>"name"</member> +<member>"#text"</member> +<member>"position"</member> +<member>"#text"</member> +<member>"salary"</member> +<member>"#text"</member> +<member>"gender"</member> +<member>"#text"</member> +<member>"address"</member> +<member>"#text"</member> +</var> +<var name="expectedNoWhitespace" type="List"> +<member>"employeeId"</member> +<member>"name"</member> +<member>"position"</member> +<member>"salary"</member> +<member>"gender"</member> +<member>"address"</member> +</var> +<load var="doc" href="staff" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="elementList" tagname=""employee""/> +<item interface="NodeList" obj="elementList" var="employeeNode" index="2"/> +<childNodes obj="employeeNode" var="employeeList"/> +<length var="length" obj="employeeList" interface="NodeList"/> +<for-each collection="employeeList" member="child"> + <nodeName obj="child" var="childName"/> + <append collection="result" item="childName"/> +</for-each> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <assertEquals actual="result" expected="expectedNoWhitespace" id="nowhitespace" ignoreCase="false"/> +<else> + <assertEquals actual="result" expected="expectedWhitespace" id="whitespace" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/noderemovechildgetnodename.xml b/test/testcases/tests/level1/core/noderemovechildgetnodename.xml deleted file mode 100644 index 33da6b7..0000000 --- a/test/testcases/tests/level1/core/noderemovechildgetnodename.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="noderemovechildgetnodename"> -<metadata> -<title>nodeRemoveChildGetNodeName</title> -<creator>NIST</creator> -<description> - Remove the first child of the second employee - and check the NodeName returned by the - "removeChild(oldChild)" method. The returned node - should have a NodeName equal to "#text" or employeeId depending on whitespace. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-F68D095"/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1734..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="oldChild" type="Node"/> -<var name="removedChild" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<item interface="NodeList" obj="childList" index="0" var="oldChild"/> -<removeChild obj="employeeNode" oldChild="oldChild" var="removedChild"/> -<nodeName obj="removedChild" var="childName"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <assertEquals actual="childName" expected='"employeeId"' id="nowhitespace" ignoreCase="false"/> -<else> - <assertEquals actual="childName" expected='"#text"' id="whitespace" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken b/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken new file mode 100644 index 0000000..33da6b7 --- /dev/null +++ b/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="noderemovechildgetnodename"> +<metadata> +<title>nodeRemoveChildGetNodeName</title> +<creator>NIST</creator> +<description> + Remove the first child of the second employee + and check the NodeName returned by the + "removeChild(oldChild)" method. The returned node + should have a NodeName equal to "#text" or employeeId depending on whitespace. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-F68D095"/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1734..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="oldChild" type="Node"/> +<var name="removedChild" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<item interface="NodeList" obj="childList" index="0" var="oldChild"/> +<removeChild obj="employeeNode" oldChild="oldChild" var="removedChild"/> +<nodeName obj="removedChild" var="childName"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <assertEquals actual="childName" expected='"employeeId"' id="nowhitespace" ignoreCase="false"/> +<else> + <assertEquals actual="childName" expected='"#text"' id="whitespace" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/noderemovechildnode.xml b/test/testcases/tests/level1/core/noderemovechildnode.xml deleted file mode 100644 index 7d83ce3..0000000 --- a/test/testcases/tests/level1/core/noderemovechildnode.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="noderemovechildnode"> -<metadata> -<title>nodeRemoveChildNode</title> -<creator>NIST</creator> -<description> - Retrieve the second employee and remove its first child. - After the removal, the second employee should have five or twelve - children and the first child should now be the child - that used to be at the second position in the list. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1734..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="oldChild" type="Node"/> -<var name="child" type="Node"/> -<var name="childName" type="DOMString"/> -<var name="length" type="int"/> -<var name="removedChild" type="Node"/> -<var name="removedName" type="DOMString"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<item interface="NodeList" obj="childList" index="0" var="oldChild"/> -<removeChild var="removedChild" obj="employeeNode" oldChild="oldChild"/> -<nodeName obj="removedChild" var="removedName"/> -<item interface="NodeList" obj="childList" index="0" var="child"/> -<nodeName obj="child" var="childName"/> -<length interface="NodeList" obj="childList" var="length"/> -<if><equals actual="length" expected="5" ignoreCase="false"/> - <assertEquals actual="removedName" expected='"employeeId"' ignoreCase="false" id="removedNameNoWhitespace"/> - <assertEquals actual="childName" expected='"name"' ignoreCase="false" id="childNameNoWhitespace"/> -<else> - <assertEquals actual="removedName" expected='"#text"' ignoreCase="false" id="removedName"/> - <assertEquals actual="childName" expected='"employeeId"' ignoreCase="false" id="childName"/> - <assertEquals actual="length" expected="12" ignoreCase="false" id="length"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken b/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken new file mode 100644 index 0000000..7d83ce3 --- /dev/null +++ b/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="noderemovechildnode"> +<metadata> +<title>nodeRemoveChildNode</title> +<creator>NIST</creator> +<description> + Retrieve the second employee and remove its first child. + After the removal, the second employee should have five or twelve + children and the first child should now be the child + that used to be at the second position in the list. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-1734..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="oldChild" type="Node"/> +<var name="child" type="Node"/> +<var name="childName" type="DOMString"/> +<var name="length" type="int"/> +<var name="removedChild" type="Node"/> +<var name="removedName" type="DOMString"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<item interface="NodeList" obj="childList" index="0" var="oldChild"/> +<removeChild var="removedChild" obj="employeeNode" oldChild="oldChild"/> +<nodeName obj="removedChild" var="removedName"/> +<item interface="NodeList" obj="childList" index="0" var="child"/> +<nodeName obj="child" var="childName"/> +<length interface="NodeList" obj="childList" var="length"/> +<if><equals actual="length" expected="5" ignoreCase="false"/> + <assertEquals actual="removedName" expected='"employeeId"' ignoreCase="false" id="removedNameNoWhitespace"/> + <assertEquals actual="childName" expected='"name"' ignoreCase="false" id="childNameNoWhitespace"/> +<else> + <assertEquals actual="removedName" expected='"#text"' ignoreCase="false" id="removedName"/> + <assertEquals actual="childName" expected='"employeeId"' ignoreCase="false" id="childName"/> + <assertEquals actual="length" expected="12" ignoreCase="false" id="length"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml b/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml deleted file mode 100644 index 87a05eb..0000000 --- a/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodereplacechildnewchildexists"> -<metadata> -<title>nodeReplaceChildNewChildExists</title> -<creator>NIST</creator> -<description> - Retrieve the second employee and replace its TWELFTH - child(address) with its SECOND child(employeeId). After the - replacement the second child should now be the one that used - to be at the third position and the TWELFTH child should be the - one that used to be at the SECOND position. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7858..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="oldChild" type="Node" isNull="true"/> -<var name="newChild" type="Node" isNull="true"/> -<var name="childName" type="DOMString"/> -<var name="childNode" type="Node"/> -<var name="length" type="int"/> -<var name="actual" type="List"/> -<var name="expected" type="List"/> -<var name="expectedWithoutWhitespace" type="List"> -<member>"name"</member> -<member>"position"</member> -<member>"salary"</member> -<member>"gender"</member> -<member>"employeeId"</member> -</var> -<var name="expectedWithWhitespace" type="List"> -<member>"#text"</member> -<member>"#text"</member> -<member>"name"</member> -<member>"#text"</member> -<member>"position"</member> -<member>"#text"</member> -<member>"salary"</member> -<member>"#text"</member> -<member>"gender"</member> -<member>"#text"</member> -<member>"employeeId"</member> -<member>"#text"</member> -</var> -<var name="replacedChild" type="Node"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<if><equals actual="length" expected="13" ignoreCase="false"/> - <item interface="NodeList" obj="childList" index="1" var="newChild"/> - <item interface="NodeList" obj="childList" index="11" var="oldChild"/> - <assign var="expected" value="expectedWithWhitespace"/> -<else> - <item interface="NodeList" obj="childList" index="0" var="newChild"/> - <item interface="NodeList" obj="childList" index="5" var="oldChild"/> - <assign var="expected" value="expectedWithoutWhitespace"/> -</else> -</if> -<replaceChild var="replacedChild" obj="employeeNode" newChild="newChild" oldChild="oldChild"/> -<assertSame actual="replacedChild" expected="oldChild" id="return_value_same"/> -<for-each collection="childList" member="childNode"> - <nodeName var="childName" obj="childNode"/> - <append collection="actual" item="childName"/> -</for-each> -<assertEquals actual="actual" expected="expected" id="childNames" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken b/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken new file mode 100644 index 0000000..87a05eb --- /dev/null +++ b/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodereplacechildnewchildexists"> +<metadata> +<title>nodeReplaceChildNewChildExists</title> +<creator>NIST</creator> +<description> + Retrieve the second employee and replace its TWELFTH + child(address) with its SECOND child(employeeId). After the + replacement the second child should now be the one that used + to be at the third position and the TWELFTH child should be the + one that used to be at the SECOND position. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7858..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="oldChild" type="Node" isNull="true"/> +<var name="newChild" type="Node" isNull="true"/> +<var name="childName" type="DOMString"/> +<var name="childNode" type="Node"/> +<var name="length" type="int"/> +<var name="actual" type="List"/> +<var name="expected" type="List"/> +<var name="expectedWithoutWhitespace" type="List"> +<member>"name"</member> +<member>"position"</member> +<member>"salary"</member> +<member>"gender"</member> +<member>"employeeId"</member> +</var> +<var name="expectedWithWhitespace" type="List"> +<member>"#text"</member> +<member>"#text"</member> +<member>"name"</member> +<member>"#text"</member> +<member>"position"</member> +<member>"#text"</member> +<member>"salary"</member> +<member>"#text"</member> +<member>"gender"</member> +<member>"#text"</member> +<member>"employeeId"</member> +<member>"#text"</member> +</var> +<var name="replacedChild" type="Node"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname='"employee"' var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<if><equals actual="length" expected="13" ignoreCase="false"/> + <item interface="NodeList" obj="childList" index="1" var="newChild"/> + <item interface="NodeList" obj="childList" index="11" var="oldChild"/> + <assign var="expected" value="expectedWithWhitespace"/> +<else> + <item interface="NodeList" obj="childList" index="0" var="newChild"/> + <item interface="NodeList" obj="childList" index="5" var="oldChild"/> + <assign var="expected" value="expectedWithoutWhitespace"/> +</else> +</if> +<replaceChild var="replacedChild" obj="employeeNode" newChild="newChild" oldChild="oldChild"/> +<assertSame actual="replacedChild" expected="oldChild" id="return_value_same"/> +<for-each collection="childList" member="childNode"> + <nodeName var="childName" obj="childNode"/> + <append collection="actual" item="childName"/> +</for-each> +<assertEquals actual="actual" expected="expected" id="childNames" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/core/nodereplacechildnodename.xml b/test/testcases/tests/level1/core/nodereplacechildnodename.xml deleted file mode 100644 index 174f104..0000000 --- a/test/testcases/tests/level1/core/nodereplacechildnodename.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE test SYSTEM "dom1.dtd"> - -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodereplacechildnodename"> -<metadata> -<title>nodeReplaceChildNodeName</title> -<creator>NIST</creator> -<description> - Replace the second Element of the second employee with - a newly created node Element and check the NodeName - returned by the "replaceChild(newChild,oldChild)" - method. The returned node should have a NodeName equal - to "employeeId". -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-08-17</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-F68D095"/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7858..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="elementList" type="NodeList"/> -<var name="employeeNode" type="Node"/> -<var name="childList" type="NodeList"/> -<var name="oldChild" type="Node"/> -<var name="newChild" type="Node"/> -<var name="replacedNode" type="Node"/> -<var name="length" type="int"/> -<var name="childName" type="DOMString"/> -<load var="doc" href="staff" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> -<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> -<childNodes obj="employeeNode" var="childList"/> -<length var="length" obj="childList" interface="NodeList"/> -<item interface="NodeList" obj="childList" index="1" var="oldChild"/> -<createElement obj="doc" tagName=""newChild"" var="newChild"/> -<replaceChild obj="employeeNode" newChild="newChild" oldChild="oldChild" var="replacedNode"/> -<nodeName obj="replacedNode" var="childName"/> -<if><equals actual="length" expected="6" ignoreCase="false"/> - <assertEquals actual="childName" expected='"name"' id="nowhitespace" ignoreCase="false"/> -<else> - <assertEquals actual="childName" expected='"employeeId"' id="whitespace" ignoreCase="false"/> -</else> -</if> -</test> diff --git a/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken b/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken new file mode 100644 index 0000000..174f104 --- /dev/null +++ b/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE test SYSTEM "dom1.dtd"> + +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="nodereplacechildnodename"> +<metadata> +<title>nodeReplaceChildNodeName</title> +<creator>NIST</creator> +<description> + Replace the second Element of the second employee with + a newly created node Element and check the NodeName + returned by the "replaceChild(newChild,oldChild)" + method. The returned node should have a NodeName equal + to "employeeId". +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-08-17</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-F68D095"/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#ID-7858..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="elementList" type="NodeList"/> +<var name="employeeNode" type="Node"/> +<var name="childList" type="NodeList"/> +<var name="oldChild" type="Node"/> +<var name="newChild" type="Node"/> +<var name="replacedNode" type="Node"/> +<var name="length" type="int"/> +<var name="childName" type="DOMString"/> +<load var="doc" href="staff" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" tagname=""employee"" var="elementList"/> +<item interface="NodeList" obj="elementList" index="1" var="employeeNode"/> +<childNodes obj="employeeNode" var="childList"/> +<length var="length" obj="childList" interface="NodeList"/> +<item interface="NodeList" obj="childList" index="1" var="oldChild"/> +<createElement obj="doc" tagName=""newChild"" var="newChild"/> +<replaceChild obj="employeeNode" newChild="newChild" oldChild="oldChild" var="replacedNode"/> +<nodeName obj="replacedNode" var="childName"/> +<if><equals actual="length" expected="6" ignoreCase="false"/> + <assertEquals actual="childName" expected='"name"' id="nowhitespace" ignoreCase="false"/> +<else> + <assertEquals actual="childName" expected='"employeeId"' id="whitespace" ignoreCase="false"/> +</else> +</if> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFormElement01.xml b/test/testcases/tests/level1/html/HTMLFormElement01.xml deleted file mode 100644 index 057fac5..0000000 --- a/test/testcases/tests/level1/html/HTMLFormElement01.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFormElement01"> -<metadata> -<title>HTMLFormElement01</title> -<creator>NIST</creator> -<description> - The elements attribute specifies a collection of all control element - in the form. - - Retrieve the elements attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7672..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="elementnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="velements" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="form" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="elementnodeList"/> -<length interface="HTMLCollection" obj="elementnodeList" var="velements"/> -<assertEquals actual="velements" expected="3" id="elementsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken b/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken new file mode 100644 index 0000000..057fac5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFormElement01"> +<metadata> +<title>HTMLFormElement01</title> +<creator>NIST</creator> +<description> + The elements attribute specifies a collection of all control element + in the form. + + Retrieve the elements attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7672..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="elementnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="velements" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="form" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="elementnodeList"/> +<length interface="HTMLCollection" obj="elementnodeList" var="velements"/> +<assertEquals actual="velements" expected="3" id="elementsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFormElement02.xml b/test/testcases/tests/level1/html/HTMLFormElement02.xml deleted file mode 100644 index 06abf8d..0000000 --- a/test/testcases/tests/level1/html/HTMLFormElement02.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFormElement02"> -<metadata> -<title>HTMLFormElement02</title> -<creator>NIST</creator> -<description> - The length attribute specifies the number of form controls - in the form. - - Retrieve the length attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4000..."/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTML-HTMLFormElement-length"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlength" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="form" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<length interface="HTMLFormElement" obj="testNode" var="vlength"/> -<assertEquals actual="vlength" expected="3" id="lengthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken b/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken new file mode 100644 index 0000000..06abf8d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFormElement02"> +<metadata> +<title>HTMLFormElement02</title> +<creator>NIST</creator> +<description> + The length attribute specifies the number of form controls + in the form. + + Retrieve the length attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4000..."/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTML-HTMLFormElement-length"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlength" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="form" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<length interface="HTMLFormElement" obj="testNode" var="vlength"/> +<assertEquals actual="vlength" expected="3" id="lengthLink" ignoreCase="false"/> +</test> ----------------------------------------------------------------------- Summary of changes: test/DOMTSHandler.pm | 4 ++-- ... documentcreatedocumentfragment.xml.int-broken} | 0 ..._documentcreatedocumentfragment.xml.int-broken} | 0 ...y.xml => hc_nodechildnodesempty.xml.int-broken} | 0 ...se.xml => hc_nodeclonenodefalse.xml.int-broken} | 0 ...ml => hc_nodelistindexequalzero.xml.int-broken} | 0 ...ml => hc_nodelistindexgetlength.xml.int-broken} | 0 ...delistindexgetlengthofemptylist.xml.int-broken} | 0 ...ml => hc_nodelistreturnlastitem.xml.int-broken} | 0 ... hc_textparseintolistofelements.xml.int-broken} | 0 ...l => namednodemapchildnoderange.xml.int-broken} | 0 ...ml => namednodemapnumberofnodes.xml.int-broken} | 0 ...ml => nodechildnodesappendchild.xml.int-broken} | 0 ...false.xml => nodeclonenodefalse.xml.int-broken} | 0 ...detrue.xml => nodeclonenodetrue.xml.int-broken} | 0 ...tbefore.xml => nodeinsertbefore.xml.int-broken} | 0 ... nodeinsertbeforenewchildexists.xml.int-broken} | 0 ...h.xml => nodelistindexgetlength.xml.int-broken} | 0 ...ero.xml => nodelistindexnotzero.xml.int-broken} | 0 ....xml => nodelistreturnfirstitem.xml.int-broken} | 0 ...m.xml => nodelistreturnlastitem.xml.int-broken} | 0 ...ist.xml => nodelisttraverselist.xml.int-broken} | 0 ...l => noderemovechildgetnodename.xml.int-broken} | 0 ...node.xml => noderemovechildnode.xml.int-broken} | 0 ... nodereplacechildnewchildexists.xml.int-broken} | 0 ...xml => nodereplacechildnodename.xml.int-broken} | 0 ...ment01.xml => HTMLFormElement01.xml.int-broken} | 0 ...ment02.xml => HTMLFormElement02.xml.int-broken} | 0 28 files changed, 2 insertions(+), 2 deletions(-) rename test/testcases/tests/level1/core/{documentcreatedocumentfragment.xml => documentcreatedocumentfragment.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_documentcreatedocumentfragment.xml => hc_documentcreatedocumentfragment.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodechildnodesempty.xml => hc_nodechildnodesempty.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodeclonenodefalse.xml => hc_nodeclonenodefalse.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodelistindexequalzero.xml => hc_nodelistindexequalzero.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodelistindexgetlength.xml => hc_nodelistindexgetlength.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodelistindexgetlengthofemptylist.xml => hc_nodelistindexgetlengthofemptylist.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_nodelistreturnlastitem.xml => hc_nodelistreturnlastitem.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{hc_textparseintolistofelements.xml => hc_textparseintolistofelements.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{namednodemapchildnoderange.xml => namednodemapchildnoderange.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{namednodemapnumberofnodes.xml => namednodemapnumberofnodes.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodechildnodesappendchild.xml => nodechildnodesappendchild.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodeclonenodefalse.xml => nodeclonenodefalse.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodeclonenodetrue.xml => nodeclonenodetrue.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodeinsertbefore.xml => nodeinsertbefore.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodeinsertbeforenewchildexists.xml => nodeinsertbeforenewchildexists.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodelistindexgetlength.xml => nodelistindexgetlength.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodelistindexnotzero.xml => nodelistindexnotzero.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodelistreturnfirstitem.xml => nodelistreturnfirstitem.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodelistreturnlastitem.xml => nodelistreturnlastitem.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodelisttraverselist.xml => nodelisttraverselist.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{noderemovechildgetnodename.xml => noderemovechildgetnodename.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{noderemovechildnode.xml => noderemovechildnode.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodereplacechildnewchildexists.xml => nodereplacechildnewchildexists.xml.int-broken} (100%) rename test/testcases/tests/level1/core/{nodereplacechildnodename.xml => nodereplacechildnodename.xml.int-broken} (100%) rename test/testcases/tests/level1/html/{HTMLFormElement01.xml => HTMLFormElement01.xml.int-broken} (100%) rename test/testcases/tests/level1/html/{HTMLFormElement02.xml => HTMLFormElement02.xml.int-broken} (100%) diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 890a8ff..5d11b62 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -30,8 +30,8 @@ our %native_interface = ( our %special_type = ( # Some of the type are not defined now! boolean => "bool ", - int => "unsigned long ", - "unsigned long" => "unsigned long ", + int => "int32_t ", + "unsigned long" => "uint32_t ", DOMString => "dom_string *", List => "list *", Collection => "list *", diff --git a/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml b/test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/documentcreatedocumentfragment.xml rename to test/testcases/tests/level1/core/documentcreatedocumentfragment.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml b/test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml rename to test/testcases/tests/level1/core/hc_documentcreatedocumentfragment.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml b/test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodechildnodesempty.xml rename to test/testcases/tests/level1/core/hc_nodechildnodesempty.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml b/test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml rename to test/testcases/tests/level1/core/hc_nodeclonenodefalse.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml b/test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml rename to test/testcases/tests/level1/core/hc_nodelistindexequalzero.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml b/test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml rename to test/testcases/tests/level1/core/hc_nodelistindexgetlength.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml b/test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml rename to test/testcases/tests/level1/core/hc_nodelistindexgetlengthofemptylist.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml b/test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml rename to test/testcases/tests/level1/core/hc_nodelistreturnlastitem.xml.int-broken diff --git a/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml b/test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/hc_textparseintolistofelements.xml rename to test/testcases/tests/level1/core/hc_textparseintolistofelements.xml.int-broken diff --git a/test/testcases/tests/level1/core/namednodemapchildnoderange.xml b/test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/namednodemapchildnoderange.xml rename to test/testcases/tests/level1/core/namednodemapchildnoderange.xml.int-broken diff --git a/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml b/test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/namednodemapnumberofnodes.xml rename to test/testcases/tests/level1/core/namednodemapnumberofnodes.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodechildnodesappendchild.xml b/test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodechildnodesappendchild.xml rename to test/testcases/tests/level1/core/nodechildnodesappendchild.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodeclonenodefalse.xml b/test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodeclonenodefalse.xml rename to test/testcases/tests/level1/core/nodeclonenodefalse.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodeclonenodetrue.xml b/test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodeclonenodetrue.xml rename to test/testcases/tests/level1/core/nodeclonenodetrue.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodeinsertbefore.xml b/test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodeinsertbefore.xml rename to test/testcases/tests/level1/core/nodeinsertbefore.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml b/test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml rename to test/testcases/tests/level1/core/nodeinsertbeforenewchildexists.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodelistindexgetlength.xml b/test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodelistindexgetlength.xml rename to test/testcases/tests/level1/core/nodelistindexgetlength.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodelistindexnotzero.xml b/test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodelistindexnotzero.xml rename to test/testcases/tests/level1/core/nodelistindexnotzero.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml b/test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodelistreturnfirstitem.xml rename to test/testcases/tests/level1/core/nodelistreturnfirstitem.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodelistreturnlastitem.xml b/test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodelistreturnlastitem.xml rename to test/testcases/tests/level1/core/nodelistreturnlastitem.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodelisttraverselist.xml b/test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodelisttraverselist.xml rename to test/testcases/tests/level1/core/nodelisttraverselist.xml.int-broken diff --git a/test/testcases/tests/level1/core/noderemovechildgetnodename.xml b/test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/noderemovechildgetnodename.xml rename to test/testcases/tests/level1/core/noderemovechildgetnodename.xml.int-broken diff --git a/test/testcases/tests/level1/core/noderemovechildnode.xml b/test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/noderemovechildnode.xml rename to test/testcases/tests/level1/core/noderemovechildnode.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml b/test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml rename to test/testcases/tests/level1/core/nodereplacechildnewchildexists.xml.int-broken diff --git a/test/testcases/tests/level1/core/nodereplacechildnodename.xml b/test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/core/nodereplacechildnodename.xml rename to test/testcases/tests/level1/core/nodereplacechildnodename.xml.int-broken diff --git a/test/testcases/tests/level1/html/HTMLFormElement01.xml b/test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/html/HTMLFormElement01.xml rename to test/testcases/tests/level1/html/HTMLFormElement01.xml.int-broken diff --git a/test/testcases/tests/level1/html/HTMLFormElement02.xml b/test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken similarity index 100% rename from test/testcases/tests/level1/html/HTMLFormElement02.xml rename to test/testcases/tests/level1/html/HTMLFormElement02.xml.int-broken -- Document Object Model library

10 years, 6 months

1
0
0 / 0

libdom: branch master updated. a77488bab4732c30044b04e97d13707e03825bdf

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/a77488bab4732c30044b04... ...commit http://git.netsurf-browser.org/libdom.git/commit/a77488bab4732c30044b04e9... ...tree http://git.netsurf-browser.org/libdom.git/tree/a77488bab4732c30044b04e97d... The branch, master has been updated via a77488bab4732c30044b04e97d13707e03825bdf (commit) from c733e0fbd053ffa80b83839c4114a2a28b3ed2ec (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/libdom.git/commitdiff/a77488bab4732c30044b... commit a77488bab4732c30044b04e97d13707e03825bdf Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> unsigned long -> uint32_t, signed long and long -> int32_t, plus collateral fixes. Test suite does not pass diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 1077bc9..8cf1193 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -214,7 +214,7 @@ expat_xmlparser_cdata_handler(void *_parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -230,7 +230,7 @@ expat_xmlparser_cdata_handler(void *_parser, if (ins_cdata != NULL) dom_node_unref(ins_cdata); - /* No longer interested in cdata section */ + /* No int32_ter interested in cdata section */ dom_node_unref(cdata); } @@ -309,7 +309,7 @@ expat_xmlparser_comment_handler(void *_parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append comment to parent */ @@ -326,7 +326,7 @@ expat_xmlparser_comment_handler(void *_parser, if (ins_comment != NULL) dom_node_unref((struct dom_node *) ins_comment); - /* No longer interested in comment */ + /* No int32_ter interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -369,7 +369,7 @@ expat_xmlparser_start_doctype_decl_handler(void *_parser, if (ins_doctype != NULL) dom_node_unref((struct dom_node *) ins_doctype); - /* No longer interested in doctype */ + /* No int32_ter interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c index 1c2442a..ddca1d4 100644 --- a/bindings/xml/libxml_xmlparser.c +++ b/bindings/xml/libxml_xmlparser.c @@ -672,7 +672,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need tag name */ + /* No int32_ter need tag name */ dom_string_unref(tag_name); } else { /* Namespace */ @@ -727,7 +727,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need namespace / qname */ + /* No int32_ter need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -764,7 +764,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No longer need attribute name */ + /* No int32_ter need attribute name */ dom_string_unref(name); } else { /* Attribute has namespace */ @@ -819,7 +819,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need namespace / qname */ + /* No int32_ter need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -865,7 +865,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, if (prev_attr != NULL && prev_attr != attr) dom_node_unref((struct dom_node *) prev_attr); - /* We're no longer interested in the attribute node */ + /* We're no int32_ter interested in the attribute node */ dom_node_unref((struct dom_node *) attr); } @@ -890,13 +890,13 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No longer interested in element node */ + /* No int32_ter interested in element node */ dom_node_unref((struct dom_node *) el); return; cleanup: - /* No longer want node (any attributes attached to it + /* No int32_ter want node (any attributes attached to it * will be cleaned up with it) */ dom_node_unref((struct dom_node *) el); @@ -935,7 +935,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append text node to parent */ @@ -960,7 +960,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer interested in text node */ + /* No int32_ter interested in text node */ dom_node_unref((struct dom_node *) text); } @@ -996,7 +996,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -1021,7 +1021,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No longer interested in cdata section */ + /* No int32_ter interested in cdata section */ dom_node_unref((struct dom_node *) cdata); } @@ -1059,7 +1059,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No longer need name */ + /* No int32_ter need name */ dom_string_unref(name); /* Mirror subtree (reference value) */ @@ -1089,7 +1089,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No longer interested in entity reference */ + /* No int32_ter interested in entity reference */ dom_node_unref((struct dom_node *) entity); } @@ -1133,7 +1133,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append comment to parent */ @@ -1158,7 +1158,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer interested in comment */ + /* No int32_ter interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -1220,7 +1220,7 @@ void xml_parser_add_document_type(dom_xml_parser *parser, return; } - /* No longer interested in doctype */ + /* No int32_ter interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/include/dom/core/attr.h b/include/dom/core/attr.h index 69612f7..1ae5be5 100644 --- a/include/dom/core/attr.h +++ b/include/dom/core/attr.h @@ -114,7 +114,7 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * Following are our implementation specific APIs. * * These APIs are defined for the purpose that there are some attributes in - * HTML and other DOM module whose type is not DOMString, but unsigned long or + * HTML and other DOM module whose type is not DOMString, but uint32_t or * boolean, for those types of attributes, clients should call one of the * following APIs to set it. * @@ -135,8 +135,8 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * dom_attr_get_* functions. */ dom_attr_type dom_attr_get_type(dom_attr *a); -dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value); -dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value); +dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value); +dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value); dom_exception dom_attr_get_short(dom_attr *a, unsigned short *value); dom_exception dom_attr_set_short(dom_attr *a, unsigned short value); dom_exception dom_attr_get_bool(dom_attr *a, bool *value); diff --git a/include/dom/core/characterdata.h b/include/dom/core/characterdata.h index 174be89..6b894fb 100644 --- a/include/dom/core/characterdata.h +++ b/include/dom/core/characterdata.h @@ -25,22 +25,22 @@ typedef struct dom_characterdata_vtable { dom_string *data); dom_exception (*dom_characterdata_get_length)( struct dom_characterdata *cdata, - unsigned long *length); + uint32_t *length); dom_exception (*dom_characterdata_substring_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data); dom_exception (*dom_characterdata_append_data)( struct dom_characterdata *cdata, dom_string *data); dom_exception (*dom_characterdata_insert_data)( struct dom_characterdata *cdata, - unsigned long offset, dom_string *data); + uint32_t offset, dom_string *data); dom_exception (*dom_characterdata_delete_data)( struct dom_characterdata *cdata, - unsigned long offset, unsigned long count); + uint32_t offset, uint32_t count); dom_exception (*dom_characterdata_replace_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data); } dom_characterdata_vtable; @@ -63,17 +63,17 @@ static inline dom_exception dom_characterdata_set_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_get_length( - struct dom_characterdata *cdata, unsigned long *length) + struct dom_characterdata *cdata, uint32_t *length) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_get_length(cdata, length); } #define dom_characterdata_get_length(c, l) dom_characterdata_get_length( \ - (struct dom_characterdata *) (c), (unsigned long *) (l)) + (struct dom_characterdata *) (c), (uint32_t *) (l)) static inline dom_exception dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_substring_data(cdata, offset, count, @@ -81,8 +81,8 @@ static inline dom_exception dom_characterdata_substring_data( } #define dom_characterdata_substring_data(c, o, ct, d) \ dom_characterdata_substring_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct), (d)) static inline dom_exception dom_characterdata_append_data( struct dom_characterdata *cdata, dom_string *data) @@ -94,29 +94,29 @@ static inline dom_exception dom_characterdata_append_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_insert_data( - struct dom_characterdata *cdata, unsigned long offset, + struct dom_characterdata *cdata, uint32_t offset, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_insert_data(cdata, offset, data); } #define dom_characterdata_insert_data(c, o, d) dom_characterdata_insert_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), (d)) static inline dom_exception dom_characterdata_delete_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_delete_data(cdata, offset, count); } #define dom_characterdata_delete_data(c, o, ct) dom_characterdata_delete_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct)) static inline dom_exception dom_characterdata_replace_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_replace_data(cdata, offset, count, @@ -124,7 +124,7 @@ static inline dom_exception dom_characterdata_replace_data( } #define dom_characterdata_replace_data(c, o, ct, d) \ dom_characterdata_replace_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o),\ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o),\ + (uint32_t) (ct), (d)) #endif diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h index 04c7f18..67160d1 100644 --- a/include/dom/core/exceptions.h +++ b/include/dom/core/exceptions.h @@ -12,7 +12,7 @@ * Class of a DOM exception. * * The top 16 bits of a dom_exception are a bitfield - * indicating which class the exception belongs to. + * indicating which class the exception beint32_ts to. */ typedef enum { DOM_EXCEPTION_CLASS_NORMAL = 0, diff --git a/include/dom/core/namednodemap.h b/include/dom/core/namednodemap.h index fc5e886..f44e553 100644 --- a/include/dom/core/namednodemap.h +++ b/include/dom/core/namednodemap.h @@ -19,7 +19,7 @@ void dom_namednodemap_ref(struct dom_namednodemap *map); void dom_namednodemap_unref(struct dom_namednodemap *map); dom_exception dom_namednodemap_get_length(struct dom_namednodemap *map, - unsigned long *length); + uint32_t *length); dom_exception _dom_namednodemap_get_named_item(struct dom_namednodemap *map, dom_string *name, struct dom_node **node); @@ -47,10 +47,10 @@ dom_exception _dom_namednodemap_remove_named_item( dom_exception _dom_namednodemap_item(struct dom_namednodemap *map, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_namednodemap_item(m, i, n) _dom_namednodemap_item( \ - (dom_namednodemap *) (m), (unsigned long) (i), \ + (dom_namednodemap *) (m), (uint32_t) (i), \ (dom_node **) (n)) diff --git a/include/dom/core/nodelist.h b/include/dom/core/nodelist.h index 2aad313..369a42b 100644 --- a/include/dom/core/nodelist.h +++ b/include/dom/core/nodelist.h @@ -18,11 +18,11 @@ void dom_nodelist_ref(struct dom_nodelist *list); void dom_nodelist_unref(struct dom_nodelist *list); dom_exception dom_nodelist_get_length(struct dom_nodelist *list, - unsigned long *length); + uint32_t *length); dom_exception _dom_nodelist_item(struct dom_nodelist *list, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_nodelist_item(l, i, n) _dom_nodelist_item((dom_nodelist *) (l), \ - (unsigned long) (i), (dom_node **) (n)) + (uint32_t) (i), (dom_node **) (n)) #endif diff --git a/include/dom/core/text.h b/include/dom/core/text.h index 1750aec..7bafc8c 100644 --- a/include/dom/core/text.h +++ b/include/dom/core/text.h @@ -21,7 +21,7 @@ typedef struct dom_text_vtable { struct dom_characterdata_vtable base; dom_exception (*dom_text_split_text)(struct dom_text *text, - unsigned long offset, struct dom_text **result); + uint32_t offset, struct dom_text **result); dom_exception (*dom_text_get_is_element_content_whitespace)( struct dom_text *text, bool *result); dom_exception (*dom_text_get_whole_text)(struct dom_text *text, @@ -31,13 +31,13 @@ typedef struct dom_text_vtable { } dom_text_vtable; static inline dom_exception dom_text_split_text(struct dom_text *text, - unsigned long offset, struct dom_text **result) + uint32_t offset, struct dom_text **result) { return ((dom_text_vtable *) ((dom_node *) text)->vtable)-> dom_text_split_text(text, offset, result); } #define dom_text_split_text(t, o, r) dom_text_split_text((dom_text *) (t), \ - (unsigned long) (o), (dom_text **) (r)) + (uint32_t) (o), (dom_text **) (r)) static inline dom_exception dom_text_get_is_element_content_whitespace( struct dom_text *text, bool *result) diff --git a/include/dom/events/mouse_event.h b/include/dom/events/mouse_event.h index 8212c72..9cf84bb 100644 --- a/include/dom/events/mouse_event.h +++ b/include/dom/events/mouse_event.h @@ -18,24 +18,24 @@ struct dom_abstract_view; typedef struct dom_mouse_event dom_mouse_event; dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_screen_x(e, x) _dom_mouse_event_get_screen_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_screen_y(e, y) _dom_mouse_event_get_screen_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_client_x(e, x) _dom_mouse_event_get_client_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_client_y(e, y) _dom_mouse_event_get_client_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt, bool *key); @@ -76,32 +76,32 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, bool ctrl, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \ shift, meta, button, et) \ _dom_mouse_event_init((dom_mouse_event *) (e), \ (dom_string *) (t), (bool) (b), (bool) (c),\ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy), (bool) (ctrl),\ (bool) (alt), (bool) (shift), (bool) (meta), \ (unsigned short) (button), (dom_event_target *) (et)) dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail, long screen_x, long screen_y, long client_x, - long client_y, bool ctrl, bool alt, bool shift, bool meta, + int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x, + int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt,\ shift, meta, button, et) \ _dom_mouse_event_init_ns((dom_mouse_event *) (e), \ (dom_string *) (n), (dom_string *) (t),\ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx),\ - (long) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx),\ + (int32_t) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ (bool) (meta), (unsigned short) (button),\ (dom_event_target *) (et)) diff --git a/include/dom/events/mouse_multi_wheel_event.h b/include/dom/events/mouse_multi_wheel_event.h index 8d2a4eb..d8115ad 100644 --- a/include/dom/events/mouse_multi_wheel_event.h +++ b/include/dom/events/mouse_multi_wheel_event.h @@ -18,39 +18,39 @@ struct dom_abstract_view; typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event; dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( - dom_mouse_multi_wheel_event *evt, long *x); + dom_mouse_multi_wheel_event *evt, int32_t *x); #define dom_mouse_multi_wheel_event_get_wheel_delta_x(e, x) \ _dom_mouse_multi_wheel_event_get_wheel_delta_x( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (x)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( - dom_mouse_multi_wheel_event *evt, long *y); + dom_mouse_multi_wheel_event *evt, int32_t *y); #define dom_mouse_multi_wheel_event_get_wheel_delta_y(e, y) \ _dom_mouse_multi_wheel_event_get_wheel_delta_y( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (y)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( - dom_mouse_multi_wheel_event *evt, long *z); + dom_mouse_multi_wheel_event *evt, int32_t *z); #define dom_mouse_multi_wheel_event_get_wheel_delta_z(e, z) \ _dom_mouse_multi_wheel_event_get_wheel_delta_z( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (z)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (z)) dom_exception _dom_mouse_multi_wheel_event_init_ns( dom_mouse_multi_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta_x, - long wheel_delta_y, long wheel_delta_z); + dom_string *modifier_list, int32_t wheel_delta_x, + int32_t wheel_delta_y, int32_t wheel_delta_z); #define dom_mouse_multi_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, x, y, z) \ _dom_mouse_multi_wheel_event_init_ns( \ (dom_mouse_multi_wheel_event *) (e), (dom_string *) (n),\ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (x), (long) (y), (long) (z)) + (dom_string *) (ml), (int32_t) (x), (int32_t) (y), (int32_t) (z)) #endif diff --git a/include/dom/events/mouse_wheel_event.h b/include/dom/events/mouse_wheel_event.h index 34f5e75..f753b68 100644 --- a/include/dom/events/mouse_wheel_event.h +++ b/include/dom/events/mouse_wheel_event.h @@ -17,26 +17,26 @@ struct dom_abstract_view; typedef struct dom_mouse_wheel_event dom_mouse_wheel_event; dom_exception _dom_mouse_wheel_event_get_wheel_delta( - dom_mouse_wheel_event *evt, long *d); + dom_mouse_wheel_event *evt, int32_t *d); #define dom_mouse_wheel_event_get_wheel_delta(e, d) \ _dom_mouse_wheel_event_get_wheel_delta( \ - (dom_mouse_wheel_event *) (e), (long *) (d)) + (dom_mouse_wheel_event *) (e), (int32_t *) (d)) dom_exception _dom_mouse_wheel_event_init_ns( dom_mouse_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta); + dom_string *modifier_list, int32_t wheel_delta); #define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, dt) \ _dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \ (dom_string *) (n), (dom_string *) (t), \ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (dt)) + (dom_string *) (ml), (int32_t) (dt)) #endif diff --git a/include/dom/events/ui_event.h b/include/dom/events/ui_event.h index da321e5..0979a3b 100644 --- a/include/dom/events/ui_event.h +++ b/include/dom/events/ui_event.h @@ -22,24 +22,24 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt, (dom_ui_event *) (e), (struct dom_abstract_view **) (v)) dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, - long *detail); + int32_t *detail); #define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail(\ - (dom_ui_event *) (e), (long *) (d)) + (dom_ui_event *) (e), (int32_t *) (d)) dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init( \ (dom_ui_event *) (e), (dom_string *) (t), (bool) (b), \ - (bool) (c), (struct dom_abstract_view *) (v), (long) (d)) + (bool) (c), (struct dom_abstract_view *) (v), (int32_t) (d)) dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \ (dom_ui_event *) (e), (dom_string *) (n), \ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d)) + (struct dom_abstract_view *) (v), (int32_t) (d)) #endif diff --git a/include/dom/html/html_button_element.h b/include/dom/html/html_button_element.h index 9bbd562..155d125 100644 --- a/include/dom/html/html_button_element.h +++ b/include/dom/html/html_button_element.h @@ -37,10 +37,10 @@ dom_exception dom_html_button_element_set_name( dom_html_button_element *button, dom_string *name); dom_exception dom_html_button_element_get_tab_index( - dom_html_button_element *button, long *tab_index); + dom_html_button_element *button, int32_t *tab_index); dom_exception dom_html_button_element_set_tab_index( - dom_html_button_element *button, unsigned long tab_index); + dom_html_button_element *button, uint32_t tab_index); dom_exception dom_html_button_element_get_type( dom_html_button_element *button, dom_string **type); diff --git a/include/dom/html/html_collection.h b/include/dom/html/html_collection.h index 7322ea8..9521f94 100644 --- a/include/dom/html/html_collection.h +++ b/include/dom/html/html_collection.h @@ -16,9 +16,9 @@ struct dom_node; typedef struct dom_html_collection dom_html_collection; dom_exception dom_html_collection_get_length(dom_html_collection *col, - unsigned long *len); + uint32_t *len); dom_exception dom_html_collection_item(dom_html_collection *col, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); dom_exception dom_html_collection_named_item(dom_html_collection *col, dom_string *name, struct dom_node **node); diff --git a/include/dom/html/html_form_element.h b/include/dom/html/html_form_element.h index c4ee1d8..81637a3 100644 --- a/include/dom/html/html_form_element.h +++ b/include/dom/html/html_form_element.h @@ -18,7 +18,7 @@ typedef struct dom_html_form_element dom_html_form_element; dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, struct dom_html_collection **col); dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, - unsigned long *len); + uint32_t *len); dom_exception dom_html_form_element_get_accept_charset( dom_html_form_element *ele, dom_string **accept_charset); diff --git a/include/dom/html/html_input_element.h b/include/dom/html/html_input_element.h index 6d87bd9..eb6aecd 100644 --- a/include/dom/html/html_input_element.h +++ b/include/dom/html/html_input_element.h @@ -67,10 +67,10 @@ dom_exception dom_html_input_element_set_disabled( dom_html_input_element *input, bool disabled); dom_exception dom_html_input_element_get_max_length( - dom_html_input_element *input, long *max_length); + dom_html_input_element *input, int32_t *max_length); dom_exception dom_html_input_element_set_max_length( - dom_html_input_element *input, unsigned long max_length); + dom_html_input_element *input, uint32_t max_length); dom_exception dom_html_input_element_get_name( dom_html_input_element *input, dom_string **name); @@ -97,10 +97,10 @@ dom_exception dom_html_input_element_set_src( dom_html_input_element *input, dom_string *src); dom_exception dom_html_input_element_get_tab_index( - dom_html_input_element *input, long *tab_index); + dom_html_input_element *input, int32_t *tab_index); dom_exception dom_html_input_element_set_tab_index( - dom_html_input_element *input, unsigned long tab_index); + dom_html_input_element *input, uint32_t tab_index); dom_exception dom_html_input_element_get_type( dom_html_input_element *input, dom_string **type); diff --git a/include/dom/html/html_options_collection.h b/include/dom/html/html_options_collection.h index d11221a..5825fb0 100644 --- a/include/dom/html/html_options_collection.h +++ b/include/dom/html/html_options_collection.h @@ -16,11 +16,11 @@ struct dom_node; typedef struct dom_html_options_collection dom_html_options_collection; dom_exception dom_html_options_collection_get_length( - dom_html_options_collection *col, unsigned long *len); + dom_html_options_collection *col, uint32_t *len); dom_exception dom_html_options_collection_set_length( - dom_html_options_collection *col, unsigned long len); + dom_html_options_collection *col, uint32_t len); dom_exception dom_html_options_collection_item( - dom_html_options_collection *col, unsigned long index, + dom_html_options_collection *col, uint32_t index, struct dom_node **node); dom_exception dom_html_options_collection_named_item( dom_html_options_collection *col, dom_string *name, diff --git a/include/dom/html/html_select_element.h b/include/dom/html/html_select_element.h index 10c002a..a052be1 100644 --- a/include/dom/html/html_select_element.h +++ b/include/dom/html/html_select_element.h @@ -18,13 +18,13 @@ struct dom_html_options_collection; struct dom_html_element; dom_exception dom_html_select_element_get_selected_index( - dom_html_select_element *ele, unsigned long *index); + dom_html_select_element *ele, uint32_t *index); dom_exception dom_html_select_element_set_selected_index( - dom_html_select_element *ele, unsigned long index); + dom_html_select_element *ele, uint32_t index); dom_exception dom_html_select_element_get_length( - dom_html_select_element *ele, unsigned long *len); + dom_html_select_element *ele, uint32_t *len); dom_exception dom_html_select_element_set_length( - dom_html_select_element *ele, unsigned long len); + dom_html_select_element *ele, uint32_t len); dom_exception dom_html_select_element_get_options( dom_html_select_element *ele, struct dom_html_options_collection **col); @@ -37,13 +37,13 @@ dom_exception dom_html_select_element_get_multiple( dom_exception dom_html_select_element_set_multiple( dom_html_select_element *ele, bool multiple); dom_exception dom_html_select_element_get_size( - dom_html_select_element *ele, unsigned long *size); + dom_html_select_element *ele, uint32_t *size); dom_exception dom_html_select_element_set_size( - dom_html_select_element *ele, unsigned long size); + dom_html_select_element *ele, uint32_t size); dom_exception dom_html_select_element_get_tab_index( - dom_html_select_element *ele, unsigned long *tab_index); + dom_html_select_element *ele, uint32_t *tab_index); dom_exception dom_html_select_element_set_tab_index( - dom_html_select_element *ele, unsigned long tab_index); + dom_html_select_element *ele, uint32_t tab_index); /* Functions */ dom_exception dom_html_select_element_add(struct dom_html_element *ele, diff --git a/include/dom/html/html_text_area_element.h b/include/dom/html/html_text_area_element.h index ce610ad..9954e04 100644 --- a/include/dom/html/html_text_area_element.h +++ b/include/dom/html/html_text_area_element.h @@ -37,16 +37,16 @@ dom_exception dom_html_text_area_element_set_disabled( dom_html_text_area_element *text_area, bool disabled); dom_exception dom_html_text_area_element_get_cols( - dom_html_text_area_element *text_area, long *cols); + dom_html_text_area_element *text_area, int32_t *cols); dom_exception dom_html_text_area_element_set_cols( - dom_html_text_area_element *text_area, unsigned long cols); + dom_html_text_area_element *text_area, uint32_t cols); dom_exception dom_html_text_area_element_get_rows( - dom_html_text_area_element *text_area, long *rows); + dom_html_text_area_element *text_area, int32_t *rows); dom_exception dom_html_text_area_element_set_rows( - dom_html_text_area_element *text_area, unsigned long rows); + dom_html_text_area_element *text_area, uint32_t rows); dom_exception dom_html_text_area_element_get_name( dom_html_text_area_element *text_area, dom_string **name); @@ -61,10 +61,10 @@ dom_exception dom_html_text_area_element_set_read_only( dom_html_text_area_element *text_area, bool read_only); dom_exception dom_html_text_area_element_get_tab_index( - dom_html_text_area_element *text_area, long *tab_index); + dom_html_text_area_element *text_area, int32_t *tab_index); dom_exception dom_html_text_area_element_set_tab_index( - dom_html_text_area_element *text_area, unsigned long tab_index); + dom_html_text_area_element *text_area, uint32_t tab_index); dom_exception dom_html_text_area_element_get_type( dom_html_text_area_element *text_area, dom_string **type); diff --git a/src/core/attr.c b/src/core/attr.c index 9db04b6..d9e2b07 100644 --- a/src/core/attr.c +++ b/src/core/attr.c @@ -36,7 +36,7 @@ struct dom_attr { dom_attr_type type; /**< The type of this attribute */ union { - unsigned long lvalue; + uint32_t lvalue; unsigned short svalue; bool bvalue; } value; /**< The special type value of this attribute */ @@ -204,7 +204,7 @@ dom_attr_type dom_attr_get_type(dom_attr *a) * DOM_ATTR_WRONG_TYPE_ERR if the attribute node is not a integer * attribute */ -dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value) +dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value) { if (a->type != DOM_ATTR_INTEGER) return DOM_ATTR_WRONG_TYPE_ERR; @@ -223,7 +223,7 @@ dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value) * DOM_ATTR_WRONG_TYPE_ERR if the attribute node is not a integer * attribute */ -dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value) +dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value) { struct dom_document *doc; struct dom_node_internal *ele; @@ -507,7 +507,7 @@ dom_exception _dom_attr_get_value(struct dom_attr *attr, return err; } - /* No longer need textual representation */ + /* No int32_ter need textual representation */ dom_string_unref(tr); /* Finished with previous value */ diff --git a/src/core/characterdata.c b/src/core/characterdata.c index 0883444..c46a5c6 100644 --- a/src/core/characterdata.c +++ b/src/core/characterdata.c @@ -159,7 +159,7 @@ dom_exception _dom_characterdata_set_data(struct dom_characterdata *cdata, * \return DOM_NO_ERR. */ dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, - unsigned long *length) + uint32_t *length) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; @@ -192,13 +192,13 @@ dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, * this implementation; dom_strings are unbounded. */ dom_exception _dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; uint32_t len, end; - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } @@ -273,7 +273,7 @@ dom_exception _dom_characterdata_append_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, - unsigned long offset, dom_string *data) + uint32_t offset, dom_string *data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; dom_string *temp; @@ -286,7 +286,7 @@ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0) { + if ((int32_t) offset < 0) { return DOM_INDEX_SIZE_ERR; } @@ -335,7 +335,7 @@ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count) + uint32_t offset, uint32_t count) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; dom_string *temp; @@ -349,7 +349,7 @@ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } @@ -404,7 +404,7 @@ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count, + uint32_t offset, uint32_t count, dom_string *data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; @@ -418,7 +418,7 @@ dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } diff --git a/src/core/characterdata.h b/src/core/characterdata.h index 23be9c9..0b0889c 100644 --- a/src/core/characterdata.h +++ b/src/core/characterdata.h @@ -34,18 +34,18 @@ dom_exception _dom_characterdata_get_data(struct dom_characterdata *cdata, dom_exception _dom_characterdata_set_data(struct dom_characterdata *cdata, dom_string *data); dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, - unsigned long *length); + uint32_t *length); dom_exception _dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data); dom_exception _dom_characterdata_append_data(struct dom_characterdata *cdata, dom_string *data); dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, - unsigned long offset, dom_string *data); + uint32_t offset, dom_string *data); dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count); + uint32_t offset, uint32_t count); dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count, + uint32_t offset, uint32_t count, dom_string *data); dom_exception _dom_characterdata_get_text_content( dom_node_internal *node, diff --git a/src/core/element.c b/src/core/element.c index 8908968..df40eaf 100644 --- a/src/core/element.c +++ b/src/core/element.c @@ -485,7 +485,7 @@ static dom_exception _dom_element_set_id_attr(struct dom_element *element, /* The operation set for namednodemap */ static dom_exception attributes_get_length(void *priv, - unsigned long *length); + uint32_t *length); static dom_exception attributes_get_named_item(void *priv, dom_string *name, struct dom_node **node); static dom_exception attributes_set_named_item(void *priv, @@ -494,7 +494,7 @@ static dom_exception attributes_remove_named_item( void *priv, dom_string *name, struct dom_node **node); static dom_exception attributes_item(void *priv, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); static dom_exception attributes_get_named_item_ns( void *priv, dom_string *namespace, dom_string *localname, struct dom_node **node); @@ -739,7 +739,7 @@ dom_exception _dom_element_get_attribute_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -944,7 +944,7 @@ dom_exception _dom_element_get_attribute_node_ns(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to recieve previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1843,7 +1843,7 @@ dom_exception _dom_element_get_attr_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1869,7 +1869,7 @@ dom_exception _dom_element_set_attr_node(struct dom_element *element, /** \todo validate name */ - /* Ensure element and attribute belong to the same document */ + /* Ensure element and attribute beint32_t to the same document */ if (e->owner != attr_node->owner) return DOM_WRONG_DOCUMENT_ERR; @@ -2226,7 +2226,7 @@ dom_exception _dom_element_get_id(struct dom_element *ele, dom_string **id) /* Implementation function for NamedNodeMap, see core/namednodemap.h for * details */ -dom_exception attributes_get_length(void *priv, unsigned long *length) +dom_exception attributes_get_length(void *priv, uint32_t *length) { dom_element *e = (dom_element *) priv; @@ -2283,7 +2283,7 @@ dom_exception attributes_remove_named_item( /* Implementation function for NamedNodeMap, see core/namednodemap.h for * details */ dom_exception attributes_item(void *priv, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { dom_attr_list * match = NULL; unsigned int num = index + 1; diff --git a/src/core/implementation.c b/src/core/implementation.c index 26908f2..6041c22 100644 --- a/src/core/implementation.c +++ b/src/core/implementation.c @@ -266,7 +266,7 @@ dom_exception dom_implementation_create_document( return err; } - /* No longer interested in inserted node */ + /* No int32_ter interested in inserted node */ dom_node_unref(inserted); /* Done with element */ diff --git a/src/core/namednodemap.c b/src/core/namednodemap.c index f68cd3b..ada7e90 100644 --- a/src/core/namednodemap.c +++ b/src/core/namednodemap.c @@ -117,7 +117,7 @@ void dom_namednodemap_unref(dom_namednodemap *map) * \return DOM_NO_ERR. */ dom_exception dom_namednodemap_get_length(dom_namednodemap *map, - unsigned long *length) + uint32_t *length) { assert(map->opt != NULL); return map->opt->namednodemap_get_length(map->priv, length); @@ -209,7 +209,7 @@ dom_exception _dom_namednodemap_remove_named_item( * should unref the node once it has finished with it. */ dom_exception _dom_namednodemap_item(dom_namednodemap *map, - unsigned long index, dom_node **node) + uint32_t index, dom_node **node) { assert(map->opt != NULL); return map->opt->namednodemap_item(map->priv, index, node); diff --git a/src/core/namednodemap.h b/src/core/namednodemap.h index 079294c..62e5858 100644 --- a/src/core/namednodemap.h +++ b/src/core/namednodemap.h @@ -19,7 +19,7 @@ struct dom_namednodemap; struct nnm_operation { dom_exception (*namednodemap_get_length)(void *priv, - unsigned long *length); + uint32_t *length); dom_exception (*namednodemap_get_named_item)(void *priv, dom_string *name, struct dom_node **node); @@ -32,7 +32,7 @@ struct nnm_operation { struct dom_node **node); dom_exception (*namednodemap_item)(void *priv, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); dom_exception (*namednodemap_get_named_item_ns)( void *priv, dom_string *namespace, diff --git a/src/core/node.c b/src/core/node.c index ca8fd72..b14f4fa 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -167,7 +167,7 @@ dom_exception _dom_node_initialise(dom_node_internal *node, node->previous = NULL; node->next = NULL; - /* Note: nodes do not reference the document to which they belong, + /* Note: nodes do not reference the document to which they beint32_t, * as this would result in the document never being destroyed once * the client has finished with it. The document will be aware of * any nodes that it owns through 2 mechanisms: @@ -783,7 +783,7 @@ dom_exception _dom_node_insert_before(dom_node_internal *node, * also need to set its owner. */ if (node->type == DOM_DOCUMENT_NODE && new_child->type == DOM_DOCUMENT_TYPE_NODE) { - /* See long comment in _dom_node_initialise as to why + /* See int32_t comment in _dom_node_initialise as to why * we don't ref the document here */ new_child->owner = (struct dom_document *) node; } @@ -1277,7 +1277,7 @@ dom_exception _dom_node_set_prefix(dom_node_internal *node, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - /* No longer want existing prefix */ + /* No int32_ter want existing prefix */ if (node->prefix != NULL) { dom_string_unref(node->prefix); } diff --git a/src/core/nodelist.c b/src/core/nodelist.c index 8ce9475..e2a1435 100644 --- a/src/core/nodelist.c +++ b/src/core/nodelist.c @@ -196,10 +196,10 @@ void dom_nodelist_unref(dom_nodelist *list) * \param length Pointer to location to receive length * \return DOM_NO_ERR. */ -dom_exception dom_nodelist_get_length(dom_nodelist *list, unsigned long *length) +dom_exception dom_nodelist_get_length(dom_nodelist *list, uint32_t *length) { dom_node_internal *cur = list->root->first_child; - unsigned long len = 0; + uint32_t len = 0; /* Traverse data structure */ while (cur != NULL) { @@ -300,10 +300,10 @@ dom_exception dom_nodelist_get_length(dom_nodelist *list, unsigned long *length) * should unref the node once it has finished with it. */ dom_exception _dom_nodelist_item(dom_nodelist *list, - unsigned long index, dom_node **node) + uint32_t index, dom_node **node) { dom_node_internal *cur = list->root->first_child; - unsigned long count = 0; + uint32_t count = 0; /* Traverse data structure */ while (cur != NULL) { diff --git a/src/core/text.c b/src/core/text.c index 532ee13..94718a2 100644 --- a/src/core/text.c +++ b/src/core/text.c @@ -178,12 +178,12 @@ void _dom_text_finalise(dom_text *text) * once it has finished with it. */ dom_exception _dom_text_split_text(dom_text *text, - unsigned long offset, dom_text **result) + uint32_t offset, dom_text **result) { dom_node_internal *t = (dom_node_internal *) text; dom_string *value; dom_text *res; - unsigned long len; + uint32_t len; dom_exception err; if (_dom_node_readonly(t)) { diff --git a/src/core/text.h b/src/core/text.h index 1cc5b1e..26424ce 100644 --- a/src/core/text.h +++ b/src/core/text.h @@ -43,7 +43,7 @@ void _dom_text_finalise(dom_text *text); /* Virtual functions for dom_text */ dom_exception _dom_text_split_text(dom_text *text, - unsigned long offset, dom_text **result); + uint32_t offset, dom_text **result); dom_exception _dom_text_get_is_element_content_whitespace( dom_text *text, bool *result); dom_exception _dom_text_get_whole_text(dom_text *text, diff --git a/src/events/mouse_event.c b/src/events/mouse_event.c index a2a97bb..3e76879 100644 --- a/src/events/mouse_event.c +++ b/src/events/mouse_event.c @@ -66,7 +66,7 @@ void _virtual_dom_mouse_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, - long *x) + int32_t *x) { *x = evt->sx; @@ -81,7 +81,7 @@ dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, - long *y) + int32_t *y) { *y = evt->sy; @@ -96,7 +96,7 @@ dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, - long *x) + int32_t *x) { *x = evt->cx; @@ -111,7 +111,7 @@ dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt, - long *y) + int32_t *y) { *y = evt->cy; @@ -282,8 +282,8 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, */ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, bool ctrl, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et) { @@ -337,8 +337,8 @@ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail, long screen_x, long screen_y, long client_x, - long client_y, bool ctrl, bool alt, bool shift, bool meta, + int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x, + int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et) { evt->sx = screen_x; diff --git a/src/events/mouse_event.h b/src/events/mouse_event.h index 85246e7..e49bcd7 100644 --- a/src/events/mouse_event.h +++ b/src/events/mouse_event.h @@ -18,10 +18,10 @@ struct dom_mouse_event { struct dom_ui_event base; /**< Base class */ - long sx; /**< ScreenX */ - long sy; /**< ScreenY */ - long cx; /**< ClientX */ - long cy; /**< ClientY */ + int32_t sx; /**< ScreenX */ + int32_t sy; /**< ScreenY */ + int32_t cx; /**< ClientX */ + int32_t cy; /**< ClientY */ uint32_t modifier_state; /**< The modifier keys state */ diff --git a/src/events/mouse_multi_wheel_event.c b/src/events/mouse_multi_wheel_event.c index 8c4615b..35f91af 100644 --- a/src/events/mouse_multi_wheel_event.c +++ b/src/events/mouse_multi_wheel_event.c @@ -67,7 +67,7 @@ void _virtual_dom_mouse_multi_wheel_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( - dom_mouse_multi_wheel_event *evt, long *x) + dom_mouse_multi_wheel_event *evt, int32_t *x) { *x = evt->x; @@ -82,7 +82,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( - dom_mouse_multi_wheel_event *evt, long *y) + dom_mouse_multi_wheel_event *evt, int32_t *y) { *y = evt->y; @@ -97,7 +97,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( - dom_mouse_multi_wheel_event *evt, long *z) + dom_mouse_multi_wheel_event *evt, int32_t *z) { *z = evt->z; @@ -129,11 +129,11 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( dom_exception _dom_mouse_multi_wheel_event_init_ns( dom_mouse_multi_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta_x, - long wheel_delta_y, long wheel_delta_z) + dom_string *modifier_list, int32_t wheel_delta_x, + int32_t wheel_delta_y, int32_t wheel_delta_z) { dom_exception err; dom_mouse_event *e = (dom_mouse_event *) evt; diff --git a/src/events/mouse_multi_wheel_event.h b/src/events/mouse_multi_wheel_event.h index 9b854c9..0476911 100644 --- a/src/events/mouse_multi_wheel_event.h +++ b/src/events/mouse_multi_wheel_event.h @@ -18,9 +18,9 @@ struct dom_mouse_multi_wheel_event { struct dom_mouse_event base; /**< The base class */ - long x; /**< The wheelDeltaX */ - long y; /**< The wheelDeltaY */ - long z; /**< The wheelDeltaZ */ + int32_t x; /**< The wheelDeltaX */ + int32_t y; /**< The wheelDeltaY */ + int32_t z; /**< The wheelDeltaZ */ }; /* Constructor */ diff --git a/src/events/mouse_wheel_event.c b/src/events/mouse_wheel_event.c index cce4fac..778a53b 100644 --- a/src/events/mouse_wheel_event.c +++ b/src/events/mouse_wheel_event.c @@ -65,7 +65,7 @@ void _virtual_dom_mouse_wheel_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_wheel_event_get_wheel_delta( - dom_mouse_wheel_event *evt, long *d) + dom_mouse_wheel_event *evt, int32_t *d) { *d = evt->delta; @@ -95,10 +95,10 @@ dom_exception _dom_mouse_wheel_event_get_wheel_delta( dom_exception _dom_mouse_wheel_event_init_ns( dom_mouse_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta) + dom_string *modifier_list, int32_t wheel_delta) { dom_exception err; dom_mouse_event *e = (dom_mouse_event *) evt; diff --git a/src/events/mouse_wheel_event.h b/src/events/mouse_wheel_event.h index 9247d4a..e78abf6 100644 --- a/src/events/mouse_wheel_event.h +++ b/src/events/mouse_wheel_event.h @@ -18,7 +18,7 @@ struct dom_mouse_wheel_event { struct dom_mouse_event base; /**< The base class */ - long delta; /**< The wheelDelta */ + int32_t delta; /**< The wheelDelta */ }; /* Constructor */ diff --git a/src/events/ui_event.c b/src/events/ui_event.c index 0082332..911b0d0 100644 --- a/src/events/ui_event.c +++ b/src/events/ui_event.c @@ -84,7 +84,7 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, - long *detail) + int32_t *detail) { *detail = evt->detail; @@ -104,7 +104,7 @@ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, */ dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail) + int32_t detail) { evt->view = view; evt->detail = detail; @@ -127,7 +127,7 @@ dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail) + int32_t detail) { evt->view = view; evt->detail = detail; diff --git a/src/events/ui_event.h b/src/events/ui_event.h index d90f6d7..e60ed35 100644 --- a/src/events/ui_event.h +++ b/src/events/ui_event.h @@ -32,7 +32,7 @@ typedef enum { struct dom_ui_event { struct dom_event base; /**< The base class */ struct dom_abstract_view *view; /**< The AbstractView */ - long detail; /**< Some private data for this event */ + int32_t detail; /**< Some private data for this event */ }; /* Constructor */ diff --git a/src/html/html_button_element.c b/src/html/html_button_element.c index 47fdb7b..95b5d31 100644 --- a/src/html/html_button_element.c +++ b/src/html/html_button_element.c @@ -196,16 +196,16 @@ SIMPLE_GET(type); SIMPLE_GET_SET(value); dom_exception dom_html_button_element_get_tab_index( - dom_html_button_element *button, long *tab_index) + dom_html_button_element *button, int32_t *tab_index) { - return dom_html_element_get_long_property(&button->base, "tabindex", + return dom_html_element_get_int32_t_property(&button->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_button_element_set_tab_index( - dom_html_button_element *button, unsigned long tab_index) + dom_html_button_element *button, uint32_t tab_index) { - return dom_html_element_set_long_property(&button->base, "tabindex", + return dom_html_element_set_int32_t_property(&button->base, "tabindex", SLEN("tabindex"), tab_index); } diff --git a/src/html/html_collection.c b/src/html/html_collection.c index 1e43940..704d384 100644 --- a/src/html/html_collection.c +++ b/src/html/html_collection.c @@ -25,7 +25,7 @@ * \param doc The document * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \param col The result collection object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -49,7 +49,7 @@ dom_exception _dom_html_collection_create(struct dom_html_document *doc, * \param col The collection object to be initialised * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \return DOM_NO_ERR on success. */ dom_exception _dom_html_collection_initialise(struct dom_html_document *doc, @@ -113,7 +113,7 @@ void _dom_html_collection_destroy(struct dom_html_collection *col) * \return DOM_NO_ERR on success. */ dom_exception dom_html_collection_get_length(dom_html_collection *col, - unsigned long *len) + uint32_t *len) { struct dom_node_internal *node = col->root; *len = 0; @@ -157,10 +157,10 @@ dom_exception dom_html_collection_get_length(dom_html_collection *col, * \return DOM_NO_ERR on success. */ dom_exception dom_html_collection_item(dom_html_collection *col, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { struct dom_node_internal *n = col->root; - unsigned long len = 0; + uint32_t len = 0; while (n != NULL) { if (n->type == DOM_ELEMENT_NODE && diff --git a/src/html/html_document.c b/src/html/html_document.c index ffc2e1c..1b238e9 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -340,7 +340,7 @@ dom_exception _dom_html_document_get_title(dom_html_document *doc, } else { dom_element *node; dom_nodelist *nodes; - unsigned long len; + uint32_t len; exc = dom_document_get_elements_by_tag_name(doc, doc->memoised[hds_TITLE], diff --git a/src/html/html_element.c b/src/html/html_element.c index b3b3bfc..9dc3155 100644 --- a/src/html/html_element.c +++ b/src/html/html_element.c @@ -220,7 +220,7 @@ dom_exception _dom_html_element_get_elements_by_tag_name_ns( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_element_get_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool *has) + const char *name, uint32_t len, bool *has) { dom_string *str = NULL; dom_attr *a = NULL; @@ -259,7 +259,7 @@ fail: * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_element_set_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool has) + const char *name, uint32_t len, bool has) { dom_string *str = NULL; dom_attr *a = NULL; @@ -325,7 +325,7 @@ static char *_strndup(const char *s, size_t n) } /** - * Get the a long property + * Get the a int32_t property * * \param ele The dom_html_element object * \param name The name of the attribute @@ -333,8 +333,8 @@ static char *_strndup(const char *s, size_t n) * \param value The returned value, or -1 if prop. not set * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_element_get_long_property(dom_html_element *ele, - const char *name, unsigned long len, long *value) +dom_exception dom_html_element_get_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, int32_t *value) { dom_string *str = NULL, *s2 = NULL; dom_attr *a = NULL; @@ -372,7 +372,7 @@ fail: } /** - * Set a long property + * Set a int32_t property * * \param ele The dom_html_element object * \param name The name of the attribute @@ -380,8 +380,8 @@ fail: * \param value The value * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_element_set_long_property(dom_html_element *ele, - const char *name, unsigned long len, unsigned long value) +dom_exception dom_html_element_set_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, uint32_t value) { dom_string *str = NULL, *svalue = NULL; dom_exception err; @@ -391,7 +391,7 @@ dom_exception dom_html_element_set_long_property(dom_html_element *ele, if (err != DOM_NO_ERR) goto fail; - if (snprintf(numbuffer, 32, "%lu", value) == 32) + if (snprintf(numbuffer, 32, "%u", value) == 32) numbuffer[31] = '\0'; err = dom_string_create((const uint8_t *) numbuffer, diff --git a/src/html/html_element.h b/src/html/html_element.h index 140e3f1..a1130cc 100644 --- a/src/html/html_element.h +++ b/src/html/html_element.h @@ -113,14 +113,14 @@ dom_exception _dom_html_element_set_class_name(dom_html_element *element, /* Some common functions used by all child classes */ dom_exception dom_html_element_get_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool *has); + const char *name, uint32_t len, bool *has); dom_exception dom_html_element_set_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool has); + const char *name, uint32_t len, bool has); -dom_exception dom_html_element_get_long_property(dom_html_element *ele, - const char *name, unsigned long len, long *value); -dom_exception dom_html_element_set_long_property(dom_html_element *ele, - const char *name, unsigned long len, unsigned long value); +dom_exception dom_html_element_get_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, int32_t *value); +dom_exception dom_html_element_set_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, uint32_t value); extern struct dom_html_element_vtable _dom_html_element_vtable; diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index fcdf42e..55ec0e9 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -168,7 +168,7 @@ dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, - unsigned long *len) + uint32_t *len) { dom_exception err; diff --git a/src/html/html_input_element.c b/src/html/html_input_element.c index 694eb22..9586abb 100644 --- a/src/html/html_input_element.c +++ b/src/html/html_input_element.c @@ -356,30 +356,30 @@ SIMPLE_GET_SET(use_map); SIMPLE_GET_SET(value); dom_exception dom_html_input_element_get_tab_index( - dom_html_input_element *input, long *tab_index) + dom_html_input_element *input, int32_t *tab_index) { - return dom_html_element_get_long_property(&input->base, "tabindex", + return dom_html_element_get_int32_t_property(&input->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_input_element_set_tab_index( - dom_html_input_element *input, unsigned long tab_index) + dom_html_input_element *input, uint32_t tab_index) { - return dom_html_element_set_long_property(&input->base, "tabindex", + return dom_html_element_set_int32_t_property(&input->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_input_element_get_max_length( - dom_html_input_element *input, long *max_length) + dom_html_input_element *input, int32_t *max_length) { - return dom_html_element_get_long_property(&input->base, "maxlength", + return dom_html_element_get_int32_t_property(&input->base, "maxlength", SLEN("maxlength"), max_length); } dom_exception dom_html_input_element_set_max_length( - dom_html_input_element *input, unsigned long max_length) + dom_html_input_element *input, uint32_t max_length) { - return dom_html_element_set_long_property(&input->base, "maxlength", + return dom_html_element_set_int32_t_property(&input->base, "maxlength", SLEN("maxlength"), max_length); } diff --git a/src/html/html_options_collection.c b/src/html/html_options_collection.c index 26926bf..0583d9c 100644 --- a/src/html/html_options_collection.c +++ b/src/html/html_options_collection.c @@ -26,7 +26,7 @@ * \param doc The document * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \param col The result collection object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -51,7 +51,7 @@ dom_exception _dom_html_options_collection_create(struct dom_html_document *doc, * \param col The collection object to be initialised * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \return DOM_NO_ERR on success. */ dom_exception _dom_html_options_collection_initialise(struct dom_html_document *doc, @@ -95,7 +95,7 @@ void _dom_html_options_collection_destroy(struct dom_html_options_collection *co * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_get_length(dom_html_options_collection *col, - unsigned long *len) + uint32_t *len) { return dom_html_collection_get_length(&col->base, len); } @@ -108,7 +108,7 @@ dom_exception dom_html_options_collection_get_length(dom_html_options_collection * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_set_length( - dom_html_options_collection *col, unsigned long len) + dom_html_options_collection *col, uint32_t len) { UNUSED(col); UNUSED(len); @@ -126,7 +126,7 @@ dom_exception dom_html_options_collection_set_length( * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_item(dom_html_options_collection *col, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { return dom_html_collection_item(&col->base, index, node); } diff --git a/src/html/html_select_element.c b/src/html/html_select_element.c index 2d92c5f..58c08bc 100644 --- a/src/html/html_select_element.c +++ b/src/html/html_select_element.c @@ -137,7 +137,7 @@ dom_exception _dom_html_select_element_copy(dom_node_internal *old, * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_get_selected_index( - dom_html_select_element *ele, unsigned long *index) + dom_html_select_element *ele, uint32_t *index) { *index = ele->selected; @@ -152,7 +152,7 @@ dom_exception dom_html_select_element_get_selected_index( * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_set_selected_index( - dom_html_select_element *ele, unsigned long index) + dom_html_select_element *ele, uint32_t index) { ele->selected = index; @@ -167,7 +167,7 @@ dom_exception dom_html_select_element_set_selected_index( * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_get_length( - dom_html_select_element *ele, unsigned long *len) + dom_html_select_element *ele, uint32_t *len) { dom_exception err; dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); @@ -194,7 +194,7 @@ dom_exception dom_html_select_element_get_length( * todo: how to deal with set the len of the children option objects? */ dom_exception dom_html_select_element_set_length( - dom_html_select_element *ele, unsigned long len) + dom_html_select_element *ele, uint32_t len) { UNUSED(ele); UNUSED(len); @@ -291,13 +291,13 @@ dom_exception dom_html_select_element_set_multiple( } dom_exception dom_html_select_element_get_size( - dom_html_select_element *ele, unsigned long *size); + dom_html_select_element *ele, uint32_t *size); dom_exception dom_html_select_element_set_size( - dom_html_select_element *ele, unsigned long size); + dom_html_select_element *ele, uint32_t size); dom_exception dom_html_select_element_get_tab_index( - dom_html_select_element *ele, unsigned long *tab_index); + dom_html_select_element *ele, uint32_t *tab_index); dom_exception dom_html_select_element_set_tab_index( - dom_html_select_element *ele, unsigned long tab_index); + dom_html_select_element *ele, uint32_t tab_index); /* Functions */ dom_exception dom_html_select_element_add(struct dom_html_element *ele, diff --git a/src/html/html_select_element.h b/src/html/html_select_element.h index 68c51e3..ae5c7dd 100644 --- a/src/html/html_select_element.h +++ b/src/html/html_select_element.h @@ -16,7 +16,7 @@ struct dom_html_select_element { struct dom_html_element base; /**< The base class */ - long selected; + int32_t selected; /**< The selected element's index */ dom_html_options_collection *options; /**< The options objects */ diff --git a/src/html/html_text_area_element.c b/src/html/html_text_area_element.c index 887a2c0..1c7534c 100644 --- a/src/html/html_text_area_element.c +++ b/src/html/html_text_area_element.c @@ -365,44 +365,44 @@ dom_exception dom_html_text_area_element_get_type( } dom_exception dom_html_text_area_element_get_tab_index( - dom_html_text_area_element *text_area, long *tab_index) + dom_html_text_area_element *text_area, int32_t *tab_index) { - return dom_html_element_get_long_property(&text_area->base, "tabindex", + return dom_html_element_get_int32_t_property(&text_area->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_text_area_element_set_tab_index( - dom_html_text_area_element *text_area, unsigned long tab_index) + dom_html_text_area_element *text_area, uint32_t tab_index) { - return dom_html_element_set_long_property(&text_area->base, "tabindex", + return dom_html_element_set_int32_t_property(&text_area->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_text_area_element_get_cols( - dom_html_text_area_element *text_area, long *cols) + dom_html_text_area_element *text_area, int32_t *cols) { - return dom_html_element_get_long_property(&text_area->base, "cols", + return dom_html_element_get_int32_t_property(&text_area->base, "cols", SLEN("cols"), cols); } dom_exception dom_html_text_area_element_set_cols( - dom_html_text_area_element *text_area, unsigned long cols) + dom_html_text_area_element *text_area, uint32_t cols) { - return dom_html_element_set_long_property(&text_area->base, "cols", + return dom_html_element_set_int32_t_property(&text_area->base, "cols", SLEN("cols"), cols); } dom_exception dom_html_text_area_element_get_rows( - dom_html_text_area_element *text_area, long *rows) + dom_html_text_area_element *text_area, int32_t *rows) { - return dom_html_element_get_long_property(&text_area->base, "rows", + return dom_html_element_get_int32_t_property(&text_area->base, "rows", SLEN("rows"), rows); } dom_exception dom_html_text_area_element_set_rows( - dom_html_text_area_element *text_area, unsigned long rows) + dom_html_text_area_element *text_area, uint32_t rows) { - return dom_html_element_set_long_property(&text_area->base, "rows", + return dom_html_element_set_int32_t_property(&text_area->base, "rows", SLEN("rows"), rows); } diff --git a/src/utils/character_valid.c b/src/utils/character_valid.c index e966ec1..81c3558 100644 --- a/src/utils/character_valid.c +++ b/src/utils/character_valid.c @@ -161,11 +161,11 @@ bool binary_search(unsigned int ch, int left, int right, } /** - * Test whether certain character belongs to some XML character group + * Test whether certain character beint32_ts to some XML character group * * \param ch The character being tested * \param group The character group - * \return true if the character belongs to the group, false otherwise. + * \return true if the character beint32_ts to the group, false otherwise. * * Generally, we use an algorithm like binary search to find the desired * character in the group. The time complexity is about lg(n) and here n is diff --git a/src/utils/hashtable.c b/src/utils/hashtable.c index db6ece8..fb7c84a 100644 --- a/src/utils/hashtable.c +++ b/src/utils/hashtable.c @@ -114,7 +114,7 @@ dom_hash_table *_dom_hash_clone(dom_hash_table *ht) * Destroys a hash table, freeing all memory associated with it. * * \param ht Hash table to destroy. After the function returns, this - * will nolonger be valid + * will noint32_ter be valid */ void _dom_hash_destroy(dom_hash_table *ht) { @@ -305,7 +305,7 @@ uint32_t _dom_hash_get_length(struct dom_hash_table *ht) * If you make changes to this hash table implementation, please rerun this * test, and if possible, through valgrind to make sure there are no memory * leaks or invalid memory accesses. If you add new functionality, please - * include a test for it that has good coverage along side the other tests. + * include a test for it that has good coverage aint32_t side the other tests. */ #ifdef TEST_RIG diff --git a/test/testutils/domtsasserts.c b/test/testutils/domtsasserts.c index e5220e0..41cacf2 100644 --- a/test/testutils/domtsasserts.c +++ b/test/testutils/domtsasserts.c @@ -50,7 +50,7 @@ bool is_same_int(int expected, int actual) return expected == actual; } -bool is_same_unsigned_long(unsigned long expected, unsigned long actual) +bool is_same_unsigned_int32_t(uint32_t expected, uint32_t actual) { return expected == actual; } @@ -69,7 +69,7 @@ bool is_equals_bool(bool expected, bool actual, bool dummy) return expected == actual; } -bool is_equals_unsigned_long(unsigned long expected, unsigned long actual, bool dummy) +bool is_equals_unsigned_int32_t(uint32_t expected, uint32_t actual, bool dummy) { UNUSED(dummy); @@ -156,9 +156,9 @@ bool is_instanceof(const char *type, dom_node *node) } -bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map) +bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map) { - unsigned long len; + uint32_t len; dom_exception err; err = dom_namednodemap_get_length(map, &len); @@ -170,9 +170,9 @@ bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map) return size == len; } -bool is_size_domnodelist(unsigned long size, dom_nodelist *list) +bool is_size_domnodelist(uint32_t size, dom_nodelist *list) { - unsigned long len; + uint32_t len; dom_exception err; err = dom_nodelist_get_length(list, &len); @@ -184,7 +184,7 @@ bool is_size_domnodelist(unsigned long size, dom_nodelist *list) return size == len; } -bool is_size_list(unsigned long size, list *list) +bool is_size_list(uint32_t size, list *list) { return size == list->size; } diff --git a/test/testutils/domtsasserts.h b/test/testutils/domtsasserts.h index bc214e8..e18509c 100644 --- a/test/testutils/domtsasserts.h +++ b/test/testutils/domtsasserts.h @@ -30,10 +30,10 @@ bool is_null(void *arg); bool is_same(void *excepted, void *actual); bool is_same_int(int excepted, int actual); -bool is_same_unsigned_long(unsigned long excepted, unsigned long actual); +bool is_same_unsigned_int32_t(uint32_t excepted, uint32_t actual); bool is_equals_int(int excepted, int actual, bool dummy); -bool is_equals_unsigned_long(unsigned long excepted, unsigned long actual, bool dummy); +bool is_equals_unsigned_int32_t(uint32_t excepted, uint32_t actual, bool dummy); bool is_equals_bool(bool excepted, bool actual, bool dummy); bool is_equals_string(const char *excepted, dom_string *actual, bool ignoreCase); @@ -45,9 +45,9 @@ bool is_equals_list(list *expected, list *actual, bool ignoreCase); bool is_instanceof(const char *type, dom_node *node); -bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map); -bool is_size_domnodelist(unsigned long size, dom_nodelist *list); -bool is_size_list(unsigned long size, list *list); +bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map); +bool is_size_domnodelist(uint32_t size, dom_nodelist *list); +bool is_size_list(uint32_t size, list *list); bool is_uri_equals(const char *scheme, const char *path, const char *host, const char *file, const char *name, const char *query, diff --git a/test/testutils/foreach.c b/test/testutils/foreach.c index 764920c..e068201 100644 --- a/test/testutils/foreach.c +++ b/test/testutils/foreach.c @@ -38,7 +38,7 @@ void foreach_initialise_domnamednodemap(dom_namednodemap *map, unsigned int *ite bool _get_next_domnodelist(dom_nodelist *list, unsigned int *iterator, dom_node **ret) { dom_exception err; - unsigned long len; + uint32_t len; err = dom_nodelist_get_length(list, &len); if (err != DOM_NO_ERR) @@ -80,7 +80,7 @@ bool get_next_list(list *list, unsigned int *iterator, void **ret) bool _get_next_domnamednodemap(dom_namednodemap *map, unsigned int *iterator, dom_node **ret) { dom_exception err; - unsigned long len; + uint32_t len; err = dom_namednodemap_get_length(map, &len); if (err != DOM_NO_ERR) ----------------------------------------------------------------------- Summary of changes: bindings/xml/expat_xmlparser.c | 10 +++--- bindings/xml/libxml_xmlparser.c | 32 +++++++++--------- include/dom/core/attr.h | 6 ++-- include/dom/core/characterdata.h | 46 +++++++++++++------------- include/dom/core/exceptions.h | 2 +- include/dom/core/namednodemap.h | 6 ++-- include/dom/core/nodelist.h | 6 ++-- include/dom/core/text.h | 6 ++-- include/dom/events/mouse_event.h | 32 +++++++++--------- include/dom/events/mouse_multi_wheel_event.h | 26 +++++++------- include/dom/events/mouse_wheel_event.h | 14 ++++---- include/dom/events/ui_event.h | 12 +++--- include/dom/html/html_button_element.h | 4 +- include/dom/html/html_collection.h | 4 +- include/dom/html/html_form_element.h | 2 +- include/dom/html/html_input_element.h | 8 ++-- include/dom/html/html_options_collection.h | 6 ++-- include/dom/html/html_select_element.h | 16 ++++---- include/dom/html/html_text_area_element.h | 12 +++--- src/core/attr.c | 8 ++-- src/core/characterdata.c | 20 ++++++------ src/core/characterdata.h | 12 +++--- src/core/element.c | 16 ++++---- src/core/implementation.c | 2 +- src/core/namednodemap.c | 4 +- src/core/namednodemap.h | 4 +- src/core/node.c | 6 ++-- src/core/nodelist.c | 8 ++-- src/core/text.c | 4 +- src/core/text.h | 2 +- src/events/mouse_event.c | 16 ++++---- src/events/mouse_event.h | 8 ++-- src/events/mouse_multi_wheel_event.c | 14 ++++---- src/events/mouse_multi_wheel_event.h | 6 ++-- src/events/mouse_wheel_event.c | 8 ++-- src/events/mouse_wheel_event.h | 2 +- src/events/ui_event.c | 6 ++-- src/events/ui_event.h | 2 +- src/html/html_button_element.c | 8 ++-- src/html/html_collection.c | 10 +++--- src/html/html_document.c | 2 +- src/html/html_element.c | 18 +++++----- src/html/html_element.h | 12 +++--- src/html/html_form_element.c | 2 +- src/html/html_input_element.c | 16 ++++---- src/html/html_options_collection.c | 10 +++--- src/html/html_select_element.c | 16 ++++---- src/html/html_select_element.h | 2 +- src/html/html_text_area_element.c | 24 +++++++------- src/utils/character_valid.c | 4 +- src/utils/hashtable.c | 4 +- test/testutils/domtsasserts.c | 14 ++++---- test/testutils/domtsasserts.h | 10 +++--- test/testutils/foreach.c | 4 +- 54 files changed, 277 insertions(+), 277 deletions(-) diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 1077bc9..8cf1193 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -214,7 +214,7 @@ expat_xmlparser_cdata_handler(void *_parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -230,7 +230,7 @@ expat_xmlparser_cdata_handler(void *_parser, if (ins_cdata != NULL) dom_node_unref(ins_cdata); - /* No longer interested in cdata section */ + /* No int32_ter interested in cdata section */ dom_node_unref(cdata); } @@ -309,7 +309,7 @@ expat_xmlparser_comment_handler(void *_parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append comment to parent */ @@ -326,7 +326,7 @@ expat_xmlparser_comment_handler(void *_parser, if (ins_comment != NULL) dom_node_unref((struct dom_node *) ins_comment); - /* No longer interested in comment */ + /* No int32_ter interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -369,7 +369,7 @@ expat_xmlparser_start_doctype_decl_handler(void *_parser, if (ins_doctype != NULL) dom_node_unref((struct dom_node *) ins_doctype); - /* No longer interested in doctype */ + /* No int32_ter interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c index 1c2442a..ddca1d4 100644 --- a/bindings/xml/libxml_xmlparser.c +++ b/bindings/xml/libxml_xmlparser.c @@ -672,7 +672,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need tag name */ + /* No int32_ter need tag name */ dom_string_unref(tag_name); } else { /* Namespace */ @@ -727,7 +727,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need namespace / qname */ + /* No int32_ter need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -764,7 +764,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No longer need attribute name */ + /* No int32_ter need attribute name */ dom_string_unref(name); } else { /* Attribute has namespace */ @@ -819,7 +819,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, return; } - /* No longer need namespace / qname */ + /* No int32_ter need namespace / qname */ dom_string_unref(namespace); dom_string_unref(qname); } @@ -865,7 +865,7 @@ void xml_parser_add_element_node(dom_xml_parser *parser, if (prev_attr != NULL && prev_attr != attr) dom_node_unref((struct dom_node *) prev_attr); - /* We're no longer interested in the attribute node */ + /* We're no int32_ter interested in the attribute node */ dom_node_unref((struct dom_node *) attr); } @@ -890,13 +890,13 @@ void xml_parser_add_element_node(dom_xml_parser *parser, goto cleanup; } - /* No longer interested in element node */ + /* No int32_ter interested in element node */ dom_node_unref((struct dom_node *) el); return; cleanup: - /* No longer want node (any attributes attached to it + /* No int32_ter want node (any attributes attached to it * will be cleaned up with it) */ dom_node_unref((struct dom_node *) el); @@ -935,7 +935,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append text node to parent */ @@ -960,7 +960,7 @@ void xml_parser_add_text_node(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer interested in text node */ + /* No int32_ter interested in text node */ dom_node_unref((struct dom_node *) text); } @@ -996,7 +996,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append cdata section to parent */ @@ -1021,7 +1021,7 @@ void xml_parser_add_cdata_section(dom_xml_parser *parser, return; } - /* No longer interested in cdata section */ + /* No int32_ter interested in cdata section */ dom_node_unref((struct dom_node *) cdata); } @@ -1059,7 +1059,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No longer need name */ + /* No int32_ter need name */ dom_string_unref(name); /* Mirror subtree (reference value) */ @@ -1089,7 +1089,7 @@ void xml_parser_add_entity_reference(dom_xml_parser *parser, return; } - /* No longer interested in entity reference */ + /* No int32_ter interested in entity reference */ dom_node_unref((struct dom_node *) entity); } @@ -1133,7 +1133,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer need data */ + /* No int32_ter need data */ dom_string_unref(data); /* Append comment to parent */ @@ -1158,7 +1158,7 @@ void xml_parser_add_comment(dom_xml_parser *parser, struct dom_node *parent, return; } - /* No longer interested in comment */ + /* No int32_ter interested in comment */ dom_node_unref((struct dom_node *) comment); } @@ -1220,7 +1220,7 @@ void xml_parser_add_document_type(dom_xml_parser *parser, return; } - /* No longer interested in doctype */ + /* No int32_ter interested in doctype */ dom_node_unref((struct dom_node *) doctype); } diff --git a/include/dom/core/attr.h b/include/dom/core/attr.h index 69612f7..1ae5be5 100644 --- a/include/dom/core/attr.h +++ b/include/dom/core/attr.h @@ -114,7 +114,7 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * Following are our implementation specific APIs. * * These APIs are defined for the purpose that there are some attributes in - * HTML and other DOM module whose type is not DOMString, but unsigned long or + * HTML and other DOM module whose type is not DOMString, but uint32_t or * boolean, for those types of attributes, clients should call one of the * following APIs to set it. * @@ -135,8 +135,8 @@ static inline dom_exception dom_attr_is_id(struct dom_attr *attr, bool *result) * dom_attr_get_* functions. */ dom_attr_type dom_attr_get_type(dom_attr *a); -dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value); -dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value); +dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value); +dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value); dom_exception dom_attr_get_short(dom_attr *a, unsigned short *value); dom_exception dom_attr_set_short(dom_attr *a, unsigned short value); dom_exception dom_attr_get_bool(dom_attr *a, bool *value); diff --git a/include/dom/core/characterdata.h b/include/dom/core/characterdata.h index 174be89..6b894fb 100644 --- a/include/dom/core/characterdata.h +++ b/include/dom/core/characterdata.h @@ -25,22 +25,22 @@ typedef struct dom_characterdata_vtable { dom_string *data); dom_exception (*dom_characterdata_get_length)( struct dom_characterdata *cdata, - unsigned long *length); + uint32_t *length); dom_exception (*dom_characterdata_substring_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data); dom_exception (*dom_characterdata_append_data)( struct dom_characterdata *cdata, dom_string *data); dom_exception (*dom_characterdata_insert_data)( struct dom_characterdata *cdata, - unsigned long offset, dom_string *data); + uint32_t offset, dom_string *data); dom_exception (*dom_characterdata_delete_data)( struct dom_characterdata *cdata, - unsigned long offset, unsigned long count); + uint32_t offset, uint32_t count); dom_exception (*dom_characterdata_replace_data)( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data); } dom_characterdata_vtable; @@ -63,17 +63,17 @@ static inline dom_exception dom_characterdata_set_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_get_length( - struct dom_characterdata *cdata, unsigned long *length) + struct dom_characterdata *cdata, uint32_t *length) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_get_length(cdata, length); } #define dom_characterdata_get_length(c, l) dom_characterdata_get_length( \ - (struct dom_characterdata *) (c), (unsigned long *) (l)) + (struct dom_characterdata *) (c), (uint32_t *) (l)) static inline dom_exception dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_substring_data(cdata, offset, count, @@ -81,8 +81,8 @@ static inline dom_exception dom_characterdata_substring_data( } #define dom_characterdata_substring_data(c, o, ct, d) \ dom_characterdata_substring_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct), (d)) static inline dom_exception dom_characterdata_append_data( struct dom_characterdata *cdata, dom_string *data) @@ -94,29 +94,29 @@ static inline dom_exception dom_characterdata_append_data( (struct dom_characterdata *) (c), (d)) static inline dom_exception dom_characterdata_insert_data( - struct dom_characterdata *cdata, unsigned long offset, + struct dom_characterdata *cdata, uint32_t offset, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_insert_data(cdata, offset, data); } #define dom_characterdata_insert_data(c, o, d) dom_characterdata_insert_data( \ - (struct dom_characterdata *) (c), (unsigned long) (o), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o), (d)) static inline dom_exception dom_characterdata_delete_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_delete_data(cdata, offset, count); } #define dom_characterdata_delete_data(c, o, ct) dom_characterdata_delete_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o), \ - (unsigned long) (ct)) + (struct dom_characterdata *) (c), (uint32_t) (o), \ + (uint32_t) (ct)) static inline dom_exception dom_characterdata_replace_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string *data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string *data) { return ((dom_characterdata_vtable *) ((dom_node *) cdata)->vtable)-> dom_characterdata_replace_data(cdata, offset, count, @@ -124,7 +124,7 @@ static inline dom_exception dom_characterdata_replace_data( } #define dom_characterdata_replace_data(c, o, ct, d) \ dom_characterdata_replace_data(\ - (struct dom_characterdata *) (c), (unsigned long) (o),\ - (unsigned long) (ct), (d)) + (struct dom_characterdata *) (c), (uint32_t) (o),\ + (uint32_t) (ct), (d)) #endif diff --git a/include/dom/core/exceptions.h b/include/dom/core/exceptions.h index 04c7f18..67160d1 100644 --- a/include/dom/core/exceptions.h +++ b/include/dom/core/exceptions.h @@ -12,7 +12,7 @@ * Class of a DOM exception. * * The top 16 bits of a dom_exception are a bitfield - * indicating which class the exception belongs to. + * indicating which class the exception beint32_ts to. */ typedef enum { DOM_EXCEPTION_CLASS_NORMAL = 0, diff --git a/include/dom/core/namednodemap.h b/include/dom/core/namednodemap.h index fc5e886..f44e553 100644 --- a/include/dom/core/namednodemap.h +++ b/include/dom/core/namednodemap.h @@ -19,7 +19,7 @@ void dom_namednodemap_ref(struct dom_namednodemap *map); void dom_namednodemap_unref(struct dom_namednodemap *map); dom_exception dom_namednodemap_get_length(struct dom_namednodemap *map, - unsigned long *length); + uint32_t *length); dom_exception _dom_namednodemap_get_named_item(struct dom_namednodemap *map, dom_string *name, struct dom_node **node); @@ -47,10 +47,10 @@ dom_exception _dom_namednodemap_remove_named_item( dom_exception _dom_namednodemap_item(struct dom_namednodemap *map, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_namednodemap_item(m, i, n) _dom_namednodemap_item( \ - (dom_namednodemap *) (m), (unsigned long) (i), \ + (dom_namednodemap *) (m), (uint32_t) (i), \ (dom_node **) (n)) diff --git a/include/dom/core/nodelist.h b/include/dom/core/nodelist.h index 2aad313..369a42b 100644 --- a/include/dom/core/nodelist.h +++ b/include/dom/core/nodelist.h @@ -18,11 +18,11 @@ void dom_nodelist_ref(struct dom_nodelist *list); void dom_nodelist_unref(struct dom_nodelist *list); dom_exception dom_nodelist_get_length(struct dom_nodelist *list, - unsigned long *length); + uint32_t *length); dom_exception _dom_nodelist_item(struct dom_nodelist *list, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); #define dom_nodelist_item(l, i, n) _dom_nodelist_item((dom_nodelist *) (l), \ - (unsigned long) (i), (dom_node **) (n)) + (uint32_t) (i), (dom_node **) (n)) #endif diff --git a/include/dom/core/text.h b/include/dom/core/text.h index 1750aec..7bafc8c 100644 --- a/include/dom/core/text.h +++ b/include/dom/core/text.h @@ -21,7 +21,7 @@ typedef struct dom_text_vtable { struct dom_characterdata_vtable base; dom_exception (*dom_text_split_text)(struct dom_text *text, - unsigned long offset, struct dom_text **result); + uint32_t offset, struct dom_text **result); dom_exception (*dom_text_get_is_element_content_whitespace)( struct dom_text *text, bool *result); dom_exception (*dom_text_get_whole_text)(struct dom_text *text, @@ -31,13 +31,13 @@ typedef struct dom_text_vtable { } dom_text_vtable; static inline dom_exception dom_text_split_text(struct dom_text *text, - unsigned long offset, struct dom_text **result) + uint32_t offset, struct dom_text **result) { return ((dom_text_vtable *) ((dom_node *) text)->vtable)-> dom_text_split_text(text, offset, result); } #define dom_text_split_text(t, o, r) dom_text_split_text((dom_text *) (t), \ - (unsigned long) (o), (dom_text **) (r)) + (uint32_t) (o), (dom_text **) (r)) static inline dom_exception dom_text_get_is_element_content_whitespace( struct dom_text *text, bool *result) diff --git a/include/dom/events/mouse_event.h b/include/dom/events/mouse_event.h index 8212c72..9cf84bb 100644 --- a/include/dom/events/mouse_event.h +++ b/include/dom/events/mouse_event.h @@ -18,24 +18,24 @@ struct dom_abstract_view; typedef struct dom_mouse_event dom_mouse_event; dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_screen_x(e, x) _dom_mouse_event_get_screen_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_screen_y(e, y) _dom_mouse_event_get_screen_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_client_x(e, x) _dom_mouse_event_get_client_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_client_y(e, y) _dom_mouse_event_get_client_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt, bool *key); @@ -76,32 +76,32 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, bool ctrl, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \ shift, meta, button, et) \ _dom_mouse_event_init((dom_mouse_event *) (e), \ (dom_string *) (t), (bool) (b), (bool) (c),\ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy), (bool) (ctrl),\ (bool) (alt), (bool) (shift), (bool) (meta), \ (unsigned short) (button), (dom_event_target *) (et)) dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail, long screen_x, long screen_y, long client_x, - long client_y, bool ctrl, bool alt, bool shift, bool meta, + int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x, + int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt,\ shift, meta, button, et) \ _dom_mouse_event_init_ns((dom_mouse_event *) (e), \ (dom_string *) (n), (dom_string *) (t),\ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx),\ - (long) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx),\ + (int32_t) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ (bool) (meta), (unsigned short) (button),\ (dom_event_target *) (et)) diff --git a/include/dom/events/mouse_multi_wheel_event.h b/include/dom/events/mouse_multi_wheel_event.h index 8d2a4eb..d8115ad 100644 --- a/include/dom/events/mouse_multi_wheel_event.h +++ b/include/dom/events/mouse_multi_wheel_event.h @@ -18,39 +18,39 @@ struct dom_abstract_view; typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event; dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( - dom_mouse_multi_wheel_event *evt, long *x); + dom_mouse_multi_wheel_event *evt, int32_t *x); #define dom_mouse_multi_wheel_event_get_wheel_delta_x(e, x) \ _dom_mouse_multi_wheel_event_get_wheel_delta_x( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (x)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( - dom_mouse_multi_wheel_event *evt, long *y); + dom_mouse_multi_wheel_event *evt, int32_t *y); #define dom_mouse_multi_wheel_event_get_wheel_delta_y(e, y) \ _dom_mouse_multi_wheel_event_get_wheel_delta_y( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (y)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( - dom_mouse_multi_wheel_event *evt, long *z); + dom_mouse_multi_wheel_event *evt, int32_t *z); #define dom_mouse_multi_wheel_event_get_wheel_delta_z(e, z) \ _dom_mouse_multi_wheel_event_get_wheel_delta_z( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (z)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (z)) dom_exception _dom_mouse_multi_wheel_event_init_ns( dom_mouse_multi_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta_x, - long wheel_delta_y, long wheel_delta_z); + dom_string *modifier_list, int32_t wheel_delta_x, + int32_t wheel_delta_y, int32_t wheel_delta_z); #define dom_mouse_multi_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, x, y, z) \ _dom_mouse_multi_wheel_event_init_ns( \ (dom_mouse_multi_wheel_event *) (e), (dom_string *) (n),\ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (x), (long) (y), (long) (z)) + (dom_string *) (ml), (int32_t) (x), (int32_t) (y), (int32_t) (z)) #endif diff --git a/include/dom/events/mouse_wheel_event.h b/include/dom/events/mouse_wheel_event.h index 34f5e75..f753b68 100644 --- a/include/dom/events/mouse_wheel_event.h +++ b/include/dom/events/mouse_wheel_event.h @@ -17,26 +17,26 @@ struct dom_abstract_view; typedef struct dom_mouse_wheel_event dom_mouse_wheel_event; dom_exception _dom_mouse_wheel_event_get_wheel_delta( - dom_mouse_wheel_event *evt, long *d); + dom_mouse_wheel_event *evt, int32_t *d); #define dom_mouse_wheel_event_get_wheel_delta(e, d) \ _dom_mouse_wheel_event_get_wheel_delta( \ - (dom_mouse_wheel_event *) (e), (long *) (d)) + (dom_mouse_wheel_event *) (e), (int32_t *) (d)) dom_exception _dom_mouse_wheel_event_init_ns( dom_mouse_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta); + dom_string *modifier_list, int32_t wheel_delta); #define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, dt) \ _dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \ (dom_string *) (n), (dom_string *) (t), \ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (dt)) + (dom_string *) (ml), (int32_t) (dt)) #endif diff --git a/include/dom/events/ui_event.h b/include/dom/events/ui_event.h index da321e5..0979a3b 100644 --- a/include/dom/events/ui_event.h +++ b/include/dom/events/ui_event.h @@ -22,24 +22,24 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt, (dom_ui_event *) (e), (struct dom_abstract_view **) (v)) dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, - long *detail); + int32_t *detail); #define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail(\ - (dom_ui_event *) (e), (long *) (d)) + (dom_ui_event *) (e), (int32_t *) (d)) dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init( \ (dom_ui_event *) (e), (dom_string *) (t), (bool) (b), \ - (bool) (c), (struct dom_abstract_view *) (v), (long) (d)) + (bool) (c), (struct dom_abstract_view *) (v), (int32_t) (d)) dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \ (dom_ui_event *) (e), (dom_string *) (n), \ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d)) + (struct dom_abstract_view *) (v), (int32_t) (d)) #endif diff --git a/include/dom/html/html_button_element.h b/include/dom/html/html_button_element.h index 9bbd562..155d125 100644 --- a/include/dom/html/html_button_element.h +++ b/include/dom/html/html_button_element.h @@ -37,10 +37,10 @@ dom_exception dom_html_button_element_set_name( dom_html_button_element *button, dom_string *name); dom_exception dom_html_button_element_get_tab_index( - dom_html_button_element *button, long *tab_index); + dom_html_button_element *button, int32_t *tab_index); dom_exception dom_html_button_element_set_tab_index( - dom_html_button_element *button, unsigned long tab_index); + dom_html_button_element *button, uint32_t tab_index); dom_exception dom_html_button_element_get_type( dom_html_button_element *button, dom_string **type); diff --git a/include/dom/html/html_collection.h b/include/dom/html/html_collection.h index 7322ea8..9521f94 100644 --- a/include/dom/html/html_collection.h +++ b/include/dom/html/html_collection.h @@ -16,9 +16,9 @@ struct dom_node; typedef struct dom_html_collection dom_html_collection; dom_exception dom_html_collection_get_length(dom_html_collection *col, - unsigned long *len); + uint32_t *len); dom_exception dom_html_collection_item(dom_html_collection *col, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); dom_exception dom_html_collection_named_item(dom_html_collection *col, dom_string *name, struct dom_node **node); diff --git a/include/dom/html/html_form_element.h b/include/dom/html/html_form_element.h index c4ee1d8..81637a3 100644 --- a/include/dom/html/html_form_element.h +++ b/include/dom/html/html_form_element.h @@ -18,7 +18,7 @@ typedef struct dom_html_form_element dom_html_form_element; dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, struct dom_html_collection **col); dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, - unsigned long *len); + uint32_t *len); dom_exception dom_html_form_element_get_accept_charset( dom_html_form_element *ele, dom_string **accept_charset); diff --git a/include/dom/html/html_input_element.h b/include/dom/html/html_input_element.h index 6d87bd9..eb6aecd 100644 --- a/include/dom/html/html_input_element.h +++ b/include/dom/html/html_input_element.h @@ -67,10 +67,10 @@ dom_exception dom_html_input_element_set_disabled( dom_html_input_element *input, bool disabled); dom_exception dom_html_input_element_get_max_length( - dom_html_input_element *input, long *max_length); + dom_html_input_element *input, int32_t *max_length); dom_exception dom_html_input_element_set_max_length( - dom_html_input_element *input, unsigned long max_length); + dom_html_input_element *input, uint32_t max_length); dom_exception dom_html_input_element_get_name( dom_html_input_element *input, dom_string **name); @@ -97,10 +97,10 @@ dom_exception dom_html_input_element_set_src( dom_html_input_element *input, dom_string *src); dom_exception dom_html_input_element_get_tab_index( - dom_html_input_element *input, long *tab_index); + dom_html_input_element *input, int32_t *tab_index); dom_exception dom_html_input_element_set_tab_index( - dom_html_input_element *input, unsigned long tab_index); + dom_html_input_element *input, uint32_t tab_index); dom_exception dom_html_input_element_get_type( dom_html_input_element *input, dom_string **type); diff --git a/include/dom/html/html_options_collection.h b/include/dom/html/html_options_collection.h index d11221a..5825fb0 100644 --- a/include/dom/html/html_options_collection.h +++ b/include/dom/html/html_options_collection.h @@ -16,11 +16,11 @@ struct dom_node; typedef struct dom_html_options_collection dom_html_options_collection; dom_exception dom_html_options_collection_get_length( - dom_html_options_collection *col, unsigned long *len); + dom_html_options_collection *col, uint32_t *len); dom_exception dom_html_options_collection_set_length( - dom_html_options_collection *col, unsigned long len); + dom_html_options_collection *col, uint32_t len); dom_exception dom_html_options_collection_item( - dom_html_options_collection *col, unsigned long index, + dom_html_options_collection *col, uint32_t index, struct dom_node **node); dom_exception dom_html_options_collection_named_item( dom_html_options_collection *col, dom_string *name, diff --git a/include/dom/html/html_select_element.h b/include/dom/html/html_select_element.h index 10c002a..a052be1 100644 --- a/include/dom/html/html_select_element.h +++ b/include/dom/html/html_select_element.h @@ -18,13 +18,13 @@ struct dom_html_options_collection; struct dom_html_element; dom_exception dom_html_select_element_get_selected_index( - dom_html_select_element *ele, unsigned long *index); + dom_html_select_element *ele, uint32_t *index); dom_exception dom_html_select_element_set_selected_index( - dom_html_select_element *ele, unsigned long index); + dom_html_select_element *ele, uint32_t index); dom_exception dom_html_select_element_get_length( - dom_html_select_element *ele, unsigned long *len); + dom_html_select_element *ele, uint32_t *len); dom_exception dom_html_select_element_set_length( - dom_html_select_element *ele, unsigned long len); + dom_html_select_element *ele, uint32_t len); dom_exception dom_html_select_element_get_options( dom_html_select_element *ele, struct dom_html_options_collection **col); @@ -37,13 +37,13 @@ dom_exception dom_html_select_element_get_multiple( dom_exception dom_html_select_element_set_multiple( dom_html_select_element *ele, bool multiple); dom_exception dom_html_select_element_get_size( - dom_html_select_element *ele, unsigned long *size); + dom_html_select_element *ele, uint32_t *size); dom_exception dom_html_select_element_set_size( - dom_html_select_element *ele, unsigned long size); + dom_html_select_element *ele, uint32_t size); dom_exception dom_html_select_element_get_tab_index( - dom_html_select_element *ele, unsigned long *tab_index); + dom_html_select_element *ele, uint32_t *tab_index); dom_exception dom_html_select_element_set_tab_index( - dom_html_select_element *ele, unsigned long tab_index); + dom_html_select_element *ele, uint32_t tab_index); /* Functions */ dom_exception dom_html_select_element_add(struct dom_html_element *ele, diff --git a/include/dom/html/html_text_area_element.h b/include/dom/html/html_text_area_element.h index ce610ad..9954e04 100644 --- a/include/dom/html/html_text_area_element.h +++ b/include/dom/html/html_text_area_element.h @@ -37,16 +37,16 @@ dom_exception dom_html_text_area_element_set_disabled( dom_html_text_area_element *text_area, bool disabled); dom_exception dom_html_text_area_element_get_cols( - dom_html_text_area_element *text_area, long *cols); + dom_html_text_area_element *text_area, int32_t *cols); dom_exception dom_html_text_area_element_set_cols( - dom_html_text_area_element *text_area, unsigned long cols); + dom_html_text_area_element *text_area, uint32_t cols); dom_exception dom_html_text_area_element_get_rows( - dom_html_text_area_element *text_area, long *rows); + dom_html_text_area_element *text_area, int32_t *rows); dom_exception dom_html_text_area_element_set_rows( - dom_html_text_area_element *text_area, unsigned long rows); + dom_html_text_area_element *text_area, uint32_t rows); dom_exception dom_html_text_area_element_get_name( dom_html_text_area_element *text_area, dom_string **name); @@ -61,10 +61,10 @@ dom_exception dom_html_text_area_element_set_read_only( dom_html_text_area_element *text_area, bool read_only); dom_exception dom_html_text_area_element_get_tab_index( - dom_html_text_area_element *text_area, long *tab_index); + dom_html_text_area_element *text_area, int32_t *tab_index); dom_exception dom_html_text_area_element_set_tab_index( - dom_html_text_area_element *text_area, unsigned long tab_index); + dom_html_text_area_element *text_area, uint32_t tab_index); dom_exception dom_html_text_area_element_get_type( dom_html_text_area_element *text_area, dom_string **type); diff --git a/src/core/attr.c b/src/core/attr.c index 9db04b6..d9e2b07 100644 --- a/src/core/attr.c +++ b/src/core/attr.c @@ -36,7 +36,7 @@ struct dom_attr { dom_attr_type type; /**< The type of this attribute */ union { - unsigned long lvalue; + uint32_t lvalue; unsigned short svalue; bool bvalue; } value; /**< The special type value of this attribute */ @@ -204,7 +204,7 @@ dom_attr_type dom_attr_get_type(dom_attr *a) * DOM_ATTR_WRONG_TYPE_ERR if the attribute node is not a integer * attribute */ -dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value) +dom_exception dom_attr_get_integer(dom_attr *a, uint32_t *value) { if (a->type != DOM_ATTR_INTEGER) return DOM_ATTR_WRONG_TYPE_ERR; @@ -223,7 +223,7 @@ dom_exception dom_attr_get_integer(dom_attr *a, unsigned long *value) * DOM_ATTR_WRONG_TYPE_ERR if the attribute node is not a integer * attribute */ -dom_exception dom_attr_set_integer(dom_attr *a, unsigned long value) +dom_exception dom_attr_set_integer(dom_attr *a, uint32_t value) { struct dom_document *doc; struct dom_node_internal *ele; @@ -507,7 +507,7 @@ dom_exception _dom_attr_get_value(struct dom_attr *attr, return err; } - /* No longer need textual representation */ + /* No int32_ter need textual representation */ dom_string_unref(tr); /* Finished with previous value */ diff --git a/src/core/characterdata.c b/src/core/characterdata.c index 0883444..c46a5c6 100644 --- a/src/core/characterdata.c +++ b/src/core/characterdata.c @@ -159,7 +159,7 @@ dom_exception _dom_characterdata_set_data(struct dom_characterdata *cdata, * \return DOM_NO_ERR. */ dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, - unsigned long *length) + uint32_t *length) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; @@ -192,13 +192,13 @@ dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, * this implementation; dom_strings are unbounded. */ dom_exception _dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data) + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; uint32_t len, end; - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } @@ -273,7 +273,7 @@ dom_exception _dom_characterdata_append_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, - unsigned long offset, dom_string *data) + uint32_t offset, dom_string *data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; dom_string *temp; @@ -286,7 +286,7 @@ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0) { + if ((int32_t) offset < 0) { return DOM_INDEX_SIZE_ERR; } @@ -335,7 +335,7 @@ dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count) + uint32_t offset, uint32_t count) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; dom_string *temp; @@ -349,7 +349,7 @@ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } @@ -404,7 +404,7 @@ dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::cdata is readonly. */ dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count, + uint32_t offset, uint32_t count, dom_string *data) { struct dom_node_internal *c = (struct dom_node_internal *) cdata; @@ -418,7 +418,7 @@ dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - if ((signed long) offset < 0 || (signed long) count < 0) { + if ((int32_t) offset < 0 || (int32_t) count < 0) { return DOM_INDEX_SIZE_ERR; } diff --git a/src/core/characterdata.h b/src/core/characterdata.h index 23be9c9..0b0889c 100644 --- a/src/core/characterdata.h +++ b/src/core/characterdata.h @@ -34,18 +34,18 @@ dom_exception _dom_characterdata_get_data(struct dom_characterdata *cdata, dom_exception _dom_characterdata_set_data(struct dom_characterdata *cdata, dom_string *data); dom_exception _dom_characterdata_get_length(struct dom_characterdata *cdata, - unsigned long *length); + uint32_t *length); dom_exception _dom_characterdata_substring_data( - struct dom_characterdata *cdata, unsigned long offset, - unsigned long count, dom_string **data); + struct dom_characterdata *cdata, uint32_t offset, + uint32_t count, dom_string **data); dom_exception _dom_characterdata_append_data(struct dom_characterdata *cdata, dom_string *data); dom_exception _dom_characterdata_insert_data(struct dom_characterdata *cdata, - unsigned long offset, dom_string *data); + uint32_t offset, dom_string *data); dom_exception _dom_characterdata_delete_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count); + uint32_t offset, uint32_t count); dom_exception _dom_characterdata_replace_data(struct dom_characterdata *cdata, - unsigned long offset, unsigned long count, + uint32_t offset, uint32_t count, dom_string *data); dom_exception _dom_characterdata_get_text_content( dom_node_internal *node, diff --git a/src/core/element.c b/src/core/element.c index 8908968..df40eaf 100644 --- a/src/core/element.c +++ b/src/core/element.c @@ -485,7 +485,7 @@ static dom_exception _dom_element_set_id_attr(struct dom_element *element, /* The operation set for namednodemap */ static dom_exception attributes_get_length(void *priv, - unsigned long *length); + uint32_t *length); static dom_exception attributes_get_named_item(void *priv, dom_string *name, struct dom_node **node); static dom_exception attributes_set_named_item(void *priv, @@ -494,7 +494,7 @@ static dom_exception attributes_remove_named_item( void *priv, dom_string *name, struct dom_node **node); static dom_exception attributes_item(void *priv, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); static dom_exception attributes_get_named_item_ns( void *priv, dom_string *namespace, dom_string *localname, struct dom_node **node); @@ -739,7 +739,7 @@ dom_exception _dom_element_get_attribute_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -944,7 +944,7 @@ dom_exception _dom_element_get_attribute_node_ns(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to recieve previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1843,7 +1843,7 @@ dom_exception _dom_element_get_attr_node(struct dom_element *element, * \param attr The attribute node to add * \param result Pointer to location to receive previous node * \return DOM_NO_ERR on success, - * DOM_WRONG_DOCUMENT_ERR if ::attr does not belong to the + * DOM_WRONG_DOCUMENT_ERR if ::attr does not beint32_t to the * same document as ::element, * DOM_NO_MODIFICATION_ALLOWED_ERR if ::element is readonly, * DOM_INUSE_ATTRIBUTE_ERR if ::attr is already an attribute @@ -1869,7 +1869,7 @@ dom_exception _dom_element_set_attr_node(struct dom_element *element, /** \todo validate name */ - /* Ensure element and attribute belong to the same document */ + /* Ensure element and attribute beint32_t to the same document */ if (e->owner != attr_node->owner) return DOM_WRONG_DOCUMENT_ERR; @@ -2226,7 +2226,7 @@ dom_exception _dom_element_get_id(struct dom_element *ele, dom_string **id) /* Implementation function for NamedNodeMap, see core/namednodemap.h for * details */ -dom_exception attributes_get_length(void *priv, unsigned long *length) +dom_exception attributes_get_length(void *priv, uint32_t *length) { dom_element *e = (dom_element *) priv; @@ -2283,7 +2283,7 @@ dom_exception attributes_remove_named_item( /* Implementation function for NamedNodeMap, see core/namednodemap.h for * details */ dom_exception attributes_item(void *priv, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { dom_attr_list * match = NULL; unsigned int num = index + 1; diff --git a/src/core/implementation.c b/src/core/implementation.c index 26908f2..6041c22 100644 --- a/src/core/implementation.c +++ b/src/core/implementation.c @@ -266,7 +266,7 @@ dom_exception dom_implementation_create_document( return err; } - /* No longer interested in inserted node */ + /* No int32_ter interested in inserted node */ dom_node_unref(inserted); /* Done with element */ diff --git a/src/core/namednodemap.c b/src/core/namednodemap.c index f68cd3b..ada7e90 100644 --- a/src/core/namednodemap.c +++ b/src/core/namednodemap.c @@ -117,7 +117,7 @@ void dom_namednodemap_unref(dom_namednodemap *map) * \return DOM_NO_ERR. */ dom_exception dom_namednodemap_get_length(dom_namednodemap *map, - unsigned long *length) + uint32_t *length) { assert(map->opt != NULL); return map->opt->namednodemap_get_length(map->priv, length); @@ -209,7 +209,7 @@ dom_exception _dom_namednodemap_remove_named_item( * should unref the node once it has finished with it. */ dom_exception _dom_namednodemap_item(dom_namednodemap *map, - unsigned long index, dom_node **node) + uint32_t index, dom_node **node) { assert(map->opt != NULL); return map->opt->namednodemap_item(map->priv, index, node); diff --git a/src/core/namednodemap.h b/src/core/namednodemap.h index 079294c..62e5858 100644 --- a/src/core/namednodemap.h +++ b/src/core/namednodemap.h @@ -19,7 +19,7 @@ struct dom_namednodemap; struct nnm_operation { dom_exception (*namednodemap_get_length)(void *priv, - unsigned long *length); + uint32_t *length); dom_exception (*namednodemap_get_named_item)(void *priv, dom_string *name, struct dom_node **node); @@ -32,7 +32,7 @@ struct nnm_operation { struct dom_node **node); dom_exception (*namednodemap_item)(void *priv, - unsigned long index, struct dom_node **node); + uint32_t index, struct dom_node **node); dom_exception (*namednodemap_get_named_item_ns)( void *priv, dom_string *namespace, diff --git a/src/core/node.c b/src/core/node.c index ca8fd72..b14f4fa 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -167,7 +167,7 @@ dom_exception _dom_node_initialise(dom_node_internal *node, node->previous = NULL; node->next = NULL; - /* Note: nodes do not reference the document to which they belong, + /* Note: nodes do not reference the document to which they beint32_t, * as this would result in the document never being destroyed once * the client has finished with it. The document will be aware of * any nodes that it owns through 2 mechanisms: @@ -783,7 +783,7 @@ dom_exception _dom_node_insert_before(dom_node_internal *node, * also need to set its owner. */ if (node->type == DOM_DOCUMENT_NODE && new_child->type == DOM_DOCUMENT_TYPE_NODE) { - /* See long comment in _dom_node_initialise as to why + /* See int32_t comment in _dom_node_initialise as to why * we don't ref the document here */ new_child->owner = (struct dom_document *) node; } @@ -1277,7 +1277,7 @@ dom_exception _dom_node_set_prefix(dom_node_internal *node, return DOM_NO_MODIFICATION_ALLOWED_ERR; } - /* No longer want existing prefix */ + /* No int32_ter want existing prefix */ if (node->prefix != NULL) { dom_string_unref(node->prefix); } diff --git a/src/core/nodelist.c b/src/core/nodelist.c index 8ce9475..e2a1435 100644 --- a/src/core/nodelist.c +++ b/src/core/nodelist.c @@ -196,10 +196,10 @@ void dom_nodelist_unref(dom_nodelist *list) * \param length Pointer to location to receive length * \return DOM_NO_ERR. */ -dom_exception dom_nodelist_get_length(dom_nodelist *list, unsigned long *length) +dom_exception dom_nodelist_get_length(dom_nodelist *list, uint32_t *length) { dom_node_internal *cur = list->root->first_child; - unsigned long len = 0; + uint32_t len = 0; /* Traverse data structure */ while (cur != NULL) { @@ -300,10 +300,10 @@ dom_exception dom_nodelist_get_length(dom_nodelist *list, unsigned long *length) * should unref the node once it has finished with it. */ dom_exception _dom_nodelist_item(dom_nodelist *list, - unsigned long index, dom_node **node) + uint32_t index, dom_node **node) { dom_node_internal *cur = list->root->first_child; - unsigned long count = 0; + uint32_t count = 0; /* Traverse data structure */ while (cur != NULL) { diff --git a/src/core/text.c b/src/core/text.c index 532ee13..94718a2 100644 --- a/src/core/text.c +++ b/src/core/text.c @@ -178,12 +178,12 @@ void _dom_text_finalise(dom_text *text) * once it has finished with it. */ dom_exception _dom_text_split_text(dom_text *text, - unsigned long offset, dom_text **result) + uint32_t offset, dom_text **result) { dom_node_internal *t = (dom_node_internal *) text; dom_string *value; dom_text *res; - unsigned long len; + uint32_t len; dom_exception err; if (_dom_node_readonly(t)) { diff --git a/src/core/text.h b/src/core/text.h index 1cc5b1e..26424ce 100644 --- a/src/core/text.h +++ b/src/core/text.h @@ -43,7 +43,7 @@ void _dom_text_finalise(dom_text *text); /* Virtual functions for dom_text */ dom_exception _dom_text_split_text(dom_text *text, - unsigned long offset, dom_text **result); + uint32_t offset, dom_text **result); dom_exception _dom_text_get_is_element_content_whitespace( dom_text *text, bool *result); dom_exception _dom_text_get_whole_text(dom_text *text, diff --git a/src/events/mouse_event.c b/src/events/mouse_event.c index a2a97bb..3e76879 100644 --- a/src/events/mouse_event.c +++ b/src/events/mouse_event.c @@ -66,7 +66,7 @@ void _virtual_dom_mouse_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, - long *x) + int32_t *x) { *x = evt->sx; @@ -81,7 +81,7 @@ dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, - long *y) + int32_t *y) { *y = evt->sy; @@ -96,7 +96,7 @@ dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, - long *x) + int32_t *x) { *x = evt->cx; @@ -111,7 +111,7 @@ dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt, - long *y) + int32_t *y) { *y = evt->cy; @@ -282,8 +282,8 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, */ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, bool ctrl, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et) { @@ -337,8 +337,8 @@ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail, long screen_x, long screen_y, long client_x, - long client_y, bool ctrl, bool alt, bool shift, bool meta, + int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x, + int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et) { evt->sx = screen_x; diff --git a/src/events/mouse_event.h b/src/events/mouse_event.h index 85246e7..e49bcd7 100644 --- a/src/events/mouse_event.h +++ b/src/events/mouse_event.h @@ -18,10 +18,10 @@ struct dom_mouse_event { struct dom_ui_event base; /**< Base class */ - long sx; /**< ScreenX */ - long sy; /**< ScreenY */ - long cx; /**< ClientX */ - long cy; /**< ClientY */ + int32_t sx; /**< ScreenX */ + int32_t sy; /**< ScreenY */ + int32_t cx; /**< ClientX */ + int32_t cy; /**< ClientY */ uint32_t modifier_state; /**< The modifier keys state */ diff --git a/src/events/mouse_multi_wheel_event.c b/src/events/mouse_multi_wheel_event.c index 8c4615b..35f91af 100644 --- a/src/events/mouse_multi_wheel_event.c +++ b/src/events/mouse_multi_wheel_event.c @@ -67,7 +67,7 @@ void _virtual_dom_mouse_multi_wheel_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( - dom_mouse_multi_wheel_event *evt, long *x) + dom_mouse_multi_wheel_event *evt, int32_t *x) { *x = evt->x; @@ -82,7 +82,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( - dom_mouse_multi_wheel_event *evt, long *y) + dom_mouse_multi_wheel_event *evt, int32_t *y) { *y = evt->y; @@ -97,7 +97,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( * \return DOM_NO_ERR. */ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( - dom_mouse_multi_wheel_event *evt, long *z) + dom_mouse_multi_wheel_event *evt, int32_t *z) { *z = evt->z; @@ -129,11 +129,11 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( dom_exception _dom_mouse_multi_wheel_event_init_ns( dom_mouse_multi_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta_x, - long wheel_delta_y, long wheel_delta_z) + dom_string *modifier_list, int32_t wheel_delta_x, + int32_t wheel_delta_y, int32_t wheel_delta_z) { dom_exception err; dom_mouse_event *e = (dom_mouse_event *) evt; diff --git a/src/events/mouse_multi_wheel_event.h b/src/events/mouse_multi_wheel_event.h index 9b854c9..0476911 100644 --- a/src/events/mouse_multi_wheel_event.h +++ b/src/events/mouse_multi_wheel_event.h @@ -18,9 +18,9 @@ struct dom_mouse_multi_wheel_event { struct dom_mouse_event base; /**< The base class */ - long x; /**< The wheelDeltaX */ - long y; /**< The wheelDeltaY */ - long z; /**< The wheelDeltaZ */ + int32_t x; /**< The wheelDeltaX */ + int32_t y; /**< The wheelDeltaY */ + int32_t z; /**< The wheelDeltaZ */ }; /* Constructor */ diff --git a/src/events/mouse_wheel_event.c b/src/events/mouse_wheel_event.c index cce4fac..778a53b 100644 --- a/src/events/mouse_wheel_event.c +++ b/src/events/mouse_wheel_event.c @@ -65,7 +65,7 @@ void _virtual_dom_mouse_wheel_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mouse_wheel_event_get_wheel_delta( - dom_mouse_wheel_event *evt, long *d) + dom_mouse_wheel_event *evt, int32_t *d) { *d = evt->delta; @@ -95,10 +95,10 @@ dom_exception _dom_mouse_wheel_event_get_wheel_delta( dom_exception _dom_mouse_wheel_event_init_ns( dom_mouse_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta) + dom_string *modifier_list, int32_t wheel_delta) { dom_exception err; dom_mouse_event *e = (dom_mouse_event *) evt; diff --git a/src/events/mouse_wheel_event.h b/src/events/mouse_wheel_event.h index 9247d4a..e78abf6 100644 --- a/src/events/mouse_wheel_event.h +++ b/src/events/mouse_wheel_event.h @@ -18,7 +18,7 @@ struct dom_mouse_wheel_event { struct dom_mouse_event base; /**< The base class */ - long delta; /**< The wheelDelta */ + int32_t delta; /**< The wheelDelta */ }; /* Constructor */ diff --git a/src/events/ui_event.c b/src/events/ui_event.c index 0082332..911b0d0 100644 --- a/src/events/ui_event.c +++ b/src/events/ui_event.c @@ -84,7 +84,7 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, - long *detail) + int32_t *detail) { *detail = evt->detail; @@ -104,7 +104,7 @@ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, */ dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail) + int32_t detail) { evt->view = view; evt->detail = detail; @@ -127,7 +127,7 @@ dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail) + int32_t detail) { evt->view = view; evt->detail = detail; diff --git a/src/events/ui_event.h b/src/events/ui_event.h index d90f6d7..e60ed35 100644 --- a/src/events/ui_event.h +++ b/src/events/ui_event.h @@ -32,7 +32,7 @@ typedef enum { struct dom_ui_event { struct dom_event base; /**< The base class */ struct dom_abstract_view *view; /**< The AbstractView */ - long detail; /**< Some private data for this event */ + int32_t detail; /**< Some private data for this event */ }; /* Constructor */ diff --git a/src/html/html_button_element.c b/src/html/html_button_element.c index 47fdb7b..95b5d31 100644 --- a/src/html/html_button_element.c +++ b/src/html/html_button_element.c @@ -196,16 +196,16 @@ SIMPLE_GET(type); SIMPLE_GET_SET(value); dom_exception dom_html_button_element_get_tab_index( - dom_html_button_element *button, long *tab_index) + dom_html_button_element *button, int32_t *tab_index) { - return dom_html_element_get_long_property(&button->base, "tabindex", + return dom_html_element_get_int32_t_property(&button->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_button_element_set_tab_index( - dom_html_button_element *button, unsigned long tab_index) + dom_html_button_element *button, uint32_t tab_index) { - return dom_html_element_set_long_property(&button->base, "tabindex", + return dom_html_element_set_int32_t_property(&button->base, "tabindex", SLEN("tabindex"), tab_index); } diff --git a/src/html/html_collection.c b/src/html/html_collection.c index 1e43940..704d384 100644 --- a/src/html/html_collection.c +++ b/src/html/html_collection.c @@ -25,7 +25,7 @@ * \param doc The document * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \param col The result collection object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -49,7 +49,7 @@ dom_exception _dom_html_collection_create(struct dom_html_document *doc, * \param col The collection object to be initialised * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \return DOM_NO_ERR on success. */ dom_exception _dom_html_collection_initialise(struct dom_html_document *doc, @@ -113,7 +113,7 @@ void _dom_html_collection_destroy(struct dom_html_collection *col) * \return DOM_NO_ERR on success. */ dom_exception dom_html_collection_get_length(dom_html_collection *col, - unsigned long *len) + uint32_t *len) { struct dom_node_internal *node = col->root; *len = 0; @@ -157,10 +157,10 @@ dom_exception dom_html_collection_get_length(dom_html_collection *col, * \return DOM_NO_ERR on success. */ dom_exception dom_html_collection_item(dom_html_collection *col, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { struct dom_node_internal *n = col->root; - unsigned long len = 0; + uint32_t len = 0; while (n != NULL) { if (n->type == DOM_ELEMENT_NODE && diff --git a/src/html/html_document.c b/src/html/html_document.c index ffc2e1c..1b238e9 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -340,7 +340,7 @@ dom_exception _dom_html_document_get_title(dom_html_document *doc, } else { dom_element *node; dom_nodelist *nodes; - unsigned long len; + uint32_t len; exc = dom_document_get_elements_by_tag_name(doc, doc->memoised[hds_TITLE], diff --git a/src/html/html_element.c b/src/html/html_element.c index b3b3bfc..9dc3155 100644 --- a/src/html/html_element.c +++ b/src/html/html_element.c @@ -220,7 +220,7 @@ dom_exception _dom_html_element_get_elements_by_tag_name_ns( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_element_get_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool *has) + const char *name, uint32_t len, bool *has) { dom_string *str = NULL; dom_attr *a = NULL; @@ -259,7 +259,7 @@ fail: * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_element_set_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool has) + const char *name, uint32_t len, bool has) { dom_string *str = NULL; dom_attr *a = NULL; @@ -325,7 +325,7 @@ static char *_strndup(const char *s, size_t n) } /** - * Get the a long property + * Get the a int32_t property * * \param ele The dom_html_element object * \param name The name of the attribute @@ -333,8 +333,8 @@ static char *_strndup(const char *s, size_t n) * \param value The returned value, or -1 if prop. not set * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_element_get_long_property(dom_html_element *ele, - const char *name, unsigned long len, long *value) +dom_exception dom_html_element_get_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, int32_t *value) { dom_string *str = NULL, *s2 = NULL; dom_attr *a = NULL; @@ -372,7 +372,7 @@ fail: } /** - * Set a long property + * Set a int32_t property * * \param ele The dom_html_element object * \param name The name of the attribute @@ -380,8 +380,8 @@ fail: * \param value The value * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_element_set_long_property(dom_html_element *ele, - const char *name, unsigned long len, unsigned long value) +dom_exception dom_html_element_set_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, uint32_t value) { dom_string *str = NULL, *svalue = NULL; dom_exception err; @@ -391,7 +391,7 @@ dom_exception dom_html_element_set_long_property(dom_html_element *ele, if (err != DOM_NO_ERR) goto fail; - if (snprintf(numbuffer, 32, "%lu", value) == 32) + if (snprintf(numbuffer, 32, "%u", value) == 32) numbuffer[31] = '\0'; err = dom_string_create((const uint8_t *) numbuffer, diff --git a/src/html/html_element.h b/src/html/html_element.h index 140e3f1..a1130cc 100644 --- a/src/html/html_element.h +++ b/src/html/html_element.h @@ -113,14 +113,14 @@ dom_exception _dom_html_element_set_class_name(dom_html_element *element, /* Some common functions used by all child classes */ dom_exception dom_html_element_get_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool *has); + const char *name, uint32_t len, bool *has); dom_exception dom_html_element_set_bool_property(dom_html_element *ele, - const char *name, unsigned long len, bool has); + const char *name, uint32_t len, bool has); -dom_exception dom_html_element_get_long_property(dom_html_element *ele, - const char *name, unsigned long len, long *value); -dom_exception dom_html_element_set_long_property(dom_html_element *ele, - const char *name, unsigned long len, unsigned long value); +dom_exception dom_html_element_get_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, int32_t *value); +dom_exception dom_html_element_set_int32_t_property(dom_html_element *ele, + const char *name, uint32_t len, uint32_t value); extern struct dom_html_element_vtable _dom_html_element_vtable; diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index fcdf42e..55ec0e9 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -168,7 +168,7 @@ dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, - unsigned long *len) + uint32_t *len) { dom_exception err; diff --git a/src/html/html_input_element.c b/src/html/html_input_element.c index 694eb22..9586abb 100644 --- a/src/html/html_input_element.c +++ b/src/html/html_input_element.c @@ -356,30 +356,30 @@ SIMPLE_GET_SET(use_map); SIMPLE_GET_SET(value); dom_exception dom_html_input_element_get_tab_index( - dom_html_input_element *input, long *tab_index) + dom_html_input_element *input, int32_t *tab_index) { - return dom_html_element_get_long_property(&input->base, "tabindex", + return dom_html_element_get_int32_t_property(&input->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_input_element_set_tab_index( - dom_html_input_element *input, unsigned long tab_index) + dom_html_input_element *input, uint32_t tab_index) { - return dom_html_element_set_long_property(&input->base, "tabindex", + return dom_html_element_set_int32_t_property(&input->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_input_element_get_max_length( - dom_html_input_element *input, long *max_length) + dom_html_input_element *input, int32_t *max_length) { - return dom_html_element_get_long_property(&input->base, "maxlength", + return dom_html_element_get_int32_t_property(&input->base, "maxlength", SLEN("maxlength"), max_length); } dom_exception dom_html_input_element_set_max_length( - dom_html_input_element *input, unsigned long max_length) + dom_html_input_element *input, uint32_t max_length) { - return dom_html_element_set_long_property(&input->base, "maxlength", + return dom_html_element_set_int32_t_property(&input->base, "maxlength", SLEN("maxlength"), max_length); } diff --git a/src/html/html_options_collection.c b/src/html/html_options_collection.c index 26926bf..0583d9c 100644 --- a/src/html/html_options_collection.c +++ b/src/html/html_options_collection.c @@ -26,7 +26,7 @@ * \param doc The document * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \param col The result collection object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -51,7 +51,7 @@ dom_exception _dom_html_options_collection_create(struct dom_html_document *doc, * \param col The collection object to be initialised * \param root The root element of the collection * \param ic The callback function used to determin whether certain node - * belongs to the collection + * beint32_ts to the collection * \return DOM_NO_ERR on success. */ dom_exception _dom_html_options_collection_initialise(struct dom_html_document *doc, @@ -95,7 +95,7 @@ void _dom_html_options_collection_destroy(struct dom_html_options_collection *co * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_get_length(dom_html_options_collection *col, - unsigned long *len) + uint32_t *len) { return dom_html_collection_get_length(&col->base, len); } @@ -108,7 +108,7 @@ dom_exception dom_html_options_collection_get_length(dom_html_options_collection * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_set_length( - dom_html_options_collection *col, unsigned long len) + dom_html_options_collection *col, uint32_t len) { UNUSED(col); UNUSED(len); @@ -126,7 +126,7 @@ dom_exception dom_html_options_collection_set_length( * \return DOM_NO_ERR on success. */ dom_exception dom_html_options_collection_item(dom_html_options_collection *col, - unsigned long index, struct dom_node **node) + uint32_t index, struct dom_node **node) { return dom_html_collection_item(&col->base, index, node); } diff --git a/src/html/html_select_element.c b/src/html/html_select_element.c index 2d92c5f..58c08bc 100644 --- a/src/html/html_select_element.c +++ b/src/html/html_select_element.c @@ -137,7 +137,7 @@ dom_exception _dom_html_select_element_copy(dom_node_internal *old, * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_get_selected_index( - dom_html_select_element *ele, unsigned long *index) + dom_html_select_element *ele, uint32_t *index) { *index = ele->selected; @@ -152,7 +152,7 @@ dom_exception dom_html_select_element_get_selected_index( * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_set_selected_index( - dom_html_select_element *ele, unsigned long index) + dom_html_select_element *ele, uint32_t index) { ele->selected = index; @@ -167,7 +167,7 @@ dom_exception dom_html_select_element_set_selected_index( * \return DOM_NO_ERR on success. */ dom_exception dom_html_select_element_get_length( - dom_html_select_element *ele, unsigned long *len) + dom_html_select_element *ele, uint32_t *len) { dom_exception err; dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); @@ -194,7 +194,7 @@ dom_exception dom_html_select_element_get_length( * todo: how to deal with set the len of the children option objects? */ dom_exception dom_html_select_element_set_length( - dom_html_select_element *ele, unsigned long len) + dom_html_select_element *ele, uint32_t len) { UNUSED(ele); UNUSED(len); @@ -291,13 +291,13 @@ dom_exception dom_html_select_element_set_multiple( } dom_exception dom_html_select_element_get_size( - dom_html_select_element *ele, unsigned long *size); + dom_html_select_element *ele, uint32_t *size); dom_exception dom_html_select_element_set_size( - dom_html_select_element *ele, unsigned long size); + dom_html_select_element *ele, uint32_t size); dom_exception dom_html_select_element_get_tab_index( - dom_html_select_element *ele, unsigned long *tab_index); + dom_html_select_element *ele, uint32_t *tab_index); dom_exception dom_html_select_element_set_tab_index( - dom_html_select_element *ele, unsigned long tab_index); + dom_html_select_element *ele, uint32_t tab_index); /* Functions */ dom_exception dom_html_select_element_add(struct dom_html_element *ele, diff --git a/src/html/html_select_element.h b/src/html/html_select_element.h index 68c51e3..ae5c7dd 100644 --- a/src/html/html_select_element.h +++ b/src/html/html_select_element.h @@ -16,7 +16,7 @@ struct dom_html_select_element { struct dom_html_element base; /**< The base class */ - long selected; + int32_t selected; /**< The selected element's index */ dom_html_options_collection *options; /**< The options objects */ diff --git a/src/html/html_text_area_element.c b/src/html/html_text_area_element.c index 887a2c0..1c7534c 100644 --- a/src/html/html_text_area_element.c +++ b/src/html/html_text_area_element.c @@ -365,44 +365,44 @@ dom_exception dom_html_text_area_element_get_type( } dom_exception dom_html_text_area_element_get_tab_index( - dom_html_text_area_element *text_area, long *tab_index) + dom_html_text_area_element *text_area, int32_t *tab_index) { - return dom_html_element_get_long_property(&text_area->base, "tabindex", + return dom_html_element_get_int32_t_property(&text_area->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_text_area_element_set_tab_index( - dom_html_text_area_element *text_area, unsigned long tab_index) + dom_html_text_area_element *text_area, uint32_t tab_index) { - return dom_html_element_set_long_property(&text_area->base, "tabindex", + return dom_html_element_set_int32_t_property(&text_area->base, "tabindex", SLEN("tabindex"), tab_index); } dom_exception dom_html_text_area_element_get_cols( - dom_html_text_area_element *text_area, long *cols) + dom_html_text_area_element *text_area, int32_t *cols) { - return dom_html_element_get_long_property(&text_area->base, "cols", + return dom_html_element_get_int32_t_property(&text_area->base, "cols", SLEN("cols"), cols); } dom_exception dom_html_text_area_element_set_cols( - dom_html_text_area_element *text_area, unsigned long cols) + dom_html_text_area_element *text_area, uint32_t cols) { - return dom_html_element_set_long_property(&text_area->base, "cols", + return dom_html_element_set_int32_t_property(&text_area->base, "cols", SLEN("cols"), cols); } dom_exception dom_html_text_area_element_get_rows( - dom_html_text_area_element *text_area, long *rows) + dom_html_text_area_element *text_area, int32_t *rows) { - return dom_html_element_get_long_property(&text_area->base, "rows", + return dom_html_element_get_int32_t_property(&text_area->base, "rows", SLEN("rows"), rows); } dom_exception dom_html_text_area_element_set_rows( - dom_html_text_area_element *text_area, unsigned long rows) + dom_html_text_area_element *text_area, uint32_t rows) { - return dom_html_element_set_long_property(&text_area->base, "rows", + return dom_html_element_set_int32_t_property(&text_area->base, "rows", SLEN("rows"), rows); } diff --git a/src/utils/character_valid.c b/src/utils/character_valid.c index e966ec1..81c3558 100644 --- a/src/utils/character_valid.c +++ b/src/utils/character_valid.c @@ -161,11 +161,11 @@ bool binary_search(unsigned int ch, int left, int right, } /** - * Test whether certain character belongs to some XML character group + * Test whether certain character beint32_ts to some XML character group * * \param ch The character being tested * \param group The character group - * \return true if the character belongs to the group, false otherwise. + * \return true if the character beint32_ts to the group, false otherwise. * * Generally, we use an algorithm like binary search to find the desired * character in the group. The time complexity is about lg(n) and here n is diff --git a/src/utils/hashtable.c b/src/utils/hashtable.c index db6ece8..fb7c84a 100644 --- a/src/utils/hashtable.c +++ b/src/utils/hashtable.c @@ -114,7 +114,7 @@ dom_hash_table *_dom_hash_clone(dom_hash_table *ht) * Destroys a hash table, freeing all memory associated with it. * * \param ht Hash table to destroy. After the function returns, this - * will nolonger be valid + * will noint32_ter be valid */ void _dom_hash_destroy(dom_hash_table *ht) { @@ -305,7 +305,7 @@ uint32_t _dom_hash_get_length(struct dom_hash_table *ht) * If you make changes to this hash table implementation, please rerun this * test, and if possible, through valgrind to make sure there are no memory * leaks or invalid memory accesses. If you add new functionality, please - * include a test for it that has good coverage along side the other tests. + * include a test for it that has good coverage aint32_t side the other tests. */ #ifdef TEST_RIG diff --git a/test/testutils/domtsasserts.c b/test/testutils/domtsasserts.c index e5220e0..41cacf2 100644 --- a/test/testutils/domtsasserts.c +++ b/test/testutils/domtsasserts.c @@ -50,7 +50,7 @@ bool is_same_int(int expected, int actual) return expected == actual; } -bool is_same_unsigned_long(unsigned long expected, unsigned long actual) +bool is_same_unsigned_int32_t(uint32_t expected, uint32_t actual) { return expected == actual; } @@ -69,7 +69,7 @@ bool is_equals_bool(bool expected, bool actual, bool dummy) return expected == actual; } -bool is_equals_unsigned_long(unsigned long expected, unsigned long actual, bool dummy) +bool is_equals_unsigned_int32_t(uint32_t expected, uint32_t actual, bool dummy) { UNUSED(dummy); @@ -156,9 +156,9 @@ bool is_instanceof(const char *type, dom_node *node) } -bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map) +bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map) { - unsigned long len; + uint32_t len; dom_exception err; err = dom_namednodemap_get_length(map, &len); @@ -170,9 +170,9 @@ bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map) return size == len; } -bool is_size_domnodelist(unsigned long size, dom_nodelist *list) +bool is_size_domnodelist(uint32_t size, dom_nodelist *list) { - unsigned long len; + uint32_t len; dom_exception err; err = dom_nodelist_get_length(list, &len); @@ -184,7 +184,7 @@ bool is_size_domnodelist(unsigned long size, dom_nodelist *list) return size == len; } -bool is_size_list(unsigned long size, list *list) +bool is_size_list(uint32_t size, list *list) { return size == list->size; } diff --git a/test/testutils/domtsasserts.h b/test/testutils/domtsasserts.h index bc214e8..e18509c 100644 --- a/test/testutils/domtsasserts.h +++ b/test/testutils/domtsasserts.h @@ -30,10 +30,10 @@ bool is_null(void *arg); bool is_same(void *excepted, void *actual); bool is_same_int(int excepted, int actual); -bool is_same_unsigned_long(unsigned long excepted, unsigned long actual); +bool is_same_unsigned_int32_t(uint32_t excepted, uint32_t actual); bool is_equals_int(int excepted, int actual, bool dummy); -bool is_equals_unsigned_long(unsigned long excepted, unsigned long actual, bool dummy); +bool is_equals_unsigned_int32_t(uint32_t excepted, uint32_t actual, bool dummy); bool is_equals_bool(bool excepted, bool actual, bool dummy); bool is_equals_string(const char *excepted, dom_string *actual, bool ignoreCase); @@ -45,9 +45,9 @@ bool is_equals_list(list *expected, list *actual, bool ignoreCase); bool is_instanceof(const char *type, dom_node *node); -bool is_size_domnamednodemap(unsigned long size, dom_namednodemap *map); -bool is_size_domnodelist(unsigned long size, dom_nodelist *list); -bool is_size_list(unsigned long size, list *list); +bool is_size_domnamednodemap(uint32_t size, dom_namednodemap *map); +bool is_size_domnodelist(uint32_t size, dom_nodelist *list); +bool is_size_list(uint32_t size, list *list); bool is_uri_equals(const char *scheme, const char *path, const char *host, const char *file, const char *name, const char *query, diff --git a/test/testutils/foreach.c b/test/testutils/foreach.c index 764920c..e068201 100644 --- a/test/testutils/foreach.c +++ b/test/testutils/foreach.c @@ -38,7 +38,7 @@ void foreach_initialise_domnamednodemap(dom_namednodemap *map, unsigned int *ite bool _get_next_domnodelist(dom_nodelist *list, unsigned int *iterator, dom_node **ret) { dom_exception err; - unsigned long len; + uint32_t len; err = dom_nodelist_get_length(list, &len); if (err != DOM_NO_ERR) @@ -80,7 +80,7 @@ bool get_next_list(list *list, unsigned int *iterator, void **ret) bool _get_next_domnamednodemap(dom_namednodemap *map, unsigned int *iterator, dom_node **ret) { dom_exception err; - unsigned long len; + uint32_t len; err = dom_namednodemap_get_length(map, &len); if (err != DOM_NO_ERR) -- Document Object Model library

10 years, 6 months

1
0
0 / 0

nsgenjsbind: branch master updated. b19fd9d8772824d12d33a3236710a9b6e96bda76

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenjsbind.git/shortlog/b19fd9d8772824d12... ...commit http://git.netsurf-browser.org/nsgenjsbind.git/commit/b19fd9d8772824d12d3... ...tree http://git.netsurf-browser.org/nsgenjsbind.git/tree/b19fd9d8772824d12d33a... The branch, master has been updated via b19fd9d8772824d12d33a3236710a9b6e96bda76 (commit) from 751839d208b02af3d0a2329e6d75a90d51a247ff (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/nsgenjsbind.git/commitdiff/b19fd9d8772824d... commit b19fd9d8772824d12d33a3236710a9b6e96bda76 Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk> Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk> clean up parser warnings diff --git a/src/genjsbind-parser.y b/src/genjsbind-parser.y index 17d1850..98ae18a 100644 --- a/src/genjsbind-parser.y +++ b/src/genjsbind-parser.y @@ -19,6 +19,8 @@ char *errtxt; static void genjsbind_error(YYLTYPE *locp, struct genbind_node **genbind_ast, const char *str) { + locp = locp; + genbind_ast = genbind_ast; errtxt = strdup(str); } @@ -71,7 +73,10 @@ char *errtxt; Input : - Statements { *genbind_ast = $1 } + Statements + { + *genbind_ast = $1; + } ; diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index c925ef9..d1ac37c 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -57,7 +57,6 @@ static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) static int webidl_hdrcomment_cb(struct genbind_node *node, void *ctx) { - FILE *outfile = ctx; genbind_node_for_each_type(genbind_node_getnode(node), GENBIND_NODE_TYPE_STRING, webidl_hdrcomments_cb, diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 3c93305..6c61de9 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -9,7 +9,10 @@ #ifndef genjsbind_webidl_ast_h #define genjsbind_webidl_ast_h -#define WEBIDL_NODE_TYPE_ROOT 0 +enum webidl_node_type { + WEBIDL_NODE_TYPE_ROOT = 0, + +}; struct webidl_node { int type; diff --git a/src/webidl-parser.y b/src/webidl-parser.y index b45a8bd..c6d981f 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -107,10 +107,20 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %token <text> TOK_JAVADOC %type <text> Inheritance -%type <ifmember> InterfaceMembers %type <node> Definitions %type <node> Definition +%type <node> Partial +%type <node> Dictionary +%type <node> Exception +%type <node> Enum +%type <node> Typedef +%type <node> ImplementsStatement +%type <node> Interface +%type <node> InterfaceMembers +%type <node> CallbackOrInterface +%type <node> CallbackRest +%type <node> CallbackRestOrInterface %% @@ -158,8 +168,12 @@ Definition: ; /* [3] */ -CallbackOrInterface: +CallbackOrInterface + : TOK_CALLBACK CallbackRestOrInterface + { + $$ = $2; + } | Interface ; @@ -175,6 +189,7 @@ CallbackRestOrInterface: Interface: TOK_INTERFACE TOK_IDENTIFIER Inheritance '{' InterfaceMembers '}' ';' { + $$ = NULL; } ; @@ -296,6 +311,10 @@ EnumValues: /* [23] - bug in w3c grammar? it doesnt list the equals as a terminal */ CallbackRest: TOK_IDENTIFIER '=' ReturnType '(' ArgumentList ')' ';' + { + $$ = NULL; + } + ; /* [24] */ Typedef: ----------------------------------------------------------------------- Summary of changes: src/genjsbind-parser.y | 7 ++++++- src/jsapi-libdom.c | 1 - src/webidl-ast.h | 5 ++++- src/webidl-parser.y | 23 +++++++++++++++++++++-- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/genjsbind-parser.y b/src/genjsbind-parser.y index 17d1850..98ae18a 100644 --- a/src/genjsbind-parser.y +++ b/src/genjsbind-parser.y @@ -19,6 +19,8 @@ char *errtxt; static void genjsbind_error(YYLTYPE *locp, struct genbind_node **genbind_ast, const char *str) { + locp = locp; + genbind_ast = genbind_ast; errtxt = strdup(str); } @@ -71,7 +73,10 @@ char *errtxt; Input : - Statements { *genbind_ast = $1 } + Statements + { + *genbind_ast = $1; + } ; diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index c925ef9..d1ac37c 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -57,7 +57,6 @@ static int webidl_hdrcomments_cb(struct genbind_node *node, void *ctx) static int webidl_hdrcomment_cb(struct genbind_node *node, void *ctx) { - FILE *outfile = ctx; genbind_node_for_each_type(genbind_node_getnode(node), GENBIND_NODE_TYPE_STRING, webidl_hdrcomments_cb, diff --git a/src/webidl-ast.h b/src/webidl-ast.h index 3c93305..6c61de9 100644 --- a/src/webidl-ast.h +++ b/src/webidl-ast.h @@ -9,7 +9,10 @@ #ifndef genjsbind_webidl_ast_h #define genjsbind_webidl_ast_h -#define WEBIDL_NODE_TYPE_ROOT 0 +enum webidl_node_type { + WEBIDL_NODE_TYPE_ROOT = 0, + +}; struct webidl_node { int type; diff --git a/src/webidl-parser.y b/src/webidl-parser.y index b45a8bd..c6d981f 100644 --- a/src/webidl-parser.y +++ b/src/webidl-parser.y @@ -107,10 +107,20 @@ webidl_error(YYLTYPE *locp, struct webidl_node **winbind_ast, const char *str) %token <text> TOK_JAVADOC %type <text> Inheritance -%type <ifmember> InterfaceMembers %type <node> Definitions %type <node> Definition +%type <node> Partial +%type <node> Dictionary +%type <node> Exception +%type <node> Enum +%type <node> Typedef +%type <node> ImplementsStatement +%type <node> Interface +%type <node> InterfaceMembers +%type <node> CallbackOrInterface +%type <node> CallbackRest +%type <node> CallbackRestOrInterface %% @@ -158,8 +168,12 @@ Definition: ; /* [3] */ -CallbackOrInterface: +CallbackOrInterface + : TOK_CALLBACK CallbackRestOrInterface + { + $$ = $2; + } | Interface ; @@ -175,6 +189,7 @@ CallbackRestOrInterface: Interface: TOK_INTERFACE TOK_IDENTIFIER Inheritance '{' InterfaceMembers '}' ';' { + $$ = NULL; } ; @@ -296,6 +311,10 @@ EnumValues: /* [23] - bug in w3c grammar? it doesnt list the equals as a terminal */ CallbackRest: TOK_IDENTIFIER '=' ReturnType '(' ArgumentList ')' ';' + { + $$ = NULL; + } + ; /* [24] */ Typedef: -- NetSurf Generator for JavaScript bindings

10 years, 6 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits September 2012