Changeset 20949

Timestamp:

10/08/08 09:16:42 (3 months ago)

Author:

tokuhirom

Message:

added doc.createCDATASection

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/libxml/SConscript (modified) (1 diff)
• ext/libxml/document.cc (modified) (5 diffs)
• ext/libxml/libxml.cc (modified) (2 diffs)
• ext/libxml/libxml.h (modified) (2 diffs)
• t/070_libxml/02_dom.js (modified) (2 diffs)

lang/cplusplus/llv8call/trunk/ext/libxml/SConscript

@@ -12 +12 @@
     env.SharedLibrary(
         "libxml",
-        [Split('libxml.cc document.cc node.cc dom.c element.cc attr.cc')],
+        [Split('libxml.cc document.cc node.cc dom.c element.cc attr.cc cdata.cc')],
         LIBS=['v8'] + env['LIBS'],
     )

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

@@ -100 +100 @@
 END
 
-FUNCTION(_createElement)
+FUNCTION(createElement)
     ARG_COUNT(1);
     ARG_str(elname, 0);
@@ -110 +110 @@
     xmlAddChild(fragment, node_raw);
     return createElem( doc, node_raw );
+END
+
+FUNCTION(createCDATASection)
+    ARG_COUNT(1);
+    ARG_str(elname, 0);
+    EXTERNAL_DOC();
+    EXTERNAL_FRAGMENT();
+
+    xmlNodePtr node_raw = xmlNewCDataBlock(doc, (const xmlChar*)*elname, elname.length());
+    assert(node_raw);
+    xmlAddChild(fragment, node_raw);
+    return createCDATA( doc, node_raw );
 END
 
@@ -184 +196 @@
     BIND_IM("documentElement",        _documentElement);
     BIND_IM("setDocumentElement",     setDocumentElement);
-    BIND_IM("createElement",          _createElement);
+    BIND_IM("createElement",          createElement);
+    BIND_IM("createCDATASection",     createCDATASection);
     BIND_IM("createAttribute",        createAttribute);
     BIND_IM("createTextNode",         createTextNode);
@@ -194 +207 @@
 ENDSUBMODULE
 
-// REST: 12/51
+// REST: 13/51
 
 // TODO: doc.actualEncoding
@@ -216 +229 @@
 // TODO: doc.createAttributeNS
 // TODO: doc.createDocumentFragment
-// TODO: doc.createCDATASection
 // TODO: doc.createProcessingInstruction
 // TODO: doc.createEntityReference

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

@@ -37 +37 @@
 extern void init_attr(Handle<Object> target);
 extern void init_elem(Handle<Object> target);
+extern void init_cdata(Handle<Object> target);
 
 V8EXTINIT_FUNC 
@@ -47 +48 @@
     init_attr(target);
     init_elem(target);
+    init_cdata(target);
 
     return target;

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

@@ -35 +35 @@
 }
 
+inline v8::Handle<v8::Function> cdata_class() {
+    return Handle<Function>::Cast( libxml_namespace()->Get(String::New("CDATASection")) );
+}
+
 static inline Handle<Object> createNode(xmlDocPtr doc, xmlNodePtr node_raw) {
     Handle<Value> consarg[2];
@@ -56 +60 @@
 }
 
+static inline Handle<Object> createCDATA(xmlDocPtr doc, xmlNodePtr attr_raw) {
+    Handle<Value> consarg[2];
+    consarg[0] = External::New(attr_raw);
+    consarg[1] = External::New(doc);
+    return cdata_class()->NewInstance(2, consarg);
+}
+
 #define ARG_node(name, n) EXTERNAL(xmlNodePtr, name, args[n]->ToObject(), 0)
 #define ARG_attr(name, n) EXTERNAL(xmlAttrPtr, name, args[n]->ToObject(), 0)

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

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:22});
+plan({tests:23});
 
 check_lib("org.coderepos.libxml");
@@ -103 +103 @@
 });
 
+test(function () {
+    var cdata = doc.createCDATASection("foo");
+    root.appendChild(cdata);
+    is(root.toString(),  '<foo foo="baz"><![CDATA[foo]]></foo>',               'doc.createCDATASection()');
+});
+
 doc.close();