You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ja...@apache.org on 2008/03/12 04:41:12 UTC
svn commit: r636188 [1/8] - in /xerces/c/trunk/swig: interfaces/
interfaces/Perl/ interfaces/dom/ interfaces/framework/ perl/ perl/DOM/
perl/Handler/ perl/IO/ perl/SAX/ perl/Transcoder/ perl/samples/ perl/t/
Author: jasons
Date: Tue Mar 11 20:41:08 2008
New Revision: 636188
URL: http://svn.apache.org/viewvc?rev=636188&view=rev
Log:
preparing for 3.0 release
Removed:
xerces/c/trunk/swig/perl/Transcoder/XMLExceptionHandler.cpp
xerces/c/trunk/swig/perl/Transcoder/XMLExceptionHandler.hpp
Modified:
xerces/c/trunk/swig/interfaces/Perl/typemaps-io.i
xerces/c/trunk/swig/interfaces/Xerces.i
xerces/c/trunk/swig/interfaces/Xerces_DOM.i
xerces/c/trunk/swig/interfaces/Xerces_SAX.i
xerces/c/trunk/swig/interfaces/dom-includes.i
xerces/c/trunk/swig/interfaces/dom/DOMLSInput.i
xerces/c/trunk/swig/interfaces/framework/Wrapper4DOMLSInput.i
xerces/c/trunk/swig/interfaces/ignore.i
xerces/c/trunk/swig/interfaces/input-source.i
xerces/c/trunk/swig/interfaces/io-includes.i
xerces/c/trunk/swig/interfaces/typemaps-dom.i
xerces/c/trunk/swig/interfaces/typemaps-io.i
xerces/c/trunk/swig/interfaces/typemaps-xmlch.i
xerces/c/trunk/swig/perl/ANNOUNCE
xerces/c/trunk/swig/perl/DOM/DOM.pm
xerces/c/trunk/swig/perl/DOM/Makefile.PL
xerces/c/trunk/swig/perl/DOM/Xerces_DOM.cpp
xerces/c/trunk/swig/perl/Handler/PerlNodeFilterCallbackHandler.cpp
xerces/c/trunk/swig/perl/IO/IO.pm
xerces/c/trunk/swig/perl/IO/Makefile.PL
xerces/c/trunk/swig/perl/IO/Xerces_IO.cpp
xerces/c/trunk/swig/perl/MANIFEST
xerces/c/trunk/swig/perl/Makefile.PL
xerces/c/trunk/swig/perl/SAX/Makefile.PL
xerces/c/trunk/swig/perl/SAX/SAX.pm
xerces/c/trunk/swig/perl/SAX/Xerces_SAX.cpp
xerces/c/trunk/swig/perl/TODO
xerces/c/trunk/swig/perl/Xerces.cpp
xerces/c/trunk/swig/perl/Xerces.pm
xerces/c/trunk/swig/perl/samples/DOMCount.pl
xerces/c/trunk/swig/perl/t/DOMLSInput.t
xerces/c/trunk/swig/perl/t/DOMLSParser.t
Modified: xerces/c/trunk/swig/interfaces/Perl/typemaps-io.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/Perl/typemaps-io.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/Perl/typemaps-io.i (original)
+++ xerces/c/trunk/swig/interfaces/Perl/typemaps-io.i Tue Mar 11 20:41:08 2008
@@ -4,8 +4,7 @@
%set_output(SWIG_FromCharPtr((char*)$1));
}
-%typemap(in) (const XMLByte* const srcDocBytes,
- unsigned int byteCount) {
+%typemap(in) (const XMLByte* const srcDocBytes, XMLSize_t byteCount) {
if (SvPOK($input)||SvIOK($input)||SvNOK($input)) {
STRLEN len;
XMLByte *xmlbytes = (XMLByte *)SvPV($input, len);
@@ -13,7 +12,7 @@
$1 = new XMLByte[len];
memcpy($1, xmlbytes, len);
} else {
- SWIG_croak("Type error in argument 2 of $symname, Expected perl-string.");
+ SWIG_croak("Type error in argument 1 of $symname, Expected perl-string.");
}
}
Modified: xerces/c/trunk/swig/interfaces/Xerces.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/Xerces.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/Xerces.i (original)
+++ xerces/c/trunk/swig/interfaces/Xerces.i Tue Mar 11 20:41:08 2008
@@ -29,6 +29,9 @@
#ifdef SWIGPERL
%module "XML::Xerces"
#endif
+#ifdef SWIGRUBY
+%module "Xerces"
+#endif
/*
* Import the common macros
Modified: xerces/c/trunk/swig/interfaces/Xerces_DOM.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/Xerces_DOM.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/Xerces_DOM.i (original)
+++ xerces/c/trunk/swig/interfaces/Xerces_DOM.i Tue Mar 11 20:41:08 2008
@@ -42,7 +42,7 @@
XERCES_CPP_NAMESPACE_USE
-void
+static void
makeDOMException(const DOMException& e){
SV *error = ERRSV;
SWIG_MakePtr(error, (void *) new DOMException(e), SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMException, SWIG_SHADOW|0);
@@ -233,9 +233,7 @@
%include "parsers/AbstractDOMParser.i"
// DOMLSParser
-%include "dom/DOMLSInput.i"
%include "framework/Wrapper4InputSource.i"
-%include "framework/Wrapper4DOMLSInput.i"
%include "dom/DOMLSParserFilter.i"
%include "dom/DOMLSParser.i"
Modified: xerces/c/trunk/swig/interfaces/Xerces_SAX.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/Xerces_SAX.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/Xerces_SAX.i (original)
+++ xerces/c/trunk/swig/interfaces/Xerces_SAX.i Tue Mar 11 20:41:08 2008
@@ -43,13 +43,13 @@
XERCES_CPP_NAMESPACE_USE
-void
+static void
makeSAXNotRecognizedException(const SAXNotRecognizedException& e){
SV *error = ERRSV;
SWIG_MakePtr(error, (void *) new SAXNotRecognizedException(e), SWIGTYPE_p_XERCES_CPP_NAMESPACE__SAXNotRecognizedException, SWIG_SHADOW|0);
}
-void
+static void
makeSAXNotSupportedException(const SAXNotSupportedException& e){
SV *error = ERRSV;
SWIG_MakePtr(error, (void *) new SAXNotSupportedException(e), SWIGTYPE_p_XERCES_CPP_NAMESPACE__SAXNotSupportedException, SWIG_SHADOW|0);
Modified: xerces/c/trunk/swig/interfaces/dom-includes.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/dom-includes.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/dom-includes.i (original)
+++ xerces/c/trunk/swig/interfaces/dom-includes.i Tue Mar 11 20:41:08 2008
@@ -21,7 +21,6 @@
#include "xercesc/util/XMLException.hpp"
#include "xercesc/framework/Wrapper4InputSource.hpp"
-#include "xercesc/framework/Wrapper4DOMLSInput.hpp"
#include "xercesc/parsers/AbstractDOMParser.hpp"
#include "xercesc/parsers/XercesDOMParser.hpp"
Modified: xerces/c/trunk/swig/interfaces/dom/DOMLSInput.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/dom/DOMLSInput.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/dom/DOMLSInput.i (original)
+++ xerces/c/trunk/swig/interfaces/dom/DOMLSInput.i Tue Mar 11 20:41:08 2008
@@ -1 +1,29 @@
+%exception XERCES_CPP_NAMESPACE::DOMLSInput::~DOMLSInput %{
+ try
+ {
+ XMLCh *current = (XMLCh *)(arg1)->getStringData();
+ if (current != NULL) {
+ delete [] current;
+ }
+ $action
+ }
+ CATCH_XML_EXCEPTION
+%}
+
+%exception XERCES_CPP_NAMESPACE::DOMLSInput::setStringData %{
+ try
+ {
+ XMLCh *current = (XMLCh *)(arg1)->getStringData();
+ if (current != NULL) {
+ delete [] current;
+ }
+ $action
+ }
+ CATCH_XML_EXCEPTION
+%}
+
+%extend XERCES_CPP_NAMESPACE::DOMLSInput {
+%typemap(freearg) const XMLCh* data ""
+}
+
%include "xercesc/dom/DOMLSInput.hpp"
Modified: xerces/c/trunk/swig/interfaces/framework/Wrapper4DOMLSInput.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/framework/Wrapper4DOMLSInput.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/framework/Wrapper4DOMLSInput.i (original)
+++ xerces/c/trunk/swig/interfaces/framework/Wrapper4DOMLSInput.i Tue Mar 11 20:41:08 2008
@@ -1 +1,4 @@
+// the class constructor has an optional DOMLSResourceResolver
+%import "xercesc/dom/DOMLSResourceResolver.hpp"
+
%include "xercesc/framework/Wrapper4DOMLSInput.hpp"
Modified: xerces/c/trunk/swig/interfaces/ignore.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/ignore.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/ignore.i (original)
+++ xerces/c/trunk/swig/interfaces/ignore.i Tue Mar 11 20:41:08 2008
@@ -7,7 +7,7 @@
// ignore the char* versions of ALL constructors
%ignore XERCES_CPP_NAMESPACE::DOMLSParser::parseURI(const char *const );
-%ignore MemBufInputSource(const XMLByte* const, const unsigned int, const char* const,
+%ignore MemBufInputSource(const XMLByte* const, const XMLSize_t, const char* const,
const bool foo=false,
MemoryManager* const foo=XMLPlatformUtils::fgMemoryManager);
@@ -45,8 +45,8 @@
* in a typemap. While we are at it, we also ignore the constructor
* that sets the MemoryManager
*/
-%ignore MemBufInputSource(const XMLByte* const, const unsigned int, const XMLCh* const);
-%ignore MemBufInputSource(const XMLByte* const, const unsigned int, const XMLCh* const,
+%ignore MemBufInputSource(const XMLByte* const, const XMLSize_t, const XMLCh* const);
+%ignore MemBufInputSource(const XMLByte* const, const XMLSize_t, const XMLCh* const,
const bool, MemoryManager *const);
%ignore Wrapper4InputSource(InputSource* const);
%ignore Wrapper4InputSource(InputSource* const, const bool
Modified: xerces/c/trunk/swig/interfaces/input-source.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/input-source.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/input-source.i (original)
+++ xerces/c/trunk/swig/interfaces/input-source.i Tue Mar 11 20:41:08 2008
@@ -1,4 +1,8 @@
%include "xercesc/sax/InputSource.hpp"
+
+%include "dom/DOMLSInput.i"
+%include "framework/Wrapper4DOMLSInput.i"
+
%include "xercesc/framework/LocalFileInputSource.hpp"
%include "xercesc/framework/StdInInputSource.hpp"
%include "xercesc/framework/URLInputSource.hpp"
Modified: xerces/c/trunk/swig/interfaces/io-includes.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/io-includes.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/io-includes.i (original)
+++ xerces/c/trunk/swig/interfaces/io-includes.i Tue Mar 11 20:41:08 2008
@@ -2,6 +2,9 @@
#include "xercesc/sax/InputSource.hpp"
+#include "xercesc/dom/DOMLSInput.hpp"
+#include "xercesc/framework/Wrapper4DOMLSInput.hpp"
+
#include "xercesc/framework/LocalFileInputSource.hpp"
#include "xercesc/framework/MemBufInputSource.hpp"
#include "xercesc/framework/StdInInputSource.hpp"
Modified: xerces/c/trunk/swig/interfaces/typemaps-dom.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/typemaps-dom.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/typemaps-dom.i (original)
+++ xerces/c/trunk/swig/interfaces/typemaps-dom.i Tue Mar 11 20:41:08 2008
@@ -19,25 +19,25 @@
%extend XERCES_CPP_NAMESPACE::DOMConfiguration {
%typemap(in) const void* value (void *argp, int res) {
if (XMLString::compareIStringASCII(arg2, XMLUni::fgDOMErrorHandler) == 0) {
- res = SWIG_ConvertPtr($input, &argp,SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMErrorHandler, 0 | 0 );
+ res = SWIG_ConvertPtr($input, &argp, $descriptor(DOMErrorHandler*), 0 | 0 );
if (!SWIG_IsOK(res)) {
- SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "XERCES_CPP_NAMESPACE::DOMErrorHandler const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "DOMErrorHandler const *""'");
}
- $1 = reinterpret_cast< XERCES_CPP_NAMESPACE::DOMErrorHandler * >(argp);
+ $1 = reinterpret_cast< DOMErrorHandler * >(argp);
} else if (XMLString::compareIStringASCII(arg2, XMLUni::fgXercesEntityResolver) == 0) {
- res = SWIG_ConvertPtr($input, &argp,SWIGTYPE_p_XERCES_CPP_NAMESPACE__XMLEntityResolver, 0 | 0 );
+ res = SWIG_ConvertPtr($input, &argp, $descriptor(XMLEntityResolver*), 0 | 0 );
if (!SWIG_IsOK(res)) {
- SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "XERCES_CPP_NAMESPACE::XMLEntityResolver const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "XMLEntityResolver const *""'");
}
- $1 = reinterpret_cast< XERCES_CPP_NAMESPACE::XMLEntityResolver * >(argp);
+ $1 = reinterpret_cast< XMLEntityResolver * >(argp);
} else if (XMLString::compareIStringASCII(arg2, XMLUni::fgDOMResourceResolver) == 0) {
- res = SWIG_ConvertPtr($input, &argp,SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMLSResourceResolver, 0 | 0 );
+ res = SWIG_ConvertPtr($input, &argp, $descriptor(DOMLSResourceResolver*), 0 | 0 );
if (!SWIG_IsOK(res)) {
- SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "XERCES_CPP_NAMESPACE::DOMLSResourceResolver const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "DOMLSResourceResolver const *""'");
}
- $1 = reinterpret_cast< XERCES_CPP_NAMESPACE::DOMLSResourceResolver * >(argp);
+ $1 = reinterpret_cast< DOMLSResourceResolver * >(argp);
} else {
$1 = UTF8_TRANSCODER->Local2XMLString($input);
@@ -46,11 +46,11 @@
%typemap(out) const void* {
if (XMLString::compareIStringASCII(arg2, XMLUni::fgDOMErrorHandler) == 0) {
- $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMErrorHandler, 0 | SWIG_SHADOW);
+ $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), $descriptor(DOMErrorHandler*), 0 | SWIG_SHADOW);
} else if (XMLString::compareIStringASCII(arg2, XMLUni::fgXercesEntityResolver) == 0) {
- $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_XERCES_CPP_NAMESPACE__XMLEntityResolver, 0 | SWIG_SHADOW);
+ $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), $descriptor(XMLEntityResolver*), 0 | SWIG_SHADOW);
} else if (XMLString::compareIStringASCII(arg2, XMLUni::fgDOMResourceResolver) == 0) {
- $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMLSResourceResolver, 0 | SWIG_SHADOW);
+ $result = SWIG_NewPointerObj(SWIG_as_voidptr($1), $descriptor(DOMLSResourceResolver*), 0 | SWIG_SHADOW);
} else if (isDOMConfigXMLChParameter(arg2)) {
$result = UTF8_TRANSCODER->XMLString2Local((XMLCh*)$1);
} else {
@@ -286,9 +286,7 @@
%}
-%typecheck(SWIG_TYPECHECK_VOIDPTR)
-void*, const void*
-{
+%typemap(typecheck,precedence=SWIG_TYPECHECK_VOIDPTR,noblock=1) void*, const void* {
int res = -1;
XMLCh *name = UTF8_TRANSCODER->Local2XMLString(ST(1));
if (XMLString::compareIStringASCII(name, XMLUni::fgDOMErrorHandler) == 0) {
@@ -330,45 +328,14 @@
if (*nptr == NULL) {
return NULL;
}
- if (dynamic_cast< XERCES_CPP_NAMESPACE::MemBufFormatTarget * >(*nptr)) {
+ if (dynamic_cast< MemBufFormatTarget * >(*nptr)) {
return SWIGTYPE_p_XERCES_CPP_NAMESPACE__MemBufFormatTarget;
}
- if (dynamic_cast< XERCES_CPP_NAMESPACE::LocalFileFormatTarget * >(*nptr)) {
+ if (dynamic_cast< LocalFileFormatTarget * >(*nptr)) {
return SWIGTYPE_p_XERCES_CPP_NAMESPACE__LocalFileFormatTarget;
}
- if (dynamic_cast< XERCES_CPP_NAMESPACE::StdOutFormatTarget * >(*nptr)) {
+ if (dynamic_cast< StdOutFormatTarget * >(*nptr)) {
return SWIGTYPE_p_XERCES_CPP_NAMESPACE__StdOutFormatTarget;
- }
- return NULL;
-}
-%}
-
-%typemap(out) XERCES_CPP_NAMESPACE::InputSource * = SWIGTYPE *DYNAMIC;
-
-DYNAMIC_CAST(SWIGTYPE_p_XERCES_CPP_NAMESPACE__InputSource, InputSource_dynamic_cast);
-
-%{
-static swig_type_info *
-InputSource_dynamic_cast(void **ptr) {
- InputSource **nptr = (InputSource **) ptr;
- if (*nptr == NULL) {
- return NULL;
- }
-
- if (dynamic_cast< XERCES_CPP_NAMESPACE::Wrapper4DOMLSInput * >(*nptr)) {
- return SWIGTYPE_p_XERCES_CPP_NAMESPACE__Wrapper4DOMLSInput;
- }
- if (dynamic_cast< XERCES_CPP_NAMESPACE::MemBufInputSource * >(*nptr)) {
- return SWIGTYPE_p_XERCES_CPP_NAMESPACE__MemBufInputSource;
- }
- if (dynamic_cast< XERCES_CPP_NAMESPACE::LocalFileInputSource * >(*nptr)) {
- return SWIGTYPE_p_XERCES_CPP_NAMESPACE__LocalFileInputSource;
- }
- if (dynamic_cast< XERCES_CPP_NAMESPACE::URLInputSource * >(*nptr)) {
- return SWIGTYPE_p_XERCES_CPP_NAMESPACE__URLInputSource;
- }
- if (dynamic_cast< XERCES_CPP_NAMESPACE::StdInInputSource * >(*nptr)) {
- return SWIGTYPE_p_XERCES_CPP_NAMESPACE__StdInInputSource;
}
return NULL;
}
Modified: xerces/c/trunk/swig/interfaces/typemaps-io.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/typemaps-io.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/typemaps-io.i (original)
+++ xerces/c/trunk/swig/interfaces/typemaps-io.i Tue Mar 11 20:41:08 2008
@@ -31,3 +31,34 @@
// and Wrapper4DOMInputSource
%typemap(in,numinputs=0) const bool adoptBuffer "$1 = true;" // for MemBufInputSource
+%typemap(out) XERCES_CPP_NAMESPACE::InputSource * = SWIGTYPE *DYNAMIC;
+
+DYNAMIC_CAST(SWIGTYPE_p_XERCES_CPP_NAMESPACE__InputSource, InputSource_dynamic_cast);
+
+%{
+static swig_type_info *
+InputSource_dynamic_cast(void **ptr) {
+ InputSource **nptr = (InputSource **) ptr;
+ if (*nptr == NULL) {
+ return NULL;
+ }
+
+ if (dynamic_cast< XERCES_CPP_NAMESPACE::Wrapper4DOMLSInput * >(*nptr)) {
+ return SWIGTYPE_p_XERCES_CPP_NAMESPACE__Wrapper4DOMLSInput;
+ }
+ if (dynamic_cast< XERCES_CPP_NAMESPACE::MemBufInputSource * >(*nptr)) {
+ return SWIGTYPE_p_XERCES_CPP_NAMESPACE__MemBufInputSource;
+ }
+ if (dynamic_cast< XERCES_CPP_NAMESPACE::LocalFileInputSource * >(*nptr)) {
+ return SWIGTYPE_p_XERCES_CPP_NAMESPACE__LocalFileInputSource;
+ }
+ if (dynamic_cast< XERCES_CPP_NAMESPACE::URLInputSource * >(*nptr)) {
+ return SWIGTYPE_p_XERCES_CPP_NAMESPACE__URLInputSource;
+ }
+ if (dynamic_cast< XERCES_CPP_NAMESPACE::StdInInputSource * >(*nptr)) {
+ return SWIGTYPE_p_XERCES_CPP_NAMESPACE__StdInInputSource;
+ }
+ return NULL;
+}
+%}
+
Modified: xerces/c/trunk/swig/interfaces/typemaps-xmlch.i
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/interfaces/typemaps-xmlch.i?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/interfaces/typemaps-xmlch.i (original)
+++ xerces/c/trunk/swig/interfaces/typemaps-xmlch.i Tue Mar 11 20:41:08 2008
@@ -17,41 +17,13 @@
// in typemap
%typemap(in) XMLCh * %{
- // we convert *everything* into a string *including* undef
+ // we convert *everything* into a string *including* null/undef
$1 = UTF8_TRANSCODER->Local2XMLString($input);
%}
%typemap(freearg) XMLCh * %{
delete[] $1;
%}
-
-%exception XERCES_CPP_NAMESPACE::DOMLSInput::~DOMLSInput %{
- try
- {
- XMLCh *current = (XMLCh *)(arg1)->getStringData();
- if (current != NULL) {
- delete [] current;
- }
- $action
- }
- CATCH_DOM_EXCEPTION
-%}
-
-%exception XERCES_CPP_NAMESPACE::DOMLSInput::setStringData %{
- try
- {
- XMLCh *current = (XMLCh *)(arg1)->getStringData();
- if (current != NULL) {
- delete [] current;
- }
- $action
- }
- CATCH_DOM_EXCEPTION
-%}
-
-%extend XERCES_CPP_NAMESPACE::DOMLSInput {
-%typemap(freearg) const XMLCh* data ""
-}
// out typemap
%typemap(out) XMLCh * %{
Modified: xerces/c/trunk/swig/perl/ANNOUNCE
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/ANNOUNCE?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/ANNOUNCE (original)
+++ xerces/c/trunk/swig/perl/ANNOUNCE Tue Mar 11 20:41:08 2008
@@ -1,4 +1,4 @@
-
+
==============================================================================
Release of version 2.6.0-2 of XML::Xerces
==============================================================================
Modified: xerces/c/trunk/swig/perl/DOM/DOM.pm
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/DOM/DOM.pm?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/DOM/DOM.pm (original)
+++ xerces/c/trunk/swig/perl/DOM/DOM.pm Tue Mar 11 20:41:08 2008
@@ -248,13 +248,46 @@
############# Class : XML::Xerces::PerlNodeFilter ##############
package XML::Xerces::PerlNodeFilter;
use vars qw(@ISA);
-@ISA = qw(XML::Xerces::DOMNodeFilter);
+@ISA = qw(XML::Xerces::DOMNodeFilter
+ XML::Xerces::DOMLSParserFilter
+ XML::Xerces::DOMLSSerializerFilter);
+
sub new {
my $class = shift;
+
+ # support copy constructor syntax
+ $class = ref($class) if ref($class);
+
return bless {}, $class;
}
sub acceptNode {
+ my $self = shift;
+ return $self->accept_node(@_);
+}
+
+sub getWhatToShow {
+ my $self = shift;
+ return $self->get_what_to_show();
+}
+
+sub startElement {
+ my $self = shift;
+ return $self->start_element(@_);
+}
+
+#
+# support alternate Perl-friendly syntax
+#
+sub accept_node {
+ return undef;
+}
+
+sub get_what_to_whow {
+ return undef;
+}
+
+sub start_element {
return undef;
}
@@ -267,10 +300,22 @@
sub new {
my $class = shift;
+
+ # support copy constructor syntax
+ $class = ref($class) if ref($class);
+
return bless {}, $class;
}
sub handleError {
+ my $self = shift;
+ return $self->handle_error(@_);
+}
+
+#
+# support alternate Perl-friendly syntax
+#
+sub handle_error {
my $severity = $_[1]->getSeverity;
my $msg = $_[1]->getMessage;
croak(<<EOT);
@@ -1878,38 +1923,6 @@
}
-############# Class : XML::Xerces::DOMLSResourceResolver ##############
-
-package XML::Xerces::DOMLSResourceResolver;
-use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
-@ISA = qw( XML::Xerces );
-%OWNER = ();
-%ITERATORS = ();
-sub DESTROY {
- return unless $_[0]->isa('HASH');
- my $self = tied(%{$_[0]});
- return unless defined $self;
- delete $ITERATORS{$self};
- if (exists $OWNER{$self}) {
- XML::Xercesc::delete_DOMLSResourceResolver($self);
- delete $OWNER{$self};
- }
-}
-
-*resolveResource = *XML::Xercesc::DOMLSResourceResolver_resolveResource;
-sub DISOWN {
- my $self = shift;
- my $ptr = tied(%$self);
- delete $OWNER{$ptr};
-}
-
-sub ACQUIRE {
- my $self = shift;
- my $ptr = tied(%$self);
- $OWNER{$ptr} = 1;
-}
-
-
############# Class : XML::Xerces::DOMLSOutput ##############
package XML::Xerces::DOMLSOutput;
@@ -1974,11 +1987,6 @@
}
}
-*getMessage = *XML::Xercesc::DOMLSException_getMessage;
-*swig_code_get = *XML::Xercesc::DOMLSException_code_get;
-*swig_code_set = *XML::Xercesc::DOMLSException_code_set;
-*swig_msg_get = *XML::Xercesc::DOMLSException_msg_get;
-*swig_msg_set = *XML::Xercesc::DOMLSException_msg_set;
sub DISOWN {
my $self = shift;
my $ptr = tied(%$self);
@@ -2119,11 +2127,13 @@
*getStandardUriConformant = *XML::Xercesc::AbstractDOMParser_getStandardUriConformant;
*getPSVIHandler = *XML::Xercesc::AbstractDOMParser_getPSVIHandler;
*getCreateSchemaInfo = *XML::Xercesc::AbstractDOMParser_getCreateSchemaInfo;
+*getDoXInclude = *XML::Xercesc::AbstractDOMParser_getDoXInclude;
*getGenerateSyntheticAnnotations = *XML::Xercesc::AbstractDOMParser_getGenerateSyntheticAnnotations;
*getValidateAnnotations = *XML::Xercesc::AbstractDOMParser_getValidateAnnotations;
*getIgnoreAnnotations = *XML::Xercesc::AbstractDOMParser_getIgnoreAnnotations;
*getDisableDefaultEntityResolution = *XML::Xercesc::AbstractDOMParser_getDisableDefaultEntityResolution;
*getSkipDTDValidation = *XML::Xercesc::AbstractDOMParser_getSkipDTDValidation;
+*getHandleMultipleImports = *XML::Xercesc::AbstractDOMParser_getHandleMultipleImports;
*setGenerateSyntheticAnnotations = *XML::Xercesc::AbstractDOMParser_setGenerateSyntheticAnnotations;
*setValidateAnnotations = *XML::Xercesc::AbstractDOMParser_setValidateAnnotations;
*setDoNamespaces = *XML::Xercesc::AbstractDOMParser_setDoNamespaces;
@@ -2146,9 +2156,11 @@
*useImplementation = *XML::Xercesc::AbstractDOMParser_useImplementation;
*setPSVIHandler = *XML::Xercesc::AbstractDOMParser_setPSVIHandler;
*setCreateSchemaInfo = *XML::Xercesc::AbstractDOMParser_setCreateSchemaInfo;
+*setDoXInclude = *XML::Xercesc::AbstractDOMParser_setDoXInclude;
*setIgnoreAnnotations = *XML::Xercesc::AbstractDOMParser_setIgnoreAnnotations;
*setDisableDefaultEntityResolution = *XML::Xercesc::AbstractDOMParser_setDisableDefaultEntityResolution;
*setSkipDTDValidation = *XML::Xercesc::AbstractDOMParser_setSkipDTDValidation;
+*setHandleMultipleImports = *XML::Xercesc::AbstractDOMParser_setHandleMultipleImports;
*parse = *XML::Xercesc::AbstractDOMParser_parse;
*parseFirst = *XML::Xercesc::AbstractDOMParser_parseFirst;
*parseNext = *XML::Xercesc::AbstractDOMParser_parseNext;
@@ -2169,52 +2181,6 @@
}
-############# Class : XML::Xerces::DOMLSInput ##############
-
-package XML::Xerces::DOMLSInput;
-use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
-@ISA = qw( XML::Xerces );
-%OWNER = ();
-%ITERATORS = ();
-sub DESTROY {
- return unless $_[0]->isa('HASH');
- my $self = tied(%{$_[0]});
- return unless defined $self;
- delete $ITERATORS{$self};
- if (exists $OWNER{$self}) {
- XML::Xercesc::delete_DOMLSInput($self);
- delete $OWNER{$self};
- }
-}
-
-*getStringData = *XML::Xercesc::DOMLSInput_getStringData;
-*getByteStream = *XML::Xercesc::DOMLSInput_getByteStream;
-*getEncoding = *XML::Xercesc::DOMLSInput_getEncoding;
-*getPublicId = *XML::Xercesc::DOMLSInput_getPublicId;
-*getSystemId = *XML::Xercesc::DOMLSInput_getSystemId;
-*getBaseURI = *XML::Xercesc::DOMLSInput_getBaseURI;
-*setStringData = *XML::Xercesc::DOMLSInput_setStringData;
-*setByteStream = *XML::Xercesc::DOMLSInput_setByteStream;
-*setEncoding = *XML::Xercesc::DOMLSInput_setEncoding;
-*setPublicId = *XML::Xercesc::DOMLSInput_setPublicId;
-*setSystemId = *XML::Xercesc::DOMLSInput_setSystemId;
-*setBaseURI = *XML::Xercesc::DOMLSInput_setBaseURI;
-*setIssueFatalErrorIfNotFound = *XML::Xercesc::DOMLSInput_setIssueFatalErrorIfNotFound;
-*getIssueFatalErrorIfNotFound = *XML::Xercesc::DOMLSInput_getIssueFatalErrorIfNotFound;
-*release = *XML::Xercesc::DOMLSInput_release;
-sub DISOWN {
- my $self = shift;
- my $ptr = tied(%$self);
- delete $OWNER{$ptr};
-}
-
-sub ACQUIRE {
- my $self = shift;
- my $ptr = tied(%$self);
- $OWNER{$ptr} = 1;
-}
-
-
############# Class : XML::Xerces::Wrapper4InputSource ##############
package XML::Xerces::Wrapper4InputSource;
@@ -2270,52 +2236,6 @@
}
-############# Class : XML::Xerces::Wrapper4DOMLSInput ##############
-
-package XML::Xerces::Wrapper4DOMLSInput;
-use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
-@ISA = qw( XML::Xerces::InputSource XML::Xerces );
-%OWNER = ();
-%ITERATORS = ();
-sub new {
- my $pkg = shift;
- my $self = XML::Xercesc::new_Wrapper4DOMLSInput(@_);
- bless $self, $pkg if defined($self);
-}
-
-sub DESTROY {
- return unless $_[0]->isa('HASH');
- my $self = tied(%{$_[0]});
- return unless defined $self;
- delete $ITERATORS{$self};
- if (exists $OWNER{$self}) {
- XML::Xercesc::delete_Wrapper4DOMLSInput($self);
- delete $OWNER{$self};
- }
-}
-
-*makeStream = *XML::Xercesc::Wrapper4DOMLSInput_makeStream;
-*getEncoding = *XML::Xercesc::Wrapper4DOMLSInput_getEncoding;
-*getPublicId = *XML::Xercesc::Wrapper4DOMLSInput_getPublicId;
-*getSystemId = *XML::Xercesc::Wrapper4DOMLSInput_getSystemId;
-*getIssueFatalErrorIfNotFound = *XML::Xercesc::Wrapper4DOMLSInput_getIssueFatalErrorIfNotFound;
-*setEncoding = *XML::Xercesc::Wrapper4DOMLSInput_setEncoding;
-*setPublicId = *XML::Xercesc::Wrapper4DOMLSInput_setPublicId;
-*setSystemId = *XML::Xercesc::Wrapper4DOMLSInput_setSystemId;
-*setIssueFatalErrorIfNotFound = *XML::Xercesc::Wrapper4DOMLSInput_setIssueFatalErrorIfNotFound;
-sub DISOWN {
- my $self = shift;
- my $ptr = tied(%$self);
- delete $OWNER{$ptr};
-}
-
-sub ACQUIRE {
- my $self = shift;
- my $ptr = tied(%$self);
- $OWNER{$ptr} = 1;
-}
-
-
############# Class : XML::Xerces::DOMLSParserFilter ##############
package XML::Xerces::DOMLSParserFilter;
@@ -2489,7 +2409,7 @@
package XML::Xerces::PerlNodeFilterCallbackHandler;
use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
-@ISA = qw( XML::Xerces::DOMNodeFilter XML::Xerces::PerlCallbackHandler XML::Xerces );
+@ISA = qw( XML::Xerces::DOMLSSerializerFilter XML::Xerces::DOMLSParserFilter XML::Xerces::PerlCallbackHandler XML::Xerces );
%OWNER = ();
%ITERATORS = ();
sub new {
@@ -2510,6 +2430,7 @@
}
*type = *XML::Xercesc::PerlNodeFilterCallbackHandler_type;
+*getWhatToShow = *XML::Xercesc::PerlNodeFilterCallbackHandler_getWhatToShow;
*acceptNode = *XML::Xercesc::PerlNodeFilterCallbackHandler_acceptNode;
sub DISOWN {
my $self = shift;
@@ -2528,7 +2449,7 @@
package XML::Xerces::PerlDOMCallbackHandler;
use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
-@ISA = qw( XML::Xerces::DOMErrorHandler XML::Xerces::DOMLSResourceResolver XML::Xerces::PerlCallbackHandler XML::Xerces );
+@ISA = qw( XML::Xerces::DOMErrorHandler XML::Xerces::PerlCallbackHandler XML::Xerces );
%OWNER = ();
%ITERATORS = ();
sub new {
Modified: xerces/c/trunk/swig/perl/DOM/Makefile.PL
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/DOM/Makefile.PL?rev=636188&r1=636187&r2=636188&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/DOM/Makefile.PL (original)
+++ xerces/c/trunk/swig/perl/DOM/Makefile.PL Tue Mar 11 20:41:08 2008
@@ -57,7 +57,7 @@
'NAME' => 'XML::Xerces::DOM',
'INC' => $INCLUDES,
'LIBS' => [$LIBS],
- 'MYEXTLIB' => "$TRANSCODER_LIB $HANDLER_LIB",
+ 'MYEXTLIB' => $MYEXTLIB,
'OBJECT' => 'Xerces_DOM$(OBJ_EXT)',
'CCFLAGS' => $CFLAGS,
'CC' => $CXX,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org