--- parser3/src/classes/xnode.C 2003/03/07 11:16:44 1.54.2.10 +++ parser3/src/classes/xnode.C 2003/04/11 09:58:10 1.55 @@ -1,15 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" #ifdef XML -static const char* IDENT_XNODE_C="$Date: 2003/03/07 11:16:44 $"; - -#include "pa_vmethod_frame.h" +static const char* IDENT_XNODE_C="$Date: 2003/04/11 09:58:10 $"; #include "pa_charset.h" #include "pa_request.h" @@ -26,10 +24,6 @@ extern "C" { #include "gdome.h" #include "libxml/xpath.h" -// global variable - -DECLARE_CLASS_VAR(xnode, new MXnode, 0); - // classes class xmlXPathObject_auto_ptr { @@ -100,26 +94,26 @@ private: // helpers -GdomeNode *as_node(StringPtr method_name, MethodParams* params, - int index, const char* msg) { - ValuePtr value=params->as_no_junction(index, msg); - if(Value* vxnode=value->as(VXNODE_TYPE, false)) - return static_cast(vxnode)->get_node(method_name); +GdomeNode *as_node(const String& 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); else throw Exception("parser.runtime", - method_name, + &method_name, msg); } // helpers -GdomeAttr * as_attr(Pool& pool, StringPtr method_name, MethodParams* params, - int index, const char* msg) { +GdomeAttr * as_attr(Pool& pool, const String& method_name, MethodParams *params, + int index, const char *msg) { GdomeNode *node=as_node(method_name, params, index, msg); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE) throw Exception("parser.runtime", - method_name, + &method_name, msg); return GDOME_A(node); @@ -130,181 +124,181 @@ 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, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + 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 - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + VXnode& result=*new(pool) VXnode(pool, retNode); + r.write_no_lang(result); } else throw Exception( - method_name, + &method_name, exc); } // 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, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + 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(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - method_name, + &method_name, exc); } // Node removeChild(in Node oldChild) raises(DOMException); -static void _removeChild(Request& r, StringPtr method_name, MethodParams* params) { +static void _removeChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + 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(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - method_name, + &method_name, exc); } // Node appendChild(in Node newChild) raises(DOMException); -static void _appendChild(Request& r, StringPtr method_name, MethodParams* params) { +static void _appendChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + 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(ValuePtr(new VXnode(&pool, &r.charsets, retNode))); + r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else throw Exception( - method_name, + &method_name, exc); } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams* ) { +static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + 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(*new(pool) VBool(pool, result)); } // Node cloneNode(in boolean deep); -static void _cloneNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + 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); 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(*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc))); } // DOM1 element -GdomeElement *get_self_element(Request& r, StringPtr method_name) { +GdomeElement *get_self_element(Request& r, const String& method_name) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *node=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + GdomeNode *node=vnode.get_node(&method_name); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) throw Exception("parser.runtime", - method_name, + &method_name, "method can only be called on nodes of ELEMENT type"); return GDOME_EL(node); } - - // DOMString getAttribute(in DOMString name); -static void _getAttribute(Request& r, StringPtr method_name, MethodParams* params) { +static void _getAttribute(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - StringPtr 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= - gdome_el_getAttribute(element, r.transcode(name).get(), &exc); + gdome_el_getAttribute(element, pool.transcode(name).use(), &exc); // write out result - r.write_no_lang(*r.transcode(attribute_value, name)); + r.write_no_lang(pool.transcode(attribute_value, &name)); } // 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, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - StringPtr name=params->as_string(0, "name must be string"); - StringPtr 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, - r.transcode(name).get(), - r.transcode(attribute_value).get(), + pool.transcode(name).use(), + pool.transcode(attribute_value).use(), &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, StringPtr method_name, MethodParams* params) { +static void _removeAttribute(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - StringPtr 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); + gdome_el_removeAttribute(element, pool.transcode(name).use(), &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _getAttributeNode(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - StringPtr 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)) { + if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).use(), &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, &r.charsets, (GdomeNode *)attr))); + VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); + r.write_no_lang(result); } else if(exc) throw Exception( - method_name, + &method_name, exc); } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); -static void _setAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _setAttributeNode(Request& r, const String& 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"); @@ -312,15 +306,16 @@ static void _setAttributeNode(Request& r 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))); + VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr); + r.write_no_lang(result); } else throw Exception( - method_name, + &method_name, exc); } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); -static void _removeAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { +static void _removeAttributeNode(Request& r, const String& 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"); @@ -329,61 +324,67 @@ static void _removeAttributeNode(Request gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, StringPtr method_name, MethodParams* params) { +static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - StringPtr name=params->as_string(0, "name must be string"); + const String& name=params->as_string(0, "name must be string"); - VHashPtr result(new VHash); + VHash& result=*new(pool) VHash(pool); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, r.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, pool.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ihash(Exception::undefined_source).put( - skey, - ValuePtr(new VXnode(&pool, &r.charsets, gdome_nl_item(nodes, i, &exc)))); + String& skey=*new(pool) String(pool); + { + char *buf=(char *)pool.malloc(MAX_NUMBER); + snprintf(buf, MAX_NUMBER, "%d", i); + skey << buf; + } + + result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc))); } } else if(exc) throw Exception( - method_name, + &method_name, exc); // write out result r.write_no_lang(result); } -static void _getElementsByTagNameNS(Request& r, StringPtr method_name, MethodParams* params) { +static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); // namespaceURI;localName - StringPtr namespaceURI=params->as_string(0, "namespaceURI must be string"); - StringPtr 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; - VHashPtr result(new VHash); + VHash& result=*new(pool) VHash(pool); if(GdomeNodeList *nodes= gdome_el_getElementsByTagNameNS( element, - r.transcode(namespaceURI).get(), - r.transcode(localName).get(), + pool.transcode(namespaceURI).use(), + pool.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ihash(Exception::undefined_source).put(skey, - ValuePtr(new VXnode(&pool, &r.charsets, gdome_nl_item(nodes, i, &exc)))); + result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc))); } } @@ -392,33 +393,33 @@ static void _getElementsByTagNameNS(Requ } // void normalize(); -static void _normalize(Request& r, StringPtr method_name, MethodParams* ) { +static void _normalize(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); - GdomeNode *selfNode=vnode.get_node(method_name); + VXnode& vnode=*static_cast(r.get_self()); + GdomeNode *selfNode=vnode.get_node(&method_name); GdomeException exc; gdome_n_normalize(selfNode, &exc); if(exc) throw Exception( - method_name, + &method_name, exc); } -static void _selectX(Request& r, StringPtr method_name, MethodParams* params, - void (*handler)(Request& r, - StringPtr expression, +static void _selectX(Request& r, const String& method_name, MethodParams *params, + void (*handler)(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result)) { + Value *& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=GET_SELF(r, VXnode); + VXnode& vnode=*static_cast(r.get_self()); // expression - StringPtr 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); + 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 @@ -427,56 +428,57 @@ 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 r.transcode(expression)->str, ctxt.get())); + xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get())); if(xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(expression, exc); + throw Exception(&expression, exc); } - ValuePtr result; + Value *result=0; if(res.get()) - handler(r, expression, res, result); + handler(pool, expression, res, result); if(result) - r.write_no_lang(result); + r.write_no_lang(*result); } -static void selectNodesHandler(Request& r, - StringPtr expression, +static void selectNodesHandler(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - Pool& pool=r.pool(); - VHashPtr vhash(new VHash); result=vhash; + Value *& result) { + VHash *vhash=new(pool) VHash(pool); 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); + Hash& hash=vhash->hash(0); for(int i=0; inodesetval->nodeTab[i])))); + hash.put(skey, new(pool) VXnode(pool, + gdome_xml_n_mkref(res->nodesetval->nodeTab[i]))); } } break; default: - throw Exception(Exception::undefined_type, - expression, + throw Exception(0, + &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectNodeHandler(Request& r, - StringPtr expression, +static void selectNodeHandler(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - Pool& pool=r.pool(); - + Value *& result) { switch(res->type) { case XPATH_UNDEFINED: break; @@ -484,40 +486,39 @@ static void selectNodeHandler(Request& r 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=ValuePtr(new VXnode(&pool, &r.charsets, gdome_xml_n_mkref(res->nodesetval->nodeTab[0]))); + result=new(pool) VXnode(pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); } break; case XPATH_BOOLEAN: - result=ValuePtr(new VBool(res->boolval!=0)); + result=new(pool) VBool(pool, res->boolval!=0); break; case XPATH_NUMBER: - result=ValuePtr(new VDouble(res->floatval)); + result=new(pool) VDouble(pool, res->floatval); break; case XPATH_STRING: - result=ValuePtr(new VString( - r.transcode( + result=new(pool) VString( + pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; default: throw Exception("parser.runtime", - expression, + &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectBoolHandler(Request& r, - StringPtr expression, +static void selectBoolHandler(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - Pool& pool=r.pool(); + Value *& result) { switch(res->type) { case XPATH_BOOLEAN: - result=ValuePtr(new VBool(res->boolval!=0)); + result=new(pool) VBool(pool, res->boolval!=0); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -525,20 +526,19 @@ static void selectBoolHandler(Request& r // 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(Request& r, - StringPtr expression, +static void selectNumberHandler(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - Pool& pool=r.pool(); + Value *& result) { switch(res->type) { case XPATH_NUMBER: - result=ValuePtr(new VDouble(res->floatval)); + result=new(pool) VDouble(pool, res->floatval); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -546,25 +546,24 @@ static void selectNumberHandler(Request& // 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(Request& r, - StringPtr expression, +static void selectStringHandler(Pool& pool, + const String& expression, xmlXPathObject_auto_ptr res, - ValuePtr& result) { - Pool& pool=r.pool(); + Value *& result) { switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_STRING: - result=ValuePtr(new VString( - r.transcode( + result=new(pool) VString( + pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) @@ -572,41 +571,43 @@ static void selectStringHandler(Request& // else[nodeset] fall down to default default: throw Exception("parser.runtime", - expression, + &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void _select(Request& r, StringPtr method_name, MethodParams* params) { +static void _select(Request& r, const String& 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, const String& 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, const String& 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, const String& 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, const String& method_name, MethodParams *params) { _selectX(r, method_name, params, selectStringHandler); } // constructor -MXnode::MXnode(const char* aname, VStateless_class *abase): - Methoded(aname?aname:"xnode", abase) +MXnode::MXnode(Pool& apool, const char *aname, VStateless_class *abase) : + Methoded(apool, aname?aname:"xnode", abase), + + consts(apool) { /// DOM1 node @@ -660,7 +661,7 @@ MXnode::MXnode(const char* aname, VState // consts #define CONST(name) \ - consts.put(StringPtr(new String(#name)), ValuePtr(new VInt(GDOME_##name))) + consts.put(*new(pool()) String(pool(), #name), new(pool()) VInt(pool(), GDOME_##name)) CONST(ELEMENT_NODE); CONST(ATTRIBUTE_NODE); @@ -677,10 +678,19 @@ MXnode::MXnode(const char* aname, VState } -#else - // global variable -DECLARE_CLASS_VAR(xnode, 0, 0); // fictive +Methoded *Xnode_class; + +#endif +// creator +Methoded *MXnode_create(Pool& pool) { + return +#ifdef XML + Xnode_class=new(pool) MXnode(pool) +#else + 0 #endif + ; +}