Author: jasons Date: Mon Nov 10 10:22:42 2003 New Revision: 120 Modified: xml/xerces-p/trunk/Xerces.i Log: moved 2.4.20-ben1 code to Xerces-extra.pm removed all warnings exposed Grammar API
Modified: xml/xerces-p/trunk/Xerces.i ============================================================================== --- xml/xerces-p/trunk/Xerces.i (original) +++ xml/xerces-p/trunk/Xerces.i Mon Nov 10 10:22:42 2003 @@ -28,13 +28,24 @@ #include "xercesc/framework/MemBufInputSource.hpp" #include "xercesc/framework/StdInInputSource.hpp" #include "xercesc/framework/URLInputSource.hpp" +#include "xercesc/util/NameIdPool.hpp" +#include "xercesc/util/XMLEnumerator.hpp" #include "xercesc/framework/XMLValidator.hpp" +#include "xercesc/validators/common/Grammar.hpp" +#include "xercesc/validators/DTD/DTDAttDef.hpp" +#include "xercesc/validators/DTD/DTDAttDefList.hpp" +#include "xercesc/validators/DTD/DTDGrammar.hpp" +#include "xercesc/validators/DTD/DTDValidator.hpp" +#include "xercesc/validators/schema/SchemaGrammar.hpp" +#include "xercesc/validators/schema/SchemaValidator.hpp" +#include "xercesc/validators/schema/SchemaAttDefList.hpp" +#include "xercesc/validators/schema/SchemaAttDef.hpp" #include "xercesc/framework/XMLFormatter.hpp" #include "xercesc/framework/MemBufFormatTarget.hpp" #include "xercesc/framework/LocalFileFormatTarget.hpp" #include "xercesc/framework/StdOutFormatTarget.hpp" -#include "xercesc/validators/common/Grammar.hpp" +#include "PerlCallbackHandler.hpp" #include "PerlErrorCallbackHandler.hpp" #include "PerlDocumentCallbackHandler.hpp" #include "PerlContentCallbackHandler.hpp" @@ -213,6 +224,9 @@ %ignore openFile(const XMLCh* const); %include "xercesc/util/PlatformUtils.hpp" +%ignore operator new; +%ignore operator delete; +%import "xercesc/util/XMemory.hpp" // XERCES_CPP_NAMESPACE_BEGIN @@ -349,21 +363,91 @@ %include "xercesc/util/XMLExceptMsgs.hpp" %include "xercesc/util/XMLException.hpp" -// in case someone wants to re-use validators +%ignore getNotationDecl(const XMLCh* const) const; +%ignore getEntityDecl(const XMLCh* const) const; +%ignore getEntityDeclPool() const; +%ignore getElemDecl(const unsigned int) const; +%ignore getElemDecl(const unsigned int, + const XMLCh* const, + const XMLCh* const, + unsigned int) const; + + + +%ignore getContentSpec() const; +%ignore getAttDef(const XMLCh* const) const; +%ignore getBaseName() const; +%ignore getElementName() const; +%rename(ignore_me_for_now) XERCES_CPP_NAMESPACE::DTDEntityDecl(const XMLCh* const, + const XMLCh, + const bool, + const bool); +%ignore findAttDef(const unsigned long, + const XMLCh* const) const; +%ignore findAttDef(const XMLCh* const, + const XMLCh* const) const; +%rename(ignore_me_for_now) findAttDef(const unsigned long, + const XMLCh* const); +%ignore XERCES_CPP_NAMESPACE::SchemaElementDecl::getAttDef(const XMLCh* const, const int) const; +%ignore XERCES_CPP_NAMESPACE::SchemaElementDecl::getAttWildCard() const; + +// +// For the schema enumeration support +// + +// for now this have no methods we need, and are only imported +%import "xercesc/framework/XMLAttr.hpp" +%import "xercesc/framework/XMLContentModel.hpp" + +// these have getter methods and must be included +%include "xercesc/framework/XMLElementDecl.hpp" +%include "xercesc/framework/XMLEntityDecl.hpp" +%include "xercesc/framework/XMLNotationDecl.hpp" +%include "xercesc/framework/XMLAttDefList.hpp" +%include "xercesc/framework/XMLAttDef.hpp" %include "xercesc/framework/XMLValidator.hpp" +%include "xercesc/validators/common/Grammar.hpp" + +// these are needed for both the DTD and Schema templates +%import "xercesc/util/XMLEnumerator.hpp" + +// these are needed for the DTD templates +%import "xercesc/util/NameIdPool.hpp" + +%include "xercesc/validators/DTD/DTDElementDecl.hpp" +%template() XERCES_CPP_NAMESPACE::XMLEnumerator<DTDElementDecl>; +%template() XERCES_CPP_NAMESPACE::NameIdPool<DTDElementDecl>; +%template(DTDElementDeclEnumerator) XERCES_CPP_NAMESPACE::NameIdPoolEnumerator<DTDElementDecl>; + +%include "xercesc/validators/DTD/DTDEntityDecl.hpp" +%template() XERCES_CPP_NAMESPACE::XMLEnumerator<DTDEntityDecl>; +%template() XERCES_CPP_NAMESPACE::NameIdPool<DTDEntityDecl>; +%template(DTDEntityDeclEnumerator) XERCES_CPP_NAMESPACE::NameIdPoolEnumerator<DTDEntityDecl>; + +%include "xercesc/validators/DTD/DTDAttDefList.hpp" +%include "xercesc/validators/DTD/DTDAttDef.hpp" +%include "xercesc/validators/DTD/DTDGrammar.hpp" +%include "xercesc/validators/DTD/DTDValidator.hpp" + +// these are needed for the templates for schema +%import "xercesc/util/RefHash3KeysIdPool.hpp" + +%include "xercesc/validators/schema/SchemaElementDecl.hpp" +%template() XERCES_CPP_NAMESPACE::XMLEnumerator<SchemaElementDecl>; +%template() XERCES_CPP_NAMESPACE::RefHash3KeysTableBucketElem<SchemaElementDecl>; +%template() XERCES_CPP_NAMESPACE::RefHash3KeysIdPool<SchemaElementDecl>; +%template(SchemaElementDeclEnumerator) XERCES_CPP_NAMESPACE::RefHash3KeysIdPoolEnumerator<SchemaElementDecl>; + +%include "xercesc/validators/schema/SchemaGrammar.hpp" +%include "xercesc/validators/schema/SchemaValidator.hpp" +%include "xercesc/validators/schema/SchemaAttDefList.hpp" +%include "xercesc/validators/schema/SchemaAttDef.hpp" // I will wait until someone asks for these scanner classes -// %include "xercesc/framework/XMLAttDef.hpp" -// %include "xercesc/framework/XMLAttDefList.hpp" -// %include "xercesc/framework/XMLAttr.hpp" -// %include "xercesc/framework/XMLContentModel.hpp" -// %include "xercesc/framework/XMLElementDecl.hpp" -// %include "xercesc/framework/XMLEntityDecl.hpp" -// %include "xercesc/framework/XMLNotationDecl.hpp" -// %include "xercesc/framework/XMLEntityHandler.hpp" // %include "xercesc/framework/XMLErrorCodes.hpp" // %include "xercesc/framework/XMLValidityCodes.hpp" // %include "xercesc/framework/XMLDocumentHandler.hpp" +// %import "xercesc/framework/XMLEntityHandler.hpp" /* * FOR SAX 1.0 API @@ -652,6 +736,8 @@ %ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityHandler(); %ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorReporter() const; %ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorReporter(); +%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorHandler() const; +%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorHandler(); %ignore XERCES_CPP_NAMESPACE::XMLScanner::getExitOnFirstFatal() const; %ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidationConstraintFatal() const; %ignore XERCES_CPP_NAMESPACE::XMLScanner::getIDRefList(); @@ -800,10 +886,11 @@ %include "xercesc/sax2/SAX2XMLReader.hpp" %include "xercesc/sax2/XMLReaderFactory.hpp" +%ignore XERCES_CPP_NAMESPACE::SAXParser::getErrorHandler() const; +%ignore XERCES_CPP_NAMESPACE::SAXParser::getEntityResolver() const; +%ignore XERCES_CPP_NAMESPACE::SAXParser::getDocumentHandler() const; %include "xercesc/parsers/SAXParser.hpp" -%include "xercesc/validators/common/Grammar.hpp" - /* * DOM */ @@ -861,6 +948,10 @@ %include "xercesc/dom/DOMNotation.hpp" %include "xercesc/dom/DOMProcessingInstruction.hpp" +%ignore XERCES_CPP_NAMESPACE::DOMBuilder::getErrorHandler() const; +%ignore XERCES_CPP_NAMESPACE::DOMBuilder::getEntityResolver() const; +%ignore XERCES_CPP_NAMESPACE::DOMBuilder::getFilter() const; + // Introduced in DOM Level 3 // Experimental - subject to change %include "xercesc/dom/DOMBuilder.hpp" @@ -908,7 +999,7 @@ %ignore PerlErrorCallbackHandler::error(const SAXParseException&); %ignore PerlErrorCallbackHandler::fatalError(const SAXParseException&); -%import "PerlCallbackHandler.hpp" +%include "PerlCallbackHandler.hpp" %include "PerlErrorCallbackHandler.hpp" %include "PerlDocumentCallbackHandler.hpp" %include "PerlContentCallbackHandler.hpp" @@ -959,5 +1050,4 @@ * Include extra verbatim Perl code immediately after Module header */ %pragma(perl5) code="package XML::Xerces; -use vars qw($VERSION @EXPORT); -$VERSION = q[2.3.0-2];"; +use vars qw($VERSION @EXPORT);" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]