--- parser3/src/classes/xnode.C 2003/03/18 15:14:15 1.54.2.10.2.1 +++ parser3/src/classes/xnode.C 2003/03/21 16:16:43 1.54.2.10.2.6 @@ -7,7 +7,7 @@ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/03/18 15:14:15 $"; +static const char* IDENT_XNODE_C="$Date: 2003/03/21 16:16:43 $"; #include "pa_vmethod_frame.h" @@ -102,7 +102,7 @@ private: GdomeNode *as_node(const String& method_name, MethodParams* params, int index, const char* msg) { - ValuePtr 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 @@ -131,7 +131,6 @@ GdomeAttr * as_attrconst String& method_ // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); static void _insertBefore(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *selfNode=vnode.get_node(method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); @@ -140,7 +139,7 @@ static void _insertBefore(Request& r, co GdomeException exc; if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, retNode))); } else throw Exception( method_name, @@ -149,7 +148,6 @@ 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) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *selfNode=vnode.get_node(method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); @@ -158,7 +156,7 @@ static void _replaceChild(Request& r, co GdomeException exc; if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, retNode))); } else throw Exception( method_name, @@ -167,7 +165,6 @@ static void _replaceChild(Request& r, co // Node removeChild(in Node oldChild) raises(DOMException); static void _removeChild(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *selfNode=vnode.get_node(method_name); GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node"); @@ -175,7 +172,7 @@ static void _removeChild(Request& r, con GdomeException exc; if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, retNode))); } else throw Exception( method_name, @@ -184,7 +181,6 @@ static void _removeChild(Request& r, con // Node appendChild(in Node newChild) raises(DOMException); static void _appendChild(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *selfNode=vnode.get_node(method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); @@ -192,7 +188,7 @@ static void _appendChild(Request& r, con GdomeException exc; if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, retNode))); } else throw Exception( method_name, @@ -201,19 +197,17 @@ static void _appendChild(Request& r, con // boolean hasChildNodes(); static void _hasChildNodes(Request& r, const String& method_name, MethodParams* ) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *node=vnode.get_node(method_name); GdomeException exc; // write out result bool result=gdome_n_hasChildNodes(node, &exc)!=0; - r.write_no_lang(ValuePtr(new VBool(result))); + r.write_no_lang(Value*(new VBool(result))); } // Node cloneNode(in boolean deep); static void _cloneNode(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *node=vnode.get_node(method_name); @@ -221,13 +215,12 @@ static void _cloneNode(Request& r, const GdomeException exc; // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, gdome_n_cloneNode(node, deep, &exc)))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, gdome_n_cloneNode(node, deep, &exc)))); } // DOM1 element GdomeElement *get_self_element(Request& r, const String& method_name) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *node=vnode.get_node(method_name); @@ -244,7 +237,6 @@ GdomeElement *get_self_element(Request& // DOMString getAttribute(in DOMString name); static void _getAttribute(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -257,7 +249,6 @@ 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) { - =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"); @@ -275,7 +266,6 @@ static void _setAttribute(Request& r, co // void removeAttribute(in DOMString name) raises(DOMException); static void _removeAttribute(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); @@ -289,14 +279,13 @@ static void _removeAttribute(Request& r, // Attr getAttributeNode(in DOMString name); static void _getAttributeNode(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); 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)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, (GdomeNode *)attr))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, (GdomeNode *)attr))); } else if(exc) throw Exception( method_name, @@ -305,14 +294,13 @@ static void _getAttributeNode(Request& r // Attr setAttributeNode(in Attr newAttr) raises(DOMException); static void _setAttributeNode(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); - GdomeAttr * newAttr=as_attr(pool, method_name, params, 0, "newAttr must be ATTRIBUTE node"); + GdomeAttr * newAttr=as_attr(method_name, params, 0, "newAttr must be ATTRIBUTE node"); GdomeException exc; if(GdomeAttr *returnAttr=gdome_el_setAttributeNode(element, newAttr, &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, (GdomeNode *)returnAttr))); + r.write_no_lang(Value*(new VXnode(&&r.charsets, (GdomeNode *)returnAttr))); } else throw Exception( method_name, @@ -321,9 +309,8 @@ static void _setAttributeNode(Request& r // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); static void _removeAttributeNode(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); - GdomeAttr * oldAttr=as_attr(pool, method_name, params, 0, "oldAttr must be ATTRIBUTE node"); + GdomeAttr * oldAttr=as_attr(method_name, params, 0, "oldAttr must be ATTRIBUTE node"); GdomeException exc; gdome_el_removeAttributeNode(element, oldAttr, &exc); @@ -335,12 +322,11 @@ static void _removeAttributeNode(Request // NodeList getElementsByTagName(in DOMString name); static void _getElementsByTagName(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); const String& name=params->as_string(0, "name must be string"); - VHashPtr result(new VHash); + VHash* result(new VHash); GdomeException exc; if(GdomeNodeList *nodes= gdome_el_getElementsByTagName(element, r.transcode(name).get(), &exc)) { @@ -348,9 +334,9 @@ static void _getElementsByTagName(Reques for(gulong i=0; ihash(Exception::undefined_source).put( + result->hash().put( skey, - ValuePtr(new VXnode(&pool, &r.charsets, gdome_nl_item(nodes, i, &exc)))); + Value*(new VXnode(&&r.charsets, gdome_nl_item(nodes, i, &exc)))); } } else if(exc) throw Exception( @@ -362,7 +348,6 @@ static void _getElementsByTagName(Reques } static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams* params) { - =r.pool(); GdomeElement *element=get_self_element(r, method_name); // namespaceURI;localName @@ -370,7 +355,7 @@ static void _getElementsByTagNameNS(Requ const String& localName=params->as_string(1, "localName must be string"); GdomeException exc; - VHashPtr result(new VHash); + VHash* result(new VHash); if(GdomeNodeList *nodes= gdome_el_getElementsByTagNameNS( element, @@ -382,8 +367,8 @@ static void _getElementsByTagNameNS(Requ const String& skey(new String); *skey << pool.format_integer(i); - result->hash(Exception::undefined_source).put(skey, - ValuePtr(new VXnode(&pool, &r.charsets, gdome_nl_item(nodes, i, &exc)))); + result->hash().put(skey, + Value*(new VXnode(&&r.charsets, gdome_nl_item(nodes, i, &exc)))); } } @@ -393,7 +378,6 @@ static void _getElementsByTagNameNS(Requ // void normalize(); static void _normalize(Request& r, const String& method_name, MethodParams* ) { - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); GdomeNode *selfNode=vnode.get_node(method_name); @@ -409,9 +393,8 @@ static void _selectX(Request& r, const S void (*handler)(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result)) { + Value*& result)) { // _asm int 3; - =r.pool(); VXnode& vnode=GET_SELF(r, VXnode); // expression @@ -434,7 +417,7 @@ static void _selectX(Request& r, const S throw Exception(expression, exc); } - ValuePtr result; + Value* result; if(res.get()) handler(r, expression, res, result); if(result) @@ -444,27 +427,26 @@ static void _selectX(Request& r, const S static void selectNodesHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - =r.pool(); - VHashPtr vhash(new VHash); result=vhash; + Value*& result) { + VHash* vhash(new VHash); result=vhash; switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_NODESET: if(res->nodesetval) if(int size=res->nodesetval->nodeNr) { - HashStringValue& hash=vhash->hash(Exception::undefined_source); + HashStringValue& hash=vhash->hash(); for(int i=0; inodesetval->nodeTab[i])))); + Value*(new VXnode(&&r.charsets, gdome_xml_n_mkref(res->nodesetval->nodeTab[i])))); } } break; default: - throw Exception(Exception::undefined_type, + throw Exception(0, expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -474,8 +456,7 @@ static void selectNodesHandler(Request& static void selectNodeHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - =r.pool(); + Value*& result) { switch(res->type) { case XPATH_UNDEFINED: @@ -487,17 +468,17 @@ static void selectNodeHandler(Request& r expression, "resulted not in a single node (%d)", res->nodesetval->nodeNr); - result=ValuePtr(new VXnode(&pool, &r.charsets, gdome_xml_n_mkref(res->nodesetval->nodeTab[0]))); + result=Value*(new VXnode(&&r.charsets, gdome_xml_n_mkref(res->nodesetval->nodeTab[0]))); } break; case XPATH_BOOLEAN: - result=ValuePtr(new VBool(res->boolval!=0)); + result=Value*(new VBool(res->boolval!=0)); break; case XPATH_NUMBER: - result=ValuePtr(new VDouble(res->floatval)); + result=Value*(new VDouble(res->floatval)); break; case XPATH_STRING: - result=ValuePtr(new VString( + result=Value*(new VString( r.transcode( GdomeDOMString_auto_ptr( gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); @@ -513,11 +494,10 @@ static void selectNodeHandler(Request& r static void selectBoolHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - =r.pool(); + Value*& result) { switch(res->type) { case XPATH_BOOLEAN: - result=ValuePtr(new VBool(res->boolval!=0)); + result=Value*(new VBool(res->boolval!=0)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -534,11 +514,10 @@ static void selectBoolHandler(Request& r static void selectNumberHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - =r.pool(); + Value*& result) { switch(res->type) { case XPATH_NUMBER: - result=ValuePtr(new VDouble(res->floatval)); + result=Value*(new VDouble(res->floatval)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -555,13 +534,12 @@ static void selectNumberHandler(Request& static void selectStringHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - =r.pool(); + Value*& result) { switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_STRING: - result=ValuePtr(new VString( + result=Value*(new VString( r.transcode( GdomeDOMString_auto_ptr( gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); @@ -660,7 +638,7 @@ MXnode::MXnode(const char* aname, VState // consts #define CONST(name) \ - consts.put(String* (new String(#name)), ValuePtr(new VInt(GDOME_##name))) + consts.put(String* (new String(#name)), Value*(new VInt(GDOME_##name))) CONST(ELEMENT_NODE); CONST(ATTRIBUTE_NODE);