Gentoo Attachment #169168 for bug #242218

View | Details | Raw Unified
Collapse All | Expand All

(-) src/xalanc/PlatformSupport/AttributesImpl.cpp (-12 / +57 lines)

Lines 109-115	Link Here

		// until we're done.

		// until we're done.

		AttributesVectorType		tempVector(getMemoryManager());

		AttributesVectorType		tempVector(getMemoryManager());

		const unsigned int	theLength = theRHS.getLength();

		const XalanSize_t	theLength = theRHS.getLength();

		if (theLength > 0)

		if (theLength > 0)

Lines 167-178	Link Here

		// safe and don't need any try blocks.

		// safe and don't need any try blocks.

		AttributesImpl	theTempList(getMemoryManager());

		AttributesImpl	theTempList(getMemoryManager());

		const unsigned int	theLength = theRHS.getLength();

		const XalanSize_t	theLength = theRHS.getLength();

		theTempList.reserve(theLength);

		theTempList.reserve(theLength);

		// Add each attribute.

		// Add each attribute.

		for(unsigned int i = 0; i < theLength; i++)

		for(XalanSize_t i = 0; i < theLength; i++)

			theTempList.addAttribute(

			theTempList.addAttribute(

					theRHS.getURI(i),

					theRHS.getURI(i),

Lines 192-198	Link Here

unsigned int

XalanSize_t

AttributesImpl::getLength() const

AttributesImpl::getLength() const

	return unsigned(m_attributesVector.size());

	return unsigned(m_attributesVector.size());

Lines 201-207	Link Here

const XMLCh*

const XMLCh*

AttributesImpl::getURI(const unsigned int index) const

AttributesImpl::getURI(const XalanSize_t    index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 211-217	Link Here

const XMLCh*

const XMLCh*

AttributesImpl::getLocalName(const unsigned int index) const

AttributesImpl::getLocalName(const XalanSize_t  index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 221-227	Link Here

const XMLCh*

const XMLCh*

AttributesImpl::getQName(const unsigned int		index) const

AttributesImpl::getQName(const XalanSize_t  index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 231-237	Link Here

const XMLCh*

const XMLCh*

AttributesImpl::getType(const unsigned int	index) const

AttributesImpl::getType(const XalanSize_t   index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 241-247	Link Here

const XMLCh*

const XMLCh*

AttributesImpl::getValue(const unsigned int		index) const

AttributesImpl::getValue(const XalanSize_t  index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 380-397	Link Here

bool

AttributesImpl::getIndex(

            const XMLCh* const  uri,

            const XMLCh* const  localPart,

            XalanSize_t&        index) const

    const int   tempIndex =

        getIndex(uri, localPart);

    if (tempIndex == -1)

        return false;

    else

        index = tempIndex;

        return true;

int

int

AttributesImpl::getIndex(

AttributesImpl::getIndex(

			const XMLCh* const	uri,

			const XMLCh* const	uri,

			const XMLCh* const	localName) const

			const XMLCh* const	localPart) const

	assert(uri != 0 && localName != 0);

	assert(uri != 0 && localPart != 0);

	const AttributesVectorType::const_iterator	i =

	const AttributesVectorType::const_iterator	i =

		XALAN_STD_QUALIFIER find_if(

		XALAN_STD_QUALIFIER find_if(

			m_attributesVector.begin(),

			m_attributesVector.begin(),

			m_attributesVector.end(),

			m_attributesVector.end(),

			URIAndLocalNameCompareFunctor(uri, localName));

			URIAndLocalNameCompareFunctor(uri, localPart));

	if (i != m_attributesVector.end())

	if (i != m_attributesVector.end())

Lines 407-412	Link Here

bool

AttributesImpl::getIndex(

            const XMLCh* const  qName,

            XalanSize_t&        index) const

    const int   tempIndex =

        getIndex(qName);

    if (tempIndex == -1)

        return false;

    else

        index = tempIndex;

        return true;

int

int

AttributesImpl::getIndex(const XMLCh* const		qname) const

AttributesImpl::getIndex(const XMLCh* const		qname) const

(-) src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (-8 / +12 lines)

Lines 43-55	Link Here

NamedNodeMapAttributeList::NamedNodeMapAttributeList(const XalanNamedNodeMap&	theMap,

NamedNodeMapAttributeList::NamedNodeMapAttributeList(

                                                     MemoryManagerType&         theManager) :

            const XalanNamedNodeMap&    theMap,

            MemoryManagerType&          theManager) :

	ParentType(),

	ParentType(),

	m_nodeMap(theMap),

	m_nodeMap(theMap),

	m_lastIndex(theMap.getLength() - 1),

	m_lastIndex(theMap.getLength() - 1),

    m_memoryManager(theManager)

    m_memoryManager(theManager)

    assert(theMap.getLength() != 0);

Lines 60-66	Link Here

unsigned int

XalanSize_t

NamedNodeMapAttributeList::getLength() const

NamedNodeMapAttributeList::getLength() const

	return m_nodeMap.getLength();

	return m_nodeMap.getLength();

Lines 69-75	Link Here

const XMLCh*

const XMLCh*

NamedNodeMapAttributeList::getName(const unsigned int index) const

NamedNodeMapAttributeList::getName(const XalanSize_t    index) const

	const XalanNode* const	theAttribute = m_nodeMap.item(m_lastIndex - index);

	const XalanNode* const	theAttribute = m_nodeMap.item(m_lastIndex - index);

	assert(theAttribute != 0);

	assert(theAttribute != 0);

Lines 80-86	Link Here

const XMLCh*

const XMLCh*

NamedNodeMapAttributeList::getType(const unsigned int /* index */) const

NamedNodeMapAttributeList::getType(const XalanSize_t    /* index */) const

	assert(length(s_typeString) > 0);

	assert(length(s_typeString) > 0);

Lines 90-98	Link Here

const XMLCh*

const XMLCh*

NamedNodeMapAttributeList::getValue(const unsigned int index) const

NamedNodeMapAttributeList::getValue(const XalanSize_t   index) const

	const XalanNode* const	theAttribute = m_nodeMap.item(m_lastIndex - index);

    assert(index <= m_lastIndex);

    const XalanNode* const	theAttribute = m_nodeMap.item(m_lastIndex - index);

	assert(theAttribute != 0);

	assert(theAttribute != 0);

	return c_wstr(theAttribute->getNodeValue());

	return c_wstr(theAttribute->getNodeValue());

Lines 111-117	Link Here

const XMLCh*

const XMLCh*

NamedNodeMapAttributeList::getValue(const XMLCh* const      name) const

NamedNodeMapAttributeList::getValue(const XMLCh* const  name) const

	const XalanNode*	theNode = m_nodeMap.getNamedItem(XalanDOMString(name, m_memoryManager));

	const XalanNode*	theNode = m_nodeMap.getNamedItem(XalanDOMString(name, m_memoryManager));

(-) src/xalanc/PlatformSupport/StdBinInputStream.cpp (-3 / +11 lines)

Lines 43-49	Link Here

unsigned int

XalanFilePos

StdBinInputStream::curPos() const

StdBinInputStream::curPos() const

	return m_stream.tellg();

	return m_stream.tellg();

Lines 51-60	Link Here

unsigned int

XalanSize_t

StdBinInputStream::readBytes(

StdBinInputStream::readBytes(

			XMLByte* const      toFill,

			XMLByte* const      toFill,

			const unsigned int	maxToRead)

			const XalanSize_t	maxToRead)

	assert(sizeof(XMLByte) == sizeof(char));

	assert(sizeof(XMLByte) == sizeof(char));

Lines 80-83	Link Here

const XalanDOMChar*

StdBinInputStream::getContentType() const

    return 0;

XALAN_CPP_NAMESPACE_END

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/PlatformSupport/AttributeListImpl.hpp (-5 / +5 lines)

Lines 73-89	Link Here

	// These are inherited from AttributeList

	// These are inherited from AttributeList

    virtual unsigned int

    virtual XalanSize_t

	getLength() const;

	getLength() const;

    virtual const XMLCh*

    virtual const XMLCh*

	getName(const unsigned int index) const;

	getName(const XalanSize_t index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getType(const unsigned int index) const;

	getType(const XalanSize_t index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getValue(const unsigned int index) const;

	getValue(const XalanSize_t index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getType(const XMLCh* const name) const;

	getType(const XMLCh* const name) const;

Lines 141-147	Link Here

	 * @param theCount The number to reserve

	 * @param theCount The number to reserve

*/

*/

	void

	void

	reserve(unsigned int	theCount)

	reserve(XalanSize_t     theCount)

		m_AttributeVector.reserve(theCount);

		m_AttributeVector.reserve(theCount);

(-) src/xalanc/PlatformSupport/XSLException.hpp (-5 / +2 lines)

Lines 40-47	Link Here

public:

public:

	typedef XalanLocator::size_type					size_type;

/**

/**

	 * Constructor

	 * Constructor

Lines 119-125	Link Here

	 * @return the line number

	 * @return the line number

*/

*/

	size_type

	XalanFileLoc

	getLineNumber() const

	getLineNumber() const

		return m_lineNumber;

		return m_lineNumber;

Lines 130-142	Link Here

	 * @return the column number

	 * @return the column number

*/

*/

	size_type

	XalanFileLoc

	getColumnNumber() const

	getColumnNumber() const

		return m_columnNumber;

		return m_columnNumber;

    MemoryManagerType&

    MemoryManagerType&

    getMemoryManager()const

    getMemoryManager()const

(-) src/xalanc/PlatformSupport/XalanLocator.hpp (-10 / +8 lines)

Lines 45-52	Link Here

    typedef Locator     ParentType;

    typedef Locator     ParentType;

    typedef XMLSSize_t  size_type;

    XalanLocator() {}

    XalanLocator() {}

    virtual

    virtual

Lines 58-85	Link Here

    virtual const XMLCh*

    virtual const XMLCh*

    getSystemId() const = 0;

    getSystemId() const = 0;

    virtual size_type

    virtual XalanFileLoc

    getLineNumber() const = 0;

    getLineNumber() const = 0;

    virtual size_type

    virtual XalanFileLoc

    getColumnNumber() const = 0;

    getColumnNumber() const = 0;

    static size_type

    static XalanFileLoc

    getLineNumber(const ParentType*     theLocator)

    getLineNumber(const ParentType*     theLocator)

        return theLocator == 0 ? size_type(-1) : theLocator->getLineNumber();

        return theLocator == 0 ? getUnknownValue() : theLocator->getLineNumber();

    static size_type

    static XalanFileLoc

    getColumnNumber(const ParentType*   theLocator)

    getColumnNumber(const ParentType*   theLocator)

        return theLocator == 0 ? size_type(-1) : theLocator->getColumnNumber();

        return theLocator == 0 ? getUnknownValue() : theLocator->getColumnNumber();

    static size_type

    static XalanFileLoc

    getUnknownValue()

    getUnknownValue()

        return size_type(-1);

        return XalanFileLoc(-1);

private:

private:

(-) src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (+8 lines)

Lines 74-77	Link Here

MemoryManager*

XalanMemoryManagerDefault::getExceptionMemoryManager()

    return this;

XALAN_CPP_NAMESPACE_END

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/PlatformSupport/FormatterListener.hpp (-1 / +1 lines)

Lines 66-72	Link Here

	typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler	ParentType;

	typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler	ParentType;

	// A handy typedef...  Must match DocumentHandler's type for characters(), etc...

	// A handy typedef...  Must match DocumentHandler's type for characters(), etc...

	typedef unsigned int	size_type;

	typedef XalanSize_t     size_type;

	enum eFormat

	enum eFormat

(-) src/xalanc/PlatformSupport/DOMStringHelper.hpp (-1 / +1 lines)

Lines 705-711	Link Here

public:

public:

    typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);

    typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);

    static void

    static void

    DoubleToCharacters(

    DoubleToCharacters(

(-) src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (-9 / +10 lines)

Lines 43-66	Link Here

	typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList	ParentType;

	typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList	ParentType;

	explicit

	explicit

	NamedNodeMapAttributeList(const XalanNamedNodeMap&	theMap,

	NamedNodeMapAttributeList(

                                MemoryManagerType& theManager);

                const XalanNamedNodeMap&	theMap,

                MemoryManagerType&          theManager);

	virtual

	virtual

	~NamedNodeMapAttributeList();

	~NamedNodeMapAttributeList();

	// These are inherited from AttributeList

	// These are inherited from AttributeList

    virtual unsigned int

    virtual XalanSize_t

	getLength() const;

	getLength() const;

    virtual const XalanDOMChar*

    virtual const XalanDOMChar*

	getName(const unsigned int index) const;

	getName(const XalanSize_t   index) const;

    virtual const XalanDOMChar*

    virtual const XalanDOMChar*

	getType(const unsigned int index) const;

	getType(const XalanSize_t   index) const;

    virtual const XalanDOMChar*

    virtual const XalanDOMChar*

	getValue(const unsigned int index) const;

	getValue(const XalanSize_t  index) const;

    virtual const XalanDOMChar*

    virtual const XalanDOMChar*

	getType(const XalanDOMChar* const name) const;

	getType(const XalanDOMChar* const name) const;

Lines 83-93	Link Here

	// Data members...

	// Data members...

	const XalanNamedNodeMap&	m_nodeMap;

	const XalanNamedNodeMap&	m_nodeMap;

	const unsigned int			m_lastIndex;

	const XalanSize_t			m_lastIndex;

    MemoryManagerType&          m_memoryManager;

	static const XalanDOMChar	s_typeString[];

	static const XalanDOMChar	s_typeString[];

    	MemoryManagerType&  m_memoryManager;

};

};

(-) src/xalanc/PlatformSupport/AttributesImpl.hpp (-11 / +22 lines)

Lines 65-95	Link Here

	AttributesImpl&

	AttributesImpl&

	operator=(const AttributesType&		theRHS);

	operator=(const AttributesType&		theRHS);

	// These are inherited from AttributeList

	// These are inherited from Attributes

    virtual unsigned int

    virtual XalanSize_t

	getLength() const;

	getLength() const;

	virtual const XMLCh*

	virtual const XMLCh*

	getURI(const unsigned int index) const;

	getURI(const XalanSize_t    index) const;

	virtual const XMLCh*

	virtual const XMLCh*

	getLocalName(const unsigned int index) const;

	getLocalName(const XalanSize_t  index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getQName(const unsigned int index) const;

	getQName(const XalanSize_t  index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getType(const unsigned int index) const;

	getType(const XalanSize_t   index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getValue(const unsigned int index) const;

	getValue(const XalanSize_t  index) const;

	virtual int

    virtual bool

    getIndex(

            const XMLCh* const  uri,

            const XMLCh* const  localPart,

            XalanSize_t&        index) const;

    virtual int

	getIndex(

	getIndex(

			const XMLCh* const	uri,

			const XMLCh* const	uri,

			const XMLCh* const	localName) const;

			const XMLCh* const	localPart) const;

	virtual int

    virtual bool

    getIndex(

            const XMLCh* const  qName,

            XalanSize_t&        index) const;

    virtual int

	getIndex(const XMLCh* const		qname) const;

	getIndex(const XMLCh* const		qname) const;

    virtual const XMLCh*

    virtual const XMLCh*

Lines 186-192	Link Here

	 * @param theCount The number to reserve

	 * @param theCount The number to reserve

*/

*/

	void

	void

	reserve(unsigned int	theCount)

	reserve(XalanSize_t     theCount)

		m_attributesVector.reserve(theCount);

		m_attributesVector.reserve(theCount);

(-) src/xalanc/PlatformSupport/AttributeListImpl.cpp (-7 / +7 lines)

Lines 110-116	Link Here

		// until we're done.

		// until we're done.

		AttributeVectorType		tempVector(getMemoryManager());

		AttributeVectorType		tempVector(getMemoryManager());

		const unsigned int	theLength = theRHS.getLength();

		const XalanSize_t	theLength = theRHS.getLength();

		if (theLength > 0)

		if (theLength > 0)

Lines 166-177	Link Here

		// safe and don't need any try blocks.

		// safe and don't need any try blocks.

		AttributeListImpl	theTempList(getMemoryManager());

		AttributeListImpl	theTempList(getMemoryManager());

		const unsigned int	theLength = theRHS.getLength();

		const XalanSize_t	theLength = theRHS.getLength();

		theTempList.reserve(theLength);

		theTempList.reserve(theLength);

		// Add each attribute.

		// Add each attribute.

		for(unsigned int i = 0; i < theLength; i++)

		for(XalanSize_t i = 0; i < theLength; i++)

			theTempList.addAttribute(

			theTempList.addAttribute(

					theRHS.getName(i),

					theRHS.getName(i),

Lines 189-195	Link Here

unsigned int

XalanSize_t

AttributeListImpl::getLength() const

AttributeListImpl::getLength() const

	// Make sure the mismatch between Xerces and vector<> doesn't cause a problem...

	// Make sure the mismatch between Xerces and vector<> doesn't cause a problem...

Lines 201-207	Link Here

const XMLCh*

const XMLCh*

AttributeListImpl::getName(const unsigned int index) const

AttributeListImpl::getName(const XalanSize_t    index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 211-217	Link Here

const XMLCh*

const XMLCh*

AttributeListImpl::getType(const unsigned int index) const

AttributeListImpl::getType(const XalanSize_t    index) const

	assert(index < getLength());

	assert(index < getLength());

Lines 221-227	Link Here

const XMLCh*

const XMLCh*

AttributeListImpl::getValue(const unsigned int index) const

AttributeListImpl::getValue(const XalanSize_t   index) const

	assert(index < getLength());

	assert(index < getLength());

(-) src/xalanc/PlatformSupport/StdBinInputStream.hpp (-3 / +6 lines)

Lines 58-71	Link Here

	virtual

	virtual

	~StdBinInputStream();

	~StdBinInputStream();

	virtual unsigned int

	virtual XalanFilePos

	curPos() const;

	curPos() const;

	virtual unsigned int

	virtual XalanSize_t

	readBytes(

	readBytes(

			XMLByte* const      toFill,

			XMLByte* const      toFill,

			const unsigned int	maxToRead);

			const XalanSize_t   maxToRead);

    virtual const XalanDOMChar*

    getContentType() const;

private:

private:

	// Unimplemented...

	// Unimplemented...

(-) src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (+3 lines)

Lines 52-57	Link Here

    virtual void

    virtual void

    deallocate(void*    pointer);

    deallocate(void*    pointer);

    virtual MemoryManager*

    getExceptionMemoryManager();

private:

private:

    // These are not implemented.

    // These are not implemented.

(-) src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (-2 / +2 lines)

Lines 56-63	Link Here

	static void

	static void

	terminate();

	terminate();

	typedef unsigned char	XalanXMLByte;

    typedef unsigned char   XalanXMLByte;

    typedef unsigned int    size_type;

    typedef XalanSize_t     size_type;

    typedef unsigned int    UnicodeCharType;

    typedef unsigned int    UnicodeCharType;

	static size_type

	static size_type

(-) src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (-3 / +8 lines)

Lines 40-46	Link Here

		return 0;

		return 0;

	virtual void

    virtual void

	deallocate(  void* 	/*	pDataPointer */ )

	deallocate(  void* 	/*	pDataPointer */ )

		XALAN_USING_STD(bad_alloc)

		XALAN_USING_STD(bad_alloc)

Lines 48-55	Link Here

		throw bad_alloc();

		throw bad_alloc();

    MemoryManager*

    getExceptionMemoryManager()

        return this;

};

};

(-) src/xalanc/Include/VCPPDefinitions.hpp (-1 / +1 lines)

Lines 17-23	Link Here

#define VCPPDEFINITIONS_HEADER_GUARD_1357924680

#define VCPPDEFINITIONS_HEADER_GUARD_1357924680

#pragma warning(disable: 4127 4251 4511 4512 4514 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)

#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)

// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

(-) src/xalanc/Include/PlatformDefinitions.hpp (+10 lines)

Lines 120-125	Link Here

typedef unsigned short	XalanDOMChar;

typedef unsigned short	XalanDOMChar;

#endif

#endif

#if XERCES_VERSION_MAJOR < 3

typedef unsigned int    XalanSize_t;

typedef unsigned int    XalanFilePos;

typedef unsigned int    XalanFileLoc;

#else

typedef XMLSize_t       XalanSize_t;

typedef XMLFilePos      XalanFilePos;

typedef XMLFileLoc      XalanFileLoc;

#endif

template<bool value>

template<bool value>

struct XalanCompileErrorBoolean

struct XalanCompileErrorBoolean

(-) src/xalanc/XPath/XPathProcessorImpl.hpp (-4 / +6 lines)

Lines 70-75	Link Here

    typedef XalanVector<bool>               BoolVectorType;

    typedef XalanVector<bool>               BoolVectorType;

    typedef XalanDOMString::size_type   t_size_type;

    XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);

    XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);

    virtual

    virtual

Lines 121-132	Link Here

     * When a separator token is found, see if there's a element name or the

     * When a separator token is found, see if there's a element name or the

     * like to map.

     * like to map.

*/

*/

int

    t_size_type

    mapNSTokens(

    mapNSTokens(

            const XalanDOMString&   pat,

            const XalanDOMString&   pat,

            int                     startSubstring,

            t_size_type             startSubstring,

            int                     posOfNSSep,

            t_size_type             posOfNSSep,

            int                     posOfScan);

            t_size_type             posOfScan);

/**

/**

     * Check if m_token==s. If m_token is null, this won't throw

     * Check if m_token==s. If m_token is null, this won't throw

(-) src/xalanc/XPath/XPathExecutionContextDefault.cpp (-6 / +6 lines)

Lines 492-499	Link Here

    assert(m_xpathEnvSupport != 0);

    assert(m_xpathEnvSupport != 0);

    XalanLocator::size_type     lineNumber = XalanLocator::getUnknownValue();

    XalanFileLoc     lineNumber = XalanLocator::getUnknownValue();

    XalanLocator::size_type     columnNumber = XalanLocator::getUnknownValue();

    XalanFileLoc     columnNumber = XalanLocator::getUnknownValue();

    MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

    MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

Lines 546-553	Link Here

    assert(m_xpathEnvSupport != 0);

    assert(m_xpathEnvSupport != 0);

    XalanLocator::size_type     lineNumber = XalanLocator::getUnknownValue();

    XalanFileLoc    lineNumber = XalanLocator::getUnknownValue();

    XalanLocator::size_type     columnNumber = XalanLocator::getUnknownValue();

    XalanFileLoc    columnNumber = XalanLocator::getUnknownValue();

    MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

    MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

Lines 600-607	Link Here

    assert(m_xpathEnvSupport != 0);

    assert(m_xpathEnvSupport != 0);

    XalanLocator::size_type     lineNumber = XalanLocator::getUnknownValue();

    XalanFileLoc    lineNumber = XalanLocator::getUnknownValue();

    XalanLocator::size_type     columnNumber = XalanLocator::getUnknownValue();

    XalanFileLoc    columnNumber = XalanLocator::getUnknownValue();

   MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

   MemoryManagerType& theManager =  const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();

(-) src/xalanc/XPath/XPathExecutionContextDefault.hpp (-4 / +5 lines)

Lines 32-40	Link Here

/**

 * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a>

*/

// Base class include file.

// Base class include file.

#include <xalanc/XPath/XPathExecutionContext.hpp>

#include <xalanc/XPath/XPathExecutionContext.hpp>

Lines 346-352	Link Here

protected:

protected:

	typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> >	NodeListCacheType;

	typedef XalanObjectCache<

                MutableNodeRefList,

                DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>,

                DeleteFunctor<MutableNodeRefList>,

                ClearCacheResetFunctor<MutableNodeRefList> >	NodeListCacheType;

	enum { eNodeListCacheListSize = 50 };

	enum { eNodeListCacheListSize = 50 };

(-) src/xalanc/XPath/FormatterStringLengthCounter.cpp (-8 / +8 lines)

Lines 76-83	Link Here

void

void

FormatterStringLengthCounter::characters(

FormatterStringLengthCounter::characters(

			const XMLCh* const	/* chars */,

			const XMLCh* const  /* chars */,

			const unsigned int	length)

			const size_type     length)

	m_count += length;

	m_count += length;

Lines 86-93	Link Here

void

void

FormatterStringLengthCounter::charactersRaw(

FormatterStringLengthCounter::charactersRaw(

		const XMLCh* const	/* chars */,

		const XMLCh* const  /* chars */,

		const unsigned int	/*length */)

		const size_type	    /*length */)

Lines 101-108	Link Here

void

void

FormatterStringLengthCounter::ignorableWhitespace(

FormatterStringLengthCounter::ignorableWhitespace(

			const XMLCh* const	/* chars */,

			const XMLCh* const  /* chars */,

			const unsigned int	/* length */)

			const size_type	    /* length */)

Lines 133-140	Link Here

void

void

FormatterStringLengthCounter::cdata(

FormatterStringLengthCounter::cdata(

			const XMLCh* const	 /* ch */,

			const XMLCh* const  /* ch */,

			const unsigned int 	/* length */)

			const size_type     /* length */)

(-) src/xalanc/XPath/XPathConstructionContext.hpp (-13 / +9 lines)

Lines 123-142	Link Here

        // Note non-const copy semantics...

        GetAndReleaseCachedString(GetAndReleaseCachedString&    theSource) :

            m_constructionContext(theSource.m_constructionContext),

            m_string(theSource.m_string)

            theSource.m_string = 0;

        ~GetAndReleaseCachedString()

        ~GetAndReleaseCachedString()

            if (m_string != 0)

            assert(m_string != 0);

                m_constructionContext->releaseCachedString(*m_string);

            m_constructionContext->releaseCachedString(*m_string);

        XalanDOMString&

        XalanDOMString&

Lines 150-162	Link Here

        XPathConstructionContext&

        XPathConstructionContext&

        getConstructionContext() const

        getConstructionContext() const

            assert(m_constructionContext != 0);

            return *m_constructionContext;

            return *m_constructionContext;

    private:

    private:

        // Not implemented...

        // Not implemented...

        GetAndReleaseCachedString();

        GetAndReleaseCachedString(const GetAndReleaseCachedString&);

        GetAndReleaseCachedString&

        GetAndReleaseCachedString&

        operator=(const GetAndReleaseCachedString&);

        operator=(const GetAndReleaseCachedString&);

(-) src/xalanc/XPath/XPathExecutionContext.hpp (-3 / +4 lines)

Lines 35-43	Link Here

/**

 * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a>

*/

// Base class header file...

// Base class header file...

#include <xalanc/PlatformSupport/ExecutionContext.hpp>

#include <xalanc/PlatformSupport/ExecutionContext.hpp>

Lines 470-475	Link Here

    private:

    private:

        // Not implemented...

        // Not implemented...

        GetAndReleaseCachedString();

        GetAndReleaseCachedString(const GetAndReleaseCachedString&);

        GetAndReleaseCachedString&

        GetAndReleaseCachedString&

        operator=(const GetAndReleaseCachedString&);

        operator=(const GetAndReleaseCachedString&);

(-) src/xalanc/XPath/XObject.hpp (-1 / +1 lines)

Lines 141-147	Link Here

	virtual const XalanDOMString&

	virtual const XalanDOMString&

	str() const;

	str() const;

	typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);

    typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);

/**

/**

	 * Send the string value to a FormatterListener instance.

	 * Send the string value to a FormatterListener instance.

(-) src/xalanc/XPath/FormatterStringLengthCounter.hpp (-6 / +4 lines)

Lines 41-48	Link Here

public:

public:

	typedef unsigned long	size_type;

/**

/**

	 * FormatterStringLengthCounter instance constructor.

	 * FormatterStringLengthCounter instance constructor.

*/

*/

Lines 81-92	Link Here

    virtual void

    virtual void

	characters(

	characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

    virtual void

    virtual void

	charactersRaw(

	charactersRaw(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	entityReference(const XMLCh* const	name);

	entityReference(const XMLCh* const	name);

Lines 94-100	Link Here

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 110-116	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type     length);

private:

private:

(-) src/xalanc/XPath/XPathProcessorImpl.cpp (-31 / +33 lines)

Lines 212-227	Link Here

    m_expression->setCurrentPattern(m_constructionContext->getPooledString(pat));

    m_expression->setCurrentPattern(m_constructionContext->getPooledString(pat));

    const int   nChars = length(pat);

    const t_size_type   nChars = length(pat);

    int         startSubstring = -1;

    t_size_type     startSubstring = XalanDOMString::npos;

    int         posOfNSSep = -1;

    t_size_type     posOfNSSep = XalanDOMString::npos;

    const XPathConstructionContext::GetAndReleaseCachedString   theGuard(*m_constructionContext);

    const XPathConstructionContext::GetAndReleaseCachedString   theGuard(*m_constructionContext);

    XalanDOMString&     theToken = theGuard.get();

    XalanDOMString&     theToken = theGuard.get();

    for(int i = 0; i < nChars; i++)

    for(t_size_type i = 0; i < nChars; i++)

        XalanDOMChar    c = charAt(pat, i);

        XalanDOMChar    c = charAt(pat, i);

Lines 229-237	Link Here

        case XalanUnicode::charQuoteMark:

        case XalanUnicode::charQuoteMark:

                if(startSubstring != -1)

                if(startSubstring != XalanDOMString::npos)

                    if(-1 != posOfNSSep)

                    if(XalanDOMString::npos != posOfNSSep)

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

Lines 253-259	Link Here

                    addToTokenQueue(theToken);

                    addToTokenQueue(theToken);

                    startSubstring = -1;

                    startSubstring = XalanDOMString::npos;

                else

                else

Lines 264-272	Link Here

        case XalanUnicode::charApostrophe:

        case XalanUnicode::charApostrophe:

                if(startSubstring != -1)

                if(startSubstring != XalanDOMString::npos)

                    if(-1 != posOfNSSep)

                    if(XalanDOMString::npos != posOfNSSep)

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

Lines 288-294	Link Here

                    addToTokenQueue(theToken);

                    addToTokenQueue(theToken);

                    startSubstring = -1;

                    startSubstring = XalanDOMString::npos;

                else

                else

Lines 302-310	Link Here

        case XalanUnicode::charSpace:

        case XalanUnicode::charSpace:

        case XalanUnicode::charHTab:

        case XalanUnicode::charHTab:

                if(startSubstring != -1)

                if(startSubstring != XalanDOMString::npos)

                    if(-1 != posOfNSSep)

                    if(XalanDOMString::npos != posOfNSSep)

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

Lines 315-328	Link Here

                        addToTokenQueue(theToken);

                        addToTokenQueue(theToken);

                    startSubstring = -1;

                    startSubstring = XalanDOMString::npos;

            break;

            break;

        case XalanUnicode::charHyphenMinus:

        case XalanUnicode::charHyphenMinus:

                if(!(startSubstring == -1))

                if(!(startSubstring == XalanDOMString::npos))

                    break;

                    break;

Lines 347-355	Link Here

        case XalanUnicode::charLessThanSign:

        case XalanUnicode::charLessThanSign:

        case XalanUnicode::charGreaterThanSign:

        case XalanUnicode::charGreaterThanSign:

                if(startSubstring != -1)

                if(startSubstring != XalanDOMString::npos)

                    if(-1 != posOfNSSep)

                    if(XalanDOMString::npos != posOfNSSep)

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

                        posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);

Lines 360-366	Link Here

                        addToTokenQueue(theToken);

                        addToTokenQueue(theToken);

                    startSubstring = -1;

                    startSubstring = XalanDOMString::npos;

                substring(pat, theToken, i, i + 1);

                substring(pat, theToken, i, i + 1);

Lines 373-379	Link Here

                if(posOfNSSep == i - 1 && i > 0)

                if(posOfNSSep == i - 1 && i > 0)

                    if(startSubstring != -1)

                    if(startSubstring != XalanDOMString::npos)

                        if (startSubstring < i - 1)

                        if (startSubstring < i - 1)

Lines 383-390	Link Here

                    startSubstring = -1;

                    startSubstring = XalanDOMString::npos;

                    posOfNSSep = -1;

                    posOfNSSep = XalanDOMString::npos;

                    substring(pat, theToken, i - 1, i + 1);

                    substring(pat, theToken, i - 1, i + 1);

Lines 401-407	Link Here

        default:

        default:

                if(-1 == startSubstring)

                if(XalanDOMString::npos == startSubstring)

                    startSubstring = i;

                    startSubstring = i;

Lines 440-455	Link Here

                        addToTokenQueue(theToken);

                        addToTokenQueue(theToken);

                        startSubstring = -1;

                        startSubstring = XalanDOMString::npos;

    if(startSubstring != -1)

    if(startSubstring != XalanDOMString::npos)

        if(-1 != posOfNSSep)

        if(XalanDOMString::npos != posOfNSSep)

            posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars);

            posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars);

Lines 504-515	Link Here

int

XPathProcessorImpl::t_size_type

XPathProcessorImpl::mapNSTokens(

XPathProcessorImpl::mapNSTokens(

            const XalanDOMString&   pat,

            const XalanDOMString&   pat,

            int                     startSubstring,

            t_size_type             startSubstring,

            int                     posOfNSSep,

            t_size_type             posOfNSSep,

            int                     posOfScan)

            t_size_type             posOfScan)

    assert(m_prefixResolver != 0);

    assert(m_prefixResolver != 0);

Lines 575-581	Link Here

    return -1;

    return XalanDOMString::npos;

Lines 2938-2951	Link Here

bool

bool

XPathProcessorImpl::isCurrentLiteral() const

XPathProcessorImpl::isCurrentLiteral() const

    const int last = length(m_token) - 1;

    const t_size_type   theLength = m_token.length();

    if (last <= 0)

    if (theLength <= 1)

        return false;

        return false;

    else

    else

        const t_size_type   last = theLength - 1;

        const XalanDOMChar  c0 = m_tokenChar;

        const XalanDOMChar  c0 = m_tokenChar;

        const XalanDOMChar  cX = charAt(m_token, last);

        const XalanDOMChar  cX = charAt(m_token, last);

(-) src/xalanc/XPath/XPath.hpp (-1 / +1 lines)

Lines 241-247	Link Here

			XPathExecutionContext&	executionContext,

			XPathExecutionContext&	executionContext,

			XalanDOMString&			result) const;

			XalanDOMString&			result) const;

	typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);

    typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);

/**

/**

	 * Execute the XPath from the provided context.

	 * Execute the XPath from the provided context.

(-) src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (+6 lines)

Lines 83-88	Link Here

	static ExceptionCode

	static ExceptionCode

	translateErrorCode(DOMExceptionType::ExceptionCode	theCode);

	translateErrorCode(DOMExceptionType::ExceptionCode	theCode);

	static ExceptionCode

	translateErrorCode(short    theCode)

        return translateErrorCode(static_cast<DOMExceptionType::ExceptionCode>(theCode));

};

};

(-) src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (+9 lines)

Lines 741-747	Link Here

    DOMParserType* const    theParser =

    DOMParserType* const    theParser =

        new (&theMemoryManager) DOMParserType(0, &theMemoryManager);

        new (&theMemoryManager) DOMParserType(0, &theMemoryManager);

#if XERCES_VERSION_MAJOR < 3

    theParser->setExpandEntityReferences(true);

    theParser->setExpandEntityReferences(true);

#else

    theParser->setCreateEntityReferenceNodes(false);

#endif

    theParser->setDoNamespaces(m_doNamespaces);

    theParser->setDoNamespaces(m_doNamespaces);

    theParser->setEntityResolver(m_entityResolver);

    theParser->setEntityResolver(m_entityResolver);

Lines 759-765	Link Here

    SAXParserType* const    theParser =

    SAXParserType* const    theParser =

        new (&theMemoryManager) SAXParserType(0, &theMemoryManager);

        new (&theMemoryManager) SAXParserType(0, &theMemoryManager);

#if XERCES_VERSION_MAJOR < 3

    theParser->setDoValidation(false);

    theParser->setDoValidation(false);

#else

    theParser->setValidationScheme(SAXParserType::Val_Never);

#endif

    theParser->setDoNamespaces(false);

    theParser->setDoNamespaces(false);

(-) src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (-5 / +5 lines)

Lines 48-64	Link Here

	~XercesNamedNodeMapAttributeList();

	~XercesNamedNodeMapAttributeList();

	// These are inherited from AttributeList

	// These are inherited from AttributeList

    virtual unsigned int

    virtual XalanSize_t

	getLength() const;

	getLength() const;

    virtual const XMLCh*

    virtual const XMLCh*

	getName(const unsigned int index) const;

	getName(const XalanSize_t   index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getType(const unsigned int index) const;

	getType(const XalanSize_t   index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getValue(const unsigned int index) const;

	getValue(const XalanSize_t  index) const;

    virtual const XMLCh*

    virtual const XMLCh*

	getType(const XMLCh* const name) const;

	getType(const XMLCh* const name) const;

Lines 81-87	Link Here

	// Data members...

	// Data members...

	const DOMNamedNodeMapType* const	m_nodeMap;

	const DOMNamedNodeMapType* const	m_nodeMap;

	const XMLSizeType					m_lastIndex;

	const XalanSize_t					m_lastIndex;

	static const XMLCh	s_typeString[];

	static const XMLCh	s_typeString[];

};

};

(-) src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (-4 / +4 lines)

Lines 191-197	Link Here

void

void

FormatterToXercesDOM::characters(

FormatterToXercesDOM::characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	m_textBuffer.append(chars, length);

	m_textBuffer.append(chars, length);

Lines 201-207	Link Here

void

void

FormatterToXercesDOM::charactersRaw(

FormatterToXercesDOM::charactersRaw(

		const XMLCh* const	chars,

		const XMLCh* const	chars,

		const unsigned int	length)

		const size_type	    length)

try

try

Lines 237-243	Link Here

void

void

FormatterToXercesDOM::ignorableWhitespace(

FormatterToXercesDOM::ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

try

try

Lines 301-307	Link Here

void

void

FormatterToXercesDOM::cdata(

FormatterToXercesDOM::cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length)

			const size_type	    length)

try

try

(-) src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (-5 / +6 lines)

Lines 48-53	Link Here

	m_nodeMap(theMap),

	m_nodeMap(theMap),

	m_lastIndex(theMap->getLength() - 1)

	m_lastIndex(theMap->getLength() - 1)

    assert(theMap->getLength() != 0);

Lines 58-64	Link Here

unsigned int

XalanSize_t

XercesNamedNodeMapAttributeList::getLength() const

XercesNamedNodeMapAttributeList::getLength() const

	return m_lastIndex + 1;

	return m_lastIndex + 1;

Lines 67-73	Link Here

const XMLCh*

const XMLCh*

XercesNamedNodeMapAttributeList::getName(const unsigned int index) const

XercesNamedNodeMapAttributeList::getName(const XalanSize_t  index) const

	const DOMNodeType* const	theAttribute = m_nodeMap->item(m_lastIndex - index);

	const DOMNodeType* const	theAttribute = m_nodeMap->item(m_lastIndex - index);

	assert(theAttribute != 0);

	assert(theAttribute != 0);

Lines 78-84	Link Here

const XMLCh*

const XMLCh*

XercesNamedNodeMapAttributeList::getType(const unsigned int /* index */) const

XercesNamedNodeMapAttributeList::getType(const XalanSize_t  /* index */) const

	assert(length(s_typeString) > 0);

	assert(length(s_typeString) > 0);

Lines 88-94	Link Here

const XMLCh*

const XMLCh*

XercesNamedNodeMapAttributeList::getValue(const unsigned int index) const

XercesNamedNodeMapAttributeList::getValue(const XalanSize_t     index) const

	const DOMNodeType* const	theAttribute = m_nodeMap->item(m_lastIndex - index);

	const DOMNodeType* const	theAttribute = m_nodeMap->item(m_lastIndex - index);

	assert(theAttribute != 0);

	assert(theAttribute != 0);

Lines 126-132	Link Here

const XMLCh*

const XMLCh*

XercesNamedNodeMapAttributeList::getValue(const char* const /*name*/) const

XercesNamedNodeMapAttributeList::getValue(const char* const /*name*/) const

    assert( 0 );

    assert(false);

    return 0;

    return 0;

(-) src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (-5 / +5 lines)

Lines 82-93	Link Here

	~FormatterToXercesDOM();

	~FormatterToXercesDOM();

	// These methods are inherited from DocumentHandler ...

	// These methods are inherited from FormatterListener...

	virtual void

	virtual void

	charactersRaw(

	charactersRaw(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	comment(const XMLCh* const	data);

	comment(const XMLCh* const	data);

Lines 95-101	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type 	length);

	virtual void

	virtual void

	entityReference(const XMLCh* const	name);

	entityReference(const XMLCh* const	name);

Lines 120-131	Link Here

	virtual void

	virtual void

	characters(

	characters(

				const XMLCh* const	chars,

				const XMLCh* const	chars,

				const unsigned int	length);

				const size_type	    length);

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

				const XMLCh* const	chars,

				const XMLCh* const	chars,

				const unsigned int	length);

				const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

(-) src/xalanc/XSLT/XSLTProcessor.hpp (-1 / +1 lines)

Lines 80-86	Link Here

public:

public:

	typedef size_t	size_type;

    typedef XalanSize_t     size_type;

	XSLTProcessor();

	XSLTProcessor();

(-) src/xalanc/XSLT/ElemCopyOf.cpp (-11 / +11 lines)

Lines 49-56	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

Lines 60-72	Link Here

    bool    isSelectCurrentNode = false;

    bool    isSelectCurrentNode = false;

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; ++i)

    for (XalanSize_t i = 0; i < nAttrs; ++i)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_SELECT))

        if (equals(aname, Constants::ATTRNAME_SELECT))

            const XalanDOMChar* const   avalue = atts.getValue(i);

            const XalanDOMChar* const   avalue = atts.getValue(i);

            assert(avalue != 0);

            assert(avalue != 0);

Lines 80-86	Link Here

                m_selectPattern = constructionContext.createXPath(getLocator(), avalue, *this);

                m_selectPattern = constructionContext.createXPath(getLocator(), avalue, *this);

        else if(isAttrOK(

        else if (isAttrOK(

                    aname,

                    aname,

                    atts,

                    atts,

i,

i,

Lines 124-130	Link Here

    if (m_selectPattern == 0)

    if (m_selectPattern == 0)

        if(0 != executionContext.getTraceListeners())

        if (0 != executionContext.getTraceListeners())

            StylesheetExecutionContext::BorrowReturnMutableNodeRefList  theNodeList(executionContext);

            StylesheetExecutionContext::BorrowReturnMutableNodeRefList  theNodeList(executionContext);

Lines 147-153	Link Here

        const XObjectPtr    value(m_selectPattern->execute(*this, executionContext));

        const XObjectPtr    value(m_selectPattern->execute(*this, executionContext));

        assert(value.null() == false);

        assert(value.null() == false);

        if(0 != executionContext.getTraceListeners())

        if (0 != executionContext.getTraceListeners())

            executionContext.fireSelectEvent(

            executionContext.fireSelectEvent(

                SelectionEvent(

                SelectionEvent(

Lines 209-215	Link Here

    if (m_selectPattern == 0)

    if (m_selectPattern == 0)

        if(0 != executionContext.getTraceListeners())

        if (0 != executionContext.getTraceListeners())

            StylesheetExecutionContext::BorrowReturnMutableNodeRefList  theNodeList(executionContext);

            StylesheetExecutionContext::BorrowReturnMutableNodeRefList  theNodeList(executionContext);

Lines 232-238	Link Here

        const XObjectPtr    value(m_selectPattern->execute(*this, executionContext));

        const XObjectPtr    value(m_selectPattern->execute(*this, executionContext));

        assert(value.null() == false);

        assert(value.null() == false);

        if(0 != executionContext.getTraceListeners())

        if (0 != executionContext.getTraceListeners())

            executionContext.fireSelectEvent(

            executionContext.fireSelectEvent(

                SelectionEvent(

                SelectionEvent(

Lines 283-289	Link Here

const XPath*

const XPath*

ElemCopyOf::getXPath(unsigned int   index) const

ElemCopyOf::getXPath(XalanSize_t    index) const

    return index == 0 ? m_selectPattern : 0;

    return index == 0 ? m_selectPattern : 0;

(-) src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (-3 / +5 lines)

Lines 23-29	Link Here

XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :

XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(

            MemoryManagerType&  theManager,

            size_type	        theBlockCount) :

	m_allocator(theManager, theBlockCount)

	m_allocator(theManager, theBlockCount)

Lines 41-48	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber)

			XalanFileLoc					columnNumber)

	data_type* const	theBlock = m_allocator.allocateBlock();

	data_type* const	theBlock = m_allocator.allocateBlock();

	assert(theBlock != 0);

	assert(theBlock != 0);

(-) src/xalanc/XSLT/ElemAttribute.hpp (-2 / +2 lines)

Lines 52-59	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc				    lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	virtual

	virtual

	~ElemAttribute();

	~ElemAttribute();

(-) src/xalanc/XSLT/XalanElemElementAllocator.hpp (-3 / +5 lines)

Lines 57-63	Link Here

	 * @param theBlockSize The block size.

	 * @param theBlockSize The block size.

*/

*/

	XalanElemElementAllocator(MemoryManagerType&  theManager, size_type		theBlockCount);

	XalanElemElementAllocator(

            MemoryManagerType&  theManager,

            size_type		    theBlockCount);

	~XalanElemElementAllocator();

	~XalanElemElementAllocator();

Lines 77-84	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

/**

/**

	 * Determine if an object is owned by the allocator...

	 * Determine if an object is owned by the allocator...

(-) src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (-3 / +5 lines)

Lines 57-63	Link Here

	 * @param theBlockSize The block size.

	 * @param theBlockSize The block size.

*/

*/

	XalanElemAttributeAllocator(MemoryManagerType&  theManager, size_type		theBlockCount);

	XalanElemAttributeAllocator(

                MemoryManagerType&  theManager,

                size_type		    theBlockCount);

	~XalanElemAttributeAllocator();

	~XalanElemAttributeAllocator();

Lines 77-84	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

/**

/**

	 * Determine if an object is owned by the allocator...

	 * Determine if an object is owned by the allocator...

(-) src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (-17 / +17 lines)

Lines 631-638	Link Here

        StylesheetConstructionContext&  constructionContext,

        StylesheetConstructionContext&  constructionContext,

        Stylesheet&                     stylesheetTree,

        Stylesheet&                     stylesheetTree,

        const AttributeListType&        atts,

        const AttributeListType&        atts,

        int                             lineNumber,

        XalanFileLoc                    lineNumber,

        int                             columnNumber)

        XalanFileLoc                    columnNumber)

        Type*   theResult;

        Type*   theResult;

Lines 656-664	Link Here

            const AttributeListType&    atts,

            const AttributeListType&    atts,

            const LocatorType*          locator)

            const LocatorType*          locator)

    const XalanLocator::size_type   lineNumber = XalanLocator::getLineNumber(locator);

    const XalanFileLoc  lineNumber =

    const XalanLocator::size_type   columnNumber = XalanLocator::getColumnNumber(locator);

        XalanLocator::getLineNumber(locator);

    const XalanFileLoc  columnNumber =

        XalanLocator::getColumnNumber(locator);

    ElemTemplateElement*    theElement = 0;

    ElemTemplateElement*    theElement = 0;

    switch(token)

    switch(token)

Lines 975-983	Link Here

            const AttributeListType&    atts,

            const AttributeListType&    atts,

            const LocatorType*          locator)

            const LocatorType*          locator)

    const XalanLocator::size_type   lineNumber = XalanLocator::getLineNumber(locator);

    const XalanFileLoc  lineNumber =

    const XalanLocator::size_type   columnNumber = XalanLocator::getColumnNumber(locator);

        XalanLocator::getLineNumber(locator);

    const XalanFileLoc  columnNumber =

        XalanLocator::getColumnNumber(locator);

    ElemTemplateElement*    theElement = 0;

    ElemTemplateElement*    theElement = 0;

    if (token == ELEMNAME_LITERAL_RESULT)

    if (token == ELEMNAME_LITERAL_RESULT)

Lines 1032-1040	Link Here

            ExtensionNSHandler&         handler,

            ExtensionNSHandler&         handler,

            const LocatorType*          locator)

            const LocatorType*          locator)

    const XalanLocator::size_type   lineNumber = XalanLocator::getLineNumber(locator);

    const XalanLocator::size_type   columnNumber = XalanLocator::getColumnNumber(locator);

    m_allocatedElements.push_back(0);

    m_allocatedElements.push_back(0);

    m_allocatedElements.back() = ElemExtensionCall::create(

    m_allocatedElements.back() = ElemExtensionCall::create(

Lines 1043-1050	Link Here

            stylesheetTree,

            stylesheetTree,

            name,

            name,

            atts,

            atts,

            lineNumber,

            XalanLocator::getLineNumber(locator),

            columnNumber,

            XalanLocator::getColumnNumber(locator),

            handler);

            handler);

    return m_allocatedElements.back();

    return m_allocatedElements.back();

Lines 1061-1074	Link Here

            bool                        disableOutputEscaping,

            bool                        disableOutputEscaping,

            const LocatorType*          locator)

            const LocatorType*          locator)

    const XalanLocator::size_type   lineNumber = XalanLocator::getLineNumber(locator);

    const XalanLocator::size_type   columnNumber = XalanLocator::getColumnNumber(locator);

    return m_elemTextLiteralAllocator.create(

    return m_elemTextLiteralAllocator.create(

            *this,

            *this,

            stylesheetTree,

            stylesheetTree,

            lineNumber,

            XalanLocator::getLineNumber(locator),

            columnNumber,

            XalanLocator::getColumnNumber(locator),

            chars,

            chars,

0,

0,

            length,

            length,

Lines 1992-1998	Link Here

};

};

const unsigned int  StylesheetConstructionContextDefault::s_elementTokenTableSize =

const XalanSize_t  StylesheetConstructionContextDefault::s_elementTokenTableSize =

        sizeof(s_elementTokenTable) / sizeof(s_elementTokenTable[0]);

        sizeof(s_elementTokenTable) / sizeof(s_elementTokenTable[0]);

const StylesheetConstructionContextDefault::ElementTokenTableEntry&     StylesheetConstructionContextDefault::s_elementTokenTableLast =

const StylesheetConstructionContextDefault::ElementTokenTableEntry&     StylesheetConstructionContextDefault::s_elementTokenTableLast =

(-) src/xalanc/XSLT/StylesheetConstructionContext.hpp (-6 lines)

Lines 76-87	Link Here

	typedef XalanQName::NamespacesStackType		NamespacesStackType;

	typedef XalanQName::NamespacesStackType		NamespacesStackType;

#if defined(XALAN_STRICT_ANSI_HEADERS)

	typedef std::size_t		size_type;

#else

	typedef size_t			size_type;

#endif

/**

/**

	 * IDs for XSL element types. These are the values

	 * IDs for XSL element types. These are the values

	 * that must be returned by getElementToken().

	 * that must be returned by getElementToken().

(-) src/xalanc/XSLT/ElemDecimalFormat.hpp (-3 / +3 lines)

Lines 57-64	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	~ElemDecimalFormat();

	~ElemDecimalFormat();

Lines 83-89	Link Here

	virtual	const XPath*

	virtual	const XPath*

	getXPath(unsigned int	index = 0) const;

	getXPath(XalanSize_t    index) const;

private:

private:

(-) src/xalanc/XSLT/ElemAttributeSet.hpp (-2 / +2 lines)

Lines 49-56	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc				    lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	virtual

	virtual

	~ElemAttributeSet();

	~ElemAttributeSet();

(-) src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (-6 / +6 lines)

Lines 928-936	Link Here

void

void

StylesheetExecutionContextDefault::characters(

StylesheetExecutionContextDefault::characters(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length)

            fl_size_type            length)

    assert(m_xsltProcessor != 0);

    assert(m_xsltProcessor != 0);

Lines 941-949	Link Here

void

void

StylesheetExecutionContextDefault::charactersRaw(

StylesheetExecutionContextDefault::charactersRaw(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length)

            fl_size_type            length)

    assert(m_xsltProcessor != 0);

    assert(m_xsltProcessor != 0);

(-) src/xalanc/XSLT/ElemSort.cpp (-13 / +13 lines)

Lines 39-46	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

Lines 52-89	Link Here

    m_orderAVT(0),

    m_orderAVT(0),

    m_caseOrderAVT(0)

    m_caseOrderAVT(0)

    const unsigned int nAttrs = atts.getLength();

    const XalanSize_t nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_SELECT))

        if (equals(aname, Constants::ATTRNAME_SELECT))

            m_selectPattern

            m_selectPattern

                = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);

                = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);

        else if(equals(aname, Constants::ATTRNAME_LANG))

        else if (equals(aname, Constants::ATTRNAME_LANG))

            m_langAVT =

            m_langAVT =

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

        else if(equals(aname, Constants::ATTRNAME_DATATYPE))

        else if (equals(aname, Constants::ATTRNAME_DATATYPE))

            m_dataTypeAVT =

            m_dataTypeAVT =

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

        else if(equals(aname, Constants::ATTRNAME_ORDER))

        else if (equals(aname, Constants::ATTRNAME_ORDER))

            m_orderAVT =

            m_orderAVT =

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

        else if(equals(aname, Constants::ATTRNAME_CASEORDER))

        else if (equals(aname, Constants::ATTRNAME_CASEORDER))

            m_caseOrderAVT =

            m_caseOrderAVT =

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

                    constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);

        else if(isAttrOK(

        else if (isAttrOK(

                    aname,

                    aname,

                    atts,

                    atts,

i,

i,

Lines 126-133	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber)

            XalanFileLoc                    columnNumber)

    typedef ElemSort ThisType;

    typedef ElemSort ThisType;

Lines 163-169	Link Here

const XPath*

const XPath*

ElemSort::getXPath(unsigned int     index) const

ElemSort::getXPath(XalanSize_t  index) const

    return index == 0 ? m_selectPattern : 0;

    return index == 0 ? m_selectPattern : 0;

(-) src/xalanc/XSLT/ElemElement.hpp (-2 / +2 lines)

Lines 60-67	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	virtual

	virtual

	~ElemElement();

	~ElemElement();

(-) src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (-3 / +5 lines)

Lines 57-63	Link Here

	 * @param theBlockSize The block size.

	 * @param theBlockSize The block size.

*/

*/

	XalanElemApplyTemplatesAllocator(MemoryManagerType&  theManager, size_type		theBlockCount);

	XalanElemApplyTemplatesAllocator(

            MemoryManagerType&  theManager,

            size_type		    theBlockCount);

	~XalanElemApplyTemplatesAllocator();

	~XalanElemApplyTemplatesAllocator();

Lines 77-84	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

/**

/**

	 * Determine if an object is owned by the allocator...

	 * Determine if an object is owned by the allocator...

(-) src/xalanc/XSLT/ElemCopyOf.hpp (-3 / +3 lines)

Lines 57-64	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

Lines 76-82	Link Here

	execute(StylesheetExecutionContext&		executionContext) const;

	execute(StylesheetExecutionContext&		executionContext) const;

#endif

#endif

	virtual	const XPath*

	virtual	const XPath*

	getXPath(unsigned int	index = 0) const;

	getXPath(XalanSize_t    index) const;

private:

private:

(-) src/xalanc/XSLT/ElemApplyTemplates.cpp (-4 / +4 lines)

Lines 50-57	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ParentType(

    ParentType(

        constructionContext,

        constructionContext,

        stylesheetTree,

        stylesheetTree,

Lines 60-68	Link Here

        StylesheetConstructionContext::ELEMNAME_APPLY_TEMPLATES),

        StylesheetConstructionContext::ELEMNAME_APPLY_TEMPLATES),

    m_mode(0)

    m_mode(0)

    const unsigned  int nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

(-) src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (-3 / +5 lines)

Lines 57-63	Link Here

	 * @param theBlockSize The block size.

	 * @param theBlockSize The block size.

*/

*/

	XalanElemAttributeSetAllocator(MemoryManagerType&  theManager, size_type		theBlockCount);

	XalanElemAttributeSetAllocator(

            MemoryManagerType&  theManager,

            size_type		    theBlockCount);

	~XalanElemAttributeSetAllocator();

	~XalanElemAttributeSetAllocator();

Lines 77-84	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

/**

/**

	 * Determine if an object is owned by the allocator...

	 * Determine if an object is owned by the allocator...

(-) src/xalanc/XSLT/StylesheetExecutionContext.hpp (-11 / +10 lines)

Lines 56-61	Link Here

#include <xalanc/PlatformSupport/AttributeListImpl.hpp>

#include <xalanc/PlatformSupport/AttributeListImpl.hpp>

#include <xalanc/PlatformSupport/FormatterListener.hpp>

#include <xalanc/PlatformSupport/XalanCollationServices.hpp>

#include <xalanc/PlatformSupport/XalanCollationServices.hpp>

Lines 105-116	Link Here

public:

public:

#if defined(XALAN_STRICT_ANSI_HEADERS)

    typedef XalanSize_t     tl_size_type;

    typedef std::size_t     tl_size_type;

#else

    typedef size_t          tl_size_type;

#endif

    typedef FormatterListener::size_type    fl_size_type;

#if defined(XALAN_NO_STD_NAMESPACE)

#if defined(XALAN_NO_STD_NAMESPACE)

    typedef ostream         StreamType;

    typedef ostream         StreamType;

#else

#else

Lines 1069-1077	Link Here

*/

*/

    virtual void

    virtual void

    characters(

    characters(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length) = 0;

            fl_size_type            length) = 0;

/**

/**

     * Receive notification of character data. If available, when the

     * Receive notification of character data. If available, when the

Lines 1084-1092	Link Here

*/

*/

    virtual void

    virtual void

    charactersRaw(

    charactersRaw(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length) = 0;

            fl_size_type            length) = 0;

/**

/**

     * Called when a Comment is to be constructed.

     * Called when a Comment is to be constructed.

(-) src/xalanc/XSLT/ElemTemplateElement.cpp (-11 / +12 lines)

Lines 82-89	Link Here

ElemTemplateElement::ElemTemplateElement(

ElemTemplateElement::ElemTemplateElement(

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber,

            XalanFileLoc                    columnNumber,

            int                             xslToken) :

            int                             xslToken) :

    PrefixResolver(),

    PrefixResolver(),

    m_stylesheet(stylesheetTree),

    m_stylesheet(stylesheetTree),

Lines 112-119	Link Here

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            int                             xslToken,

            int                             xslToken,

            const XalanDOMString&           baseURI,

            const XalanDOMString&           baseURI,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    PrefixResolver(),

    PrefixResolver(),

    m_stylesheet(stylesheetTree),

    m_stylesheet(stylesheetTree),

    m_namespacesHandler(constructionContext.getMemoryManager()),

    m_namespacesHandler(constructionContext.getMemoryManager()),

Lines 158-164	Link Here

ElemTemplateElement::isAttrOK(

ElemTemplateElement::isAttrOK(

            const XalanDOMChar*             attrName,

            const XalanDOMChar*             attrName,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             which,

            XalanSize_t                     which,

            StylesheetConstructionContext&  constructionContext) const

            StylesheetConstructionContext&  constructionContext) const

    return m_stylesheet.isAttrOK(attrName, atts, which, constructionContext);

    return m_stylesheet.isAttrOK(attrName, atts, which, constructionContext);

Lines 171-177	Link Here

            const XalanDOMChar*             elementName,

            const XalanDOMChar*             elementName,

            const XalanDOMChar*             aname,

            const XalanDOMChar*             aname,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             which,

            XalanSize_t                     which,

            StylesheetConstructionContext&  constructionContext)

            StylesheetConstructionContext&  constructionContext)

    if(constructionContext.isXMLSpaceAttribute(

    if(constructionContext.isXMLSpaceAttribute(

Lines 1062-1073	Link Here

const XPath*

const XPath*

ElemTemplateElement::getXPath(unsigned int  /* index */) const

ElemTemplateElement::getXPath(XalanSize_t   /* index */) const

    return 0;

    return 0;

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

const ElemTemplateElement*

const ElemTemplateElement*

ElemTemplateElement::findTemplateToTransformChild(

ElemTemplateElement::findTemplateToTransformChild(

Lines 1504-1511	Link Here

ElemTemplateElement::LocatorProxy::LocatorProxy(

ElemTemplateElement::LocatorProxy::LocatorProxy(

            size_type               theLineNumber,

            XMLFileLoc              theLineNumber,

            size_type               theColumnNumber,

            XMLFileLoc              theColumnNumber,

            const XalanDOMString&   theURI) :

            const XalanDOMString&   theURI) :

    m_lineNumber(theLineNumber),

    m_lineNumber(theLineNumber),

    m_columnNumber(theColumnNumber),

    m_columnNumber(theColumnNumber),

Lines 1521-1527	Link Here

ElemTemplateElement::LocatorProxy::size_type

XMLFileLoc

ElemTemplateElement::LocatorProxy::getLineNumber() const

ElemTemplateElement::LocatorProxy::getLineNumber() const

    return m_lineNumber;

    return m_lineNumber;

Lines 1529-1535	Link Here

ElemTemplateElement::LocatorProxy::size_type

XMLFileLoc

ElemTemplateElement::LocatorProxy::getColumnNumber() const

ElemTemplateElement::LocatorProxy::getColumnNumber() const

    return m_columnNumber;

    return m_columnNumber;

(-) src/xalanc/XSLT/Stylesheet.cpp (-19 / +17 lines)

Lines 252-260	Link Here

    XPath*                  matchAttr = 0;

    XPath*                  matchAttr = 0;

    XPath*                  useAttr = 0;

    XPath*                  useAttr = 0;

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for(XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

Lines 317-323	Link Here

    if(0 == theQName)

    if (0 == theQName)

        const GetAndReleaseCachedString     theGuard(constructionContext);

        const GetAndReleaseCachedString     theGuard(constructionContext);

Lines 331-337	Link Here

            locator);

            locator);

    if(0 == matchAttr)

    if (0 == matchAttr)

        const GetAndReleaseCachedString     theGuard(constructionContext);

        const GetAndReleaseCachedString     theGuard(constructionContext);

Lines 345-351	Link Here

            locator);

            locator);

    if(0 == useAttr)

    if (0 == useAttr)

        const GetAndReleaseCachedString     theGuard(constructionContext);

        const GetAndReleaseCachedString     theGuard(constructionContext);

Lines 374-386	Link Here

void

void

Stylesheet::pushNamespaces(const AttributeListType&     atts)

Stylesheet::pushNamespaces(const AttributeListType&     atts)

    const unsigned int      nAttrs = atts.getLength();

    const XalanSize_t       nAttrs = atts.getLength();

    NamespaceVectorType     namespaces(getMemoryManager());

    NamespaceVectorType     namespaces(getMemoryManager());

    XalanDOMString          prefix(getMemoryManager());

    XalanDOMString          prefix(getMemoryManager());

    for(unsigned int i = 0; i < nAttrs; i++)

    for(XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   value = atts.getValue(i);

        const XalanDOMChar* const   value = atts.getValue(i);

Lines 438-449	Link Here

            Stylesheet::PatternTableVectorType&     theList,

            Stylesheet::PatternTableVectorType&     theList,

            const XalanMatchPatternData*            thePattern)

            const XalanMatchPatternData*            thePattern)

    typedef Stylesheet::size_type   size_type;

    assert(thePattern != 0);

    assert(thePattern != 0);

    const double        thePatternPriority = thePattern->getPriorityOrDefault();

    const double        thePatternPriority = thePattern->getPriorityOrDefault();

    const size_type     thePatternPosition = thePattern->getPosition();

    const XalanSize_t   thePatternPosition = thePattern->getPosition();

    typedef Stylesheet::PatternTableVectorType  PatternTableListType;

    typedef Stylesheet::PatternTableVectorType  PatternTableListType;

    typedef PatternTableListType::iterator      iterator;

    typedef PatternTableListType::iterator      iterator;

Lines 452-458	Link Here

    const iterator  theEnd = theList.end();

    const iterator  theEnd = theList.end();

    while(theCurrent != theEnd)

    while (theCurrent != theEnd)

        const double    theCurrentPriority = (*theCurrent)->getPriorityOrDefault();

        const double    theCurrentPriority = (*theCurrent)->getPriorityOrDefault();

Lines 626-632	Link Here

Stylesheet::isAttrOK(

Stylesheet::isAttrOK(

            const XalanDOMChar*             attrName,

            const XalanDOMChar*             attrName,

            const AttributeListType&        /* atts */,

            const AttributeListType&        /* atts */,

            int                             /* which */,

            XalanSize_t                     /* which */,

            StylesheetConstructionContext&  constructionContext) const

            StylesheetConstructionContext&  constructionContext) const

    // Namespace declarations are OK by definition

    // Namespace declarations are OK by definition

Lines 1497-1512	Link Here

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            StylesheetConstructionContext&  constructionContext)

            StylesheetConstructionContext&  constructionContext)

    const unsigned int      nAttrs = atts.getLength();

    const XalanSize_t       nAttrs = atts.getLength();

    const XalanDOMString*   stylesheetNamespace = 0;

    const XalanDOMString*   stylesheetNamespace = 0;

    const XalanDOMString*   resultNamespace = 0;

    const XalanDOMString*   resultNamespace = 0;

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true)

        if (equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true)

            const XalanDOMChar* const   value = atts.getValue(i);

            const XalanDOMChar* const   value = atts.getValue(i);

Lines 1519-1525	Link Here

                stylesheetNamespace = getNamespaceForPrefix(value, constructionContext);

                stylesheetNamespace = getNamespaceForPrefix(value, constructionContext);

        else if(equals(aname, Constants::ATTRNAME_RESULT_PREFIX))

        else if (equals(aname, Constants::ATTRNAME_RESULT_PREFIX))

            const XalanDOMChar* const   value = atts.getValue(i);

            const XalanDOMChar* const   value = atts.getValue(i);

Lines 1532-1538	Link Here

                resultNamespace = getNamespaceForPrefix(value, constructionContext);

                resultNamespace = getNamespaceForPrefix(value, constructionContext);

        else if(!isAttrOK(aname, atts, i, constructionContext))

        else if (!isAttrOK(aname, atts, i, constructionContext))

            const GetAndReleaseCachedString     theGuard(constructionContext);

            const GetAndReleaseCachedString     theGuard(constructionContext);

Lines 1588-1597	Link Here

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            const LocatorType*              locator)

            const LocatorType*              locator)

    const XalanLocator::size_type   lineNumber =

    const XalanFileLoc  lineNumber =

        XalanLocator::getLineNumber(locator);

        XalanLocator::getLineNumber(locator);

    const XalanLocator::size_type   columnNumber =

    const XalanFileLoc  columnNumber =

        XalanLocator::getColumnNumber(locator);

        XalanLocator::getColumnNumber(locator);

    m_elemDecimalFormats.reserve(m_elemDecimalFormats.size() + 1);

    m_elemDecimalFormats.reserve(m_elemDecimalFormats.size() + 1);

(-) src/xalanc/XSLT/ElemUse.cpp (-3 / +3 lines)

Lines 48-55	Link Here

ElemUse::ElemUse(

ElemUse::ElemUse(

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber,

			XalanFileLoc					columnNumber,

			int								xslToken) :

			int								xslToken) :

	ElemTemplateElement(constructionContext,

	ElemTemplateElement(constructionContext,

						stylesheetTree,

						stylesheetTree,

Lines 268-274	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			const XalanDOMChar*				attrName,

			const XalanDOMChar*				attrName,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								which)

			XalanSize_t						which)

	bool isUAS = false;

	bool isUAS = false;

(-) src/xalanc/XSLT/ElemValueOf.cpp (-4 / +4 lines)

Lines 185-191	Link Here

    void

    void

    characters(

    characters(

                const XMLCh* const  chars,

                const XMLCh* const  chars,

                const unsigned int  length)

                const size_type     length)

        m_executionContext.characters(chars, 0, length);

        m_executionContext.characters(chars, 0, length);

Lines 193-199	Link Here

    void

    void

    charactersRaw(

    charactersRaw(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

        m_executionContext.charactersRaw(chars, 0, length);

        m_executionContext.charactersRaw(chars, 0, length);

Lines 206-212	Link Here

    void

    void

    ignorableWhitespace(

    ignorableWhitespace(

                const XMLCh* const  /* chars */,

                const XMLCh* const  /* chars */,

                const unsigned int  /* length */)

                const size_type     /* length */)

Lines 232-238	Link Here

    void

    void

    cdata(

    cdata(

                const XMLCh* const  /* ch */,

                const XMLCh* const  /* ch */,

                const unsigned int  /* length */)

                const size_type     /* length */)

(-) src/xalanc/XSLT/ElemCopy.cpp (-8 / +8 lines)

Lines 46-77	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemUse(constructionContext,

    ElemUse(constructionContext,

            stylesheetTree,

            stylesheetTree,

            lineNumber,

            lineNumber,

            columnNumber,

            columnNumber,

            StylesheetConstructionContext::ELEMNAME_COPY)

            StylesheetConstructionContext::ELEMNAME_COPY)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(processUseAttributeSets(

        if (processUseAttributeSets(

                constructionContext,

                constructionContext,

                aname,

                aname,

                atts,

                atts,

                i) == false &&

                i) == false &&

           processSpaceAttr(

            processSpaceAttr(

                Constants::ELEMNAME_COPY_WITH_PREFIX_STRING.c_str(),

                Constants::ELEMNAME_COPY_WITH_PREFIX_STRING.c_str(),

                aname,

                aname,

                atts,

                atts,

i,

i,

                constructionContext) == false &&

                constructionContext) == false &&

           isAttrOK(

            isAttrOK(

                aname,

                aname,

                atts,

                atts,

i,

i,

Lines 94-99	Link Here

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

const ElemTemplateElement*

const ElemTemplateElement*

ElemCopy::startElement(StylesheetExecutionContext&  executionContext) const

ElemCopy::startElement(StylesheetExecutionContext&  executionContext) const

Lines 120-126	Link Here

            executionContext.copyNamespaceAttributes(*sourceNode);

            executionContext.copyNamespaceAttributes(*sourceNode);

            return beginExecuteChildren(executionContext);

            return beginExecuteChildren(executionContext);

        else

        else

(-) src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (-3 / +4 lines)

Lines 213-220	Link Here

	getURLFromString(const XalanDOMString&	urlString);

	getURLFromString(const XalanDOMString&	urlString);

	virtual XalanDOMString&

	virtual XalanDOMString&

	getURLStringFromString(const XalanDOMString&	urlString,

	getURLStringFromString(

                            XalanDOMString& theResult);

            const XalanDOMString&	urlString,

            XalanDOMString&         theResult);

	virtual URLAutoPtrType

	virtual URLAutoPtrType

	getURLFromString(

	getURLFromString(

Lines 648-654	Link Here

	static const ElementTokenTableEntry		s_elementTokenTable[];

	static const ElementTokenTableEntry		s_elementTokenTable[];

	static const unsigned int				s_elementTokenTableSize;

	static const XalanSize_t				s_elementTokenTableSize;

	static const ElementTokenTableEntry&	s_elementTokenTableLast;

	static const ElementTokenTableEntry&	s_elementTokenTableLast;

(-) src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (-8 / +7 lines)

Lines 471-485	Link Here

    virtual void

    virtual void

    characters(

    characters(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length);

            fl_size_type            length);

    virtual void

    virtual void

    charactersRaw(

    charactersRaw(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            fl_size_type            start,

            XalanDOMString::size_type   length);

            fl_size_type            length);

    virtual void

    virtual void

    comment(const XalanDOMChar*     data);

    comment(const XalanDOMChar*     data);

Lines 515-522	Link Here

    endCreateXResultTreeFrag();

    endCreateXResultTreeFrag();

    virtual void

    virtual void

    beginFormatToText(

    beginFormatToText(XalanDOMString&   theResult);

            XalanDOMString&             theResult);

    virtual void

    virtual void

    endFormatToText();

    endFormatToText();

(-) src/xalanc/XSLT/ElemSort.hpp (-5 / +5 lines)

Lines 59-66	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

    static ElemSort*

    static ElemSort*

	create(

	create(

Lines 68-75	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	~ElemSort();

	~ElemSort();

Lines 132-138	Link Here

	getElementName() const;

	getElementName() const;

	virtual	const XPath*

	virtual	const XPath*

	getXPath(unsigned int	index = 0) const;

	getXPath(XalanSize_t	index = 0) const;

private:

private:

(-) src/xalanc/XSLT/XSLTEngineImpl.cpp (-40 / +43 lines)

Lines 692-698	Link Here

#if defined(XALAN_OLD_STYLE_CASTS)

#if defined(XALAN_OLD_STYLE_CASTS)

                nsNode = (const XalanElement*)&fragBase;

                nsNode = (const XalanElement*)&fragBase;

#else

#else

                nsNode = static_cast<XalanElement*>(node);

                nsNode = static_cast<const XalanElement*>(node);

#endif

#endif

            else

            else

Lines 1064-1072	Link Here

    XalanDOMString          uri( theManager );

    XalanDOMString          uri( theManager );

    int                     lineNumber = XalanLocator::getUnknownValue();

    XalanFileLoc    lineNumber =

    int                     columnNumber = XalanLocator::getUnknownValue();

        XalanLocator::getUnknownValue();

    XalanFileLoc    columnNumber =

        XalanLocator::getUnknownValue();

    const LocatorType*      locator = getLocatorFromStack();

    const LocatorType*      locator = getLocatorFromStack();

    if (locator == 0 && styleNode != 0)

    if (locator == 0 && styleNode != 0)

Lines 1136-1143	Link Here

        id = &theDummy;

        id = &theDummy;

    const XalanLocator::size_type   lineNumber = locator.getLineNumber();

    XalanFileLoc    lineNumber = locator.getLineNumber();

    const XalanLocator::size_type   columnNumber = locator.getColumnNumber();

    XalanFileLoc    columnNumber = locator.getColumnNumber();

    if (m_problemListener != 0)

    if (m_problemListener != 0)

Lines 1364-1375	Link Here

void

void

XSLTEngineImpl::addResultAttribute(

XSLTEngineImpl::addResultAttribute(

            AttributeListImpl&          attList,

            AttributeListImpl&      attList,

            const XalanDOMString&       aname,

            const XalanDOMString&   aname,

            const XalanDOMChar*         value,

            const XalanDOMChar*     value,

            XalanDOMString::size_type   theLength,

            size_type               theLength,

            bool                        fromCopy,

            bool                    fromCopy,

			const LocatorType*	        locator)

            const LocatorType*      locator)

    assert(value != 0);

    assert(value != 0);

Lines 1517-1529	Link Here

    const AttributeListImpl&    thePendingAttributes =

    const AttributeListImpl&    thePendingAttributes =

        (const AttributeListImpl&)getPendingAttributes();

        (const AttributeListImpl&)getPendingAttributes();

    const unsigned int  n = thePendingAttributes.getLength();

    const XalanSize_t   n = thePendingAttributes.getLength();

    for(unsigned int i = 0; i < n; i++)

    for (XalanSize_t i = 0; i < n; i++)

        if(equals(

        if (equals(

            thePendingAttributes.getName(i),

                thePendingAttributes.getName(i),

            DOMServices::s_XMLNamespace) == true)

                DOMServices::s_XMLNamespace) == true)

            return true;

            return true;

Lines 1650-1656	Link Here

    flushPending();

    flushPending();

    const unsigned int  nAtts = atts.getLength();

    const XalanSize_t   nAtts = atts.getLength();

    assert(m_outputContextStack.empty() == false);

    assert(m_outputContextStack.empty() == false);

Lines 1659-1665	Link Here

    thePendingAttributes.clear();

    thePendingAttributes.clear();

    for(unsigned int i = 0; i < nAtts; i++)

    for (XalanSize_t i = 0; i < nAtts; i++)

        thePendingAttributes.addAttribute(

        thePendingAttributes.addAttribute(

            atts.getName(i),

            atts.getName(i),

Lines 1708-1715	Link Here

void

void

XSLTEngineImpl::characters(

XSLTEngineImpl::characters(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   length)

            size_type               length)

    characters(

    characters(

ch,

ch,

Lines 1721-1729	Link Here

void

void

XSLTEngineImpl::characters(

XSLTEngineImpl::characters(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            size_type               start,

            XalanDOMString::size_type   length)

            size_type               length)

    assert(getFormatterListenerImpl() != 0);

    assert(getFormatterListenerImpl() != 0);

    assert(ch != 0);

    assert(ch != 0);

Lines 1732-1742	Link Here

    doFlushPending();

    doFlushPending();

    if(generateCDATASection() == true)

    if (generateCDATASection() == true)

        getFormatterListenerImpl()->cdata(ch + start, length);

        getFormatterListenerImpl()->cdata(ch + start, length);

        if(getTraceListeners() > 0)

        if (getTraceListeners() > 0)

            fireCharacterGenerateEvent(ch, start, length, true);

            fireCharacterGenerateEvent(ch, start, length, true);

Lines 1745-1751	Link Here

        getFormatterListenerImpl()->characters(ch + start, length);

        getFormatterListenerImpl()->characters(ch + start, length);

        if(getTraceListeners() > 0)

        if (getTraceListeners() > 0)

            fireCharacterGenerateEvent(ch, start, length, false);

            fireCharacterGenerateEvent(ch, start, length, false);

Lines 1817-1825	Link Here

void

void

XSLTEngineImpl::charactersRaw(

XSLTEngineImpl::charactersRaw(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            size_type               start,

            XalanDOMString::size_type   length)

            size_type               length)

    assert(ch != 0);

    assert(ch != 0);

    assert(length != 0);

    assert(length != 0);

Lines 1880-1887	Link Here

void

void

XSLTEngineImpl::ignorableWhitespace(

XSLTEngineImpl::ignorableWhitespace(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   length)

            size_type               length)

    assert(getFormatterListenerImpl() != 0);

    assert(getFormatterListenerImpl() != 0);

    assert(ch != 0);

    assert(ch != 0);

Lines 1973-1981	Link Here

void

void

XSLTEngineImpl::cdata(

XSLTEngineImpl::cdata(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            size_type               start,

            XalanDOMString::size_type   length)

            size_type               length)

    assert(getFormatterListenerImpl() != 0);

    assert(getFormatterListenerImpl() != 0);

    assert(ch != 0);

    assert(ch != 0);

Lines 2716-2722	Link Here

            const XalanDOMString&       thePrefix,

            const XalanDOMString&       thePrefix,

            XalanDOMString::size_type   thePrefixLength)

            XalanDOMString::size_type   thePrefixLength)

    const unsigned int  thePendingAttributesCount =

    const XalanSize_t   thePendingAttributesCount =

                thePendingAttributes.getLength();

                thePendingAttributes.getLength();

    if (thePendingAttributesCount == 0)

    if (thePendingAttributesCount == 0)

Lines 2729-2735	Link Here

        bool    fResult = false;

        bool    fResult = false;

        // Check each attribute...

        // Check each attribute...

        for (unsigned int i = 0; i < thePendingAttributesCount; ++i)

        for (XalanSize_t i = 0; i < thePendingAttributesCount; ++i)

            const XalanDOMChar* const   thePendingAttributeName =

            const XalanDOMChar* const   thePendingAttributeName =

                            thePendingAttributes.getName(i);

                            thePendingAttributes.getName(i);

Lines 3141-3150	Link Here

void

void

XSLTEngineImpl::fireCharacterGenerateEvent(

XSLTEngineImpl::fireCharacterGenerateEvent(

            const XalanDOMChar*         ch,

            const XalanDOMChar*     ch,

            XalanDOMString::size_type   start,

            size_type               start,

            XalanDOMString::size_type   length,

            size_type               length,

            bool                        isCDATA)

            bool                    isCDATA)

    const GenerateEvent     ge(

    const GenerateEvent     ge(

        isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA : GenerateEvent::EVENTTYPE_CHARACTERS,

        isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA : GenerateEvent::EVENTTYPE_CHARACTERS,

(-) src/xalanc/XSLT/DecimalToRoman.hpp (-1 / +1 lines)

Lines 38-44	Link Here

	enum { eMaxLetter = 2 };

	enum { eMaxLetter = 2 };

	typedef unsigned long	ValueType;

	typedef XalanSize_t     ValueType;

	ValueType		m_postValue;

	ValueType		m_postValue;

(-) src/xalanc/XSLT/ElemForEach.cpp (-12 / +12 lines)

Lines 55-62	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

Lines 66-82	Link Here

    m_sortElems(constructionContext.getMemoryManager()),

    m_sortElems(constructionContext.getMemoryManager()),

    m_sortElemsCount(0)

    m_sortElemsCount(0)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_SELECT))

        if (equals(aname, Constants::ATTRNAME_SELECT))

            m_selectPattern = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);

            m_selectPattern = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);

        else if(isAttrOK(

        else if (isAttrOK(

                    aname,

                    aname,

                    atts,

                    atts,

i,

i,

Lines 96-102	Link Here

    if(0 == m_selectPattern)

    if (0 == m_selectPattern)

        error(

        error(

            constructionContext,

            constructionContext,

Lines 111-118	Link Here

ElemForEach::ElemForEach(

ElemForEach::ElemForEach(

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber,

            XalanFileLoc                    columnNumber,

            int                             xslToken) :

            int                             xslToken) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

Lines 147-154	Link Here

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            const LocatorType*              locator)

            const LocatorType*              locator)

    const int   lineNumber = XalanLocator::getLineNumber(locator);

    const XalanFileLoc  lineNumber = XalanLocator::getLineNumber(locator);

    const int   columnNumber = XalanLocator::getColumnNumber(locator);

    const XalanFileLoc  columnNumber = XalanLocator::getColumnNumber(locator);

    m_sortElems.reserve(m_sortElems.size() + 1);

    m_sortElems.reserve(m_sortElems.size() + 1);

Lines 826-832	Link Here

const XPath*

const XPath*

ElemForEach::getXPath(unsigned int  index) const

ElemForEach::getXPath(XalanSize_t   index) const

    return index == 0 ? m_selectPattern : 0;

    return index == 0 ? m_selectPattern : 0;

(-) src/xalanc/XSLT/ElemApplyTemplates.hpp (-5 / +5 lines)

Lines 50-60	Link Here

	 * @param columnNumber			column number in document

	 * @param columnNumber			column number in document

*/

*/

	ElemApplyTemplates(

	ElemApplyTemplates(

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&  constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&                     stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&        atts,

			int								lineNumber,

			XalanFileLoc                    lineNumber,

			int								columnNumber);

			XalanFileLoc                    columnNumber);

    virtual

    virtual

    ~ElemApplyTemplates();

    ~ElemApplyTemplates();

(-) src/xalanc/XSLT/StylesheetHandler.cpp (-8 / +8 lines)

Lines 1525-1531	Link Here

void

void

StylesheetHandler::characters(

StylesheetHandler::characters(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

    if (m_inTemplate == false &&

    if (m_inTemplate == false &&

        inExtensionElement() == false &&

        inExtensionElement() == false &&

Lines 1551-1557	Link Here

void

void

StylesheetHandler::cdata(

StylesheetHandler::cdata(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

    accumulateText(chars, length);

    accumulateText(chars, length);

Lines 1565-1571	Link Here

void

void

StylesheetHandler::ignorableWhitespace(

StylesheetHandler::ignorableWhitespace(

            const XMLCh* const  /*chars*/,

            const XMLCh* const  /*chars*/,

            const unsigned int  /*length*/)

            const size_type     /*length*/)

    // Ignore!

    // Ignore!

    m_lastPopped = 0;

    m_lastPopped = 0;

Lines 1617-1623	Link Here

void

void

StylesheetHandler::charactersRaw(

StylesheetHandler::charactersRaw(

            const XMLCh* const  /* chars */,

            const XMLCh* const  /* chars */,

            const unsigned int  /* length */)

            const size_type     /* length */)

Lines 1625-1632	Link Here

void

void

StylesheetHandler::processText(

StylesheetHandler::processText(

            const XMLCh*                chars,

            const XMLCh*    chars,

            XalanDOMString::size_type   length)

            size_type       length)

    if(m_inTemplate)

    if(m_inTemplate)

Lines 1719-1726	Link Here

void

void

StylesheetHandler::accumulateText(

StylesheetHandler::accumulateText(

            const XMLCh*                chars,

            const XMLCh*    chars,

            XalanDOMString::size_type   length)

            size_type       length)

    if(m_inTemplate)

    if(m_inTemplate)

(-) src/xalanc/XSLT/ElemTemplateElement.hpp (-15 / +15 lines)

Lines 89-96	Link Here

    ElemTemplateElement(

    ElemTemplateElement(

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber,

            XalanFileLoc                    columnNumber,

            int                             xslToken);

            int                             xslToken);

/**

/**

Lines 110-117	Link Here

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            int                             xslToken,

            int                             xslToken,

            const XalanDOMString&           baseURI = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),

            const XalanDOMString&           baseURI = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),

            int                             lineNumber = XalanLocator::getUnknownValue(),

            XalanFileLoc                    lineNumber = XalanLocator::getUnknownValue(),

            int                             columnNumber = XalanLocator::getUnknownValue());

            XalanFileLoc                    columnNumber = XalanLocator::getUnknownValue());

    virtual

    virtual

    ~ElemTemplateElement();

    ~ElemTemplateElement();

Lines 138-144	Link Here

    isAttrOK(

    isAttrOK(

            const XalanDOMChar*             attrName,

            const XalanDOMChar*             attrName,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             which,

            XalanSize_t                     which,

            StylesheetConstructionContext&  constructionContext) const;

            StylesheetConstructionContext&  constructionContext) const;

/**

/**

Lines 156-162	Link Here

            const XalanDOMChar*             elementName,

            const XalanDOMChar*             elementName,

            const XalanDOMChar*             aname,

            const XalanDOMChar*             aname,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             which,

            XalanSize_t                     which,

            StylesheetConstructionContext&  constructionContext);

            StylesheetConstructionContext&  constructionContext);

/**

/**

Lines 615-621	Link Here

     * @return pointer or null

     * @return pointer or null

*/

*/

    virtual const XPath*

    virtual const XPath*

    getXPath(unsigned int   index = 0) const;

    getXPath(XalanSize_t    index) const;

    // These interfaces are inherited from PrefixResolver...

    // These interfaces are inherited from PrefixResolver...

Lines 633-640	Link Here

    public:

    public:

        LocatorProxy(

        LocatorProxy(

                    size_type               theLineNumber,

                    XMLFileLoc              theLineNumber,

                    size_type               theColumnNumber,

                    XMLFileLoc              theColumnNumber,

                    const XalanDOMString&   theURI);

                    const XalanDOMString&   theURI);

        virtual

        virtual

Lines 646-655	Link Here

        virtual const XMLCh*

        virtual const XMLCh*

        getSystemId() const;

        getSystemId() const;

        virtual size_type

        virtual XMLFileLoc

        getLineNumber() const;

        getLineNumber() const;

        virtual size_type

        virtual XMLFileLoc

        getColumnNumber() const;

        getColumnNumber() const;

        const XalanDOMString&

        const XalanDOMString&

Lines 670-690	Link Here

        operator==(const LocatorProxy&) const;

        operator==(const LocatorProxy&) const;

        // data members...

        // data members...

        const size_type         m_lineNumber;

        const XMLFileLoc        m_lineNumber;

        const size_type         m_columnNumber;

        const XMLFileLoc        m_columnNumber;

        const XalanDOMString&   m_uri;

        const XalanDOMString&   m_uri;

};

};

    LocatorProxy::size_type

    XMLFileLoc

    getLineNumber() const

    getLineNumber() const

        return m_locatorProxy.getLineNumber();

        return m_locatorProxy.getLineNumber();

    LocatorProxy::size_type

    XMLFileLoc

    getColumnNumber() const

    getColumnNumber() const

        return m_locatorProxy.getColumnNumber();

        return m_locatorProxy.getColumnNumber();

(-) src/xalanc/XSLT/Stylesheet.hpp (-6 / +7 lines)

Lines 86-92	Link Here

public:

public:

    typedef StylesheetConstructionContext::size_type        size_type;

	typedef StylesheetExecutionContext::ParamVectorType		ParamVectorType;

	typedef StylesheetExecutionContext::ParamVectorType		ParamVectorType;

	typedef XalanQName::NamespaceVectorType					NamespaceVectorType;

	typedef XalanQName::NamespaceVectorType					NamespaceVectorType;

	typedef XalanQName::NamespacesStackType					NamespacesStackType;

	typedef XalanQName::NamespacesStackType					NamespacesStackType;

Lines 288-294	Link Here

	isAttrOK(

	isAttrOK(

			const XalanDOMChar*				attrName,

			const XalanDOMChar*				attrName,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int 							which,

			XalanSize_t						which,

			StylesheetConstructionContext&	constructionContext) const;

			StylesheetConstructionContext&	constructionContext) const;

/**

/**

Lines 298-305	Link Here

	 * @return namespace string for node, or null if not found.

	 * @return namespace string for node, or null if not found.

*/

*/

	const XalanDOMString*

	const XalanDOMString*

	getNamespaceFromStack(const XalanDOMString& 	nodeName,

    getNamespaceFromStack(

                            XalanDOMString&         theBuffer) const

                const XalanDOMString&   nodeName,

                XalanDOMString&         theBuffer) const

		return getNamespaceFromStack(c_wstr(nodeName), theBuffer);

		return getNamespaceFromStack(c_wstr(nodeName), theBuffer);

Lines 311-318	Link Here

	 * @return namespace string for node, or null if not found.

	 * @return namespace string for node, or null if not found.

*/

*/

	const XalanDOMString*

	const XalanDOMString*

	getNamespaceFromStack(const XalanDOMChar* 	nodeName,

    getNamespaceFromStack(

                            XalanDOMString&     theBuffer) const;

                const XalanDOMChar*     nodeName,

                XalanDOMString&         theBuffer) const;

/**

/**

	 * Get the namespace from a prefix by searching the stack of namespace

	 * Get the namespace from a prefix by searching the stack of namespace

(-) src/xalanc/XSLT/ElemUse.hpp (-3 / +3 lines)

Lines 56-63	Link Here

	ElemUse(

	ElemUse(

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber,

			XalanFileLoc					columnNumber,

			int								xslToken);

			int								xslToken);

	virtual

	virtual

Lines 77-83	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			const XalanDOMChar*				attrName,

			const XalanDOMChar*				attrName,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								which);

			XalanSize_t						which);

	// These methods are inherited from ElemTemplateElement ...

	// These methods are inherited from ElemTemplateElement ...

(-) src/xalanc/XSLT/ElemCallTemplate.cpp (-4 / +4 lines)

Lines 54-66	Link Here

    m_templateName(0),

    m_templateName(0),

    m_template(0)

    m_template(0)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for(XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_NAME))

        if (equals(aname, Constants::ATTRNAME_NAME))

            m_templateName = constructionContext.createXalanQName(

            m_templateName = constructionContext.createXalanQName(

                    atts.getValue(i),

                    atts.getValue(i),

Lines 76-82	Link Here

                    atts.getValue(i));

                    atts.getValue(i));

        else if(isAttrOK(

        else if (isAttrOK(

                    aname,

                    aname,

                    atts,

                    atts,

i,

i,

(-) src/xalanc/XSLT/CountersTable.hpp (-1 / +1 lines)

Lines 55-61	Link Here

*/

*/

struct Counter

struct Counter

	typedef unsigned long	CountType;

	typedef XalanSize_t     CountType;

	typedef XalanVector<XalanNode*>			NodeVectorType;

	typedef XalanVector<XalanNode*>			NodeVectorType;

(-) src/xalanc/XSLT/ElemCopy.hpp (-2 / +2 lines)

Lines 49-56	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	// These methods are inherited from ElemTemplateElement ...

	// These methods are inherited from ElemTemplateElement ...

(-) src/xalanc/XSLT/ElemChoose.cpp (-10 / +10 lines)

Lines 48-73	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

                        columnNumber,

                        columnNumber,

                        StylesheetConstructionContext::ELEMNAME_CHOOSE)

                        StylesheetConstructionContext::ELEMNAME_CHOOSE)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(isAttrOK(

        if (isAttrOK(

                aname,

                aname,

                atts,

                atts,

i,

i,

                constructionContext) == false &&

                constructionContext) == false &&

           processSpaceAttr(

            processSpaceAttr(

                Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING.c_str(),

                Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING.c_str(),

                aname,

                aname,

                atts,

                atts,

Lines 107-123	Link Here

        const int   type = node->getXSLToken();

        const int   type = node->getXSLToken();

        if(StylesheetConstructionContext::ELEMNAME_WHEN == type)

        if (StylesheetConstructionContext::ELEMNAME_WHEN == type)

            const XPath* const      theXPath = node->getXPath();

            const XPath* const      theXPath = node->getXPath(0);

            assert(theXPath != 0);

            assert(theXPath != 0);

            bool    test;

            bool    test;

            theXPath->execute(*this, executionContext, test);

            theXPath->execute(*this, executionContext, test);

            if(0 != executionContext.getTraceListeners())

            if (0 != executionContext.getTraceListeners())

                executionContext.fireSelectEvent(

                executionContext.fireSelectEvent(

                    SelectionEvent(executionContext,

                    SelectionEvent(executionContext,

Lines 172-178	Link Here

        if(StylesheetConstructionContext::ELEMNAME_WHEN == type)

        if(StylesheetConstructionContext::ELEMNAME_WHEN == type)

            const XPath* const      theXPath = node->getXPath();

            const XPath* const      theXPath = node->getXPath(0);

            assert(theXPath != 0);

            assert(theXPath != 0);

            bool    test;

            bool    test;

(-) src/xalanc/XSLT/ElemApplyImport.cpp (-5 / +5 lines)

Lines 52-72	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

        ElemTemplateElement(constructionContext,

        ElemTemplateElement(constructionContext,

                            stylesheetTree,

                            stylesheetTree,

                            lineNumber,

                            lineNumber,

                            columnNumber,

                            columnNumber,

                            StylesheetConstructionContext::ELEMNAME_APPLY_IMPORTS)

                            StylesheetConstructionContext::ELEMNAME_APPLY_IMPORTS)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(isAttrOK(

        if (isAttrOK(

                aname,

                aname,

                atts,

                atts,

i,

i,

(-) src/xalanc/XSLT/KeyDeclaration.hpp (-6 / +6 lines)

Lines 54-61	Link Here

			const XPath&				matchPattern,

			const XPath&				matchPattern,

			const XPath&				use,

			const XPath&				use,

			const XalanDOMString&		uri,

			const XalanDOMString&		uri,

			XalanLocator::size_type		lineNumber,

			XMLFileLoc		            lineNumber,

			XalanLocator::size_type		columnNumber) :

			XMLFileLoc		            columnNumber) :

		m_qname(&qname),

		m_qname(&qname),

		m_match(&matchPattern),

		m_match(&matchPattern),

		m_use(&use),

		m_use(&use),

Lines 136-142	Link Here

	 * @return The line number

	 * @return The line number

*/

*/

	XalanLocator::size_type

	XMLFileLoc

	getLineNumber() const

	getLineNumber() const

		return m_lineNumber;

		return m_lineNumber;

Lines 147-153	Link Here

	 * @return The column number

	 * @return The column number

*/

*/

	XalanLocator::size_type

	XMLFileLoc

	getColumnNumber() const

	getColumnNumber() const

		return m_columnNumber;

		return m_columnNumber;

Lines 163-171	Link Here

	const XalanDOMString*		m_uri;

	const XalanDOMString*		m_uri;

	XalanLocator::size_type		m_lineNumber;

	XMLFileLoc		            m_lineNumber;

	XalanLocator::size_type		m_columnNumber;

	XMLFileLoc                  m_columnNumber;

};

};

(-) src/xalanc/XSLT/ElemAttribute.cpp (-4 / +5 lines)

Lines 46-53	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

Lines 56-64	Link Here

    m_nameAVT(0),

    m_nameAVT(0),

    m_namespaceAVT(0)

    m_namespaceAVT(0)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

Lines 398-403	Link Here

    executionContext.getAndPopCachedString();

    executionContext.getAndPopCachedString();

    return 0;

    return 0;

(-) src/xalanc/XSLT/XSLTEngineImpl.hpp (-62 / +62 lines)

Lines 425-431	Link Here

	addResultNamespaceDecl(

	addResultNamespaceDecl(

			const XalanDOMString&		prefix,

			const XalanDOMString&		prefix,

			const XalanDOMChar*			namespaceVal,

			const XalanDOMChar*			namespaceVal,

			XalanDOMString::size_type	len)

			size_type					len)

		m_resultNamespacesStack.addDeclaration(

		m_resultNamespacesStack.addDeclaration(

			prefix,

			prefix,

Lines 496-510	Link Here

     * @param theLength The length of the value

     * @param theLength The length of the value

     * @param fromCopy true if the attribute is being copied from the source tree

     * @param fromCopy true if the attribute is being copied from the source tree

     * @param locator The Locator for reporting errors.

     * @param locator The Locator for reporting errors.

*/

*/

	void

    void

	addResultAttribute(

    addResultAttribute(

			AttributeListImpl&			attList,

            AttributeListImpl&      attList,

			const XalanDOMString&		aname,

            const XalanDOMString&   aname,

			const XalanDOMChar*			value,

            const XalanDOMChar*     value,

            XalanDOMString::size_type   theLength,

            size_type               theLength,

            bool                        fromCopy = false,

            bool                    fromCopy = false,

			const LocatorType*	        locator = 0);

            const LocatorType*      locator = 0);

/**

/**

	 * Add attribute to pending attributes list, and if it is a namespace, add

	 * Add attribute to pending attributes list, and if it is a namespace, add

Lines 585-599	Link Here

	void

	void

	endElement(const XalanDOMChar*	name);

	endElement(const XalanDOMChar*	name);

	void

    void

	characters (

    characters (

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	length);

            size_type               length);

	void

    void

	ignorableWhitespace(

    ignorableWhitespace(

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	length);

            size_type               length);

	void

	void

	processingInstruction(

	processingInstruction(

Lines 603-620	Link Here

	void

	void

	resetDocument();

	resetDocument();

/**

/**

	 * Receive notification of character data.

     * Receive notification of character data.

	 * @param ch	 pointer to characters from the XML document

     * @param ch     pointer to characters from the XML document

	 * @param start  startng offset in 'ch' array

     * @param start  startng offset in 'ch' array

	 * @param length number of characters to read from the array

     * @param length number of characters to read from the array

*/

*/

	void

    void

	characters(

    characters(

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	start,

            size_type               start,

			XalanDOMString::size_type	length);

            size_type               length);

/**

/**

	 * Send character data from the node to the result tree.

	 * Send character data from the node to the result tree.

Lines 641-660	Link Here

	void

	void

	startElement(const XalanDOMChar*	name);

	startElement(const XalanDOMChar*	name);

/**

/**

	 * Receive notification of character data. If available, when the

     * Receive notification of character data. If available, when the

	 * disable-output-escaping attribute is used, output raw text without

     * disable-output-escaping attribute is used, output raw text without

	 * escaping.

     * escaping.

	 * @param ch pointer to characters from the XML document

     * @param ch pointer to characters from the XML document

	 * @param start start position in the array

     * @param start start position in the array

	 * @param length number of characters to read from the array

     * @param length number of characters to read from the array

*/

*/

	void

    void

	charactersRaw(

    charactersRaw(

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	start,

            size_type               start,

			XalanDOMString::size_type	length);

            size_type               length);

/**

/**

	 * Send raw character data from the node to the result tree.

	 * Send raw character data from the node to the result tree.

Lines 689-706	Link Here

	void

	void

	entityReference(const XalanDOMChar*		data);

	entityReference(const XalanDOMChar*		data);

/**

/**

	 * Receive notification of cdata.

     * Receive notification of cdata.

	 * @param ch	 pointer to characters from the XML document

     * @param ch     pointer to characters from the XML document

	 * @param start  start position in the array

     * @param start  start position in the array

	 * @param length number of characters to read from the array

     * @param length number of characters to read from the array

*/

*/

	void

    void

	cdata(

    cdata(

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	start,

            size_type               start,

			XalanDOMString::size_type	length);

            size_type               length);

/**

/**

	 * Clone a node to the result tree

	 * Clone a node to the result tree

Lines 1600-1611	Link Here

			const XalanDOMString&	theString,

			const XalanDOMString&	theString,

			bool					isCDATA);

			bool					isCDATA);

	void

    void

	fireCharacterGenerateEvent(

    fireCharacterGenerateEvent(

			const XalanDOMChar*			ch,

            const XalanDOMChar*     ch,

			XalanDOMString::size_type	start,

            size_type               start,

			XalanDOMString::size_type	length,

            size_type               length,

			bool						isCDATA);

            bool                    isCDATA);

	void

	void

	checkDefaultNamespace(

	checkDefaultNamespace(

(-) src/xalanc/XSLT/ElemForEach.hpp (-11 / +11 lines)

Lines 67-77	Link Here

	 * @param columnNumber			column number in document

	 * @param columnNumber			column number in document

*/

*/

	ElemForEach(

	ElemForEach(

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&  constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&                     stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&        atts,

			int								lineNumber,

			XalanFileLoc                    lineNumber,

			int								columnNumber);

			XalanFileLoc                    columnNumber);

	virtual

	virtual

	~ElemForEach();

	~ElemForEach();

Lines 112-118	Link Here

#endif

#endif

	virtual	const XPath*

	virtual	const XPath*

	getXPath(unsigned int	index = 0) const;

	getXPath(XalanSize_t    index) const;

protected:

protected:

Lines 126-136	Link Here

	 * @param xslToken             an integer representing the type of instance.

	 * @param xslToken             an integer representing the type of instance.

*/

*/

	ElemForEach(

	ElemForEach(

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&  constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&                     stylesheetTree,

			int								lineNumber,

			XalanFileLoc                    lineNumber,

			int								columnNumber,

			XalanFileLoc                    columnNumber,

			int								xslToken);

			int                             xslToken);

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

(-) src/xalanc/XSLT/XalanElemElementAllocator.cpp (-3 / +5 lines)

Lines 23-29	Link Here

XalanElemElementAllocator::XalanElemElementAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :

XalanElemElementAllocator::XalanElemElementAllocator(

            MemoryManagerType&  theManager,

            size_type	        theBlockCount) :

	m_allocator(theManager, theBlockCount)

	m_allocator(theManager, theBlockCount)

Lines 41-48	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc				    lineNumber,

			int								columnNumber)

			XalanFileLoc					columnNumber)

	data_type* const	theBlock = m_allocator.allocateBlock();

	data_type* const	theBlock = m_allocator.allocateBlock();

	assert(theBlock != 0);

	assert(theBlock != 0);

(-) src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (-3 / +5 lines)

Lines 23-29	Link Here

XalanElemAttributeAllocator::XalanElemAttributeAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :

XalanElemAttributeAllocator::XalanElemAttributeAllocator(

            MemoryManagerType&  theManager,

            size_type	        theBlockCount) :

	m_allocator(theManager, theBlockCount)

	m_allocator(theManager, theBlockCount)

Lines 41-48	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber)

			XalanFileLoc					columnNumber)

	data_type* const	theBlock = m_allocator.allocateBlock();

	data_type* const	theBlock = m_allocator.allocateBlock();

	assert(theBlock != 0);

	assert(theBlock != 0);

(-) src/xalanc/XSLT/StylesheetHandler.hpp (-8 / +20 lines)

Lines 129-135	Link Here

     * @see #ignorableWhitespace

     * @see #ignorableWhitespace

     * @see org.xml.sax.Locator

     * @see org.xml.sax.Locator

*/

*/

    virtual void characters (const XMLCh* const chars, const unsigned int length);

    virtual void

    characters(

            const XMLCh* const  chars,

            const size_type     length);

/**

/**

     * Receive notification of character data. If available, when the

     * Receive notification of character data. If available, when the

Lines 141-147	Link Here

     * @param length number of characters to read from the array

     * @param length number of characters to read from the array

     * @exception SAXException

     * @exception SAXException

*/

*/

    virtual void charactersRaw(const XMLCh* const chars, const unsigned int length);

    virtual void

    charactersRaw(

            const XMLCh* const  chars,

            const size_type     length);

/**

/**

     * Receive notification of cdata.

     * Receive notification of cdata.

Lines 166-172	Link Here

     * @exception SAXException

     * @exception SAXException

     * @see #ignorableWhitespace

     * @see #ignorableWhitespace

*/

*/

    virtual void cdata(const XMLCh* const ch, const unsigned int length);

    virtual void

    cdata(

            const XMLCh* const  ch,

            const size_type     length);

/**

/**

     * Receive notification of ignorable whitespace in element content.

     * Receive notification of ignorable whitespace in element content.

Lines 191-197	Link Here

     * @exception SAXException

     * @exception SAXException

     * @see #characters

     * @see #characters

*/

*/

    virtual void ignorableWhitespace (const XMLCh* const chars, const unsigned int length);

    virtual void

    ignorableWhitespace(

            const XMLCh* const  chars,

            const size_type     length);

/**

/**

     * Receive notification of a processing instruction.

     * Receive notification of a processing instruction.

Lines 467-479	Link Here

    void

    void

    processText(

    processText(

            const XMLCh*                chars,

            const XMLCh*    chars,

            XalanDOMString::size_type   length);

            size_type       length);

    void

    void

    accumulateText(

    accumulateText(

            const XMLCh*                chars,

            const XMLCh*    chars,

            XalanDOMString::size_type   length);

            size_type       length);

    void

    void

    processAccumulatedText();

    processAccumulatedText();

(-) src/xalanc/XSLT/ElemDecimalFormat.cpp (-15 / +15 lines)

Lines 50-57	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemTemplateElement(constructionContext,

    ElemTemplateElement(constructionContext,

                        stylesheetTree,

                        stylesheetTree,

                        lineNumber,

                        lineNumber,

Lines 66-78	Link Here

    m_decimalFormatSymbols.setInfinity(XalanDOMString(constructionContext.getMemoryManager()));

    m_decimalFormatSymbols.setInfinity(XalanDOMString(constructionContext.getMemoryManager()));

    m_decimalFormatSymbols.setNaN(XalanDOMString(constructionContext.getMemoryManager()));

    m_decimalFormatSymbols.setNaN(XalanDOMString(constructionContext.getMemoryManager()));

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const       aname = atts.getName(i);

        const XalanDOMChar* const       aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_NAME))

        if (equals(aname, Constants::ATTRNAME_NAME))

            assert(atts.getValue(i) != 0);

            assert(atts.getValue(i) != 0);

Lines 90-96	Link Here

                    atts.getValue(i));

                    atts.getValue(i));

        else if(equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR))

        else if (equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR))

            const XalanDOMChar* const   decimalSepValue = atts.getValue(i);

            const XalanDOMChar* const   decimalSepValue = atts.getValue(i);

            assert(decimalSepValue != 0);

            assert(decimalSepValue != 0);

Lines 109-115	Link Here

                    decimalSepValue);

                    decimalSepValue);

        else if(equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR))

        else if (equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR))

            const XalanDOMChar* const   sepValue = atts.getValue(i);

            const XalanDOMChar* const   sepValue = atts.getValue(i);

            assert(sepValue!= 0);

            assert(sepValue!= 0);

Lines 128-140	Link Here

                    sepValue);

                    sepValue);

        else if(equals(aname, Constants::ATTRNAME_INFINITY))

        else if (equals(aname, Constants::ATTRNAME_INFINITY))

            assert(atts.getValue(i) != 0);

            assert(atts.getValue(i) != 0);

            m_decimalFormatSymbols.setInfinity(atts.getValue(i));

            m_decimalFormatSymbols.setInfinity(atts.getValue(i));

        else if(equals(aname, Constants::ATTRNAME_MINUSSIGN))

        else if (equals(aname, Constants::ATTRNAME_MINUSSIGN))

            const XalanDOMChar* const   minusValue = atts.getValue(i);

            const XalanDOMChar* const   minusValue = atts.getValue(i);

            assert(minusValue != 0);

            assert(minusValue != 0);

Lines 153-165	Link Here

                    minusValue);

                    minusValue);

        else if(equals(aname, Constants::ATTRNAME_NAN))

        else if (equals(aname, Constants::ATTRNAME_NAN))

            assert(atts.getValue(i) != 0);

            assert(atts.getValue(i) != 0);

            m_decimalFormatSymbols.setNaN(atts.getValue(i));

            m_decimalFormatSymbols.setNaN(atts.getValue(i));

        else if(equals(aname, Constants::ATTRNAME_PERCENT))

        else if (equals(aname, Constants::ATTRNAME_PERCENT))

            const XalanDOMChar* const   percentValue = atts.getValue(i);

            const XalanDOMChar* const   percentValue = atts.getValue(i);

            assert(percentValue != 0);

            assert(percentValue != 0);

Lines 178-184	Link Here

                    percentValue);

                    percentValue);

        else if(equals(aname, Constants::ATTRNAME_PERMILLE))

        else if (equals(aname, Constants::ATTRNAME_PERMILLE))

            const XalanDOMChar* const   permilleValue = atts.getValue(i);

            const XalanDOMChar* const   permilleValue = atts.getValue(i);

            assert(permilleValue != 0);

            assert(permilleValue != 0);

Lines 197-203	Link Here

                    permilleValue);

                    permilleValue);

        else if(equals(aname, Constants::ATTRNAME_ZERODIGIT))

        else if (equals(aname, Constants::ATTRNAME_ZERODIGIT))

            const XalanDOMChar* const   zeroDigitValue = atts.getValue(i);

            const XalanDOMChar* const   zeroDigitValue = atts.getValue(i);

            assert(zeroDigitValue != 0);

            assert(zeroDigitValue != 0);

Lines 216-222	Link Here

                    zeroDigitValue);

                    zeroDigitValue);

        else if(equals(aname, Constants::ATTRNAME_DIGIT))

        else if (equals(aname, Constants::ATTRNAME_DIGIT))

            const XalanDOMChar* const   digitValue = atts.getValue(i);

            const XalanDOMChar* const   digitValue = atts.getValue(i);

            assert(digitValue != 0);

            assert(digitValue != 0);

Lines 308-314	Link Here

const XPath*

const XPath*

ElemDecimalFormat::getXPath(unsigned int    index) const

ElemDecimalFormat::getXPath(XalanSize_t index) const

    const XPath*    result = 0;

    const XPath*    result = 0;

(-) src/xalanc/XSLT/ElemAttributeSet.cpp (-8 / +8 lines)

Lines 41-48	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemUse(constructionContext,

    ElemUse(constructionContext,

            stylesheetTree,

            stylesheetTree,

            lineNumber,

            lineNumber,

Lines 50-62	Link Here

            StylesheetConstructionContext::ELEMNAME_ATTRIBUTE_SET),

            StylesheetConstructionContext::ELEMNAME_ATTRIBUTE_SET),

    m_qname(0)

    m_qname(0)

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t   nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

        if(equals(aname, Constants::ATTRNAME_NAME))

        if (equals(aname, Constants::ATTRNAME_NAME))

            m_qname = constructionContext.createXalanQName(

            m_qname = constructionContext.createXalanQName(

                atts.getValue(i),

                atts.getValue(i),

Lines 72-83	Link Here

                    atts.getValue(i));

                    atts.getValue(i));

        else if(processUseAttributeSets(

        else if (processUseAttributeSets(

                    constructionContext,

                    constructionContext,

                    aname,

                    aname,

                    atts,

                    atts,

                    i) == false &&

                    i) == false &&

                isAttrOK(

                 isAttrOK(

                    aname,

                    aname,

                    atts,

                    atts,

i,

i,

Lines 91-97	Link Here

    if(m_qname == 0)

    if (m_qname == 0)

        error(

        error(

            constructionContext,

            constructionContext,

(-) src/xalanc/XSLT/ElemChoose.hpp (-2 / +2 lines)

Lines 49-56	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	// These methods are inherited from ElemTemplateElement ...

	// These methods are inherited from ElemTemplateElement ...

(-) src/xalanc/XSLT/ElemApplyImport.hpp (-3 / +2 lines)

Lines 50-57	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber);

			XalanFileLoc					columnNumber);

	// These methods are inherited from ElemTemplateElement ...

	// These methods are inherited from ElemTemplateElement ...

Lines 77-83	Link Here

	virtual ElemTemplateElement*

	virtual ElemTemplateElement*

	appendChildElem(ElemTemplateElement*	newChild);

	appendChildElem(ElemTemplateElement*	newChild);

private:

private:

};

};

(-) src/xalanc/XSLT/ElemElement.cpp (-4 / +5 lines)

Lines 45-52	Link Here

            StylesheetConstructionContext&  constructionContext,

            StylesheetConstructionContext&  constructionContext,

            Stylesheet&                     stylesheetTree,

            Stylesheet&                     stylesheetTree,

            const AttributeListType&        atts,

            const AttributeListType&        atts,

            int                             lineNumber,

            XalanFileLoc                    lineNumber,

            int                             columnNumber) :

            XalanFileLoc                    columnNumber) :

    ElemUse(constructionContext,

    ElemUse(constructionContext,

            stylesheetTree,

            stylesheetTree,

            lineNumber,

            lineNumber,

Lines 59-67	Link Here

    // turn them off...

    // turn them off...

//  m_namespacesHandler.setProcessNamespaceAliaises(false);

//  m_namespacesHandler.setProcessNamespaceAliaises(false);

    const unsigned int  nAttrs = atts.getLength();

    const XalanSize_t  nAttrs = atts.getLength();

    for(unsigned int i = 0; i < nAttrs; i++)

    for (XalanSize_t i = 0; i < nAttrs; i++)

        const XalanDOMChar* const   aname = atts.getName(i);

        const XalanDOMChar* const   aname = atts.getName(i);

Lines 125-130	Link Here

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)

const ElemTemplateElement*

const ElemTemplateElement*

ElemElement::startElement(StylesheetExecutionContext&       executionContext) const

ElemElement::startElement(StylesheetExecutionContext&       executionContext) const

(-) src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (-3 / +5 lines)

Lines 23-29	Link Here

XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :

XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(

            MemoryManagerType&  theManager,

            size_type	        theBlockCount) :

	m_allocator(theManager, theBlockCount)

	m_allocator(theManager, theBlockCount)

Lines 41-48	Link Here

			StylesheetConstructionContext&	constructionContext,

			StylesheetConstructionContext&	constructionContext,

			Stylesheet&						stylesheetTree,

			Stylesheet&						stylesheetTree,

			const AttributeListType&		atts,

			const AttributeListType&		atts,

			int								lineNumber,

			XalanFileLoc					lineNumber,

			int								columnNumber)

			XalanFileLoc					columnNumber)

	data_type* const	theBlock = m_allocator.allocateBlock();

	data_type* const	theBlock = m_allocator.allocateBlock();

	assert(theBlock != 0);

	assert(theBlock != 0);

(-) src/xalanc/XMLSupport/XalanIndentWriter.hpp (-3 / +6 lines)

Lines 22-39	Link Here

#include <xalanc/Include/XalanVector.hpp>

#include <xalanc/Include/XalanVector.hpp>

#include <xalanc/PlatformSupport/FormatterListener.hpp>

#include <xalanc/PlatformSupport/Writer.hpp>

#include <xalanc/PlatformSupport/Writer.hpp>

XALAN_CPP_NAMESPACE_BEGIN

XALAN_CPP_NAMESPACE_BEGIN

template<class WhiteSpaceWriter,

template<

         class NewLineWriter>

    class WhiteSpaceWriter,

    class NewLineWriter>

class XalanIndentWriter

class XalanIndentWriter

public:

public:

    typedef typename XalanDOMString::size_type       size_type;

    typedef FormatterListener::size_type    size_type;

    typedef XalanVector<bool>               BoolStackType;

    typedef XalanVector<bool>               BoolStackType;

    typedef typename WhiteSpaceWriter::writer_type   writer_type;

    typedef typename WhiteSpaceWriter::writer_type   writer_type;

(-) src/xalanc/XMLSupport/XalanUTF8Writer.hpp (-30 / +36 lines)

Lines 150-183	Link Here

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars , if not presentable, throws

*/

*/

    void writeNameChar(const XalanDOMChar*      data,

    void

                       size_type                theLength)

    writeNameChar(

            const XalanDOMChar*      data,

            size_type                theLength)

        write(data, theLength);

        write(data, theLength);

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars, if not representable, throws

*/

*/

    void writePIChars(const XalanDOMChar*       data,

    void

                        size_type               theLength)

    writePIChars(

            const XalanDOMChar*     data,

            size_type               theLength)

        write(data, theLength);

        write(data, theLength);

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars, if not representable, throws

*/

*/

    void writeCommentChars(const XalanDOMChar*      data,

    void

                           size_type                theLength)

    writeCommentChars(

            const XalanDOMChar*      data,

            size_type                theLength)

        write(data, theLength);

        write(data, theLength);

    void

    void

    safeWriteContent(

    safeWriteContent(

            const XalanDOMChar*         theChars,

            const XalanDOMChar*     theChars,

            XalanDOMString::size_type   theLength)

            size_type               theLength)

        for(size_type i = 0; i < theLength; ++i)

        for(size_type i = 0; i < theLength; ++i)

Lines 187-194	Link Here

    void

    void

    write(

    write(

            const value_type*           theChars,

            const value_type*   theChars,

            XalanDOMString::size_type   theLength)

            size_type           theLength)

    #if defined(NDEBUG)

    #if defined(NDEBUG)

        if (theLength > sizeof(m_buffer))

        if (theLength > sizeof(m_buffer))

Lines 214-220	Link Here

            m_bufferRemaining -= theLength;

            m_bufferRemaining -= theLength;

    #else

    #else

        for(XalanDOMString::size_type i = 0; i < theLength; ++i)

        for(size_type i = 0; i < theLength; ++i)

            write(theChars[i]);

            write(theChars[i]);

Lines 251-258	Link Here

    void

    void

    write(

    write(

                const XalanDOMChar*         theChars,

            const XalanDOMChar*     theChars,

                XalanDOMString::size_type   theLength)

            size_type               theLength)

        for(size_type i = 0; i < theLength; ++i)

        for(size_type i = 0; i < theLength; ++i)

Lines 262-274	Link Here

    size_type

    size_type

    write(

    write(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

        XalanDOMChar ch = chars[start];

        XalanDOMChar ch = chars[start];

        if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == false)

        if (isUTF16HighSurrogate(ch) == false)

            write((unsigned int)ch);

            write((unsigned int)ch);

Lines 276-282	Link Here

            if (start + 1 >= length)

            if (start + 1 >= length)

                XalanFormatterWriter::throwInvalidUTF16SurrogateException(

                throwInvalidUTF16SurrogateException(

ch,

ch,

0,

0,

                    getMemoryManager());

                    getMemoryManager());

Lines 284-290	Link Here

            else

            else

                write(

                write(

                    XalanFormatterWriter::decodeUTF16SurrogatePair(

                    decodeUTF16SurrogatePair(

ch,

ch,

                        chars[++start],

                        chars[++start],

                        getMemoryManager()));

                        getMemoryManager()));

Lines 296-303	Link Here

    void

    void

    writeSafe(

    writeSafe(

        const XalanDOMChar*         theChars,

        const XalanDOMChar*     theChars,

        XalanDOMString::size_type   theLength)

        size_type               theLength)

        XalanDOMChar ch = 0;

        XalanDOMChar ch = 0;

Lines 305-319	Link Here

            ch = theChars[i];

            ch = theChars[i];

            if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == true)

            if (isUTF16HighSurrogate(ch) == true)

                if (i + 1 >= theLength)

                if (i + 1 >= theLength)

                    XalanFormatterWriter::throwInvalidUTF16SurrogateException(ch, 0,  getMemoryManager());

                    throwInvalidUTF16SurrogateException(ch, 0,  getMemoryManager());

                else

                else

                    write(XalanFormatterWriter::decodeUTF16SurrogatePair(ch, theChars[i+1],  getMemoryManager()));

                    write(decodeUTF16SurrogatePair(ch, theChars[i + 1],  getMemoryManager()));

                    ++i;

                    ++i;

Lines 410-416	Link Here

        else

        else

            XalanFormatterWriter::throwInvalidCharacterException(theChar, getMemoryManager());

            throwInvalidCharacterException(theChar, getMemoryManager());

Lines 421-431	Link Here

    // Data members...

    // Data members...

    value_type                  m_buffer[kBufferSize];

    value_type      m_buffer[kBufferSize];

    value_type*                 m_bufferPosition;

    value_type*     m_bufferPosition;

    XalanDOMString::size_type   m_bufferRemaining;

    size_type       m_bufferRemaining;

};

};

(-) src/xalanc/XMLSupport/XalanFormatterWriter.hpp (-6 / +7 lines)

Lines 24-29	Link Here

#include <xercesc/sax/SAXException.hpp>

#include <xercesc/sax/SAXException.hpp>

#include <xalanc/PlatformSupport/DOMStringHelper.hpp>

#include <xalanc/PlatformSupport/DOMStringHelper.hpp>

#include <xalanc/PlatformSupport/FormatterListener.hpp>

#include <xalanc/PlatformSupport/Writer.hpp>

#include <xalanc/PlatformSupport/Writer.hpp>

#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>

#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>

#include <xalanc/PlatformSupport/XalanOutputStream.hpp>

#include <xalanc/PlatformSupport/XalanOutputStream.hpp>

Lines 42-47	Link Here

public:

public:

    typedef FormatterListener::size_type    size_type;

    template <class WriterType>

    template <class WriterType>

    class NewLineWriterFunctor

    class NewLineWriterFunctor

Lines 90-103	Link Here

/**

/**

        * The length of the the string of characters that represents the newline

        * The length of the the string of characters that represents the newline

*/

*/

        XalanDOMString::size_type   m_newlineStringLength;

        size_type   m_newlineStringLength;

};

};

    template<class WriterType>

    template<class WriterType>

    class WhiteSpaceWriterFunctor

    class WhiteSpaceWriterFunctor

        typedef XalanDOMString::size_type       size_type;

        typedef typename WriterType::value_type value_type;

        typedef typename WriterType::value_type value_type;

    public:

    public:

        typedef WriterType                  writer_type;

        typedef WriterType                  writer_type;

Lines 150-158	Link Here

public:

public:

    typedef XalanDOMString::size_type   size_type;

    XalanFormatterWriter(

    XalanFormatterWriter(

                Writer&	        theWriter,

                Writer&	        theWriter,

                MemoryManager&  theMemoryManager) :

                MemoryManager&  theMemoryManager) :

Lines 313-319	Link Here

/**

/**

     * The length of the the string of characters that represents the newline

     * The length of the the string of characters that represents the newline

*/

*/

    XalanDOMString::size_type   m_newlineStringLength;

    size_type   m_newlineStringLength;

/**

/**

     * Format a code point as a numeric character reference.

     * Format a code point as a numeric character reference.

(-) src/xalanc/XMLSupport/FormatterToHTML.cpp (-21 / +21 lines)

Lines 156-162	Link Here

	m_attrCharsMap[XalanUnicode::charLessThanSign] = 0;

	m_attrCharsMap[XalanUnicode::charLessThanSign] = 0;

	m_attrCharsMap[XalanUnicode::charGreaterThanSign] = 0;

	m_attrCharsMap[XalanUnicode::charGreaterThanSign] = 0;

	for(XalanDOMString::size_type i = 160; i < SPECIALSSIZE; i++)

	for(size_type i = 160; i < SPECIALSSIZE; i++)

		m_attrCharsMap[i] = 'S';

		m_attrCharsMap[i] = 'S';

Lines 481-487	Link Here

void

void

FormatterToHTML::characters(

FormatterToHTML::characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type 	length)

	if(length != 0)

	if(length != 0)

Lines 590-596	Link Here

void

void

FormatterToHTML::cdata(

FormatterToHTML::cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length)

			const size_type 	length)

	if(m_isScriptOrStyleElem == true)

	if(m_isScriptOrStyleElem == true)

Lines 632-638	Link Here

		const XMLCh* const	data)

		const XMLCh* const	data)

	const XalanDOMString::size_type		dataLength = length(data);

	const size_type		dataLength = length(data);

	// Use a fairly nasty hack to tell if the next node is supposed to be

	// Use a fairly nasty hack to tell if the next node is supposed to be

	// unescaped text.

	// unescaped text.

Lines 689-701	Link Here

void

void

FormatterToHTML::writeCharacters(

FormatterToHTML::writeCharacters(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theLength)

			size_type	            theLength)

	assert(theString != 0);

	assert(theString != 0);

	XalanDOMString::size_type	i = 0;

	size_type	i = 0;

	XalanDOMString::size_type	firstIndex = 0;

	size_type	firstIndex = 0;

    while(i < theLength)

    while(i < theLength)

Lines 768-780	Link Here

void

void

FormatterToHTML::writeAttrString(

FormatterToHTML::writeAttrString(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theStringLength)

			size_type	            theStringLength)

	assert(theString != 0);

	assert(theString != 0);

	XalanDOMString::size_type	i = 0;

	size_type	i = 0;

	XalanDOMString::size_type	firstIndex = 0;

	size_type	firstIndex = 0;

    while(i < theStringLength)

    while(i < theStringLength)

Lines 853-860	Link Here

void

void

FormatterToHTML::copyEntityIntoBuffer(

FormatterToHTML::copyEntityIntoBuffer(

			const XalanDOMChar*			s,

			const XalanDOMChar*		s,

			XalanDOMString::size_type	theLength)

			size_type	            theLength)

	assert(s != 0);

	assert(s != 0);

Lines 885-895	Link Here

			const XalanDOMChar*										value,

			const XalanDOMChar*										value,

			const XalanHTMLElementsProperties::ElementProperties&	elemProperties)

			const XalanHTMLElementsProperties::ElementProperties&	elemProperties)

	const XalanDOMString::size_type		nameLength = length(name);

	const size_type		nameLength = length(name);

	accumContent(XalanUnicode::charSpace);

	accumContent(XalanUnicode::charSpace);

	const XalanDOMString::size_type		valueLength = length(value);

	const size_type     valueLength = length(value);

	if((valueLength == 0 || equalsIgnoreCaseASCII(name, nameLength, value, valueLength)) &&

	if((valueLength == 0 || equalsIgnoreCaseASCII(name, nameLength, value, valueLength)) &&

	   elemProperties.isAttribute(name, XalanHTMLElementsProperties::ATTREMPTY) == true)

	   elemProperties.isAttribute(name, XalanHTMLElementsProperties::ATTREMPTY) == true)

Lines 919-926	Link Here

void

void

FormatterToHTML::writeAttrURI(

FormatterToHTML::writeAttrURI(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theStringLength)

			size_type	            theStringLength)

	assert(theString != 0);

	assert(theString != 0);

Lines 939-945	Link Here

	// causing damage.	If the URL is already properly escaped, in theory, this

	// causing damage.	If the URL is already properly escaped, in theory, this

	// function should not change the string value.

	// function should not change the string value.

    for (XalanDOMString::size_type i = 0; i < theStringLength; ++i)

    for (size_type i = 0; i < theStringLength; ++i)

		const XalanDOMChar	ch = theString[i];

		const XalanDOMChar	ch = theString[i];

Lines 1123-1130	Link Here

	if (m_prefixResolver != 0)

	if (m_prefixResolver != 0)

		const XalanDOMString::size_type		theLength = length(theElementName);

		const size_type		theLength = length(theElementName);

		const XalanDOMString::size_type		theColonIndex = indexOf(theElementName, XalanUnicode::charColon);

		const size_type		theColonIndex = indexOf(theElementName, XalanUnicode::charColon);

		const XalanDOMString*	thePrefix = &s_emptyString;

		const XalanDOMString*	thePrefix = &s_emptyString;

(-) src/xalanc/XMLSupport/FormatterToHTML.hpp (-15 / +13 lines)

Lines 118-124	Link Here

    virtual void

    virtual void

	characters(

	characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type 	length);

	// These methods are inherited from FormatterToXML...

	// These methods are inherited from FormatterToXML...

Lines 135-141	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type 	length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 159-177	Link Here

		enum { eMaxLength = 8 };

		enum { eMaxLength = 8 };

		XalanDOMChar				m_char;

		XalanDOMChar	m_char;

		XalanDOMString::size_type	m_length;

		size_type	    m_length;

		XalanDOMChar				m_string[eMaxLength + 1];

		XalanDOMChar	m_string[eMaxLength + 1];

};

};

protected:

protected:

	virtual void

	virtual void

	writeAttrString(

	writeAttrString(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theStringLength);

			size_type	            theStringLength);

	virtual void

	virtual void

	accumCommentData(const XalanDOMChar*	data);

	accumCommentData(const XalanDOMChar*	data);

Lines 181-193	Link Here

	void

	void

	writeCharacters(

	writeCharacters(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theLength);

			size_type	            theLength);

private:

private:

	typedef XalanDOMString::size_type	size_type;

/**

/**

	 * The string "<!DOCTYPE  HTML".

	 * The string "<!DOCTYPE  HTML".

*/

*/

Lines 230-237	Link Here

	void

	void

	copyEntityIntoBuffer(

	copyEntityIntoBuffer(

			const XalanDOMChar*			s,

			const XalanDOMChar*		s,

			XalanDOMString::size_type	theLength);

			size_type	            theLength);

	void

	void

	copyEntityIntoBuffer(const XalanDOMString&	s);

	copyEntityIntoBuffer(const XalanDOMString&	s);

Lines 256-263	Link Here

*/

*/

	void

	void

	writeAttrURI(

	writeAttrURI(

			const XalanDOMChar*			theString,

			const XalanDOMChar*		theString,

			XalanDOMString::size_type	theStringLength);

			size_type	            theStringLength);

/**

/**

	 * Accumulate the specified character by converting its numeric value to

	 * Accumulate the specified character by converting its numeric value to

(-) src/xalanc/XMLSupport/FormatterToNull.cpp (-5 / +5 lines)

Lines 76-82	Link Here

void

void

FormatterToNull::characters(

FormatterToNull::characters(

			const XMLCh* const	/* chars */,

			const XMLCh* const	/* chars */,

			const unsigned int	/* length */)

			const size_type	    /* length */)

Lines 85-91	Link Here

void

void

FormatterToNull::charactersRaw(

FormatterToNull::charactersRaw(

		const XMLCh* const	/* chars */,

		const XMLCh* const	/* chars */,

		const unsigned int	/*length */)

		const size_type	    /*length */)

Lines 100-106	Link Here

void

void

FormatterToNull::ignorableWhitespace(

FormatterToNull::ignorableWhitespace(

			const XMLCh* const	/* chars */,

			const XMLCh* const	/* chars */,

			const unsigned int	/* length */)

			const size_type	    /* length */)

Lines 131-138	Link Here

void

void

FormatterToNull::cdata(

FormatterToNull::cdata(

			const XMLCh* const	 /* ch */,

			const XMLCh* const  /* ch */,

			const unsigned int 	/* length */)

			const size_type	    /* length */)

(-) src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (-28 / +28 lines)

Lines 233-239	Link Here

    virtual void

    virtual void

    charactersRaw(

    charactersRaw(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

        writeParentTagEnd();

        writeParentTagEnd();

Lines 391-397	Link Here

        m_writer.write(value_type(XalanUnicode::charQuestionMark));

        m_writer.write(value_type(XalanUnicode::charQuestionMark));

        writeName(target);

        writeName(target);

        const XalanDOMString::size_type     len = length(data);

        const size_type     len = length(data);

        // We need to make sure there is a least one whitespace character

        // We need to make sure there is a least one whitespace character

        // between the target and the data.

        // between the target and the data.

Lines 416-422	Link Here

    void

    void

    writeCharacters(

    writeCharacters(

            const XMLCh*    chars,

            const XMLCh*    chars,

            unsigned int    length)

            size_type       length)

        assert(length != 0);

        assert(length != 0);

Lines 424-431	Link Here

        m_indentHandler.setPreserve(true);

        m_indentHandler.setPreserve(true);

        unsigned int    i = 0;

        size_type   i = 0;

        unsigned int    firstIndex = 0;

        size_type   firstIndex = 0;

        while(i < length)

        while(i < length)

Lines 466-472	Link Here

    void

    void

    writeCDATA(

    writeCDATA(

            const XMLCh*    chars,

            const XMLCh*    chars,

            unsigned int    length)

            size_type       length)

        assert(length != 0);

        assert(length != 0);

Lines 638-649	Link Here

    * @param start the start offset into the string.

    * @param start the start offset into the string.

    * @param length the length of the string.

    * @param length the length of the string.

*/

*/

    XalanDOMString::size_type

    size_type

    writeNormalizedChar(

    writeNormalizedChar(

        XalanDOMChar                ch,

        XalanDOMChar        ch,

        const XalanDOMChar          chars[],

        const XalanDOMChar  chars[],

        XalanDOMString::size_type   start,

        size_type           start,

        XalanDOMString::size_type   length)

        size_type           length)

        if (XalanUnicode::charLF == ch)

        if (XalanUnicode::charLF == ch)

Lines 679-689	Link Here

        m_writer.write(value_type(XalanUnicode::charSemicolon));

        m_writer.write(value_type(XalanUnicode::charSemicolon));

    XalanDOMString::size_type

    size_type

    writeNormalizedCharBig(

    writeNormalizedCharBig(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

        assert( start < length);

        assert( start < length);

Lines 712-722	Link Here

*/

*/

    void

    void

    writeCDATAChars(

    writeCDATAChars(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   length,

            size_type           length,

            bool&                       outsideCDATA)

            bool&               outsideCDATA)

        XalanDOMString::size_type i = 0;

        size_type   i = 0;

        while(i < length)

        while(i < length)

Lines 795-807	Link Here

*/

*/

    void

    void

    writeAttrString(

    writeAttrString(

            const XalanDOMChar*         theString,

            const XalanDOMChar*     theString,

            XalanDOMString::size_type   theStringLength)

            size_type               theStringLength)

        assert(theString != 0);

        assert(theString != 0);

        XalanDOMString::size_type   i = 0;

        size_type   i = 0;

        XalanDOMString::size_type   firstIndex = 0;

        size_type   firstIndex = 0;

        while(i < theStringLength)

        while(i < theStringLength)

Lines 863-872	Link Here

*/

*/

    void

    void

    writeNormalizedData(

    writeNormalizedData(

            const XalanDOMChar*         theData,

            const XalanDOMChar*     theData,

            XalanDOMString::size_type   theLength)

            size_type               theLength)

        for (XalanDOMString::size_type i = 0; i < theLength; ++i)

        for (size_type i = 0; i < theLength; ++i)

            const XalanDOMChar  theChar = theData[i];

            const XalanDOMChar  theChar = theData[i];

Lines 876-883	Link Here

    void

    void

    safeWriteContent(

    safeWriteContent(

                const XalanDOMChar*         theChars,

                const XalanDOMChar*     theChars,

                XalanDOMString::size_type   theLength)

                size_type               theLength)

        for(size_type i = 0; i < theLength; ++i)

        for(size_type i = 0; i < theLength; ++i)

(-) src/xalanc/XMLSupport/FormatterToNull.hpp (-4 / +4 lines)

Lines 74-85	Link Here

    virtual void

    virtual void

	characters(

	characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type     length);

    virtual void

    virtual void

	charactersRaw(

	charactersRaw(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	entityReference(const XMLCh* const	name);

	entityReference(const XMLCh* const	name);

Lines 87-93	Link Here

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 104-110	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type 	length);

private:

private:

(-) src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (-34 / +34 lines)

Lines 258-264	Link Here

void

void

XalanXMLSerializerBase::characters(

XalanXMLSerializerBase::characters(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

    if(length != 0)

    if(length != 0)

Lines 280-286	Link Here

void

void

XalanXMLSerializerBase::cdata(

XalanXMLSerializerBase::cdata(

            const XMLCh* const  ch,

            const XMLCh* const  ch,

            const unsigned int  length)

            const size_type     length)

    if (length != 0)

    if (length != 0)

Lines 322-328	Link Here

void

void

XalanXMLSerializerBase::ignorableWhitespace(

XalanXMLSerializerBase::ignorableWhitespace(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

    if (length > 0)

    if (length > 0)

Lines 380-386	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::s_xhtmlDocTypeStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::s_xhtmlDocTypeStringLength =

        FXML_SIZE(s_xhtmlDocTypeString);

        FXML_SIZE(s_xhtmlDocTypeString);

Lines 481-487	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength =

        FXML_SIZE(s_doctypeHeaderStartString);

        FXML_SIZE(s_doctypeHeaderStartString);

const char  XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicString[] =

const char  XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicString[] =

Lines 498-504	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength =

        FXML_SIZE(s_doctypeHeaderPublicString);

        FXML_SIZE(s_doctypeHeaderPublicString);

const char  XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemString[] =

const char  XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemString[] =

Lines 515-521	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength =

        FXML_SIZE(s_doctypeHeaderSystemString);

        FXML_SIZE(s_doctypeHeaderSystemString);

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderStartString[] =

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderStartString[] =

Lines 538-544	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength =

        FXML_SIZE(s_xmlHeaderStartString);

        FXML_SIZE(s_xmlHeaderStartString);

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingString[] =

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingString[] =

Lines 558-564	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength =

        FXML_SIZE(s_xmlHeaderEncodingString);

        FXML_SIZE(s_xmlHeaderEncodingString);

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneString[] =

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneString[] =

Lines 580-586	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength =

        FXML_SIZE(s_xmlHeaderStandaloneString);

        FXML_SIZE(s_xmlHeaderStandaloneString);

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderEndString[] =

const char  XalanXMLSerializerBase::UTF8::s_xmlHeaderEndString[] =

Lines 591-597	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength =

        FXML_SIZE(s_xmlHeaderEndString);

        FXML_SIZE(s_xmlHeaderEndString);

const char  XalanXMLSerializerBase::UTF8::s_defaultVersionString[] =

const char  XalanXMLSerializerBase::UTF8::s_defaultVersionString[] =

Lines 602-608	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength =

        FXML_SIZE(s_defaultVersionString);

        FXML_SIZE(s_defaultVersionString);

const char  XalanXMLSerializerBase::UTF8::s_cdataOpenString[] =

const char  XalanXMLSerializerBase::UTF8::s_cdataOpenString[] =

Lines 619-625	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength =

        FXML_SIZE(s_cdataOpenString);

        FXML_SIZE(s_cdataOpenString);

const char  XalanXMLSerializerBase::UTF8::s_cdataCloseString[] =

const char  XalanXMLSerializerBase::UTF8::s_cdataCloseString[] =

Lines 630-636	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength =

        FXML_SIZE(s_cdataCloseString);

        FXML_SIZE(s_cdataCloseString);

Lines 656-662	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength =

        FXML_SIZE(s_xhtmlDocTypeString);

        FXML_SIZE(s_xhtmlDocTypeString);

const char  XalanXMLSerializerBase::UTF8::s_lessThanEntityString[] =

const char  XalanXMLSerializerBase::UTF8::s_lessThanEntityString[] =

Lines 668-674	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength =

        FXML_SIZE(s_lessThanEntityString);

        FXML_SIZE(s_lessThanEntityString);

const char  XalanXMLSerializerBase::UTF8::s_greaterThanEntityString[] =

const char  XalanXMLSerializerBase::UTF8::s_greaterThanEntityString[] =

Lines 680-686	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength =

        FXML_SIZE(s_greaterThanEntityString);

        FXML_SIZE(s_greaterThanEntityString);

const char  XalanXMLSerializerBase::UTF8::s_ampersandEntityString[] =

const char  XalanXMLSerializerBase::UTF8::s_ampersandEntityString[] =

Lines 693-699	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength =

        FXML_SIZE(s_ampersandEntityString);

        FXML_SIZE(s_ampersandEntityString);

const char  XalanXMLSerializerBase::UTF8::s_quoteEntityString[] =

const char  XalanXMLSerializerBase::UTF8::s_quoteEntityString[] =

Lines 707-713	Link Here

    char(0)

    char(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength =

        FXML_SIZE(s_quoteEntityString);

        FXML_SIZE(s_quoteEntityString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartString[] =

Lines 725-731	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength =

        FXML_SIZE(s_doctypeHeaderStartString);

        FXML_SIZE(s_doctypeHeaderStartString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicString[] =

Lines 742-748	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength =

        FXML_SIZE(s_doctypeHeaderPublicString);

        FXML_SIZE(s_doctypeHeaderPublicString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemString[] =

Lines 759-765	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength =

        FXML_SIZE(s_doctypeHeaderSystemString);

        FXML_SIZE(s_doctypeHeaderSystemString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderStartString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderStartString[] =

Lines 782-788	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength =

        FXML_SIZE(s_xmlHeaderStartString);

        FXML_SIZE(s_xmlHeaderStartString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingString[] =

Lines 802-808	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength =

        FXML_SIZE(s_xmlHeaderEncodingString);

        FXML_SIZE(s_xmlHeaderEncodingString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneString[] =

Lines 824-830	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength =

        FXML_SIZE(s_xmlHeaderStandaloneString);

        FXML_SIZE(s_xmlHeaderStandaloneString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderEndString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_xmlHeaderEndString[] =

Lines 835-841	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength =

        FXML_SIZE(s_xmlHeaderEndString);

        FXML_SIZE(s_xmlHeaderEndString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_defaultVersionString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_defaultVersionString[] =

Lines 846-852	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength =

        FXML_SIZE(s_defaultVersionString);

        FXML_SIZE(s_defaultVersionString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_cdataOpenString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_cdataOpenString[] =

Lines 863-869	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength =

        FXML_SIZE(s_cdataOpenString);

        FXML_SIZE(s_cdataOpenString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_cdataCloseString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_cdataCloseString[] =

Lines 874-880	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength =

        FXML_SIZE(s_cdataCloseString);

        FXML_SIZE(s_cdataCloseString);

Lines 900-906	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength =

        FXML_SIZE(s_xhtmlDocTypeString);

        FXML_SIZE(s_xhtmlDocTypeString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_lessThanEntityString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_lessThanEntityString[] =

Lines 912-918	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength =

        FXML_SIZE(s_lessThanEntityString);

        FXML_SIZE(s_lessThanEntityString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_greaterThanEntityString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_greaterThanEntityString[] =

Lines 924-930	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength =

        FXML_SIZE(s_greaterThanEntityString);

        FXML_SIZE(s_greaterThanEntityString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_ampersandEntityString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_ampersandEntityString[] =

Lines 937-943	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength =

        FXML_SIZE(s_ampersandEntityString);

        FXML_SIZE(s_ampersandEntityString);

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_quoteEntityString[] =

const XalanDOMChar  XalanXMLSerializerBase::UTF16::s_quoteEntityString[] =

Lines 951-957	Link Here

    XalanDOMChar(0)

    XalanDOMChar(0)

};

};

const XalanDOMString::size_type     XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength =

const XalanXMLSerializerBase::size_type     XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength =

        FXML_SIZE(s_quoteEntityString);

        FXML_SIZE(s_quoteEntityString);

(-) src/xalanc/XMLSupport/FormatterToText.cpp (-4 / +4 lines)

Lines 187-193	Link Here

void

void

FormatterToText::characters(

FormatterToText::characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	assert(m_writer != 0);

	assert(m_writer != 0);

Lines 245-251	Link Here

void

void

FormatterToText::charactersRaw(

FormatterToText::charactersRaw(

		const XMLCh* const	chars,

		const XMLCh* const	chars,

		const unsigned int	length)

		const size_type	    length)

	characters(chars, length);

	characters(chars, length);

Lines 262-268	Link Here

void

void

FormatterToText::ignorableWhitespace(

FormatterToText::ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	if (m_handleIgnorableWhitespace == true)

	if (m_handleIgnorableWhitespace == true)

Lines 301-307	Link Here

void

void

FormatterToText::cdata(

FormatterToText::cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length)

			const size_type 	length)

	characters(ch, length);

	characters(ch, length);

(-) src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (-69 / +69 lines)

Lines 122-133	Link Here

    virtual void

    virtual void

    characters(

    characters(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length);

            const size_type     length);

    virtual void

    virtual void

    charactersRaw(

    charactersRaw(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length) = 0;

            const size_type     length) = 0;

    virtual void

    virtual void

    entityReference(const XMLCh* const  name) = 0;

    entityReference(const XMLCh* const  name) = 0;

Lines 135-141	Link Here

    virtual void

    virtual void

    ignorableWhitespace(

    ignorableWhitespace(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length);

            const size_type     length);

    virtual void

    virtual void

    processingInstruction(

    processingInstruction(

Lines 151-157	Link Here

    virtual void

    virtual void

    cdata(

    cdata(

            const XMLCh* const  ch,

            const XMLCh* const  ch,

            const unsigned int  length);

            const size_type     length);

    virtual const XalanDOMString&

    virtual const XalanDOMString&

    getDoctypeSystem() const;

    getDoctypeSystem() const;

Lines 207-313	Link Here

/**

/**

         * The string "<!DOCTYPE ".

         * The string "<!DOCTYPE ".

*/

*/

        static const char                       s_doctypeHeaderStartString[];

        static const char           s_doctypeHeaderStartString[];

        static const XalanDOMString::size_type  s_doctypeHeaderStartStringLength;

        static const size_type      s_doctypeHeaderStartStringLength;

/**

/**

         * The string " PUBLIC \"".

         * The string " PUBLIC \"".

*/

*/

        static const char                       s_doctypeHeaderPublicString[];

        static const char       s_doctypeHeaderPublicString[];

        static const XalanDOMString::size_type  s_doctypeHeaderPublicStringLength;

        static const size_type  s_doctypeHeaderPublicStringLength;

/**

/**

         * The string " SYSTEM \"".

         * The string " SYSTEM \"".

*/

*/

        static const char                       s_doctypeHeaderSystemString[];

        static const char       s_doctypeHeaderSystemString[];

        static const XalanDOMString::size_type  s_doctypeHeaderSystemStringLength;

        static const size_type  s_doctypeHeaderSystemStringLength;

/**

/**

         * The string "<?xml version=\"".

         * The string "<?xml version=\"".

*/

*/

        static const char                       s_xmlHeaderStartString[];

        static const char       s_xmlHeaderStartString[];

        static const XalanDOMString::size_type  s_xmlHeaderStartStringLength;

        static const size_type  s_xmlHeaderStartStringLength;

/**

/**

         * The string "\" encoding=\"".

         * The string "\" encoding=\"".

*/

*/

        static const char                       s_xmlHeaderEncodingString[];

        static const char       s_xmlHeaderEncodingString[];

        static const XalanDOMString::size_type  s_xmlHeaderEncodingStringLength;

        static const size_type  s_xmlHeaderEncodingStringLength;

/**

/**

         * The string "\" standalone=\"".

         * The string "\" standalone=\"".

*/

*/

        static const char                       s_xmlHeaderStandaloneString[];

        static const char       s_xmlHeaderStandaloneString[];

        static const XalanDOMString::size_type  s_xmlHeaderStandaloneStringLength;

        static const size_type  s_xmlHeaderStandaloneStringLength;

/**

/**

         * The string "\"?>".

         * The string "\"?>".

*/

*/

        static const char                       s_xmlHeaderEndString[];

        static const char       s_xmlHeaderEndString[];

        static const XalanDOMString::size_type  s_xmlHeaderEndStringLength;

        static const size_type  s_xmlHeaderEndStringLength;

/**

/**

         * The string "1.0".

         * The string "1.0".

*/

*/

        static const char                       s_defaultVersionString[];

        static const char       s_defaultVersionString[];

        static const XalanDOMString::size_type  s_defaultVersionStringLength;

        static const size_type  s_defaultVersionStringLength;

/**

/**

         * The string "-//W3C//DTD XHTML".

         * The string "-//W3C//DTD XHTML".

*/

*/

        static const XalanDOMChar               s_xhtmlDocTypeString[];

        static const XalanDOMChar   s_xhtmlDocTypeString[];

        static const XalanDOMString::size_type  s_xhtmlDocTypeStringLength;

        static const size_type      s_xhtmlDocTypeStringLength;

/**

/**

         * The string "<![CDATA[".

         * The string "<![CDATA[".

*/

*/

        static const char                       s_cdataOpenString[];

        static const char       s_cdataOpenString[];

        static const XalanDOMString::size_type  s_cdataOpenStringLength;

        static const size_type  s_cdataOpenStringLength;

/**

/**

         * The string "]]>".

         * The string "]]>".

*/

*/

        static const char                       s_cdataCloseString[];

        static const char       s_cdataCloseString[];

        static const XalanDOMString::size_type  s_cdataCloseStringLength;

        static const size_type  s_cdataCloseStringLength;

/**

/**

         * The string "&lt;".

         * The string "&lt;".

*/

*/

        static const char                       s_lessThanEntityString[];

        static const char       s_lessThanEntityString[];

        static const XalanDOMString::size_type  s_lessThanEntityStringLength;

        static const size_type  s_lessThanEntityStringLength;

/**

/**

         * The string "&gt;".

         * The string "&gt;".

*/

*/

        static const char                       s_greaterThanEntityString[];

        static const char       s_greaterThanEntityString[];

        static const XalanDOMString::size_type  s_greaterThanEntityStringLength;

        static const size_type  s_greaterThanEntityStringLength;

/**

/**

         * The string "&amp;".

         * The string "&amp;".

*/

*/

        static const char                       s_ampersandEntityString[];

        static const char       s_ampersandEntityString[];

        static const XalanDOMString::size_type  s_ampersandEntityStringLength;

        static const size_type  s_ampersandEntityStringLength;

/**

/**

         * The string "&quot;".

         * The string "&quot;".

*/

*/

        static const char                       s_quoteEntityString[];

        static const char       s_quoteEntityString[];

        static const XalanDOMString::size_type  s_quoteEntityStringLength;

        static const size_type  s_quoteEntityStringLength;

};

};

    class XALAN_XMLSUPPORT_EXPORT UTF16

    class XALAN_XMLSUPPORT_EXPORT UTF16

Lines 322-428	Link Here

/**

/**

         * The string "<!DOCTYPE ".

         * The string "<!DOCTYPE ".

*/

*/

        static const XalanDOMChar               s_doctypeHeaderStartString[];

        static const XalanDOMChar   s_doctypeHeaderStartString[];

        static const XalanDOMString::size_type  s_doctypeHeaderStartStringLength;

        static const size_type      s_doctypeHeaderStartStringLength;

/**

/**

         * The string " PUBLIC \"".

         * The string " PUBLIC \"".

*/

*/

        static const XalanDOMChar               s_doctypeHeaderPublicString[];

        static const XalanDOMChar   s_doctypeHeaderPublicString[];

        static const XalanDOMString::size_type  s_doctypeHeaderPublicStringLength;

        static const size_type      s_doctypeHeaderPublicStringLength;

/**

/**

         * The string " SYSTEM \"".

         * The string " SYSTEM \"".

*/

*/

        static const XalanDOMChar               s_doctypeHeaderSystemString[];

        static const XalanDOMChar   s_doctypeHeaderSystemString[];

        static const XalanDOMString::size_type  s_doctypeHeaderSystemStringLength;

        static const size_type      s_doctypeHeaderSystemStringLength;

/**

/**

         * The string "<?xml version=\"".

         * The string "<?xml version=\"".

*/

*/

        static const XalanDOMChar               s_xmlHeaderStartString[];

        static const XalanDOMChar   s_xmlHeaderStartString[];

        static const XalanDOMString::size_type  s_xmlHeaderStartStringLength;

        static const size_type      s_xmlHeaderStartStringLength;

/**

/**

         * The string "\" encoding=\"".

         * The string "\" encoding=\"".

*/

*/

        static const XalanDOMChar               s_xmlHeaderEncodingString[];

        static const XalanDOMChar   s_xmlHeaderEncodingString[];

        static const XalanDOMString::size_type  s_xmlHeaderEncodingStringLength;

        static const size_type      s_xmlHeaderEncodingStringLength;

/**

/**

         * The string "\" standalone=\"".

         * The string "\" standalone=\"".

*/

*/

        static const XalanDOMChar               s_xmlHeaderStandaloneString[];

        static const XalanDOMChar   s_xmlHeaderStandaloneString[];

        static const XalanDOMString::size_type  s_xmlHeaderStandaloneStringLength;

        static const size_type      s_xmlHeaderStandaloneStringLength;

/**

/**

         * The string "\"?>".

         * The string "\"?>".

*/

*/

        static const XalanDOMChar               s_xmlHeaderEndString[];

        static const XalanDOMChar   s_xmlHeaderEndString[];

        static const XalanDOMString::size_type  s_xmlHeaderEndStringLength;

        static const size_type      s_xmlHeaderEndStringLength;

/**

/**

         * The string "1.0".

         * The string "1.0".

*/

*/

        static const XalanDOMChar               s_defaultVersionString[];

        static const XalanDOMChar   s_defaultVersionString[];

        static const XalanDOMString::size_type  s_defaultVersionStringLength;

        static const size_type      s_defaultVersionStringLength;

/**

/**

         * The string "-//W3C//DTD XHTML".

         * The string "-//W3C//DTD XHTML".

*/

*/

        static const XalanDOMChar               s_xhtmlDocTypeString[];

        static const XalanDOMChar   s_xhtmlDocTypeString[];

        static const XalanDOMString::size_type  s_xhtmlDocTypeStringLength;

        static const size_type      s_xhtmlDocTypeStringLength;

/**

/**

         * The string "<![CDATA[".

         * The string "<![CDATA[".

*/

*/

        static const XalanDOMChar               s_cdataOpenString[];

        static const XalanDOMChar   s_cdataOpenString[];

        static const XalanDOMString::size_type  s_cdataOpenStringLength;

        static const size_type      s_cdataOpenStringLength;

/**

/**

         * The string "]]>".

         * The string "]]>".

*/

*/

        static const XalanDOMChar               s_cdataCloseString[];

        static const XalanDOMChar   s_cdataCloseString[];

        static const XalanDOMString::size_type  s_cdataCloseStringLength;

        static const size_type      s_cdataCloseStringLength;

/**

/**

         * The string "&lt;".

         * The string "&lt;".

*/

*/

        static const XalanDOMChar               s_lessThanEntityString[];

        static const XalanDOMChar   s_lessThanEntityString[];

        static const XalanDOMString::size_type  s_lessThanEntityStringLength;

        static const size_type      s_lessThanEntityStringLength;

/**

/**

         * The string "&gt;".

         * The string "&gt;".

*/

*/

        static const XalanDOMChar               s_greaterThanEntityString[];

        static const XalanDOMChar   s_greaterThanEntityString[];

        static const XalanDOMString::size_type  s_greaterThanEntityStringLength;

        static const size_type      s_greaterThanEntityStringLength;

/**

/**

         * The string "&amp;".

         * The string "&amp;".

*/

*/

        static const XalanDOMChar               s_ampersandEntityString[];

        static const XalanDOMChar   s_ampersandEntityString[];

        static const XalanDOMString::size_type  s_ampersandEntityStringLength;

        static const size_type      s_ampersandEntityStringLength;

/**

/**

         * The string "&quot;".

         * The string "&quot;".

*/

*/

        static const XalanDOMChar               s_quoteEntityString[];

        static const XalanDOMChar   s_quoteEntityString[];

        static const XalanDOMString::size_type  s_quoteEntityStringLength;

        static const size_type      s_quoteEntityStringLength;

};

};

    enum

    enum

Lines 569-580	Link Here

    virtual void

    virtual void

    writeCharacters(

    writeCharacters(

            const XMLCh*    chars,

            const XMLCh*    chars,

            unsigned int    length) = 0;

            size_type       length) = 0;

    virtual void

    virtual void

    writeCDATA(

    writeCDATA(

            const XMLCh*    chars,

            const XMLCh*    chars,

            unsigned int    length) = 0;

            size_type       length) = 0;

    virtual void

    virtual void

    outputNewline() = 0;

    outputNewline() = 0;

Lines 692-698	Link Here

*/

*/

    const XalanDOMString    m_standalone;

    const XalanDOMString    m_standalone;

    const XalanDOMString  m_encoding;

    const XalanDOMString    m_encoding;

    static bool

    static bool

    isUTF16HighSurrogate(XalanDOMChar   theChar)

    isUTF16HighSurrogate(XalanDOMChar   theChar)

Lines 790-798	Link Here

/**

/**

     * The string "-//W3C//DTD XHTML".

     * The string "-//W3C//DTD XHTML".

*/

*/

    static const XalanDOMChar               s_xhtmlDocTypeString[];

    static const XalanDOMChar   s_xhtmlDocTypeString[];

    static const XalanDOMString::size_type  s_xhtmlDocTypeStringLength;

    static const size_type      s_xhtmlDocTypeStringLength;

};

};

(-) src/xalanc/XMLSupport/FormatterToText.hpp (-4 / +4 lines)

Lines 187-198	Link Here

    virtual void

    virtual void

	characters(

	characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

    virtual void

    virtual void

	charactersRaw(

	charactersRaw(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	entityReference(const XMLCh* const	name);

	entityReference(const XMLCh* const	name);

Lines 200-206	Link Here

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 216-222	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type 	length);

private:

private:

(-) src/xalanc/XMLSupport/FormatterToXML.cpp (-43 / +43 lines)

Lines 695-707	Link Here

void

void

FormatterToXML::accumNameArray(

FormatterToXML::accumNameArray(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

    const XalanDOMString::size_type     n = start + length;

    const size_type     n = start + length;

    for(XalanDOMString::size_type i = start; i < n; ++i)

    for(size_type i = start; i < n; ++i)

        accumName(chars[i]);

        accumName(chars[i]);

Lines 711-723	Link Here

void

void

FormatterToXML::accumContentArray(

FormatterToXML::accumContentArray(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

    const XalanDOMString::size_type     n = start + length;

    const size_type     n = start + length;

    for(XalanDOMString::size_type i = start; i < n; ++i)

    for(size_type i = start; i < n; ++i)

        accumContent(chars[i]);

        accumContent(chars[i]);

Lines 727-739	Link Here

void

void

FormatterToXML::accumArrayUTF(

FormatterToXML::accumArrayUTF(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

    const XalanDOMString::size_type     n = start + length;

    const size_type     n = start + length;

    for(XalanDOMString::size_type i = start; i < n; ++i)

    for(size_type i = start; i < n; ++i)

        accumCharUTF(chars[i]);

        accumCharUTF(chars[i]);

Lines 743-751	Link Here

void

void

FormatterToXML::accumArrayUTFDirect(

FormatterToXML::accumArrayUTFDirect(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

    assert(m_maxCharacter >= 65535);

    assert(m_maxCharacter >= 65535);

    assert(m_stream != 0);

    assert(m_stream != 0);

Lines 854-866	Link Here

XalanDOMString::size_type

FormatterToXML::size_type

FormatterToXML::accumDefaultEscape(

FormatterToXML::accumDefaultEscape(

            XalanDOMChar                ch,

            XalanDOMChar        ch,

            XalanDOMString::size_type   i,

            size_type           i,

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   len,

            size_type           len,

            bool                        escLF)

            bool                escLF)

    if(!accumDefaultEntity(ch, escLF))

    if(!accumDefaultEntity(ch, escLF))

Lines 1258-1264	Link Here

void

void

FormatterToXML::characters(

FormatterToXML::characters(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

    if(length != 0)

    if(length != 0)

Lines 1278-1285	Link Here

            m_ispreserve = true;

            m_ispreserve = true;

            unsigned int    i = 0;

            size_type    i = 0;

            unsigned int    firstIndex = 0;

            size_type   firstIndex = 0;

            while(i < length)

            while(i < length)

Lines 1318-1324	Link Here

void

void

FormatterToXML::charactersRaw(

FormatterToXML::charactersRaw(

        const XMLCh* const  chars,

        const XMLCh* const  chars,

        const unsigned int  length)

        const size_type     length)

    writeParentTagEnd();

    writeParentTagEnd();

Lines 1378-1390	Link Here

void

void

FormatterToXML::writeAttrString(

FormatterToXML::writeAttrString(

            const XalanDOMChar*         theString,

            const XalanDOMChar*     theString,

            XalanDOMString::size_type   theStringLength)

            size_type               theStringLength)

    assert(theString != 0);

    assert(theString != 0);

    XalanDOMString::size_type   i = 0;

    size_type   i = 0;

    XalanDOMString::size_type   firstIndex = 0;

    size_type   firstIndex = 0;

    while(i < theStringLength)

    while(i < theStringLength)

Lines 1423-1436	Link Here

void

void

FormatterToXML::writeNormalizedChars(

FormatterToXML::writeNormalizedChars(

            const XalanDOMChar          ch[],

            const XalanDOMChar  ch[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length,

            size_type           length,

            bool                        isCData)

            bool                isCData)

    XalanDOMString::size_type   end = start + length;

    size_type   end = start + length;

    for(XalanDOMString::size_type i = start; i < end; i++)

    for(size_type i = start; i < end; ++i)

        const XalanDOMChar  c = ch[i];

        const XalanDOMChar  c = ch[i];

Lines 1595-1601	Link Here

void

void

FormatterToXML::ignorableWhitespace(

FormatterToXML::ignorableWhitespace(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length)

            const size_type     length)

#if 1

#if 1

    // We need to do normalization, which is slower,

    // We need to do normalization, which is slower,

Lines 1678-1684	Link Here

void

void

FormatterToXML::cdata(

FormatterToXML::cdata(

            const XMLCh* const  ch,

            const XMLCh* const  ch,

            const unsigned int  length)

            const size_type     length)

    if(m_nextIsRaw == true)

    if(m_nextIsRaw == true)

Lines 1839-1848	Link Here

void

void

FormatterToXML::accumNormalizedPIData(

FormatterToXML::accumNormalizedPIData(

            const XalanDOMChar*         theData,

            const XalanDOMChar*     theData,

            XalanDOMString::size_type   theLength)

            size_type               theLength)

    for (XalanDOMString::size_type i = 0; i < theLength; ++i)

    for (size_type i = 0; i < theLength; ++i)

        accumContent(theData[i]);

        accumContent(theData[i]);

(-) src/xalanc/XMLSupport/XalanUTF16Writer.hpp (-13 / +19 lines)

Lines 56-65	Link Here

    size_type

    size_type

    writeCDATAChar(

    writeCDATAChar(

                const XalanDOMChar  chars[],

            const XalanDOMChar  chars[],

                size_type           start,

            size_type           start,

                size_type           /*length*/,

            size_type           /*length*/,

                bool&               /* outsideCDATA */)

            bool&               /* outsideCDATA */)

        assert( chars != 0 );

        assert( chars != 0 );

Lines 69-96	Link Here

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars, if not representable, throws

*/

*/

    void writeNameChar(const XalanDOMChar*            data,

    void

                       size_type                theLength)

    writeNameChar(

            const XalanDOMChar*     data,

            size_type               theLength)

        write(data, theLength);

        write(data, theLength);

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars, if not representable, throws

*/

*/

    void writePIChars(const XalanDOMChar*       data,

    void

                        size_type               theLength)

    writePIChars(

            const XalanDOMChar*     data,

            size_type               theLength)

        write(data, theLength);

        write(data, theLength);

/**

/**

     * Writes name chars , if not presentable, throws

     * Writes name chars, if not representable, throws

*/

*/

    void writeCommentChars(const XalanDOMChar*      data,

    void

                           size_type                theLength)

    writeCommentChars(

            const XalanDOMChar*      data,

            size_type                theLength)

        write(data, theLength);

        write(data, theLength);

(-) src/xalanc/XMLSupport/FormatterToXML.hpp (-39 / +39 lines)

Lines 146-157	Link Here

    virtual void

    virtual void

    characters(

    characters(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length);

            const size_type     length);

    virtual void

    virtual void

    charactersRaw(

    charactersRaw(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length);

            const size_type     length);

    virtual void

    virtual void

    entityReference(const XMLCh* const  name);

    entityReference(const XMLCh* const  name);

Lines 159-165	Link Here

    virtual void

    virtual void

    ignorableWhitespace(

    ignorableWhitespace(

            const XMLCh* const  chars,

            const XMLCh* const  chars,

            const unsigned int  length);

            const size_type     length);

    virtual void

    virtual void

    processingInstruction(

    processingInstruction(

Lines 176-182	Link Here

    virtual void

    virtual void

    cdata(

    cdata(

            const XMLCh* const  ch,

            const XMLCh* const  ch,

            const unsigned int  length);

            const size_type     length);

    virtual Writer*

    virtual Writer*

    getWriter() const;

    getWriter() const;

Lines 294-301	Link Here

    typedef void (FormatterToXML::*AccumArrayFunctionType)(

    typedef void (FormatterToXML::*AccumArrayFunctionType)(

                        const XalanDOMChar[],

                        const XalanDOMChar[],

                        XalanDOMString::size_type,

                        size_type,

                        XalanDOMString::size_type);

                        size_type);

    typedef void (FormatterToXML::*FlushFunctionType)();

    typedef void (FormatterToXML::*FlushFunctionType)();

Lines 374-382	Link Here

*/

*/

    void

    void

    accumName(

    accumName(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

        assert(m_accumNameArrayFunction != 0);

        assert(m_accumNameArrayFunction != 0);

Lines 392-400	Link Here

*/

*/

    void

    void

    accumContent(

    accumContent(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length)

            size_type           length)

        assert(m_accumContentArrayFunction != 0);

        assert(m_accumContentArrayFunction != 0);

Lines 434-446	Link Here

/**

/**

     * Escape and accum a character.

     * Escape and accum a character.

*/

*/

    XalanDOMString::size_type

    size_type

    accumDefaultEscape(

    accumDefaultEscape(

            XalanDOMChar                ch,

            XalanDOMChar        ch,

            XalanDOMString::size_type   i,

            size_type           i,

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   len,

            size_type           len,

            bool                        escLF);

            bool                escLF);

/**

/**

     * Handle one of the default entities, return false if it

     * Handle one of the default entities, return false if it

Lines 513-522	Link Here

*/

*/

    virtual void

    virtual void

    writeNormalizedChars(

    writeNormalizedChars(

            const XalanDOMChar          ch[],

            const XalanDOMChar  ch[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length,

            size_type           length,

            bool                        isCData);

            bool                isCData);

/**

/**

     * Write a number into the buffer as an entity

     * Write a number into the buffer as an entity

Lines 534-541	Link Here

*/

*/

    virtual void

    virtual void

    writeAttrString(

    writeAttrString(

            const XalanDOMChar*         theString,

            const XalanDOMChar*     theString,

            XalanDOMString::size_type   theStringLength);

            size_type               theStringLength);

/**

/**

     * Write the data for a comment

     * Write the data for a comment

Lines 853-861	Link Here

*/

*/

    void

    void

    accumNameArray(

    accumNameArray(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length);

            size_type           length);

/**

/**

     * Append an array of wide character to the buffer.

     * Append an array of wide character to the buffer.

Lines 868-876	Link Here

*/

*/

    void

    void

    accumContentArray(

    accumContentArray(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length);

            size_type           length);

/**

/**

     * Append an array of wide character to the buffer.

     * Append an array of wide character to the buffer.

Lines 883-891	Link Here

*/

*/

    void

    void

    accumArrayUTF(

    accumArrayUTF(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length);

            size_type           length);

/**

/**

     * Append an array of wide character to the output.

     * Append an array of wide character to the output.

Lines 898-906	Link Here

*/

*/

    void

    void

    accumArrayUTFDirect(

    accumArrayUTFDirect(

            const XalanDOMChar          chars[],

            const XalanDOMChar  chars[],

            XalanDOMString::size_type   start,

            size_type           start,

            XalanDOMString::size_type   length);

            size_type           length);

/**

/**

     * Append a string to the buffer.

     * Append a string to the buffer.

Lines 974-981	Link Here

*/

*/

    void

    void

    accumNormalizedPIData(

    accumNormalizedPIData(

            const XalanDOMChar*         theData,

            const XalanDOMChar*     theData,

            XalanDOMString::size_type   theLength);

            size_type               theLength);

    // Data members...

    // Data members...

Lines 1018-1024	Link Here

*/

*/

    const XalanDOMString    m_attrSpecialChars;

    const XalanDOMString    m_attrSpecialChars;

    typedef XalanDOMString::size_type   size_type;

    //typedef XalanDOMString::size_type   size_type;

/**

/**

     * The string "<!DOCTYPE ".

     * The string "<!DOCTYPE ".

(-) src/xalanc/Utils/MsgCreator/NLSHandler.hpp (-1 / +10 lines)

Lines 20-27	Link Here

#include "ICUResHandler.hpp"

#include "ICUResHandler.hpp"

XALAN_CPP_NAMESPACE_BEGIN

XERCES_CPP_NAMESPACE_USE

XERCES_CPP_NAMESPACE_USE

class NLSHandler : public ICUResHandler

class NLSHandler : public ICUResHandler

public:

public:

Lines 72-77	Link Here

#endif  //NLSHANDLER_MSGCREATOR_1357924680

XALAN_CPP_NAMESPACE_END

#endif  //NLSHANDLER_MSGCREATOR_1357924680

(-) src/xalanc/Utils/MsgCreator/InMemHandler.cpp (-7 / +16 lines)

Lines 26-31	Link Here

#include "InMemData.hpp"

#include "InMemData.hpp"

XALAN_CPP_NAMESPACE_BEGIN

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

//  Constructors

//  Constructors

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

Lines 68-74	Link Here

void InMemHandler::characters(	const   XMLCh* const    chars

void InMemHandler::characters(	const   XMLCh* const    chars

						, const unsigned int    length)

						, const XalanSize_t    length)

	if ( m_startCollectingCharacters == true )

	if ( m_startCollectingCharacters == true )

Lines 99-113	Link Here

void InMemHandler::endElement(const XMLCh* const ,

void InMemHandler::endElement(const XMLCh* const /* uri */,

					const XMLCh* const localname,

					const XMLCh* const /* localname */,

					const XMLCh* const )

					const XMLCh* const qname)

	if ( m_startCollectingCharacters == false)

	if ( m_startCollectingCharacters == false)

		return;

		return;

	if(!XMLString::compareString(localname,s_targetXMLCh))

	if(!XMLString::compareString(qname,s_targetXMLCh))

		m_startCollectingCharacters = false;

		m_startCollectingCharacters = false;

Lines 121-133	Link Here

								const   Attributes&		attributes)

								const   Attributes&		attributes)

	if(!XMLString::compareString(localname,s_transUnitXMLCh))

	if(!XMLString::compareString(qname,s_transUnitXMLCh))

		// this is an elemente, SAX2Handler class is responsible to handle:

		// this is an elemente, SAX2Handler class is responsible to handle:

		// creating Index file, commom for all localization styles

		// creating Index file, commom for all localization styles

		SAX2Handler::startElement(uri, localname, qname, attributes);

		SAX2Handler::startElement(uri, localname, qname, attributes);

	else if(!XMLString::compareString(localname,s_targetXMLCh))

	else if(!XMLString::compareString(qname,s_targetXMLCh))

Lines 203-205	Link Here

	printToDataFile( szEndDataFile );

	printToDataFile( szEndDataFile );

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/Utils/MsgCreator/MsgCreator.cpp (-1 / +3 lines)

Lines 263-269	Link Here

	_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);

	_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);

	_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);

	_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);

#endif

#endif

    XALAN_CPP_NAMESPACE_USE

	CmdLineParams	theParams;

	CmdLineParams	theParams;

	int iReturnValue = 0;

	int iReturnValue = 0;

(-) src/xalanc/Utils/MsgCreator/InMemHandler.hpp (-1 / +13 lines)

Lines 20-27	Link Here

#include "SAX2Handler.hpp"

#include "SAX2Handler.hpp"

XALAN_CPP_NAMESPACE_BEGIN

XERCES_CPP_NAMESPACE_USE

XERCES_CPP_NAMESPACE_USE

class InMemHandler : public SAX2Handler

class InMemHandler : public SAX2Handler

public:

public:

Lines 54-60	Link Here

	virtual void

	virtual void

	characters(	const   XMLCh* const    chars

	characters(	const   XMLCh* const    chars

						, const unsigned int    length);

						, const XalanSize_t    length);

Lines 96-99	Link Here

};

};

XALAN_CPP_NAMESPACE_END

#endif /// INMEMHANDLER_MSGCREATOR_1357924680

#endif /// INMEMHANDLER_MSGCREATOR_1357924680

(-) src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (-5 / +8 lines)

Lines 29-39	Link Here

#include "MsgCreator.hpp"

#include "MsgCreator.hpp"

XALAN_CPP_NAMESPACE_BEGIN

static const char* INDEX_FILE_NAME="LocalMsgIndex.hpp";

static const char* INDEX_FILE_NAME="LocalMsgIndex.hpp";

// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

//  SAX2Handler: Constructors and Destructor

//  SAX2Handler: Constructors and Destructor

// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

Lines 92-103	Link Here

void SAX2Handler::startElement(const   XMLCh* const    ,

void SAX2Handler::startElement(const   XMLCh* const    /* uri */,

									const   XMLCh* const    localname,

									const   XMLCh* const    /* localname */,

									const   XMLCh* const    ,

									const   XMLCh* const    qname,

                                    const   Attributes&		attributes)

                                    const   Attributes&		attributes)

	if(!XMLString::compareString(localname,s_transUnitXMLCh))

	if(!XMLString::compareString(qname,s_transUnitXMLCh))

		unsigned int len = attributes.getLength();

		unsigned int len = attributes.getLength();

Lines 192-194	Link Here

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (-1 / +8 lines)

Lines 23-28	Link Here

#include <xercesc/util/XMLUniDefs.hpp>

#include <xercesc/util/XMLUniDefs.hpp>

XALAN_CPP_NAMESPACE_BEGIN

XERCES_CPP_NAMESPACE_USE

XERCES_CPP_NAMESPACE_USE

Lines 210-215	Link Here

};

};

#endif //SAX2HANDLER_MSGCREATOR_1357924680

XALAN_CPP_NAMESPACE_END

#endif //SAX2HANDLER_MSGCREATOR_1357924680

(-) src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (-5 / +12 lines)

Lines 24-29	Link Here

#include <cstdio>

#include <cstdio>

XALAN_CPP_NAMESPACE_BEGIN

static  XalanFileOutputStream::HandleType

static  XalanFileOutputStream::HandleType

openFile(const char*	theFileName)

openFile(const char*	theFileName)

Lines 105-111	Link Here

void

void

XalanFileOutputStream::writeData(

XalanFileOutputStream::writeData(

			const char*		theBuffer,

			const char*		theBuffer,

			unsigned int		theBufferLength)

			XalanSize_t		theBufferLength)

#if defined(WIN32)

#if defined(WIN32)

	DWORD			theBytesWritten;

	DWORD			theBytesWritten;

Lines 204-216	Link Here

void 	XalanFileOutputStream::write(const UTF16Ch*	theString, unsigned int		theLength)

void 	XalanFileOutputStream::write(const UTF16Ch*	theString, XalanSize_t		theLength)

	assert ( theString != 0 );

	assert ( theString != 0 );

	writeData((const char*)theString,theLength * sizeof(UTF16Ch) );

	writeData((const char*)theString,theLength * sizeof(UTF16Ch) );

void 	XalanFileOutputStream::write(const char*	theString, unsigned int		theLength)

void 	XalanFileOutputStream::write(const char*	theString, XalanSize_t		theLength)

	assert ( theString != 0 );

	assert ( theString != 0 );

Lines 221-227	Link Here

	XMLString::release(&theUTFString);

	XMLString::release(&theUTFString);

void XalanFileOutputStream::writeAsASCII(const UTF16Ch*	theString, unsigned int		theLengts)

void XalanFileOutputStream::writeAsASCII(const UTF16Ch*	theString, XalanSize_t		theLengts)

	char* szString = XMLString::transcode(theString);

	char* szString = XMLString::transcode(theString);

	writeData( szString, theLengts );

	writeData( szString, theLengts );

Lines 229-235	Link Here

void XalanFileOutputStream::writeAsASCII(const char*	theString, unsigned int		theLengts)

void XalanFileOutputStream::writeAsASCII(const char*	theString, XalanSize_t		theLengts)

	writeData( theString, theLengts );

	writeData( theString, theLengts );

Lines 244-246	Link Here

	write(s_UTF16ByteOrderMark,1);

	write(s_UTF16ByteOrderMark,1);

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (-7 / +10 lines)

Lines 20-25	Link Here

#define XALANOUTPUTFILE_1357924680

#define XALANOUTPUTFILE_1357924680

#include <xercesc/util/XMLUniDefs.hpp>

#include <xercesc/util/XMLUniDefs.hpp>

#include "xalanc/Include/PlatformDefinitions.hpp"

#if defined(WIN32)

#if defined(WIN32)

Lines 32-41	Link Here

XERCES_CPP_NAMESPACE_USE

XALAN_CPP_NAMESPACE_BEGIN

XERCES_CPP_NAMESPACE_USE

// Class responcible for printing into file with UTF16

// Class responcible for printing into file with UTF16

Lines 111-125	Link Here

	void

	void

	write(const UTF16Ch*	theString, unsigned int		theLength);

	write(const UTF16Ch*	theString, XalanSize_t		theLength);

	void

	void

	write(const char*	theString, unsigned int		theLength);

	write(const char*	theString, XalanSize_t		theLength);

	void

	void

	writeAsASCII(const char*	theString, unsigned int		theLengts);

	writeAsASCII(const char*	theString, XalanSize_t		theLengts);

	void

	void

	writeAsASCII(const UTF16Ch*	theString, unsigned int		theLengts);

	writeAsASCII(const UTF16Ch*	theString, XalanSize_t		theLengts);

	void

	void

	writeUTFprefix();

	writeUTFprefix();

protected:

protected:

Lines 127-133	Link Here

	void

	void

	writeData(

	writeData(

			const char*		theBuffer,

			const char*		theBuffer,

			unsigned int	theBufferLength);

			XalanSize_t	theBufferLength);

	void

	void

	doFlush();

	doFlush();

Lines 151-156	Link Here

};

};

#endif //XALANOUTPUTFILE_1357924680

XALAN_CPP_NAMESPACE_END

#endif //XALANOUTPUTFILE_1357924680

(-) src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (-8 / +11 lines)

Lines 28-34	Link Here

XALAN_CPP_NAMESPACE_BEGIN

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

//  Constructors

//  Constructors

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

Lines 58-64	Link Here

// change tham with \", \{ and \}

// change tham with \", \{ and \}

void ICUResHandler::characters(	const   XMLCh* const    chars

void ICUResHandler::characters(	const   XMLCh* const    chars

						, const unsigned int    length)

						, const XalanSize_t    length)

	if ( m_startCollectingCharacters == true )

	if ( m_startCollectingCharacters == true )

Lines 100-114	Link Here

void ICUResHandler::endElement(const XMLCh* const ,

void ICUResHandler::endElement(const XMLCh* const /* uri */,

					const XMLCh* const localname,

					const XMLCh* const /* localname */,

					const XMLCh* const )

					const XMLCh* const qname)

	if ( m_startCollectingCharacters == false)

	if ( m_startCollectingCharacters == false)

		return;

		return;

    if(!XMLString::compareString(localname,s_targetXMLCh))

    if(!XMLString::compareString(qname,s_targetXMLCh))

		m_startCollectingCharacters = false;

		m_startCollectingCharacters = false;

Lines 122-134	Link Here

								const   Attributes&		attributes)

								const   Attributes&		attributes)

	if(!XMLString::compareString(localname,s_transUnitXMLCh))

	if(!XMLString::compareString(qname,s_transUnitXMLCh))

		// this is an elemente, SAX2Handler class is responsible to handle:

		// this is an elemente, SAX2Handler class is responsible to handle:

		// creating Index file, commom for all localization styles

		// creating Index file, commom for all localization styles

		SAX2Handler::startElement(uri, localname, qname, attributes);

		SAX2Handler::startElement(uri, localname, qname, attributes);

	else if(!XMLString::compareString(localname,s_targetXMLCh))

	else if(!XMLString::compareString(qname,s_targetXMLCh))

		if ( m_locale != 0 )

		if ( m_locale != 0 )

Lines 196-199	Link Here

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/Utils/MsgCreator/NLSHandler.cpp (-1 / +10 lines)

Lines 22-27	Link Here

#include <cstdio>

#include <cstdio>

XALAN_CPP_NAMESPACE_BEGIN

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

//  Constructors

//  Constructors

// -----------------------------------------------------------------------

// -----------------------------------------------------------------------

Lines 48-54	Link Here

void NLSHandler::characters(	const   XMLCh* const    chars

void NLSHandler::characters(	const   XMLCh* const    chars

						, const unsigned int    length)

						, const XalanSize_t    length)

	if ( m_startCollectingCharacters == true )

	if ( m_startCollectingCharacters == true )

Lines 128-130	Link Here

		m_fStream.writeAsASCII("^\n",2);

		m_fStream.writeAsASCII("^\n",2);

XALAN_CPP_NAMESPACE_END

(-) src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (-1 / +11 lines)

Lines 20-27	Link Here

#include "SAX2Handler.hpp"

#include "SAX2Handler.hpp"

XALAN_CPP_NAMESPACE_BEGIN

XERCES_CPP_NAMESPACE_USE

XERCES_CPP_NAMESPACE_USE

class ICUResHandler : public SAX2Handler

class ICUResHandler : public SAX2Handler

public:

public:

Lines 84-88	Link Here

	operator==(const ICUResHandler&) const;

	operator==(const ICUResHandler&) const;

};

};

XALAN_CPP_NAMESPACE_END

#endif // ICURESHANDLER_MSGCREATOR_1357924680

#endif // ICURESHANDLER_MSGCREATOR_1357924680

(-) src/xalanc/XalanDOM/XalanDOMString.hpp (-2 / +2 lines)

Lines 50-56	Link Here

	typedef XalanDOMChar&				reference;

	typedef XalanDOMChar&				reference;

	typedef const XalanDOMChar&			const_reference;

	typedef const XalanDOMChar&			const_reference;

    typedef unsigned int    size_type;

    typedef XalanSize_t     size_type;

	typedef XalanDOMCharVectorType::iterator				iterator;

	typedef XalanDOMCharVectorType::iterator				iterator;

	typedef XalanDOMCharVectorType::const_iterator			const_iterator;

	typedef XalanDOMCharVectorType::const_iterator			const_iterator;

Lines 60-66	Link Here

#if defined(XALAN_INLINE_INITIALIZATION)

#if defined(XALAN_INLINE_INITIALIZATION)

	static const size_type	npos = ~0u;

	static const size_type	npos = ~0u;

#else

#else

	enum { npos = -1 };

    enum { npos = ~0u };

#endif

#endif

	XalanDOMString(MemoryManagerType&  theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR );

	XalanDOMString(MemoryManagerType&  theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR );

(-) src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (+3 lines)

Lines 96-101	Link Here

    virtual void

    virtual void

    deallocate(void*    pointer);

    deallocate(void*    pointer);

    virtual MemoryManager*

    getExceptionMemoryManager();

    bool

    bool

    getAssertErrors() const

    getAssertErrors() const

(-) src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (+8 lines)

Lines 157-162	Link Here

MemoryManager*

XalanDiagnosticMemoryManager::getExceptionMemoryManager()

    return &m_memoryManager;

void

void

XalanDiagnosticMemoryManager::dumpStatistics(

XalanDiagnosticMemoryManager::dumpStatistics(

            StreamType*     theStream,

            StreamType*     theStream,

(-) src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (-6 / +7 lines)

Lines 74-80	Link Here

public:

public:

	typedef XalanVector<XalanSourceTreeElement*> 		ElementStackType;

	typedef XalanVector<XalanSourceTreeElement*> 		ElementStackType;

	typedef XalanVector<XalanNode*> 						LastChildStackType;

	typedef XalanVector<XalanNode*> 					LastChildStackType;

    typedef XalanSize_t                                 size_type;

	enum { eDefaultStackSize = 50, eDefaultTextBufferSize = 100 };

	enum { eDefaultStackSize = 50, eDefaultTextBufferSize = 100 };

Lines 94-100	Link Here

	virtual void

	virtual void

	characters(

	characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	endDocument();

	endDocument();

Lines 108-114	Link Here

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 165-171	Link Here

	virtual void

	virtual void

	comment(

	comment(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	endCDATA();

	endCDATA();

Lines 225-232	Link Here

	void

	void

	doCharacters(

	doCharacters(

			const XMLCh*				chars,

			const XMLCh*	chars,

			XalanDOMString::size_type	length);

			size_type	    length);

	// Data members...

	// Data members...

(-) src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (-6 / +6 lines)

Lines 259-265	Link Here

void

void

FormatterToSourceTree::characters(

FormatterToSourceTree::characters(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	if (m_documentFragment != 0)

	if (m_documentFragment != 0)

Lines 283-289	Link Here

void

void

FormatterToSourceTree::charactersRaw(

FormatterToSourceTree::charactersRaw(

		const XMLCh* const	chars,

		const XMLCh* const	chars,

		const unsigned int	length)

		const size_type	    length)

	assert(m_document != 0);

	assert(m_document != 0);

Lines 306-312	Link Here

void

void

FormatterToSourceTree::ignorableWhitespace(

FormatterToSourceTree::ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	assert(m_document != 0);

	assert(m_document != 0);

Lines 381-387	Link Here

void

void

FormatterToSourceTree::cdata(

FormatterToSourceTree::cdata(

			const XMLCh* const	/* ch */,

			const XMLCh* const	/* ch */,

			const unsigned int 	/* length */)

			const size_type 	/* length */)

Lines 402-409	Link Here

void

void

FormatterToSourceTree::doCharacters(

FormatterToSourceTree::doCharacters(

			const XMLCh*				chars,

			const XMLCh*	chars,

			XalanDOMString::size_type	length)

			size_type	    length)

	if (m_currentElement != 0)

	if (m_currentElement != 0)

(-) src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (-6 / +6 lines)

Lines 141-147	Link Here

	virtual void

	virtual void

	charactersRaw(

	charactersRaw(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length);

			const size_type	    length);

	virtual void

	virtual void

	comment(const XMLCh* const	data);

	comment(const XMLCh* const	data);

Lines 149-155	Link Here

	virtual void

	virtual void

	cdata(

	cdata(

			const XMLCh* const	ch,

			const XMLCh* const	ch,

			const unsigned int 	length);

			const size_type 	length);

	virtual void

	virtual void

	entityReference(const XMLCh* const	name);

	entityReference(const XMLCh* const	name);

Lines 174-185	Link Here

	virtual void

	virtual void

	characters(

	characters(

				const XMLCh* const	chars,

				const XMLCh* const	chars,

				const unsigned int	length);

				const size_type	    length);

	virtual void

	virtual void

	ignorableWhitespace(

	ignorableWhitespace(

				const XMLCh* const	chars,

				const XMLCh* const	chars,

				const unsigned int	length);

				const size_type	    length);

	virtual void

	virtual void

	processingInstruction(

	processingInstruction(

Lines 203-210	Link Here

	void

	void

	doCharacters(

	doCharacters(

			const XalanDOMChar*			chars,

			const XalanDOMChar*		chars,

			XalanDOMString::size_type	length);

			size_type	            length);

	void

	void

	doProcessingInstruction(

	doProcessingInstruction(

(-) src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (-5 / +5 lines)

Lines 65-71	Link Here

void

void

XalanSourceTreeContentHandler::characters(

XalanSourceTreeContentHandler::characters(

			const	XMLCh* const	chars,

			const	XMLCh* const	chars,

			const unsigned int		length)

			const size_type		    length)

	assert(m_inDTD == false);

	assert(m_inDTD == false);

Lines 194-200	Link Here

void

void

XalanSourceTreeContentHandler::ignorableWhitespace(

XalanSourceTreeContentHandler::ignorableWhitespace(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	assert(m_inDTD == false);

	assert(m_inDTD == false);

Lines 370-376	Link Here

void

void

XalanSourceTreeContentHandler::comment(

XalanSourceTreeContentHandler::comment(

			const XMLCh* const	chars,

			const XMLCh* const	chars,

			const unsigned int	length)

			const size_type	    length)

	assert(m_document != 0);

	assert(m_document != 0);

Lines 499-506	Link Here

void

void

XalanSourceTreeContentHandler::doCharacters(

XalanSourceTreeContentHandler::doCharacters(

			const XMLCh*				chars,

			const XMLCh*	chars,

			XalanDOMString::size_type	length)

			size_type	    length)

	assert(m_inDTD == false);

	assert(m_inDTD == false);

(-) src/xalanc/DOMSupport/DOMSupportDefault.cpp (-7 / +3 lines)

Lines 90-107	Link Here

			if (theNode != 0 && theNode->getNodeType() == XalanNode::ENTITY_NODE)

			if (theNode != 0 && theNode->getNodeType() == XalanNode::ENTITY_NODE)

				const XalanEntity*	theEntity =

				const XalanEntity* const    theEntity =

#if defined(XALAN_OLD_STYLE_CASTS)

#if defined(XALAN_OLD_STYLE_CASTS)

					(const XalanEntity*)theNode;

					(const XalanEntity*)theNode;

#else

#else

					static_cast<const XalanEntity*>(theNode);

					static_cast<const XalanEntity*>(theNode);

#endif

#endif

                const XalanDOMString    theNotationName(

				if(length(theEntity->getNotationName()) != 0) // then it's unparsed

                                            theEntity->getNotationName(),

                                            theMemoryManager);

				if(isEmpty(theNotationName) == false) // then it's unparsed

					// The draft says: "The XSLT processor may use the public

					// The draft says: "The XSLT processor may use the public

					// identifier to generate a URI for the entity instead of the URI

					// identifier to generate a URI for the entity instead of the URI

Lines 114-120	Link Here

					// So I'm falling a bit short here.

					// So I'm falling a bit short here.

					theURI = theEntity->getSystemId();

					theURI = theEntity->getSystemId();

					if(isEmpty(theURI) == true)

                    if(theURI.length() == 0)

						theURI = theEntity->getPublicId();

						theURI = theEntity->getPublicId();

(-) src/xalanc/DOMSupport/DOMServices.hpp (-1 / +1 lines)

Lines 203-209	Link Here

		append(data, text.getData());

		append(data, text.getData());

	typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);

    typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);

/**

/**

	 * Sends the data for a node to a FormatterListener

	 * Sends the data for a node to a FormatterListener

(-) Tests/Conf/conf.cpp (-1 / +8 lines)

Lines 207-213	Link Here

    XercesDOMParser  theParser(0, &mgr);

    XercesDOMParser  theParser(0, &mgr);

#if XERCES_VERSION_MAJOR < 3

    theParser.setDoValidation(true);

    theParser.setDoValidation(true);

#else

    theParser.setValidationScheme(XercesDOMParser::Val_Auto);

#endif

    theParser.setDoNamespaces(true);

    theParser.setDoNamespaces(true);

    theParser.parse(xmlInput);

    theParser.parse(xmlInput);

Lines 308-314	Link Here

//

//

                const XalanDOMString&   currentDir = dirs[j];

                const XalanDOMString&   currentDir = dirs[j];

                if (length(h.args.sub) == 0 || equals(currentDir, h.args.sub) == true)

                if ((length(h.args.sub) == 0 ||

                     equals(currentDir, h.args.sub) == true) &&

                    currentDir[0] != XalanUnicode::charFullStop)

                    // Check that output directory is there.

                    // Check that output directory is there.

//

//

(-) samples/SimpleTransform/XalanMemoryManagerImpl.hpp (-1 / +7 lines)

Lines 96-102	Link Here

	virtual

    MemoryManager*

    getExceptionMemoryManager()

        return this;

    virtual

	~XalanMemoryManagerImpl()

	~XalanMemoryManagerImpl()

       if( 0 == HeapDestroy(m_heapHandle) )

       if( 0 == HeapDestroy(m_heapHandle) )

Attachment #169168: Backported 7 changesets to make things compile for bug #242218