Changeset 20866 for lang/cplusplus

Timestamp:

10/07/08 01:15:50 (2 months ago)

Author:

tokuhirom

Message:

added doc.createComment

Location:

lang/cplusplus/llv8call/trunk

Files:

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

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

@@ -110 +110 @@
     xmlAddChild(fragment, node_raw);
     return createNode( doc, node_raw );
+END
+
+FUNCTION(createComment)
+    ARG_COUNT(1);
+    ARG_str(text, 0);
+    EXTERNAL_DOC();
+    EXTERNAL_FRAGMENT();
+
+    xmlNodePtr textnode = xmlNewDocComment(doc, (const xmlChar*)*text);
+    assert(textnode);
+    textnode->doc = doc;
+    xmlAddChild(fragment, textnode);
+    return createNode( doc, textnode );
 END
 
@@ -162 +175 @@
     BIND_IM("createElement",          _createElement);
     BIND_IM("createTextNode",         createTextNode);
+    BIND_IM("createComment",          createComment);
     BIND_IM("toString",               toString);
     BIND_IM("close",                  _close);
@@ -168 +182 @@
 ENDSUBMODULE
 
-// rest: 11/51
+// REST: 12/51
 
 // TODO: doc.actualEncoding
@@ -188 +202 @@
 // TODO: doc.documentElement
 // TODO: doc.createElementNS
-// TODO: doc.createComment
 // TODO: doc.createAttribute
 // TODO: doc.createAttributeNS

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

@@ -125 +125 @@
 END
 
+xmlNodePtr
+_CloneNodeIn( xmlNodePtr node, int recursive )
+{
+    xmlNodePtr retval = NULL;
+    
+    if ( node != NULL ) {
+        switch ( node->type ) {
+        case XML_ELEMENT_NODE:
+        case XML_TEXT_NODE:
+        case XML_CDATA_SECTION_NODE:
+        case XML_ENTITY_REF_NODE:
+        case XML_PI_NODE:
+        case XML_COMMENT_NODE:
+        case XML_DOCUMENT_FRAG_NODE:
+        case XML_ENTITY_DECL: 
+          retval = xmlCopyNode( node, recursive ? 1 : 2 );
+          break;
+        case XML_ATTRIBUTE_NODE:
+          retval = (xmlNodePtr) xmlCopyProp( NULL, (xmlAttrPtr) node );
+          break;
+        case XML_DOCUMENT_NODE:
+        case XML_HTML_DOCUMENT_NODE:
+          retval = (xmlNodePtr) xmlCopyDoc( (xmlDocPtr)node, recursive );
+          break;
+        case XML_DOCUMENT_TYPE_NODE:
+        case XML_DTD_NODE:
+          retval = (xmlNodePtr) xmlCopyDtd( (xmlDtdPtr)node );
+          break;
+        case XML_NAMESPACE_DECL:
+          retval = ( xmlNodePtr ) xmlCopyNamespace( (xmlNsPtr) node );
+          break;
+        default:
+          break;
+        }
+    }
+
+    return retval;
+}
+
+FUNCTION(cloneNode)
+    ARG_BETWEEN(0, 1);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    int deep = args.Length() == 1 ? args[0]->Int32Value() : 0;
+    xmlNodePtr ret = _CloneNodeIn( node, deep );
+    assert(ret);
+    return createNode( doc, ret );
+END
+
+FUNCTION(firstChild)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    return createNode( doc, node->children );
+END
+
+FUNCTION(lastChild)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    return createNode( doc, node->last );
+END
+
+FUNCTION(parentNode)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    EXTERNAL_DOC();
+    return createNode( doc, node->parent );
+END
+
 SUBMODULE(init_node)
     CLASS_WITH_CONSTRUCTOR(_new);
@@ -134 +204 @@
     BIND_IM("removeChild",         removeChild);
     BIND_IM("removeChildNodes",    removeChildNodes);
+    BIND_IM("cloneNode",           cloneNode);
+    BIND_IM("firstChild",          firstChild);
+    BIND_IM("lastChild",           lastChild);
+    BIND_IM("parentNode",          parentNode);
     INTERNALCOUNT(2);
     EXPORT_CLASS("Node");
 ENDSUBMODULE
 
-// REST: 7/50
+// REST: 11/50
+
 // TODO: node.setNodeName
 // TODO: node.isSameNode
@@ -151 +226 @@
 // TODO: node.addNewChild
 // TODO: node.addSibling
-// TODO: node.cloneNode
-// TODO: node.parentNode
 // TODO: node.nextSibling
 // TODO: node.previousSibling
 // TODO: node.hasChildNodes
-// TODO: node.firstChild
-// TODO: node.lastChild
 // TODO: node.ownerDocument
 // TODO: node.getOwner

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

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:11});
+plan({tests:17});
 
 check_lib("org.coderepos.libxml");
@@ -63 +63 @@
 });
 
+test(function () {
+    root.appendChild(bar)
+    root.appendChild(bar.cloneNode())
+    is(root.toString(), '<foo><bar/><bar/></foo>', 'doc.cloneNode()');
+});
+
+test(function () {
+    root.appendChild(bar)
+    root.appendChild(eee)
+    is(root.firstChild().nodeName(), 'bar', 'node.firstChild()');
+    is(root.lastChild().nodeName(),  'eee', 'node.lastChild()');
+});
+
+test(function () {
+    root.appendChild(bar)
+    bar.appendChild(eee)
+    is(root.toString(),  '<foo><bar><eee/></bar></foo>', 'node.parentNode()');
+    is(eee.parentNode().nodeName(), 'bar', 'node.parentNode()');
+});
+
+test(function () {
+    root.appendChild(doc.createComment("yay"));
+    is(root.toString(),  '<foo><!--yay--></foo>', 'node.createComment()');
+});
+
 doc.close();