From 4c706c539f2ae7f390c3463013e4e41428993c6c Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Sat, 10 May 2014 01:32:06 +0530 Subject: OList
    Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_olist_element.h | 28 +++ src/html/Makefile | 4 +- src/html/TODO | 4 +- src/html/html_document.c | 4 + src/html/html_olist_element.c | 201 +++++++++++++++++++++ src/html/html_olist_element.h | 45 +++++ .../tests/level1/html/HTMLOListElement01.xml | 43 +++++ .../tests/level1/html/HTMLOListElement01.xml.kfail | 43 ----- .../tests/level1/html/HTMLOListElement02.xml | 42 +++++ .../tests/level1/html/HTMLOListElement02.xml.kfail | 42 ----- .../tests/level1/html/HTMLOListElement03.xml | 42 +++++ .../tests/level1/html/HTMLOListElement03.xml.kfail | 42 ----- 14 files changed, 411 insertions(+), 131 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLOListElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLOListElement02.xml delete mode 100644 test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLOListElement03.xml delete mode 100644 test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail diff --git a/Makefile b/Makefile index b591dd4..d007a48 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_pre_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_br_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_label_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_ulist_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_olist_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 0610427..4af78f7 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -69,6 +69,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_olist_element.h b/include/dom/html/html_olist_element.h index 2e182d5..3d1511e 100644 --- a/include/dom/html/html_olist_element.h +++ b/include/dom/html/html_olist_element.h @@ -3,5 +3,33 @@ * 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_o_list_element_h_ +#define dom_html_o_list_element_h_ +#include +#include +#include + +typedef struct dom_html_o_list_element dom_html_o_list_element; + +dom_exception dom_html_o_list_element_get_compact( + dom_html_o_list_element *ele, bool *compact); + +dom_exception dom_html_o_list_element_set_compact( + dom_html_o_list_element *ele, bool compact); + +dom_exception dom_html_o_list_element_get_start( + dom_html_o_list_element *ele, int32_t *start); + +dom_exception dom_html_o_list_element_set_start( + dom_html_o_list_element *ele, uint32_t start); + +dom_exception dom_html_o_list_element_get_type( + dom_html_o_list_element *ele, dom_string **type); + +dom_exception dom_html_o_list_element_set_type( + dom_html_o_list_element *ele, dom_string *type); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 3f42e43..7895630 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -11,10 +11,10 @@ DIR_SOURCES := \ 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_br_element.c html_label_element.c \ - html_ulist_element.c + html_ulist_element.c html_olist_element.c UNINMPLEMENTED_SOURCES := \ - html_olist_element.c html_li_element.c html_basefont_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/TODO b/src/html/TODO index 19be8a4..9806c6b 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -21,8 +21,8 @@ HTMLButtonElement html_button_element MISSING HTMLLabelElement html_label_element DONE HTMLFieldSetElement html_fieldset_element DONE HTMLLegendElement html_legend_element DONE -HTMLUListElement html_ulist_element MISSING -HTMLOListElement html_olist_element MISSING +HTMLUListElement html_ulist_element DONE +HTMLOListElement html_olist_element DONE HTMLDListElement html_dlist_element DONE HTMLDirectoryElement html_directory_element DONE HTMLMenuElement html_menu_element DONE diff --git a/src/html/html_document.c b/src/html/html_document.c index 34e2bf0..60c2edc 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -37,6 +37,7 @@ #include "html/html_br_element.h" #include "html/html_label_element.h" #include "html/html_ulist_element.h" +#include "html/html_olist_element.h" #include "core/attr.h" #include "core/string.h" @@ -278,6 +279,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_UL])) { exc = _dom_html_u_list_element_create(html, namespace, prefix, (dom_html_u_list_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_OL])) { + exc = _dom_html_o_list_element_create(html, namespace, prefix, + (dom_html_o_list_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_olist_element.c b/src/html/html_olist_element.c index 2e182d5..16b8763 100644 --- a/src/html/html_olist_element.c +++ b/src/html/html_olist_element.c @@ -3,5 +3,206 @@ * 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_olist_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_O_LIST_ELEMENT + }, + DOM_HTML_O_LIST_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_o_list_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_o_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *o_listfix, + struct dom_html_o_list_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_o_list_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_o_list_element_initialise(doc, namespace, o_listfix, *ele); +} + +/** + * Initialise a dom_html_o_list_element object + * + * \param doc The document object + * \param ele The dom_html_o_list_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_o_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *o_listfix, + struct dom_html_o_list_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_OL], + namespace, o_listfix); +} + +/** + * Finalise a dom_html_o_list_element object + * + * \param ele The dom_html_o_list_element object + */ +void _dom_html_o_list_element_finalise(struct dom_html_o_list_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_o_list_element object + * + * \param ele The dom_html_o_list_element object + */ +void _dom_html_o_list_element_destroy(struct dom_html_o_list_element *ele) +{ + _dom_html_o_list_element_finalise(ele); + free(ele); +} + +/** + * Get the compact Property + * + * \param o_list The dom_html_o_list_element object + */ +dom_exception dom_html_o_list_element_get_compact( + dom_html_o_list_element *o_list, bool *compact) +{ + return dom_html_element_get_bool_property(&o_list->base, "compact", + SLEN("compact"), compact); +} + +/** + * Set the compact Property + * + * \param o_list The dom_html_o_list_element object + */ +dom_exception dom_html_o_list_element_set_compact( + dom_html_o_list_element *o_list, bool compact) +{ + return dom_html_element_set_bool_property(&o_list->base, "compact", + SLEN("compact"), compact); +} + +/** + * Get the start Property + * + * \param o_list The dom_html_o_list_element object + */ +dom_exception dom_html_o_list_element_get_start( + dom_html_o_list_element *o_list, int32_t *start) +{ + return dom_html_element_get_int32_t_property(&o_list->base, "start", + SLEN("start"), start); +} + +/** + * Set the start Property + * + * \param o_list The dom_html_o_list_element object + */ +dom_exception dom_html_o_list_element_set_start( + dom_html_o_list_element *o_list, uint32_t start) +{ + return dom_html_element_set_int32_t_property(&o_list->base, "start", + SLEN("start"), start); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_o_list_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_o_list_element_destroy(dom_node_internal *node) +{ + _dom_html_o_list_element_destroy((struct dom_html_o_list_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_o_list_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_o_list_element_get_##attr( \ + dom_html_o_list_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_o_list_element_set_##attr( \ + dom_html_o_list_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(type); diff --git a/src/html/html_olist_element.h b/src/html/html_olist_element.h index 2e182d5..301d8ac 100644 --- a/src/html/html_olist_element.h +++ b/src/html/html_olist_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_o_list_element_h_ +#define dom_internal_html_o_list_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_o_list_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_o_list_element object */ +dom_exception _dom_html_o_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *o_listfix, + struct dom_html_o_list_element **ele); + +/* Initialise a dom_html_o_list_element object */ +dom_exception _dom_html_o_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *o_listfix, + struct dom_html_o_list_element *ele); + +/* Finalise a dom_html_o_list_element object */ +void _dom_html_o_list_element_finalise(struct dom_html_o_list_element *ele); + +/* Destroy a dom_html_o_list_element object */ +void _dom_html_o_list_element_destroy(struct dom_html_o_list_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_o_list_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_o_list_element_destroy(dom_node_internal *node); +dom_exception _dom_html_o_list_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_O_LIST_ELEMENT_PROTECT_VTABLE \ + _dom_html_o_list_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_O_LIST_ELEMENT \ + _dom_virtual_html_o_list_element_destroy, \ + _dom_html_o_list_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLOListElement01.xml b/test/testcases/tests/level1/html/HTMLOListElement01.xml new file mode 100644 index 0000000..7b053bf --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLOListElement01.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLOListElement01 +NIST + + The compact attribute specifies a boolean value on whether to display + the list more compactly. + + Retrieve the compact attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail deleted file mode 100644 index 7b053bf..0000000 --- a/test/testcases/tests/level1/html/HTMLOListElement01.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLOListElement01 -NIST - - The compact attribute specifies a boolean value on whether to display - the list more compactly. - - Retrieve the compact attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLOListElement02.xml b/test/testcases/tests/level1/html/HTMLOListElement02.xml new file mode 100644 index 0000000..85b78d4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLOListElement02.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLOListElement02 +NIST + + The start attribute specifies the starting sequence number. + + Retrieve the start attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail deleted file mode 100644 index 85b78d4..0000000 --- a/test/testcases/tests/level1/html/HTMLOListElement02.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLOListElement02 -NIST - - The start attribute specifies the starting sequence number. - - Retrieve the start attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLOListElement03.xml b/test/testcases/tests/level1/html/HTMLOListElement03.xml new file mode 100644 index 0000000..e6306ec --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLOListElement03.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLOListElement03 +NIST + + The type attribute specifies the numbering style. + + Retrieve the type attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail deleted file mode 100644 index e6306ec..0000000 --- a/test/testcases/tests/level1/html/HTMLOListElement03.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLOListElement03 -NIST - - The type attribute specifies the numbering style. - - Retrieve the type attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3