Changeset 20986 for lang/cplusplus

Timestamp:

10/08/08 23:10:24 (2 months ago)

Author:

tokuhirom

Message:

dry

Location:

lang/cplusplus/llv8call/trunk/ext/libxml

Files:

• document.cc (modified) (7 diffs)
• element.cc (modified) (1 diff)
• libxml.h (modified) (1 diff)
• node.h (modified) (8 diffs)

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

@@ -35 +35 @@
         doc->encoding = (const xmlChar*)xmlStrdup((const xmlChar*)*encoding);
     }
-    Handle<Object> t = document_class()->NewInstance();
-    t->SetInternalField(0, External::New(doc));
-    t->SetInternalField(1, External::New(xmlNewDocFragment(doc)));
-    return t;
+    return createDocument(doc);
 END
 
@@ -80 +77 @@
     xmlNodePtr node_raw = xmlDocGetRootElement(doc);
     assert(node_raw);
-    return createElem( doc,  node_raw );
+    return createObject( "Element", doc,  node_raw );
 END
 
@@ -109 +106 @@
     assert(node_raw);
     xmlAddChild(fragment, node_raw);
-    return createElem( doc, node_raw );
+    return createObject( "Element", doc, node_raw );
 END
 
@@ -121 +118 @@
     assert(node_raw);
     xmlAddChild(fragment, node_raw);
-    return createCDATA( doc, node_raw );
+    return createObject( "CDATASection", doc, node_raw );
 END
 
@@ -132 +129 @@
 
     xmlAttrPtr attr = xmlNewDocProp(doc, (const xmlChar*)*name, args.Length() == 2 ? (const xmlChar*)*value : NULL);
-    return createAttr(doc, attr);
+    return createObject("Attr", doc, (xmlNodePtr)attr);
 END
 
@@ -145 +142 @@
     textnode->doc = doc;
     xmlAddChild(fragment, textnode);
-    return createNode( doc, textnode );
+    return CREATE_NODE( doc, textnode );
 END
 
@@ -158 +155 @@
     textnode->doc = doc;
     xmlAddChild(fragment, textnode);
-    return createNode( doc, textnode );
+    return CREATE_NODE( doc, textnode );
 END
 

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

@@ -56 +56 @@
         return Undefined();
     } else {
-        return createAttr(doc, ret);
+        return createObject("Attr", doc, (xmlNode*)ret);
     }
 END

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

@@ -19 +19 @@
 }
 
-inline v8::Handle<v8::Function> node_class() {
-    return Handle<Function>::Cast( libxml_namespace()->Get(String::New("Node")) );
-}
-
-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")) );
-}
-
-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) {
+static inline Handle<Object> createObject(const char * type, xmlDocPtr doc, xmlNodePtr node_raw) {
     Handle<Value> consarg[2];
     consarg[0] = External::New(node_raw);
     consarg[1] = External::New(doc);
-    return node_class()->NewInstance(2, consarg);
+    Handle<Function> f = Handle<Function>::Cast( libxml_namespace()->Get(String::New(type)) );
+    return f->NewInstance(2, consarg);
 }
 
-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> createDocument(xmlDocPtr doc) {
+    Handle<Function> f = Handle<Function>::Cast( libxml_namespace()->Get(String::New("Document")) );
+    Handle<Object> t = f->NewInstance();
+    t->SetInternalField(0, External::New(doc));
+    t->SetInternalField(1, External::New(xmlNewDocFragment(doc)));
+    return t;
 }
 
-static inline Handle<Object> createAttr(xmlDocPtr doc, xmlAttrPtr attr_raw) {
-    Handle<Value> consarg[2];
-    consarg[0] = External::New(attr_raw);
-    consarg[1] = External::New(doc);
-    return attr_class()->NewInstance(2, consarg);
-}
-
-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 CREATE_NODE(doc, node) createObject("Node",      doc, node)
+#define CREATE_ATTR(doc, node) createObject("Attribute", doc, node)
 
 #define ARG_node(name, n) EXTERNAL(xmlNodePtr, name, args[n]->ToObject(), 0)

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

@@ -56 +56 @@
     ARG_node(argnode, 0);
     xmlNodePtr rNode = domAppendChild( node, argnode );
-    return createNode( doc, rNode );
+    return CREATE_NODE( doc, rNode );
 END
 
@@ -67 +67 @@
     xmlNodePtr rNode = domInsertBefore( node, newnode, refnode );
     assert(rNode);
-    return createNode( doc, rNode );
+    return CREATE_NODE( doc, rNode );
 END
 
@@ -78 +78 @@
     xmlNodePtr rNode = domInsertAfter( node, newnode, refnode );
     assert(rNode);
-    return createNode( doc, rNode );
+    return CREATE_NODE( doc, rNode );
 END
 
@@ -87 +87 @@
     ARG_node(argnode, 0);
     xmlNodePtr rNode = domRemoveChild( node, argnode );
-    return createNode( doc, rNode );
+    return CREATE_NODE( doc, rNode );
 END
 
@@ -149 +149 @@
     xmlNodePtr ret = _CloneNodeIn( node, deep );
     assert(ret);
-    return createNode( doc, ret );
+    return CREATE_NODE( doc, ret );
 END
 
@@ -156 +156 @@
     EXTERNAL_NODE();
     EXTERNAL_DOC();
-    return createNode( doc, node->children );
+    return CREATE_NODE( doc, node->children );
 END
 
@@ -163 +163 @@
     EXTERNAL_NODE();
     EXTERNAL_DOC();
-    return createNode( doc, node->last );
+    return CREATE_NODE( doc, node->last );
 END
 
@@ -170 +170 @@
     EXTERNAL_NODE();
     EXTERNAL_DOC();
-    return createNode( doc, node->parent );
+    return CREATE_NODE( doc, node->parent );
 END