jasons 2002/10/19 16:06:35 Modified: perl Xerces.i Log: * Xerces.i (Repository): commented out all the overloading support that SWIG now handles on it's own Revision Changes Path 1.23 +92 -80 xml-xerces/perl/Xerces.i Index: Xerces.i =================================================================== RCS file: /home/cvs/xml-xerces/perl/Xerces.i,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Xerces.i 27 Aug 2002 19:49:35 -0000 1.22 +++ Xerces.i 19 Oct 2002 23:06:35 -0000 1.23 @@ -201,6 +201,8 @@ /* * Utility Classes */ + +/* %rename(XMLURL__constructor__base) XMLURL::XMLURL(const XMLCh* const, const XMLCh* const); %rename(XMLURL__constructor__text) XMLURL::XMLURL(const XMLCh* const); @@ -212,12 +214,14 @@ const XMLCh* const); %rename(setURL__overload__XMLURL) XMLURL::setURL(const XMLURL&, const XMLCh* const); +*/ + %ignore XMLURL::XMLURL(const XMLURL&,const char* const); %ignore XMLURL::XMLURL(const char* const); %ignore XMLURL::XMLURL(const XMLCh* const, const char* const); %include "xercesc/util/XMLURL.hpp" -%rename(XMLUri__constructor__uri) XMLUri::XMLUri(const XMLCh* const); +// %rename(XMLUri__constructor__uri) XMLUri::XMLUri(const XMLCh* const); %include "xercesc/util/XMLUri.hpp" // I want to add these eventually, but for now, I want to eliminate @@ -233,73 +237,76 @@ %ignore XMLValidator::emitError(const XMLValid::Codes,const XMLCh *const, const XMLCh *const,const XMLCh *const, const XMLCh *const ); + +// These are just char* versions and should be ignored %ignore XMLValidator::emitError(const XMLValid::Codes, const char *const, const char *const, const char *const, const char *const ); - -%ignore SAXException::SAXException(const XMLCh *const ); %ignore SAXException::SAXException(const char *const ); -%ignore SAXException::SAXException(const SAXException &); -%ignore SAXNotSupportedException::SAXNotSupportedException(const XMLCh *const); %ignore SAXNotSupportedException::SAXNotSupportedException(const char *const); -%ignore SAXNotSupportedException::SAXNotSupportedException(const SAXException&); -%ignore SAXNotRecognizedException::SAXNotRecognizedException(const XMLCh *const); %ignore SAXNotRecognizedException::SAXNotRecognizedException(const char *const); -%ignore SAXNotRecognizedException::SAXNotRecognizedException(const SAXException&); - -%ignore SAXParseException::SAXParseException(const XMLCh *const , - const XMLCh *const , - const XMLCh *const , - XMLSSize_t const , - XMLSSize_t const ); -%ignore SAXParseException::SAXParseException(const SAXParseException &); - -%ignore DOMDocument::createElementNS(const XMLCh *,const XMLCh *,const int, - const int); - -%ignore DOMException::DOMException(short ,const XMLCh *); -%ignore DOMException::DOMException(const DOMException &); - -%ignore DOMImplementation::createDocument(); - -%ignore DOMRangeException::DOMRangeException(RangeExceptionCode, - const XMLCh *); -%ignore DOMRangeException::DOMRangeException(const DOMRangeException&); - -%ignore XMLPScanToken::XMLPScanToken(const XMLPScanToken&); - -%ignore SAX2XMLReader::parse(const XMLCh *const ); - +%ignore DOMBuilder::parseURI(const char *const ,const bool ); %ignore SAXParser::setExternalSchemaLocation(const char *const ); %ignore SAXParser::setExternalNoNamespaceSchemaLocation(const char *const ); -%ignore SAXParser::getDocumentHandler() const; -%ignore SAXParser::getEntityResolver() const; -%ignore SAXParser::getErrorHandler() const; - -%ignore Grammar::getElemDecl(const unsigned int ) const; -%ignore Grammar::putElemDecl(XMLElementDecl *const ) const; -%ignore Grammar::getElemDecl(const unsigned int ,const XMLCh *const ,const XMLCh *const ,unsigned int ); -%ignore Grammar::getElemDecl(const unsigned int ); -%ignore Grammar::getNotationDecl(const XMLCh *const ); - -%ignore DOMDocument::createElementNS(const XMLCh *,const XMLCh *, - XMLSSize_t const ,XMLSSize_t const ); -%ignore DOMImplementation::createDocument(); -%ignore DOMRangeException::DOMRangeException(RangeExceptionCode , - const XMLCh *); -%ignore DOMRangeException::DOMRangeException(const DOMRangeException &); -%ignore DOMBuilder::getErrorHandler() const; -%ignore DOMBuilder::getErrorHandler(); -%ignore DOMBuilder::getEntityResolver(); -%ignore DOMBuilder::getFilter(); -%ignore DOMBuilder::parseURI(const char *const ,const bool ); + +// %ignore SAXException::SAXException(const XMLCh *const ); +// %ignore SAXException::SAXException(const SAXException &); +// %ignore SAXNotSupportedException::SAXNotSupportedException(const XMLCh *const); +// %ignore SAXNotSupportedException::SAXNotSupportedException(const SAXException&); +// %ignore SAXNotRecognizedException::SAXNotRecognizedException(const XMLCh *const); +// %ignore SAXNotRecognizedException::SAXNotRecognizedException(const SAXException&); +// +// %ignore SAXParseException::SAXParseException(const XMLCh *const , +// const XMLCh *const , +// const XMLCh *const , +// XMLSSize_t const , +// XMLSSize_t const ); +// %ignore SAXParseException::SAXParseException(const SAXParseException &); +// +// %ignore DOMDocument::createElementNS(const XMLCh *,const XMLCh *,const int, +// const int); +// +// %ignore DOMException::DOMException(short ,const XMLCh *); +// %ignore DOMException::DOMException(const DOMException &); +// +// %ignore DOMImplementation::createDocument(); +// +// %ignore DOMRangeException::DOMRangeException(RangeExceptionCode, +// const XMLCh *); +// %ignore DOMRangeException::DOMRangeException(const DOMRangeException&); +// +// %ignore XMLPScanToken::XMLPScanToken(const XMLPScanToken&); +// +// %ignore SAX2XMLReader::parse(const XMLCh *const ); +// +// %ignore SAXParser::getDocumentHandler() const; +// %ignore SAXParser::getEntityResolver() const; +// %ignore SAXParser::getErrorHandler() const; +// +// %ignore Grammar::getElemDecl(const unsigned int ) const; +// %ignore Grammar::putElemDecl(XMLElementDecl *const ) const; +// %ignore Grammar::getElemDecl(const unsigned int ,const XMLCh *const ,const XMLCh *const ,unsigned int ); +// %ignore Grammar::getElemDecl(const unsigned int ); +// %ignore Grammar::getNotationDecl(const XMLCh *const ); +// +// %ignore DOMDocument::createElementNS(const XMLCh *,const XMLCh *, +// XMLSSize_t const ,XMLSSize_t const ); +// %ignore DOMImplementation::createDocument(); +// %ignore DOMRangeException::DOMRangeException(RangeExceptionCode , +// const XMLCh *); +// %ignore DOMRangeException::DOMRangeException(const DOMRangeException &); +// %ignore DOMBuilder::getErrorHandler() const; +// %ignore DOMBuilder::getErrorHandler(); +// %ignore DOMBuilder::getEntityResolver(); +// %ignore DOMBuilder::getFilter(); + // These are just const versions of the others, and should be ignored -%ignore getPrefix() const; -%ignore getLocalPart() const; -%ignore getURI() const; -%ignore getRawName() const; +%ignore QName::getPrefix() const; +%ignore QName::getLocalPart() const; +%ignore QName::getURI() const; +%ignore QName::getRawName() const; %include "xercesc/util/QName.hpp" // although not really necessary for Perl, why not? @@ -339,9 +346,10 @@ %include "xercesc/sax/DTDHandler.hpp" %include "xercesc/sax/DocumentHandler.hpp" %include "xercesc/sax/EntityResolver.hpp" -%rename(getType__overload__index) AttributeList::getType(const unsigned int) const; + +// %rename(getType__overload__index) AttributeList::getType(const unsigned int) const; %ignore AttributeList::getValue(const XMLCh* const) const; -%rename(getValue__overload__index) AttributeList::getValue(const unsigned int) const; +// %rename(getValue__overload__index) AttributeList::getValue(const unsigned int) const; %include "xercesc/sax/AttributeList.hpp" %include "xercesc/sax/HandlerBase.hpp" %include "xercesc/sax/Locator.hpp" @@ -349,11 +357,11 @@ /* * FOR SAX 2.0 API */ -%rename(getType__overload__qname) Attributes::getType(const XMLCh* const) const; -%rename(getType__overload__index) Attributes::getType(const unsigned int) const; -%rename(getValue__overload__qname) Attributes::getValue(const XMLCh* const) const; -%rename(getValue__overload__index) Attributes::getValue(const unsigned int) const; -%rename(getIndex__overload__qname) Attributes::getIndex(const XMLCh* const) const; +// %rename(getType__overload__qname) Attributes::getType(const XMLCh* const) const; +// %rename(getType__overload__index) Attributes::getType(const unsigned int) const; +// %rename(getValue__overload__qname) Attributes::getValue(const XMLCh* const) const; +// %rename(getValue__overload__index) Attributes::getValue(const unsigned int) const; +// %rename(getIndex__overload__qname) Attributes::getIndex(const XMLCh* const) const; %include "xercesc/sax2/Attributes.hpp" %include "xercesc/sax2/ContentHandler.hpp" %include "xercesc/sax2/LexicalHandler.hpp" @@ -374,11 +382,11 @@ %include "xercesc/framework/MemBufInputSource.hpp" %include "xercesc/framework/StdInInputSource.hpp" -%rename(LocalFileInputSource__constructor__base) LocalFileInputSource(const XMLCh* const,const XMLCh* const); +// %rename(LocalFileInputSource__constructor__base) LocalFileInputSource(const XMLCh* const,const XMLCh* const); %include "xercesc/framework/LocalFileInputSource.hpp" -%rename(URLInputSource__constructor__pub) URLInputSource(const XMLCh* const,const XMLCh* const,const XMLCh* const); -%rename(URLInputSource__constructor__sys) URLInputSource(const XMLCh* const,const XMLCh* const); +// %rename(URLInputSource__constructor__pub) URLInputSource(const XMLCh* const,const XMLCh* const,const XMLCh* const); +// %rename(URLInputSource__constructor__sys) URLInputSource(const XMLCh* const,const XMLCh* const); %ignore URLInputSource(const XMLCh* const,const char* const, const char* const); %ignore URLInputSource(const XMLCh* const,const char* const); %include "xercesc/framework/URLInputSource.hpp" @@ -518,9 +526,11 @@ %ignore XercesDOMParser::getEntityResolver() const; // Overloaded methods -%rename(parse__overload__is) parse(const InputSource&, const bool); -%rename(parseFirst__overload__is) parseFirst(const InputSource&, - XMLPScanToken &, const bool); + +// %rename(parse__overload__is) parse(const InputSource&, const bool); +// %rename(parseFirst__overload__is) parseFirst(const InputSource&, +// XMLPScanToken &, const bool); + // // The abstract base classes for Parsers // @@ -641,11 +651,13 @@ %include "xercesc/dom/DOMWriter.hpp" %include "xercesc/dom/DOMWriterFilter.hpp" -// %addmethods IDOM_Node { -// bool operator==(const IDOM_Node &other) { -// return self == &other; +// %addmethods DOMNode { +// bool operator==(const DOMNode &other) { +// DOMElementImpl *self_impl = (DOMElementImpl *)self; +// DOMElementImpl *other_impl = (DOMElementImpl *)&other; +// return self_impl == other_impl; // } -// bool operator!=(const IDOM_Node &other) { +// bool operator!=(const DOMNode &other) { // return self != &other; // } // }; @@ -655,11 +667,11 @@ * so that SWIG can wrap the superclass methods properly */ -%rename(PerlErrorCallbackHandler__constructor__arg) PerlErrorCallbackHandler::PerlErrorCallbackHandler(SV*); -%rename(PerlNodeFilterCallbackHandler__constructor__arg) PerlNodeFilterCallbackHandler::PerlNodeFilterCallbackHandler(SV*); -%rename(PerlContentCallbackHandler__constructor__arg) PerlContentCallbackHandler::PerlContentCallbackHandler(SV*); -%rename(PerlDocumentCallbackHandler__constructor__arg) PerlDocumentCallbackHandler::PerlDocumentCallbackHandler(SV*); -%rename(PerlEntityResolverHandler__constructor__arg) PerlEntityResolverHandler::PerlEntityResolverHandler(SV*); +// %rename(PerlErrorCallbackHandler__constructor__arg) PerlErrorCallbackHandler::PerlErrorCallbackHandler(SV*); +// %rename(PerlNodeFilterCallbackHandler__constructor__arg) PerlNodeFilterCallbackHandler::PerlNodeFilterCallbackHandler(SV*); +// %rename(PerlContentCallbackHandler__constructor__arg) PerlContentCallbackHandler::PerlContentCallbackHandler(SV*); +// %rename(PerlDocumentCallbackHandler__constructor__arg) PerlDocumentCallbackHandler::PerlDocumentCallbackHandler(SV*); +// %rename(PerlEntityResolverHandler__constructor__arg) PerlEntityResolverHandler::PerlEntityResolverHandler(SV*); %ignore PerlErrorCallbackHandler::warning(const SAXParseException&); %ignore PerlErrorCallbackHandler::error(const SAXParseException&); @@ -674,7 +686,7 @@ const XMLCh* const); %include "PerlEntityResolverHandler.hpp" -%ignore PerlNodeFilterCallbackHandler::acceptNode (const IDOM_Node*) const; +%ignore PerlNodeFilterCallbackHandler::acceptNode (const DOMNode*) const; %include "PerlNodeFilterCallbackHandler.hpp" /*
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]