--- parser3/src/classes/xnode.C 2003/02/17 12:13:43 1.54.2.6 +++ parser3/src/classes/xnode.C 2003/02/20 14:53:35 1.54.2.7 @@ -7,7 +7,7 @@ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/02/17 12:13:43 $"; +static const char* IDENT_XNODE_C="$Date: 2003/02/20 14:53:35 $"; #include "pa_vmethod_frame.h" @@ -100,9 +100,9 @@ private: // helpers -GdomeNode *as_node(StringPtr method_name, MethodParams& params, +GdomeNode *as_node(StringPtr method_name, MethodParams* params, int index, const char* msg) { - Value& value=params.as_no_junction(index, 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 @@ -113,7 +113,7 @@ GdomeNode *as_node(StringPtr method_name // helpers -GdomeAttr * as_attr(Pool& pool, StringPtr method_name, MethodParams& params, +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; @@ -130,7 +130,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, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -149,7 +149,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, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -167,7 +167,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, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -184,7 +184,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, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -201,7 +201,7 @@ static void _appendChild(Request& r, Str } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams& ) { +static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams* ) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); @@ -213,12 +213,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, StringPtr 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 @@ -242,10 +242,10 @@ 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, 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= @@ -255,11 +255,11 @@ static void _getAttribute(Request& r, St } // 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, 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, @@ -273,10 +273,10 @@ 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, 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); @@ -287,10 +287,10 @@ 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, 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)) { @@ -304,7 +304,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, 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"); @@ -321,7 +321,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, 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"); @@ -335,11 +335,11 @@ static void _removeAttributeNode(Request } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, StringPtr 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; @@ -361,13 +361,13 @@ static void _getElementsByTagName(Reques r.write_no_lang(result); } -static void _getElementsByTagNameNS(Request& r, StringPtr 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); @@ -391,7 +391,7 @@ static void _getElementsByTagNameNS(Requ } // void normalize(); -static void _normalize(Request& r, StringPtr method_name, MethodParams& ) { +static void _normalize(Request& r, StringPtr method_name, MethodParams* ) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); @@ -404,7 +404,7 @@ static void _normalize(Request& r, Strin exc); } -static void _selectX(Request& r, StringPtr 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, @@ -414,7 +414,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); @@ -571,27 +571,27 @@ static void selectStringHandler(Pool& po } } -static void _select(Request& r, StringPtr 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, StringPtr 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, StringPtr 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, StringPtr 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, StringPtr method_name, MethodParams& params) { +static void _selectString(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectStringHandler); }