summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRupinder Singh Khokhar <rsk1coder99@gmail.com>2014-05-01 02:27:54 (GMT)
committer Rupinder Singh Khokhar <rsk1coder99@gmail.com>2014-05-01 02:27:54 (GMT)
commit8c5ed8cf35405c73653aabd57db1b5fbaa1f2b28 (patch)
tree9e0f5ded5a0f31907520b0153198647126f48ebf
parentb7b74c98c3dc2352fecaa6f06732f6cc9d44d015 (diff)
downloadlibdom-8c5ed8cf35405c73653aabd57db1b5fbaa1f2b28.tar.gz
libdom-8c5ed8cf35405c73653aabd57db1b5fbaa1f2b28.tar.bz2
Directory Element
-rw-r--r--Makefile1
-rw-r--r--include/dom/dom.h1
-rw-r--r--include/dom/html/html_directory_element.h16
-rw-r--r--src/html/Makefile4
-rw-r--r--src/html/TODO4
-rw-r--r--src/html/html_directory_element.c140
-rw-r--r--src/html/html_directory_element.h45
-rw-r--r--src/html/html_document.c4
-rw-r--r--src/html/html_document_strings.h2
-rw-r--r--test/testcases/tests/level1/html/HTMLDirectoryElement01.xml (renamed from test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl)0
10 files changed, 212 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4c6906f..1914637 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_opt_group_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_options_collection.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_hr_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_dlist_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_directory_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 12245c2..0b727af 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -57,6 +57,7 @@
#include <dom/html/html_options_collection.h>
#include <dom/html/html_hr_element.h>
#include <dom/html/html_dlist_element.h>
+#include <dom/html/html_directory_element.h>
/* DOM Events header */
#include <dom/events/events.h>
diff --git a/include/dom/html/html_directory_element.h b/include/dom/html/html_directory_element.h
index 2e182d5..67fa269 100644
--- a/include/dom/html/html_directory_element.h
+++ b/include/dom/html/html_directory_element.h
@@ -3,5 +3,21 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
*/
+#ifndef dom_html_directory_element_h_
+#define dom_html_directory_element_h_
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_directory_element dom_html_directory_element;
+
+dom_exception dom_html_directory_element_get_compact(
+ dom_html_directory_element *ele, bool *compact);
+
+dom_exception dom_html_directory_element_set_compact(
+ dom_html_directory_element *ele, bool compact);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 25e99f4..def64dd 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -7,12 +7,12 @@ DIR_SOURCES := \
html_body_element.c html_form_element.c html_select_element.c \
html_button_element.c html_input_element.c html_text_area_element.c \
html_opt_group_element.c html_option_element.c html_hr_element.c \
- html_dlist_element.c
+ html_dlist_element.c html_directory_element.c
UNINMPLEMENTED_SOURCES := \
html_label_element.c html_fieldset_element.c \
html_legend_element.c html_ulist_element.c html_olist_element.c \
- html_directory_element.c html_menu_element.c \
+ html_menu_element.c \
html_li_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_basefont_element.c html_font_element.c \
diff --git a/src/html/TODO b/src/html/TODO
index 37ade2c..307505a 100644
--- a/src/html/TODO
+++ b/src/html/TODO
@@ -23,8 +23,8 @@ HTMLFieldSetElement html_fieldset_element MISSING
HTMLLegendElement html_legend_element MISSING
HTMLUListElement html_ulist_element MISSING
HTMLOListElement html_olist_element MISSING
-HTMLDListElement html_dlist_element MISSING
-HTMLDirectoryElement html_directory_element MISSING
+HTMLDListElement html_dlist_element DONE
+HTMLDirectoryElement html_directory_element DONE
HTMLMenuElement html_menu_element MISSING
HTMLLIElement html_li_element MISSING
HTMLBlockquoteElement html_blockquote_element MISSING
diff --git a/src/html/html_directory_element.c b/src/html/html_directory_element.c
index 2e182d5..4e0d9e0 100644
--- a/src/html/html_directory_element.c
+++ b/src/html/html_directory_element.c
@@ -3,5 +3,145 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99@gmail.com>
*/
+#include <assert.h>
+#include <stdlib.h>
+
+#include <dom/html/html_directory_element.h>
+
+#include "html/html_document.h"
+#include "html/html_directory_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_DIRECTORY_ELEMENT
+ },
+ DOM_HTML_DIRECTORY_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_directory_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_directory_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_directory_element **ele)
+{
+ struct dom_node_internal *node;
+
+ *ele = malloc(sizeof(dom_html_directory_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_directory_element_initialise(doc, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_directory_element object
+ *
+ * \param doc The document object
+ * \param ele The dom_html_directory_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_directory_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_directory_element *ele)
+{
+ return _dom_html_element_initialise(doc, &ele->base,
+ doc->memoised[hds_DIRECTORY],
+ namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_directory_element object
+ *
+ * \param ele The dom_html_directory_element object
+ */
+void _dom_html_directory_element_finalise(struct dom_html_directory_element *ele)
+{
+ _dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_directory_element object
+ *
+ * \param ele The dom_html_directory_element object
+ */
+void _dom_html_directory_element_destroy(struct dom_html_directory_element *ele)
+{
+ _dom_html_directory_element_finalise(ele);
+ free(ele);
+}
+
+/**
+ * Get the compact property
+ *
+ * \param ele The dom_html_directory_element object
+ * \param compact The status
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_directory_element_get_compact(dom_html_directory_element *ele,
+ bool *compact)
+{
+ return dom_html_element_get_bool_property(&ele->base, "compact",
+ SLEN("compact"), compact);
+}
+
+/**
+ * Set the compact property
+ *
+ * \param ele The dom_html_directory_element object
+ * \param compact The status
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_directory_element_set_compact(dom_html_directory_element *ele,
+ bool compact)
+{
+ return dom_html_element_set_bool_property(&ele->base, "compact",
+ SLEN("compact"), compact);
+}
+
+/*------------------------------------------------------------------------*/
+/* The protected virtual functions */
+
+/* The virtual function used to parse attribute value, see src/core/element.c
+ * for detail */
+dom_exception _dom_html_directory_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_directory_element_destroy(dom_node_internal *node)
+{
+ _dom_html_directory_element_destroy((struct dom_html_directory_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_directory_element_copy(dom_node_internal *old,
+ dom_node_internal **copy)
+{
+ return _dom_html_element_copy(old, copy);
+}
diff --git a/src/html/html_directory_element.h b/src/html/html_directory_element.h
index 2e182d5..9f3fe2b 100644
--- a/src/html/html_directory_element.h
+++ b/src/html/html_directory_element.h
@@ -3,5 +3,50 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com>
*/
+#ifndef dom_internal_html_directory_element_h_
+#define dom_internal_html_directory_element_h_
+
+#include <dom/html/html_directory_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_directory_element {
+ struct dom_html_element base;
+ /**< The base class */
+};
+
+/* Create a dom_html_directory_element object */
+dom_exception _dom_html_directory_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_directory_element **ele);
+
+/* Initialise a dom_html_directory_element object */
+dom_exception _dom_html_directory_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_directory_element *ele);
+
+/* Finalise a dom_html_directory_element object */
+void _dom_html_directory_element_finalise(struct dom_html_directory_element *ele);
+
+/* Destroy a dom_html_directory_element object */
+void _dom_html_directory_element_destroy(struct dom_html_directory_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_directory_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed);
+void _dom_virtual_html_directory_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_directory_element_copy(dom_node_internal *old,
+ dom_node_internal **copy);
+
+#define DOM_HTML_DIRECTORY_ELEMENT_PROTECT_VTABLE \
+ _dom_html_directory_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_DIRECTORY_ELEMENT \
+ _dom_virtual_html_directory_element_destroy, \
+ _dom_html_directory_element_copy
+
+#endif
diff --git a/src/html/html_document.c b/src/html/html_document.c
index a77901f..5a6e72e 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -26,6 +26,7 @@
#include "html/html_select_element.h"
#include "html/html_hr_element.h"
#include "html/html_dlist_element.h"
+#include "html/html_directory_element.h"
#include "core/attr.h"
#include "core/string.h"
@@ -228,6 +229,9 @@ _dom_html_document_create_element_internal(dom_html_document *html,
} 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);
+ } 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);
} 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 f484cb3..9de497f 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -127,7 +127,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(LEGEND)
HTML_DOCUMENT_STRINGS_ACTION1(UL)
HTML_DOCUMENT_STRINGS_ACTION1(OL)
HTML_DOCUMENT_STRINGS_ACTION1(DL)
-HTML_DOCUMENT_STRINGS_ACTION1(DIR)
+HTML_DOCUMENT_STRINGS_ACTION1(DIRECTORY)
HTML_DOCUMENT_STRINGS_ACTION1(MENU)
HTML_DOCUMENT_STRINGS_ACTION1(LI)
HTML_DOCUMENT_STRINGS_ACTION1(BLOCKQUOTE)
diff --git a/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl b/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml
index 4b1b402..4b1b402 100644
--- a/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl
+++ b/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml