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/07/01 00:47:22 UTC
svn commit: r672951 [1/2] - in /xalan/c/trunk/src/xalanc: PlatformSupport/
TestXPath/ Utils/MsgCreator/ XPath/ XSLT/ XalanTransformer/
Author: dbertoni
Date: Mon Jun 30 15:47:20 2008
New Revision: 672951
URL: http://svn.apache.org/viewvc?rev=672951&view=rev
Log:
More changes for Xerces-C API updates.
Modified:
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
xalan/c/trunk/src/xalanc/XPath/XPathParserException.cpp
xalan/c/trunk/src/xalanc/XPath/XPathParserException.hpp
xalan/c/trunk/src/xalanc/XPath/XalanXPathException.cpp
xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemComment.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemComment.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemFallback.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemFallback.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemIf.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemIf.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemMessage.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemPI.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemPI.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemParam.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemParam.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemText.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemText.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemVariable.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemVariable.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemWhen.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemWhen.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.hpp
xalan/c/trunk/src/xalanc/XSLT/ProblemListener.hpp
xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/ProblemListenerDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorException.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorException.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemCallTemplateAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemCallTemplateAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemEmptyAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemEmptyAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemLiteralResultAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemLiteralResultAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTemplateAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTemplateAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTextAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTextAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTextLiteralAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemTextLiteralAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemValueOfAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemValueOfAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemVariableAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanElemVariableAllocator.hpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformerProblemListener.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Mon Jun 30 15:47:20 2008
@@ -1775,6 +1775,18 @@
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
+NumberToDOMString(
+ unsigned long long theValue,
+ XalanDOMString& theResult)
+{
+ ScalarToDecimalString(theValue, theResult);
+
+ return theResult;
+}
+
+
+
+XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
UnsignedLongToDOMString(
unsigned long theValue,
XalanDOMString& theResult)
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Mon Jun 30 15:47:20 2008
@@ -686,8 +686,6 @@
-
-
/**
* Converts a double value into a XalanDOMString
*
@@ -702,7 +700,6 @@
-
class XALAN_PLATFORMSUPPORT_EXPORT DOMStringHelper
{
public:
@@ -739,9 +736,6 @@
-
-
-
/**
* Converts an unsigned long value and appends the
* result to a XalanDOMString.
@@ -771,6 +765,19 @@
+/**
+ * Converts an unsigned long long value into a XalanDOMString
+ *
+ * @param theValue number to be converted
+ * @param theResult the string to append with the result
+ * @return a reference to the passed string result.
+ */
+XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
+NumberToDOMString(
+ unsigned long long theValue,
+ XalanDOMString& theResult);
+
+
/**
* Converts a size_t value and appends the
@@ -787,8 +794,6 @@
-
-
/**
* Converts an unsigned long value and appends the
* result to a XalanDOMString.
@@ -804,8 +809,6 @@
-
-
/**
* Converts a wide string into an integer value
*
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp Mon Jun 30 15:47:20 2008
@@ -78,7 +78,7 @@
const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index);
assert(theAttribute != 0);
- return c_wstr(theAttribute->getNodeName());
+ return theAttribute->getNodeName().c_str();
}
@@ -101,7 +101,7 @@
const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index);
assert(theAttribute != 0);
- return c_wstr(theAttribute->getNodeValue());
+ return theAttribute->getNodeValue().c_str();
}
@@ -111,7 +111,7 @@
{
assert(length(s_typeString) > 0);
- return c_wstr(s_typeString);
+ return s_typeString;
}
@@ -127,7 +127,7 @@
}
else
{
- return c_wstr(theNode->getNodeValue());
+ return theNode->getNodeValue().c_str();
}
}
@@ -136,9 +136,9 @@
const XMLCh*
NamedNodeMapAttributeList::getValue(const char* const name) const
{
- XalanDOMString theBuffer(m_memoryManager);
+ XalanDOMString theBuffer(m_memoryManager);
- return getValue(c_wstr(TranscodeFromLocalCodePage(name, theBuffer)));
+ return getValue(TranscodeFromLocalCodePage(name, theBuffer).c_str());
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp Mon Jun 30 15:47:20 2008
@@ -32,8 +32,8 @@
XSLException::XSLException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager) :
m_message(theMessage, theManager),
m_uri(theURI, theManager),
@@ -137,8 +137,8 @@
const XalanDOMString::size_type theMessageLength,
const XalanDOMChar* theURI,
const XalanDOMString::size_type theURILength,
- size_type theLineNumber,
- size_type theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
const XalanDOMChar* theType,
const XalanDOMString::size_type theTypeLength,
XalanDOMString& theBuffer)
@@ -150,9 +150,9 @@
theBuffer += XalanDOMChar(XalanUnicode::charLeftParenthesis);
theBuffer.append(theURI, theURILength);
theBuffer += lineString;
- LongToDOMString(theLineNumber, theBuffer);
+ NumberToDOMString(theLineNumber, theBuffer);
theBuffer += columnString;
- LongToDOMString(theColumnNumber, theBuffer);
+ NumberToDOMString(theColumnNumber, theBuffer);
theBuffer += XalanDOMChar(XalanUnicode::charRightParenthesis);
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp Mon Jun 30 15:47:20 2008
@@ -54,8 +54,8 @@
XSLException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager);
/**
* Constructor
@@ -139,8 +139,8 @@
MemoryManagerType&
getMemoryManager()const
{
-//#pragma message ("Breaks the const-correctness !")
XalanDOMString* pnt = const_cast<XalanDOMString*>(&m_message);
+
return pnt->getMemoryManager();
}
@@ -151,8 +151,8 @@
defaultFormat(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
- size_type theLineNumber,
- size_type theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
const XalanDOMChar* theType,
XalanDOMString& theBuffer)
{
@@ -170,12 +170,12 @@
static void
defaultFormat(
- const XalanDOMChar* theMessage,
- const XalanDOMChar* theURI,
- size_type theLineNumber,
- size_type theColumnNumber,
- const XalanDOMChar* theType,
- XalanDOMString& theBuffer)
+ const XalanDOMChar* theMessage,
+ const XalanDOMChar* theURI,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
+ const XalanDOMChar* theType,
+ XalanDOMString& theBuffer)
{
assert(theMessage != 0 && theURI != 0 && theType != 0);
@@ -197,8 +197,8 @@
const XalanDOMString::size_type theMessageLength,
const XalanDOMChar* theURI,
const XalanDOMString::size_type theURILength,
- size_type theLineNumber,
- size_type theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
const XalanDOMChar* theType,
const XalanDOMString::size_type theTypeLength,
XalanDOMString& theBuffer);
@@ -208,8 +208,8 @@
const XalanDOMString m_message;
const XalanDOMString m_uri;
- const size_type m_lineNumber;
- const size_type m_columnNumber;
+ const XalanFileLoc m_lineNumber;
+ const XalanFileLoc m_columnNumber;
};
Modified: xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Mon Jun 30 15:47:20 2008
@@ -1185,30 +1185,20 @@
XalanDOMString&
-GetXSLFileName(const XalanDOMString& theXMLFileName, XalanDOMString& theResult)
+GetXSLFileName(
+ const XalanDOMString& theXMLFileName,
+ XalanDOMString& theResult)
{
-
+ const XalanDOMString::size_type thePeriodIndex =
+ lastIndexOf(theXMLFileName, XalanUnicode::charFullStop);
- int thePeriodIndex = -1;
-
- const int theLength = length(theXMLFileName);
-
- for (int i = theLength - 1; i > 0; i--)
- {
- if (charAt(theXMLFileName, i) == XalanUnicode::charFullStop)
- {
- thePeriodIndex = i;
-
- break;
- }
- }
-
- if (thePeriodIndex != -1)
+ if (thePeriodIndex != XalanDOMString::npos)
{
- substring(theXMLFileName,
- theResult,
- 0,
- thePeriodIndex + 1);
+ substring(
+ theXMLFileName,
+ theResult,
+ 0,
+ thePeriodIndex + 1);
theResult.append("xsl");
}
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp Mon Jun 30 15:47:20 2008
@@ -395,7 +395,7 @@
// handler for the parser. Then parse the file and catch any exceptions
// that propogate out
//
- int errorCount = 0;
+ XalanSize_t errorCount = 0;
const char* const fileName = theParams.inXMLFileName;
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp Mon Jun 30 15:47:20 2008
@@ -101,7 +101,7 @@
{
if (sArrayOfStrings != 0)
{
- for (unsigned int i = 0; sArrayOfStrings[i] != 0; ++i)
+ for (XalanSize_t i = 0; sArrayOfStrings[i] != 0; ++i)
{
m_indexOutputStream.writeAsASCII(
sArrayOfStrings[i],
@@ -121,12 +121,12 @@
{
if(!XMLString::compareString(localname, s_transUnitXMLCh))
{
- const unsigned int len =
+ const XalanSize_t len =
attributes.getLength();
++m_numberOfRecords;
- for (unsigned int index = 0; index < len; index++)
+ for (XalanSize_t index = 0; index < len; index++)
{
const XMLCh* const name =
attributes.getQName(index);
@@ -138,8 +138,10 @@
attributes.getValue(index);
assert(val != 0);
- if ( m_numberOfRecords != 1)
+ if (m_numberOfRecords != 1)
+ {
printBeginOfIndexLine();
+ }
m_indexOutputStream.writeAsASCII(
val,
Modified: xalan/c/trunk/src/xalanc/XPath/XPathParserException.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathParserException.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathParserException.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathParserException.cpp Mon Jun 30 15:47:20 2008
@@ -53,10 +53,15 @@
XPathParserException::XPathParserException(
const XalanDOMString& message,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager) :
- XalanXPathException(message, theURI, theLineNumber, theColumnNumber, theManager)
+ XalanXPathException(
+ message,
+ theURI,
+ theLineNumber,
+ theColumnNumber,
+ theManager)
{
}
@@ -66,7 +71,10 @@
const LocatorType& theLocator,
const XalanDOMString& theMessage,
MemoryManagerType& theManager) :
- XalanXPathException(theLocator, theMessage, theManager)
+ XalanXPathException(
+ theLocator,
+ theMessage,
+ theManager)
{
}
@@ -75,7 +83,9 @@
XPathParserException::XPathParserException(
const XalanDOMString& message,
MemoryManagerType& theManager) :
- XalanXPathException(message, theManager)
+ XalanXPathException(
+ message,
+ theManager)
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathParserException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathParserException.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathParserException.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathParserException.hpp Mon Jun 30 15:47:20 2008
@@ -52,8 +52,8 @@
XPathParserException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager);
/**
Modified: xalan/c/trunk/src/xalanc/XPath/XalanXPathException.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanXPathException.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanXPathException.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanXPathException.cpp Mon Jun 30 15:47:20 2008
@@ -27,8 +27,8 @@
const XalanDOMString XalanXPathException::s_emptyString(XalanMemMgrs::getDummyMemMgr());
-const XalanDOMChar XalanXPathException::m_type[] =
-{
+const XalanDOMChar XalanXPathException::s_type[] =
+{
XalanUnicode::charLetter_X,
XalanUnicode::charLetter_a,
XalanUnicode::charLetter_l,
@@ -51,13 +51,20 @@
0
};
+
+
XalanXPathException::XalanXPathException(
const XalanDOMString& message,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager) :
- XSLException(message, theURI, theLineNumber, theColumnNumber, theManager)
+ XSLException(
+ message,
+ theURI,
+ theLineNumber,
+ theColumnNumber,
+ theManager)
{
}
@@ -66,7 +73,9 @@
XalanXPathException::XalanXPathException(
const XalanDOMString& message,
MemoryManagerType& theManager) :
- XSLException(message, theManager)
+ XSLException(
+ message,
+ theManager)
{
}
@@ -76,22 +85,31 @@
const LocatorType& theLocator,
const XalanDOMString& theMessage,
MemoryManagerType& theManager) :
- XSLException(theLocator, theMessage, theManager)
+ XSLException(
+ theLocator,
+ theMessage,
+ theManager)
{
}
XalanXPathException::XalanXPathException(MemoryManagerType& theManager) :
- XSLException(s_emptyString, theManager)
+ XSLException(
+ s_emptyString,
+ theManager)
{
}
+
+
XalanXPathException::XalanXPathException(const XalanXPathException& other) :
XSLException(other)
{
}
+
+
XalanXPathException::~XalanXPathException()
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanXPathException.hpp Mon Jun 30 15:47:20 2008
@@ -60,8 +60,8 @@
XalanXPathException(
const XalanDOMString& message,
const XalanDOMString& theURI,
- int theLineNumber,
- int theColumnNumber,
+ XalanFileLoc theLineNumber,
+ XalanFileLoc theColumnNumber,
MemoryManagerType& theManager);
/**
@@ -83,10 +83,11 @@
* @param message message explaining the problem.
* @param theType type of exception, default is "XalanXPathException"
*/
- XalanXPathException(const XalanDOMString& message,
- MemoryManagerType& theManager);
+ XalanXPathException(
+ const XalanDOMString& message,
+ MemoryManagerType& theManager);
- XalanXPathException(const XalanXPathException& other);
+ XalanXPathException(const XalanXPathException& other);
virtual
~XalanXPathException();
@@ -94,7 +95,7 @@
virtual const XalanDOMChar*
getType() const
{
- return m_type;
+ return s_type;
}
protected:
@@ -107,11 +108,12 @@
XalanXPathException(MemoryManagerType& theManager);
private:
- static const XalanDOMChar m_type[];
const XalanNode* m_styleNode;
static const XalanDOMString s_emptyString;
+
+ static const XalanDOMChar s_type[];
};
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.cpp Mon Jun 30 15:47:20 2008
@@ -46,8 +46,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -191,7 +191,6 @@
-
#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
void
ElemCallTemplate::execute(StylesheetExecutionContext& executionContext) const
@@ -209,6 +208,7 @@
#endif
+
void
ElemCallTemplate::postConstruction(
StylesheetConstructionContext& constructionContext,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCallTemplate.hpp Mon Jun 30 15:47:20 2008
@@ -48,15 +48,15 @@
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
* @param atts list of attributes for element
- * @param lineNumber line number in document
- * @param columnNumber column number in document
+ * @param lineNumber line number in document
+ * @param columnNumber column number in document
*/
ElemCallTemplate (
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemCallTemplate();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemComment.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemComment.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemComment.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemComment.cpp Mon Jun 30 15:47:20 2008
@@ -42,26 +42,26 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
columnNumber,
StylesheetConstructionContext::ELEMNAME_COMMENT)
{
- 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_COMMENT_WITH_PREFIX_STRING.c_str(),
aname,
atts,
@@ -110,7 +110,6 @@
void
ElemComment::endElement(StylesheetExecutionContext& executionContext) const
{
-
endChildrenToString(executionContext);
XalanDOMString& theResult = executionContext.getAndPopCachedString();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemComment.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemComment.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemComment.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemComment.hpp Mon Jun 30 15:47:20 2008
@@ -44,15 +44,15 @@
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
* @param atts list of attributes for element
- * @param lineNumber line number in document
- * @param columnNumber column number in document
+ * @param lineNumber line number in document
+ * @param columnNumber column number in document
*/
ElemComment(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp Mon Jun 30 15:47:20 2008
@@ -77,7 +77,8 @@
virtual void
execute(StylesheetExecutionContext& executionContext) const;
#endif
- virtual const XPath*
+
+ virtual const XPath*
getXPath(XalanSize_t index) const;
private:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.cpp Mon Jun 30 15:47:20 2008
@@ -33,15 +33,16 @@
ElemEmpty::ElemEmpty(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
const XalanDOMString* elementName) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- StylesheetConstructionContext::ELEMNAME_UNDEFINED,
- XalanDOMString(constructionContext.getMemoryManager()),
- lineNumber,
- columnNumber),
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ StylesheetConstructionContext::ELEMNAME_UNDEFINED,
+ XalanDOMString(constructionContext.getMemoryManager()),
+ lineNumber,
+ columnNumber),
m_elementName(elementName)
{
}
@@ -53,9 +54,9 @@
Stylesheet& stylesheetTree,
const XalanDOMString* elementName) :
ElemTemplateElement(
- constructionContext,
- stylesheetTree,
- StylesheetConstructionContext::ELEMNAME_UNDEFINED),
+ constructionContext,
+ stylesheetTree,
+ StylesheetConstructionContext::ELEMNAME_UNDEFINED),
m_elementName(elementName)
{
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemEmpty.hpp Mon Jun 30 15:47:20 2008
@@ -53,8 +53,8 @@
ElemEmpty(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
const XalanDOMString* elementName = 0);
/**
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.cpp Mon Jun 30 15:47:20 2008
@@ -39,8 +39,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
ExtensionNSHandler& ns) :
ElemLiteralResult(constructionContext,
stylesheetTree,
@@ -68,8 +68,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
ExtensionNSHandler& ns)
{
typedef ElemExtensionCall ThisType;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp Mon Jun 30 15:47:20 2008
@@ -59,8 +59,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
ExtensionNSHandler& ns);
static ElemExtensionCall*
@@ -70,8 +70,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
ExtensionNSHandler& ns);
// These methods are inherited from ElemLiteralResult ...
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemFallback.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemFallback.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemFallback.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemFallback.cpp Mon Jun 30 15:47:20 2008
@@ -45,17 +45,18 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_FALLBACK)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_FALLBACK)
{
- 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/ElemFallback.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemFallback.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemFallback.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemFallback.hpp Mon Jun 30 15:47:20 2008
@@ -53,8 +53,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemFallback();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp Mon Jun 30 15:47:20 2008
@@ -47,8 +47,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(
constructionContext,
stylesheetTree,
@@ -57,9 +57,9 @@
StylesheetConstructionContext::ELEMNAME_FORWARD_COMPATIBLE),
m_elementName(constructionContext.getPooledString(name))
{
- 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);
@@ -87,14 +87,14 @@
ElemForwardCompatible*
-ElemForwardCompatible:: create(
+ElemForwardCompatible::create(
MemoryManagerType& theManager,
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber)
{
typedef ElemForwardCompatible ThisType;
@@ -109,7 +109,7 @@
lineNumber,
columnNumber);
- theGuard.release();
+ theGuard.release();
return theResult;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp Mon Jun 30 15:47:20 2008
@@ -53,8 +53,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
static ElemForwardCompatible*
create(
@@ -63,9 +63,10 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
- virtual
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
+
+ virtual
~ElemForwardCompatible();
// These methods are inherited from ElemTemplateElement ...
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemIf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemIf.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemIf.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemIf.cpp Mon Jun 30 15:47:20 2008
@@ -50,18 +50,19 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_IF),
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_IF),
m_test(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);
@@ -89,7 +90,7 @@
}
}
- if(0 == m_test)
+ if (0 == m_test)
{
error(
constructionContext,
@@ -120,7 +121,7 @@
m_test->execute(*this, executionContext, fResult);
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireSelectEvent(
SelectionEvent(executionContext,
@@ -131,13 +132,14 @@
fResult));
}
- if(fResult == true)
+ if (fResult == true)
{
executionContext.pushExecuteIf(true);
return beginExecuteChildren(executionContext);
}
executionContext.pushExecuteIf(false);
+
return 0;
}
@@ -146,7 +148,7 @@
void
ElemIf::endElement(StylesheetExecutionContext& executionContext) const
{
- if(executionContext.popExecuteIf())
+ if (executionContext.popExecuteIf())
{
endExecuteChildren(executionContext);
}
@@ -167,7 +169,7 @@
m_test->execute(*this, executionContext, fResult);
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireSelectEvent(
SelectionEvent(executionContext,
@@ -178,7 +180,7 @@
fResult));
}
- if(fResult == true)
+ if (fResult == true)
{
executeChildren(executionContext);
}
@@ -188,7 +190,7 @@
const XPath*
-ElemIf::getXPath(unsigned int index) const
+ElemIf::getXPath(XalanSize_t index) const
{
return index == 0 ? m_test : 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemIf.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemIf.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemIf.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemIf.hpp Mon Jun 30 15:47:20 2008
@@ -53,8 +53,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
// These methods are inherited from ElemTemplateElement ...
@@ -73,7 +73,7 @@
#endif
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
private:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.cpp Mon Jun 30 15:47:20 2008
@@ -49,8 +49,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemUse(
constructionContext,
stylesheetTree,
@@ -71,8 +71,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken) :
ElemUse(constructionContext,
stylesheetTree,
@@ -99,7 +99,7 @@
hasPrefix(indexOf(name, XalanUnicode::charColon) < length(name) ? true : false);
- const unsigned int nAttrs = atts.getLength();
+ const XalanSize_t nAttrs = atts.getLength();
// This over-allocates, but we probably won't waste that much space.
m_avts = constructionContext.allocateAVTPointerVector(nAttrs);
@@ -109,7 +109,7 @@
XalanDOMString& theBuffer = theGuard.get();
- for(unsigned int i = 0; i < nAttrs; i++)
+ for (XalanSize_t i = 0; i < nAttrs; i++)
{
const XalanDOMChar* const aname = atts.getName(i);
@@ -117,27 +117,27 @@
const XalanDOMString::size_type indexOfNSSep = indexOf(aname, XalanUnicode::charColon);
const XalanDOMString::size_type len = length(aname);
- if(indexOfNSSep < len)
+ if (indexOfNSSep < len)
{
substring(aname, theBuffer, 0, indexOfNSSep);
- if(!equals(theBuffer, DOMServices::s_XMLNamespace))
+ if (!equals(theBuffer, DOMServices::s_XMLNamespace))
{
const XalanDOMString* const ns =
getNamespaceForPrefixInternal(theBuffer);
- if(ns == 0)
+ if (ns == 0)
{
error(
constructionContext,
XalanMessages::PrefixIsNotDeclared_1Param,
theBuffer);
}
- else if(equals(*ns, stylesheetTree.getXSLTNamespaceURI()))
+ else if (equals(*ns, stylesheetTree.getXSLTNamespaceURI()))
{
theBuffer.assign(aname + indexOfNSSep + 1, len - (indexOfNSSep + 1));
- if(processPrefixControl(constructionContext, stylesheetTree, theBuffer, atts.getValue(i)) == true)
+ if (processPrefixControl(constructionContext, stylesheetTree, theBuffer, atts.getValue(i)) == true)
{
needToProcess = false;
}
@@ -157,7 +157,7 @@
}
}
- if(needToProcess == true)
+ if (needToProcess == true)
{
processSpaceAttr(
m_elementName.c_str(),
@@ -168,7 +168,7 @@
// Add xmlns attribute(except xmlns:xsl), xml:space, etc...
// Ignore anything with xsl:xxx
- if(processUseAttributeSets(
+ if (processUseAttributeSets(
constructionContext,
aname,
atts,
@@ -207,8 +207,8 @@
public:
AVTPrefixChecker(
- const AVT** theAVTs,
- unsigned int theAVTsCount) :
+ const AVT** theAVTs,
+ XalanSize_t theAVTsCount) :
m_avts(theAVTs),
m_avtsCount(theAVTsCount)
{
@@ -219,7 +219,7 @@
{
bool fActive = false;
- for(unsigned int i = 0; i < m_avtsCount; ++i)
+ for (XalanSize_t i = 0; i < m_avtsCount; ++i)
{
const AVT* const avt = m_avts[i];
@@ -252,7 +252,7 @@
// Data members...
const AVT** const m_avts;
- const unsigned int m_avtsCount;
+ const XalanSize_t m_avtsCount;
};
@@ -375,13 +375,13 @@
void
ElemLiteralResult::evaluateAVTs(StylesheetExecutionContext& executionContext) const
{
- if(m_avtsCount > 0)
+ if (m_avtsCount > 0)
{
StylesheetExecutionContext::GetAndReleaseCachedString theGuard(executionContext);
XalanDOMString& theStringedValue = theGuard.get();
- for(unsigned int i = 0; i < m_avtsCount; ++i)
+ for(XalanSize_t i = 0; i < m_avtsCount; ++i)
{
const AVT* const avt = m_avts[i];
@@ -443,7 +443,7 @@
XalanDOMString& theStringedValue = theGuard.get();
- for(unsigned int i = 0; i < m_avtsCount; ++i)
+ for(XalanSize_t i = 0; i < m_avtsCount; ++i)
{
const AVT* const avt = m_avts[i];
@@ -469,18 +469,18 @@
ElemLiteralResult::isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& /* atts */,
- int /* which */,
+ XalanSize_t /* which */,
StylesheetConstructionContext& constructionContext) const
{
bool isAttrOK = equals(attrName, DOMServices::s_XMLNamespace) ||
startsWith(attrName, DOMServices::s_XMLNamespaceWithSeparator);
- if(isAttrOK == false)
+ if (isAttrOK == false)
{
const XalanDOMString::size_type len = length(attrName);
const XalanDOMString::size_type indexOfNSSep = indexOf(attrName, XalanUnicode::charColon);
- if(indexOfNSSep >= len)
+ if (indexOfNSSep >= len)
{
// An empty namespace is OK.
isAttrOK = true;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemLiteralResult.hpp Mon Jun 30 15:47:20 2008
@@ -57,8 +57,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemLiteralResult();
@@ -77,7 +77,7 @@
isAttrOK(
const XalanDOMChar* attrName,
const AttributeListType& atts,
- int which,
+ XalanSize_t which,
StylesheetConstructionContext& constructionContext) const;
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
@@ -127,8 +127,8 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
int xslToken);
virtual void
@@ -159,7 +159,7 @@
/**
* The size of m_avts, once the stylesheet is compiled...
*/
- unsigned int m_avtsCount;
+ XalanSize_t m_avtsCount;
};
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp Mon Jun 30 15:47:20 2008
@@ -42,8 +42,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
lineNumber,
@@ -51,9 +51,9 @@
StylesheetConstructionContext::ELEMNAME_MESSAGE),
m_terminate(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);
@@ -75,7 +75,7 @@
avalue);
}
}
- else if(
+ else if (
isAttrOK(
aname,
atts,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemMessage.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemMessage.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemMessage.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemMessage.hpp Mon Jun 30 15:47:20 2008
@@ -53,8 +53,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/ElemNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp Mon Jun 30 15:47:20 2008
@@ -71,8 +71,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
unsigned long id) :
ElemTemplateElement(constructionContext,
stylesheetTree,
@@ -91,25 +91,25 @@
m_id(id)
{
- 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, s_levelString))
+ if (equals(aname, s_levelString))
{
const XalanDOMChar* const levelValue = atts.getValue(i);
- if(equals(s_multipleString, levelValue))
+ if (equals(s_multipleString, levelValue))
{
m_level = eMultiple;
}
- else if(equals(s_anyString, levelValue))
+ else if (equals(s_anyString, levelValue))
{
m_level = eAny;
}
- else if(equals(s_singleString, levelValue))
+ else if (equals(s_singleString, levelValue))
{
m_level = eSingle;
}
@@ -123,44 +123,44 @@
levelValue);
}
}
- else if(equals(aname, Constants::ATTRNAME_COUNT))
+ else if (equals(aname, Constants::ATTRNAME_COUNT))
{
m_countMatchPattern = constructionContext.createMatchPattern(getLocator(), atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_FROM))
+ else if (equals(aname, Constants::ATTRNAME_FROM))
{
m_fromMatchPattern = constructionContext.createMatchPattern(getLocator(), atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_VALUE))
+ else if (equals(aname, Constants::ATTRNAME_VALUE))
{
m_valueExpr = constructionContext.createXPath(getLocator(), atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_FORMAT))
+ else if (equals(aname, Constants::ATTRNAME_FORMAT))
{
m_format_avt =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_LANG))
+ else if (equals(aname, Constants::ATTRNAME_LANG))
{
m_lang_avt =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname, Constants::ATTRNAME_LETTERVALUE))
+ else if (equals(aname, Constants::ATTRNAME_LETTERVALUE))
{
m_lettervalue_avt =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname,Constants::ATTRNAME_GROUPINGSEPARATOR))
+ else if (equals(aname,Constants::ATTRNAME_GROUPINGSEPARATOR))
{
m_groupingSeparator_avt =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(equals(aname,Constants::ATTRNAME_GROUPINGSIZE))
+ else if (equals(aname,Constants::ATTRNAME_GROUPINGSIZE))
{
m_groupingSize_avt =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
@@ -179,12 +179,12 @@
ElemNumber*
ElemNumber::create(
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager,
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
unsigned long id)
{
typedef ElemNumber ThisType;
@@ -278,23 +278,25 @@
{
XalanNode* contextCopy = context;
- while(contextCopy != 0)
+ while (contextCopy != 0)
{
- if(0 != fromMatchPattern)
+ if (0 != fromMatchPattern)
{
- if(fromMatchPattern->getMatchScore(contextCopy, *this,
- executionContext) !=
- XPath::eMatchScoreNone)
+ if (fromMatchPattern->getMatchScore(
+ contextCopy,
+ *this,
+ executionContext) != XPath::eMatchScoreNone)
{
break;
}
}
- if(0 != countMatchPattern)
+ if (0 != countMatchPattern)
{
- if(countMatchPattern->getMatchScore(contextCopy, *this,
- executionContext) !=
- XPath::eMatchScoreNone)
+ if(countMatchPattern->getMatchScore(
+ contextCopy,
+ *this,
+ executionContext) != XPath::eMatchScoreNone)
{
break;
}
@@ -317,24 +319,26 @@
{
XalanNode* contextCopy = context;
- while(contextCopy != 0)
+ while (contextCopy != 0)
{
- if(0 != fromMatchPattern)
+ if (0 != fromMatchPattern)
{
- if(fromMatchPattern->getMatchScore(contextCopy, *this,
- executionContext) !=
- XPath::eMatchScoreNone)
+ if (fromMatchPattern->getMatchScore(
+ contextCopy,
+ *this,
+ executionContext) != XPath::eMatchScoreNone)
{
contextCopy = 0;
break;
}
}
- if(0 != countMatchPattern)
+ if (0 != countMatchPattern)
{
- if(countMatchPattern->getMatchScore(contextCopy, *this,
- executionContext) !=
- XPath::eMatchScoreNone)
+ if (countMatchPattern->getMatchScore(
+ contextCopy,
+ *this,
+ executionContext) != XPath::eMatchScoreNone)
{
break;
}
@@ -342,7 +346,7 @@
XalanNode* const prevSibling = contextCopy->getPreviousSibling();
- if(prevSibling == 0)
+ if (prevSibling == 0)
{
contextCopy = DOMServices::getParentOfNode(*contextCopy);
}
@@ -351,7 +355,9 @@
// Now go down the chain of children of this sibling
contextCopy = prevSibling->getLastChild();
if (contextCopy == 0)
+ {
contextCopy = prevSibling;
+ }
}
}
@@ -367,7 +373,7 @@
{
const XPath* countMatchPattern = 0;
- switch(contextNode->getNodeType())
+ switch (contextNode->getNodeType())
{
case XalanNode::ELEMENT_NODE:
{
@@ -503,7 +509,7 @@
NodeRefListBase::size_type numberListLength,
XalanDOMString& theResult) const
{
- for(NodeRefListBase::size_type i = 0; i < numberListLength; i++)
+ for (NodeRefListBase::size_type i = 0; i < numberListLength; i++)
{
XalanNode* const target = ancestors.item(numberListLength - i - 1);
@@ -531,7 +537,7 @@
assert(sourceNode != 0);
- if(0 != m_valueExpr)
+ if (0 != m_valueExpr)
{
double theValue;
@@ -547,7 +553,7 @@
}
else
{
- CountType theNumber =
+ const CountType theNumber =
CountType(DoubleSupport::round(theValue));
formatNumberList(
@@ -561,7 +567,7 @@
{
CountersTable& ctable = executionContext.getCountersTable();
- if(eAny == m_level)
+ if (eAny == m_level)
{
const CountType theNumber =
ctable.countNode(executionContext, *this, sourceNode);
@@ -586,7 +592,7 @@
const NodeRefListBase::size_type lastIndex = ancestors->getLength();
- if(lastIndex > 0)
+ if (lastIndex > 0)
{
const NodeRefListBase::size_type theStackArrayThreshold = 100;
@@ -644,7 +650,7 @@
countMatchPattern = xpathGuard.get();
}
- if(eAny == m_level)
+ if (eAny == m_level)
{
const XPath* const fromMatchPattern = m_fromMatchPattern;
@@ -704,13 +710,13 @@
}
else // NUMBERLEVEL_MULTI or NUMBERLEVEL_SINGLE
{
- while(0 != pos)
+ while (0 != pos)
{
pos = pos->getPreviousSibling();
- if(0 != pos &&
- (0 == countMatchPattern ||
- countMatchPattern->getMatchScore(
+ if (0 != pos &&
+ (0 == countMatchPattern ||
+ countMatchPattern->getMatchScore(
pos,
*this,
executionContext) != XPath::eMatchScoreNone))
@@ -747,7 +753,7 @@
countMatchPattern = xpathGuard.get();
}
- if(eAny == m_level)
+ if (eAny == m_level)
{
target = findPrecedingOrAncestorOrSelf(
executionContext,
@@ -778,8 +784,7 @@
{
// Create an XPathGuard, since we may need to
// create a new XPath...
- StylesheetExecutionContext::XPathGuard xpathGuard(
- executionContext);
+ StylesheetExecutionContext::XPathGuard xpathGuard(executionContext);
const XPath* countMatchPattern = m_countMatchPattern;
@@ -791,11 +796,13 @@
countMatchPattern = xpathGuard.get();
}
- while(0 != node)
+ while (0 != node)
{
- if((0 != m_fromMatchPattern) &&
- (m_fromMatchPattern->getMatchScore(node, *this, executionContext) !=
- XPath::eMatchScoreNone))
+ if (0 != m_fromMatchPattern &&
+ m_fromMatchPattern->getMatchScore(
+ node,
+ *this,
+ executionContext) != XPath::eMatchScoreNone)
{
// The following if statement gives level="single" different
// behavior from level="multiple", which seems incorrect according
@@ -804,10 +811,11 @@
// think this is a bug, or there is something about level="single"
// that we still don't understand.
if(!stopAtFirstFound)
+ {
break;
+ }
}
- // Programmer error! countMatchPattern should never be 0!
assert(0 != countMatchPattern);
if(countMatchPattern->getMatchScore(node, *this, executionContext) !=
@@ -815,8 +823,10 @@
{
ancestors.addNode(node);
- if(stopAtFirstFound)
+ if (stopAtFirstFound)
+ {
break;
+ }
}
node = DOMServices::getParentOfNode(*node);
@@ -839,7 +849,9 @@
XalanDOMString& digitGroupSepValue = theGuard1.get();
if (0 != m_groupingSeparator_avt)
+ {
m_groupingSeparator_avt->evaluate(digitGroupSepValue, *this, executionContext);
+ }
if (length(digitGroupSepValue) > 1)
{
@@ -853,10 +865,12 @@
XalanDOMString& nDigitsPerGroupValue = theGuard2.get();
if (0 != m_groupingSize_avt)
+ {
m_groupingSize_avt->evaluate(nDigitsPerGroupValue, *this, executionContext);
+ }
// 7.7.1 If one is empty, it is ignored (numb81 conf test)
- if(!isEmpty(digitGroupSepValue) && !isEmpty(nDigitsPerGroupValue))
+ if (!isEmpty(digitGroupSepValue) && !isEmpty(nDigitsPerGroupValue))
{
formatter->setGroupingUsed(true);
formatter->setGroupingSeparator(digitGroupSepValue);
@@ -905,7 +919,7 @@
m_format_avt->evaluate(formatValue, *this, executionContext);
}
- if(isEmpty(formatValue) == true)
+ if (isEmpty(formatValue) == true)
{
formatValue = XalanUnicode::charDigit_1;
}
@@ -917,7 +931,7 @@
tokenVector.resize(theTokenCount);
// Tokenize directly into the vector...
- for(NumberFormatStringTokenizer::size_type i = 0; i < theTokenCount; ++i)
+ for (NumberFormatStringTokenizer::size_type i = 0; i < theTokenCount; ++i)
{
formatTokenizer.nextToken(tokenVector[i]);
}
@@ -939,7 +953,7 @@
if (theVectorSize > 0)
{
- if(!isXMLLetterOrDigit(charAt(*it, 0)))
+ if (!isXMLLetterOrDigit(charAt(*it, 0)))
{
leaderStrIt = it;
@@ -950,7 +964,7 @@
if (theVectorSize > 1)
{
- if(!isXMLLetterOrDigit(charAt(tokenVector.back(), 0)))
+ if (!isXMLLetterOrDigit(charAt(tokenVector.back(), 0)))
{
// Move the iterator back one, so it's pointing
// at the trailing string...
@@ -974,7 +988,7 @@
XalanDOMString& theIntermediateResult = theGuard2.get();
- for(NodeRefListBase::size_type i = 0; i < theListLength; i++)
+ for( NodeRefListBase::size_type i = 0; i < theListLength; i++)
{
if (it != trailerStrIt)
{
@@ -1125,7 +1139,9 @@
do
{
if (i >= multiplierSize)
+ {
break; //number is smaller than multipliers
+ }
// some languages (ie chinese) put a zero character (and only one) when
// the multiplier is multiplied by zero. (ie, 1001 is 1X1000 + 0X100 + 0X10 + 1)
@@ -1343,11 +1359,8 @@
break;
case XalanUnicode::charLetter_i:
- {
- toRoman(listElement, true, theResult);
-
- toLowerCaseASCII(theResult);
- }
+ toRoman(listElement, true, theResult);
+ toLowerCaseASCII(theResult);
break;
case 0x3042:
@@ -1418,7 +1431,7 @@
reserve(theResult, nPadding * length(padString) + lengthNumString + 1);
- for(XalanDOMString::size_type i = 0; i < nPadding; i++)
+ for (XalanDOMString::size_type i = 0; i < nPadding; i++)
{
insert(theResult, 0, padString);
}
@@ -1530,7 +1543,9 @@
// if the next value we'd put out would be a leading zero, we're done.
if (lookupIndex == 0 && val == 0)
+ {
break;
+ }
// put out the next character of output
buf[charPos--] = table[lookupIndex];
@@ -2159,7 +2174,7 @@
const XPath*
-ElemNumber::getXPath(unsigned int index) const
+ElemNumber::getXPath(XalanSize_t index) const
{
const XPath* result = 0;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp Mon Jun 30 15:47:20 2008
@@ -97,18 +97,18 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
unsigned long id);
static ElemNumber*
create(
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager,
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
unsigned long id);
virtual
@@ -148,7 +148,7 @@
XalanNode* sourceNode) const;
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
protected:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.cpp Mon Jun 30 15:47:20 2008
@@ -41,26 +41,27 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_OTHERWISE)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_OTHERWISE)
{
- 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_OTHERWISE_WITH_PREFIX_STRING.c_str(),
aname,
atts,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemOtherwise.hpp Mon Jun 30 15:47:20 2008
@@ -51,8 +51,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual const XalanDOMString&
getElementName() const;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemPI.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemPI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemPI.cpp Mon Jun 30 15:47:20 2008
@@ -43,32 +43,33 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_PI),
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_PI),
m_nameAVT(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_nameAVT =
constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this);
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
constructionContext) == false &&
- processSpaceAttr(
+ processSpaceAttr(
Constants::ELEMNAME_PI_WITH_PREFIX_STRING.c_str(),
aname,
atts,
@@ -83,7 +84,7 @@
}
}
- if(0 == m_nameAVT)
+ if (0 == m_nameAVT)
{
error(
constructionContext,
@@ -119,7 +120,7 @@
m_nameAVT->evaluate(piName, *this, executionContext);
- if(equalsIgnoreCaseASCII(
+ if (equalsIgnoreCaseASCII(
piName,
Constants::ATTRVAL_OUTPUT_METHOD_XML) ||
isValidNCName(piName) == false)
@@ -158,7 +159,7 @@
// We need to fix up any occurrences of the sequence '?>' in
// the PI's data by inserting a space between them.
- while(theCurrent != theEnd)
+ while (theCurrent != theEnd)
{
const XalanDOMChar theChar = *theCurrent;
@@ -208,7 +209,7 @@
m_nameAVT->evaluate(piName, *this, executionContext);
- if(equalsIgnoreCaseASCII(
+ if (equalsIgnoreCaseASCII(
piName,
Constants::ATTRVAL_OUTPUT_METHOD_XML) ||
isValidNCName(piName) == false)
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemPI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemPI.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemPI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemPI.hpp Mon Jun 30 15:47:20 2008
@@ -56,8 +56,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemPI();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemParam.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemParam.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemParam.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemParam.cpp Mon Jun 30 15:47:20 2008
@@ -40,8 +40,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
ElemVariable(constructionContext,
stylesheetTree,
atts,
@@ -76,7 +76,7 @@
}
else
{
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(
TracerEvent(
@@ -120,7 +120,7 @@
}
else
{
- if(0 != executionContext.getTraceListeners())
+ if (0 != executionContext.getTraceListeners())
{
executionContext.fireTraceEvent(
TracerEvent(
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemParam.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemParam.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemParam.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemParam.hpp Mon Jun 30 15:47:20 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 ElemVariable ...
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.cpp Mon Jun 30 15:47:20 2008
@@ -55,21 +55,22 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_TEMPLATE),
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_TEMPLATE),
m_matchPattern(0),
m_name(&s_empty),
m_mode(&s_empty),
m_priority(XPath::getMatchScoreValue(XPath::eMatchScoreNone))
{
- 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);
@@ -135,7 +136,7 @@
}
}
- if(0 == m_matchPattern && m_name->isEmpty() == true)
+ if (0 == m_matchPattern && m_name->isEmpty() == true)
{
error(
constructionContext,
@@ -225,7 +226,7 @@
const XPath*
-ElemTemplate::getXPath(unsigned int index) const
+ElemTemplate::getXPath(XalanSize_t index) const
{
return index == 0 ? m_matchPattern : 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplate.hpp Mon Jun 30 15:47:20 2008
@@ -59,8 +59,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemTemplate();
@@ -140,7 +140,7 @@
#endif
virtual const XPath*
- getXPath(unsigned int index = 0) const;
+ getXPath(XalanSize_t index) const;
protected:
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemText.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemText.cpp Mon Jun 30 15:47:20 2008
@@ -46,21 +46,22 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber) :
- ElemTemplateElement(constructionContext,
- stylesheetTree,
- lineNumber,
- columnNumber,
- StylesheetConstructionContext::ELEMNAME_TEXT)
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber) :
+ ElemTemplateElement(
+ constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ StylesheetConstructionContext::ELEMNAME_TEXT)
{
- 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_DISABLE_OUTPUT_ESCAPING))
+ if (equals(aname, Constants::ATTRNAME_DISABLE_OUTPUT_ESCAPING))
{
disableOutputEscaping(
stylesheetTree.getYesOrNo(
@@ -68,7 +69,7 @@
atts.getValue(i),
constructionContext));
}
- else if(isAttrOK(
+ else if (isAttrOK(
aname,
atts,
i,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemText.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemText.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemText.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemText.hpp Mon Jun 30 15:47:20 2008
@@ -54,8 +54,8 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- int lineNumber,
- int columnNumber);
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber);
virtual
~ElemText();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.cpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.cpp Mon Jun 30 15:47:20 2008
@@ -41,8 +41,8 @@
ElemTextLiteral::ElemTextLiteral(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
const XMLCh* ch,
XalanDOMString::size_type start,
XalanDOMString::size_type length,
@@ -61,7 +61,8 @@
m_length(length)
{
disableOutputEscaping(fDisableOutputEscaping);
- preserveSpace(fPreserveSpace);
+
+ preserveSpace(fPreserveSpace);
}
@@ -93,7 +94,7 @@
{
ElemTemplateElement::startElement(executionContext);
- if(disableOutputEscaping() == false)
+ if (disableOutputEscaping() == false)
{
executionContext.characters(m_ch, 0, m_length);
}
@@ -113,7 +114,7 @@
{
ElemTemplateElement::execute(executionContext);
- if(disableOutputEscaping() == false)
+ if (disableOutputEscaping() == false)
{
executionContext.characters(m_ch, 0, m_length);
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTextLiteral.hpp Mon Jun 30 15:47:20 2008
@@ -57,8 +57,8 @@
ElemTextLiteral(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- int lineNumber,
- int columnNumber,
+ XalanFileLoc lineNumber,
+ XalanFileLoc columnNumber,
const XalanDOMChar* ch,
XalanDOMString::size_type start,
XalanDOMString::size_type length,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp?rev=672951&r1=672950&r2=672951&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemUse.hpp Mon Jun 30 15:47:20 2008
@@ -58,7 +58,7 @@
ElemUse(
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
- XalanFileLoc lineNumber,
+ XalanFileLoc lineNumber,
XalanFileLoc columnNumber,
int xslToken);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org