--- parser3/src/classes/xnode.C 2002/04/15 11:34:24 1.43 +++ parser3/src/classes/xnode.C 2003/02/26 11:29:58 1.54.2.8 @@ -1,14 +1,16 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: xnode.C,v 1.43 2002/04/15 11:34:24 paf Exp $ */ #include "classes.h" #ifdef XML +static const char* IDENT_XNODE_C="$Date: 2003/02/26 11:29:58 $"; + +#include "pa_vmethod_frame.h" + #include "pa_charset.h" #include "pa_request.h" #include "pa_vxnode.h" @@ -24,9 +26,9 @@ extern "C" { #include "gdome.h" #include "libxml/xpath.h" -// defines +// global variable -#define XNODE_CLASS_NAME "xnode" +DECLARE_CLASS_VAR(xnode, new MXnode, 0); // classes @@ -98,28 +100,26 @@ private: // helpers -GdomeNode *as_node(const String& method_name, MethodParams *params, - int index, const char *msg) { +GdomeNode *as_node(StringPtr 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)->get_node(&method_name); + else throw Exception("parser.runtime", - &method_name, + method_name, msg); - - VXnode& vnode=*static_cast(&value); - return vnode.get_node(&method_name); } // helpers -GdomeAttr * as_attr(Pool& pool, const String& method_name, MethodParams *params, - int index, const char *msg) { +GdomeAttr * as_attr(Pool& pool, StringPtr method_name, MethodParams* params, + int index, const char* 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", - &method_name, + method_name, msg); return GDOME_A(node); @@ -130,9 +130,9 @@ GdomeAttr * as_attr(Pool& pool, const St // DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); -static void _insertBefore(Request& r, const String& method_name, MethodParams *params) { +static void _insertBefore(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -144,14 +144,14 @@ static void _insertBefore(Request& r, co r.write_no_lang(result); } else throw Exception( - &method_name, + method_name, exc); } // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException); -static void _replaceChild(Request& r, const String& method_name, MethodParams *params) { +static void _replaceChild(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -162,14 +162,14 @@ static void _replaceChild(Request& r, co r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - &method_name, + method_name, exc); } // Node removeChild(in Node oldChild) raises(DOMException); -static void _removeChild(Request& r, const String& method_name, MethodParams *params) { +static void _removeChild(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node"); @@ -179,14 +179,14 @@ static void _removeChild(Request& r, con r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - &method_name, + method_name, exc); } // Node appendChild(in Node newChild) raises(DOMException); -static void _appendChild(Request& r, const String& method_name, MethodParams *params) { +static void _appendChild(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); @@ -196,56 +196,53 @@ static void _appendChild(Request& r, con r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - &method_name, + method_name, exc); } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { +static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams* ) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); 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); -static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { +static void _cloneNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); bool deep=params->as_bool(0, "deep must be bool", r); 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 GdomeElement *get_self_element(Request& r, const String& method_name) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) throw Exception("parser.runtime", - &method_name, - "method can be called on node of ELEMENT type"); + method_name, + "method can only be called on nodes of ELEMENT type"); return GDOME_EL(node); } // DOMString getAttribute(in DOMString name); -static void _getAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _getAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -254,11 +251,11 @@ 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(pool.transcode(attribute_value)); + r.write_no_lang(pool.transcode(attribute_value, &name)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); -static void _setAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _setAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -271,12 +268,12 @@ static void _setAttribute(Request& r, co &exc); if(exc) throw Exception( - &method_name, + method_name, exc); } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _removeAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -285,12 +282,12 @@ static void _removeAttribute(Request& r, gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); if(exc) throw Exception( - &method_name, + method_name, exc); } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _getAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -302,12 +299,12 @@ static void _getAttributeNode(Request& r r.write_no_lang(result); } else if(exc) throw Exception( - &method_name, + method_name, exc); } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); -static void _setAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _setAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); GdomeAttr * newAttr=as_attr(pool, method_name, params, 0, "newAttr must be ATTRIBUTE node"); @@ -319,12 +316,12 @@ static void _setAttributeNode(Request& r r.write_no_lang(result); } else throw Exception( - &method_name, + method_name, exc); } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); -static void _removeAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _removeAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); GdomeAttr * oldAttr=as_attr(pool, method_name, params, 0, "oldAttr must be ATTRIBUTE node"); @@ -333,12 +330,12 @@ static void _removeAttributeNode(Request gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) throw Exception( - &method_name, + method_name, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { +static void _getElementsByTagName(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); @@ -351,24 +348,20 @@ static void _getElementsByTagName(Reques gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; i(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeException exc; gdome_n_normalize(selfNode, &exc); if(exc) throw Exception( - &method_name, + method_name, exc); } -static void _selectX(Request& r, const String& method_name, MethodParams *params, +static void _selectX(Request& r, StringPtr method_name, MethodParams* params, void (*handler)(Pool& pool, const String& expression, xmlXPathObject_auto_ptr res, Value *& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); // expression const String& expression=params->as_string(0, "expression must be string"); @@ -447,10 +436,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, @@ -467,11 +454,7 @@ static void selectNodesHandler(Pool& poo Hash& hash=vhash->hash(0); for(int i=0; inodesetval->nodeTab[i]))); @@ -513,7 +496,7 @@ static void selectNodeHandler(Pool& pool result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); break; default: throw Exception("parser.runtime", @@ -574,7 +557,7 @@ static void selectStringHandler(Pool& po result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -588,37 +571,38 @@ static void selectStringHandler(Pool& po } } -static void _select(Request& r, const String& method_name, MethodParams *params) { +static void _select(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNodesHandler); } -static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { +static void _selectSingle(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNodeHandler); } -static void _selectBool(Request& r, const String& method_name, MethodParams *params) { +static void _selectBool(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectBoolHandler); } -static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { +static void _selectNumber(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNumberHandler); } -static void _selectString(Request& r, const String& method_name, MethodParams *params) { +static void _selectString(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectStringHandler); } // 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); @@ -688,19 +672,10 @@ MXnode::MXnode(Pool& apool) : Methoded(a } -// global variable +#else -Methoded *Xnode_class; +// global variable -#endif +DECLARE_CLASS_VAR(xnode, 0, 0); // fictive -// creator -Methoded *MXnode_create(Pool& pool) { - return -#ifdef XML - Xnode_class=new(pool) MXnode(pool) -#else - 0 #endif - ; -}