diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-07-04 23:03:53 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-07-04 23:03:53 +0100 |
commit | e99205f8edf965857ea8ed756c542b87b3a8808e (patch) | |
tree | 127650d01fbb073d00337703a18069d9871d84d9 | |
parent | 49738c03bc3211a634d40b59f8549d533de46c9e (diff) | |
download | libdom-e99205f8edf965857ea8ed756c542b87b3a8808e.tar.gz libdom-e99205f8edf965857ea8ed756c542b87b3a8808e.tar.bz2 |
HTMLElement: className is a simple get/set property, enable 29 more tests.
HTMLElement.className means that dynamic conversion looks for class_name
and not classname. As such, rename the methods and enable the simple getter/setter
methods for the property. As such, another 29 tests pass.
-rw-r--r-- | include/dom/html/html_element.h | 28 | ||||
-rw-r--r-- | src/html/html_element.c | 42 | ||||
-rw-r--r-- | src/html/html_element.h | 12 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement117.xml (renamed from test/testcases/tests/level1/html/HTMLElement117.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement118.xml (renamed from test/testcases/tests/level1/html/HTMLElement118.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement119.xml (renamed from test/testcases/tests/level1/html/HTMLElement119.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement120.xml (renamed from test/testcases/tests/level1/html/HTMLElement120.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement121.xml (renamed from test/testcases/tests/level1/html/HTMLElement121.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement122.xml (renamed from test/testcases/tests/level1/html/HTMLElement122.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement123.xml (renamed from test/testcases/tests/level1/html/HTMLElement123.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement124.xml (renamed from test/testcases/tests/level1/html/HTMLElement124.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement125.xml (renamed from test/testcases/tests/level1/html/HTMLElement125.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement126.xml (renamed from test/testcases/tests/level1/html/HTMLElement126.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement127.xml (renamed from test/testcases/tests/level1/html/HTMLElement127.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement128.xml (renamed from test/testcases/tests/level1/html/HTMLElement128.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement129.xml (renamed from test/testcases/tests/level1/html/HTMLElement129.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement130.xml (renamed from test/testcases/tests/level1/html/HTMLElement130.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement131.xml (renamed from test/testcases/tests/level1/html/HTMLElement131.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement132.xml (renamed from test/testcases/tests/level1/html/HTMLElement132.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement133.xml (renamed from test/testcases/tests/level1/html/HTMLElement133.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement134.xml (renamed from test/testcases/tests/level1/html/HTMLElement134.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement135.xml (renamed from test/testcases/tests/level1/html/HTMLElement135.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement136.xml (renamed from test/testcases/tests/level1/html/HTMLElement136.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement137.xml (renamed from test/testcases/tests/level1/html/HTMLElement137.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement138.xml (renamed from test/testcases/tests/level1/html/HTMLElement138.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement139.xml (renamed from test/testcases/tests/level1/html/HTMLElement139.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement140.xml (renamed from test/testcases/tests/level1/html/HTMLElement140.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement141.xml (renamed from test/testcases/tests/level1/html/HTMLElement141.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement142.xml (renamed from test/testcases/tests/level1/html/HTMLElement142.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement143.xml (renamed from test/testcases/tests/level1/html/HTMLElement143.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement144.xml (renamed from test/testcases/tests/level1/html/HTMLElement144.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLElement145.xml (renamed from test/testcases/tests/level1/html/HTMLElement145.xml.kfail) | 0 |
32 files changed, 32 insertions, 50 deletions
diff --git a/include/dom/html/html_element.h b/include/dom/html/html_element.h index 1b40e25..d6d3c88 100644 --- a/include/dom/html/html_element.h +++ b/include/dom/html/html_element.h @@ -31,10 +31,10 @@ typedef struct dom_html_element_vtable { dom_string **dir); dom_exception (*dom_html_element_set_dir)(struct dom_html_element *element, dom_string *dir); - dom_exception (*dom_html_element_get_classname)(struct dom_html_element *element, - dom_string **classname); - dom_exception (*dom_html_element_set_classname)(struct dom_html_element *element, - dom_string *classname); + dom_exception (*dom_html_element_get_class_name)(struct dom_html_element *element, + dom_string **class_name); + dom_exception (*dom_html_element_set_class_name)(struct dom_html_element *element, + dom_string *class_name); } dom_html_element_vtable; static inline dom_exception dom_html_element_get_id(struct dom_html_element *element, @@ -109,23 +109,23 @@ static inline dom_exception dom_html_element_set_dir(struct dom_html_element *el #define dom_html_element_set_dir(e, dir) dom_html_element_set_dir( \ (dom_html_element *) (e), (dir)) -static inline dom_exception dom_html_element_get_classname(struct dom_html_element *element, - dom_string **classname) +static inline dom_exception dom_html_element_get_class_name(struct dom_html_element *element, + dom_string **class_name) { return ((dom_html_element_vtable *) ((dom_node *) element)->vtable)-> - dom_html_element_get_classname(element, classname); + dom_html_element_get_class_name(element, class_name); } -#define dom_html_element_get_classname(e, classname) dom_html_element_get_classname( \ - (dom_html_element *) (e), (classname)) +#define dom_html_element_get_class_name(e, class_name) dom_html_element_get_class_name( \ + (dom_html_element *) (e), (class_name)) -static inline dom_exception dom_html_element_set_classname(struct dom_html_element *element, - dom_string *classname) +static inline dom_exception dom_html_element_set_class_name(struct dom_html_element *element, + dom_string *class_name) { return ((dom_html_element_vtable *) ((dom_node *) element)->vtable)-> - dom_html_element_set_classname(element, classname); + dom_html_element_set_class_name(element, class_name); } -#define dom_html_element_set_classname(e, classname) dom_html_element_set_classname( \ - (dom_html_element *) (e), (classname)) +#define dom_html_element_set_class_name(e, class_name) dom_html_element_set_class_name( \ + (dom_html_element *) (e), (class_name)) #endif diff --git a/src/html/html_element.c b/src/html/html_element.c index b670439..18607d7 100644 --- a/src/html/html_element.c +++ b/src/html/html_element.c @@ -103,9 +103,9 @@ dom_exception _dom_html_element_copy(dom_node_internal *old, /*-----------------------------------------------------------------------*/ /* API functions */ -#define SIMPLE_GET_SET(attr) \ -dom_exception _dom_html_element_get_##attr(dom_html_element *element, \ - dom_string **attr) \ +#define SIMPLE_GET_SET(fattr,attr) \ +dom_exception _dom_html_element_get_##fattr(dom_html_element *element, \ + dom_string **fattr) \ { \ dom_exception ret; \ dom_string *_memo_##attr; \ @@ -114,13 +114,13 @@ dom_exception _dom_html_element_get_##attr(dom_html_element *element, \ ((struct dom_html_document *) \ ((struct dom_node_internal *)element)->owner)->_memo_##attr; \ \ - ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + ret = dom_element_get_attribute(element, _memo_##attr, fattr); \ \ return ret; \ } \ \ -dom_exception _dom_html_element_set_##attr(dom_html_element *element, \ - dom_string *attr) \ +dom_exception _dom_html_element_set_##fattr(dom_html_element *element, \ + dom_string *fattr) \ { \ dom_exception ret; \ dom_string *_memo_##attr; \ @@ -129,34 +129,16 @@ dom_exception _dom_html_element_set_##attr(dom_html_element *element, \ ((struct dom_html_document *) \ ((struct dom_node_internal *)element)->owner)->_memo_##attr; \ \ - ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + ret = dom_element_set_attribute(element, _memo_##attr, fattr); \ \ return ret; \ } -SIMPLE_GET_SET(id) -SIMPLE_GET_SET(title) -SIMPLE_GET_SET(lang) -SIMPLE_GET_SET(dir) - -dom_exception _dom_html_element_get_classname(dom_html_element *element, - dom_string **classname) -{ - UNUSED(element); - UNUSED(classname); - - return DOM_NOT_SUPPORTED_ERR; -} - -dom_exception _dom_html_element_set_classname(dom_html_element *element, - dom_string *classname) -{ - UNUSED(element); - UNUSED(classname); - - return DOM_NOT_SUPPORTED_ERR; -} - +SIMPLE_GET_SET(id,id) +SIMPLE_GET_SET(title,title) +SIMPLE_GET_SET(lang,lang) +SIMPLE_GET_SET(dir,dir) +SIMPLE_GET_SET(class_name,class) /*-----------------------------------------------------------------------*/ /* Common functions */ diff --git a/src/html/html_element.h b/src/html/html_element.h index 3194cba..2766dab 100644 --- a/src/html/html_element.h +++ b/src/html/html_element.h @@ -60,10 +60,10 @@ dom_exception _dom_html_element_get_dir(dom_html_element *element, dom_string **dir); dom_exception _dom_html_element_set_dir(dom_html_element *element, dom_string *dir); -dom_exception _dom_html_element_get_classname(dom_html_element *element, - dom_string **classname); -dom_exception _dom_html_element_set_classname(dom_html_element *element, - dom_string *classname); +dom_exception _dom_html_element_get_class_name(dom_html_element *element, + dom_string **class_name); +dom_exception _dom_html_element_set_class_name(dom_html_element *element, + dom_string *class_name); #define DOM_HTML_ELEMENT_VTABLE \ _dom_html_element_get_id, \ @@ -74,8 +74,8 @@ dom_exception _dom_html_element_set_classname(dom_html_element *element, _dom_html_element_set_lang, \ _dom_html_element_get_dir, \ _dom_html_element_set_dir, \ - _dom_html_element_get_classname, \ - _dom_html_element_set_classname + _dom_html_element_get_class_name, \ + _dom_html_element_set_class_name /* Some common functions used by all child classes */ dom_exception dom_html_element_get_bool_property(dom_html_element *ele, diff --git a/test/testcases/tests/level1/html/HTMLElement117.xml.kfail b/test/testcases/tests/level1/html/HTMLElement117.xml index ba720cd..ba720cd 100644 --- a/test/testcases/tests/level1/html/HTMLElement117.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement117.xml diff --git a/test/testcases/tests/level1/html/HTMLElement118.xml.kfail b/test/testcases/tests/level1/html/HTMLElement118.xml index a175045..a175045 100644 --- a/test/testcases/tests/level1/html/HTMLElement118.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement118.xml diff --git a/test/testcases/tests/level1/html/HTMLElement119.xml.kfail b/test/testcases/tests/level1/html/HTMLElement119.xml index 09361ae..09361ae 100644 --- a/test/testcases/tests/level1/html/HTMLElement119.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement119.xml diff --git a/test/testcases/tests/level1/html/HTMLElement120.xml.kfail b/test/testcases/tests/level1/html/HTMLElement120.xml index 4edc694..4edc694 100644 --- a/test/testcases/tests/level1/html/HTMLElement120.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement120.xml diff --git a/test/testcases/tests/level1/html/HTMLElement121.xml.kfail b/test/testcases/tests/level1/html/HTMLElement121.xml index 93af01a..93af01a 100644 --- a/test/testcases/tests/level1/html/HTMLElement121.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement121.xml diff --git a/test/testcases/tests/level1/html/HTMLElement122.xml.kfail b/test/testcases/tests/level1/html/HTMLElement122.xml index e1e1064..e1e1064 100644 --- a/test/testcases/tests/level1/html/HTMLElement122.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement122.xml diff --git a/test/testcases/tests/level1/html/HTMLElement123.xml.kfail b/test/testcases/tests/level1/html/HTMLElement123.xml index de7ce7a..de7ce7a 100644 --- a/test/testcases/tests/level1/html/HTMLElement123.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement123.xml diff --git a/test/testcases/tests/level1/html/HTMLElement124.xml.kfail b/test/testcases/tests/level1/html/HTMLElement124.xml index 1f86541..1f86541 100644 --- a/test/testcases/tests/level1/html/HTMLElement124.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement124.xml diff --git a/test/testcases/tests/level1/html/HTMLElement125.xml.kfail b/test/testcases/tests/level1/html/HTMLElement125.xml index 4238620..4238620 100644 --- a/test/testcases/tests/level1/html/HTMLElement125.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement125.xml diff --git a/test/testcases/tests/level1/html/HTMLElement126.xml.kfail b/test/testcases/tests/level1/html/HTMLElement126.xml index fdfd4a9..fdfd4a9 100644 --- a/test/testcases/tests/level1/html/HTMLElement126.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement126.xml diff --git a/test/testcases/tests/level1/html/HTMLElement127.xml.kfail b/test/testcases/tests/level1/html/HTMLElement127.xml index f7eb5ff..f7eb5ff 100644 --- a/test/testcases/tests/level1/html/HTMLElement127.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement127.xml diff --git a/test/testcases/tests/level1/html/HTMLElement128.xml.kfail b/test/testcases/tests/level1/html/HTMLElement128.xml index 3656298..3656298 100644 --- a/test/testcases/tests/level1/html/HTMLElement128.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement128.xml diff --git a/test/testcases/tests/level1/html/HTMLElement129.xml.kfail b/test/testcases/tests/level1/html/HTMLElement129.xml index 80ca878..80ca878 100644 --- a/test/testcases/tests/level1/html/HTMLElement129.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement129.xml diff --git a/test/testcases/tests/level1/html/HTMLElement130.xml.kfail b/test/testcases/tests/level1/html/HTMLElement130.xml index 9636f0e..9636f0e 100644 --- a/test/testcases/tests/level1/html/HTMLElement130.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement130.xml diff --git a/test/testcases/tests/level1/html/HTMLElement131.xml.kfail b/test/testcases/tests/level1/html/HTMLElement131.xml index d0a35ee..d0a35ee 100644 --- a/test/testcases/tests/level1/html/HTMLElement131.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement131.xml diff --git a/test/testcases/tests/level1/html/HTMLElement132.xml.kfail b/test/testcases/tests/level1/html/HTMLElement132.xml index 50e124e..50e124e 100644 --- a/test/testcases/tests/level1/html/HTMLElement132.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement132.xml diff --git a/test/testcases/tests/level1/html/HTMLElement133.xml.kfail b/test/testcases/tests/level1/html/HTMLElement133.xml index 096cbfa..096cbfa 100644 --- a/test/testcases/tests/level1/html/HTMLElement133.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement133.xml diff --git a/test/testcases/tests/level1/html/HTMLElement134.xml.kfail b/test/testcases/tests/level1/html/HTMLElement134.xml index dd9645e..dd9645e 100644 --- a/test/testcases/tests/level1/html/HTMLElement134.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement134.xml diff --git a/test/testcases/tests/level1/html/HTMLElement135.xml.kfail b/test/testcases/tests/level1/html/HTMLElement135.xml index 5b52ce5..5b52ce5 100644 --- a/test/testcases/tests/level1/html/HTMLElement135.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement135.xml diff --git a/test/testcases/tests/level1/html/HTMLElement136.xml.kfail b/test/testcases/tests/level1/html/HTMLElement136.xml index 459f9a5..459f9a5 100644 --- a/test/testcases/tests/level1/html/HTMLElement136.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement136.xml diff --git a/test/testcases/tests/level1/html/HTMLElement137.xml.kfail b/test/testcases/tests/level1/html/HTMLElement137.xml index bd9d69b..bd9d69b 100644 --- a/test/testcases/tests/level1/html/HTMLElement137.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement137.xml diff --git a/test/testcases/tests/level1/html/HTMLElement138.xml.kfail b/test/testcases/tests/level1/html/HTMLElement138.xml index 25e4ced..25e4ced 100644 --- a/test/testcases/tests/level1/html/HTMLElement138.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement138.xml diff --git a/test/testcases/tests/level1/html/HTMLElement139.xml.kfail b/test/testcases/tests/level1/html/HTMLElement139.xml index 82b2771..82b2771 100644 --- a/test/testcases/tests/level1/html/HTMLElement139.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement139.xml diff --git a/test/testcases/tests/level1/html/HTMLElement140.xml.kfail b/test/testcases/tests/level1/html/HTMLElement140.xml index e982a80..e982a80 100644 --- a/test/testcases/tests/level1/html/HTMLElement140.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement140.xml diff --git a/test/testcases/tests/level1/html/HTMLElement141.xml.kfail b/test/testcases/tests/level1/html/HTMLElement141.xml index 5c22702..5c22702 100644 --- a/test/testcases/tests/level1/html/HTMLElement141.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement141.xml diff --git a/test/testcases/tests/level1/html/HTMLElement142.xml.kfail b/test/testcases/tests/level1/html/HTMLElement142.xml index 4f78aff..4f78aff 100644 --- a/test/testcases/tests/level1/html/HTMLElement142.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement142.xml diff --git a/test/testcases/tests/level1/html/HTMLElement143.xml.kfail b/test/testcases/tests/level1/html/HTMLElement143.xml index 84700a2..84700a2 100644 --- a/test/testcases/tests/level1/html/HTMLElement143.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement143.xml diff --git a/test/testcases/tests/level1/html/HTMLElement144.xml.kfail b/test/testcases/tests/level1/html/HTMLElement144.xml index e4bdee4..e4bdee4 100644 --- a/test/testcases/tests/level1/html/HTMLElement144.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement144.xml diff --git a/test/testcases/tests/level1/html/HTMLElement145.xml.kfail b/test/testcases/tests/level1/html/HTMLElement145.xml index 3241888..3241888 100644 --- a/test/testcases/tests/level1/html/HTMLElement145.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLElement145.xml |