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 2001/11/03 06:09:16 UTC

cvs commit: xml-xerces/perl Xerces.i

jasons      01/11/02 21:09:15

  Modified:    perl     Xerces.i
  Log:
  	* Xerces.i (Repository):
  	removed #includes for iostream stuff
  	Added #include for TransService.hpp
  	Added static UTF-8 transcoder
  	Added debug flag for UTF-8 transcoding
  	Converted all all XMLURL constructors to use XMLCh* and not char*
  	Added forgotten XMLURL ctor
  	ignored duplicate QName methods
  	now properly ignore operators with DOM_NullPtr
  	Added $VERSION to Xerces.pm
  
  Revision  Changes    Path
  1.13      +40 -12    xml-xerces/perl/Xerces.i
  
  Index: Xerces.i
  ===================================================================
  RCS file: /home/cvs/xml-xerces/perl/Xerces.i,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Xerces.i	2001/10/12 04:32:47	1.12
  +++ Xerces.i	2001/11/03 05:09:15	1.13
  @@ -1,8 +1,6 @@
   %module Xerces
   %{
   #include "stdio.h"
  -#include "strstream.h"
  -#include "iostream.h"
   #include "string.h"
   #include "sax/InputSource.hpp"
   #include "sax/SAXException.hpp"
  @@ -16,6 +14,7 @@
   #include "sax2/SAX2XMLReader.hpp"
   #include "sax2/XMLReaderFactory.hpp"
   #include "util/PlatformUtils.hpp"
  +#include "util/TransService.hpp"
   #include "util/XMLString.hpp"
   #include "util/XMLUri.hpp"
   #include "util/QName.hpp"
  @@ -37,8 +36,24 @@
   #include "PerlEntityResolverHandler.i"
   #include "PerlDocumentCallbackHandler.hpp"
   #include "PerlContentCallbackHandler.hpp"
  +
  +
  +// we initialize the static UTF-8 transcoding info
  +// these are used by the typemaps to convert between
  +// Xerces internal UTF-16 and Perl's internal UTF-8
  +static XMLCh* UTF8_ENCODING = NULL; 
  +static XMLTranscoder* UTF8_TRANSCODER  = NULL;
  +
  +static XMLCh* ISO_8859_1_ENCODING = NULL; 
  +static XMLTranscoder* ISO_8859_1_TRANSCODER  = NULL;
  +
  +static bool DEBUG_UTF8_OUT = 0;
  +static bool DEBUG_UTF8_IN = 0;
   %}
   
  +bool DEBUG_UTF8_OUT;
  +bool DEBUG_UTF8_IN;
  +
   /**************/
   /*            */
   /*  TYPEMAPS  */
  @@ -107,27 +122,36 @@
   %rename(operator_assignment) operator=;
   %rename(operator_equal_to) operator==;
   %rename(operator_not_equal_to) operator!=;
  +
  +// both of these static variables cause trouble
  +// the transcoding service is only useful to C++ anyway.
   %ignore XMLPlatformUtils::fgTransService;
   %ignore XMLPlatformUtils::fgNetAccessor;
  +
  +%ignore openFile(const XMLCh* const);
   %include "Xerces_headers/util/PlatformUtils.hpp"
   
   /*
    * Utility Classes
    */
  -%ignore XMLURL::XMLURL(const   XMLCh* const, const XMLCh* const);
  -%rename(XMLURL__constructor__base) XMLURL::XMLURL(const   XMLCh* const, const char* const);
  -%rename(XMLURL__constructor__text) XMLURL::XMLURL(const char* const);
  +%rename(XMLURL__constructor__base) XMLURL::XMLURL(const   XMLCh* const, const XMLCh* const);
  +%rename(XMLURL__constructor__text) XMLURL::XMLURL(const XMLCh* const);
   %rename(XMLURL__constructor__copy) XMLURL::XMLURL(const XMLURL&);
  +%rename(XMLURL__constructor__url_base) XMLURL::XMLURL(const XMLURL&,const XMLCh* const);
   %rename(makeRelativeTo__overload__XMLURL) XMLURL::makeRelativeTo(const XMLURL&);
   %rename(setURL__overload__string) XMLURL::setURL(const XMLCh* const,const XMLCh* const);
   %rename(setURL__overload__XMLURL) XMLURL::setURL(const XMLURL&,const XMLCh* const);
  -%ignore XMLURL::XMLURL(const XMLCh* const);
  -%ignore XMLURL::XMLURL(const XMLCh&, const XMLCh* const);
  -%ignore XMLURL::XMLURL(const XMLCh&, const char* 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 "util/XMLURL.hpp"
   
   %rename(XMLUri__constructor__uri) XMLUri::XMLUri(const XMLCh* const);
   %include "Xerces_headers/util/XMLUri.hpp"
  +%ignore getPrefix() const;
  +%ignore getLocalPart() const;
  +%ignore getURI() const;
  +%ignore getRawName() const;
   %include "util/QName.hpp"
   
   // although not really necessary for Perl, why not?
  @@ -325,9 +349,12 @@
   }
   
   // we ignore the nulling operator= and the != NULL operator
  -%ignore operator_assignment(const DOM_NullPtr *);
  -%ignore operator_not_equal_to(const DOM_NullPtr *);
  - 
  +%ignore operator= (DOM_NullPtr *);
  +%ignore operator!= (DOM_NullPtr *);
  +// %rename(operator_assignment) operator= ;
  +// %rename(operator_equal_to) operator== ;
  +// %rename(operator_not_equal_to) operator!= ;
  +
   %include "dom/DOMString.hpp"
   %include "dom/DOM_Node.hpp"
   %rename(DOM_Attr__constructor__copy) DOM_Attr(const DOM_Attr&);
  @@ -476,4 +503,5 @@
   %include "parsers/IDOMParser.hpp"
   
   /* %pragma(perl5) include="Xerces-extra.pm" */
  -
  +%pragma(perl5) code="package XML::Xerces; 
  +$VERSION = q[1.5.2_0];";
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org