--- parser3/src/classes/xnode.C 2003/03/21 16:16:43 1.54.2.10.2.6 +++ parser3/src/classes/xnode.C 2003/03/24 17:52:18 1.54.2.10.2.8 @@ -7,7 +7,7 @@ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/03/21 16:16:43 $"; +static const char* IDENT_XNODE_C="$Date: 2003/03/24 17:52:18 $"; #include "pa_vmethod_frame.h" @@ -104,7 +104,7 @@ GdomeNode *as_node(const String& method_ 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); + return static_cast(vxnode)->get_node(); else throw Exception("parser.runtime", method_name, @@ -130,9 +130,9 @@ GdomeAttr * as_attrconst String& method_ // 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, MethodParams* params) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + GdomeNode *selfNode=vnode.get_node(); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -147,9 +147,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, MethodParams* params) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + GdomeNode *selfNode=vnode.get_node(); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -164,9 +164,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, MethodParams* params) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + GdomeNode *selfNode=vnode.get_node(); GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node"); GdomeException exc; @@ -180,9 +180,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, MethodParams* params) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + GdomeNode *selfNode=vnode.get_node(); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeException exc; @@ -196,9 +196,9 @@ static void _appendChild(Request& r, con } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, const String& method_name, MethodParams* ) { +static void _hasChildNodes(Request& r, MethodParams* ) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + GdomeNode *node=vnode.get_node(); GdomeException exc; // write out result @@ -207,9 +207,9 @@ 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, MethodParams* params) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + GdomeNode *node=vnode.get_node(); bool deep=params->as_bool(0, "deep must be bool", r); @@ -220,9 +220,9 @@ static void _cloneNode(Request& r, const // DOM1 element -GdomeElement *get_self_element(Request& r, const String& method_name) { +GdomeElement *get_self_element(Request& r) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + GdomeNode *node=vnode.get_node(); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) @@ -236,7 +236,7 @@ GdomeElement *get_self_element(Request& // DOMString getAttribute(in DOMString name); -static void _getAttribute(Request& r, const String& method_name, MethodParams* params) { +static void _getAttribute(Request& r, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -248,7 +248,7 @@ static void _getAttribute(Request& r, co } // 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, MethodParams* params) { 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"); @@ -265,7 +265,7 @@ 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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -278,7 +278,7 @@ 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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -293,7 +293,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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); GdomeAttr * newAttr=as_attr(method_name, params, 0, "newAttr must be ATTRIBUTE node"); @@ -308,7 +308,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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); GdomeAttr * oldAttr=as_attr(method_name, params, 0, "oldAttr must be ATTRIBUTE node"); @@ -321,7 +321,7 @@ 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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -347,7 +347,7 @@ 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, MethodParams* params) { GdomeElement *element=get_self_element(r, method_name); // namespaceURI;localName @@ -377,9 +377,9 @@ static void _getElementsByTagNameNS(Requ } // void normalize(); -static void _normalize(Request& r, const String& method_name, MethodParams* ) { +static void _normalize(Request& r, MethodParams* ) { VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + GdomeNode *selfNode=vnode.get_node(); GdomeException exc; gdome_n_normalize(selfNode, &exc); @@ -389,7 +389,7 @@ static void _normalize(Request& r, const exc); } -static void _selectX(Request& r, const String& method_name, MethodParams* params, +static void _selectX(Request& r, MethodParams* params, void (*handler)(Request& r, const String& expression, xmlXPathObject_auto_ptr res, @@ -401,7 +401,7 @@ static void _selectX(Request& r, const S const String& expression=params->as_string(0, "expression must be string"); GdomeException exc; - GdomeNode *dome_node=vnode.get_node(method_name); + GdomeNode *dome_node=vnode.get_node(); GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc); if(!dome_document) // document does not own itself, so ownerDocument = 0 dome_document=GDOME_DOC(dome_node); // and we need downcast @@ -556,27 +556,27 @@ static void selectStringHandler(Request& } } -static void _select(Request& r, const String& method_name, MethodParams* params) { +static void _select(Request& r, MethodParams* params) { _selectX(r, method_name, params, selectNodesHandler); } -static void _selectSingle(Request& r, const String& method_name, MethodParams* params) { +static void _selectSingle(Request& r, MethodParams* params) { _selectX(r, method_name, params, selectNodeHandler); } -static void _selectBool(Request& r, const String& method_name, MethodParams* params) { +static void _selectBool(Request& r, MethodParams* params) { _selectX(r, method_name, params, selectBoolHandler); } -static void _selectNumber(Request& r, const String& method_name, MethodParams* params) { +static void _selectNumber(Request& r, MethodParams* params) { _selectX(r, method_name, params, selectNumberHandler); } -static void _selectString(Request& r, const String& method_name, MethodParams* params) { +static void _selectString(Request& r, MethodParams* params) { _selectX(r, method_name, params, selectStringHandler); }