From 76fa6b3589c3ee19db20201ab072d6907e84390b Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Tue, 13 May 2014 18:08:32 +0530 Subject: Mod Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_mod_element.h | 22 +++ src/html/Makefile | 4 +- src/html/TODO | 4 +- src/html/html_document.c | 5 + src/html/html_document_strings.h | 1 + src/html/html_mod_element.c | 156 +++++++++++++++++++++ src/html/html_mod_element.h | 45 ++++++ .../tests/level1/html/HTMLBaseFontElement01.xml | 42 ------ .../level1/html/HTMLBaseFontElement01.xml.kfail | 42 ++++++ .../tests/level1/html/HTMLBaseFontElement02.xml | 42 ------ .../level1/html/HTMLBaseFontElement02.xml.kfail | 42 ++++++ .../tests/level1/html/HTMLBaseFontElement03.xml | 49 ------- .../level1/html/HTMLBaseFontElement03.xml.kfail | 49 +++++++ .../tests/level1/html/HTMLModElement01.xml | 43 ++++++ .../tests/level1/html/HTMLModElement01.xml.kfail | 43 ------ .../tests/level1/html/HTMLModElement02.xml | 42 ++++++ .../tests/level1/html/HTMLModElement02.xml.kfail | 42 ------ .../tests/level1/html/HTMLModElement03.xml | 43 ++++++ .../tests/level1/html/HTMLModElement03.xml.kfail | 43 ------ .../tests/level1/html/HTMLModElement04.xml | 42 ++++++ .../tests/level1/html/HTMLModElement04.xml.kfail | 42 ------ 23 files changed, 538 insertions(+), 307 deletions(-) delete mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement01.xml create mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail delete mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement02.xml create mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail delete mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement03.xml create mode 100644 test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLModElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLModElement01.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLModElement02.xml delete mode 100644 test/testcases/tests/level1/html/HTMLModElement02.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLModElement03.xml delete mode 100644 test/testcases/tests/level1/html/HTMLModElement03.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLModElement04.xml delete mode 100644 test/testcases/tests/level1/html/HTMLModElement04.xml.kfail diff --git a/Makefile b/Makefile index 5582dde..0495b3a 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_ulist_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_olist_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_li_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_font_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_mod_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 98dc5ee..3dabeec 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -72,6 +72,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_mod_element.h b/include/dom/html/html_mod_element.h index 2e182d5..99c4f2e 100644 --- a/include/dom/html/html_mod_element.h +++ b/include/dom/html/html_mod_element.h @@ -3,5 +3,27 @@ * 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_mod_element_h_ +#define dom_html_mod_element_h_ +#include +#include +#include + +typedef struct dom_html_mod_element dom_html_mod_element; + +dom_exception dom_html_mod_element_get_cite( + dom_html_mod_element *ele, dom_string **cite); + +dom_exception dom_html_mod_element_set_cite( + dom_html_mod_element *ele, dom_string *cite); + +dom_exception dom_html_mod_element_get_date_time( + dom_html_mod_element *ele, dom_string **date_time); + +dom_exception dom_html_mod_element_set_date_time( + dom_html_mod_element *ele, dom_string *date_time); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 651ebbb..7711479 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -12,10 +12,10 @@ DIR_SOURCES := \ 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_olist_element.c html_li_element.c \ - html_font_element.c + html_font_element.c html_mod_element.c UNINMPLEMENTED_SOURCES := \ - html_basefont_element.c html_mod_element.c \ + html_basefont_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 html_script_element.c html_table_element.c \ diff --git a/src/html/TODO b/src/html/TODO index 9806c6b..53e6edb 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -35,9 +35,9 @@ HTMLQuoteElement html_quote_element DONE HTMLPreElement html_pre_element DONE HTMLBRElement html_br_element DONE HTMLBaseFontElement html_basefont_element MISSING -HTMLFontElement html_font_element MISSING +HTMLFontElement html_font_element DONE HTMLHRElement html_hr_element DONE -HTMLModElement html_mod_element MISSING +HTMLModElement html_mod_element DONE HTMLAnchorElement html_anchor_element MISSING HTMLImageElement html_image_element MISSING HTMLObjectElement html_object_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index 1c3ebab..c8fd11e 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -40,6 +40,7 @@ #include "html/html_olist_element.h" #include "html/html_li_element.h" #include "html/html_font_element.h" +#include "html/html_mod_element.h" #include "core/attr.h" #include "core/string.h" @@ -290,6 +291,10 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FONT])) { exc = _dom_html_font_element_create(html, namespace, prefix, (dom_html_font_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DEL]) || + dom_string_caseless_isequal(tag_name, html->memoised[hds_INS])) { + exc = _dom_html_mod_element_create(html, tag_name, namespace, + prefix, (dom_html_mod_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 23b36cf..73b7bab 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -89,6 +89,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(color) HTML_DOCUMENT_STRINGS_ACTION1(face) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) +HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_mod_element.c b/src/html/html_mod_element.c index 2e182d5..f20a994 100644 --- a/src/html/html_mod_element.c +++ b/src/html/html_mod_element.c @@ -3,5 +3,161 @@ * 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_mod_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_MOD_ELEMENT + }, + DOM_HTML_MOD_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_mod_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_mod_element_create(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, + dom_string *prefix, struct dom_html_mod_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_mod_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_mod_element_initialise(doc, tag_name, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_mod_element object + * + * \param doc The document object + * \param ele The dom_html_mod_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_mod_element_initialise(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, + dom_string *prefix, struct dom_html_mod_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + tag_name, + namespace, prefix); +} + +/** + * Finalise a dom_html_mod_element object + * + * \param ele The dom_html_mod_element object + */ +void _dom_html_mod_element_finalise(struct dom_html_mod_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_mod_element object + * + * \param ele The dom_html_mod_element object + */ +void _dom_html_mod_element_destroy(struct dom_html_mod_element *ele) +{ + _dom_html_mod_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_mod_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_mod_element_destroy(dom_node_internal *node) +{ + _dom_html_mod_element_destroy((struct dom_html_mod_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_mod_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_mod_element_get_##attr( \ + dom_html_mod_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_mod_element_set_##attr( \ + dom_html_mod_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(cite); +SIMPLE_GET_SET(date_time); diff --git a/src/html/html_mod_element.h b/src/html/html_mod_element.h index 2e182d5..9df07d5 100644 --- a/src/html/html_mod_element.h +++ b/src/html/html_mod_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_mod_element_h_ +#define dom_internal_html_mod_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_mod_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_mod_element object */ +dom_exception _dom_html_mod_element_create(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, + dom_string *prefix, struct dom_html_mod_element **ele); + +/* Initialise a dom_html_mod_element object */ +dom_exception _dom_html_mod_element_initialise(struct dom_html_document *doc, + dom_string *tag_name, dom_string *namespace, dom_string *prefix, + struct dom_html_mod_element *ele); + +/* Finalise a dom_html_mod_element object */ +void _dom_html_mod_element_finalise(struct dom_html_mod_element *ele); + +/* Destroy a dom_html_mod_element object */ +void _dom_html_mod_element_destroy(struct dom_html_mod_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_mod_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_mod_element_destroy(dom_node_internal *node); +dom_exception _dom_html_mod_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_MOD_ELEMENT_PROTECT_VTABLE \ + _dom_html_mod_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_MOD_ELEMENT \ + _dom_virtual_html_mod_element_destroy, \ + _dom_html_mod_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml deleted file mode 100644 index 525438f..0000000 --- a/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLBaseFontElement01 -NIST - - The color attribute specifies the base font's color. - - Retrieve the color attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail new file mode 100644 index 0000000..525438f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBaseFontElement01.xml.kfail @@ -0,0 +1,42 @@ + + + + + + + +HTMLBaseFontElement01 +NIST + + The color attribute specifies the base font's color. + + Retrieve the color attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml deleted file mode 100644 index 94894d6..0000000 --- a/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLBaseFontElement02 -NIST - - The face attribute specifies the base font's face identifier. - - Retrieve the face attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail new file mode 100644 index 0000000..94894d6 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBaseFontElement02.xml.kfail @@ -0,0 +1,42 @@ + + + + + + + +HTMLBaseFontElement02 +NIST + + The face attribute specifies the base font's face identifier. + + Retrieve the face attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml b/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml deleted file mode 100644 index e63b16f..0000000 --- a/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - -HTMLBaseFontElement03 -NIST - - The size attribute specifies the base font's size. Retrieve the size attribute and examine its value. - - This test is incompatible with L2 HTML implementations due to a change in the type of the attribute. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail new file mode 100644 index 0000000..e63b16f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBaseFontElement03.xml.kfail @@ -0,0 +1,49 @@ + + + + + + + +HTMLBaseFontElement03 +NIST + + The size attribute specifies the base font's size. Retrieve the size attribute and examine its value. + + This test is incompatible with L2 HTML implementations due to a change in the type of the attribute. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLModElement01.xml b/test/testcases/tests/level1/html/HTMLModElement01.xml new file mode 100644 index 0000000..616bc36 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLModElement01.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLModElement01 +NIST + + The cite attribute specifies an URI designating a document that describes + the reason for the change. + + Retrieve the cite attribute of the INS element and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail deleted file mode 100644 index 616bc36..0000000 --- a/test/testcases/tests/level1/html/HTMLModElement01.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLModElement01 -NIST - - The cite attribute specifies an URI designating a document that describes - the reason for the change. - - Retrieve the cite attribute of the INS element and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLModElement02.xml b/test/testcases/tests/level1/html/HTMLModElement02.xml new file mode 100644 index 0000000..bcb8c11 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLModElement02.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLModElement02 +NIST + + The dateTime attribute specifies the date and time of the change. + + Retrieve the dateTime attribute of the INS element and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail deleted file mode 100644 index bcb8c11..0000000 --- a/test/testcases/tests/level1/html/HTMLModElement02.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLModElement02 -NIST - - The dateTime attribute specifies the date and time of the change. - - Retrieve the dateTime attribute of the INS element and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLModElement03.xml b/test/testcases/tests/level1/html/HTMLModElement03.xml new file mode 100644 index 0000000..82f85b0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLModElement03.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLModElement03 +NIST + + The cite attribute specifies an URI designating a document that describes + the reason for the change. + + Retrieve the cite attribute of the DEL element and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail deleted file mode 100644 index 82f85b0..0000000 --- a/test/testcases/tests/level1/html/HTMLModElement03.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLModElement03 -NIST - - The cite attribute specifies an URI designating a document that describes - the reason for the change. - - Retrieve the cite attribute of the DEL element and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLModElement04.xml b/test/testcases/tests/level1/html/HTMLModElement04.xml new file mode 100644 index 0000000..4220ba5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLModElement04.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLModElement04 +NIST + + The dateTime attribute specifies the date and time of the change. + + Retrieve the dateTime attribute of the DEL element and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail deleted file mode 100644 index 4220ba5..0000000 --- a/test/testcases/tests/level1/html/HTMLModElement04.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLModElement04 -NIST - - The dateTime attribute specifies the date and time of the change. - - Retrieve the dateTime attribute of the DEL element and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3