--- parser3/src/classes/xnode.C 2003/02/20 14:53:35 1.54.2.7 +++ parser3/src/classes/xnode.C 2003/04/11 09:58:10 1.55 @@ -1,15 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/02/20 14:53:35 $"; - -#include "pa_vmethod_frame.h" +static const char* IDENT_XNODE_C="$Date: 2003/04/11 09:58:10 $"; #include "pa_charset.h" #include "pa_request.h" @@ -26,10 +24,6 @@ extern "C" { #include "gdome.h" #include "libxml/xpath.h" -// global variable - -MethodedPtr xnode_class(new MXnode); - // classes class xmlXPathObject_auto_ptr { @@ -100,26 +94,26 @@ private: // helpers -GdomeNode *as_node(StringPtr method_name, MethodParams* params, - int index, const char* msg) { +GdomeNode *as_node(const String& method_name, MethodParams *params, + int index, const char *msg) { Value& value=params->as_no_junction(index, msg); 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); } // helpers -GdomeAttr * as_attr(Pool& pool, StringPtr method_name, MethodParams* params, - int index, const char* msg) { +GdomeAttr * as_attr(Pool& pool, const String& 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,7 +124,7 @@ GdomeAttr * as_attr(Pool& pool, StringPt // DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); -static void _insertBefore(Request& r, StringPtr method_name, MethodParams* params) { +static void _insertBefore(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -144,12 +138,12 @@ static void _insertBefore(Request& r, St 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, StringPtr method_name, MethodParams* params) { +static void _replaceChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -162,12 +156,12 @@ static void _replaceChild(Request& r, St 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, StringPtr method_name, MethodParams* params) { +static void _removeChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -179,12 +173,12 @@ static void _removeChild(Request& r, Str 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, StringPtr method_name, MethodParams* params) { +static void _appendChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -196,12 +190,12 @@ static void _appendChild(Request& r, Str r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - method_name, + &method_name, exc); } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams* ) { +static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); @@ -213,7 +207,7 @@ static void _hasChildNodes(Request& r, S } // Node cloneNode(in boolean deep); -static void _cloneNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); @@ -235,27 +229,27 @@ GdomeElement *get_self_element(Request& GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) throw Exception("parser.runtime", - method_name, + &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, StringPtr method_name, MethodParams* params) { +static void _getAttribute(Request& r, const String& 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"); GdomeException exc; GdomeDOMString *attribute_value= - gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_getAttribute(element, pool.transcode(name).use(), &exc); // write out result r.write_no_lang(pool.transcode(attribute_value, &name)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); -static void _setAttribute(Request& r, StringPtr method_name, MethodParams* params) { +static void _setAttribute(Request& r, const String& 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"); @@ -263,48 +257,48 @@ static void _setAttribute(Request& r, St GdomeException exc; gdome_el_setAttribute(element, - pool.transcode(name).get(), - pool.transcode(attribute_value).get(), + pool.transcode(name).use(), + pool.transcode(attribute_value).use(), &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, StringPtr method_name, MethodParams* params) { +static void _removeAttribute(Request& r, const String& 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"); GdomeException exc; - gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_removeAttribute(element, pool.transcode(name).use(), &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _getAttributeNode(Request& r, const String& 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"); GdomeException exc; - if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).get(), &exc)) { + if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).use(), &exc)) { // write out result VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); 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, StringPtr method_name, MethodParams* params) { +static void _setAttributeNode(Request& r, const String& 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"); @@ -316,12 +310,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, StringPtr method_name, MethodParams* params) { +static void _removeAttributeNode(Request& r, const String& 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"); @@ -330,12 +324,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, StringPtr method_name, MethodParams* params) { +static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); @@ -344,24 +338,28 @@ static void _getElementsByTagName(Reques VHash& result=*new(pool) VHash(pool); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, pool.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; i(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -400,11 +402,11 @@ static void _normalize(Request& r, Strin gdome_n_normalize(selfNode, &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } -static void _selectX(Request& r, StringPtr method_name, MethodParams* params, +static void _selectX(Request& r, const String& method_name, MethodParams *params, void (*handler)(Pool& pool, const String& expression, xmlXPathObject_auto_ptr res, @@ -454,7 +456,11 @@ static void selectNodesHandler(Pool& poo Hash& hash=vhash->hash(0); for(int i=0; inodesetval->nodeTab[i]))); @@ -496,7 +502,7 @@ static void selectNodeHandler(Pool& pool result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; default: throw Exception("parser.runtime", @@ -557,7 +563,7 @@ static void selectStringHandler(Pool& po result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -571,34 +577,34 @@ static void selectStringHandler(Pool& po } } -static void _select(Request& r, StringPtr method_name, MethodParams* params) { +static void _select(Request& r, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectNodesHandler); } -static void _selectSingle(Request& r, StringPtr method_name, MethodParams* params) { +static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectNodeHandler); } -static void _selectBool(Request& r, StringPtr method_name, MethodParams* params) { +static void _selectBool(Request& r, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectBoolHandler); } -static void _selectNumber(Request& r, StringPtr method_name, MethodParams* params) { +static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectNumberHandler); } -static void _selectString(Request& r, StringPtr method_name, MethodParams* params) { +static void _selectString(Request& r, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectStringHandler); } // constructor -MXnode::MXnode(Pool& apool, const char* aname, VStateless_class *abase) : +MXnode::MXnode(Pool& apool, const char *aname, VStateless_class *abase) : Methoded(apool, aname?aname:"xnode", abase), consts(apool) @@ -672,10 +678,19 @@ MXnode::MXnode(Pool& apool, const char* } -#else - // global variable -MethodedPtr xnode_class(0); // fictive +Methoded *Xnode_class; + +#endif +// creator +Methoded *MXnode_create(Pool& pool) { + return +#ifdef XML + Xnode_class=new(pool) MXnode(pool) +#else + 0 #endif + ; +}