--- parser3/src/classes/xnode.C 2002/08/15 09:07:49 1.48 +++ parser3/src/classes/xnode.C 2003/02/04 14:04:47 1.54.2.2 @@ -1,13 +1,13 @@ /** @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) */ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2002/08/15 09:07:49 $"; +static const char* IDENT_XNODE_C="$Date: 2003/02/04 14:04:47 $"; #include "pa_charset.h" #include "pa_request.h" @@ -94,9 +94,9 @@ private: // helpers -GdomeNode *as_node(const String& method_name, MethodParams *params, - int index, const char *msg) { - Value& value=params->as_no_junction(index, msg); +GdomeNode *as_node(StringPtr 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 @@ -107,8 +107,8 @@ GdomeNode *as_node(const String& method_ // 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) @@ -124,9 +124,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"); @@ -143,9 +143,9 @@ static void _insertBefore(Request& r, co } // 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"); @@ -161,9 +161,9 @@ static void _replaceChild(Request& r, co } // 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"); @@ -178,9 +178,9 @@ static void _removeChild(Request& r, con } // 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"); @@ -195,9 +195,9 @@ static void _appendChild(Request& r, con } // 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; @@ -207,12 +207,12 @@ static void _hasChildNodes(Request& r, c } // 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); + bool deep=params.as_bool(0, "deep must be bool", r); GdomeException exc; // write out result @@ -223,37 +223,37 @@ static void _cloneNode(Request& r, const 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 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"); + 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); // 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"); - const String& attribute_value=params->as_string(1, "value must be string"); + const String& name=params.as_string(0, "name must be string"); + const String& attribute_value=params.as_string(1, "value must be string"); GdomeException exc; gdome_el_setAttribute(element, @@ -267,10 +267,10 @@ static void _setAttribute(Request& r, co } // 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"); + const String& name=params.as_string(0, "name must be string"); GdomeException exc; gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); @@ -281,10 +281,10 @@ static void _removeAttribute(Request& r, } // 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"); + 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)) { @@ -298,7 +298,7 @@ static void _getAttributeNode(Request& r } // 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"); @@ -315,7 +315,7 @@ static void _setAttributeNode(Request& r } // 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"); @@ -329,11 +329,11 @@ static void _removeAttributeNode(Request } // 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); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); VHash& result=*new(pool) VHash(pool); GdomeException exc; @@ -359,13 +359,13 @@ static void _getElementsByTagName(Reques r.write_no_lang(result); } -static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) { +static void _getElementsByTagNameNS(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); // namespaceURI;localName - const String& namespaceURI=params->as_string(0, "namespaceURI must be string"); - const String& localName=params->as_string(1, "localName must be string"); + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& localName=params.as_string(1, "localName must be string"); GdomeException exc; VHash& result=*new(pool) VHash(pool); @@ -393,9 +393,9 @@ static void _getElementsByTagNameNS(Requ } // void normalize(); -static void _normalize(Request& r, const String& method_name, MethodParams *) { +static void _normalize(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeException exc; @@ -406,17 +406,17 @@ static void _normalize(Request& r, const 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"); + const String& expression=params.as_string(0, "expression must be string"); GdomeException exc; GdomeNode *dome_node=vnode.get_node(&method_name); @@ -502,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())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); break; default: throw Exception("parser.runtime", @@ -563,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())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -577,34 +577,34 @@ 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, const char *aname, VStateless_class *abase) : +MXnode::MXnode(Pool& apool, const char* aname, VStateless_class *abase) : Methoded(apool, aname?aname:"xnode", abase), consts(apool)