--- parser3/src/classes/xnode.C	2002/03/27 15:30:35	1.41
+++ parser3/src/classes/xnode.C	2002/08/15 09:07:49	1.48
@@ -3,12 +3,12 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: xnode.C,v 1.41 2002/03/27 15:30:35 paf Exp $
 */
 #include "classes.h"
 #ifdef XML
 
+static const char* IDENT_XNODE_C="$Date: 2002/08/15 09:07:49 $";
+
 #include "pa_charset.h"
 #include "pa_request.h"
 #include "pa_vxnode.h"
@@ -24,10 +24,6 @@ extern "C" {
 #include "gdome.h"
 #include "libxml/xpath.h"
 
-// defines 
-
-#define XNODE_CLASS_NAME "xnode"
-
 // classes
 
 class xmlXPathObject_auto_ptr {
@@ -98,24 +94,22 @@ private:
 
 // helpers
 
-GdomeNode *as_node(Pool& pool, const String& method_name, MethodParams *params, 
+GdomeNode *as_node(const String& method_name, MethodParams *params, 
 						int index, const char *msg) {
 	Value& value=params->as_no_junction(index, msg);
-	if(!(strcmp(value.type(), VXNODE_TYPE)==0 
-		|| strcmp(value.type(), VXDOC_TYPE)==0))
+	if(Value *vxnode=value.as(VXNODE_TYPE, false))
+		return static_cast<VXnode *>(vxnode)->get_node(&method_name);
+	else
 		throw Exception("parser.runtime",
 			&method_name,
 			msg);
-
-	VXnode& vnode=*static_cast<VXnode *>(&value);
-	return vnode.get_node(&method_name);
 }
 
 // helpers
 
 GdomeAttr * as_attr(Pool& pool, const String& method_name, MethodParams *params, 
 						int index, const char *msg) {
-	GdomeNode *node=as_node(pool, method_name, params, index, msg);
+	GdomeNode *node=as_node(method_name, params, index, msg);
 	GdomeException exc;
 	if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE)
 		throw Exception("parser.runtime",
@@ -134,8 +128,8 @@ static void _insertBefore(Request& r, co
 	Pool& pool=r.pool();
 	VXnode& vnode=*static_cast<VXnode *>(r.self);
 	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
-	GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node");
+	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
+	GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node");
 	
 	GdomeException exc;
 	if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) {
@@ -153,8 +147,8 @@ static void _replaceChild(Request& r, co
 	Pool& pool=r.pool();
 	VXnode& vnode=*static_cast<VXnode *>(r.self);
 	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
-	GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node");
+	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
+	GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node");
 	
 	GdomeException exc;
 	if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) {
@@ -171,7 +165,7 @@ static void _removeChild(Request& r, con
 	Pool& pool=r.pool();
 	VXnode& vnode=*static_cast<VXnode *>(r.self);
 	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *oldChild=as_node(pool, method_name, params, 0, "oldChild must be node");
+	GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node");
 	
 	GdomeException exc;
 	if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) {
@@ -188,7 +182,7 @@ static void _appendChild(Request& r, con
 	Pool& pool=r.pool();
 	VXnode& vnode=*static_cast<VXnode *>(r.self);
 	GdomeNode *selfNode=vnode.get_node(&method_name);
-	GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node");
+	GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node");
 	
 	GdomeException exc;
 	if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &exc)) {
@@ -208,9 +202,8 @@ static void _hasChildNodes(Request& r, c
 
 	GdomeException exc;
 	// write out result
-	VBool& result=*new(pool) VBool(pool, gdome_n_hasChildNodes(node, &exc)!=0);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	bool result=gdome_n_hasChildNodes(node, &exc)!=0;
+	r.write_no_lang(*new(pool) VBool(pool, result));
 }
 
 // Node cloneNode(in boolean deep);
@@ -223,9 +216,7 @@ static void _cloneNode(Request& r, const
 
 	GdomeException exc;
 	// write out result
-	VXnode& result=*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc)));
 }
 
 // DOM1 element
@@ -254,7 +245,7 @@ static void _getAttribute(Request& r, co
 	GdomeDOMString *attribute_value=
 		gdome_el_getAttribute(element, pool.transcode(name).get(), &exc);
 	// write out result
-	r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value)));
+	r.write_no_lang(pool.transcode(attribute_value));
 }
 
 // void setAttribute(in DOMString name, in DOMString value) raises(DOMException);
@@ -447,10 +438,8 @@ static void _selectX(Request& r, const S
 	Value *result=0;
    	if(res.get())
 		handler(pool, expression, res, result);
-	if(result) {
-		result->set_name(method_name);
+	if(result)
 		r.write_no_lang(*result);
-	}
 }
 
 static void selectNodesHandler(Pool& pool,
@@ -615,10 +604,11 @@ static void _selectString(Request& r, co
 
 // constructor
 
-MXnode::MXnode(Pool& apool) : Methoded(apool), 
-	consts(apool) {
-	set_name(*NEW String(pool(), XNODE_CLASS_NAME));
+MXnode::MXnode(Pool& apool, const char *aname, VStateless_class *abase) : 
+	Methoded(apool, aname?aname:"xnode", abase), 
 
+	consts(apool) 
+{
 	/// DOM1 node
 
 	// Node insertBefore(in Node newChild,in Node refChild) raises(DOMException);