Changeset 20947

Timestamp:

10/08/08 09:00:07 (3 months ago)

Author:

tokuhirom

Message:

added attr.* methods

Location:

lang/cplusplus/llv8call/trunk

Files:

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

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

@@ -21 +21 @@
 // THE SOFTWARE.
 
-#include "libxml.h"
+#include "node.h"
 
 #define EXTERNAL_ATTR()   EXTERNAL(xmlAttrPtr, attr, args.This(),         0)
 
-FUNCTION(_new)
+FUNCTION(setValue)
     ARG_COUNT(1);
-    assert(args[0]->IsExternal());
-    args.This()->SetInternalField(0, args[0]);
-    return args.This();
+    ARG_str(val, 0);
+    EXTERNAL_NODE();
+    domSetNodeValue(node, (xmlChar*)*val);
+    return Undefined();
 END
 
 SUBMODULE(init_attr)
     CLASS_WITH_CONSTRUCTOR(_new);
-    INTERNALCOUNT(1);
+    setupNodeIM(OBJECT_TEMPLATE);
+    BIND_IM("getValue",            getValue);
+    BIND_IM("value",               getValue);
+    BIND_IM("setValue",            setValue);
+    BIND_IM("getOwnerElement",     parentNode);
     EXPORT_CLASS("Attr");
 ENDSUBMODULE
 
-// REST: 0/8
-// TODO: node.new
-// TODO: node.getValue
-// TODO: node.value
-// TODO: node.setValue
-// TODO: node.getOwnerElement
-// TODO: node.setNamespace
-// TODO: node.isId
-// TODO: node.serializeContent($docencoding)
+// REST: 5/8
+// TODO: attr.setNamespace
+// TODO: attr.isId
+// TODO: attr.serializeContent($docencoding)
+

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

@@ -120 +120 @@
 
     xmlAttrPtr attr = xmlNewDocProp(doc, (const xmlChar*)*name, args.Length() == 2 ? (const xmlChar*)*value : NULL);
-    return createAttr(attr);
+    return createAttr(doc, attr);
 END
 

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

@@ -56 +56 @@
         return Undefined();
     } else {
-        return createAttr(ret);
+        return createAttr(doc, ret);
     }
 END

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

@@ -49 +49 @@
 }
 
-static inline Handle<Object> createAttr(xmlAttrPtr attr_raw) {
-    Handle<Value> consarg[1];
+static inline Handle<Object> createAttr(xmlDocPtr doc, xmlAttrPtr attr_raw) {
+    Handle<Value> consarg[2];
     consarg[0] = External::New(attr_raw);
-    return attr_class()->NewInstance(1, consarg);
+    consarg[1] = External::New(doc);
+    return attr_class()->NewInstance(2, consarg);
 }
 

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

@@ -173 +173 @@
 END
 
+FUNCTION(getValue)
+    ARG_COUNT(0);
+    EXTERNAL_NODE();
+    xmlChar * content = domGetNodeValue(node);
+    if (content) {
+        Handle<String> s = String::New((const char*)content);
+        xmlFree(content);
+        return s;
+    } else {
+        return Undefined();
+    }
+END
+
 static inline void setupNodeIM(Handle<ObjectTemplate> OBJECT_TEMPLATE) {
     BIND_IM("nodeName",            nodeName);

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

@@ -1 +1 @@
 require('t/util.js');
 
-plan({tests:19});
+plan({tests:22});
 
 check_lib("org.coderepos.libxml");
@@ -94 +94 @@
 
 test(function () {
-    root.setAttributeNode(doc.createAttribute("foo", "bar"));
-    is(root.toString(),  '<foo foo="bar"/>', 'node.createAttribute()');
+    var attr = doc.createAttribute("foo", "bar");
+    is(attr.getValue(),  'bar', 'attr.getValue()');
+    is(attr.value(),     'bar', 'attr.value()');
+    attr.setValue("baz");
+    root.setAttributeNode(attr);
+    is(root.toString(),  '<foo foo="baz"/>',               'doc.createAttribute()');
+    is(attr.getOwnerElement().toString(), root.toString(), "attr.getOwnerElement");
 });