diff options
-rw-r--r-- | include/dom/html/html_dlist_element.h | 14 | ||||
-rw-r--r-- | src/html/html_dlist_element.c | 48 | ||||
-rw-r--r-- | src/html/html_dlist_element.h | 38 | ||||
-rw-r--r-- | src/html/html_document.c | 4 | ||||
-rw-r--r-- | test/DOMTSHandler.pm | 1 |
5 files changed, 53 insertions, 52 deletions
diff --git a/include/dom/html/html_dlist_element.h b/include/dom/html/html_dlist_element.h index e537994..e628a63 100644 --- a/include/dom/html/html_dlist_element.h +++ b/include/dom/html/html_dlist_element.h @@ -5,19 +5,19 @@ * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com> * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com> */ -#ifndef dom_html_d_list_element_h_ -#define dom_html_d_list_element_h_ +#ifndef dom_html_dlist_element_h_ +#define dom_html_dlist_element_h_ #include <stdbool.h> #include <dom/core/exceptions.h> #include <dom/core/string.h> -typedef struct dom_html_d_list_element dom_html_d_list_element; +typedef struct dom_html_dlist_element dom_html_dlist_element; -dom_exception dom_html_d_list_element_get_compact( - dom_html_d_list_element *ele, bool *compact); +dom_exception dom_html_dlist_element_get_compact( + dom_html_dlist_element *ele, bool *compact); -dom_exception dom_html_d_list_element_set_compact( - dom_html_d_list_element *ele, bool compact); +dom_exception dom_html_dlist_element_set_compact( + dom_html_dlist_element *ele, bool compact); #endif diff --git a/src/html/html_dlist_element.c b/src/html/html_dlist_element.c index f63accc..5b25037 100644 --- a/src/html/html_dlist_element.c +++ b/src/html/html_dlist_element.c @@ -25,19 +25,19 @@ static struct dom_element_protected_vtable _protect_vtable = { }; /** - * Create a dom_html_d_list_element object + * Create a dom_html_dlist_element object * * \param doc The document object * \param ele The returned element object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_html_d_list_element_create(struct dom_html_document *doc, +dom_exception _dom_html_dlist_element_create(struct dom_html_document *doc, dom_string *namespace, dom_string *prefix, - struct dom_html_d_list_element **ele) + struct dom_html_dlist_element **ele) { struct dom_node_internal *node; - *ele = malloc(sizeof(dom_html_d_list_element)); + *ele = malloc(sizeof(dom_html_dlist_element)); if (*ele == NULL) return DOM_NO_MEM_ERR; @@ -46,19 +46,19 @@ dom_exception _dom_html_d_list_element_create(struct dom_html_document *doc, node->base.vtable = &_dom_html_element_vtable; node->vtable = &_protect_vtable; - return _dom_html_d_list_element_initialise(doc, namespace, prefix, *ele); + return _dom_html_dlist_element_initialise(doc, namespace, prefix, *ele); } /** - * Initialise a dom_html_d_list_element object + * Initialise a dom_html_dlist_element object * * \param doc The document object - * \param ele The dom_html_d_list_element object + * \param ele The dom_html_dlist_element object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc, +dom_exception _dom_html_dlist_element_initialise(struct dom_html_document *doc, dom_string *namespace, dom_string *prefix, - struct dom_html_d_list_element *ele) + struct dom_html_dlist_element *ele) { return _dom_html_element_initialise(doc, &ele->base, doc->memoised[hds_DL], @@ -66,34 +66,34 @@ dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc, } /** - * Finalise a dom_html_d_list_element object + * Finalise a dom_html_dlist_element object * - * \param ele The dom_html_d_list_element object + * \param ele The dom_html_dlist_element object */ -void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele) +void _dom_html_dlist_element_finalise(struct dom_html_dlist_element *ele) { _dom_html_element_finalise(&ele->base); } /** - * Destroy a dom_html_d_list_element object + * Destroy a dom_html_dlist_element object * - * \param ele The dom_html_d_list_element object + * \param ele The dom_html_dlist_element object */ -void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele) +void _dom_html_dlist_element_destroy(struct dom_html_dlist_element *ele) { - _dom_html_d_list_element_finalise(ele); + _dom_html_dlist_element_finalise(ele); free(ele); } /** * Get the compact property * - * \param ele The dom_html_d_list_element object + * \param ele The dom_html_dlist_element object * \param compact The status * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_d_list_element_get_compact(dom_html_d_list_element *ele, +dom_exception dom_html_dlist_element_get_compact(dom_html_dlist_element *ele, bool *compact) { return dom_html_element_get_bool_property(&ele->base, "compact", @@ -103,11 +103,11 @@ dom_exception dom_html_d_list_element_get_compact(dom_html_d_list_element *ele, /** * Set the compact property * - * \param ele The dom_html_d_list_element object + * \param ele The dom_html_dlist_element object * \param compact The status * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception dom_html_d_list_element_set_compact(dom_html_d_list_element *ele, +dom_exception dom_html_dlist_element_set_compact(dom_html_dlist_element *ele, bool compact) { return dom_html_element_set_bool_property(&ele->base, "compact", @@ -119,7 +119,7 @@ dom_exception dom_html_d_list_element_set_compact(dom_html_d_list_element *ele, /* The virtual function used to parse attribute value, see src/core/element.c * for detail */ -dom_exception _dom_html_d_list_element_parse_attribute(dom_element *ele, +dom_exception _dom_html_dlist_element_parse_attribute(dom_element *ele, dom_string *name, dom_string *value, dom_string **parsed) { @@ -133,13 +133,13 @@ dom_exception _dom_html_d_list_element_parse_attribute(dom_element *ele, } /* The virtual destroy function, see src/core/node.c for detail */ -void _dom_virtual_html_d_list_element_destroy(dom_node_internal *node) +void _dom_virtual_html_dlist_element_destroy(dom_node_internal *node) { - _dom_html_d_list_element_destroy((struct dom_html_d_list_element *) node); + _dom_html_dlist_element_destroy((struct dom_html_dlist_element *) node); } /* The virtual copy function, see src/core/node.c for detail */ -dom_exception _dom_html_d_list_element_copy(dom_node_internal *old, +dom_exception _dom_html_dlist_element_copy(dom_node_internal *old, dom_node_internal **copy) { return _dom_html_element_copy(old, copy); diff --git a/src/html/html_dlist_element.h b/src/html/html_dlist_element.h index 8e40dca..06d5634 100644 --- a/src/html/html_dlist_element.h +++ b/src/html/html_dlist_element.h @@ -6,47 +6,47 @@ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com> */ -#ifndef dom_internal_html_d_list_element_h_ -#define dom_internal_html_d_list_element_h_ +#ifndef dom_internal_html_dlist_element_h_ +#define dom_internal_html_dlist_element_h_ #include <dom/html/html_dlist_element.h> #include "html/html_element.h" -struct dom_html_d_list_element { +struct dom_html_dlist_element { struct dom_html_element base; /**< The base class */ }; -/* Create a dom_html_d_list_element object */ -dom_exception _dom_html_d_list_element_create(struct dom_html_document *doc, +/* Create a dom_html_dlist_element object */ +dom_exception _dom_html_dlist_element_create(struct dom_html_document *doc, dom_string *namespace, dom_string *prefix, - struct dom_html_d_list_element **ele); + struct dom_html_dlist_element **ele); -/* Initialise a dom_html_d_list_element object */ -dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc, +/* Initialise a dom_html_dlist_element object */ +dom_exception _dom_html_dlist_element_initialise(struct dom_html_document *doc, dom_string *namespace, dom_string *prefix, - struct dom_html_d_list_element *ele); + struct dom_html_dlist_element *ele); -/* Finalise a dom_html_d_list_element object */ -void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele); +/* Finalise a dom_html_dlist_element object */ +void _dom_html_dlist_element_finalise(struct dom_html_dlist_element *ele); -/* Destroy a dom_html_d_list_element object */ -void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele); +/* Destroy a dom_html_dlist_element object */ +void _dom_html_dlist_element_destroy(struct dom_html_dlist_element *ele); /* The protected virtual functions */ -dom_exception _dom_html_d_list_element_parse_attribute(dom_element *ele, +dom_exception _dom_html_dlist_element_parse_attribute(dom_element *ele, dom_string *name, dom_string *value, dom_string **parsed); -void _dom_virtual_html_d_list_element_destroy(dom_node_internal *node); -dom_exception _dom_html_d_list_element_copy(dom_node_internal *old, +void _dom_virtual_html_dlist_element_destroy(dom_node_internal *node); +dom_exception _dom_html_dlist_element_copy(dom_node_internal *old, dom_node_internal **copy); #define DOM_HTML_DL_ELEMENT_PROTECT_VTABLE \ - _dom_html_d_list_element_parse_attribute + _dom_html_dlist_element_parse_attribute #define DOM_NODE_PROTECT_VTABLE_HTML_DL_ELEMENT \ - _dom_virtual_html_d_list_element_destroy, \ - _dom_html_d_list_element_copy + _dom_virtual_html_dlist_element_destroy, \ + _dom_html_dlist_element_copy #endif diff --git a/src/html/html_document.c b/src/html/html_document.c index 7c2b633..53bb228 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -262,8 +262,8 @@ _dom_html_document_create_element_internal(dom_html_document *html, exc = _dom_html_hr_element_create(html, namespace, prefix, (dom_html_hr_element **) result); } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DL])) { - exc = _dom_html_d_list_element_create(html, namespace, prefix, - (dom_html_d_list_element **) result); + exc = _dom_html_dlist_element_create(html, namespace, prefix, + (dom_html_dlist_element **) result); } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DIRECTORY])) { exc = _dom_html_directory_element_create(html, namespace, prefix, (dom_html_directory_element **) result); diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index a5081dd..55f30bc 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -67,6 +67,7 @@ our %special_prefix = ( HTMLIsIndexElement => "dom_html_isindex_element", HTMLIFrameElement => "dom_html_iframe_element", HTMLOListElement => "dom_html_olist_element", + HTMLDListElement => "dom_html_dlist_element", caption => "dom_html_table_caption_element *", section => "dom_html_table_section_element *", createCaption => "dom_html_element *", |