--- parser3/src/classes/xnode.C 2003/04/02 07:29:21 1.54.2.10.2.11 +++ parser3/src/classes/xnode.C 2003/04/03 10:48:25 1.54.2.10.2.12 @@ -7,7 +7,7 @@ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/04/02 07:29:21 $"; +static const char* IDENT_XNODE_C="$Date: 2003/04/03 10:48:25 $"; #include "pa_vmethod_frame.h" @@ -100,10 +100,10 @@ private: // helpers -GdomeNode* as_node(MethodParams* params, +GdomeNode* as_node(MethodParams& params, int index, const char* msg) { GdomeNode* result; - Value& value=params->as_no_junction(index, msg); + Value& value=params.as_no_junction(index, msg); if(Value* vxnode=value.as(VXNODE_TYPE, false)) result=static_cast(vxnode)->get_node(); else { @@ -118,7 +118,7 @@ GdomeNode* as_node(MethodParams* params, // helpers -GdomeAttr* as_attr(MethodParams* params, +GdomeAttr* as_attr(MethodParams& params, int index, const char* msg) { GdomeNode* node=as_node(params, index, msg); GdomeException exc; @@ -135,7 +135,7 @@ GdomeAttr* as_attr(MethodParams* params, // DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); -static void _insertBefore(Request& r, MethodParams* params) { +static void _insertBefore(Request& r, MethodParams& params) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); GdomeNode* newChild=as_node(params, 0, "newChild must be node"); @@ -150,7 +150,7 @@ static void _insertBefore(Request& r, Me } // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException); -static void _replaceChild(Request& r, MethodParams* params) { +static void _replaceChild(Request& r, MethodParams& params) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); GdomeNode* newChild=as_node(params, 0, "newChild must be node"); @@ -165,7 +165,7 @@ static void _replaceChild(Request& r, Me } // Node removeChild(in Node oldChild) raises(DOMException); -static void _removeChild(Request& r, MethodParams* params) { +static void _removeChild(Request& r, MethodParams& params) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); GdomeNode* oldChild=as_node(params, 0, "oldChild must be node"); @@ -179,7 +179,7 @@ static void _removeChild(Request& r, Met } // Node appendChild(in Node newChild) raises(DOMException); -static void _appendChild(Request& r, MethodParams* params) { +static void _appendChild(Request& r, MethodParams& params) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); GdomeNode* newChild=as_node(params, 0, "newChild must be node"); @@ -193,7 +193,7 @@ static void _appendChild(Request& r, Met } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, MethodParams* ) { +static void _hasChildNodes(Request& r, MethodParams&) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* node=vnode.get_node(); @@ -204,11 +204,11 @@ static void _hasChildNodes(Request& r, M } // Node cloneNode(in boolean deep); -static void _cloneNode(Request& r, MethodParams* params) { +static void _cloneNode(Request& r, MethodParams& params) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* node=vnode.get_node(); - 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 @@ -233,9 +233,9 @@ GdomeElement* get_self_element(Request& // DOMString getAttribute(in DOMString name); -static void _getAttribute(Request& r, MethodParams* params) { +static void _getAttribute(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); - 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= @@ -245,10 +245,10 @@ static void _getAttribute(Request& r, Me } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); -static void _setAttribute(Request& r, MethodParams* params) { +static void _setAttribute(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); - 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, @@ -260,9 +260,9 @@ static void _setAttribute(Request& r, Me } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, MethodParams* params) { +static void _removeAttribute(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); - 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, r.transcode(name).get(), &exc); @@ -271,9 +271,9 @@ static void _removeAttribute(Request& r, } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, MethodParams* params) { +static void _getAttributeNode(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); - 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, r.transcode(name).get(), &exc)) { @@ -286,7 +286,7 @@ static void _getAttributeNode(Request& r } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); -static void _setAttributeNode(Request& r, MethodParams* params) { +static void _setAttributeNode(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); GdomeAttr * newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node"); @@ -301,7 +301,7 @@ static void _setAttributeNode(Request& r } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); -static void _removeAttributeNode(Request& r, MethodParams* params) { +static void _removeAttributeNode(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); GdomeAttr * oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node"); @@ -314,10 +314,10 @@ static void _removeAttributeNode(Request } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, MethodParams* params) { +static void _getElementsByTagName(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); - 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 VHash; GdomeException exc; @@ -337,12 +337,12 @@ static void _getElementsByTagName(Reques r.write_no_lang(result); } -static void _getElementsByTagNameNS(Request& r, MethodParams* params) { +static void _getElementsByTagNameNS(Request& r, MethodParams& params) { GdomeElement* element=get_self_element(r); // 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 VHash; @@ -364,7 +364,7 @@ static void _getElementsByTagNameNS(Requ } // void normalize(); -static void _normalize(Request& r, MethodParams* ) { +static void _normalize(Request& r, MethodParams&) { VXnode& vnode=GET_SELF(r, VXnode); GdomeNode* selfNode=vnode.get_node(); @@ -376,7 +376,7 @@ static void _normalize(Request& r, Metho exc); } -static void _selectX(Request& r, MethodParams* params, +static void _selectX(Request& r, MethodParams& params, void (*handler)(Request& r, const String& expression, xmlXPathObject_auto_ptr res, @@ -384,7 +384,7 @@ static void _selectX(Request& r, MethodP VXnode& vnode=GET_SELF(r, VXnode); // 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(); @@ -541,27 +541,27 @@ static void selectStringHandler(Request& } } -static void _select(Request& r, MethodParams* params) { +static void _select(Request& r, MethodParams& params) { _selectX(r, params, selectNodesHandler); } -static void _selectSingle(Request& r, MethodParams* params) { +static void _selectSingle(Request& r, MethodParams& params) { _selectX(r, params, selectNodeHandler); } -static void _selectBool(Request& r, MethodParams* params) { +static void _selectBool(Request& r, MethodParams& params) { _selectX(r, params, selectBoolHandler); } -static void _selectNumber(Request& r, MethodParams* params) { +static void _selectNumber(Request& r, MethodParams& params) { _selectX(r, params, selectNumberHandler); } -static void _selectString(Request& r, MethodParams* params) { +static void _selectString(Request& r, MethodParams& params) { _selectX(r, params, selectStringHandler); }