--- parser3/src/classes/xnode.C 2003/02/04 14:04:47 1.54.2.2 +++ parser3/src/classes/xnode.C 2003/04/11 09:58:10 1.55 @@ -1,13 +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/04 14:04:47 $"; +static const char* IDENT_XNODE_C="$Date: 2003/04/11 09:58:10 $"; #include "pa_charset.h" #include "pa_request.h" @@ -94,9 +94,9 @@ private: // helpers -GdomeNode *as_node(StringPtr method_name, MethodParams& params, - int index, const char* msg) { - Value& value=params.as_no_junction(index, 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 @@ -107,8 +107,8 @@ GdomeNode *as_node(StringPtr method_name // 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) @@ -124,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); @@ -143,7 +143,7 @@ static void _insertBefore(Request& r, St } // 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); @@ -161,7 +161,7 @@ static void _replaceChild(Request& r, St } // 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); @@ -178,7 +178,7 @@ static void _removeChild(Request& r, Str } // 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); @@ -195,7 +195,7 @@ static void _appendChild(Request& r, Str } // 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); @@ -207,12 +207,12 @@ 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); - 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 @@ -236,29 +236,29 @@ GdomeElement *get_self_element(Request& } // 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"); + 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"); - 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, - pool.transcode(name).get(), - pool.transcode(attribute_value).get(), + pool.transcode(name).use(), + pool.transcode(attribute_value).use(), &exc); if(exc) throw Exception( @@ -267,13 +267,13 @@ static void _setAttribute(Request& r, St } // 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"); + 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, @@ -281,13 +281,13 @@ static void _removeAttribute(Request& r, } // 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"); + 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); @@ -298,7 +298,7 @@ static void _getAttributeNode(Request& r } // 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"); @@ -315,7 +315,7 @@ static void _setAttributeNode(Request& r } // 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"); @@ -329,16 +329,16 @@ static void _removeAttributeNode(Request } // 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); - 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; 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; ias_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); if(GdomeNodeList *nodes= gdome_el_getElementsByTagNameNS( element, - pool.transcode(namespaceURI).get(), - pool.transcode(localName).get(), + pool.transcode(namespaceURI).use(), + pool.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; i(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -406,7 +406,7 @@ static void _normalize(Request& r, Strin 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, @@ -416,7 +416,7 @@ static void _selectX(Request& r, StringP 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(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &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(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &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, 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)