Changeset 20340

Timestamp:

10/01/08 08:44:11 (5 years ago)

Author:

tokuhirom

Message:

added elem.nodeValue, elem.setNodeValue

Location:

lang/cplusplus/llv8call/branches/gdome

Files:

• ext/gdome/document.cc (modified) (1 diff)
• ext/gdome/element.cc (modified) (2 diffs)
• ext/gdome/gdome.h (modified) (1 diff)
• t/020_ext/09_gdome.js (modified) (2 diffs)

lang/cplusplus/llv8call/branches/gdome/ext/gdome/document.cc

@@ -149 +149 @@
     ot->Set("getElementById",            FunctionTemplate::New(_getElementById));
     ot->Set("firstChild",                FunctionTemplate::New(_firstChild));
-    ot->Set("lastChild",                FunctionTemplate::New(_lastChild));
+    ot->Set("lastChild",                 FunctionTemplate::New(_lastChild));
     ot->Set("hasChildNodes",             FunctionTemplate::New(_hasChildNodes));
     ot->Set("Close",                     FunctionTemplate::New(_close));

lang/cplusplus/llv8call/branches/gdome/ext/gdome/element.cc

@@ -147 +147 @@
 END
 
+GFUNCTION(_nodeValue)
+    ARG_COUNT(0);
+    EXTERNAL_ELEM();
+    GdomeDOMString *s = gdome_el_nodeValue(elem, &exc);
+    HANDLE_EXCEPTION();
+    if (s) {
+        RETURN_STRING(s);
+    } else {
+        return Undefined();
+    }
+END
+
+GFUNCTION(_setNodeValue)
+    ARG_COUNT(0);
+    ARG_gstr(val, 0);
+    EXTERNAL_ELEM();
+    gdome_el_set_nodeValue(elem, *val, &exc);
+    HANDLE_EXCEPTION();
+    return Undefined();
+END
+
 GFUNCTION(_hasChildNodes)
     ARG_COUNT(0);
@@ -173 +194 @@
     ot->Set("hasChildNodes",             FunctionTemplate::New(_hasChildNodes));
     ot->Set("firstChild",                FunctionTemplate::New(_firstChild));
+    ot->Set("nodeValue",                 FunctionTemplate::New(_nodeValue));
+    ot->Set("setNodeValue",              FunctionTemplate::New(_setNodeValue));
     ot->Set("lastChild",                 FunctionTemplate::New(_lastChild));
     ot->Set("Close",                     FunctionTemplate::New(_Close));

lang/cplusplus/llv8call/branches/gdome/ext/gdome/gdome.h

@@ -78 +78 @@
 #define RETURN_TEXT(e)    RETURN_BASE("Text",     e);
 #define RETURN_DOC(e)     RETURN_BASE("Document", e);
+#define RETURN_STRING(e)  do { Handle<String> __buf = String::New((e)->str); gdome_str_unref((e)); return __buf; } while(0)
 

lang/cplusplus/llv8call/branches/gdome/t/020_ext/09_gdome.js

@@ -1 +1 @@
 require('t/util.js');
 
-Test.More.plan({tests:3});
+Test.More.plan({tests:19});
 
 check_lib("org.coderepos.gdome");
@@ -68 +68 @@
 }());
 
+(function () {
+    var di = new gdome.GDOME();
+    var doc = di.createDocFromMemory('<?xml version="1.0"?>' + "\n" + '<TEST>3</TEST>' + "\n");
+    var e = doc.firstChild().firstChild();
+    Test.More.is(e.nodeValue(), '3', "doc.nodeValue()");
+    e.setNodeValue(5);
+    Test.More.is(e.nodeValue(), '5', "doc.nodeValue()");
+    Test.More.is(doc.firstChild().nodeValue(), undefined, "doc.nodeValue( element node's node value should be undefined )");
+    doc.Close();
+    di.Close();
+}());
+
 // doc.getElementsByTagName
 // doc.getElementById(no test)