--- parser3/src/classes/xnode.C 2003/02/20 14:53:35 1.54.2.7 +++ parser3/src/classes/xnode.C 2003/03/06 16:15:25 1.54.2.9 @@ -7,7 +7,7 @@ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/02/20 14:53:35 $"; +static const char* IDENT_XNODE_C="$Date: 2003/03/06 16:15:25 $"; #include "pa_vmethod_frame.h" @@ -28,7 +28,7 @@ extern "C" { // global variable -MethodedPtr xnode_class(new MXnode); +DECLARE_CLASS_VAR(xnode, new MXnode, 0); // classes @@ -102,9 +102,9 @@ private: GdomeNode *as_node(StringPtr 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); + ValuePtr value=params->as_no_junction(index, msg); + if(Value* vxnode=value->as(VXNODE_TYPE, false)) + return static_cast(vxnode)->get_node(method_name); else throw Exception("parser.runtime", method_name, @@ -132,16 +132,15 @@ GdomeAttr * as_attr(Pool& pool, StringPt // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); 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); + 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"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, retNode); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else throw Exception( method_name, @@ -151,15 +150,15 @@ 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) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.get_self()); - GdomeNode *selfNode=vnode.get_node(&method_name); + 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"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) { // write out result - r.write_no_lang(*new(pool) VXnode(pool, retNode)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else throw Exception( method_name, @@ -169,14 +168,14 @@ static void _replaceChild(Request& r, St // Node removeChild(in Node oldChild) raises(DOMException); 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); + 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"); GdomeException exc; if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) { // write out result - r.write_no_lang(*new(pool) VXnode(pool, retNode)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else throw Exception( method_name, @@ -186,14 +185,14 @@ static void _removeChild(Request& r, Str // Node appendChild(in Node newChild) raises(DOMException); 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); + 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"); GdomeException exc; if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &exc)) { // write out result - r.write_no_lang(*new(pool) VXnode(pool, retNode)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else throw Exception( method_name, @@ -203,34 +202,34 @@ static void _appendChild(Request& r, Str // boolean hasChildNodes(); 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); + 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(*new(pool) VBool(pool, result)); + r.write_no_lang(ValuePtr(new VBool(result))); } // Node cloneNode(in boolean deep); 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); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *node=vnode.get_node(method_name); bool deep=params->as_bool(0, "deep must be bool", r); GdomeException exc; // write out result - r.write_no_lang(*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc))); + r.write_no_lang(ValuePtr(new VXnode(&pool, gdome_n_cloneNode(node, deep, &exc)))); } // DOM1 element -GdomeElement *get_self_element(Request& r, const String& method_name) { +GdomeElement *get_self_element(Request& r, StringPtr method_name) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.get_self()); - GdomeNode *node=vnode.get_node(&method_name); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *node=vnode.get_node(method_name); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) @@ -241,30 +240,32 @@ GdomeElement *get_self_element(Request& return GDOME_EL(node); } + + // DOMString getAttribute(in DOMString name); 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"); + StringPtr 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, r.transcode(name).get(), &exc); // write out result - r.write_no_lang(pool.transcode(attribute_value, &name)); + r.write_no_lang(*r.transcode(attribute_value, name)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); 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"); + StringPtr name=params->as_string(0, "name must be string"); + StringPtr 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(), + r.transcode(name).get(), + r.transcode(attribute_value).get(), &exc); if(exc) throw Exception( @@ -276,10 +277,10 @@ static void _setAttribute(Request& r, St 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"); + StringPtr name=params->as_string(0, "name must be string"); GdomeException exc; - gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_removeAttribute(element, r.transcode(name).get(), &exc); if(exc) throw Exception( method_name, @@ -290,13 +291,12 @@ static void _removeAttribute(Request& r, 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"); + StringPtr 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, r.transcode(name).get(), &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, (GdomeNode *)attr))); } else if(exc) throw Exception( method_name, @@ -312,8 +312,7 @@ static void _setAttributeNode(Request& r GdomeException exc; if(GdomeAttr *returnAttr=gdome_el_setAttributeNode(element, newAttr, &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, (GdomeNode *)returnAttr))); } else throw Exception( method_name, @@ -339,18 +338,19 @@ static void _getElementsByTagName(Reques Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + StringPtr name=params->as_string(0, "name must be string"); - VHash& result=*new(pool) VHash(pool); + VHashPtr result(new VHash); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, r.transcode(name).get(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ihash(Exception::undefined_source).put( + skey, + ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &exc)))); } } else if(exc) throw Exception( @@ -366,23 +366,24 @@ static void _getElementsByTagNameNS(Requ 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"); + StringPtr namespaceURI=params->as_string(0, "namespaceURI must be string"); + StringPtr localName=params->as_string(1, "localName must be string"); GdomeException exc; - VHash& result=*new(pool) VHash(pool); + VHashPtr result(new VHash); if(GdomeNodeList *nodes= gdome_el_getElementsByTagNameNS( element, - pool.transcode(namespaceURI).get(), - pool.transcode(localName).get(), + r.transcode(namespaceURI).get(), + r.transcode(localName).get(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ihash(Exception::undefined_source).put(skey, + ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &exc)))); } } @@ -393,8 +394,8 @@ static void _getElementsByTagNameNS(Requ // void normalize(); 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); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); GdomeException exc; gdome_n_normalize(selfNode, &exc); @@ -405,19 +406,19 @@ static void _normalize(Request& r, Strin } static void _selectX(Request& r, StringPtr method_name, MethodParams* params, - void (*handler)(Pool& pool, - const String& expression, + void (*handler)(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result)) { + ValuePtr& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.get_self()); + VXnode& vnode=GET_SELF(r, VXnode); // expression - const String& expression=params->as_string(0, "expression must be string"); + StringPtr 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(method_name); 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 @@ -426,53 +427,56 @@ static void _selectX(Request& r, StringP ctxt->node=gdome_xml_n_get_xmlNode(dome_node); /*error to stderr for now*/ xmlXPathObject_auto_ptr res( - xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get())); + xmlXPathEvalExpression(BAD_CAST r.transcode(expression)->str, ctxt.get())); if(xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(&expression, exc); + throw Exception(expression, exc); } - Value *result=0; + ValuePtr result; if(res.get()) - handler(pool, expression, res, result); + handler(r, expression, res, result); if(result) - r.write_no_lang(*result); + r.write_no_lang(result); } -static void selectNodesHandler(Pool& pool, - const String& expression, +static void selectNodesHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { - VHash *vhash=new(pool) VHash(pool); result=vhash; + ValuePtr& result) { + Pool& pool=r.pool(); + VHashPtr vhash(new VHash); result=vhash; switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_NODESET: if(res->nodesetval) if(int size=res->nodesetval->nodeNr) { - Hash& hash=vhash->hash(0); + HashStringValue& hash=vhash->hash(Exception::undefined_source); for(int i=0; inodesetval->nodeTab[i]))); + hash.put(skey, + ValuePtr(new VXnode(&pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[i])))); } } break; default: - throw Exception(0, - &expression, + throw Exception(Exception::undefined_type, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectNodeHandler(Pool& pool, - const String& expression, +static void selectNodeHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); + switch(res->type) { case XPATH_UNDEFINED: break; @@ -480,39 +484,40 @@ static void selectNodeHandler(Pool& pool if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET res->type if(res->nodesetval->nodeNr>1) throw Exception("parser.runtime", - &expression, - "resulted not in a single node (%d)", res->nodesetval->nodeNr); + expression, + "resulted not in a single node (%d)", res->nodesetval->nodeNr); - result=new(pool) VXnode(pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); + result=ValuePtr(new VXnode(&pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0]))); } break; case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=ValuePtr(new VBool(res->boolval!=0)); break; case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=ValuePtr(new VDouble(res->floatval)); break; case XPATH_STRING: - result=new(pool) VString( - pool.transcode( + result=ValuePtr(new VString( + r.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); break; default: throw Exception("parser.runtime", - &expression, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectBoolHandler(Pool& pool, - const String& expression, +static void selectBoolHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=ValuePtr(new VBool(res->boolval!=0)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -520,19 +525,20 @@ static void selectBoolHandler(Pool& pool // else[nodeset] fall down to default default: throw Exception("parser.runtime", - &expression, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectNumberHandler(Pool& pool, - const String& expression, +static void selectNumberHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=ValuePtr(new VDouble(res->floatval)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -540,24 +546,25 @@ static void selectNumberHandler(Pool& po // else[nodeset] fall down to default default: throw Exception("parser.runtime", - &expression, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectStringHandler(Pool& pool, - const String& expression, +static void selectStringHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_STRING: - result=new(pool) VString( - pool.transcode( + result=ValuePtr(new VString( + r.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), &expression)); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -565,7 +572,7 @@ static void selectStringHandler(Pool& po // else[nodeset] fall down to default default: throw Exception("parser.runtime", - &expression, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } @@ -598,10 +605,8 @@ static void _selectString(Request& r, St // constructor -MXnode::MXnode(Pool& apool, const char* aname, VStateless_class *abase) : - Methoded(apool, aname?aname:"xnode", abase), - - consts(apool) +MXnode::MXnode(const char* aname, VStateless_class *abase): + Methoded(aname?aname:"xnode", abase) { /// DOM1 node @@ -655,7 +660,7 @@ MXnode::MXnode(Pool& apool, const char* // consts #define CONST(name) \ - consts.put(*new(pool()) String(pool(), #name), new(pool()) VInt(pool(), GDOME_##name)) + consts.put(StringPtr(new String(#name)), ValuePtr(new VInt(GDOME_##name))) CONST(ELEMENT_NODE); CONST(ATTRIBUTE_NODE); @@ -676,6 +681,6 @@ MXnode::MXnode(Pool& apool, const char* // global variable -MethodedPtr xnode_class(0); // fictive +DECLARE_CLASS_VAR(xnode, 0, 0); // fictive #endif