dbertoni 01/09/26 14:30:25
Modified: c/src/XSLT AVT.cpp CountersTable.cpp ElemAttribute.cpp
ElemCopyOf.cpp ElemElement.cpp ElemForEach.cpp
ElemForEach.hpp ElemLiteralResult.cpp
ElemNumber.cpp ElemNumber.hpp
ElemTemplateElement.cpp ElemTemplateElement.hpp
ElemTextLiteral.cpp ElemTextLiteral.hpp ElemUse.cpp
FunctionDocument.cpp FunctionElementAvailable.cpp
FunctionFunctionAvailable.cpp
FunctionGenerateID.cpp FunctionGenerateID.hpp
FunctionKey.cpp FunctionSystemProperty.cpp
GenerateEvent.cpp GenerateEvent.hpp KeyTable.cpp
NamespacesHandler.cpp NodeSorter.cpp Stylesheet.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetHandler.cpp StylesheetHandler.hpp
StylesheetRoot.cpp TraceListenerDefault.cpp
TracerEvent.cpp VariablesStack.cpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
XSLTProcessor.hpp
Log:
32/64-bit fixes.
Revision Changes Path
1.14 +1 -1 xml-xalan/c/src/XSLT/AVT.cpp
Index: AVT.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVT.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AVT.cpp 2001/07/12 05:05:28 1.13
+++ AVT.cpp 2001/09/26 21:30:23 1.14
@@ -130,7 +130,7 @@
{
StringTokenizer tokenizer(stringedValue,
theTokenDelimiterCharacters, true);
- const unsigned int nTokens = tokenizer.countTokens();
+ const StringTokenizer::size_type nTokens =
tokenizer.countTokens();
if(nTokens < 2)
{
1.3 +5 -5 xml-xalan/c/src/XSLT/CountersTable.cpp
Index: CountersTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/CountersTable.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CountersTable.cpp 2001/06/14 19:15:36 1.2
+++ CountersTable.cpp 2001/09/26 21:30:23 1.3
@@ -132,7 +132,7 @@
{
Counter& counter = counters[i];
- const unsigned int cacheLen =
counter.m_countNodes.size();
+ const
Counter::NodeVectorType::size_type cacheLen =
counter.m_countNodes.size();
if(cacheLen > 0 &&
counter.m_countNodes[cacheLen - 1] == target)
{
@@ -176,19 +176,19 @@
StylesheetExecutionContext& executionContext,
const XalanNode* node) const
{
- const int n = m_countNodes.size();
+ const NodeVectorType::size_type n = m_countNodes.size();
int result = 0;
- for(int i = n - 1; i >= 0; --i)
+ for(NodeVectorType::size_type i = n; i > 0; --i)
{
- const XalanNode* const countedNode = m_countNodes[i];
+ const XalanNode* const countedNode = m_countNodes[i - 1];
if(node == countedNode)
{
// Since the list is in backwards order, the count is
// how many are in the rest of the list.
- result = i + 1 + m_countNodesStartCount;
+ result = i + m_countNodesStartCount;
break;
}
1.31 +2 -2 xml-xalan/c/src/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ElemAttribute.cpp 2001/09/19 21:20:46 1.30
+++ ElemAttribute.cpp 2001/09/26 21:30:23 1.31
@@ -183,9 +183,9 @@
assign(origAttrName, attrName);
- const unsigned int origAttrNameLength =
length(origAttrName);
+ const XalanDOMString::size_type origAttrNameLength =
length(origAttrName);
- unsigned int indexOfNSSep = 0;
+ XalanDOMString::size_type indexOfNSSep =
0;
StylesheetExecutionContext::GetAndReleaseCachedString
attrNameSpaceGuard(executionContext);
1.23 +2 -2 xml-xalan/c/src/XSLT/ElemCopyOf.cpp
Index: ElemCopyOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElemCopyOf.cpp 2001/07/23 01:39:45 1.22
+++ ElemCopyOf.cpp 2001/09/26 21:30:23 1.23
@@ -210,9 +210,9 @@
StylesheetExecutionContext&
executionContext,
const NodeRefListBase& theNodeList)
const
{
- unsigned int nChildren = theNodeList.getLength();
+ const NodeRefListBase::size_type nChildren =
theNodeList.getLength();
- for(unsigned int i = 0; i < nChildren; i++)
+ for(NodeRefListBase::size_type i = 0; i < nChildren; i++)
{
assert(theNodeList.item(i) != 0);
1.32 +6 -6 xml-xalan/c/src/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ElemElement.cpp 2001/09/19 21:20:46 1.31
+++ ElemElement.cpp 2001/09/26 21:30:23 1.32
@@ -171,17 +171,17 @@
m_namespaceAVT->evaluate(elemNameSpace, sourceNode, *this,
executionContext);
}
- unsigned int namespaceLen = length(elemNameSpace);
+ XalanDOMString::size_type namespaceLen = length(elemNameSpace);
- bool isIllegalElement = false;
+ bool isIllegalElement = false;
- bool hasUnresolvedPrefix = false;
+ bool hasUnresolvedPrefix = false;
- unsigned int len = length(elemName);
+ XalanDOMString::size_type len = length(elemName);
- const unsigned int indexOfNSSep = indexOf(elemName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(elemName, XalanUnicode::charColon);
- const bool haveNamespace = indexOfNSSep == len ?
false : true;
+ const bool haveNamespace = indexOfNSSep == len ? false : true;
StylesheetExecutionContext::GetAndReleaseCachedString
prefixGuard(executionContext);
1.20 +4 -3 xml-xalan/c/src/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemForEach.cpp 2001/09/20 22:49:10 1.19
+++ ElemForEach.cpp 2001/09/26 21:30:23 1.20
@@ -200,7 +200,8 @@
XalanNode*
sourceNodeContext,
int
selectStackFrameIndex) const
{
- const unsigned int nChildren = getSortElems().size();
+ const SortElemsVectorType& sortElements =
getSortElems();
+ const SortElemsVectorType::size_type nChildren = sortElements.size();
if (nChildren == 0)
{
@@ -239,9 +240,9 @@
// March backwards, performing a sort on each xsl:sort child.
// Probably not the most efficient method.
- for(unsigned int i = 0; i < nChildren; i++)
+ for(SortElemsVectorType::size_type i = 0; i < nChildren;
i++)
{
- const ElemSort* const sort = getSortElems()[i];
+ const ElemSort* const sort = sortElements[i];
assert(sort != 0);
const AVT* avt = sort->getLangAVT();
1.13 +6 -6 xml-xalan/c/src/XSLT/ElemForEach.hpp
Index: ElemForEach.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemForEach.hpp 2001/09/20 22:49:10 1.12
+++ ElemForEach.hpp 2001/09/26 21:30:23 1.13
@@ -103,19 +103,19 @@
~ElemForEach();
#if defined(XALAN_NO_NAMESPACES)
- typedef vector<ElemSort*> SortElemsVector;
+ typedef vector<ElemSort*> SortElemsVectorType;
#else
- typedef std::vector<ElemSort*> SortElemsVector;
+ typedef std::vector<ElemSort*> SortElemsVectorType;
#endif
- const SortElemsVector&
+ const SortElemsVectorType&
getSortElems() const
{
return m_sortElems;
}
- SortElemsVector&
+ SortElemsVectorType&
getSortElems()
{
return m_sortElems;
@@ -163,11 +163,11 @@
XalanNode*
sourceNodeContext,
int
selectStackFrameIndex) const;
- const XPath* m_selectPattern;
+ const XPath* m_selectPattern;
private:
- SortElemsVector m_sortElems;
+ SortElemsVectorType m_sortElems;
};
1.44 +4 -4 xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ElemLiteralResult.cpp 2001/09/19 21:20:46 1.43
+++ ElemLiteralResult.cpp 2001/09/26 21:30:23 1.44
@@ -111,8 +111,8 @@
{
const XalanDOMChar* const aname = atts.getName(i);
- bool needToProcess =
true;
- const unsigned int indexOfNSSep =
indexOf(aname, XalanUnicode::charColon);
+ bool
needToProcess = true;
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(aname, XalanUnicode::charColon);
XalanDOMString prefix;
@@ -216,7 +216,7 @@
const XalanDOMString& theName = avt->getName();
- const unsigned int theColonIndex = indexOf(theName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type theColonIndex =
indexOf(theName, XalanUnicode::charColon);
if (theColonIndex != length(theName))
{
@@ -363,7 +363,7 @@
if(isAttrOK == false)
{
- const unsigned int indexOfNSSep = indexOf(attrName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(attrName, XalanUnicode::charColon);
if(indexOfNSSep < length(attrName))
{
1.48 +26 -22 xml-xalan/c/src/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ElemNumber.cpp 2001/08/10 17:54:01 1.47
+++ ElemNumber.cpp 2001/09/26 21:30:23 1.48
@@ -391,10 +391,10 @@
const MutableNodeRefList& ancestors,
CountersTable& ctable,
int
numberList[],
- unsigned int
numberListLength,
+ NodeRefListBase::size_type
numberListLength,
XalanDOMString&
theResult) const
{
- for(unsigned int i = 0; i < numberListLength; i++)
+ for(NodeRefListBase::size_type i = 0; i < numberListLength; i++)
{
XalanNode* const target = ancestors.item(numberListLength - i -
1);
@@ -472,11 +472,11 @@
Constants::NUMBERLEVEL_SINGLE == m_level,
*ancestors.get());
- const unsigned int lastIndex =
ancestors->getLength();
+ const NodeRefListBase::size_type lastIndex =
ancestors->getLength();
if(lastIndex > 0)
{
- const unsigned int theStackArrayThreshold
= 100;
+ const NodeRefListBase::size_type
theStackArrayThreshold = 100;
if (lastIndex < theStackArrayThreshold)
{
@@ -775,7 +775,7 @@
XalanDOMChar numberType = XalanUnicode::charDigit_1;
- int numberWidth = 1;
+ XalanDOMString::size_type numberWidth = 1;
typedef vector<XalanDOMString> StringVectorType;
typedef StringVectorType::iterator StringVectorTypeIterator;
@@ -806,14 +806,14 @@
formatValue = XalanUnicode::charDigit_1;
}
- NumberFormatStringTokenizer
formatTokenizer(formatValue);
+ NumberFormatStringTokenizer
formatTokenizer(formatValue);
- const unsigned int theTokenCount =
formatTokenizer.countTokens();
+ const NumberFormatStringTokenizer::size_type theTokenCount =
formatTokenizer.countTokens();
tokenVector.resize(theTokenCount);
// Tokenize directly into the vector...
- for(unsigned int i = 0; i < theTokenCount; ++i)
+ for(NumberFormatStringTokenizer::size_type i = 0; i <
theTokenCount; ++i)
{
formatTokenizer.nextToken(tokenVector[i]);
}
@@ -1224,7 +1224,7 @@
StylesheetExecutionContext&
executionContext,
XalanNode*
contextNode,
XalanDOMChar
numberType,
- int
numberWidth,
+ XalanDOMString::size_type numberWidth,
int
listElement,
XalanDOMString&
theResult) const
{
@@ -1290,17 +1290,17 @@
formatter->format(listElement, theResult);
- const unsigned int lengthNumString =
length(theResult);
+ const XalanDOMString::size_type
lengthNumString = length(theResult);
- const int nPadding = numberWidth -
lengthNumString;
-
- if (nPadding > 0)
+ if (numberWidth > lengthNumString)
{
+ const XalanDOMString::size_type
nPadding = numberWidth - lengthNumString;
+
const XalanDOMString padString =
formatter->format(0);
reserve(theResult, nPadding *
length(padString) + lengthNumString + 1);
- for(int i = 0; i < nPadding; i++)
+ for(XalanDOMString::size_type i = 0; i
< nPadding; i++)
{
insert(theResult, 0, padString);
}
@@ -1318,8 +1318,10 @@
const XalanDOMString& table,
XalanDOMString& theResult)
{
- const int radix = length(table);
+ assert(int(length(table)) == length(table));
+ const int radix = int(length(table));
+
// TODO: throw error on out of range input
if (val > radix)
{
@@ -1343,7 +1345,9 @@
const XalanDOMString& table,
XalanDOMString& theResult)
{
- const int radix = length(table);
+ assert(int(length(table)) == length(table));
+
+ const int radix = int(length(table));
// Create a buffer to hold the result
// TODO: size of the table can be determined by computing
@@ -1394,7 +1398,7 @@
// term after the "|| " is that it correctly propagates carries
across
// multiple columns.
correction = ((lookupIndex == 0) ||
- (correction != 0 && lookupIndex == radix-1 )) ?
(radix-1) : 0;
+ (correction != 0 && lookupIndex == radix - 1 )) ?
(radix - 1) : 0;
// index in "table" of the next char to emit
lookupIndex = (val + correction) % radix;
@@ -1507,7 +1511,7 @@
return XalanDOMString();
}
- const unsigned int start = m_currentPosition;
+ const size_type start = m_currentPosition;
if (isXMLLetterOrDigit(charAt(*m_string, m_currentPosition)))
{
@@ -1539,7 +1543,7 @@
clear(theToken);
}
- const unsigned int start = m_currentPosition;
+ const size_type start = m_currentPosition;
if (isXMLLetterOrDigit(charAt(*m_string, m_currentPosition)))
{
@@ -1563,11 +1567,11 @@
-unsigned int
+ElemNumber::NumberFormatStringTokenizer::size_type
ElemNumber::NumberFormatStringTokenizer::countTokens() const
{
- unsigned int count = 0;
- unsigned int currpos = m_currentPosition;
+ size_type count = 0;
+ size_type currpos = m_currentPosition;
// Tokens consist of sequences of alphabetic characters and sequences of
// non-alphabetic characters
1.31 +8 -6 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ElemNumber.hpp 2001/08/13 17:08:53 1.30
+++ ElemNumber.hpp 2001/09/26 21:30:23 1.31
@@ -220,7 +220,7 @@
const MutableNodeRefList& ancestors,
CountersTable& ctable,
int
numberList[],
- unsigned int
numberListLength,
+ NodeRefListBase::size_type
numberListLength,
XalanDOMString&
theResult) const;
/**
@@ -263,7 +263,7 @@
formatNumberList(
StylesheetExecutionContext&
executionContext,
const int
theList[],
- unsigned int
theListLength,
+ NodeRefListBase::size_type theListLength,
XalanNode*
contextNode,
XalanDOMString&
formattedNumber) const;
@@ -353,7 +353,7 @@
StylesheetExecutionContext&
executionContext,
XalanNode*
contextNode,
XalanDOMChar
numberType,
- int
numberWidth,
+ XalanDOMString::size_type numberWidth,
int
listElement,
XalanDOMString&
theResult) const;
@@ -443,6 +443,8 @@
{
public:
+ typedef XalanDOMString::size_type size_type;
+
/**
* Construct a NumberFormatStringTokenizer.
*
@@ -500,14 +502,14 @@
*
* @return number of remaining tokens
*/
- unsigned int
+ size_type
countTokens() const;
private:
- unsigned int m_currentPosition;
+ size_type m_currentPosition;
- unsigned int m_maxPosition;
+ size_type m_maxPosition;
const XalanDOMString* m_string;
};
1.67 +4 -4 xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ElemTemplateElement.cpp 2001/09/19 21:20:46 1.66
+++ ElemTemplateElement.cpp 2001/09/26 21:30:23 1.67
@@ -255,7 +255,7 @@
bool
ElemTemplateElement::isValidNCName(const XalanDOMString& s)
{
- const unsigned int len = length(s);
+ const XalanDOMString::size_type len = length(s);
if (len == 0)
{
@@ -270,7 +270,7 @@
if(len > 1)
{
- for(unsigned int i = 1; i < len; i++)
+ for(XalanDOMString::size_type i = 1; i < len; i++)
{
c = charAt(s, i);
@@ -742,7 +742,7 @@
theXObject));
}
- const unsigned int nNodes = sourceNodes.getLength();
+ const NodeRefListBase::size_type nNodes =
sourceNodes.getLength();
if (nNodes > 0)
{
@@ -798,7 +798,7 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
const NodeRefListBase&
sourceNodes,
- unsigned int
sourceNodesCount) const
+ NodeRefListBase::size_type
sourceNodesCount) const
{
if(executionContext.getTraceSelects() == true)
{
1.37 +6 -4 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ElemTemplateElement.hpp 2001/09/19 21:20:46 1.36
+++ ElemTemplateElement.hpp 2001/09/26 21:30:23 1.37
@@ -85,6 +85,10 @@
+#include <XPath/NodeRefListBase.hpp>
+
+
+
#include <XSLT/NamespacesHandler.hpp>
@@ -92,7 +96,6 @@
class AttributeList;
class ElemTemplate;
class NamespacesHandler;
-class NodeRefListBase;
class NodeSorter;
class Stylesheet;
class StylesheetConstructionContext;
@@ -756,8 +759,7 @@
* Perform a query if needed, and call transformChild for each child.
*
* @param executionContext The current execution context
- * @param xslInstruction The stylesheet element context (deprecated --
I do
- * not think we need this).
+ * @param xslInstruction The stylesheet element context
* @param theTemplate The owning template context.
* @param sourceNodes The source nodes to transform.
* @param sourceNodesCount The count of source nodes to transform.
@@ -768,7 +770,7 @@
const ElemTemplateElement&
xslInstruction,
const ElemTemplateElement*
theTemplate,
const NodeRefListBase&
sourceNodes,
- unsigned int
sourceNodesCount) const;
+ NodeRefListBase::size_type
sourceNodesCount) const;
/**
* Given an element, find the corresponding
1.15 +2 -2 xml-xalan/c/src/XSLT/ElemTextLiteral.cpp
Index: ElemTextLiteral.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemTextLiteral.cpp 2001/06/06 21:55:29 1.14
+++ ElemTextLiteral.cpp 2001/09/26 21:30:23 1.15
@@ -77,8 +77,8 @@
int
lineNumber,
int
columnNumber,
const XMLCh* ch,
- int
start,
- int
length,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length,
bool isCData,
bool
preserveSpace,
bool
disableOutputEscaping) :
1.13 +2 -2 xml-xalan/c/src/XSLT/ElemTextLiteral.hpp
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemTextLiteral.hpp 2001/06/06 21:55:29 1.12
+++ ElemTextLiteral.hpp 2001/09/26 21:30:23 1.13
@@ -96,8 +96,8 @@
int
lineNumber,
int
columnNumber,
const XalanDOMChar* ch,
- int
start,
- int
length,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length,
bool isCData,
bool
preserveSpace,
bool
disableOutputEscaping);
1.15 +2 -4 xml-xalan/c/src/XSLT/ElemUse.cpp
Index: ElemUse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemUse.cpp 2001/08/13 17:08:53 1.14
+++ ElemUse.cpp 2001/09/26 21:30:23 1.15
@@ -167,7 +167,7 @@
isUAS = equals(attrName, Constants::ATTRNAME_USEATTRIBUTESETS);
}
- if(isUAS)
+ if(isUAS == true)
{
const XalanDOMChar* const qnames = atts.getValue(which);
@@ -175,9 +175,7 @@
c_wstr(XALAN_STATIC_UCODE_STRING(" \t\n\r")),
false);
- const unsigned int numTokens =
tokenizer.countTokens();
-
- m_attributeSetsNames.reserve(numTokens);
+ m_attributeSetsNames.reserve(tokenizer.countTokens());
XalanDOMString qname;
1.29 +7 -7 xml-xalan/c/src/XSLT/FunctionDocument.cpp
Index: FunctionDocument.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FunctionDocument.cpp 2001/09/25 16:47:02 1.28
+++ FunctionDocument.cpp 2001/09/26 21:30:23 1.29
@@ -280,13 +280,13 @@
// This list will hold the nodes...
BorrowReturnMutableNodeRefList mnl(executionContext);
- const XObject::eObjectType theType = arg->getType();
+ const XObject::eObjectType theType =
arg->getType();
- const unsigned int nRefs = XObject::eTypeNodeSet ==
theType ?
+ const NodeRefListBase::size_type nRefs = XObject::eTypeNodeSet
== theType ?
arg->nodeset().getLength()
: 1;
- for(unsigned int i = 0; i < nRefs; i++)
+ for(NodeRefListBase::size_type i = 0; i < nRefs; i++)
{
assert(XObject::eTypeNodeSet != theType ||
arg->nodeset().item(i)
!= 0);
@@ -327,13 +327,13 @@
// characters. Systems not requiring partial forms
should not use any
// unencoded slashes in their naming schemes. If they
do, absolute URIs
// will still work, but confusion may result.
- const unsigned int theLength = length(ref);
+ const XalanDOMString::size_type theLength =
length(ref);
- const unsigned int indexOfColon = indexOf(ref,
XalanUnicode::charColon);
- unsigned int indexOfSlash = indexOf(ref,
XalanUnicode::charSolidus);
+ const XalanDOMString::size_type indexOfColon =
indexOf(ref, XalanUnicode::charColon);
+ XalanDOMString::size_type
indexOfSlash = indexOf(ref, XalanUnicode::charSolidus);
#if defined(WIN32)
- const unsigned int indexOfBackSlash = indexOf(ref,
XalanUnicode::charReverseSolidus);
+ const XalanDOMString::size_type
indexOfBackSlash = indexOf(ref, XalanUnicode::charReverseSolidus);
if(indexOfBackSlash > indexOfSlash && indexOfBackSlash
< theLength)
{
1.15 +3 -3 xml-xalan/c/src/XSLT/FunctionElementAvailable.cpp
Index: FunctionElementAvailable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionElementAvailable.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionElementAvailable.cpp 2001/09/20 18:05:14 1.14
+++ FunctionElementAvailable.cpp 2001/09/26 21:30:23 1.15
@@ -87,10 +87,10 @@
{
assert(arg1.null() == false);
- const XalanDOMString& fullName = arg1->str();
+ const XalanDOMString& fullName = arg1->str();
- const unsigned int nameLength = length(fullName);
- const unsigned int indexOfNSSep = indexOf(fullName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type nameLength = length(fullName);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(fullName, XalanUnicode::charColon);
const XalanDOMString prefix =
indexOfNSSep < nameLength ? substring(fullName, 0,
indexOfNSSep) : XalanDOMString();
1.14 +3 -3 xml-xalan/c/src/XSLT/FunctionFunctionAvailable.cpp
Index: FunctionFunctionAvailable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFunctionAvailable.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionFunctionAvailable.cpp 2001/09/20 18:05:14 1.13
+++ FunctionFunctionAvailable.cpp 2001/09/26 21:30:23 1.14
@@ -91,10 +91,10 @@
{
assert(arg.null() == false);
- const XalanDOMString& fullName = arg->str();
+ const XalanDOMString& fullName = arg->str();
- const unsigned int nameLength = length(fullName);
- const unsigned int indexOfNSSep = indexOf(fullName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type nameLength = length(fullName);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(fullName, XalanUnicode::charColon);
const XalanDOMString prefix = indexOfNSSep < nameLength ?
substring(fullName, 0, indexOfNSSep) : XalanDOMString();
1.19 +1 -5 xml-xalan/c/src/XSLT/FunctionGenerateID.cpp
Index: FunctionGenerateID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FunctionGenerateID.cpp 2001/09/20 18:05:14 1.18
+++ FunctionGenerateID.cpp 2001/09/26 21:30:23 1.19
@@ -113,11 +113,7 @@
{
// We're assuming here that each nodes has an implementation
with a
// unique address that we can convert into a string
-#if defined(XALAN_OLD_STYLE_CASTS)
- UnsignedLongToHexDOMString((unsigned long)theNode, theResult);
-#else
- UnsignedLongToHexDOMString(reinterpret_cast<unsigned
long>(theNode), theResult);
-#endif
+ PointerToDOMString(theNode, theResult);
}
else
{
1.10 +3 -3 xml-xalan/c/src/XSLT/FunctionGenerateID.hpp
Index: FunctionGenerateID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionGenerateID.hpp 2001/09/14 20:49:43 1.9
+++ FunctionGenerateID.hpp 2001/09/26 21:30:23 1.10
@@ -116,11 +116,11 @@
bool
operator==(const FunctionGenerateID&) const;
- const XalanDOMString m_prefix;
+ const XalanDOMString m_prefix;
- const unsigned int m_prefixLength;
+ const XalanDOMString::size_type m_prefixLength;
- static const XalanDOMString s_emptyString;
+ static const XalanDOMString s_emptyString;
};
1.22 +2 -2 xml-xalan/c/src/XSLT/FunctionKey.cpp
Index: FunctionKey.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FunctionKey.cpp 2001/09/20 18:05:14 1.21
+++ FunctionKey.cpp 2001/09/26 21:30:23 1.22
@@ -157,7 +157,7 @@
{
const NodeRefListBase& theNodeSet = arg2->nodeset();
- const unsigned int nRefs =
theNodeSet.getLength();
+ const NodeRefListBase::size_type nRefs =
theNodeSet.getLength();
if (nRefs > 0)
{
@@ -171,7 +171,7 @@
XalanDOMString ref;
- for(unsigned int i = 0; i < nRefs; i++)
+ for(NodeRefListBase::size_type i = 0; i <
nRefs; i++)
{
assert(theNodeSet.item(i) != 0);
1.20 +3 -3 xml-xalan/c/src/XSLT/FunctionSystemProperty.cpp
Index: FunctionSystemProperty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionSystemProperty.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FunctionSystemProperty.cpp 2001/09/20 18:05:14 1.19
+++ FunctionSystemProperty.cpp 2001/09/26 21:30:23 1.20
@@ -95,9 +95,9 @@
{
assert(arg1.null() == false);
- const XalanDOMString& fullName = arg1->str();
- const unsigned int fullNameLength = length(fullName);
- const unsigned int indexOfNSSep = indexOf(fullName,
XalanUnicode::charColon);
+ const XalanDOMString& fullName = arg1->str();
+ const XalanDOMString::size_type fullNameLength =
length(fullName);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(fullName, XalanUnicode::charColon);
bool fNumberResult = false;
1.5 +8 -8 xml-xalan/c/src/XSLT/GenerateEvent.cpp
Index: GenerateEvent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/GenerateEvent.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenerateEvent.cpp 2000/11/02 01:46:27 1.4
+++ GenerateEvent.cpp 2001/09/26 21:30:23 1.5
@@ -79,7 +79,7 @@
m_characters(),
m_start(0),
m_length(0),
- m_name(XalanDOMString(name)),
+ m_name(name),
m_data(),
m_pAtts(atts)
{
@@ -103,10 +103,10 @@
GenerateEvent::GenerateEvent(
- EventType eventType,
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length) :
+ EventType
eventType,
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length) :
m_eventType(eventType),
m_characters(ch + start, length),
m_start(start),
@@ -127,8 +127,8 @@
m_characters(),
m_start(0),
m_length(0),
- m_name(XalanDOMString(name)),
- m_data(XalanDOMString(data)),
+ m_name(name),
+ m_data(data),
m_pAtts(0)
{
}
@@ -143,7 +143,7 @@
m_start(0),
m_length(0),
m_name(),
- m_data(XalanDOMString(data)),
+ m_data(data),
m_pAtts(0)
{
}
1.6 +6 -6 xml-xalan/c/src/XSLT/GenerateEvent.hpp
Index: GenerateEvent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/GenerateEvent.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenerateEvent.hpp 2000/11/02 01:46:27 1.5
+++ GenerateEvent.hpp 2001/09/26 21:30:23 1.6
@@ -179,10 +179,10 @@
* @param length end offset to be used in the chara array
*/
GenerateEvent(
- EventType eventType,
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length);
+ EventType
eventType,
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
/**
* Constructor for processingInstruction events.
@@ -221,12 +221,12 @@
/**
* The start position of the current data in m_characters.
*/
- unsigned int m_start;
+ XalanDOMString::size_type m_start;
/**
* The length of the current data in m_characters.
*/
- unsigned int m_length;
+ XalanDOMString::size_type m_length;
/**
* The name of the element or PI.
1.17 +1 -1 xml-xalan/c/src/XSLT/KeyTable.cpp
Index: KeyTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyTable.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- KeyTable.cpp 2001/07/27 05:35:23 1.16
+++ KeyTable.cpp 2001/09/26 21:30:23 1.17
@@ -281,7 +281,7 @@
// Use each node in the node list as a key value that we'll be
// able to use to look up the given node.
- const unsigned int nUseValues = nl.getLength();
+ const NodeRefListBase::size_type nUseValues =
nl.getLength();
StylesheetExecutionContext::GetAndReleaseCachedString
theGuard(executionContext);
1.16 +1 -1 xml-xalan/c/src/XSLT/NamespacesHandler.cpp
Index: NamespacesHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NamespacesHandler.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NamespacesHandler.cpp 2001/09/20 22:49:10 1.15
+++ NamespacesHandler.cpp 2001/09/26 21:30:23 1.16
@@ -319,7 +319,7 @@
// Figure out the prefix of the owning element, to make sure we
// don't exclude its prefix.
- const unsigned int indexOfNSSep = indexOf(theElementName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(theElementName, XalanUnicode::charColon);
const XalanDOMString thePrefix = indexOfNSSep <
length(theElementName) ?
substring(theElementName, 0,
indexOfNSSep) : XalanDOMString();
1.23 +1 -1 xml-xalan/c/src/XSLT/NodeSorter.cpp
Index: NodeSorter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSorter.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- NodeSorter.cpp 2001/06/25 21:19:17 1.22
+++ NodeSorter.cpp 2001/09/26 21:30:23 1.23
@@ -133,7 +133,7 @@
{
if (m_keys.size() > 0)
{
- const unsigned int theLength = theList.getLength();
+ const NodeRefListBase::size_type theLength =
theList.getLength();
// Copy the nodes to a vector...
assert(m_scratchVector.size() == 0);
1.64 +10 -6 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Stylesheet.cpp 2001/08/22 14:17:06 1.63
+++ Stylesheet.cpp 2001/09/26 21:30:23 1.64
@@ -508,7 +508,7 @@
{
// Others are OK if their prefix has been
// bound to a non-null Namespace URI other than XSLT's
- const unsigned int indexOfNSSep = indexOf(attrName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(attrName, XalanUnicode::charColon);
if(indexOfNSSep < length(attrName))
{
@@ -533,7 +533,7 @@
{
assert(nodeName != 0);
- const unsigned int indexOfNSSep = indexOf(nodeName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(nodeName, XalanUnicode::charColon);
const XalanDOMString prefix =
indexOfNSSep < length(nodeName) ?
@@ -1332,13 +1332,17 @@
if(theSize > 0)
{
// Start from the top of the stack
- for (int i = theSize - 1; i >= 0; --i)
+ for (ElemDecimalFormatVectorType::size_type i = theSize; i > 0;
--i)
{
- assert(m_elemDecimalFormats[i] != 0);
+ assert(m_elemDecimalFormats[i - 1] != 0);
- if (equals(m_elemDecimalFormats[i]->getName(), name) ==
true)
+ const ElemDecimalFormat* const theCurrent =
+ m_elemDecimalFormats[i - 1];
+ assert(theCurrent != 0);
+
+ if (equals(theCurrent->getName(), name) == true)
{
- dfs =
&m_elemDecimalFormats[i]->getDecimalFormatSymbols();
+ dfs = &theCurrent->getDecimalFormatSymbols();
break;
}
1.64 +13 -56 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- StylesheetExecutionContext.hpp 2001/09/14 20:49:43 1.63
+++ StylesheetExecutionContext.hpp 2001/09/26 21:30:23 1.64
@@ -78,6 +78,7 @@
+#include <cstddef>
#include <memory>
@@ -154,6 +155,8 @@
{
public:
+ typedef size_t size_type;
+
explicit
StylesheetExecutionContext();
@@ -878,18 +881,7 @@
/**
* Receive notification of the beginning of an element.
*
- * <p>The Parser will invoke this method at the beginning of every
- * element in the XML document; there will be a corresponding
- * endElement() event for every startElement() event (even when the
- * element is empty). All of the element's content will be
- * reported, in order, before the corresponding endElement()
- * event.</p>
- *
- * <p>If the element name has a namespace prefix, the prefix will
- * still be attached.</p>
- *
* @param name element type name
- * @exception SAXException
*/
virtual void
startElement(const XalanDOMChar* name) = 0;
@@ -897,16 +889,7 @@
/**
* Receive notification of the end of an element.
*
- * <p>The SAX parser will invoke this method at the end of every
- * element in the XML document; there will be a corresponding
- * startElement() event for every endElement() event (even when the
- * element is empty).</p>
- *
- * <p>If the element name has a namespace prefix, the prefix will
- * still be attached to the name.</p>
- *
* @param name element type name
- * @exception SAXException
*/
virtual void
endElement(const XalanDOMChar* name) = 0;
@@ -914,30 +897,15 @@
/**
* Receive notification of character data.
*
- * <p>The Parser will call this method to report each chunk of
- * character data. SAX parsers may return all contiguous character
- * data in a single chunk, or they may split it into several
- * chunks; however, all of the characters in any single event
- * must come from the same external entity, so that the Locator
- * provides useful information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * <p>Note that some parsers will report whitespace using the
- * ignorableWhitespace() method rather than this one (validating
- * parsers must do so).</p>
- *
* @param ch pointer to characters from the XML document
* @param start start position in the array
* @param length number of characters to read from the array
- * @exception SAXException
*/
virtual void
characters(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length) = 0;
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length) = 0;
/**
* Receive notification of character data. If available, when the
@@ -947,19 +915,17 @@
* @param ch pointer to characters from the XML document
* @param start start position in the array
* @param length number of characters to read from the array
- * @exception SAXException
*/
virtual void
charactersRaw(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length) = 0;
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length) = 0;
/**
* Called when a Comment is to be constructed.
*
* @param data pointer to comment data
- * @exception SAXException
*/
virtual void
comment(const XalanDOMChar* data) = 0;
@@ -967,17 +933,8 @@
/**
* Receive notification of a processing instruction.
*
- * <p>The Parser will invoke this method once for each processing
- * instruction found: note that processing instructions may occur
- * before or after the main document element.</p>
- *
- * <p>A SAX parser should never report an XML declaration (XML 1.0,
- * section 2.8) or a text declaration (XML 1.0, section 4.3.1)
- * using this method.</p>
- *
* @param target processing instruction target
* @param data processing instruction data, or null if none was
supplied
- * @exception SAXException
*/
virtual void
processingInstruction(
@@ -1367,7 +1324,7 @@
*
* @return number of listeners
*/
- virtual unsigned long
+ virtual size_type
getTraceListeners() const = 0;
/**
@@ -1485,7 +1442,7 @@
*/
virtual void
beginConstruction(const KeyDeclaration& keyDeclaration) = 0;
-
+
/**
* Remove KeyDeclaration from construction list.
*
@@ -1600,10 +1557,10 @@
virtual void
setContextNodeList(const NodeRefListBase& theList) = 0;
- virtual unsigned int
+ virtual size_type
getContextNodeListLength() const = 0;
- virtual unsigned int
+ virtual size_type
getContextNodeListPosition(const XalanNode& contextNode)
const = 0;
virtual bool
1.76 +11 -11
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- StylesheetExecutionContextDefault.cpp 2001/09/14 20:49:43 1.75
+++ StylesheetExecutionContextDefault.cpp 2001/09/26 21:30:23 1.76
@@ -491,8 +491,8 @@
// enhance XPath so that we can tell if str would match
// the XPath, once the namespace is resolved, but it may
// not be worth it...
- const unsigned int index = indexOf(str, XalanUnicode::charColon);
- const unsigned int len = length(str);
+ const XalanDOMString::size_type index = indexOf(str,
XalanUnicode::charColon);
+ const XalanDOMString::size_type len = length(str);
// If we found a ':' before the end of the string, and
// it's by itself (:: would indicate an axis), don't
@@ -804,9 +804,9 @@
void
StylesheetExecutionContextDefault::characters(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length)
{
assert(m_xsltProcessor != 0);
@@ -817,9 +817,9 @@
void
StylesheetExecutionContextDefault::charactersRaw(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length)
{
assert(m_xsltProcessor != 0);
@@ -1493,7 +1493,7 @@
-unsigned int
+StylesheetExecutionContextDefault::size_type
StylesheetExecutionContextDefault::getContextNodeListLength() const
{
return m_xpathExecutionContextDefault.getContextNodeListLength();
@@ -1501,7 +1501,7 @@
-unsigned int
+StylesheetExecutionContextDefault::size_type
StylesheetExecutionContextDefault::getContextNodeListPosition(const
XalanNode& contextNode) const
{
return
m_xpathExecutionContextDefault.getContextNodeListPosition(contextNode);
@@ -1861,7 +1861,7 @@
-unsigned long
+StylesheetExecutionContextDefault::size_type
StylesheetExecutionContextDefault::getTraceListeners() const
{
assert(m_xsltProcessor != 0);
1.68 +9 -9
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- StylesheetExecutionContextDefault.hpp 2001/09/14 20:49:43 1.67
+++ StylesheetExecutionContextDefault.hpp 2001/09/26 21:30:23 1.68
@@ -453,15 +453,15 @@
virtual void
characters(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
virtual void
charactersRaw(
- const XalanDOMChar* ch,
- unsigned int start,
- unsigned int length);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
virtual void
comment(const XalanDOMChar* data);
@@ -597,7 +597,7 @@
installXalanNumberFormatFactory(XalanNumberFormatFactory*
theFactory);
- virtual unsigned long
+ virtual size_type
getTraceListeners() const;
virtual void
@@ -759,10 +759,10 @@
virtual void
setContextNodeList(const NodeRefListBase& theList);
- virtual unsigned int
+ virtual size_type
getContextNodeListLength() const;
- virtual unsigned int
+ virtual size_type
getContextNodeListPosition(const XalanNode& contextNode)
const;
virtual bool
1.72 +16 -12 xml-xalan/c/src/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- StylesheetHandler.cpp 2001/09/17 21:10:00 1.71
+++ StylesheetHandler.cpp 2001/09/26 21:30:23 1.72
@@ -367,8 +367,8 @@
const XalanDOMString& ns = getNamespaceFromStack(name);
- const unsigned int nameLength = length(name);
- const unsigned int index = indexOf(name,
XalanUnicode::charColon);
+ const XalanDOMString::size_type nameLength =
length(name);
+ const XalanDOMString::size_type index = indexOf(name,
XalanUnicode::charColon);
const XalanDOMString localName = index == nameLength ?
XalanDOMString(name) : substring(name, index + 1);
@@ -380,7 +380,7 @@
ElemTemplateElement* elem = 0;
- const unsigned origStackSize = m_elemStack.size();
+ const ElemTemplateStackType::size_type origStackSize =
m_elemStack.size();
if(equals(ns, m_constructionContext.getXSLTNamespaceURI()))
{
@@ -1370,11 +1370,11 @@
const Stylesheet::URLStackType& stack,
const XalanDOMString&
urlString)
{
- const unsigned int n = stack.size();
+ const Stylesheet::URLStackType::size_type n = stack.size();
bool contains = false;
- for(unsigned int i = 0; i < n && contains == false; ++i)
+ for(Stylesheet::URLStackType::size_type i = 0; i < n && contains ==
false; ++i)
{
if(equals(stack[i], urlString))
{
@@ -1710,8 +1710,8 @@
void
StylesheetHandler::processText(
- const XMLCh* const chars,
- const unsigned int length)
+ const XMLCh* chars,
+ XalanDOMString::size_type length)
{
if(m_inTemplate)
{
@@ -1742,9 +1742,13 @@
XalanAutoPtr<ElemTextLiteral> elem(new
ElemTextLiteral(m_constructionContext,
m_stylesheet,
- lineNumber, columnNumber,
- chars, 0, length,
- true, preserveSpace,
+ lineNumber,
+ columnNumber,
+ chars,
+ 0,
+ length,
+ true,
+ preserveSpace,
disableOutputEscaping));
const bool isWhite = elem->isWhitespace();
@@ -1807,8 +1811,8 @@
void
StylesheetHandler::accumulateText(
- const XMLCh* const chars,
- const unsigned int length)
+ const XMLCh* chars,
+ XalanDOMString::size_type length)
{
if(m_inTemplate)
{
1.31 +4 -4 xml-xalan/c/src/XSLT/StylesheetHandler.hpp
Index: StylesheetHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StylesheetHandler.hpp 2001/09/14 20:49:43 1.30
+++ StylesheetHandler.hpp 2001/09/26 21:30:23 1.31
@@ -454,13 +454,13 @@
void
processText(
- const XMLCh* const chars,
- const unsigned int length);
+ const XMLCh* chars,
+ XalanDOMString::size_type length);
void
accumulateText(
- const XMLCh* const chars,
- const unsigned int length);
+ const XMLCh* chars,
+ XalanDOMString::size_type length);
void
processAccumulatedText();
1.53 +1 -1 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- StylesheetRoot.cpp 2001/08/13 17:08:53 1.52
+++ StylesheetRoot.cpp 2001/09/26 21:30:23 1.53
@@ -477,7 +477,7 @@
{
StringTokenizer theTokenizer(atts.getValue(i));
- unsigned int theTokenCount =
+ StringTokenizer::size_type theTokenCount =
theTokenizer.countTokens();
m_cdataSectionElems.reserve(theTokenCount);
1.11 +2 -2 xml-xalan/c/src/XSLT/TraceListenerDefault.cpp
Index: TraceListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListenerDefault.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TraceListenerDefault.cpp 2001/08/13 17:08:53 1.10
+++ TraceListenerDefault.cpp 2001/09/26 21:30:23 1.11
@@ -257,7 +257,7 @@
const NodeRefListBase& nl = ev.m_selection->nodeset();
- const unsigned int n = nl.getLength();
+ const NodeRefListBase::size_type n =
nl.getLength();
if(n == 0)
{
@@ -265,7 +265,7 @@
}
else
{
- for(unsigned int i = 0; i < n; i++)
+ for(NodeRefListBase::size_type i = 0; i < n;
i++)
{
assert(nl.item(i) != 0);
1.8 +10 -12 xml-xalan/c/src/XSLT/TracerEvent.cpp
Index: TracerEvent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TracerEvent.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TracerEvent.cpp 2001/03/09 16:19:55 1.7
+++ TracerEvent.cpp 2001/09/26 21:30:23 1.8
@@ -87,12 +87,12 @@
XalanDOMString
TracerEvent::printNode(const XalanNode& n)
{
-#if defined(XALAN_OLD_STYLE_CASTS)
- XalanDOMString r = UnsignedLongToDOMString((unsigned long)&n) +
XALAN_STATIC_UCODE_STRING(" ");
-#else
- XalanDOMString r = UnsignedLongToDOMString(reinterpret_cast<unsigned
long>(&n)) + XALAN_STATIC_UCODE_STRING(" ");
-#endif
+ XalanDOMString r;
+ PointerToDOMString(&n, r);
+
+ append(r, XALAN_STATIC_UCODE_STRING(" "));
+
if (n.getNodeType() == XalanNode::ELEMENT_NODE)
{
r += XALAN_STATIC_UCODE_STRING("<") + n.getNodeName();
@@ -140,13 +140,11 @@
XalanDOMString
TracerEvent::printNodeList(const XalanNodeList& l)
{
-#if defined(XALAN_OLD_STYLE_CASTS)
- XalanDOMString r = UnsignedLongToDOMString((unsigned long)&l) +
-
XALAN_STATIC_UCODE_STRING("[");
-#else
- XalanDOMString r = UnsignedLongToDOMString(reinterpret_cast<long>(&l))
+
-
XALAN_STATIC_UCODE_STRING("[");
-#endif
+ XalanDOMString r;
+
+ PointerToDOMString(&l, r);
+
+ append(r, XALAN_STATIC_UCODE_STRING("["));
unsigned int len = l.getLength();
unsigned int i = 0;
1.20 +12 -7 xml-xalan/c/src/XSLT/VariablesStack.cpp
Index: VariablesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/VariablesStack.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VariablesStack.cpp 2001/08/13 17:08:53 1.19
+++ VariablesStack.cpp 2001/09/26 21:30:23 1.20
@@ -107,12 +107,13 @@
bool
VariablesStack::elementFrameAlreadyPushed(const ElemTemplateElement* elem)
const
{
- const unsigned int nElems = m_stack.size();
+ const VariableStackStackType::size_type nElems = m_stack.size();
+ assert(nElems > 0);
// There is guaranteed to be a context marker at
// the bottom of the stack, so i should stop at
// 1.
- for(unsigned int i = nElems - 1; i > 0; --i)
+ for(VariableStackStackType::size_type i = nElems - 1; i > 0; --i)
{
const StackEntry& theEntry = m_stack[i];
@@ -141,11 +142,11 @@
void
VariablesStack::popContextMarker()
{
- const int nElems = m_stack.size();
+ const VariableStackStackType::size_type nElems = m_stack.size();
- for(int i = nElems - 1; i >= 0 && m_stack.empty() == false; --i)
+ for(VariableStackStackType::size_type i = nElems; i > 0 &&
m_stack.empty() == false; --i)
{
- const StackEntry& theEntry = m_stack[i];
+ const StackEntry& theEntry = m_stack[i -
1];
assert(theEntry == back());
const StackEntry::eType type = theEntry.getType();
@@ -546,9 +547,13 @@
void
VariablesStack::popElementFrame(const ElemTemplateElement* elem)
{
- const unsigned int nElems = m_stack.size();
+ const VariableStackStackType::size_type nElems = m_stack.size();
+ assert(nElems > 0);
- for(unsigned int i = nElems - 1; i > 0; --i)
+ // There is guaranteed to be a context marker at
+ // the bottom of the stack, so i should stop at
+ // 1.
+ for(VariableStackStackType::size_type i = nElems - 1; i > 0; --i)
{
const StackEntry& theEntry = m_stack[i];
1.120 +41 -42 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- XSLTEngineImpl.cpp 2001/09/20 22:49:10 1.119
+++ XSLTEngineImpl.cpp 2001/09/26 21:30:23 1.120
@@ -170,7 +170,6 @@
XObjectFactory& xobjectFactory,
XPathFactory& xpathFactory) :
XSLTProcessor(),
- DocumentHandler(),
PrefixResolver(),
m_useDOMResultTreeFactory(false),
m_domResultTreeFactory(0),
@@ -668,7 +667,7 @@
XalanDOMString localXSLURLString = trim(xslURLString);
- const unsigned int fragIndex = indexOf(localXSLURLString,
XalanUnicode::charNumberSign);
+ const XalanDOMString::size_type fragIndex =
indexOf(localXSLURLString, XalanUnicode::charNumberSign);
const XalanDocument* stylesheetDoc = 0;
@@ -1003,9 +1002,9 @@
{
const NodeRefListBase& nl = value.nodeset();
- const unsigned int nChildren =
nl.getLength();
+ const NodeRefListBase::size_type nChildren =
nl.getLength();
- for(unsigned int i = 0; i < nChildren; i++)
+ for(NodeRefListBase::size_type i = 0; i < nChildren;
i++)
{
XalanNode* pos =
nl.item(i);
assert(pos != 0);
@@ -1107,7 +1106,7 @@
// SECTION: Diagnostic functions
//==========================================================
-unsigned long
+XSLTEngineImpl::size_type
XSLTEngineImpl::getTraceListeners() const
{
return m_traceListeners.size();
@@ -1612,13 +1611,13 @@
{
msg += attr->getValue();
msg += XALAN_STATIC_UCODE_STRING(", ");
- msg += LongToDOMString(nl.getLength());
+ msg += UnsignedLongToDOMString(nl.getLength());
msg += XALAN_STATIC_UCODE_STRING(" selected");
}
else
{
msg += XALAN_STATIC_UCODE_STRING("*|text(), (default
select), ");
- msg += LongToDOMString(nl.getLength());
+ msg += UnsignedLongToDOMString(nl.getLength());
msg += XALAN_STATIC_UCODE_STRING(" selected");
}
@@ -1974,9 +1973,9 @@
void
XSLTEngineImpl::characters(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length)
{
assert(getFormatterListener() != 0);
assert(ch != 0);
@@ -2066,9 +2065,9 @@
void
XSLTEngineImpl::charactersRaw(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length)
{
assert(ch != 0);
@@ -2128,8 +2127,8 @@
void
XSLTEngineImpl::ignorableWhitespace(
- const XMLCh* const ch,
- const unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type length)
{
assert(getFormatterListener() != 0);
assert(ch != 0);
@@ -2151,8 +2150,8 @@
void
XSLTEngineImpl::processingInstruction(
- const XMLCh* const target,
- const XMLCh* const data)
+ const XalanDOMChar* target,
+ const XalanDOMChar* data)
{
assert(getFormatterListener() != 0);
assert(target != 0);
@@ -2176,7 +2175,7 @@
void
-XSLTEngineImpl::comment(const XMLCh* const data)
+XSLTEngineImpl::comment(const XalanDOMChar* data)
{
assert(getFormatterListener() != 0);
assert(data != 0);
@@ -2195,7 +2194,7 @@
void
-XSLTEngineImpl::entityReference(const XMLCh* const name)
+XSLTEngineImpl::entityReference(const XalanDOMChar* name)
{
assert(getFormatterListener() != 0);
assert(name != 0);
@@ -2217,9 +2216,9 @@
void
XSLTEngineImpl::cdata(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length)
{
assert(getFormatterListener() != 0);
assert(ch != 0);
@@ -2474,7 +2473,7 @@
{
bool fResult = false;
- const unsigned int indexOfNSSep = indexOf(elementName,
XalanUnicode::charColon);
+ const XalanDOMString::size_type indexOfNSSep =
indexOf(elementName, XalanUnicode::charColon);
if(indexOfNSSep == length(elementName))
{
@@ -2539,10 +2538,10 @@
inline bool
isPrefixUsed(
- const XalanDOMString& thePrefix,
- unsigned int thePrefixLength,
- const XalanDOMChar* theName,
- unsigned int theNameLength)
+ const XalanDOMString& thePrefix,
+ XalanDOMString::size_type thePrefixLength,
+ const XalanDOMChar* theName,
+ XalanDOMString::size_type theNameLength)
{
assert(thePrefixLength != 0);
@@ -2556,7 +2555,7 @@
{
assert(theName != 0);
- const unsigned int theIndex = indexOf(
+ const XalanDOMString::size_type theIndex = indexOf(
theName,
XalanUnicode::charColon);
@@ -2578,9 +2577,9 @@
inline bool
isPrefixUsed(
- const XalanDOMString& thePrefix,
- unsigned int thePrefixLength,
- const XalanDOMString& theName)
+ const XalanDOMString& thePrefix,
+ XalanDOMString::size_type thePrefixLength,
+ const XalanDOMString& theName)
{
return isPrefixUsed(thePrefix, thePrefixLength, c_wstr(theName),
length(theName));
}
@@ -2589,10 +2588,10 @@
inline bool
isPrefixUsedOrDeclared(
- const XalanDOMString& thePrefix,
- unsigned int thePrefixLength,
- const XalanDOMChar* theName,
- unsigned int theNameLength)
+ const XalanDOMString& thePrefix,
+ XalanDOMString::size_type thePrefixLength,
+ const XalanDOMChar* theName,
+ XalanDOMString::size_type theNameLength)
{
if (isPrefixUsed(thePrefix, thePrefixLength, theName, theNameLength) ==
true)
{
@@ -2600,7 +2599,7 @@
}
else
{
- const unsigned int theDeclarationLength =
+ const XalanDOMString::size_type theDeclarationLength =
thePrefixLength +
DOMServices::s_XMLNamespaceWithSeparatorLength;
// If this is a namespace declaration for this prefix, then all
of
@@ -2624,7 +2623,7 @@
isPendingAttributePrefix(
const AttributeList& thePendingAttributes,
const XalanDOMString& thePrefix,
- unsigned int thePrefixLength)
+ XalanDOMString::size_type thePrefixLength)
{
const unsigned int thePendingAttributesCount =
thePendingAttributes.getLength();
@@ -2666,7 +2665,7 @@
bool
XSLTEngineImpl::isPendingResultPrefix(const XalanDOMString&
thePrefix) const
{
- const unsigned int thePrefixLength = length(thePrefix);
+ const XalanDOMString::size_type thePrefixLength =
length(thePrefix);
assert(thePrefixLength > 0);
// The element name must be greater than the length of the prefix + 1,
since
@@ -3166,10 +3165,10 @@
void
XSLTEngineImpl::fireCharacterGenerateEvent(
- const XMLCh* ch,
- unsigned int start,
- unsigned int length,
- bool isCDATA)
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length,
+ bool isCDATA)
{
const GenerateEvent ge(
isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA :
GenerateEvent::EVENTTYPE_CHARACTERS,
1.76 +62 -102 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- XSLTEngineImpl.hpp 2001/09/20 22:49:09 1.75
+++ XSLTEngineImpl.hpp 2001/09/26 21:30:23 1.76
@@ -151,7 +151,7 @@
*
*/
-class XALAN_XSLT_EXPORT XSLTEngineImpl : public XSLTProcessor, private
DocumentHandler, public PrefixResolver
+class XALAN_XSLT_EXPORT XSLTEngineImpl : public XSLTProcessor, public
PrefixResolver
{
public:
@@ -288,7 +288,7 @@
// Trace-related functions...
- virtual unsigned long
+ virtual size_type
getTraceListeners() const;
virtual void
@@ -449,35 +449,53 @@
value);
}
+ void
+ setDocumentLocator(const Locator* locator);
+
+ void
+ startDocument();
+
+ void
+ endDocument();
+
+ void
+ startElement(
+ const XalanDOMChar* name,
+ AttributeList& atts);
+
+ void
+ endElement(const XalanDOMChar* name);
+
+ void
+ characters (
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type length);
+
+ void
+ ignorableWhitespace(
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type length);
+
+ void
+ processingInstruction(
+ const XalanDOMChar* target,
+ const XalanDOMChar* data);
+
+ void
+ resetDocument();
+
/**
* Receive notification of character data.
*
- * <p>The Parser will call this method to report each chunk of
- * character data. SAX parsers may return all contiguous character
- * data in a single chunk, or they may split it into several
- * chunks; however, all of the characters in any single event
- * must come from the same external entity, so that the Locator
- * provides useful information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * <p>Note that some parsers will report whitespace using the
- * ignorableWhitespace() method rather than this one (validating
- * parsers must do so).</p>
- *
- * NOTE: This method is only provided for compatibility with existing
code
- *
* @param ch pointer to characters from the XML document
* @param start startng offset in 'ch' array
* @param length number of characters to read from the array
- * @deprecated
*/
- virtual void
+ void
characters(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
/**
* Send character data from the node to the result tree.
@@ -492,7 +510,7 @@
*
* @param node The xobject to send.
*/
- virtual void
+ void
characters(const XObjectPtr& xobject);
/**
@@ -500,10 +518,9 @@
* attribute list
*
* @param name element type name
- * @exception SAXException
*/
- virtual void
- startElement(const XMLCh* const name);
+ void
+ startElement(const XalanDOMChar* name);
/**
* Receive notification of character data. If available, when the
@@ -513,20 +530,19 @@
* @param ch pointer to characters from the XML document
* @param start start position in the array
* @param length number of characters to read from the array
- * @exception SAXException
*/
- virtual void
+ void
charactersRaw(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
/**
* Send raw character data from the node to the result tree.
*
* @param node The node to send.
*/
- virtual void
+ void
charactersRaw(const XalanNode& node);
/**
@@ -534,18 +550,16 @@
*
* @param node The xobject to send.
*/
- virtual void
+ void
charactersRaw(const XObjectPtr& xobject);
/**
* Called when a Comment is to be constructed.
*
* @param data pointer to comment data
- * @exception SAXException
*/
- virtual void
- comment(
- const XMLCh* const data);
+ void
+ comment(const XalanDOMChar* data);
/**
* Receive notification of a entityReference.
@@ -553,37 +567,21 @@
* @param data pointer to characters from the XML document
* @exception SAXException
*/
- virtual void
- entityReference(
- const XMLCh* const data);
+ void
+ entityReference(const XalanDOMChar* data);
/**
* Receive notification of cdata.
*
- * <p>The Parser will call this method to report each chunk of
- * character data. SAX parsers may return all contiguous character
- * data in a single chunk, or they may split it into several
- * chunks; however, all of the characters in any single event
- * must come from the same external entity, so that the Locator
- * provides useful information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * <p>Note that some parsers will report whitespace using the
- * ignorableWhitespace() method rather than this one (validating
- * parsers must do so).</p>
- *
* @param ch pointer to characters from the XML document
* @param start start position in the array
* @param length number of characters to read from the array
- * @exception SAXException
*/
- virtual void
+ void
cdata(
- const XMLCh* const ch,
- const unsigned int start,
- const unsigned int length);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length);
/**
* Clone an element with or without children.
@@ -1279,44 +1277,6 @@
}
}
-
- // These methods are inherited from DocumentHandler ...
-
- virtual void
- setDocumentLocator(const Locator* const locator);
-
- virtual void
- startDocument();
-
- virtual void
- endDocument();
-
- virtual void
- startElement(
- const XMLCh* const name,
- AttributeList& atts);
-
- virtual void
- endElement(
- const XMLCh* const name);
-
- virtual void characters (
- const XMLCh* const chars,
- const unsigned int length);
-
- virtual void
- ignorableWhitespace(
- const XMLCh* const ch,
- const unsigned int length);
-
- virtual void
- processingInstruction(
- const XMLCh* const target,
- const XMLCh* const data);
-
- virtual void
- resetDocument();
-
protected:
/**
@@ -1672,10 +1632,10 @@
void
fireCharacterGenerateEvent(
- const XMLCh* ch,
- unsigned int start,
- unsigned int length,
- bool isCDATA);
+ const XalanDOMChar* ch,
+ XalanDOMString::size_type start,
+ XalanDOMString::size_type length,
+ bool
isCDATA);
XMLParserLiaison& m_parserLiaison;
1.26 +7 -1 xml-xalan/c/src/XSLT/XSLTProcessor.hpp
Index: XSLTProcessor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessor.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XSLTProcessor.hpp 2001/09/14 20:49:43 1.25
+++ XSLTProcessor.hpp 2001/09/26 21:30:23 1.26
@@ -68,6 +68,10 @@
+#include <cstddef>
+
+
+
#include <XalanDOM/XalanDOMString.hpp>
@@ -112,6 +116,8 @@
{
public:
+ typedef size_t size_type;
+
XSLTProcessor();
virtual
@@ -336,7 +342,7 @@
*
* @return number of listeners
*/
- virtual unsigned long
+ virtual size_type
getTraceListeners() const = 0;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
