summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsk1994 <rsk1coder99@gmail.com>2014-05-16 21:36:50 (GMT)
committer Rupinder Singh Khokhar <rsk1coder99@gmail.com>2014-06-21 12:07:12 (GMT)
commitc82cd22ba5d791404345ec75251b3136581e89e5 (patch)
tree73703bcd16362c014cdce3879b77784207e810b5
parent692a5aab2178b5b6e3111ed782f4288c7994ac2b (diff)
downloadlibdom-c82cd22ba5d791404345ec75251b3136581e89e5.tar.gz
libdom-c82cd22ba5d791404345ec75251b3136581e89e5.tar.bz2
Param Element
-rw-r--r--Makefile1
-rw-r--r--include/dom/dom.h1
-rw-r--r--include/dom/html/html_param_element.h34
-rw-r--r--src/html/Makefile5
-rw-r--r--src/html/html_basefont_element.c8
-rw-r--r--src/html/html_document.c4
-rw-r--r--src/html/html_document_strings.h1
-rw-r--r--src/html/html_param_element.c155
-rw-r--r--src/html/html_param_element.h45
-rw-r--r--test/testcases/tests/level1/html/HTMLParamElement01.xml (renamed from test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLParamElement02.xml (renamed from test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLParamElement03.xml (renamed from test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLParamElement04.xml (renamed from test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail)0
13 files changed, 248 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f577585..93d4e61 100644
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_anchor_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_basefont_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_image_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_object_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_param_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 1503625..d8edf7e 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -77,6 +77,7 @@
#include <dom/html/html_basefont_element.h>
#include <dom/html/html_image_element.h>
#include <dom/html/html_object_element.h>
+#include <dom/html/html_param_element.h>
/* DOM Events header */
#include <dom/events/events.h>
diff --git a/include/dom/html/html_param_element.h b/include/dom/html/html_param_element.h
index 2e182d5..be12789 100644
--- a/include/dom/html/html_param_element.h
+++ b/include/dom/html/html_param_element.h
@@ -3,5 +3,39 @@
* 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_param_element_h_
+#define dom_html_param_element_h_
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_param_element dom_html_param_element;
+
+dom_exception dom_html_param_element_get_name(
+ dom_html_param_element *element, dom_string **name);
+
+dom_exception dom_html_param_element_set_name(
+ dom_html_param_element *element, dom_string *name);
+
+dom_exception dom_html_param_element_get_type(
+ dom_html_param_element *element, dom_string **type);
+
+dom_exception dom_html_param_element_set_type(
+ dom_html_param_element *ele, dom_string *type);
+
+dom_exception dom_html_param_element_get_value(
+ dom_html_param_element *ele, dom_string **value);
+
+dom_exception dom_html_param_element_set_value(
+ dom_html_param_element *ele, dom_string *value);
+
+dom_exception dom_html_param_element_get_value_type(
+ dom_html_param_element *ele, dom_string **value_type);
+
+dom_exception dom_html_param_element_set_value_type(
+ dom_html_param_element *ele, dom_string *value_type);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 455ea21..bd9f935 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -13,10 +13,11 @@ DIR_SOURCES := \
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_mod_element.c html_anchor_element.c \
- html_basefont_element.c html_image_element.c html_object_element.c
+ html_basefont_element.c html_image_element.c html_object_element.c \
+ html_param_element.c
UNINMPLEMENTED_SOURCES := \
- html_param_element.c html_applet_element.c html_map_element.c \
+ html_applet_element.c html_map_element.c \
html_area_element.c html_script_element.c html_table_element.c \
html_tablecaption_element.c html_tablecol_element.c html_tablesection_element.c \
html_tablerow_element.c html_tablecell_element.c html_frameset_element.c \
diff --git a/src/html/html_basefont_element.c b/src/html/html_basefont_element.c
index e524ed3..7aa20a0 100644
--- a/src/html/html_basefont_element.c
+++ b/src/html/html_basefont_element.c
@@ -32,7 +32,7 @@ static struct dom_element_protected_vtable _protect_vtable = {
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
dom_exception _dom_html_base_font_element_create(struct dom_html_document *doc,
- dom_string *namespace, dom_string *base_fontfix,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_base_font_element **ele)
{
struct dom_node_internal *node;
@@ -46,7 +46,7 @@ dom_exception _dom_html_base_font_element_create(struct dom_html_document *doc,
node->base.vtable = &_dom_html_element_vtable;
node->vtable = &_protect_vtable;
- return _dom_html_base_font_element_initialise(doc, namespace, base_fontfix, *ele);
+ return _dom_html_base_font_element_initialise(doc, namespace, prefix, *ele);
}
/**
@@ -57,12 +57,12 @@ dom_exception _dom_html_base_font_element_create(struct dom_html_document *doc,
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
dom_exception _dom_html_base_font_element_initialise(struct dom_html_document *doc,
- dom_string *namespace, dom_string *base_fontfix,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_base_font_element *ele)
{
return _dom_html_element_initialise(doc, &ele->base,
doc->memoised[hds_BASEFONT],
- namespace, base_fontfix);
+ namespace, prefix);
}
/**
diff --git a/src/html/html_document.c b/src/html/html_document.c
index ae80712..a2d007f 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -45,6 +45,7 @@
#include "html/html_basefont_element.h"
#include "html/html_image_element.h"
#include "html/html_object_element.h"
+#include "html/html_param_element.h"
#include "core/attr.h"
#include "core/string.h"
@@ -311,6 +312,9 @@ _dom_html_document_create_element_internal(dom_html_document *html,
} else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_OBJECT])) {
exc = _dom_html_object_element_create(html, namespace, prefix,
(dom_html_object_element **) result);
+ } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_PARAM])) {
+ exc = _dom_html_param_element_create(html, namespace, prefix,
+ (dom_html_param_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 e23cc0b..0805915 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -101,6 +101,7 @@ HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime)
HTML_DOCUMENT_STRINGS_ACTION(long_desc,longdesc)
HTML_DOCUMENT_STRINGS_ACTION(code_base,codebase)
HTML_DOCUMENT_STRINGS_ACTION(code_type,codetype)
+HTML_DOCUMENT_STRINGS_ACTION(value_type,valuetype)
/* HTML_DOCUMENT_STRINGS_ACTION1(type) */
HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap)
/* HTML_DOCUMENT_STRINGS_ACTION1(value) */
diff --git a/src/html/html_param_element.c b/src/html/html_param_element.c
index 2e182d5..6bda015 100644
--- a/src/html/html_param_element.c
+++ b/src/html/html_param_element.c
@@ -3,5 +3,160 @@
* 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_param_element.h>
+
+#include "html/html_document.h"
+#include "html/html_param_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_PARAM_ELEMENT
+ },
+ DOM_HTML_PARAM_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_param_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_param_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_param_element **ele)
+{
+ struct dom_node_internal *node;
+
+ *ele = malloc(sizeof(dom_html_param_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_param_element_initialise(doc, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_param_element object
+ *
+ * \param doc The document object
+ * \param ele The dom_html_param_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_param_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_param_element *ele)
+{
+ return _dom_html_element_initialise(doc, &ele->base,
+ doc->memoised[hds_PARAM],
+ namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_param_element object
+ *
+ * \param ele The dom_html_param_element object
+ */
+void _dom_html_param_element_finalise(struct dom_html_param_element *ele)
+{
+ _dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_param_element object
+ *
+ * \param ele The dom_html_param_element object
+ */
+void _dom_html_param_element_destroy(struct dom_html_param_element *ele)
+{
+ _dom_html_param_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_param_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_param_element_destroy(dom_node_internal *node)
+{
+ _dom_html_param_element_destroy((struct dom_html_param_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_param_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_param_element_get_##attr( \
+ dom_html_param_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_param_element_set_##attr( \
+ dom_html_param_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(name);
+SIMPLE_GET_SET(type);
+SIMPLE_GET_SET(value);
+SIMPLE_GET_SET(value_type);
diff --git a/src/html/html_param_element.h b/src/html/html_param_element.h
index 2e182d5..2cd8150 100644
--- a/src/html/html_param_element.h
+++ b/src/html/html_param_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_param_element_h_
+#define dom_internal_html_param_element_h_
+
+#include <dom/html/html_param_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_param_element {
+ struct dom_html_element base;
+ /**< The base class */
+};
+
+/* Create a dom_html_param_element object */
+dom_exception _dom_html_param_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_param_element **ele);
+
+/* Initialise a dom_html_param_element object */
+dom_exception _dom_html_param_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_param_element *ele);
+
+/* Finalise a dom_html_param_element object */
+void _dom_html_param_element_finalise(struct dom_html_param_element *ele);
+
+/* Destroy a dom_html_param_element object */
+void _dom_html_param_element_destroy(struct dom_html_param_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_param_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed);
+void _dom_virtual_html_param_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_param_element_copy(dom_node_internal *old,
+ dom_node_internal **copy);
+
+#define DOM_HTML_PARAM_ELEMENT_PROTECT_VTABLE \
+ _dom_html_param_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_PARAM_ELEMENT \
+ _dom_virtual_html_param_element_destroy, \
+ _dom_html_param_element_copy
+
+#endif
diff --git a/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLParamElement01.xml
index 33f9238..33f9238 100644
--- a/test/testcases/tests/level1/html/HTMLParamElement01.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLParamElement01.xml
diff --git a/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLParamElement02.xml
index 52e3b8a..52e3b8a 100644
--- a/test/testcases/tests/level1/html/HTMLParamElement02.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLParamElement02.xml
diff --git a/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLParamElement03.xml
index 48b227a..48b227a 100644
--- a/test/testcases/tests/level1/html/HTMLParamElement03.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLParamElement03.xml
diff --git a/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLParamElement04.xml
index da298fd..da298fd 100644
--- a/test/testcases/tests/level1/html/HTMLParamElement04.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLParamElement04.xml