From 1ea759971d89fdb7bb8f20206cef27c2ea0c15b9 Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Thu, 8 May 2014 04:49:06 +0530 Subject: Br Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_br_element.h | 16 +++ src/html/Makefile | 5 +- src/html/html_br_element.c | 155 +++++++++++++++++++++ src/html/html_br_element.h | 45 ++++++ src/html/html_document.c | 4 + src/html/html_document_strings.h | 2 + test/DOMTSHandler.pm | 1 + .../tests/level1/html/HTMLBRElement01.xml | 42 ++++++ .../tests/level1/html/HTMLBRElement01.xml.notimpl | 42 ------ 11 files changed, 269 insertions(+), 45 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLBRElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl diff --git a/Makefile b/Makefile index eb2870d..a9b7388 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_paragraph_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_heading_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_quote_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_pre_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_br_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 8b9e0c9..4c5ba09 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -66,6 +66,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_br_element.h b/include/dom/html/html_br_element.h index 2e182d5..9475e74 100644 --- a/include/dom/html/html_br_element.h +++ b/include/dom/html/html_br_element.h @@ -3,5 +3,21 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_html_br_element_h_ +#define dom_html_br_element_h_ +#include +#include +#include + +typedef struct dom_html_br_element dom_html_br_element; + +dom_exception dom_html_br_element_get_clear( + dom_html_br_element *ele, dom_string **clear); + +dom_exception dom_html_br_element_set_clear( + dom_html_br_element *ele, dom_string *clear); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 718a44f..632e581 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -10,12 +10,11 @@ DIR_SOURCES := \ html_dlist_element.c html_directory_element.c html_menu_element.c \ html_fieldset_element.c html_legend_element.c html_div_element.c \ html_paragraph_element.c html_heading_element.c html_quote_element.c \ - html_pre_element.c + html_pre_element.c html_br_element.c UNINMPLEMENTED_SOURCES := \ html_label_element.c html_ulist_element.c html_olist_element.c \ - html_li_element.c html_br_element.c \ - html_basefont_element.c html_font_element.c \ + html_li_element.c html_basefont_element.c html_font_element.c \ html_mod_element.c html_anchor_element.c \ html_image_element.c html_object_element.c html_param_element.c \ html_applet_element.c html_map_element.c html_area_element.c \ diff --git a/src/html/html_br_element.c b/src/html/html_br_element.c index 2e182d5..fbc133e 100644 --- a/src/html/html_br_element.c +++ b/src/html/html_br_element.c @@ -3,5 +3,160 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#include +#include + +#include + +#include "html/html_document.h" +#include "html/html_br_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_BR_ELEMENT + }, + DOM_HTML_BR_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_br_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_br_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_br_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_br_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_br_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_br_element object + * + * \param doc The document object + * \param ele The dom_html_br_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_br_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_br_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_BR], + namespace, prefix); +} + +/** + * Finalise a dom_html_br_element object + * + * \param ele The dom_html_br_element object + */ +void _dom_html_br_element_finalise(struct dom_html_br_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_br_element object + * + * \param ele The dom_html_br_element object + */ +void _dom_html_br_element_destroy(struct dom_html_br_element *ele) +{ + _dom_html_br_element_finalise(ele); + free(ele); +} + + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_br_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_br_element_destroy(dom_node_internal *node) +{ + _dom_html_br_element_destroy((struct dom_html_br_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_br_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_br_element_get_##attr( \ + dom_html_br_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_br_element_set_##attr( \ + dom_html_br_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(clear); diff --git a/src/html/html_br_element.h b/src/html/html_br_element.h index 2e182d5..ff2df3d 100644 --- a/src/html/html_br_element.h +++ b/src/html/html_br_element.h @@ -3,5 +3,50 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_internal_html_br_element_h_ +#define dom_internal_html_br_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_br_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_br_element object */ +dom_exception _dom_html_br_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_br_element **ele); + +/* Initialise a dom_html_br_element object */ +dom_exception _dom_html_br_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_br_element *ele); + +/* Finalise a dom_html_br_element object */ +void _dom_html_br_element_finalise(struct dom_html_br_element *ele); + +/* Destroy a dom_html_br_element object */ +void _dom_html_br_element_destroy(struct dom_html_br_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_br_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_br_element_destroy(dom_node_internal *node); +dom_exception _dom_html_br_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_BR_ELEMENT_PROTECT_VTABLE \ + _dom_html_br_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_BR_ELEMENT \ + _dom_virtual_html_br_element_destroy, \ + _dom_html_br_element_copy + +#endif diff --git a/src/html/html_document.c b/src/html/html_document.c index 68734fa..e2ac1f3 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -34,6 +34,7 @@ #include "html/html_heading_element.h" #include "html/html_quote_element.h" #include "html/html_pre_element.h" +#include "html/html_br_element.h" #include "core/attr.h" #include "core/string.h" @@ -266,6 +267,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_PRE])) { exc = _dom_html_pre_element_create(html, namespace, prefix, (dom_html_pre_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_BR])) { + exc = _dom_html_br_element_create(html, namespace, prefix, + (dom_html_br_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 3334593..e7af1b9 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -65,6 +65,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(method) /* HTML_DOCUMENT_STRINGS_ACTION1(target) */ /* Useful attributes used by HTMLButtonElement */ HTML_DOCUMENT_STRINGS_ACTION(access_key,accesskey) +/* Useful attributes used by HTMLBrElement */ +HTML_DOCUMENT_STRINGS_ACTION1(clear) /* HTML_DOCUMENT_STRINGS_ACTION1(name) */ /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION1(value) diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index df2b028..315465d 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -53,6 +53,7 @@ our %special_prefix = ( CharacterData => "dom_characterdata", CDATASection => "dom_cdata_section *", HTMLHRElement => "dom_html_hr_element", + HTMLBRElement => "dom_html_br_element", ); our %unref_prefix = ( diff --git a/test/testcases/tests/level1/html/HTMLBRElement01.xml b/test/testcases/tests/level1/html/HTMLBRElement01.xml new file mode 100644 index 0000000..cc4d17a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBRElement01.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLBRElement01 +NIST + + The clear attribute specifies control flow of text around floats. + + Retrieve the clear attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl b/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl deleted file mode 100644 index cc4d17a..0000000 --- a/test/testcases/tests/level1/html/HTMLBRElement01.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLBRElement01 -NIST - - The clear attribute specifies control flow of text around floats. - - Retrieve the clear attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3