Changeset 20859

Timestamp:

10/06/08 23:59:56 (2 months ago)

Author:

tokuhirom

Message:

added doc.createDocument(), doc.setDocumentElement()

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/libxml/document.cc (modified) (4 diffs)
• ext/libxml/libxml.h (modified) (2 diffs)
• ext/libxml/node.cc (modified) (1 diff)
• t/070_libxml/01_simple.js (modified) (2 diffs)
• t/070_libxml/02_dom.js (added)

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

@@ -24 +24 @@
 
 #define EXTERNAL_DOC() EXTERNAL(xmlDocPtr, doc, args.This(), 0);
+
+FUNCTION(createDocument)
+    ARG_BETWEEN(1, 2);
+    ARG_str(version,  0);
+    xmlDocPtr doc = xmlNewDoc((const xmlChar*)*version);
+    assert(doc);
+    if (args.Length() == 2) {
+        ARG_str(encoding, 1);
+        doc->encoding = (const xmlChar*)xmlStrdup((const xmlChar*)*encoding);
+    }
+    Handle<Object> t = document_class()->NewInstance();
+    t->SetInternalField(0, External::New(doc));
+    return t;
+END
 
 FUNCTION(_readFile)
@@ -53 +67 @@
     assert(node_raw);
     return createNode( doc,  node_raw );
+END
+
+FUNCTION(setDocumentElement)
+    ARG_COUNT(1);
+    EXTERNAL_DOC();
+    ARG_node(node, 0);
+
+    if (doc!=node->doc) {
+        domImportNode(doc, node, 1, 1);
+    }
+    xmlNodePtr oelem = xmlDocGetRootElement( doc );
+    if ( oelem == NULL || oelem->_private == NULL ) {
+        xmlDocSetRootElement( doc, node );
+    } else {
+        abort(); // TODO: implement
+    }
+    return Undefined();
 END
 
@@ -93 +124 @@
 SUBMODULE(init_document)
     CLASS();
+    BIND_CM("createDocument",         createDocument);
+
     BIND_IM("readFile",               _readFile);
     BIND_IM("encoding",               _encoding);
     BIND_IM("version",                _version);
     BIND_IM("documentElement",        _documentElement);
+    BIND_IM("setDocumentElement",     setDocumentElement);
     BIND_IM("createElement",          _createElement);
     BIND_IM("toString",               toString);
@@ -106 +140 @@
 // rest: 7/51
 
-// TODO: doc.createDocument
 // TODO: doc.actualEncoding
 // TODO: doc.setEncoding

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

@@ -23 +23 @@
 }
 
+inline v8::Handle<v8::Function> document_class() {
+    return Handle<Function>::Cast( libxml_namespace()->Get(String::New("Document")) );
+}
+
 static inline Handle<Object> createNode(xmlDocPtr doc, xmlNodePtr node_raw) {
     Handle<Value> consarg[2];
@@ -30 +34 @@
 }
 
+#define ARG_node(name, n) EXTERNAL(xmlNodePtr, name, args[n]->ToObject(), 0)
+

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

@@ -25 +25 @@
 #define EXTERNAL_NODE()   EXTERNAL(xmlNodePtr, node, args.This(),         0)
 #define EXTERNAL_DOC()    EXTERNAL(xmlDocPtr,  doc,  args.This(),         1)
-#define ARG_node(name, n) EXTERNAL(xmlNodePtr, name, args[n]->ToObject(), 0)
 
 FUNCTION(_new)

lang/cplusplus/llv8call/trunk/t/070_libxml/01_simple.js

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:11});
+plan({tests:7});
 
 check_lib("org.coderepos.libxml");
@@ -15 +15 @@
 is(doc.createElement("bar").toString(), "<bar/>", 'node.toString');
 is(root.toString(), "<foo/>", "node.toString");
-var bar = doc.createElement("bar");
-var eee = doc.createElement("eee");
-root.appendChild(bar);
-is(root.toString(), "<foo><bar/></foo>", "node.appendChild");
-root.removeChild(bar);
-is(root.toString(), "<foo/>", "node.removeChild");
-root.appendChild(bar);
-root.appendChild(eee);
-is(root.toString(), "<foo><bar/><eee/></foo>", "node.appendChild");
-root.removeChildNodes();
-is(root.toString(), "<foo/>", "node.removeChildNodes");
-root.appendChild(bar);
-is(root.insertBefore(eee, bar).nodeName(), 'eee', 'node.insertBefore');
-is(root.toString(), "<foo><eee/><bar/></foo>", "node.insertBefore");
-root.removeChildNodes();
-root.appendChild(bar);
-is(root.insertAfter(eee, bar).nodeName(), 'eee', 'node.insertAfter');
-is(root.toString(), "<foo><bar/><eee/></foo>", "node.insertAfter");
 doc.close();