Changeset 20881 for lang/cplusplus

Timestamp:

10/07/08 09:25:10 (2 months ago)

Author:

tokuhirom

Message:

added doc.createAttribute, element class, attribute class, elem.setAttributeNode

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/include/llv8-macros.h (modified) (1 diff)
• ext/libxml/SConscript (modified) (1 diff)
• ext/libxml/attr.cc (added)
• ext/libxml/document.cc (modified) (5 diffs)
• ext/libxml/element.cc (added)
• ext/libxml/libxml.cc (modified) (2 diffs)
• ext/libxml/libxml.h (modified) (2 diffs)
• ext/libxml/node.cc (modified) (1 diff)
• ext/libxml/node.h (added)
• t/070_libxml/02_dom.js (modified) (1 diff)

lang/cplusplus/llv8call/trunk/ext/include/llv8-macros.h

@@ -103 +103 @@
 #define SUBMODULE(funcname) void funcname(Handle<Object> target) {
 #define ENDSUBMODULE }
+#define OBJECT_TEMPLATE   __k7_ot
  
 #endif

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

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

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

@@ -80 +80 @@
     xmlNodePtr node_raw = xmlDocGetRootElement(doc);
     assert(node_raw);
-    return createNode( doc,  node_raw );
+    return createElem( doc,  node_raw );
 END
 
@@ -109 +109 @@
     assert(node_raw);
     xmlAddChild(fragment, node_raw);
-    return createNode( doc, node_raw );
+    return createElem( doc, node_raw );
+END
+
+// attrnode = doc.createAttribute(name [,value]);
+FUNCTION(createAttribute)
+    ARG_BETWEEN(1, 2);
+    ARG_str(name,  0);
+    ARG_str(value, 1);
+    EXTERNAL_DOC();
+
+    xmlAttrPtr attr = xmlNewDocProp(doc, (const xmlChar*)*name, args.Length() == 2 ? (const xmlChar*)*value : NULL);
+    return createAttr(attr);
 END
 
@@ -174 +185 @@
     BIND_IM("setDocumentElement",     setDocumentElement);
     BIND_IM("createElement",          _createElement);
+    BIND_IM("createAttribute",        createAttribute);
     BIND_IM("createTextNode",         createTextNode);
     BIND_IM("createComment",          createComment);
@@ -202 +214 @@
 // TODO: doc.documentElement
 // TODO: doc.createElementNS
-// TODO: doc.createAttribute
 // TODO: doc.createAttributeNS
 // TODO: doc.createDocumentFragment
@@ -223 +234 @@
 // TODO: doc.getElementById
 // TODO: doc.indexElements
+

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

@@ -35 +35 @@
 extern void init_document(Handle<Object> target);
 extern void init_node(Handle<Object> target);
+extern void init_attr(Handle<Object> target);
+extern void init_elem(Handle<Object> target);
 
 V8EXTINIT_FUNC 
@@ -43 +45 @@
     init_document(target);
     init_node(target);
+    init_attr(target);
+    init_elem(target);
 
     return target;

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

@@ -23 +23 @@
 }
 
+inline v8::Handle<v8::Function> attr_class() {
+    return Handle<Function>::Cast( libxml_namespace()->Get(String::New("Attr")) );
+}
+
+inline v8::Handle<v8::Function> elem_class() {
+    return Handle<Function>::Cast( libxml_namespace()->Get(String::New("Element")) );
+}
+
 inline v8::Handle<v8::Function> document_class() {
     return Handle<Function>::Cast( libxml_namespace()->Get(String::New("Document")) );
@@ -34 +42 @@
 }
 
+static inline Handle<Object> createElem(xmlDocPtr doc, xmlNodePtr elem_raw) {
+    Handle<Value> consarg[2];
+    consarg[0] = External::New(elem_raw);
+    consarg[1] = External::New(doc);
+    return elem_class()->NewInstance(2, consarg);
+}
+
+static inline Handle<Object> createAttr(xmlAttrPtr attr_raw) {
+    Handle<Value> consarg[1];
+    consarg[0] = External::New(attr_raw);
+    return attr_class()->NewInstance(1, 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/ext/libxml/node.cc

@@ -21 +21 @@
 // THE SOFTWARE.
 
-#include "libxml.h"
-
-#define EXTERNAL_NODE()   EXTERNAL(xmlNodePtr, node, args.This(),         0)
-#define EXTERNAL_DOC()    EXTERNAL(xmlDocPtr,  doc,  args.This(),         1)
-
-FUNCTION(_new)
-    ARG_COUNT(2);
-    assert(args[0]->IsExternal());
-    assert(args[1]->IsExternal());
-    args.This()->SetInternalField(0, args[0]);
-    args.This()->SetInternalField(1, args[1]);
-    return args.This();
-END
-
-FUNCTION(nodeName)
-    ARG_COUNT(0);
-    EXTERNAL_NODE();
-    return String::New((char*)domName(node));
-END
-
-FUNCTION(toString)
-    ARG_BETWEEN(0, 1);
-    EXTERNAL_NODE();
-    EXTERNAL_DOC();
-    int format = args.Length() > 0 ? args[0]->Int32Value() : 0;
-
-    xmlBufferPtr buffer = xmlBufferCreate();
-    if ( format <= 0 ) {
-        xmlNodeDump(
-            buffer,
-            doc,
-            node, 0, format
-        );
-    }
-    else {
-        int t_indent_var = xmlIndentTreeOutput;
-        xmlIndentTreeOutput = 1;
-        xmlNodeDump(
-            buffer,
-            doc,
-            node, 0, format
-        );
-        xmlIndentTreeOutput = t_indent_var;
-    }
-    const xmlChar *ret = xmlBufferContent( buffer );
-    assert(ret);
-    Handle<String> s = String::New((const char*)ret);
-    xmlBufferFree(buffer);
-    return s;
-END
-
-FUNCTION(appendChild)
-    ARG_BETWEEN(0, 1);
-    EXTERNAL_NODE();
-    EXTERNAL_DOC();
-    ARG_node(argnode, 0);
-    xmlNodePtr rNode = domAppendChild( node, argnode );
-    return createNode( doc, rNode );
-END
-
-FUNCTION(insertBefore)
-    ARG_COUNT(2);
-    EXTERNAL_NODE();
-    EXTERNAL_DOC();
-    ARG_node(newnode, 0);
-    ARG_node(refnode, 1);
-    xmlNodePtr rNode = domInsertBefore( node, newnode, refnode );
-    assert(rNode);
-    return createNode( doc, rNode );
-END
-
-FUNCTION(insertAfter)
-    ARG_COUNT(2);
-    EXTERNAL_NODE();
-    EXTERNAL_DOC();
-    ARG_node(newnode, 0);
-    ARG_node(refnode, 1);
-    xmlNodePtr rNode = domInsertAfter( node, newnode, refnode );
-    assert(rNode);
-    return createNode( doc, rNode );
-END
-
-FUNCTION(removeChild)
-    ARG_BETWEEN(0, 1);
-    EXTERNAL_NODE();
-    EXTERNAL_DOC();
-    ARG_node(argnode, 0);
-    xmlNodePtr rNode = domRemoveChild( node, argnode );
-    return createNode( doc, rNode );
-END
-
-// remove whole child nodes
-FUNCTION(removeChildNodes)
-    ARG_BETWEEN(0, 1);
-    EXTERNAL_NODE();
-    xmlNodePtr elem = node->children;
-    while (elem ) {
-        xmlUnlinkNode( elem );
-        elem = elem->next;
-    }
-    node->children = node->last = NULL;
-    return Undefined();
-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
+#include "node.h"
 
 SUBMODULE(init_node)
     CLASS_WITH_CONSTRUCTOR(_new);
-    BIND_IM("nodeName",            nodeName);
-    BIND_IM("toString",            toString);
-    BIND_IM("appendChild",         appendChild);
-    BIND_IM("insertBefore",        insertBefore);
-    BIND_IM("insertAfter",         insertAfter);
-    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);
+    setupNodeIM(OBJECT_TEMPLATE);
     EXPORT_CLASS("Node");
 ENDSUBMODULE

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

@@ -88 +88 @@
 });
 
+test(function () {
+    root.setAttributeNode(doc.createAttribute("foo", "bar"));
+    is(root.toString(),  '<foo foo="bar"/>', 'node.createAttribute()');
+});
+
 doc.close();