Changeset 20999

Timestamp:

10/08/08 23:44:32 (3 months ago)

Author:

tokuhirom

Message:

added node.nextSibling, node.previousSibling

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/libxml/node.cc (modified) (2 diffs)
• ext/libxml/node.h (modified) (2 diffs)
• t/070_libxml/02_dom.js (modified) (3 diffs)

lang/cplusplus/llv8call/trunk/ext/libxml/node.cc

@@ -35 +35 @@
 ENDSUBMODULE
 
-// REST: 11/50
+// REST: 13/50
 
 // TODO: node.setNodeName
@@ -49 +49 @@
 // TODO: node.addNewChild
 // TODO: node.addSibling
-// TODO: node.nextSibling
-// TODO: node.previousSibling
 // TODO: node.hasChildNodes
 // TODO: node.ownerDocument

lang/cplusplus/llv8call/trunk/ext/libxml/node.h

@@ -170 +170 @@
     EXTERNAL_NODE();
     EXTERNAL_DOC();
-    return CREATE_NODE( doc, node->parent );
+    if (node->parent) {
+        return CREATE_NODE( doc, node->parent );
+    } else {
+        return Undefined();
+    }
+END
+
+FUNCTION(nextSibling)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    if (node->next) {
+        return CREATE_NODE( doc, node->next );
+    } else {
+        return Undefined();
+    }
+END
+
+FUNCTION(previousSibling)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    if (node->prev) {
+        return CREATE_NODE( doc, node->prev );
+    } else {
+        return Undefined();
+    }
 END
 
@@ -198 +224 @@
     BIND_IM("lastChild",           lastChild);
     BIND_IM("parentNode",          parentNode);
+    BIND_IM("nextSibling",         nextSibling);
+    BIND_IM("previousSibling",     previousSibling);
     INTERNALCOUNT(2);
 }

lang/cplusplus/llv8call/trunk/t/070_libxml/02_dom.js

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:25});
+plan({tests:31});
 
 check_lib("org.coderepos.libxml");
@@ -80 +80 @@
     bar.appendChild(eee)
     is(root.toString(),  '<foo><bar><eee/></bar></foo>', 'node.parentNode()');
-    is(eee.parentNode().nodeName(), 'bar', 'node.parentNode()');
+    is(eee.parentNode().nodeName(),   'bar',     'node.parentNode()');
+    is(doc.createElement("emem").parentNode().parentNode(), undefined, 'node.parentNode()');
 });
 
@@ -111 +112 @@
 });
 
+test(function () {
+    var f1 = doc.createElement("f1");
+    var f2 = doc.createElement("f2");
+    var f3 = doc.createElement("f3");
+    root.appendChild(f1);
+    root.appendChild(f2);
+    root.appendChild(f3);
+    is(root.toString(),  '<foo foo="baz"><f1/><f2/><f3/></foo>',           'doc.nextSibling()');
+    is(f2.nextSibling().nodeName(),     'f3',                              'doc.nextSibling()');
+    is(f3.nextSibling(),                undefined,                         'doc.nextSibling()');
+    is(f2.previousSibling().nodeName(), 'f1',                              'doc.previousSibling()');
+    is(f1.previousSibling(),            undefined,                         'doc.previousSibling()');
+});
+
 doc.close();