Changeset 20864 for lang/cplusplus

Timestamp:

10/07/08 00:43:28 (2 months ago)

Author:

tokuhirom

Message:

added doc.createTextNode

Location:

lang/cplusplus/llv8call/trunk

Files:

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

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

@@ -23 +23 @@
 #include "libxml.h"
 
-#define EXTERNAL_DOC() EXTERNAL(xmlDocPtr, doc, args.This(), 0);
+#define EXTERNAL_DOC()      EXTERNAL(xmlDocPtr,  doc,      args.This(), 0);
+#define EXTERNAL_FRAGMENT() EXTERNAL(xmlNodePtr, fragment, args.This(), 1);
 
 FUNCTION(createDocument)
@@ -36 +37 @@
     Handle<Object> t = document_class()->NewInstance();
     t->SetInternalField(0, External::New(doc));
+    t->SetInternalField(1, External::New(xmlNewDocFragment(doc)));
     return t;
 END
@@ -45 +47 @@
     assert(doc); // TODO: better error handling
     args.This()->SetInternalField(0, External::New(doc));
+    args.This()->SetInternalField(1, External::New(xmlNewDocFragment(doc)));
     return Undefined();
 END
@@ -101 +104 @@
     ARG_str(elname, 0);
     EXTERNAL_DOC();
+    EXTERNAL_FRAGMENT();
 
     xmlNodePtr node_raw = xmlNewNode(NULL, (const xmlChar*)*elname);
     assert(node_raw);
+    xmlAddChild(fragment, node_raw);
     return createNode( doc, node_raw );
+END
+
+FUNCTION(createTextNode)
+    ARG_COUNT(1);
+    ARG_str(text, 0);
+    EXTERNAL_DOC();
+    EXTERNAL_FRAGMENT();
+
+    xmlNodePtr textnode = xmlNewDocText(doc, (const xmlChar*)*text);
+    assert(textnode);
+    textnode->doc = doc;
+    xmlAddChild(fragment, textnode);
+    return createNode( doc, textnode );
 END
 
@@ -136 +154 @@
     CLASS();
     BIND_CM("createDocument",         createDocument);
-
     BIND_IM("readFile",               _readFile);
     BIND_IM("encoding",               _encoding);
@@ -144 +161 @@
     BIND_IM("setDocumentElement",     setDocumentElement);
     BIND_IM("createElement",          _createElement);
+    BIND_IM("createTextNode",         createTextNode);
     BIND_IM("toString",               toString);
     BIND_IM("close",                  _close);
-    INTERNALCOUNT(1);
+    INTERNALCOUNT(2);
     EXPORT_CLASS("Document");
 ENDSUBMODULE
 
-// rest: 9/51
+// rest: 11/51
 
 // TODO: doc.actualEncoding
@@ -170 +188 @@
 // TODO: doc.documentElement
 // TODO: doc.createElementNS
-// TODO: doc.createTextNode
 // TODO: doc.createComment
 // TODO: doc.createAttribute

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

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:7});
+plan({tests:8});
 
 check_lib("org.coderepos.libxml");
@@ -15 +15 @@
 is(doc.createElement("bar").toString(), "<bar/>", 'node.toString');
 is(root.toString(), "<foo/>", "node.toString");
+doc.setEncoding("euc-jp");
+is(doc.encoding(), "euc-jp", "setEncoding");
 doc.close();
 

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

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:9});
+plan({tests:11});
 
 check_lib("org.coderepos.libxml");
 var libxml = org.coderepos.libxml;
+
 var doc = new libxml.Document.createDocument("1.0");
 var foo = doc.createElement("foo");
 doc.setDocumentElement(foo);
-doc.setEncoding("euc-jp");
-is(doc.encoding(), "euc-jp", "setEncoding");
 var root = doc.documentElement();
 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");
+
+function test(cb, purpose) {
+    root.removeChildNodes();
+    cb();
+}
+
+test(function () {
+    root.appendChild(bar);
+    is(root.toString(), "<foo><bar/></foo>", "node.appendChild");
+});
+
+test(function () {
+    root.appendChild(bar);
+    root.removeChild(bar);
+    is(root.toString(), "<foo/>", "node.removeChild");
+});
+
+test(function () {
+    root.appendChild(bar);
+    root.appendChild(eee);
+    is(root.toString(), "<foo><bar/><eee/></foo>", "node.appendChild");
+});
+
+test(function () {
+    root.removeChildNodes();
+    is(root.toString(), "<foo/>", "node.removeChildNodes");
+});
+
+test(function () {
+    root.appendChild(bar);
+    is(root.insertBefore(eee, bar).nodeName(), 'eee', 'node.insertBefore');
+    is(root.toString(), "<foo><eee/><bar/></foo>", "node.insertBefore");
+});
+
+test(function () {
+    root.appendChild(bar);
+    is(root.insertAfter(eee, bar).nodeName(), 'eee', 'node.insertAfter');
+    is(root.toString(), "<foo><bar/><eee/></foo>", "node.insertAfter");
+});
+
+test(function () {
+    root.appendChild(bar);
+    is(root.insertAfter(eee, bar).nodeName(), 'eee', 'node.insertAfter');
+    is(root.toString(), "<foo><bar/><eee/></foo>", "node.insertAfter");
+});
+
+test(function () {
+    root.appendChild(doc.createTextNode("qqq"));
+    is(root.toString(), '<foo>qqq</foo>', 'doc.createTextNode()');
+});
 
 doc.close();