You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/06/30 19:18:36 UTC
svn commit: r672824 [1/2] - in /xalan/c/trunk/src/xalanc: Include/
PlatformSupport/ XPath/ XSLT/ XercesParserLiaison/
Author: dbertoni
Date: Mon Jun 30 10:18:34 2008
New Revision: 672824
URL: http://svn.apache.org/viewvc?rev=672824&view=rev
Log:
Initial set of changes for Xerces-C API changes.
Modified:
xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemChoose.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemChoose.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopy.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemElement.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp
xalan/c/trunk/src/xalanc/XSLT/KeyDeclaration.hpp
xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemElementAllocator.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
Modified: xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp Mon Jun 30 10:18:34 2008
@@ -122,9 +122,11 @@
#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
typedef XMLCh XalanDOMChar;
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp Mon Jun 30 10:18:34 2008
@@ -112,7 +112,7 @@
// until we're done.
AttributeVectorType tempVector(getMemoryManager());
- const unsigned int theLength = theRHS.getLength();
+ const XalanSize_t theLength = theRHS.getLength();
if (theLength > 0)
{
@@ -168,12 +168,12 @@
// safe and don't need any try blocks.
AttributeListImpl theTempList(getMemoryManager());
- const unsigned int theLength = theRHS.getLength();
+ const XalanSize_t theLength = theRHS.getLength();
theTempList.reserve(theLength);
// Add each attribute.
- for(unsigned int i = 0; i < theLength; i++)
+ for(XalanSize_t i = 0; i < theLength; i++)
{
theTempList.addAttribute(
theRHS.getName(i),
@@ -191,7 +191,7 @@
-unsigned int
+XalanSize_t
AttributeListImpl::getLength() const
{
// Make sure the mismatch between Xerces and vector<> doesn't cause a problem...
@@ -203,7 +203,7 @@
const XMLCh*
-AttributeListImpl::getName(const unsigned int index) const
+AttributeListImpl::getName(const XalanSize_t index) const
{
assert(index < getLength());
@@ -213,7 +213,7 @@
const XMLCh*
-AttributeListImpl::getType(const unsigned int index) const
+AttributeListImpl::getType(const XalanSize_t index) const
{
assert(index < getLength());
@@ -223,7 +223,7 @@
const XMLCh*
-AttributeListImpl::getValue(const unsigned int index) const
+AttributeListImpl::getValue(const XalanSize_t index) const
{
assert(index < getLength());
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.hpp Mon Jun 30 10:18:34 2008
@@ -75,17 +75,17 @@
}
// These are inherited from AttributeList
- virtual unsigned int
+ virtual XalanSize_t
getLength() const;
virtual const XMLCh*
- getName(const unsigned int index) const;
+ getName(const XalanSize_t index) const;
virtual const XMLCh*
- getType(const unsigned int index) const;
+ getType(const XalanSize_t index) const;
virtual const XMLCh*
- getValue(const unsigned int index) const;
+ getValue(const XalanSize_t index) const;
virtual const XMLCh*
getType(const XMLCh* const name) const;
@@ -143,7 +143,7 @@
* @param theCount The number to reserve
*/
void
- reserve(unsigned int theCount)
+ reserve(XalanSize_t theCount)
{
m_AttributeVector.reserve(theCount);
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp Mon Jun 30 10:18:34 2008
@@ -111,7 +111,7 @@
// until we're done.
AttributesVectorType tempVector(getMemoryManager());
- const unsigned int theLength = theRHS.getLength();
+ const XalanSize_t theLength = theRHS.getLength();
if (theLength > 0)
{
@@ -169,12 +169,12 @@
// safe and don't need any try blocks.
AttributesImpl theTempList(getMemoryManager());
- const unsigned int theLength = theRHS.getLength();
+ const XalanSize_t theLength = theRHS.getLength();
theTempList.reserve(theLength);
// Add each attribute.
- for(unsigned int i = 0; i < theLength; i++)
+ for(XalanSize_t i = 0; i < theLength; i++)
{
theTempList.addAttribute(
theRHS.getURI(i),
@@ -194,7 +194,7 @@
-unsigned int
+XalanSize_t
AttributesImpl::getLength() const
{
return unsigned(m_attributesVector.size());
@@ -203,7 +203,7 @@
const XMLCh*
-AttributesImpl::getURI(const unsigned int index) const
+AttributesImpl::getURI(const XalanSize_t index) const
{
assert(index < getLength());
@@ -213,7 +213,7 @@
const XMLCh*
-AttributesImpl::getLocalName(const unsigned int index) const
+AttributesImpl::getLocalName(const XalanSize_t index) const
{
assert(index < getLength());
@@ -223,7 +223,7 @@
const XMLCh*
-AttributesImpl::getQName(const unsigned int index) const
+AttributesImpl::getQName(const XalanSize_t index) const
{
assert(index < getLength());
@@ -233,7 +233,7 @@
const XMLCh*
-AttributesImpl::getType(const unsigned int index) const
+AttributesImpl::getType(const XalanSize_t index) const
{
assert(index < getLength());
@@ -243,7 +243,7 @@
const XMLCh*
-AttributesImpl::getValue(const unsigned int index) const
+AttributesImpl::getValue(const XalanSize_t index) const
{
assert(index < getLength());
@@ -382,18 +382,41 @@
+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
AttributesImpl::getIndex(
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 =
XALAN_STD_QUALIFIER find_if(
m_attributesVector.begin(),
m_attributesVector.end(),
- URIAndLocalNameCompareFunctor(uri, localName));
+ URIAndLocalNameCompareFunctor(uri, localPart));
if (i != m_attributesVector.end())
{
@@ -409,6 +432,28 @@
+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
AttributesImpl::getIndex(const XMLCh* const qname) const
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.hpp Mon Jun 30 10:18:34 2008
@@ -67,31 +67,42 @@
AttributesImpl&
operator=(const AttributesType& theRHS);
- // These are inherited from AttributeList
- virtual unsigned int
+ // These are inherited from Attributes
+ virtual XalanSize_t
getLength() const;
virtual const XMLCh*
- getURI(const unsigned int index) const;
+ getURI(const XalanSize_t index) const;
virtual const XMLCh*
- getLocalName(const unsigned int index) const;
+ getLocalName(const XalanSize_t index) const;
virtual const XMLCh*
- getQName(const unsigned int index) const;
+ getQName(const XalanSize_t index) const;
virtual const XMLCh*
- getType(const unsigned int index) const;
+ getType(const XalanSize_t index) const;
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(
const XMLCh* const uri,
- const XMLCh* const localName) const;
+ const XMLCh* const localPart) const;
+
+ virtual bool
+ getIndex(
+ const XMLCh* const qName,
+ XalanSize_t& index) const;
- virtual int
+ virtual int
getIndex(const XMLCh* const qname) const;
virtual const XMLCh*
@@ -188,7 +199,7 @@
* @param theCount The number to reserve
*/
void
- reserve(unsigned int theCount)
+ reserve(XalanSize_t theCount)
{
m_attributesVector.reserve(theCount);
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp Mon Jun 30 10:18:34 2008
@@ -45,13 +45,15 @@
-NamedNodeMapAttributeList::NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap,
- MemoryManagerType& theManager) :
+NamedNodeMapAttributeList::NamedNodeMapAttributeList(
+ const XalanNamedNodeMap& theMap,
+ MemoryManagerType& theManager) :
ParentType(),
m_nodeMap(theMap),
m_lastIndex(theMap.getLength() - 1),
m_memoryManager(theManager)
{
+ assert(theMap.getLength() != 0);
}
@@ -62,7 +64,7 @@
-unsigned int
+XalanSize_t
NamedNodeMapAttributeList::getLength() const
{
return m_nodeMap.getLength();
@@ -71,7 +73,7 @@
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);
assert(theAttribute != 0);
@@ -82,7 +84,7 @@
const XMLCh*
-NamedNodeMapAttributeList::getType(const unsigned int /* index */) const
+NamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const
{
assert(length(s_typeString) > 0);
@@ -92,9 +94,11 @@
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);
return c_wstr(theAttribute->getNodeValue());
@@ -113,7 +117,7 @@
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));
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp Mon Jun 30 10:18:34 2008
@@ -45,24 +45,25 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType;
explicit
- NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap,
- MemoryManagerType& theManager);
+ NamedNodeMapAttributeList(
+ const XalanNamedNodeMap& theMap,
+ MemoryManagerType& theManager);
virtual
~NamedNodeMapAttributeList();
// These are inherited from AttributeList
- virtual unsigned int
+ virtual XalanSize_t
getLength() const;
virtual const XalanDOMChar*
- getName(const unsigned int index) const;
+ getName(const XalanSize_t index) const;
virtual const XalanDOMChar*
- getType(const unsigned int index) const;
+ getType(const XalanSize_t index) const;
virtual const XalanDOMChar*
- getValue(const unsigned int index) const;
+ getValue(const XalanSize_t index) const;
virtual const XalanDOMChar*
getType(const XalanDOMChar* const name) const;
@@ -85,11 +86,11 @@
// Data members...
const XalanNamedNodeMap& m_nodeMap;
- const unsigned int m_lastIndex;
+ const XalanSize_t m_lastIndex;
- static const XalanDOMChar s_typeString[];
+ MemoryManagerType& m_memoryManager;
- MemoryManagerType& m_memoryManager;
+ static const XalanDOMChar s_typeString[];
};
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp Mon Jun 30 10:18:34 2008
@@ -42,8 +42,6 @@
{
public:
- typedef XalanLocator::size_type size_type;
-
/**
* Constructor
*
@@ -121,7 +119,7 @@
*
* @return the line number
*/
- size_type
+ XalanFileLoc
getLineNumber() const
{
return m_lineNumber;
@@ -132,13 +130,12 @@
*
* @return the column number
*/
- size_type
+ XalanFileLoc
getColumnNumber() const
{
return m_columnNumber;
}
-
MemoryManagerType&
getMemoryManager()const
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp Mon Jun 30 10:18:34 2008
@@ -47,12 +47,6 @@
typedef Locator ParentType;
-#if XERCES_VERSION_MAJOR < 3
- typedef XMLSSize_t size_type;
-#else
- typedef unsigned long size_type;
-#endif
-
XalanLocator() {}
virtual
@@ -64,28 +58,28 @@
virtual const XMLCh*
getSystemId() const = 0;
- virtual size_type
+ virtual XalanFileLoc
getLineNumber() const = 0;
- virtual size_type
+ virtual XalanFileLoc
getColumnNumber() const = 0;
- static size_type
+ static XalanFileLoc
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)
{
- return theLocator == 0 ? size_type(-1) : theLocator->getColumnNumber();
+ return theLocator == 0 ? getUnknownValue() : theLocator->getColumnNumber();
}
- static size_type
+ static XalanFileLoc
getUnknownValue()
{
- return size_type(-1);
+ return XalanFileLoc(-1);
}
private:
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp Mon Jun 30 10:18:34 2008
@@ -495,8 +495,8 @@
{
assert(m_xpathEnvSupport != 0);
- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue();
MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();
@@ -549,8 +549,8 @@
{
assert(m_xpathEnvSupport != 0);
- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue();
MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();
@@ -603,8 +603,8 @@
{
assert(m_xpathEnvSupport != 0);
- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue();
- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue();
+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue();
MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.cpp Mon Jun 30 10:18:34 2008
@@ -54,21 +54,21 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
columnNumber,
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);
- if(isAttrOK(
+ if (isAttrOK(
aname,
atts,
i,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyImport.hpp Mon Jun 30 10:18:34 2008
@@ -52,8 +52,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
// These methods are inherited from ElemTemplateElement ...
@@ -79,7 +79,6 @@
virtual ElemTemplateElement*
appendChildElem(ElemTemplateElement* newChild);
-
private:
};
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp Mon Jun 30 10:18:34 2008
@@ -52,8 +52,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ParentType(
constructionContext,
stylesheetTree,
@@ -62,9 +62,9 @@
StylesheetConstructionContext::ELEMNAME_APPLY_TEMPLATES),
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);
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp Mon Jun 30 10:18:34 2008
@@ -52,11 +52,11 @@
* @param columnNumber column number in document
*/
ElemApplyTemplates(
- StylesheetConstructionContext& constructionContext,
- Stylesheet& stylesheetTree,
- const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemApplyTemplates();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp Mon Jun 30 10:18:34 2008
@@ -48,8 +48,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -58,9 +58,9 @@
m_nameAVT(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);
@@ -400,6 +400,7 @@
}
executionContext.getAndPopCachedString();
+
return 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.hpp Mon Jun 30 10:18:34 2008
@@ -54,8 +54,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemAttribute();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.cpp Mon Jun 30 10:18:34 2008
@@ -43,8 +43,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
lineNumber,
@@ -52,13 +52,13 @@
StylesheetConstructionContext::ELEMNAME_ATTRIBUTE_SET),
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);
- if(equals(aname, Constants::ATTRNAME_NAME))
+ if (equals(aname, Constants::ATTRNAME_NAME))
{
m_qname = constructionContext.createXalanQName(
atts.getValue(i),
@@ -74,12 +74,12 @@
atts.getValue(i));
}
}
- else if(processUseAttributeSets(
+ else if (processUseAttributeSets(
constructionContext,
aname,
atts,
i) == false &&
- isAttrOK(
+ isAttrOK(
aname,
atts,
i,
@@ -93,7 +93,7 @@
}
}
- if(m_qname == 0)
+ if (m_qname == 0)
{
error(
constructionContext,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemAttributeSet.hpp Mon Jun 30 10:18:34 2008
@@ -51,8 +51,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemAttributeSet();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp Mon Jun 30 10:18:34 2008
@@ -56,13 +56,13 @@
m_templateName(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);
- if(equals(aname, Constants::ATTRNAME_NAME))
+ if (equals(aname, Constants::ATTRNAME_NAME))
{
m_templateName = constructionContext.createXalanQName(
atts.getValue(i),
@@ -78,7 +78,7 @@
atts.getValue(i));
}
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemChoose.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemChoose.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemChoose.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemChoose.cpp Mon Jun 30 10:18:34 2008
@@ -50,26 +50,26 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
columnNumber,
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);
- if(isAttrOK(
+ if (isAttrOK(
aname,
atts,
i,
constructionContext) == false &&
- processSpaceAttr(
+ processSpaceAttr(
Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING.c_str(),
aname,
atts,
@@ -109,17 +109,17 @@
{
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);
bool test;
theXPath->execute(*this, executionContext, test);
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireSelectEvent(
SelectionEvent(executionContext,
@@ -174,7 +174,7 @@
if(StylesheetConstructionContext::ELEMNAME_WHEN == type)
{
- const XPath* const theXPath = node->getXPath();
+ const XPath* const theXPath = node->getXPath(0);
assert(theXPath != 0);
bool test;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemChoose.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemChoose.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemChoose.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemChoose.hpp Mon Jun 30 10:18:34 2008
@@ -51,8 +51,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
// These methods are inherited from ElemTemplateElement ...
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp Mon Jun 30 10:18:34 2008
@@ -48,32 +48,32 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
lineNumber,
columnNumber,
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);
- if(processUseAttributeSets(
+ if (processUseAttributeSets(
constructionContext,
aname,
atts,
i) == false &&
- processSpaceAttr(
+ processSpaceAttr(
Constants::ELEMNAME_COPY_WITH_PREFIX_STRING.c_str(),
aname,
atts,
i,
constructionContext) == false &&
- isAttrOK(
+ isAttrOK(
aname,
atts,
i,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopy.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopy.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopy.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopy.hpp Mon Jun 30 10:18:34 2008
@@ -51,8 +51,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
// These methods are inherited from ElemTemplateElement ...
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.cpp Mon Jun 30 10:18:34 2008
@@ -51,8 +51,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -62,13 +62,13 @@
{
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);
- if(equals(aname, Constants::ATTRNAME_SELECT))
+ if (equals(aname, Constants::ATTRNAME_SELECT))
{
const XalanDOMChar* const avalue = atts.getValue(i);
assert(avalue != 0);
@@ -82,7 +82,7 @@
m_selectPattern = constructionContext.createXPath(getLocator(), avalue, *this);
}
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
@@ -126,7 +126,7 @@
if (m_selectPattern == 0)
{
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext);
@@ -149,7 +149,7 @@
const XObjectPtr value(m_selectPattern->execute(*this, executionContext));
assert(value.null() == false);
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireSelectEvent(
SelectionEvent(
@@ -211,7 +211,7 @@
if (m_selectPattern == 0)
{
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext);
@@ -234,7 +234,7 @@
const XObjectPtr value(m_selectPattern->execute(*this, executionContext));
assert(value.null() == false);
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireSelectEvent(
SelectionEvent(
@@ -285,7 +285,7 @@
const XPath*
-ElemCopyOf::getXPath(unsigned int index) const
+ElemCopyOf::getXPath(XalanSize_t index) const
{
return index == 0 ? m_selectPattern : 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp Mon Jun 30 10:18:34 2008
@@ -59,8 +59,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
@@ -78,7 +78,7 @@
execute(StylesheetExecutionContext& executionContext) const;
#endif
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
private:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.cpp Mon Jun 30 10:18:34 2008
@@ -52,8 +52,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -68,13 +68,13 @@
m_decimalFormatSymbols.setInfinity(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);
- if(equals(aname, Constants::ATTRNAME_NAME))
+ if (equals(aname, Constants::ATTRNAME_NAME))
{
assert(atts.getValue(i) != 0);
@@ -92,7 +92,7 @@
atts.getValue(i));
}
}
- else if(equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR))
+ else if (equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR))
{
const XalanDOMChar* const decimalSepValue = atts.getValue(i);
assert(decimalSepValue != 0);
@@ -111,7 +111,7 @@
decimalSepValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR))
+ else if (equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR))
{
const XalanDOMChar* const sepValue = atts.getValue(i);
assert(sepValue!= 0);
@@ -130,13 +130,13 @@
sepValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_INFINITY))
+ else if (equals(aname, Constants::ATTRNAME_INFINITY))
{
assert(atts.getValue(i) != 0);
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);
assert(minusValue != 0);
@@ -155,13 +155,13 @@
minusValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_NAN))
+ else if (equals(aname, Constants::ATTRNAME_NAN))
{
assert(atts.getValue(i) != 0);
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);
assert(percentValue != 0);
@@ -180,7 +180,7 @@
percentValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_PERMILLE))
+ else if (equals(aname, Constants::ATTRNAME_PERMILLE))
{
const XalanDOMChar* const permilleValue = atts.getValue(i);
assert(permilleValue != 0);
@@ -199,7 +199,7 @@
permilleValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_ZERODIGIT))
+ else if (equals(aname, Constants::ATTRNAME_ZERODIGIT))
{
const XalanDOMChar* const zeroDigitValue = atts.getValue(i);
assert(zeroDigitValue != 0);
@@ -218,7 +218,7 @@
zeroDigitValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_DIGIT))
+ else if (equals(aname, Constants::ATTRNAME_DIGIT))
{
const XalanDOMChar* const digitValue = atts.getValue(i);
assert(digitValue != 0);
@@ -310,7 +310,7 @@
const XPath*
-ElemDecimalFormat::getXPath(unsigned int index) const
+ElemDecimalFormat::getXPath(XalanSize_t index) const
{
const XPath* result = 0;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemDecimalFormat.hpp Mon Jun 30 10:18:34 2008
@@ -59,8 +59,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
~ElemDecimalFormat();
@@ -85,7 +85,7 @@
}
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
private:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp Mon Jun 30 10:18:34 2008
@@ -47,8 +47,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
lineNumber,
@@ -61,9 +61,9 @@
// turn them off...
// 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);
@@ -127,6 +127,7 @@
}
+
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemElement::startElement(StylesheetExecutionContext& executionContext) const
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemElement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemElement.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemElement.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemElement.hpp Mon Jun 30 10:18:34 2008
@@ -55,8 +55,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemElement();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp Mon Jun 30 10:18:34 2008
@@ -57,8 +57,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -68,17 +68,17 @@
m_sortElems(constructionContext.getMemoryManager()),
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);
- if(equals(aname, Constants::ATTRNAME_SELECT))
+ if (equals(aname, Constants::ATTRNAME_SELECT))
{
m_selectPattern = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
@@ -98,7 +98,7 @@
}
}
- if(0 == m_selectPattern)
+ if (0 == m_selectPattern)
{
error(
constructionContext,
@@ -113,8 +113,8 @@
ElemForEach::ElemForEach(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken) :
ElemTemplateElement(constructionContext,
stylesheetTree,
@@ -149,8 +149,8 @@
const AttributeListType& atts,
const LocatorType* locator)
{
- const int lineNumber = XalanLocator::getLineNumber(locator);
- const int columnNumber = XalanLocator::getColumnNumber(locator);
+ const XalanFileLoc lineNumber = XalanLocator::getLineNumber(locator);
+ const XalanFileLoc columnNumber = XalanLocator::getColumnNumber(locator);
m_sortElems.reserve(m_sortElems.size() + 1);
@@ -828,7 +828,7 @@
const XPath*
-ElemForEach::getXPath(unsigned int index) const
+ElemForEach::getXPath(XalanSize_t index) const
{
return index == 0 ? m_selectPattern : 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp Mon Jun 30 10:18:34 2008
@@ -69,11 +69,11 @@
* @param columnNumber column number in document
*/
ElemForEach(
- StylesheetConstructionContext& constructionContext,
- Stylesheet& stylesheetTree,
- const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemForEach();
@@ -114,7 +114,7 @@
#endif
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
protected:
@@ -128,11 +128,11 @@
* @param xslToken an integer representing the type of instance.
*/
ElemForEach(
- StylesheetConstructionContext& constructionContext,
- Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
- int xslToken);
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
+ int xslToken);
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp Mon Jun 30 10:18:34 2008
@@ -41,8 +41,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -54,38 +54,38 @@
m_orderAVT(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);
- if(equals(aname, Constants::ATTRNAME_SELECT))
+ if (equals(aname, Constants::ATTRNAME_SELECT))
{
m_selectPattern
= constructionContext.createXPath(getLocator(), atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_LANG))
+ else if (equals(aname, Constants::ATTRNAME_LANG))
{
m_langAVT =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_DATATYPE))
+ else if (equals(aname, Constants::ATTRNAME_DATATYPE))
{
m_dataTypeAVT =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_ORDER))
+ else if (equals(aname, Constants::ATTRNAME_ORDER))
{
m_orderAVT =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_CASEORDER))
+ else if (equals(aname, Constants::ATTRNAME_CASEORDER))
{
m_caseOrderAVT =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
@@ -128,8 +128,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
typedef ElemSort ThisType;
@@ -165,7 +165,7 @@
const XPath*
-ElemSort::getXPath(unsigned int index) const
+ElemSort::getXPath(XalanSize_t index) const
{
return index == 0 ? m_selectPattern : 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp Mon Jun 30 10:18:34 2008
@@ -61,8 +61,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
static ElemSort*
create(
@@ -70,8 +70,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
~ElemSort();
@@ -134,7 +134,7 @@
getElementName() const;
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index = 0) const;
private:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp Mon Jun 30 10:18:34 2008
@@ -84,8 +84,8 @@
ElemTemplateElement::ElemTemplateElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken) :
PrefixResolver(),
m_stylesheet(stylesheetTree),
@@ -114,8 +114,8 @@
Stylesheet& stylesheetTree,
int xslToken,
const XalanDOMString& baseURI,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
PrefixResolver(),
m_stylesheet(stylesheetTree),
m_namespacesHandler(constructionContext.getMemoryManager()),
@@ -160,7 +160,7 @@
ElemTemplateElement::isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext) const
{
return m_stylesheet.isAttrOK(attrName, atts, which, constructionContext);
@@ -173,7 +173,7 @@
const XalanDOMChar* elementName,
const XalanDOMChar* aname,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext)
{
if(constructionContext.isXMLSpaceAttribute(
@@ -1064,12 +1064,13 @@
const XPath*
-ElemTemplateElement::getXPath(unsigned int /* index */) const
+ElemTemplateElement::getXPath(XalanSize_t /* index */) const
{
return 0;
}
+
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemTemplateElement::findTemplateToTransformChild(
@@ -1512,8 +1513,8 @@
ElemTemplateElement::LocatorProxy::LocatorProxy(
- size_type theLineNumber,
- size_type theColumnNumber,
+ XMLFileLoc theLineNumber,
+ XMLFileLoc theColumnNumber,
const XalanDOMString& theURI) :
m_lineNumber(theLineNumber),
m_columnNumber(theColumnNumber),
@@ -1529,7 +1530,7 @@
-ElemTemplateElement::LocatorProxy::size_type
+XMLFileLoc
ElemTemplateElement::LocatorProxy::getLineNumber() const
{
return m_lineNumber;
@@ -1537,7 +1538,7 @@
-ElemTemplateElement::LocatorProxy::size_type
+XMLFileLoc
ElemTemplateElement::LocatorProxy::getColumnNumber() const
{
return m_columnNumber;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp Mon Jun 30 10:18:34 2008
@@ -91,8 +91,8 @@
ElemTemplateElement(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken);
/**
@@ -112,8 +112,8 @@
Stylesheet& stylesheetTree,
int xslToken,
const XalanDOMString& baseURI = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
- int lineNumber = XalanLocator::getUnknownValue(),
- int columnNumber = XalanLocator::getUnknownValue());
+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(),
+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue());
virtual
~ElemTemplateElement();
@@ -140,7 +140,7 @@
isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext) const;
/**
@@ -158,7 +158,7 @@
const XalanDOMChar* elementName,
const XalanDOMChar* aname,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext);
/**
@@ -617,7 +617,7 @@
* @return pointer or null
*/
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
// These interfaces are inherited from PrefixResolver...
@@ -635,8 +635,8 @@
public:
LocatorProxy(
- size_type theLineNumber,
- size_type theColumnNumber,
+ XMLFileLoc theLineNumber,
+ XMLFileLoc theColumnNumber,
const XalanDOMString& theURI);
virtual
@@ -648,10 +648,10 @@
virtual const XMLCh*
getSystemId() const;
- virtual size_type
+ virtual XMLFileLoc
getLineNumber() const;
- virtual size_type
+ virtual XMLFileLoc
getColumnNumber() const;
const XalanDOMString&
@@ -672,21 +672,21 @@
operator==(const LocatorProxy&) const;
// data members...
- const size_type m_lineNumber;
+ const XMLFileLoc m_lineNumber;
- const size_type m_columnNumber;
+ const XMLFileLoc m_columnNumber;
const XalanDOMString& m_uri;
};
- LocatorProxy::size_type
+ XMLFileLoc
getLineNumber() const
{
return m_locatorProxy.getLineNumber();
}
- LocatorProxy::size_type
+ XMLFileLoc
getColumnNumber() const
{
return m_locatorProxy.getColumnNumber();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp Mon Jun 30 10:18:34 2008
@@ -50,8 +50,8 @@
ElemUse::ElemUse(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken) :
ElemTemplateElement(constructionContext,
stylesheetTree,
@@ -274,7 +274,7 @@
StylesheetConstructionContext& constructionContext,
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which)
+ XalanSize_t which)
{
bool isUAS = false;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp Mon Jun 30 10:18:34 2008
@@ -58,8 +58,8 @@
ElemUse(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken);
virtual
@@ -79,7 +79,7 @@
StylesheetConstructionContext& constructionContext,
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which);
+ XalanSize_t which);
// These methods are inherited from ElemTemplateElement ...
Modified: xalan/c/trunk/src/xalanc/XSLT/KeyDeclaration.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/KeyDeclaration.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/KeyDeclaration.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/KeyDeclaration.hpp Mon Jun 30 10:18:34 2008
@@ -56,8 +56,8 @@
const XPath& matchPattern,
const XPath& use,
const XalanDOMString& uri,
- XalanLocator::size_type lineNumber,
- XalanLocator::size_type columnNumber) :
+ XMLFileLoc lineNumber,
+ XMLFileLoc columnNumber) :
m_qname(&qname),
m_match(&matchPattern),
m_use(&use),
@@ -138,7 +138,7 @@
*
* @return The line number
*/
- XalanLocator::size_type
+ XMLFileLoc
getLineNumber() const
{
return m_lineNumber;
@@ -149,7 +149,7 @@
*
* @return The column number
*/
- XalanLocator::size_type
+ XMLFileLoc
getColumnNumber() const
{
return m_columnNumber;
@@ -165,9 +165,9 @@
const XalanDOMString* m_uri;
- XalanLocator::size_type m_lineNumber;
+ XMLFileLoc m_lineNumber;
- XalanLocator::size_type m_columnNumber;
+ XMLFileLoc m_columnNumber;
};
Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp Mon Jun 30 10:18:34 2008
@@ -256,9 +256,9 @@
XPath* matchAttr = 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);
@@ -321,7 +321,7 @@
}
}
- if(0 == theQName)
+ if (0 == theQName)
{
const GetAndReleaseCachedString theGuard(constructionContext);
@@ -335,7 +335,7 @@
locator);
}
- if(0 == matchAttr)
+ if (0 == matchAttr)
{
const GetAndReleaseCachedString theGuard(constructionContext);
@@ -349,7 +349,7 @@
locator);
}
- if(0 == useAttr)
+ if (0 == useAttr)
{
const GetAndReleaseCachedString theGuard(constructionContext);
@@ -378,13 +378,13 @@
void
Stylesheet::pushNamespaces(const AttributeListType& atts)
{
- const unsigned int nAttrs = atts.getLength();
+ const XalanSize_t nAttrs = atts.getLength();
NamespaceVectorType namespaces(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 value = atts.getValue(i);
@@ -442,12 +442,10 @@
Stylesheet::PatternTableVectorType& theList,
const XalanMatchPatternData* thePattern)
{
-
- typedef Stylesheet::size_type size_type;
assert(thePattern != 0);
const double thePatternPriority = thePattern->getPriorityOrDefault();
- const size_type thePatternPosition = thePattern->getPosition();
+ const XalanSize_t thePatternPosition = thePattern->getPosition();
typedef Stylesheet::PatternTableVectorType PatternTableListType;
typedef PatternTableListType::iterator iterator;
@@ -456,7 +454,7 @@
const iterator theEnd = theList.end();
- while(theCurrent != theEnd)
+ while (theCurrent != theEnd)
{
const double theCurrentPriority = (*theCurrent)->getPriorityOrDefault();
@@ -630,7 +628,7 @@
Stylesheet::isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& /* atts */,
- int /* which */,
+ XalanSize_t /* which */,
StylesheetConstructionContext& constructionContext) const
{
// Namespace declarations are OK by definition
@@ -1507,16 +1505,16 @@
const AttributeListType& atts,
StylesheetConstructionContext& constructionContext)
{
- const unsigned int nAttrs = atts.getLength();
+ const XalanSize_t nAttrs = atts.getLength();
const XalanDOMString* stylesheetNamespace = 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);
- if(equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true)
+ if (equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true)
{
const XalanDOMChar* const value = atts.getValue(i);
@@ -1529,7 +1527,7 @@
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);
@@ -1542,7 +1540,7 @@
resultNamespace = getNamespaceForPrefix(value, constructionContext);
}
}
- else if(!isAttrOK(aname, atts, i, constructionContext))
+ else if (!isAttrOK(aname, atts, i, constructionContext))
{
const GetAndReleaseCachedString theGuard(constructionContext);
@@ -1598,10 +1596,10 @@
const AttributeListType& atts,
const LocatorType* locator)
{
- const XalanLocator::size_type lineNumber =
+ const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
- const XalanLocator::size_type columnNumber =
+ const XalanFileLoc columnNumber =
XalanLocator::getColumnNumber(locator);
m_elemDecimalFormats.reserve(m_elemDecimalFormats.size() + 1);
Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp Mon Jun 30 10:18:34 2008
@@ -88,7 +88,6 @@
public:
- typedef StylesheetConstructionContext::size_type size_type;
typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
typedef XalanQName::NamespaceVectorType NamespaceVectorType;
typedef XalanQName::NamespacesStackType NamespacesStackType;
@@ -290,7 +289,7 @@
isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext) const;
/**
@@ -300,8 +299,9 @@
* @return namespace string for node, or null if not found.
*/
const XalanDOMString*
- getNamespaceFromStack(const XalanDOMString& nodeName,
- XalanDOMString& theBuffer) const
+ getNamespaceFromStack(
+ const XalanDOMString& nodeName,
+ XalanDOMString& theBuffer) const
{
return getNamespaceFromStack(c_wstr(nodeName), theBuffer);
}
@@ -313,8 +313,9 @@
* @return namespace string for node, or null if not found.
*/
const XalanDOMString*
- getNamespaceFromStack(const XalanDOMChar* nodeName,
- XalanDOMString& theBuffer) const;
+ getNamespaceFromStack(
+ const XalanDOMChar* nodeName,
+ XalanDOMString& theBuffer) const;
/**
* Get the namespace from a prefix by searching the stack of namespace
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp Mon Jun 30 10:18:34 2008
@@ -78,12 +78,6 @@
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
* that must be returned by getElementToken().
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp Mon Jun 30 10:18:34 2008
@@ -701,8 +701,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
Type* theResult;
@@ -726,10 +726,10 @@
const AttributeListType& atts,
const LocatorType* locator)
{
- const XalanLocator::size_type lineNumber =
+ const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
- const XalanLocator::size_type columnNumber =
+ const XalanFileLoc columnNumber =
XalanLocator::getColumnNumber(locator);
ElemTemplateElement* theElement = 0;
@@ -1048,10 +1048,10 @@
const AttributeListType& atts,
const LocatorType* locator)
{
- const XalanLocator::size_type lineNumber =
+ const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
- const XalanLocator::size_type columnNumber =
+ const XalanFileLoc columnNumber =
XalanLocator::getColumnNumber(locator);
ElemTemplateElement* theElement = 0;
@@ -1110,12 +1110,6 @@
ExtensionNSHandler& handler,
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.back() = ElemExtensionCall::create(
@@ -1124,8 +1118,8 @@
stylesheetTree,
name,
atts,
- lineNumber,
- columnNumber,
+ XalanLocator::getLineNumber(locator),
+ XalanLocator::getColumnNumber(locator),
handler);
return m_allocatedElements.back();
@@ -1142,17 +1136,11 @@
bool disableOutputEscaping,
const LocatorType* locator)
{
- const XalanLocator::size_type lineNumber =
- XalanLocator::getLineNumber(locator);
-
- const XalanLocator::size_type columnNumber =
- XalanLocator::getColumnNumber(locator);
-
return m_elemTextLiteralAllocator.create(
*this,
stylesheetTree,
- lineNumber,
- columnNumber,
+ XalanLocator::getLineNumber(locator),
+ XalanLocator::getColumnNumber(locator),
chars,
0,
length,
@@ -2098,7 +2086,7 @@
}
};
-const unsigned int StylesheetConstructionContextDefault::s_elementTokenTableSize =
+const XalanSize_t StylesheetConstructionContextDefault::s_elementTokenTableSize =
sizeof(s_elementTokenTable) / sizeof(s_elementTokenTable[0]);
const StylesheetConstructionContextDefault::ElementTokenTableEntry& StylesheetConstructionContextDefault::s_elementTokenTableLast =
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp Mon Jun 30 10:18:34 2008
@@ -215,8 +215,9 @@
getURLFromString(const XalanDOMString& urlString);
virtual XalanDOMString&
- getURLStringFromString(const XalanDOMString& urlString,
- XalanDOMString& theResult);
+ getURLStringFromString(
+ const XalanDOMString& urlString,
+ XalanDOMString& theResult);
virtual URLAutoPtrType
getURLFromString(
@@ -650,7 +651,7 @@
static const ElementTokenTableEntry s_elementTokenTable[];
- static const unsigned int s_elementTokenTableSize;
+ static const XalanSize_t s_elementTokenTableSize;
static const ElementTokenTableEntry& s_elementTokenTableLast;
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Mon Jun 30 10:18:34 2008
@@ -1068,10 +1068,10 @@
XalanDOMString uri(theManager);
- XalanLocator::size_type lineNumber =
+ XalanFileLoc lineNumber =
XalanLocator::getUnknownValue();
- XalanLocator::size_type columnNumber =
+ XalanFileLoc columnNumber =
XalanLocator::getUnknownValue();
const LocatorType* locator = getLocatorFromStack();
@@ -1148,8 +1148,8 @@
id = &theDummy;
}
- const XalanLocator::size_type lineNumber = locator.getLineNumber();
- const XalanLocator::size_type columnNumber = locator.getColumnNumber();
+ XalanFileLoc lineNumber = locator.getLineNumber();
+ XalanFileLoc columnNumber = locator.getColumnNumber();
if (m_problemListener != 0)
{
@@ -1529,13 +1529,13 @@
const AttributeListImpl& thePendingAttributes =
(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(
- thePendingAttributes.getName(i),
- DOMServices::s_XMLNamespace) == true)
+ if (equals(
+ thePendingAttributes.getName(i),
+ DOMServices::s_XMLNamespace) == true)
{
return true;
}
@@ -1694,7 +1694,7 @@
flushPending();
- const unsigned int nAtts = atts.getLength();
+ const XalanSize_t nAtts = atts.getLength();
assert(m_outputContextStack.empty() == false);
@@ -1703,7 +1703,7 @@
thePendingAttributes.clear();
- for(unsigned int i = 0; i < nAtts; i++)
+ for (XalanSize_t i = 0; i < nAtts; i++)
{
thePendingAttributes.addAttribute(
atts.getName(i),
@@ -1776,11 +1776,11 @@
doFlushPending();
- if(generateCDATASection() == true)
+ if (generateCDATASection() == true)
{
getFormatterListenerImpl()->cdata(ch + start, length);
- if(getTraceListeners() > 0)
+ if (getTraceListeners() > 0)
{
fireCharacterGenerateEvent(ch, start, length, true);
}
@@ -1789,7 +1789,7 @@
{
getFormatterListenerImpl()->characters(ch + start, length);
- if(getTraceListeners() > 0)
+ if (getTraceListeners() > 0)
{
fireCharacterGenerateEvent(ch, start, length, false);
}
@@ -2827,7 +2827,7 @@
const XalanDOMString& thePrefix,
XalanDOMString::size_type thePrefixLength)
{
- const unsigned int thePendingAttributesCount =
+ const XalanSize_t thePendingAttributesCount =
thePendingAttributes.getLength();
if (thePendingAttributesCount == 0)
@@ -2840,7 +2840,7 @@
bool fResult = false;
// Check each attribute...
- for (unsigned int i = 0; i < thePendingAttributesCount; ++i)
+ for (XalanSize_t i = 0; i < thePendingAttributesCount; ++i)
{
const XalanDOMChar* const thePendingAttributeName =
thePendingAttributes.getName(i);
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp Mon Jun 30 10:18:34 2008
@@ -25,7 +25,9 @@
-XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -43,8 +45,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp Mon Jun 30 10:18:34 2008
@@ -59,7 +59,9 @@
*
* @param theBlockSize The block size.
*/
- XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanElemApplyTemplatesAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount);
~XalanElemApplyTemplatesAllocator();
@@ -79,8 +81,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
/**
* Determine if an object is owned by the allocator...
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.cpp?rev=672824&r1=672823&r2=672824&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanElemAttributeAllocator.cpp Mon Jun 30 10:18:34 2008
@@ -25,7 +25,9 @@
-XalanElemAttributeAllocator::XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanElemAttributeAllocator::XalanElemAttributeAllocator(
+ MemoryManagerType& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -43,8 +45,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org